wxControl::~wxControl()
{
- m_isBeingDeleted = TRUE;
+ m_isBeingDeleted = true;
}
// ----------------------------------------------------------------------------
const wxString& name)
{
if ( !wxWindow::Create(parent, id, pos, size, style, name) )
- return FALSE;
+ return false;
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
- return TRUE;
+ return true;
}
bool wxControl::MSWCreateControl(const wxChar *classname,
// all controls should have this style
style |= WS_CHILD;
- // create the control visible if it's currently shown for wxWindows
+ // create the control visible if it's currently shown for wxWidgets
if ( m_isShown )
{
style |= WS_VISIBLE;
}
// choose the position for the control
- int x = pos.x == -1 ? 0 : pos.x,
- y = pos.y == -1 ? 0 : pos.y,
- w = size.x == -1 ? 0 : size.x,
- h = size.y == -1 ? 0 : size.y;
+ 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;
- // ... and adjust it to account for ap ossible parent frames toolbar
+ // ... and adjust it to account for a possible parent frames toolbar
AdjustForParentClientOrigin(x, y);
m_hWnd = (WXHWND)::CreateWindowEx
if ( !m_hWnd )
{
wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
- wxFAIL_MSG(_T("something is very wrong"));
+ wxFAIL_MSG(_T("something is very wrong, CreateWindowEx failed"));
- return FALSE;
+ return false;
}
#if wxUSE_CTL3D
if ( want3D )
{
Ctl3dSubclassCtl(GetHwnd());
- m_useCtl3D = TRUE;
+ m_useCtl3D = true;
}
#endif // wxUSE_CTL3D
- // install wxWindows window proc for this window
+ // install wxWidgets window proc for this window
SubclassWin(m_hWnd);
// set up fonts and colours
InheritAttributes();
- SetFont(GetDefaultAttributes().font);
+ if (!m_hasFont)
+ SetFont(GetDefaultAttributes().font);
// set the size now if no initial size specified
- if ( w <= 0 || h <= 0 )
- {
- SetBestSize(size);
- }
+ SetInitialBestSize(size);
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
}
+// 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
+{
+ // take size according to layout
+ wxSize bestSize(
+#ifdef __SMARTPHONE__
+ 0,GetCharHeight()
+#else // !__SMARTPHONE__
+ GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
+ GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
+#endif // __SMARTPHONE__/!__SMARTPHONE__
+ );
+
+ // correct size as for undocumented MSW variants cases (WinCE and perhaps others)
+ if (bestSize.x==0)
+ bestSize.x = bestSize.y;
+ if (bestSize.y==0)
+ bestSize.y = bestSize.x;
+
+ // double size according to layout
+ if (is_vertical)
+ bestSize.y *= 2;
+ else
+ bestSize.x *= 2;
+
+ return bestSize;
+}
+
/* static */ wxVisualAttributes
wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
// another version for the "composite", i.e. non simple controls
/* static */ wxVisualAttributes
-wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant variant)
+wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
wxVisualAttributes attrs;
attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
WXLPARAM lParam,
WXLPARAM* result)
{
- wxEventType eventType = wxEVT_NULL;
+ wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL);
NMHDR *hdr = (NMHDR*) lParam;
switch ( hdr->code )
//
// Call this repeatedly for several wnds to find the overall size
// of the widget.
-// Call it initially with -1 for all values in rect.
+// Call it initially with wxDefaultCoord for all values in rect.
// Keep calling for other widgets, and rect will be modified
// to calculate largest bounding rectangle.
void wxFindMaxSize(WXHWND wnd, RECT *rect)