missing commit

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 7dc54a51146a5c8129c57b655f3abeeda2cfbe91..6fe928cc5772aa3ae4e935eb04851e90c73f8a41 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/control.cpp
+// Name:        src/msw/control.cpp

 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "control.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,27 +26,29 @@
 
 #if wxUSE_CONTROLS
 
 
 #if wxUSE_CONTROLS
 

+#include "wx/control.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"

     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/log.h"
     #include "wx/settings.h"

+    #include "wx/ctrlsub.h"

 #endif
 
 #endif
 

-#include "wx/control.h"
+#if wxUSE_LISTCTRL
+    #include "wx/listctrl.h"
+#endif // wxUSE_LISTCTRL

 
 

-#if wxUSE_NOTEBOOK
-    #include "wx/notebook.h"
-#endif // wxUSE_NOTEBOOK
+#if wxUSE_TREECTRL
+    #include "wx/treectrl.h"
+#endif // wxUSE_TREECTRL

 
 #include "wx/msw/private.h"
 #include "wx/msw/uxtheme.h"
 
 
 #include "wx/msw/private.h"
 #include "wx/msw/uxtheme.h"
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#endif
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -61,15 +59,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 // wxControl implementation
 // ============================================================================
 
 // wxControl implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// wxControl ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxControl::~wxControl()
-{
-    m_isBeingDeleted = true;
-}
-

 // ----------------------------------------------------------------------------
 // control window creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // control window creation
 // ----------------------------------------------------------------------------


@@ -143,41 +132,95 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                        (
                         exstyle,            // extended style
                         classname,          // the kind of control to create
                        (
                         exstyle,            // extended style
                         classname,          // the kind of control to create

-                        label,              // the window name
+                        label.t_str(),      // the window name

                         style,              // the window style
                         x, y, w, h,         // the window position and size
                         style,              // the window style
                         x, y, w, h,         // the window position and size

-                        GetHwndOf(GetParent()),  // parent
-                        (HMENU)GetId(),     // child id
+                        GetHwndOf(GetParent()),         // parent
+                        (HMENU)wxUIntToPtr(GetId()),    // child id

                         wxGetInstance(),    // app instance
                         NULL                // creation parameters
                        );
 
     if ( !m_hWnd )
     {
                         wxGetInstance(),    // app instance
                         NULL                // creation parameters
                        );
 
     if ( !m_hWnd )
     {

-        wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
-        wxFAIL_MSG(_T("something is very wrong, CreateWindowEx failed"));
+        wxLogLastError(wxString::Format
+                       (
+                        wxT("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
+                        classname, style, exstyle
+                       ));

 
         return false;
     }
 
 
         return false;
     }
 

-#if wxUSE_CTL3D
-    if ( want3D )
-    {
-        Ctl3dSubclassCtl(GetHwnd());
-        m_useCtl3D = true;
-    }
-#endif // wxUSE_CTL3D
+#if !wxUSE_UNICODE
+    // Text labels starting with the character 0xff (which is a valid character
+    // in many code pages) don't appear correctly as CreateWindowEx() has some
+    // special treatment for this case, apparently the strings starting with -1
+    // are not really strings but something called "ordinals". There is no
+    // documentation about it but the fact is that the label gets mangled or
+    // not displayed at all if we don't do this, see #9572.
+    //
+    // Notice that 0xffff is not a valid Unicode character so the problem
+    // doesn't arise in Unicode build.
+    if ( !label.empty() && label[0] == -1 )
+        ::SetWindowText(GetHwnd(), label.t_str());
+#endif // !wxUSE_UNICODE
+
+    // saving the label in m_labelOrig to return it verbatim
+    // later in GetLabel()
+    m_labelOrig = label;

 
     // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 
     // set up fonts and colours
     InheritAttributes();
 
     // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 
     // set up fonts and colours
     InheritAttributes();

-    if (!m_hasFont)
-        SetFont(GetDefaultAttributes().font);
+    if ( !m_hasFont )
+    {
+        bool setFont = true;
+
+        wxFont font = GetDefaultAttributes().font;
+
+        // if we set a font for {list,tree}ctrls and the font size is changed in
+        // the display properties then the font size for these controls doesn't
+        // automatically adjust when they receive WM_SETTINGCHANGE
+
+        // FIXME: replace the dynamic casts with virtual function calls!!
+#if wxUSE_LISTCTRL || wxUSE_TREECTRL
+        bool testFont = false;
+#if wxUSE_LISTCTRL
+        if ( wxDynamicCastThis(wxListCtrl) )
+            testFont = true;
+#endif // wxUSE_LISTCTRL
+#if wxUSE_TREECTRL
+        if ( wxDynamicCastThis(wxTreeCtrl) )
+            testFont = true;
+#endif // wxUSE_TREECTRL
+
+        if ( testFont )
+        {
+            // not sure if we need to explicitly set the font here for Win95/NT4
+            // but we definitely can't do it for any newer version
+            // see wxGetCCDefaultFont() in src/msw/settings.cpp for explanation
+            // of why this test works
+
+            // TODO: test Win95/NT4 to see if this is needed or breaks the
+            // font resizing as it does on newer versions
+            if ( font != wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) )
+            {
+                setFont = false;
+            }
+        }
+#endif // wxUSE_LISTCTRL || wxUSE_TREECTRL
+
+        if ( setFont )
+        {
+            SetFont(GetDefaultAttributes().font);
+        }
+    }

 
     // set the size now if no initial size specified
 
     // set the size now if no initial size specified

-    SetInitialBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -186,19 +229,11 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 // various accessors
 // ----------------------------------------------------------------------------
 
 // various accessors
 // ----------------------------------------------------------------------------
 

-wxBorder wxControl::GetDefaultBorder() const
-{
-    // we want to automatically give controls a sunken style (confusingly,
-    // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
-    // which is not sunken at all under Windows XP -- rather, just the default)
-    return wxBORDER_SUNKEN;
-}
-

 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);
 
 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);
 

-    if ( AcceptsFocus() )
+    if ( AcceptsFocusFromKeyboard() )

     {
         msStyle |= WS_TABSTOP;
     }
     {
         msStyle |= WS_TABSTOP;
     }


@@ -208,22 +243,30 @@ WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxControl::DoGetBestSize() const
 {
 
 wxSize wxControl::DoGetBestSize() const
 {

+    if (m_windowSizer)
+       return wxControlBase::DoGetBestSize();
+

     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 

+wxBorder wxControl::GetDefaultBorder() const
+{
+    return wxControlBase::GetDefaultBorder();
+}
+

 // This is a helper for all wxControls made with UPDOWN native control.
 // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
 // WinCE of Smartphones this happens also for native wxTextCtrl,
 // wxChoice and others.
 // This is a helper for all wxControls made with UPDOWN native control.
 // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
 // WinCE of Smartphones this happens also for native wxTextCtrl,
 // wxChoice and others.

-wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
+wxSize wxControl::GetBestSpinnerSize(const bool is_vertical) const

 {
     // take size according to layout
     wxSize bestSize(
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
                     0,GetCharHeight()
 #else
 {
     // take size according to layout
     wxSize bestSize(
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
                     0,GetCharHeight()
 #else

-                    GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
-                    GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
+                    ::GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
+                    ::GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)

 #endif
     );
 
 #endif
     );
 


@@ -260,28 +303,15 @@ wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return attrs;
 }
 
     return attrs;
 }
 

-// another version for the "composite", i.e. non simple controls
-/* static */ wxVisualAttributes
-wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant))
-{
-    wxVisualAttributes attrs;
-    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-
-    return attrs;
-}
-

 // ----------------------------------------------------------------------------
 // message handling
 // ----------------------------------------------------------------------------
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
 // ----------------------------------------------------------------------------
 // message handling
 // ----------------------------------------------------------------------------
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 
 }
 

-#ifdef __WIN95__

 bool wxControl::MSWOnNotify(int idCtrl,
                             WXLPARAM lParam,
                             WXLPARAM* result)
 bool wxControl::MSWOnNotify(int idCtrl,
                             WXLPARAM lParam,
                             WXLPARAM* result)


@@ -327,71 +357,126 @@ bool wxControl::MSWOnNotify(int idCtrl,
     event.SetEventType(eventType);
     event.SetEventObject(this);
 
     event.SetEventType(eventType);
     event.SetEventObject(this);
 

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 }

-#endif // Win95

 
 

-WXHBRUSH wxControl::MSWControlColorSolid(WXHDC pDC, wxColour colBg)
+WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)

 {
     HDC hdc = (HDC)pDC;
 {
     HDC hdc = (HDC)pDC;

-    if ( m_hasFgCol )
+
+    WXHBRUSH hbr = 0;
+    if ( !colBg.IsOk() )
+    {
+        wxWindow *win = wxFindWinFromHandle( hWnd );
+        if ( !win )
+        {
+            // If this HWND doesn't correspond to a wxWindow, it still might be
+            // one of its children for which we need to set the background
+            // brush, e.g. this is the case for the EDIT control that is part
+            // of wxComboBox. Check for this by asking the parent if it has it:
+            HWND parent = ::GetParent(hWnd);
+            if ( parent )
+            {
+                wxWindow *winParent = wxFindWinFromHandle( parent );
+                if( winParent && winParent->ContainsHWND( hWnd ) )
+                    win = winParent;
+             }
+        }
+
+        if ( win )
+            hbr = win->MSWGetBgBrush(pDC);
+
+        // if the control doesn't have any bg colour, foreground colour will be
+        // ignored as the return value would be 0 -- so forcefully give it a
+        // non default background brush in this case
+        if ( !hbr && m_hasFgCol )
+            colBg = GetBackgroundColour();
+    }
+
+    // use the background colour override if a valid colour is given: this is
+    // used when the control is disabled to grey it out and also if colBg was
+    // set just above
+    if ( colBg.IsOk() )
+    {
+        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg);
+        hbr = (WXHBRUSH)brush->GetResourceHandle();
+    }
+
+    // always set the foreground colour if we changed the background, whether
+    // m_hasFgCol is true or not: if it true, we must do it, of course, but
+    // even if it isn't, we must set the default foreground explicitly as by
+    // default just the simple black is used
+    if ( hbr )
+    {

         ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
         ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));

+    }

 
 

-    if ( colBg.Ok() )
+    // finally also set the background colour for text drawing: without this,
+    // the text in an edit control is drawn using the default background even
+    // if we return a valid brush
+    if ( colBg.IsOk() || m_hasBgCol )

     {
     {

+        if ( !colBg.IsOk() )
+            colBg = GetBackgroundColour();
+

         ::SetBkColor(hdc, wxColourToRGB(colBg));
         ::SetBkColor(hdc, wxColourToRGB(colBg));

+    }

 
 

-        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
+    return hbr;
+}

 
 

-        return (WXHBRUSH)brush->GetResourceHandle();
-    }
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)
+{
+    if ( HasTransparentBackground() )
+        ::SetBkMode((HDC)pDC, TRANSPARENT);

 
 

-    return 0;
+    // don't pass any background colour to DoMSWControlColor(), our own
+    // background colour will be used by it only if it is set, otherwise the
+    // defaults will be used
+    return DoMSWControlColor(pDC, wxColour(), hWnd);

 }
 
 }
 

-WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)

 {
 {

-    WXHBRUSH hbr = MSWControlColorSolid(pDC, m_hasBgCol ? m_backgroundColour
-                                                        : wxNullColour);
-    if ( hbr )
-        return hbr;
+    return DoMSWControlColor(pDC,
+                             wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE),
+                             GetHWND());
+}

 
 

-    ::SetBkMode((HDC)pDC, TRANSPARENT);
+// ----------------------------------------------------------------------------
+// wxControlWithItems
+// ----------------------------------------------------------------------------

 
 

-#if wxUSE_UXTHEME && wxUSE_NOTEBOOK
-    if ( wxUxThemeEngine::GetIfActive() )
+void wxControlWithItems::MSWAllocStorage(const wxArrayStringsAdapter& items,
+                                         unsigned wm)
+{
+    const unsigned numItems = items.GetCount();
+    unsigned long totalTextLength = numItems; // for trailing '\0' characters
+    for ( unsigned i = 0; i < numItems; ++i )

     {
     {

-        for ( wxWindow *win = this; win; win = win->GetParent() )
-        {
-            if ( win->IsTopLevel() )
-            {
-                // don't go beyond the first top level parent
-                break;
-            }
-
-            wxNotebook *nbook = wxDynamicCast(win, wxNotebook);
-            if ( nbook )
-            {
-                // return value may be NULL but it is ok: if the first parent
-                // notebook doesn't use themes, then we don't have to process
-                // this message at all, so let default processing take place
-                return nbook->GetThemeBackgroundBrush(pDC, this);
-            }
-        }
+        totalTextLength += items[i].length();

     }
     }

-#endif // wxUSE_UXTHEME

 
 

-    // let the control deal with background itself
-    return MSWGetDefaultBgBrush();
+    if ( SendMessage((HWND)MSWGetItemsHWND(), wm, numItems,
+                     (LPARAM)totalTextLength*sizeof(wxChar)) == LB_ERRSPACE )
+    {
+        wxLogLastError(wxT("SendMessage(XX_INITSTORAGE)"));
+    }

 }
 
 }
 

-WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
+int wxControlWithItems::MSWInsertOrAppendItem(unsigned pos,
+                                              const wxString& item,
+                                              unsigned wm)

 {
 {

-    return MSWControlColorSolid
-           (
-                pDC,
-                wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)
-           );
+    LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,
+                            wxMSW_CONV_LPARAM(item));
+    if ( n == CB_ERR || n == CB_ERRSPACE )
+    {
+        wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));
+        return wxNOT_FOUND;
+    }
+
+    return n;

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