X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a23fd0e1d1329a4a258b4defb3e0b0001b700c6e..399b60a0ad232265cd74ce8bf6a53a1f2cc57ff2:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 542d3d7b08..ce7b2fca18 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -30,93 +30,127 @@
 
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
-#include <commctrl.h>
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+    #include <commctrl.h>
 #endif
 
-#ifdef GetCharWidth
-#undef GetCharWidth
-#undef GetWindowProc
-#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(void)
+wxControl::wxControl()
 {
-  m_backgroundColour = *wxWHITE;
-  m_foregroundColour = *wxBLACK;
-  m_callback = 0;
-//  m_windowCursor = wxNullCursor; // To avoid the standard cursor being used
+    m_backgroundColour = *wxWHITE;
+    m_foregroundColour = *wxBLACK;
+
+#if WXWIN_COMPATIBILITY
+    m_callback = 0;
+#endif // WXWIN_COMPATIBILITY
 }
 
-wxControl::~wxControl(void)
+wxControl::~wxControl()
 {
-  m_isBeingDeleted = TRUE;
-
-  // If we delete an item, we should initialize the parent panel,
-  // because it could now be invalid.
-  wxWindow *parent = (wxWindow *)GetParent();
-  if (parent)
-  {
-    if (parent->GetDefaultItem() == (wxButton*) this)
-        parent->SetDefaultItem(NULL);
-  }
+    m_isBeingDeleted = TRUE;
 }
 
-void wxControl::SetLabel(const wxString& label)
+
+bool wxControl::Create(wxWindow *parent, wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size, long style,
+                       const wxValidator& validator,
+                       const wxString& name)
 {
-  if (GetHWND())
-    SetWindowText((HWND) GetHWND(), (const char *)label);
+    bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+    if (rval) {
+#if wxUSE_VALIDATORS
+        SetValidator(validator);
+#endif
+    }
+    return rval;
 }
 
-wxString wxControl::GetLabel(void) const
+bool wxControl::MSWCreateControl(const wxChar *classname,
+                                 WXDWORD style,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 const wxString& label,
+                                 WXDWORD exstyle)
 {
-    wxBuffer[0] = 0;
-    if (GetHWND())
+    // 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 )
     {
-        int len = GetWindowText((HWND)GetHWND(), wxBuffer, 256);
-        wxBuffer[len] = 0;
+        exstyle = GetExStyle(style, &want3D);
     }
 
-  return wxString(wxBuffer);
-}
+    // all controls have these childs (wxWindows creates all controls visible
+    // by default)
+    style |= WS_CHILD | WS_VISIBLE;
+
+    m_hWnd = (WXHWND)::CreateWindowEx
+                       (
+                        exstyle,            // extended style
+                        classname,          // the kind of control to create
+                        label,              // the window name
+                        style,              // the window style
+                        pos.x, pos.y,       // the window position
+                        size.x, size.y,     //            and size
+                        GetHwndOf(GetParent()),  // parent
+                        (HMENU)GetId(),     // child id
+                        wxGetInstance(),    // app instance
+                        NULL                // creation parameters
+                       );
+
+    if ( !m_hWnd )
+    {
+#ifdef __WXDEBUG__
+        wxLogError(wxT("Failed to create a control of class '%s'"), classname);
+#endif // DEBUG
 
-// Call this repeatedly for several wnds to find the overall size
-// of the widget.
-// Call it initially with -1 for all values in rect.
-// Keep calling for other widgets, and rect will be modified
-// to calculate largest bounding rectangle.
-void wxFindMaxSize(WXHWND wnd, RECT *rect)
-{
-  int left = rect->left;
-  int right = rect->right;
-  int top = rect->top;
-  int bottom = rect->bottom;
+        return FALSE;
+    }
 
-  GetWindowRect((HWND) wnd, rect);
+#if wxUSE_CTL3D
+    if ( want3D )
+    {
+        Ctl3dSubclassCtl(GetHwnd());
+        m_useCtl3D = TRUE;
+    }
+#endif // wxUSE_CTL3D
 
-  if (left < 0)
-    return;
+    // subclass again for purposes of dialog editing mode
+    SubclassWin(m_hWnd);
 
-  if (left < rect->left)
-    rect->left = left;
+    // controls use the same font and colours as their parent dialog by default
+    InheritAttributes();
 
-  if (right > rect->right)
-    rect->right = right;
+    return TRUE;
+}
 
-  if (top < rect->top)
-    rect->top = top;
+wxSize wxControl::DoGetBestSize() const
+{
+    return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
+}
+
+bool wxControl::ProcessCommand(wxCommandEvent& event)
+{
+#if WXWIN_COMPATIBILITY
+    if ( m_callback )
+    {
+        (void)(*m_callback)(this, event);
 
-  if (bottom > rect->bottom)
-    rect->bottom = bottom;
+        return TRUE;
+    }
+    else
+#endif // WXWIN_COMPATIBILITY
 
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 #ifdef __WIN95__
@@ -168,70 +202,96 @@ bool wxControl::MSWOnNotify(int idCtrl,
 }
 #endif // Win95
 
-void wxControl::ProcessCommand (wxCommandEvent & event)
+void wxControl::OnEraseBackground(wxEraseEvent& event)
 {
-  // Tries:
-  // 1) A callback function (to become obsolete)
-  // 2) OnCommand, starting at this window and working up parent hierarchy
-  // 3) OnCommand then calls ProcessEvent to search the event tables.
-  if (m_callback)
-    {
-      (void) (*(m_callback)) (*this, event);
-    }
-    else
-    {
-      GetEventHandler()->OnCommand(*this, event);
-    }
+    // 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);
+
+    HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour()));
+
+    HDC hdc = GetHdcOf((*event.GetDC()));
+    int mode = ::SetMapMode(hdc, MM_TEXT);
+
+    ::FillRect(hdc, &rect, hBrush);
+    ::DeleteObject(hBrush);
+    ::SetMapMode(hdc, mode);
 }
 
-void wxControl::OnEraseBackground(wxEraseEvent& event)
+WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+                               WXUINT message,
+                               WXWPARAM wParam,
+                               WXLPARAM lParam)
 {
-  // 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.
+#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);
 
-  RECT rect;
-  ::GetClientRect((HWND) GetHWND(), &rect);
+    const wxColour& colBack = GetBackgroundColour();
+    ::SetBkColor(hdc, wxColourToRGB(colBack));
+    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
 
-  HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
+    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
 
-  ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
-  ::DeleteObject(hBrush);
-  ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
+    return (WXHBRUSH)brush->GetResourceHandle();
 }
 
-void wxControl::SetClientSize (int width, int height)
+WXDWORD wxControl::GetExStyle(WXDWORD& style, bool *want3D) const
 {
-  SetSize (-1, -1, width, height);
+    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) )
+        style |= WS_BORDER;
+
+    return exStyle;
 }
 
-void wxControl::Centre (int direction)
+// ---------------------------------------------------------------------------
+// global functions
+// ---------------------------------------------------------------------------
+
+// Call this repeatedly for several wnds to find the overall size
+// of the widget.
+// Call it initially with -1 for all values in rect.
+// Keep calling for other widgets, and rect will be modified
+// to calculate largest bounding rectangle.
+void wxFindMaxSize(WXHWND wnd, RECT *rect)
 {
-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
+    int left = rect->left;
+    int right = rect->right;
+    int top = rect->top;
+    int bottom = rect->bottom;
 
-  wxWindow *parent = (wxWindow *) GetParent ();
-  if (!parent)
-    return;
+    GetWindowRect((HWND) wnd, rect);
 
-  parent->GetClientSize (&panel_width, &panel_height);
-  GetSize (&width, &height);
-  GetPosition (&x, &y);
+    if (left < 0)
+        return;
 
-  new_x = x;
-  new_y = y;
+    if (left < rect->left)
+        rect->left = left;
 
-  if (direction & wxHORIZONTAL)
-    new_x = (int) ((panel_width - width) / 2);
+    if (right > rect->right)
+        rect->right = right;
 
-  if (direction & wxVERTICAL)
-    new_y = (int) ((panel_height - height) / 2);
+    if (top < rect->top)
+        rect->top = top;
 
-  SetSize (new_x, new_y, width, height);
-  int temp_x, temp_y;
-  GetPosition (&temp_x, &temp_y);
-  GetPosition (&temp_x, &temp_y);
+    if (bottom > rect->bottom)
+        rect->bottom = bottom;
 }
 
-