compilation for Win32 using configure works again

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 652b4929f78316da326e1e9bea2e7541d06ac083..89ddd5c54680727beeb67932f3b04d3699cf4db4 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -34,13 +34,11 @@
 #include <commctrl.h>
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
 END_EVENT_TABLE()
-#endif
 
 // Item members
 wxControl::wxControl()
@@ -58,23 +56,51 @@ wxControl::~wxControl()
     m_isBeingDeleted = TRUE;
 }
 
-bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style)
+
+bool wxControl::Create(wxWindow *parent, wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size, long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+    bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+    if (rval) {
+#if wxUSE_VALIDATORS
+        SetValidator(validator);
+#endif
+    }
+    return rval;
+}
+
+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, &want3D), // 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
@@ -107,7 +133,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style)
     return TRUE;
 }
 
-wxSize wxControl::DoGetBestSize()
+wxSize wxControl::DoGetBestSize() const
 {
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
@@ -178,10 +204,9 @@ bool wxControl::MSWOnNotify(int idCtrl,
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {
-    // In general, you don't want to erase the background of a control,
-    // or you'll get a flicker.
-    // TODO: move this 'null' function into each control that
-    // might flicker.
+    // notice that this 'dumb' implementation may cause flicker for some of the
+    // controls in which case they should intercept wxEraseEvent and process it
+    // themselves somehow
 
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);
@@ -196,6 +221,34 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
     ::SetMapMode(hdc, mode);
 }
 
+WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+                               WXUINT message,
+                               WXWPARAM wParam,
+                               WXLPARAM lParam)
+{
+#if wxUSE_CTL3D
+    if ( m_useCtl3D )
+    {
+        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
+        return (WXHBRUSH) hbrush;
+    }
+#endif // wxUSE_CTL3D
+
+    HDC hdc = (HDC)pDC;
+    if (GetParent()->GetTransparentBackground())
+        SetBkMode(hdc, TRANSPARENT);
+    else
+        SetBkMode(hdc, OPAQUE);
+
+    const wxColour& colBack = GetBackgroundColour();
+    ::SetBkColor(hdc, wxColourToRGB(colBack));
+    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+
+    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+
+    return (WXHBRUSH)brush->GetResourceHandle();
+}
+
 WXDWORD wxControl::GetExStyle(WXDWORD& style, bool *want3D) const
 {
     WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, want3D);