X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index fc25a1a83b..17c62f087c 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -45,11 +45,11 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
-  m_backgroundColour = *wxWHITE;
-  m_foregroundColour = *wxBLACK;
+    m_backgroundColour = *wxWHITE;
+    m_foregroundColour = *wxBLACK;
 
 #if WXWIN_COMPATIBILITY
-  m_callback = 0;
+    m_callback = 0;
 #endif // WXWIN_COMPATIBILITY
 }
 
@@ -58,15 +58,35 @@ wxControl::~wxControl()
     m_isBeingDeleted = TRUE;
 }
 
-bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style)
+bool wxControl::MSWCreateControl(const wxChar *classname,
+                                 WXDWORD style,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 const wxString& label,
+                                 WXDWORD exstyle)
 {
+    // VZ: if someone could put a comment here explaining what exactly this is
+    //     needed for, it would be nice...
+    bool want3D;
+
+    // if no extended style given, determine it ourselves
+    if ( exstyle == (WXDWORD)-1 )
+    {
+        exstyle = GetExStyle(style, &want3D);
+    }
+
+    // all controls have these childs (wxWindows creates all controls visible
+    // by default)
+    style |= WS_CHILD | WS_VISIBLE;
+
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
-                        GetExStyle(style),  // extended style
+                        exstyle,            // extended style
                         classname,          // the kind of control to create
-                        NULL,               // the window name
+                        label,              // the window name
                         style,              // the window style
-                        0, 0, 0, 0,         // the window position and size
+                        pos.x, pos.y,       // the window position
+                        size.x, size.y,     //            and size
                         GetHwndOf(GetParent()),  // parent
                         (HMENU)GetId(),     // child id
                         wxGetInstance(),    // app instance
@@ -76,12 +96,20 @@ bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style)
     if ( !m_hWnd )
     {
 #ifdef __WXDEBUG__
-        wxLogError(T("Failed to create a control of class '%s'"), classname);
+        wxLogError(wxT("Failed to create a control of class '%s'"), classname);
 #endif // DEBUG
 
         return FALSE;
     }
 
+#if wxUSE_CTL3D
+    if ( want3D )
+    {
+        Ctl3dSubclassCtl(GetHwnd());
+        m_useCtl3D = TRUE;
+    }
+#endif // wxUSE_CTL3D
+
     // subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
 
@@ -168,26 +196,25 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
     // might flicker.
 
     RECT rect;
-    ::GetClientRect((HWND) GetHWND(), &rect);
+    ::GetClientRect(GetHwnd(), &rect);
 
-    HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(),
-                                                  GetBackgroundColour().Green(),
-                                                  GetBackgroundColour().Blue()));
-    int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
+    HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour()));
 
-    ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
+    HDC hdc = GetHdcOf((*event.GetDC()));
+    int mode = ::SetMapMode(hdc, MM_TEXT);
+
+    ::FillRect(hdc, &rect, hBrush);
     ::DeleteObject(hBrush);
-    ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
+    ::SetMapMode(hdc, mode);
 }
 
-WXDWORD wxControl::GetExStyle(WXDWORD& style) const
+WXDWORD wxControl::GetExStyle(WXDWORD& style, bool *want3D) const
 {
-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, want3D);
 
-    // Even with extended styles, need to combine with WS_BORDER
-    // for them to look right.
-    if ( want3D || wxStyleHasBorder(m_windowStyle) )
+    // Even with extended styles, need to combine with WS_BORDER for them to
+    // look right.
+    if ( *want3D || wxStyleHasBorder(m_windowStyle) )
         style |= WS_BORDER;
 
     return exStyle;