X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4afd752902ae7c44f4b3dc2edb11d7c24f95ed54..b49576e07725d578c231fdd09243d9edb0eab701:/src/msw/radiobox.cpp

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 20ce47a197..fe2d803e2c 100644
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -38,14 +38,15 @@
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS
+
+#ifndef __GNUWIN32__
     #include <commctrl.h>
+#endif
 
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-#endif
 
 // 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.
@@ -54,7 +55,15 @@
 //     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.
+
+// For some reason, the background colour is set wrongly in WIN16 mode
+// if we use the new method.
+
+#ifdef __WIN16__
+#define RADIOBTN_PARENT_IS_RADIOBOX 0
+#else
 #define RADIOBTN_PARENT_IS_RADIOBOX 1
+#endif
 
 // ---------------------------------------------------------------------------
 // private functions
@@ -748,7 +757,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
 
         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;