X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdf5c30deb87129df7fb8a1a782d2b20dba0a816..d8c65cf48881468f97798ac521fb93f9b8b5a293:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 6593d6eed1..3a3b57b99c 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -78,11 +78,10 @@ bool wxControl::Create(wxWindow *parent,
 bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  const wxPoint& pos,
-                                 const wxSize& size,
-                                 long style)
+                                 const wxSize& size)
 {
     WXDWORD exstyle;
-    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+    WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), &exstyle);
 
     return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
 }
@@ -156,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);
     }