1. fixed wxStaticBox background erasing (or, rather, restored the old bug)

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index c22387c146c932fd2c23b2de7cb5f427bde22341..9b809e110e5deff9923788221fda6ed91d4bcfcc 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -87,17 +87,17 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
     // on what we have here
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
     // on what we have here

-    const wxChar *classname = _T("STATIC");
+    const wxChar *classname = wxT("STATIC");

     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16
     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16

-    const wxChar *classname = _T("BUTTON");
+    const wxChar *classname = wxT("BUTTON");

     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,

-                        _T(""),
+                        wxT(""),

                         winstyle | WS_CHILD | WS_VISIBLE,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
                         winstyle | WS_CHILD | WS_VISIBLE,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),


@@ -106,7 +106,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                         NULL
                        );
 
                         NULL
                        );
 

-    wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create static bitmap") );
+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );

 
     SetBitmap(bitmap);
 
 
     SetBitmap(bitmap);
 


@@ -140,39 +140,11 @@ void wxStaticBitmap::Free()
     m_image.icon = NULL;
 }
 
     m_image.icon = NULL;
 }
 

-void wxStaticBitmap::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+wxSize wxStaticBitmap::DoGetBestSize()

 {
 {

-    int currentX, currentY;
-    GetPosition(&currentX, &currentY);
-    int x1 = x;
-    int y1 = y;
-
-    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        x1 = currentX;
-    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        y1 = currentY;
-
-    AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-    int actualWidth = width;
-    int actualHeight = height;
-
-    int ww, hh;
-    GetSize(&ww, &hh);
-
-    // If we're prepared to use the existing width, then...
-    if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
-        actualWidth = ww;
-    else
-        actualWidth = width;
-
-    // If we're prepared to use the existing height, then...
-    if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
-        actualHeight = hh;
-    else
-        actualHeight = height;
-
-    MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
+    // reuse the current size (as wxWindow does) instead of using some
+    // arbitrary default size (as wxControl, our immediate base class, does)
+    return wxWindow::DoGetBestSize();

 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)


@@ -210,7 +182,11 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
         }
     }
 
         }
     }
 

-    RECT rect = { x, y, x + w, y + h };
+    RECT rect ;
+    rect.left   = x ;
+    rect.top    = y ;
+    rect.right  = x + w ;
+    rect.bottom = y + h ;

     InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
 }
 
     InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
 }