/////////////////////////////////////////////////////////////////////////////
-// Name: msw/control.cpp
+// Name: src/msw/control.cpp
// Purpose: wxControl class
// Author: Julian Smart
// Modified by:
// 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"
#if wxUSE_CONTROLS
+#include "wx/control.h"
+
#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/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"
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#endif
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
(
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
return false;
}
+ // 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;
}
// 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;
}
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,
bool wxControl::ProcessCommand(wxCommandEvent& event)
{
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(event);
}
-#ifdef __WIN95__
bool wxControl::MSWOnNotify(int idCtrl,
WXLPARAM lParam,
WXLPARAM* result)
event.SetEventType(eventType);
event.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(event);
}
-#endif // Win95
-WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
+WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
{
HDC hdc = (HDC)pDC;
if ( m_hasFgCol )
WXHBRUSH hbr = 0;
if ( !colBg.Ok() )
{
- hbr = MSWGetBgBrush(pDC);
+ hbr = MSWGetBgBrush(pDC, hWnd);
// 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
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
hbr = (WXHBRUSH)brush->GetResourceHandle();
+
}
+ // if we use custom background, we should set foreground ourselves too
+ if ( hbr && !m_hasFgCol )
+ {
+ ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
+ }
+ //else: already set above
+
return hbr;
}
-WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)
{
wxColour colBg;
else // if the control is opaque it shouldn't use the parents background
colBg = GetBackgroundColour();
- return DoMSWControlColor(pDC, colBg);
+ return DoMSWControlColor(pDC, colBg, hWnd);
}
WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
{
return DoMSWControlColor(pDC,
- wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+ wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE),
+ 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;
}
// ---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff