// wxControl implementation
// ============================================================================
-// ----------------------------------------------------------------------------
-// wxControl ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxControl::~wxControl()
-{
- m_isBeingDeleted = true;
-}
-
// ----------------------------------------------------------------------------
// control window creation
// ----------------------------------------------------------------------------
(
exstyle, // extended style
classname, // the kind of control to create
- label.wx_str(), // the window name
+ label.t_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__
wxLogLastError(wxString::Format
(
- _T("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
+ wxT("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
classname, style, exstyle
));
-#endif // __WXDEBUG__
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.t_str());
+#endif // !wxUSE_UNICODE
+
// saving the label in m_labelOrig to return it verbatim
// later in GetLabel()
m_labelOrig = label;
wxSize wxControl::DoGetBestSize() const
{
+ if (m_windowSizer)
+ return wxControlBase::DoGetBestSize();
+
return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
}
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
// ----------------------------------------------------------------------------
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);
+ 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
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));
-
- // draw children with the same colour as the parent
- wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
-
+ 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()));
}
- // if we use custom background, we should set foreground ourselves too
- if ( hbr && !m_hasFgCol )
+ // 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 )
{
- ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
+ if ( !colBg.IsOk() )
+ colBg = GetBackgroundColour();
+
+ ::SetBkColor(hdc, wxColourToRGB(colBg));
}
- //else: already set above
return hbr;
}
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)
unsigned wm)
{
LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,
- (LPARAM)item.wx_str());
+ wxMSW_CONV_LPARAM(item));
if ( n == CB_ERR || n == CB_ERRSPACE )
{
wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));
projects / wxWidgets.git / blobdiff