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 2767986d6a5b49a3d76b7b5373daf12874b1b54b..a7e5101893eaa2c9ed5752282edc14e1b6706c44 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -38,12 +38,15 @@
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS

+
+#ifndef __GNUWIN32__

     #include <commctrl.h>
     #include <commctrl.h>

+#endif

 
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
 
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 

-    IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

 
 // VZ: the new behaviour is to create the radio buttons as children of the
 //     radiobox instead of creating them as children of the radiobox' parent.
 
 // VZ: the new behaviour is to create the radio buttons as children of the
 //     radiobox instead of creating them as children of the radiobox' parent.


@@ -52,7 +55,8 @@
 //     and allows tooltips to work with radioboxes, so there should be no
 //     reason to revert to the backward compatible behaviour - but I still
 //     leave this possibility just in case.
 //     and allows tooltips to work with radioboxes, so there should be no
 //     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


@@ -152,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()


@@ -190,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


@@ -218,7 +223,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     {
         m_radioWidth[i] =
         m_radioHeight[i] = -1;
     {
         m_radioWidth[i] =
         m_radioHeight[i] = -1;

-        long styleBtn = BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE;
+        long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;

         if ( i == 0 && style == 0 )
             styleBtn |= WS_GROUP;
 
         if ( i == 0 && style == 0 )
             styleBtn |= WS_GROUP;
 


@@ -357,9 +362,9 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     int xx = x;
     int yy = y;
 
     int xx = x;
     int yy = y;
 

-    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         xx = currentX;
         xx = currentX;

-    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         yy = currentY;
 
 #if RADIOBTN_PARENT_IS_RADIOBOX
         yy = currentY;
 
 #if RADIOBTN_PARENT_IS_RADIOBOX


@@ -706,22 +711,43 @@ bool wxRadioBox::SetFont(const wxFont& font)
 
 long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 
 long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

-    // This is required for the radiobox to be sensitive to mouse input,
-    // e.g. for Dialog Editor.
-    if (nMsg == WM_NCHITTEST)
+    switch ( nMsg )

     {
     {

-        int xPos = LOWORD(lParam);  // horizontal position of cursor
-        int yPos = HIWORD(lParam);  // vertical position of cursor
+#ifndef __WIN16__
+        case WM_CTLCOLORSTATIC:
+            // set the colour of the radio buttons to be the same as ours
+            {
+                HDC hdc = (HDC)wParam;

 
 

-        ScreenToClient(&xPos, &yPos);
+                const wxColour& colBack = GetBackgroundColour();
+                ::SetBkColor(hdc, wxColourToRGB(colBack));
+                ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));

 
 

-        // Make sure you can drag by the top of the groupbox, but let
-        // other (enclosed) controls get mouse events also
-        if (yPos < 10)
-            return (long)HTCLIENT;
-    }
+                wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+
+                return (WXHBRUSH)brush->GetResourceHandle();
+            }
+#endif
+
+        // This is required for the radiobox to be sensitive to mouse input,
+        // e.g. for Dialog Editor.
+        case WM_NCHITTEST:
+            {
+                int xPos = LOWORD(lParam);  // horizontal position of cursor
+                int yPos = HIWORD(lParam);  // vertical position of cursor
+
+                ScreenToClient(&xPos, &yPos);

 
 

-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+                // Make sure you can drag by the top of the groupbox, but let
+                // other (enclosed) controls get mouse events also
+                if (yPos < 10)
+                    return (long)HTCLIENT;
+            }
+            // fall through
+
+        default:
+            return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+    }

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -746,7 +772,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
 
         wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
 
 
         wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
 

-#if wxUSE_TOOLTIPS
+#if wxUSE_TOOLTIPS && !defined(__GNUWIN32__)

         if ( msg == WM_NOTIFY )
         {
             NMHDR* hdr = (NMHDR *)lParam;
         if ( msg == WM_NOTIFY )
         {
             NMHDR* hdr = (NMHDR *)lParam;