Fixed "Failed to set clipboard data. (error 1418: thread does not have

[wxWidgets.git] / src / univ / themes / win32.cpp

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 037c9cd2cc6e8f15b7736fa186cd42c61eaa1a2b..349c3f088eafa740da07c1dadf63ea036199a456 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -255,6 +255,7 @@ public:
                                    const wxMenuGeometryInfo& geomInfo);
 #endif
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,
                                    const wxMenuGeometryInfo& geomInfo);
 #endif
     virtual void GetComboBitmaps(wxBitmap *bmpNormal,

+                                 wxBitmap *bmpFocus,

                                  wxBitmap *bmpPressed,
                                  wxBitmap *bmpDisabled);
 
                                  wxBitmap *bmpPressed,
                                  wxBitmap *bmpDisabled);
 


@@ -1089,8 +1090,6 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
 {
     switch ( col )
     {
 {
     switch ( col )
     {

-        case WINDOW:            return *wxWHITE;
-

         // use the system colours under Windows
 #if defined(__WXMSW__)
         case WINDOW:            return wxColour(GetSysColor(COLOR_WINDOW));
         // use the system colours under Windows
 #if defined(__WXMSW__)
         case WINDOW:            return wxColour(GetSysColor(COLOR_WINDOW));


@@ -1122,6 +1121,8 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
         case SHADOW_OUT:        return wxColour(GetSysColor(COLOR_BTNSHADOW));
 #else // !__WXMSW__
         // use the standard Windows colours elsewhere
         case SHADOW_OUT:        return wxColour(GetSysColor(COLOR_BTNSHADOW));
 #else // !__WXMSW__
         // use the standard Windows colours elsewhere

+        case WINDOW:            return *wxWHITE;
+

         case CONTROL_PRESSED:
         case CONTROL_CURRENT:
         case CONTROL:           return wxColour(0xc0c0c0);
         case CONTROL_PRESSED:
         case CONTROL_CURRENT:
         case CONTROL:           return wxColour(0xc0c0c0);


@@ -2759,6 +2760,7 @@ wxWin32Renderer::GetMenuGeometry(wxWindow *WXUNUSED(win),
 // ----------------------------------------------------------------------------
 
 void wxWin32Renderer::GetComboBitmaps(wxBitmap *bmpNormal,
 // ----------------------------------------------------------------------------
 
 void wxWin32Renderer::GetComboBitmaps(wxBitmap *bmpNormal,

+                                      wxBitmap *bmpFocus,

                                       wxBitmap *bmpPressed,
                                       wxBitmap *bmpDisabled)
 {
                                       wxBitmap *bmpPressed,
                                       wxBitmap *bmpDisabled)
 {


@@ -3008,19 +3010,17 @@ void wxWin32Renderer::AdjustSize(wxSize *size, const wxWindow *window)
 #if wxUSE_BUTTON
     if ( wxDynamicCast(window, wxButton) )
     {
 #if wxUSE_BUTTON
     if ( wxDynamicCast(window, wxButton) )
     {

-        // TODO
-        size->x += 3*window->GetCharWidth();
-#if 0 // do allow creating small buttons if wanted
-        wxSize sizeDef = wxButton::GetDefaultSize();
-        if ( size->x < sizeDef.x )
-            size->x = sizeDef.x;
-#endif // 0
-
-        wxCoord heightBtn = (11*(window->GetCharHeight() + 8))/10;
-        if ( size->y < heightBtn - 8 )
-            size->y = heightBtn;
-        else
-            size->y += 9;
+        if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) )
+        {
+            // TODO: don't harcode all this
+            size->x += 3*window->GetCharWidth();
+
+            wxCoord heightBtn = (11*(window->GetCharHeight() + 8))/10;
+            if ( size->y < heightBtn - 8 )
+                size->y = heightBtn;
+            else
+                size->y += 9;
+        }

 
         // no border width adjustments for buttons
         return;
 
         // no border width adjustments for buttons
         return;