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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index ba76513c75..e05ee6476d 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -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);
 }
@@ -94,16 +93,12 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  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.
-    // Sometimes want3D is used to indicate that the non-extended style should have
-    // WS_BORDER.
-    bool want3D = TRUE;
-
     // if no extended style given, determine it ourselves
     if ( exstyle == (WXDWORD)-1 )
     {
-        exstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
+//        exstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
+        exstyle = 0;
+        (void) MSWGetStyle(GetWindowStyle(), & exstyle) ;
     }
 
     // all controls should have this style