added wxUSE_NOTEBOOK to include/wx/msw/setup0.h, removed wxUSE_RADIOBUTTON (we

already have RADIOBTN)

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

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index d90ef467d108e02c426f6f71f316e3338a16bad8..6303aa2f2706b08ec641354eb288df222b8afd54 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -111,7 +111,7 @@
 /*
  * Use scrollbar item
  */
 /*
  * Use scrollbar item
  */

-#define wxUSE_RADIOBUTTON 1
+#define wxUSE_RADIOBTN 1

 /*
  * Use toolbar item
  */
 /*
  * Use toolbar item
  */

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index e4a18d95fba1d960e3b0f6a7c67030ebf1d327c0..c6de668c6127b9eb6dce7ec87211d1d728fbcdf2 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        setup.h
+// Name:        wx/msw/setup.h

 // Purpose:     Configuration for the library
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Configuration for the library
 // Author:      Julian Smart
 // Modified by:


@@ -23,12 +23,15 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
 // compatibility settings
 // ----------------------------------------------------------------------------
 

+// This setting determines the compatibility with 1.68 API:
+// Level 0: no backward compatibility, all new features
+// Level 1: some extra methods are defined for compatibility.
+//
+// Default is 0.
+//
+// Recommended setting: 0 (in fact the compatibility code is now very minimal
+// so there is little advantage to setting it to 1.

 #define WXWIN_COMPATIBILITY  0
 #define WXWIN_COMPATIBILITY  0

-                                // Compatibility with 1.68 API.
-                                // Level 0: no backward compatibility, all new features
-                                // Level 1: Some compatibility. In fact
-                                // the compatibility code is now very minimal so there
-                                // is little advantage to setting it to 1.

 
 // in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
 // but this is very dangerous because you can mistakenly pass an icon instead
 
 // in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
 // but this is very dangerous because you can mistakenly pass an icon instead


@@ -125,6 +128,38 @@
 #define wxUSE_TOOLBAR_NATIVE 1
 #define wxUSE_TOOLBAR_SIMPLE 1
 
 #define wxUSE_TOOLBAR_NATIVE 1
 #define wxUSE_TOOLBAR_SIMPLE 1
 

+// wxNotebook is a control with several "tabs" located on one of its sides. It
+// may be used ot logically organise the data presented to the user instead of
+// putting everything in one huge dialog. It replaces wxTabControl and related
+// classes of wxWin 1.6x.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_NOTEBOOK 1
+
+// The corresponding controls will be compiled in if wxUSE_<CONTROL> is set to
+// 1 and not compiled into the library otherwise.
+//
+// Default is 1 for everything.
+//
+// Recommended setting: 1 (library might fail to compile for some combinations
+// of disabled controls) 
+#define wxUSE_COMBOBOX     1
+#define wxUSE_CHOICE       1
+#define wxUSE_RADIOBTN     1
+#define wxUSE_RADIOBOX     1
+#define wxUSE_SCROLLBAR    1
+#define wxUSE_CHECKBOX     1
+#define wxUSE_LISTBOX      1
+#define wxUSE_SPINBTN      1
+#define wxUSE_SPINCTRL     1
+#define wxUSE_STATLINE     1
+#define wxUSE_CHECKLISTBOX 1
+#define wxUSE_CHOICE       1
+#define wxUSE_CARET        1
+#define wxUSE_SLIDER       1
+

 // ----------------------------------------------------------------------------
 // Postscript support settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Postscript support settings
 // ----------------------------------------------------------------------------


@@ -160,49 +195,6 @@
 #define wxUSE_GAUGE        1
                                 // Define 1 to use Microsoft's gauge (Windows)
                                 // or Bull's gauge (Motif) library (both in contrib).
 #define wxUSE_GAUGE        1
                                 // Define 1 to use Microsoft's gauge (Windows)
                                 // or Bull's gauge (Motif) library (both in contrib).

-#define wxUSE_COMBOBOX     1
-                                // Define 1 to use COMBOXBOX control (Windows)
-                                // or FWW's ComboBox widget (Motif).
-#define wxUSE_CHOICE       1
-                                // Define 1 to use CHOICE
-
-#define wxUSE_RADIOBUTTON  1
-                                // Define 1 to use radio button control
-#define wxUSE_RADIOBTN     1
-                                // Unfortunately someone introduced this one, too
-#define wxUSE_RADIOBOX     1
-                                // And this... don't know which one is corect
-
-#define wxUSE_SCROLLBAR    1
-                                // Define 1 to compile contributed wxScrollBar class
-
-#define wxUSE_CHECKBOX     1
-                                // Define 1 to compile checkbox
-
-#define wxUSE_LISTBOX      1
-                                // Define 1 to compile listbox
-
-#define wxUSE_SPINBTN      1
-                                // Define 1 to compile spin button
-
-#define wxUSE_SPINCTRL     1
-                                // Define 1 to use wxSpinCtrl class
-
-#define wxUSE_STATLINE     1
-                                // use wxStaticLine class
-
-#define wxUSE_CHECKLISTBOX 1
-                                // Define 1 to compile check listbox
-
-#define wxUSE_CHOICE       1
-                                // Define 1 to compile choice
-
-#define wxUSE_CARET        1
-                                // Define 1 to use wxCaret class
-
-#define wxUSE_SLIDER       1
-                                // Define 1 to use wxSlider class
-

 #define wxUSE_NEW_GRID     1
                                 // Define 1 to use the new wxGrid class
                                 // (still under development, define 0 to
 #define wxUSE_NEW_GRID     1
                                 // Define 1 to use the new wxGrid class
                                 // (still under development, define 0 to

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 60ed7b702552b9c003652541957cae85f8d70f90..25925b61339c43d19f3a9e06dcaffb76b3219587 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1217,14 +1217,14 @@ void wxWindowBase::UpdateWindowUI()
         }
 #endif // wxUSE_CHECKBOX
 
         }
 #endif // wxUSE_CHECKBOX
 

-#if wxUSE_RADIOBUTTON
+#if wxUSE_RADIOBTN

         wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton);
         if ( radiobtn )
         {
             if ( event.GetSetChecked() )
                 radiobtn->SetValue(event.GetChecked());
         }
         wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton);
         if ( radiobtn )
         {
             if ( event.GetSetChecked() )
                 radiobtn->SetValue(event.GetChecked());
         }

-#endif // wxUSE_RADIOBUTTON
+#endif // wxUSE_RADIOBTN

     }
 }
 
     }
 }