added some utils (tex2rtf, helpgen, makegen) to make system

[wxWidgets.git] / src / msw / radiobox.cpp

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 7aaff04b2115c30fcf529255681d009d98873d8f..a7e5101893eaa2c9ed5752282edc14e1b6706c44 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -56,7 +56,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 //     reason to revert to the backward compatible behaviour - but I still
 //     leave this possibility just in case.
 
 //     reason to revert to the backward compatible behaviour - but I still
 //     leave this possibility just in case.
 

-#define RADIOBTN_PARENT_IS_RADIOBOX 1
+#define RADIOBTN_PARENT_IS_RADIOBOX 0

 
 // ---------------------------------------------------------------------------
 // private functions
 
 // ---------------------------------------------------------------------------
 // private functions


@@ -156,7 +156,7 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
     delete choices2;
 }
 
     delete choices2;
 }
 

-#endif
+#endif // WXWIN_COMPATIBILITY

 
 // Radio box item
 wxRadioBox::wxRadioBox()
 
 // Radio box item
 wxRadioBox::wxRadioBox()


@@ -194,7 +194,8 @@ bool wxRadioBox::Create(wxWindow *parent,
         return FALSE;
 
     // create the static box
         return FALSE;
 
     // create the static box

-    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, title, 0) )
+    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX | WS_GROUP,
+                           pos, size, title, 0) )

         return FALSE;
 
     // and now create the buttons
         return FALSE;
 
     // and now create the buttons


@@ -712,6 +713,7 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
     switch ( nMsg )
     {
 {
     switch ( nMsg )
     {

+#ifndef __WIN16__

         case WM_CTLCOLORSTATIC:
             // set the colour of the radio buttons to be the same as ours
             {
         case WM_CTLCOLORSTATIC:
             // set the colour of the radio buttons to be the same as ours
             {


@@ -725,6 +727,7 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
                 return (WXHBRUSH)brush->GetResourceHandle();
             }
 
                 return (WXHBRUSH)brush->GetResourceHandle();
             }

+#endif

 
         // This is required for the radiobox to be sensitive to mouse input,
         // e.g. for Dialog Editor.
 
         // This is required for the radiobox to be sensitive to mouse input,
         // e.g. for Dialog Editor.