Applied patch [ 652491 ] Update makefiles for mingw

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index b3f223c21001b4a00493442be8363b60d0d567c4..ba76513c757bb1952bb49510c4e88a471260524a 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -46,9 +46,6 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
 // Item members
 wxControl::wxControl()
 {

-    m_backgroundColour = *wxWHITE;
-    m_foregroundColour = *wxBLACK;
-

 #if WXWIN_COMPATIBILITY
     m_callback = 0;
 #endif // WXWIN_COMPATIBILITY
 #if WXWIN_COMPATIBILITY
     m_callback = 0;
 #endif // WXWIN_COMPATIBILITY


@@ -60,19 +57,34 @@ wxControl::~wxControl()
 }
 
 
 }
 
 

-bool wxControl::Create(wxWindow *parent, wxWindowID id,
+bool wxControl::Create(wxWindow *parent,
+                       wxWindowID id,

                        const wxPoint& pos,
                        const wxPoint& pos,

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

                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        const wxString& name)
 {

-    bool rval = wxWindow::Create(parent, id, pos, size, style, name);
-    if (rval) {
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return FALSE;
+

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-        SetValidator(validator);
+    SetValidator(validator);

 #endif
 #endif

-    }
-    return rval;
+
+    return TRUE;
+}
+
+bool wxControl::MSWCreateControl(const wxChar *classname,
+                                 const wxString& label,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 long style)
+{
+    WXDWORD exstyle;
+    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+
+    return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);

 }
 
 bool wxControl::MSWCreateControl(const wxChar *classname,
 }
 
 bool wxControl::MSWCreateControl(const wxChar *classname,


@@ -91,12 +103,17 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     // 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 = GetExStyle(style, &want3D);
+        exstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);

     }
 
     }
 

-    // all controls have these styles (wxWindows creates all controls visible
-    // by default)
-    style |= WS_CHILD | WS_VISIBLE;
+    // all controls should have this style
+    style |= WS_CHILD;
+
+    // create the control visible if it's currently shown for wxWindows
+    if ( m_isShown )
+    {
+        style |= WS_VISIBLE;
+    }

 
     int x = pos.x == -1 ? 0 : pos.x,
         y = pos.y == -1 ? 0 : pos.y,
 
     int x = pos.x == -1 ? 0 : pos.x,
         y = pos.y == -1 ? 0 : pos.y,


@@ -139,7 +156,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);
     }


@@ -272,16 +289,16 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED
     return (WXHBRUSH)brush->GetResourceHandle();
 }
 
     return (WXHBRUSH)brush->GetResourceHandle();
 }
 

-WXDWORD wxControl::GetExStyle(WXDWORD& style, bool *want3D) const
+WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const

 {
 {

-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, want3D);
+    long msStyle = wxWindow::MSWGetStyle(style, exstyle);

 
 

-    // Even with extended styles, need to combine with WS_BORDER for them to
-    // look right.
-    if ( *want3D || wxStyleHasBorder(m_windowStyle) )
-        style |= WS_BORDER;
+    if ( AcceptsFocus() )
+    {
+        msStyle |= WS_TABSTOP;
+    }

 
 

-    return exStyle;
+    return msStyle;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------