/////////////////////////////////////////////////////////////////////////////
-// 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"
#include "wx/msw/private.h"
#include "wx/msw/uxtheme.h"
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
// ----------------------------------------------------------------------------
// wxWin macros
style |= WS_VISIBLE;
}
- // choose the position for the control
+ // choose the position for the control: we have a problem with default size
+ // here as we can't calculate the best size before the control exists
+ // (DoGetBestSize() may need to use m_hWnd), so just choose the minimal
+ // possible but non 0 size because 0 window width/height result in problems
+ // elsewhere
int x = pos.x == wxDefaultCoord ? 0 : pos.x,
y = pos.y == wxDefaultCoord ? 0 : pos.y,
- w = size.x == wxDefaultCoord ? 0 : size.x,
- h = size.y == wxDefaultCoord ? 0 : size.y;
+ w = size.x == wxDefaultCoord ? 1 : size.x,
+ h = size.y == wxDefaultCoord ? 1 : size.y;
// ... and adjust it to account for a possible parent frames toolbar
AdjustForParentClientOrigin(x, y);
if ( !m_hWnd )
{
- wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
- wxFAIL_MSG(_T("something is very wrong, CreateWindowEx failed"));
+#ifdef __WXDEBUG__
+ wxFAIL_MSG(wxString::Format
+ (
+ _T("CreateWindowEx(\"%s\", flags=%08x, ex=%08x) failed"),
+ classname, (unsigned int)style, (unsigned int)exstyle
+ ));
+#endif // __WXDEBUG__
return false;
}
-#if wxUSE_CTL3D
- if ( want3D )
- {
- Ctl3dSubclassCtl(GetHwnd());
- m_useCtl3D = true;
- }
-#endif // wxUSE_CTL3D
-
// install wxWidgets window proc for this window
SubclassWin(m_hWnd);
// 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
// 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
- 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
);
return GetEventHandler()->ProcessEvent(event);
}
-#ifdef __WIN95__
bool wxControl::MSWOnNotify(int idCtrl,
WXLPARAM lParam,
WXLPARAM* result)
return GetEventHandler()->ProcessEvent(event);
}
-#endif // Win95
-WXHBRUSH wxControl::MSWControlColorSolid(WXHDC pDC, wxColour colBg)
+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() )
+ {
+ 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
+ // non default background brush in this case
+ if ( !hbr && m_hasFgCol )
+ colBg = GetBackgroundColour();
+ }
+ // use the background colour override if a valid colour is given
if ( colBg.Ok() )
{
::SetBkColor(hdc, wxColourToRGB(colBg));
+ // draw children with the same colour as the parent
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
- return (WXHBRUSH)brush->GetResourceHandle();
+ hbr = (WXHBRUSH)brush->GetResourceHandle();
+
+ // if we use custom background, we should set foreground ourselves too
+ if ( !m_hasFgCol )
+ {
+ ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
+ }
+ //else: already set above
}
- return 0;
+ return hbr;
}
-WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)
{
- WXHBRUSH hbr = MSWControlColorSolid(pDC, m_hasBgCol ? m_backgroundColour
- : wxNullColour);
- if ( hbr )
- return hbr;
+ wxColour colBg;
- ::SetBkMode((HDC)pDC, TRANSPARENT);
-
-#if wxUSE_UXTHEME && wxUSE_NOTEBOOK
- if ( wxUxThemeEngine::GetIfActive() )
- {
- for ( wxWindow *win = this; win; win = win->GetParent() )
- {
- 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);
- }
- }
- }
-#endif // wxUSE_UXTHEME
+ if ( HasTransparentBackground() )
+ ::SetBkMode((HDC)pDC, TRANSPARENT);
+ else // if the control is opaque it shouldn't use the parents background
+ colBg = GetBackgroundColour();
- return MSWAlwaysDrawBg() ? 0 : ::GetStockObject(NULL_BRUSH);
+ return DoMSWControlColor(pDC, colBg, hWnd);
}
WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
{
- return MSWControlColorSolid
- (
- pDC,
- wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)
- );
+ return DoMSWControlColor(pDC,
+ wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE),
+ GetHWND());
}
// ---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff