X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a71d815bbe669ebb9bdb9409926a272c37a5a9aa..51ec29ea5d1d1093bafbae27a8483211a90d9659:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index a5a7431b76..0d937c9016 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -26,26 +26,29 @@ #if wxUSE_CONTROLS +#include "wx/control.h" + #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #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 -#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 "properly" -#include "wx/msw/wrapcctl.h" - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -56,15 +59,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) // wxControl implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// wxControl ctor/dtor -// ---------------------------------------------------------------------------- - -wxControl::~wxControl() -{ - m_isBeingDeleted = true; -} - // ---------------------------------------------------------------------------- // control window creation // ---------------------------------------------------------------------------- @@ -138,38 +132,95 @@ bool wxControl::MSWCreateControl(const wxChar *classname, ( exstyle, // extended style classname, // the kind of control to create - label, // the window name + label.wx_str(), // the window name 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 ) { -#ifdef __WXDEBUG__ - wxFAIL_MSG(wxString::Format - ( - _T("CreateWindowEx(\"%s\", flags=%08x, ex=%08x) failed"), - classname, (unsigned int)style, (unsigned int)exstyle - )); -#endif // __WXDEBUG__ + wxLogLastError(wxString::Format + ( + wxT("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"), + classname, style, exstyle + )); return false; } +#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.wx_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(); - 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 - SetInitialBestSize(size); + SetInitialSize(size); return true; } @@ -178,23 +229,11 @@ bool wxControl::MSWCreateControl(const wxChar *classname, // 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) -#if defined(__POCKETPC__) || defined(__SMARTPHONE__) - return wxBORDER_SIMPLE; -#else - return wxBORDER_SUNKEN; -#endif -} - WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const { long msStyle = wxWindow::MSWGetStyle(style, exstyle); - if ( AcceptsFocus() ) + if ( AcceptsFocusFromKeyboard() ) { msStyle |= WS_TABSTOP; } @@ -204,9 +243,17 @@ WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const wxSize wxControl::DoGetBestSize() const { + if (m_windowSizer) + return wxControlBase::DoGetBestSize(); + 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, @@ -256,25 +303,13 @@ wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) 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) { - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } bool wxControl::MSWOnNotify(int idCtrl, @@ -322,21 +357,18 @@ bool wxControl::MSWOnNotify(int idCtrl, event.SetEventType(eventType); event.SetEventObject(this); - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) { HDC hdc = (HDC)pDC; - if ( m_hasFgCol ) - { - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); - } WXHBRUSH hbr = 0; - if ( !colBg.Ok() ) + if ( !colBg.IsOk() ) { - hbr = MSWGetBgBrush(pDC, hWnd); + if ( wxWindow *win = wxFindWinFromHandle(hWnd) ) + 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 @@ -345,22 +377,33 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) colBg = GetBackgroundColour(); } - // use the background colour override if a valid colour is given - if ( colBg.Ok() ) + // 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() ) { - ::SetBkColor(hdc, wxColourToRGB(colBg)); + wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg); + hbr = (WXHBRUSH)brush->GetResourceHandle(); + } - // draw children with the same colour as the parent - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID); + // 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())); + } - hbr = (WXHBRUSH)brush->GetResourceHandle(); + // 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(); - // if we use custom background, we should set foreground ourselves too - if ( !m_hasFgCol ) - { - ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT)); - } - //else: already set above + ::SetBkColor(hdc, wxColourToRGB(colBg)); } return hbr; @@ -368,14 +411,13 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd) { - wxColour colBg; - if ( HasTransparentBackground() ) ::SetBkMode((HDC)pDC, TRANSPARENT); - else // if the control is opaque it shouldn't use the parents background - colBg = GetBackgroundColour(); - return DoMSWControlColor(pDC, colBg, hWnd); + // 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::MSWControlColorDisabled(WXHDC pDC) @@ -385,6 +427,42 @@ WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC) GetHWND()); } +// ---------------------------------------------------------------------------- +// wxControlWithItems +// ---------------------------------------------------------------------------- + +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 ) + { + totalTextLength += items[i].length(); + } + + if ( SendMessage((HWND)MSWGetItemsHWND(), wm, numItems, + (LPARAM)totalTextLength*sizeof(wxChar)) == LB_ERRSPACE ) + { + wxLogLastError(wxT("SendMessage(XX_INITSTORAGE)")); + } +} + +int wxControlWithItems::MSWInsertOrAppendItem(unsigned pos, + const wxString& item, + unsigned wm) +{ + LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos, + (LPARAM)item.wx_str()); + if ( n == CB_ERR || n == CB_ERRSPACE ) + { + wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)")); + return wxNOT_FOUND; + } + + return n; +} + // --------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------