Compile and build fixes

  Version update etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 41a42f653a1706f27f90bf447be53bb3fb238e47..4d31a44e5919783f8066a0d463857dfc3589a5ed 100755 (executable)
--- a/configure
+++ b/configure
@@ -4533,7 +4533,7 @@ DEFAULT_wxUSE_GTK=1
 DEFAULT_wxUSE_QT=0
 DEFAULT_wxUSE_MOTIF=0
 
 DEFAULT_wxUSE_QT=0
 DEFAULT_wxUSE_MOTIF=0
 

-DEFAULT_wxUSE_THREADS=1
+DEFAULT_wxUSE_THREADS=0

 
 DEFAULT_wxUSE_SHARED=1
 DEFAULT_wxUSE_OPTIMISE=1
 
 DEFAULT_wxUSE_SHARED=1
 DEFAULT_wxUSE_OPTIMISE=1


@@ -4547,7 +4547,7 @@ DEFAULT_wxUSE_IOSTREAMH=1
 
 DEFAULT_wxUSE_ZLIB=1
 DEFAULT_wxUSE_LIBPNG=1
 
 DEFAULT_wxUSE_ZLIB=1
 DEFAULT_wxUSE_LIBPNG=1

-DEFAULT_wxUSE_ODBC=0
+DEFAULT_wxUSE_ODBC=1

 
 DEFAULT_wxUSE_COMBOBOX=1
 DEFAULT_wxUSE_GAUGE=1
 
 DEFAULT_wxUSE_COMBOBOX=1
 DEFAULT_wxUSE_GAUGE=1


@@ -6261,7 +6261,7 @@ fi
 
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__
 
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__

-  WX_LINK=-lwx_gtk_1_0
+  WX_LINK=-lwx_gtk2

   MAKEINCLUDE=../gtk.inc
 fi
 
   MAKEINCLUDE=../gtk.inc
 fi
 

diff --git a/configure.in b/configure.in
index 44f92c718d795fd8cf48d83a0f2572cb4d800bef..6ef774c2b54646058507b3294b7f0e70d96dde9a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -682,7 +682,7 @@ DEFAULT_wxUSE_GTK=1
 DEFAULT_wxUSE_QT=0
 DEFAULT_wxUSE_MOTIF=0
 
 DEFAULT_wxUSE_QT=0
 DEFAULT_wxUSE_MOTIF=0
 

-DEFAULT_wxUSE_THREADS=1
+DEFAULT_wxUSE_THREADS=0

 
 DEFAULT_wxUSE_SHARED=1
 DEFAULT_wxUSE_OPTIMISE=1
 
 DEFAULT_wxUSE_SHARED=1
 DEFAULT_wxUSE_OPTIMISE=1


@@ -696,7 +696,7 @@ DEFAULT_wxUSE_IOSTREAMH=1
 
 DEFAULT_wxUSE_ZLIB=1
 DEFAULT_wxUSE_LIBPNG=1
 
 DEFAULT_wxUSE_ZLIB=1
 DEFAULT_wxUSE_LIBPNG=1

-DEFAULT_wxUSE_ODBC=0
+DEFAULT_wxUSE_ODBC=1

 
 DEFAULT_wxUSE_COMBOBOX=1
 DEFAULT_wxUSE_GAUGE=1
 
 DEFAULT_wxUSE_COMBOBOX=1
 DEFAULT_wxUSE_GAUGE=1


@@ -1032,7 +1032,7 @@ if test "$wxUSE_GTK" = 1; then
   ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4 up-to 1.0.6?))
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__
   ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4 up-to 1.0.6?))
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__

-  WX_LINK=-lwx_gtk_1_0
+  WX_LINK=-lwx_gtk2

   MAKEINCLUDE=../gtk.inc
 fi
 
   MAKEINCLUDE=../gtk.inc
 fi
 

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index b022c9a1f6850096960ae0f107f4bfc9e4247f56..d7ac9ed5dbbb94014993b5bd7b56371c24861236 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -4,10 +4,9 @@
 If you compile wxWindows on Unix for the first time and don't 
 like to read install instructions just do (in the base dir):
 
 If you compile wxWindows on Unix for the first time and don't 
 like to read install instructions just do (in the base dir):
 

+./configure

 make
 make

-su (PASSWORD)

 make install
 make install

-ldconfig

 
 Now create your super-application myfoo.app and compile anywhere 
 with
 
 Now create your super-application myfoo.app and compile anywhere 
 with


@@ -47,7 +46,7 @@ You can get the newest version of the GTK+ from the GTK homepage
 at
   http://www.gtk.org
   
 at
   http://www.gtk.org
   

-We also mirror GTK+ 1.0.6 at our ftp site. You'll find information
+We also mirror GTK+ 1.0.6 at my ftp site. You'll find information

 about downloading at my homepage.
   
 * Additional libraries
 about downloading at my homepage.
   
 * Additional libraries


@@ -75,11 +74,12 @@ You can enable thread support by running
 ./configure "--with-threads"
 make clean
 make
 ./configure "--with-threads"
 make clean
 make

+make install

   
 NB: I included thread support in wxWindows/Gtk, as this 
 problem will disappear in the near future when all major 
 Linux Variants have moved to glibc 2. Also, the Linux
   
 NB: I included thread support in wxWindows/Gtk, as this 
 problem will disappear in the near future when all major 
 Linux Variants have moved to glibc 2. Also, the Linux

-Base Standard will include glibc 2.
+Base Standard will include glibc 2 and Posic threads.

 
 * Create your configuration
 -----------------------------
 
 * Create your configuration
 -----------------------------


@@ -137,14 +137,12 @@ toolkit. You must do this by running configure with either of:
 
         --with-gtk               Use the GIMP ToolKit (GTK)
        
 
         --with-gtk               Use the GIMP ToolKit (GTK)
        

-       --with-qt                Use Qt from TrollTec
-       

        --with-motif             Use either Motif or Lesstif
                                 Configure will look for both. 
 
 The following options handle the kind of library you want to build.
 
        --with-motif             Use either Motif or Lesstif
                                 Configure will look for both. 
 
 The following options handle the kind of library you want to build.
 

-       --without-threads       Compile without thread support.
+       --with-threads          Compile without thread support.

 
        --without-shared        Do not create shared libraries.
 
 
        --without-shared        Do not create shared libraries.
 


@@ -154,7 +152,6 @@ The following options handle the kind of library you want to build.
                                files. Currently broken, I think.
                                
        --with-mem_tracing      Add built-in memory tracing. 
                                files. Currently broken, I think.
                                
        --with-mem_tracing      Add built-in memory tracing. 

-                               This doesn't work well with gcc.

                                
        --with-dmalloc          Use the dmalloc memory debugger.
                                Read more at www.letters.com/dmalloc/
                                
        --with-dmalloc          Use the dmalloc memory debugger.
                                Read more at www.letters.com/dmalloc/


@@ -180,14 +177,14 @@ options (in contrast to what configure tells you).
 The following must be done in the base directory (e.g. ~/wxGTK
 or ~/wxWin or whatever)
 
 The following must be done in the base directory (e.g. ~/wxGTK
 or ~/wxWin or whatever)
 

-Now the makefiles are created and you can compile everything 
-by typing:
+Now the makefiles are created (by configure) and you can compile 
+the library by typing:

 
        make
 
 
        make
 

-make yourself some coffee, as it will try to compile ALL the 
-files in this distribution. During compilation, you'll get
-a few warning messages.
+make yourself some coffee, as it will take some time. On an old
+386SX possibly week. During compilation, you'll get a few 
+warning messages.

 
 if you want to be more selective:
 
 
 if you want to be more selective:
 


@@ -215,6 +212,7 @@ The "global" binaries and libraries will be placed in:
        (basedir of that application)/$(OSTYPE).
 
 This is also the place where all the object-files will go.
        (basedir of that application)/$(OSTYPE).
 
 This is also the place where all the object-files will go.

+(Currently there arent any global binaries).

 
 If you want to conserve disk space by removing unnecessary
 object-files:
 
 If you want to conserve disk space by removing unnecessary
 object-files:

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 9c48b90956c9c0700a471d33efa94999a8c823b6..bd5f8134ea1c3620bc4a26519a2f4c4ecd92526c 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,18 +1,37 @@
 
 

-  Welcome to wxWindows for GTK 1.0,
+  Welcome to wxWindows/Gtk 2.01,

   
   

-you have downloaded the first beta version of the upcoming
-release 2.0 of the GTK+ 1.0 port of wxWindows library.
+you have downloaded version 2.01 of the GTK+ 1.0 port of 
+the wxWindows GUI library.

  
  

+More information is available from my homepage at:
+
+  http://wesley.informatik.uni-freiburg.de/~wxxt
+  
+and about the wxWindows project as a whole (and the
+Windows and Motif ports in particular) can be found
+at Julian Smart's homepage at:
+
+  http://web.ukonline.co.uk/julian.smart/wxwin
+  

 Information on how to install can be found in the file 
 INSTALL.txt, but if you cannot wait, this should work on
 all systems
 
 Information on how to install can be found in the file 
 INSTALL.txt, but if you cannot wait, this should work on
 all systems
 

-configure
+./configure

 make
 make

-su (PASSWORD)

 make install
 make install

-ldconfig
+
+Type the following to make the samples
+
+make samples
+
+To start the samples, change into the directory that
+corresponds to the sample and your system, e.g on a
+linux-gnu machine the minimal sample would get started
+from the wxWindows base dir with
+
+./samples/minimal/linux-gnu/minimal

 
 When you run into problems, please read the INSTALL.txt and
 follow those instructions. If you still don't have any success,
 
 When you run into problems, please read the INSTALL.txt and
 follow those instructions. If you still don't have any success,


@@ -22,24 +41,14 @@ YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT
 DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know 
 this has no effect, but I tried...
 
 DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know 
 this has no effect, but I tried...
 

-This is the beta release which means that we have a feature
-freeze. We'll move up to version 2.0 rather soon and from then
-on there will be no more binary incompatible changes. We might
-add more classes, but none that would alter the behaviour of
-the existing ones. The library produced by the install process
-of the final version will be called libwx_gtk_1_0.a (static)
-and libwx_gtk_1_0.so.2.0.0 (shared) so that once a version
-of wxWindows/Gtk for GTK 1.2 comes out we'll change the name
-of the library to avoid linking problems.
+The library produced by the install process will be called 
+libwx_gtk2.a (static) and libwx_gtk2.so.0.1 (shared) so that 
+once a binary incompatible version of wxWindows/Gtk comes out 
+we'll augment library version number to avoid linking problems.

 
 

-More information is available from my homepage at
-
-  http://wesley.informatik.uni-freiburg.de/~wxxt
-  

 Please send problems concerning installation, feature requests, 
 Please send problems concerning installation, feature requests, 

-bug reports or comments to either the wxGTK mailing list or to
-the wxWindows developers list. Information on how to subscribe
-is available from my homepage.
+bug reports or comments to the wxWindows users Information on 
+how to subscribe is available from my homepage.

 
 wxWindows/Gtk doesn't come with any guarantee whatsoever. It might 
 crash your harddisk or destroy your monitor. It doesn't claim to be
 
 wxWindows/Gtk doesn't come with any guarantee whatsoever. It might 
 crash your harddisk or destroy your monitor. It doesn't claim to be

diff --git a/samples/bombs/bombs.cpp b/samples/bombs/bombs.cpp
index 856278e0fdf7b70cc89ffbf2a07eabfe3b0eab67..0494fc7f8dfdcc35b38ca2d02043f03b22d9e452 100644 (file)
--- a/samples/bombs/bombs.cpp
+++ b/samples/bombs/bombs.cpp
@@ -79,9 +79,9 @@ BombsFrameClass::BombsFrameClass(wxFrame *parent, const wxString& title, const w
   wxMenu *menu2 = new wxMenu;
   menu2->Append(IDM_RESTART, "&Restart"); // , "Clear the play field");
   menu2->AppendSeparator();
   wxMenu *menu2 = new wxMenu;
   menu2->Append(IDM_RESTART, "&Restart"); // , "Clear the play field");
   menu2->AppendSeparator();

-  menu2->Append(IDM_EASY, "&Easy", NULL, TRUE); // "10x10 play field", TRUE);
-  menu2->Append(IDM_MEDIUM, "&Medium", NULL, TRUE); // "15x15 play field", TRUE);
-  menu2->Append(IDM_DIFFICULT, "&Difficult", NULL, TRUE); // "25x20 play field", TRUE);
+  menu2->Append(IDM_EASY, "&Easy", (char*)NULL, TRUE); // "10x10 play field", TRUE);
+  menu2->Append(IDM_MEDIUM, "&Medium", (char*)NULL, TRUE); // "15x15 play field", TRUE);
+  menu2->Append(IDM_DIFFICULT, "&Difficult", (char*)NULL, TRUE); // "25x20 play field", TRUE);

   menuBar1->Append(menu2, "&Game");
   SetMenuBar(menuBar1);
   menuBar=menuBar1;
   menuBar1->Append(menu2, "&Game");
   SetMenuBar(menuBar1);
   menuBar=menuBar1;

diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index fb5e94fb8f781c2d3af8202507f7cbf2d1f2dfa6..44843a918e5bc1ca4aa326983599b0c1c1aa7614 100644 (file)
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -42,6 +42,7 @@
 #include "wx/window.h"
 #include "wx/utils.h"
 #include "wx/list.h"
 #include "wx/window.h"
 #include "wx/utils.h"
 #include "wx/list.h"

+#include "wx/debug.h"

 #include "wx/prop.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
 #include "wx/prop.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)


@@ -548,6 +549,8 @@ void wxPropertyValue::WritePropertyType(ostream& stream)    // Write as any othe
     }
     case wxPropertyValueStringPtr:
     {
     }
     case wxPropertyValueStringPtr:
     {

+      wxFAIL_MSG( "wxPropertyValue::WritePropertyType( wxPropertyValueStringPtr ) not implemented" );
+      /*

       int i;
       int len = strlen(*(m_value.stringPtr));
       for (i = 0; i < len; i++)
       int i;
       int len = strlen(*(m_value.stringPtr));
       for (i = 0; i < len; i++)


@@ -555,6 +558,7 @@ void wxPropertyValue::WritePropertyType(ostream& stream)    // Write as any othe
         char ch = *(m_value.stringPtr)[i];
 
       }
         char ch = *(m_value.stringPtr)[i];
 
       }

+      */

       break;
     }
     case wxPropertyValueList:
       break;
     }
     case wxPropertyValueList:


@@ -828,7 +832,7 @@ wxProperty::wxProperty(wxString nm, wxString role, wxPropertyValidator *ed):m_na
 }
 
 wxProperty::wxProperty(wxString nm, const wxPropertyValue& val, wxString role, wxPropertyValidator *ed):
 }
 
 wxProperty::wxProperty(wxString nm, const wxPropertyValue& val, wxString role, wxPropertyValidator *ed):

-  m_name(nm), m_value(val), m_propertyRole(role)
+  m_value(val), m_name(nm), m_propertyRole(role)

 {
   m_propertyValidator = ed;
   m_propertyWindow = NULL;
 {
   m_propertyValidator = ed;
   m_propertyWindow = NULL;


@@ -1032,7 +1036,7 @@ void wxPropertyValidatorRegistry::ClearRegistry(void)
 {
   BeginFind();
   wxNode *node;
 {
   BeginFind();
   wxNode *node;

-  while (node = Next())
+  while ((node = Next()))

   {
     delete (wxPropertyValidator *)node->Data();
   }
   {
     delete (wxPropertyValidator *)node->Data();
   }

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index 52b80b5c213d7ed482acce2aeaa6bc99b5c98ed8..9b32d02c00681e496e171ab42c90e99e28d1b36c 100644 (file)
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -168,7 +168,9 @@ bool wxPropertyListView::UpdatePropertyDisplayInList(wxProperty *property)
   if (!m_propertyScrollingList || !m_propertySheet)
     return FALSE;
 
   if (!m_propertyScrollingList || !m_propertySheet)
     return FALSE;
 

+#ifdef __WXMSW__

   int currentlySelected = m_propertyScrollingList->GetSelection();
   int currentlySelected = m_propertyScrollingList->GetSelection();

+#endif

 // #ifdef __WXMSW__
   wxString stringValueRepr(property->GetValue().GetStringRepresentation());
   wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
 // #ifdef __WXMSW__
   wxString stringValueRepr(property->GetValue().GetStringRepresentation());
   wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));


@@ -425,8 +427,10 @@ bool wxPropertyListView::CreateControls(void)
     return FALSE;
 
   wxWindow *leftMostWindow = panel;
     return FALSE;
 
   wxWindow *leftMostWindow = panel;

+/*

   wxWindow *topMostWindow = panel;
   wxWindow *rightMostWindow = panel;
   wxWindow *topMostWindow = panel;
   wxWindow *rightMostWindow = panel;

+*/

 
   wxSystemSettings settings;
   wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
   wxSystemSettings settings;
   wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);


@@ -836,7 +840,7 @@ void wxPropertyListDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     this->Close();
 }
 
     this->Close();
 }
 

-void wxPropertyListDialog::OnDefaultAction(wxControl *item)
+void wxPropertyListDialog::OnDefaultAction(wxControl *WXUNUSED(item))

 {
 /*
   if (item == m_view->GetPropertyScrollingList())
 {
 /*
   if (item == m_view->GetPropertyScrollingList())


@@ -867,7 +871,7 @@ wxPropertyListPanel::~wxPropertyListPanel()
 {
 }
 
 {
 }
 

-void wxPropertyListPanel::OnDefaultAction(wxControl *item)
+void wxPropertyListPanel::OnDefaultAction(wxControl *WXUNUSED(item))

 {
 /*
   if (item == view->GetPropertyScrollingList())
 {
 /*
   if (item == view->GetPropertyScrollingList())


@@ -943,7 +947,7 @@ bool wxPropertyListValidator::OnSelect(bool select, wxProperty *property, wxProp
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   wxString s(view->GetValueList()->GetStringSelection());
   if (s != "")
 {
   wxString s(view->GetValueList()->GetStringSelection());
   if (s != "")


@@ -954,7 +958,7 @@ bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxProperty
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxPropertyListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxPropertyListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
 //  view->GetValueText()->Show(TRUE);
   wxString str(property->GetValue().GetStringRepresentation());
 {
 //  view->GetValueText()->Show(TRUE);
   wxString str(property->GetValue().GetStringRepresentation());


@@ -966,14 +970,14 @@ bool wxPropertyListValidator::OnDisplayValue(wxProperty *property, wxPropertyLis
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxPropertyListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxPropertyListValidator::OnRetrieveValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
   return FALSE;
 }
 
 {
   if (!view->GetValueText())
     return FALSE;
   return FALSE;
 }
 

-void wxPropertyListValidator::OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+void wxPropertyListValidator::OnEdit(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetDetailedEditing())
     view->EndDetailedEditing();
 {
   if (view->GetDetailedEditing())
     view->EndDetailedEditing();


@@ -981,7 +985,7 @@ void wxPropertyListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
     view->BeginDetailedEditing();
 }
 
     view->BeginDetailedEditing();
 }
 

-bool wxPropertyListValidator::OnClearControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxPropertyListValidator::OnClearControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(FALSE);
 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(FALSE);


@@ -1001,7 +1005,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxRealListValidator, wxPropertyListValidator)
 ///
 /// Real number validator
 /// 
 ///
 /// Real number validator
 /// 

-bool wxRealListValidator::OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxRealListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)

 {
   if (m_realMin == 0.0 && m_realMax == 0.0)
     return TRUE;
 {
   if (m_realMin == 0.0 && m_realMax == 0.0)
     return TRUE;


@@ -1032,7 +1036,7 @@ bool wxRealListValidator::OnCheckValue(wxProperty *property, wxPropertyListView
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxRealListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxRealListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1046,7 +1050,7 @@ bool wxRealListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListVi
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxRealListValidator::OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxRealListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(TRUE);
 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(TRUE);


@@ -1064,7 +1068,7 @@ bool wxRealListValidator::OnPrepareControls(wxProperty *property, wxPropertyList
 /// 
 IMPLEMENT_DYNAMIC_CLASS(wxIntegerListValidator, wxPropertyListValidator)
 
 /// 
 IMPLEMENT_DYNAMIC_CLASS(wxIntegerListValidator, wxPropertyListValidator)
 

-bool wxIntegerListValidator::OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxIntegerListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)

 {
   if (m_integerMin == 0 && m_integerMax == 0)
     return TRUE;
 {
   if (m_integerMin == 0 && m_integerMax == 0)
     return TRUE;


@@ -1094,7 +1098,7 @@ bool wxIntegerListValidator::OnCheckValue(wxProperty *property, wxPropertyListVi
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxIntegerListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxIntegerListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1108,7 +1112,7 @@ bool wxIntegerListValidator::OnRetrieveValue(wxProperty *property, wxPropertyLis
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxIntegerListValidator::OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxIntegerListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(TRUE);
 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(TRUE);


@@ -1126,7 +1130,7 @@ bool wxIntegerListValidator::OnPrepareControls(wxProperty *property, wxPropertyL
 ///
 IMPLEMENT_DYNAMIC_CLASS(wxBoolListValidator, wxPropertyListValidator)
 
 ///
 IMPLEMENT_DYNAMIC_CLASS(wxBoolListValidator, wxPropertyListValidator)
 

-bool wxBoolListValidator::OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxBoolListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1142,7 +1146,7 @@ bool wxBoolListValidator::OnCheckValue(wxProperty *property, wxPropertyListView
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1160,7 +1164,7 @@ bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListVi
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxBoolListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxBoolListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1175,7 +1179,7 @@ bool wxBoolListValidator::OnDisplayValue(wxProperty *property, wxPropertyListVie
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxBoolListValidator::OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxBoolListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(FALSE);
 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(FALSE);


@@ -1188,7 +1192,7 @@ bool wxBoolListValidator::OnPrepareControls(wxProperty *property, wxPropertyList
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetValueList())
   {
 {
   if (view->GetValueList())
   {


@@ -1204,7 +1208,7 @@ bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *property, wxProper
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxBoolListValidator::OnClearDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxBoolListValidator::OnClearDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetValueList())
   {
 {
   if (view->GetValueList())
   {


@@ -1217,7 +1221,7 @@ bool wxBoolListValidator::OnClearDetailControls(wxProperty *property, wxProperty
 
 // Called when the property is double clicked. Extra functionality can be provided,
 // cycling through possible values.
 
 // Called when the property is double clicked. Extra functionality can be provided,
 // cycling through possible values.

-bool wxBoolListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxBoolListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1245,7 +1249,7 @@ wxStringListValidator::wxStringListValidator(wxStringList *list, long flags):
     m_validatorFlags |= wxPROP_ALLOW_TEXT_EDITING;
 }
 
     m_validatorFlags |= wxPROP_ALLOW_TEXT_EDITING;
 }
 

-bool wxStringListValidator::OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxStringListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *parentWindow)

 {
   if (!m_strings)
     return TRUE;
 {
   if (!m_strings)
     return TRUE;


@@ -1268,7 +1272,7 @@ bool wxStringListValidator::OnCheckValue(wxProperty *property, wxPropertyListVie
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxStringListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxStringListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1280,7 +1284,7 @@ bool wxStringListValidator::OnRetrieveValue(wxProperty *property, wxPropertyList
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1293,7 +1297,7 @@ bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListV
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxStringListValidator::OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxStringListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   // Unconstrained
   if (!m_strings)
 {
   // Unconstrained
   if (!m_strings)


@@ -1323,7 +1327,7 @@ bool wxStringListValidator::OnPrepareControls(wxProperty *property, wxPropertyLi
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxStringListValidator::OnPrepareDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxStringListValidator::OnPrepareDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetValueList())
   {
 {
   if (view->GetValueList())
   {


@@ -1342,7 +1346,7 @@ bool wxStringListValidator::OnPrepareDetailControls(wxProperty *property, wxProp
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxStringListValidator::OnClearDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxStringListValidator::OnClearDetailControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!m_strings)
   {
 {
   if (!m_strings)
   {


@@ -1360,7 +1364,7 @@ bool wxStringListValidator::OnClearDetailControls(wxProperty *property, wxProper
 
 // Called when the property is double clicked. Extra functionality can be provided,
 // cycling through possible values.
 
 // Called when the property is double clicked. Extra functionality can be provided,
 // cycling through possible values.

-bool wxStringListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxStringListValidator::OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1404,7 +1408,7 @@ wxFilenameListValidator::~wxFilenameListValidator(void)
 {
 }
 
 {
 }
 

-bool wxFilenameListValidator::OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxFilenameListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))

 {
   return TRUE;
 }
 {
   return TRUE;
 }


@@ -1412,7 +1416,7 @@ bool wxFilenameListValidator::OnCheckValue(wxProperty *property, wxPropertyListV
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxFilenameListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxFilenameListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1424,7 +1428,7 @@ bool wxFilenameListValidator::OnRetrieveValue(wxProperty *property, wxPropertyLi
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxFilenameListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxFilenameListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1443,7 +1447,7 @@ bool wxFilenameListValidator::OnDoubleClick(wxProperty *property, wxPropertyList
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxFilenameListValidator::OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxFilenameListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(TRUE);
 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(TRUE);


@@ -1492,7 +1496,7 @@ wxColourListValidator::~wxColourListValidator(void)
 {
 }
 
 {
 }
 

-bool wxColourListValidator::OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxColourListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))

 {
   return TRUE;
 }
 {
   return TRUE;
 }


@@ -1500,7 +1504,7 @@ bool wxColourListValidator::OnCheckValue(wxProperty *property, wxPropertyListVie
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxColourListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxColourListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1513,7 +1517,7 @@ bool wxColourListValidator::OnRetrieveValue(wxProperty *property, wxPropertyList
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself
 // Called when TICK is pressed or focus is lost or view wants to update
 // the property list.
 // Does the transferance from the property editing area to the property itself

-bool wxColourListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxColourListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1532,7 +1536,7 @@ bool wxColourListValidator::OnDoubleClick(wxProperty *property, wxPropertyListVi
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxColourListValidator::OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxColourListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(TRUE);
 {
   if (view->GetConfirmButton())
     view->GetConfirmButton()->Enable(TRUE);


@@ -1602,7 +1606,7 @@ wxListOfStringsListValidator::wxListOfStringsListValidator(long flags):
 {
 }
 
 {
 }
 

-bool wxListOfStringsListValidator::OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxListOfStringsListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))

 {
   // No constraints for an arbitrary, user-editable list of strings.
   return TRUE;
 {
   // No constraints for an arbitrary, user-editable list of strings.
   return TRUE;


@@ -1612,12 +1616,12 @@ bool wxListOfStringsListValidator::OnCheckValue(wxProperty *property, wxProperty
 // the property list.
 // Does the transferance from the property editing area to the property itself.
 // In this case, the user cannot directly edit the string list.
 // the property list.
 // Does the transferance from the property editing area to the property itself.
 // In this case, the user cannot directly edit the string list.

-bool wxListOfStringsListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxListOfStringsListValidator::OnRetrieveValue(wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow))

 {
   return TRUE;
 }
 
 {
   return TRUE;
 }
 

-bool wxListOfStringsListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxListOfStringsListValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (!view->GetValueText())
     return FALSE;
 {
   if (!view->GetValueText())
     return FALSE;


@@ -1626,7 +1630,7 @@ bool wxListOfStringsListValidator::OnDisplayValue(wxProperty *property, wxProper
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxListOfStringsListValidator::OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxListOfStringsListValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))

 {
   if (view->GetEditButton())
     view->GetEditButton()->Enable(TRUE);
 {
   if (view->GetEditButton())
     view->GetEditButton()->Enable(TRUE);

diff --git a/src/gtk.inc b/src/gtk.inc
index 149019108e760bcdfa7b73c8acd411e32feddd9c..f0179c8f59b6527292bca92d04a35a3acf778f5c 100644 (file)
--- a/src/gtk.inc
+++ b/src/gtk.inc
@@ -2,9 +2,9 @@
 NONE =
 
 # define library name
 NONE =
 
 # define library name

-LIB_TARGET=wx_gtk_1_0
-LIB_MAJOR=1
-LIB_MINOR=99
+LIB_TARGET=wx_gtk2
+LIB_MAJOR=0
+LIB_MINOR=1

 
 # define library sources
 
 
 # define library sources
 


@@ -133,6 +133,9 @@ LIB_CPP_SRC=\
  generic/panelg.cpp \
  generic/printps.cpp \
  generic/prntdlgg.cpp \
  generic/panelg.cpp \
  generic/printps.cpp \
  generic/prntdlgg.cpp \

+ generic/prop.cpp \
+ generic/propform.cpp \
+ generic/proplist.cpp \

  generic/sashwin.cpp \
  generic/scrolwin.cpp \
  generic/splitter.cpp \
  generic/sashwin.cpp \
  generic/scrolwin.cpp \
  generic/splitter.cpp \

diff --git a/src/make.env b/src/make.env
index 944038e5aead26b361866d9f4ed9fc1e4e367173..73fac0fcda6d1c07e0f705d9c696520ff994dcb6 100644 (file)
--- a/src/make.env
+++ b/src/make.env
@@ -104,7 +104,7 @@ motif:
        make -f makefile.unx all GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm'
 
 gtk:
        make -f makefile.unx all GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm'
 
 gtk:

-       make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lX11 -lm -pthread'
+       make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lX11 -lm -pthread'

 
 cleanstubs:
        make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
 
 cleanstubs:
        make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'

diff --git a/src/motif.inc b/src/motif.inc
index e42e5fa91e57443ee8cde8c8c668c4dcc19f689a..7230b8c036324fa927db6e8e9adf1f268b58a18c 100644 (file)
--- a/src/motif.inc
+++ b/src/motif.inc
@@ -2,7 +2,7 @@
 NONE =
 
 # define library name
 NONE =
 
 # define library name

-LIB_TARGET=wx_motif
+LIB_TARGET=wx_motif2

 LIB_MAJOR=0
 LIB_MINOR=1
 
 LIB_MAJOR=0
 LIB_MINOR=1
 


@@ -141,6 +141,9 @@ LIB_CPP_SRC=\
  generic/panelg.cpp \
  generic/printps.cpp \
  generic/prntdlgg.cpp \
  generic/panelg.cpp \
  generic/printps.cpp \
  generic/prntdlgg.cpp \

+ generic/prop.cpp \
+ generic/propform.cpp \
+ generic/proplist.cpp \

  generic/sashwin.cpp \
  generic/scrolwin.cpp \
  generic/splitter.cpp \
  generic/sashwin.cpp \
  generic/scrolwin.cpp \
  generic/splitter.cpp \

diff --git a/wx-config.in b/wx-config.in
index a960ca8945fce111cd3ed273c02a173bfea3bdda..a3ad5a6e1f319a3671b91f952af66f17c81ff3c5 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -36,7 +36,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
       echo $exec_prefix
       ;;
     --version)

-      echo 1.99
+      echo 2.01

       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then
       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then


@@ -47,7 +47,7 @@ while test $# -gt 0; do
 
       ;;
     --libs)
 
       ;;
     --libs)

-      echo -L@libdir@ -lwx_gtk_1_0 @DL_LIBRARY@ @GUI_TK_LIBRARY@ @THREADS_LINK@ @EXTRA_LINK@
+      echo -L@libdir@ -lwx_gtk2 @DL_LIBRARY@ @GUI_TK_LIBRARY@ @THREADS_LINK@ @EXTRA_LINK@

       ;;
     *)
       echo "${usage}" 1>&2
       ;;
     *)
       echo "${usage}" 1>&2