Acutally use the m_maxChars parameter value instead of ignoring it

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 6593d6eed17d4f5b2308390a849e18f69ab613a0..e05ee6476d792b495c3e31d0f71008aebfd05bf5 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -78,11 +78,10 @@ bool wxControl::Create(wxWindow *parent,
 bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  const wxPoint& pos,
 bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  const wxPoint& pos,

-                                 const wxSize& size,
-                                 long style)
+                                 const wxSize& size)

 {
     WXDWORD exstyle;
 {
     WXDWORD exstyle;

-    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+    WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), &exstyle);

 
     return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
 }
 
     return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
 }


@@ -94,16 +93,12 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  WXDWORD exstyle)
 {
                                  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 )
     {
     // 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
     }
 
     // all controls should have this style


@@ -156,7 +151,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     InheritAttributes();
 
     // set the size now if no initial size specified
     InheritAttributes();
 
     // set the size now if no initial size specified

-    if ( w == 0 || h == 0 )
+    if ( w <= 0 || h <= 0 )

     {
         SetBestSize(size);
     }
     {
         SetBestSize(size);
     }