1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 63869411c44db239f29f02948dfe2d0214187cd5..70451b15901fa726b1cde5b46a6ae4d7568dce4b 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "control.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -188,7 +184,11 @@ wxBorder wxControl::GetDefaultBorder() const
     // we want to automatically give controls a sunken style (confusingly,
     // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
     // which is not sunken at all under Windows XP -- rather, just the default)
     // we want to automatically give controls a sunken style (confusingly,
     // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
     // which is not sunken at all under Windows XP -- rather, just the default)

+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+    return wxBORDER_SIMPLE;
+#else

     return wxBORDER_SUNKEN;
     return wxBORDER_SUNKEN;

+#endif

 }
 
 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 }
 
 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const


@@ -328,7 +328,7 @@ bool wxControl::MSWOnNotify(int idCtrl,
 }
 #endif // Win95
 
 }
 #endif // Win95
 

-WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
+WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)

 {
     HDC hdc = (HDC)pDC;
     if ( m_hasFgCol )
 {
     HDC hdc = (HDC)pDC;
     if ( m_hasFgCol )


@@ -336,8 +336,19 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
         ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
     }
 
         ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
     }
 

+    WXHBRUSH hbr = 0;
+    if ( !colBg.Ok() )
+    {
+        hbr = MSWGetBgBrush(pDC, hWnd);
+
+        // if the control doesn't have any bg colour, foreground colour will be
+        // ignored as the return value would be 0 -- so forcefully give it a
+        // non default background brush in this case
+        if ( !hbr && m_hasFgCol )
+            colBg = GetBackgroundColour();
+    }
+

     // use the background colour override if a valid colour is given
     // use the background colour override if a valid colour is given

-    WXHBRUSH hbr;

     if ( colBg.Ok() )
     {
         ::SetBkColor(hdc, wxColourToRGB(colBg));
     if ( colBg.Ok() )
     {
         ::SetBkColor(hdc, wxColourToRGB(colBg));


@@ -346,29 +357,35 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
         wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
 
         hbr = (WXHBRUSH)brush->GetResourceHandle();
         wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
 
         hbr = (WXHBRUSH)brush->GetResourceHandle();

-    }
-    else // use our own background colour and recurse upwards if necessary
-    {
-        hbr = MSWGetBgBrush(pDC);
+
+        // if we use custom background, we should set foreground ourselves too
+        if ( !m_hasFgCol )
+        {
+            ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
+        }
+        //else: already set above

     }
 
     return hbr;
 }
 
     }
 
     return hbr;
 }
 

-WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)

 {
 {

-    // by default consider that the controls text shouldn't erase the
-    // background under it (this is true for all static controls, check boxes,
-    // radio buttons, ...)
-    ::SetBkMode((HDC)pDC, TRANSPARENT);
+    wxColour colBg;
+
+    if ( HasTransparentBackground() )
+        ::SetBkMode((HDC)pDC, TRANSPARENT);
+    else // if the control is opaque it shouldn't use the parents background
+        colBg = GetBackgroundColour();

 
 

-    return DoMSWControlColor(pDC, wxNullColour);
+    return DoMSWControlColor(pDC, colBg, hWnd);

 }
 
 WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
 {
     return DoMSWControlColor(pDC,
 }
 
 WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
 {
     return DoMSWControlColor(pDC,

-                             wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+                             wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE),
+                             GetHWND());

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