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

2. fixed the mask code in wxBitmap(const wxIcon&) - now it really works (Win32)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/control.h

@@ -73,7 +73,18 @@ protected:
 
    // create the control of the given class with the given style, returns FALSE
    // if creation failed
-   bool MSWCreateControl(const wxChar *classname, WXDWORD style);
+   //
+   // All parameters except classname and style are optional, if the
+   // size/position are not given, they should be set later with SetSize() and,
+   // label (the title of the window), of course, is left empty. The extended
+   // style is determined from the style and the app 3D settings automatically
+   // if it's not specified explicitly.
+   bool MSWCreateControl(const wxChar *classname,
+                         WXDWORD style,
+                         const wxPoint& pos = wxDefaultPosition,
+                         const wxSize& size = wxDefaultSize,
+                         const wxString& label = wxEmptyString,
+                         WXDWORD exstyle = (WXDWORD)-1);
 
    // determine the extended styles combination for this window (may slightly
    // modify style parameter, this is why it's non const)

include/wx/msw/statbox.h

@@ -6,14 +6,14 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
 #ifdef __GNUG__
-#pragma interface "statbox.h"
+    #pragma interface "statbox.h"
 #endif
 
 #include "wx/control.h"
@@ -48,8 +48,6 @@ public:
     // implementation from now on
     // --------------------------
 
-    void OnEraseBackground(wxEraseEvent& event);
-
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
@@ -60,9 +58,6 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize();
-
-private:
-    DECLARE_EVENT_TABLE()
 };
 
 #endif