X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c832ef4985a506330691e11ac13240355ed7195b..65d8ef1e73ebb4906cb4a45acfb9e466413fd284:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 1beeb2b8d2..3a3b57b99c 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -78,14 +78,12 @@ bool wxControl::Create(wxWindow *parent,
 bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  const wxPoint& pos,
-                                 const wxSize& size,
-                                 long style,
-                                 bool visible)
+                                 const wxSize& size)
 {
     WXDWORD exstyle;
-    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+    WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), &exstyle);
 
-    return MSWCreateControl(classname, msStyle, pos, size, label, exstyle, visible);
+    return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
 }
 
 bool wxControl::MSWCreateControl(const wxChar *classname,
@@ -93,8 +91,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxPoint& pos,
                                  const wxSize& size,
                                  const wxString& label,
-                                 WXDWORD exstyle,
-                                 bool visible)
+                                 WXDWORD exstyle)
 {
     // want3D tells us whether or not the style specified a 3D border.
     // If so, under WIN16 we can use Ctl3D to give it an appropriate style.
@@ -108,17 +105,11 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         exstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
     }
 
-    // all controls should have these styles (wxWindows creates all controls
-    // visible by default)
+    // all controls should have this style
     style |= WS_CHILD;
-    
-    // sometimes, controls will defer showing the window until
-    // all configuration, sizing, and positioning is completed
-    if (!visible)
-    {
-        m_isShown = FALSE;
-    }
-     else
+
+    // create the control visible if it's currently shown for wxWindows
+    if ( m_isShown )
     {
         style |= WS_VISIBLE;
     }
@@ -164,7 +155,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     InheritAttributes();
 
     // set the size now if no initial size specified
-    if ( w == 0 || h == 0 )
+    if ( w <= 0 || h <= 0 )
     {
         SetBestSize(size);
     }