[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#166104: please recompile using wxwindows2.3



tags 166104 + patch
thanks

On Thu, Oct 24, 2002 at 09:47:15AM +0200, Andreas Tille wrote:
> I personally have neither enough time nor knowledge to fix the bug but
> I feel that it can be solved quickly by competent people.  So I tag
> this bug "help" and "critical" ("Does not compile" is critical) and
> wait for urgent help.

Last I looked, 'does not compile' was serious, not critical, but anyway,
here's a fix.  kurs.cpp was missing an include to define WXDLLEXPORT
(might well be a wxwindows bug).  The rest of the patch fixes g++ 3.x
issues.

Regards,

Daniel.

---[snip]---

diff -ur tipptrainer-0.4/src/auswahl.cpp tipptrainer-0.4.fixed/src/auswahl.cpp
--- tipptrainer-0.4/src/auswahl.cpp	2000-04-30 15:54:33.000000000 +0200
+++ tipptrainer-0.4.fixed/src/auswahl.cpp	2002-10-24 10:44:51.000000000 +0200
@@ -31,8 +31,8 @@
 //* Konstruktor
 //**********************************************
 
-Auswahldialog::Auswahldialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, 
-const wxSize& size =wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox") : wxDialog(parent, id, title, pos, size, style, name)
+Auswahldialog::Auswahldialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, 
+const wxSize& size, long style, const wxString& name) : wxDialog(parent, id, title, pos, size, style, name)
 {
   SetAutoLayout(TRUE);
 #ifdef __WXMSW__
diff -ur tipptrainer-0.4/src/info.cpp tipptrainer-0.4.fixed/src/info.cpp
--- tipptrainer-0.4/src/info.cpp	2000-04-30 15:49:18.000000000 +0200
+++ tipptrainer-0.4.fixed/src/info.cpp	2002-10-24 10:41:13.000000000 +0200
@@ -38,8 +38,8 @@
 //* Konstruktor
 //*********************************************************
 
-Info_Dialog::Info_Dialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, 
-const wxSize& size =wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox") : wxDialog(parent, id, title, pos, size, style, name)
+Info_Dialog::Info_Dialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, 
+const wxSize& size, long style, const wxString& name) : wxDialog(parent, id, title, pos, size, style, name)
 {
 
   SetAutoLayout(TRUE);
diff -ur tipptrainer-0.4/src/kurs.cpp tipptrainer-0.4.fixed/src/kurs.cpp
--- tipptrainer-0.4/src/kurs.cpp	2002-10-24 10:29:15.000000000 +0200
+++ tipptrainer-0.4.fixed/src/kurs.cpp	2002-10-24 10:42:58.000000000 +0200
@@ -25,6 +25,7 @@
 #include <ctime>
 #include <cstdlib>
 
+#include <wx/defs.h>
 #include <wx/wizard.h>
 #include <wx/ffile.h>
 #include <wx/notebook.h>
@@ -253,7 +254,7 @@
 //*Kurs::Kurs(wxWindow* parent)
 //********************************************
 
-Kurs::Kurs(wxWindow* parent, bool neu=true)
+Kurs::Kurs(wxWindow* parent, bool neu)
 {
   m_parent = parent;
   if (neu)
diff -ur tipptrainer-0.4/src/lektion.cpp tipptrainer-0.4.fixed/src/lektion.cpp
--- tipptrainer-0.4/src/lektion.cpp	2000-10-05 14:49:38.000000000 +0200
+++ tipptrainer-0.4.fixed/src/lektion.cpp	2002-10-24 10:36:19.000000000 +0200
@@ -33,7 +33,7 @@
 
 //**************************************************************************
 
-Lektion::Lektion(wxWindow* parent, int Lektion=0, Kurs* kurs)
+Lektion::Lektion(wxWindow* parent, int Lektion, Kurs* kurs)
 {
   m_richtig = 0;
   m_falsch = 0;
diff -ur tipptrainer-0.4/src/lektionsanweisung.cpp tipptrainer-0.4.fixed/src/lektionsanweisung.cpp
--- tipptrainer-0.4/src/lektionsanweisung.cpp	2000-06-07 21:40:18.000000000 +0200
+++ tipptrainer-0.4.fixed/src/lektionsanweisung.cpp	2002-10-24 10:39:39.000000000 +0200
@@ -40,8 +40,8 @@
   //* Konstruktor
   //****************************************************
   
-lektionsanweisung::lektionsanweisung(wxWindow* parent, int Lektion, wxString k,  wxWindowID id , const wxString& title, const wxPoint& pos = wxDefaultPosition, 
-const wxSize& size =wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox")
+lektionsanweisung::lektionsanweisung(wxWindow* parent, int Lektion, wxString k,  wxWindowID id , const wxString& title, const wxPoint& pos, 
+const wxSize& size, long style, const wxString& name)
   : wxDialog(parent, id, title, pos, size, style, name)
 {
   SetAutoLayout(TRUE);
diff -ur tipptrainer-0.4/src/lektionsauswahl.cpp tipptrainer-0.4.fixed/src/lektionsauswahl.cpp
--- tipptrainer-0.4/src/lektionsauswahl.cpp	2002-10-24 10:29:15.000000000 +0200
+++ tipptrainer-0.4.fixed/src/lektionsauswahl.cpp	2002-10-24 10:38:20.000000000 +0200
@@ -49,8 +49,8 @@
 //* Konstruktor
 //**************************************************************************
 
-Lektionsauswahl::Lektionsauswahl(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, 
-const wxSize& size =wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox") : wxDialog(parent, id, title, pos, size, style, name)
+Lektionsauswahl::Lektionsauswahl(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, 
+const wxSize& size, long style, const wxString& name) : wxDialog(parent, id, title, pos, size, style, name)
 {
   SetAutoLayout(TRUE);
 



Reply to: