#include "wx/settings.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
+ #include "wx/statusbr.h"
#endif //WX_PRECOMP
#if wxUSE_CONSTRAINTS
// m_foregroundColour = *wxBLACK; // TODO take this from sys settings too?
m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
-#if !defined(__WXMAC__) && !defined(__WXGTK__)
- m_font = *wxSWISS_FONT; // and this?
-#else
+ // GRG, changed Mar/2000
m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-#endif
-
// no style bits
m_exStyle =
m_windowStyle = 0;
m_windowId = id == -1 ? NewControlId() : id;
SetName(name);
-
- // if the parent window has wxWS_EX_VALIDATE_RECURSIVELY set, we want to
- // have it too - like this it's possible to set it only in the top level
- // dialog/frame and all children will inherit it by defult
- if ( parent && (parent->GetWindowStyle() & wxWS_EX_VALIDATE_RECURSIVELY) )
- {
- style |= wxWS_EX_VALIDATE_RECURSIVELY;
- }
-
SetWindowStyleFlag(style);
SetParent(parent);
SetValidator(validator);
#endif // wxUSE_VALIDATORS
+ // if the parent window has wxWS_EX_VALIDATE_RECURSIVELY set, we want to
+ // have it too - like this it's possible to set it only in the top level
+ // dialog/frame and all children will inherit it by defult
+ if ( parent && (parent->GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) )
+ {
+ SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
+ }
+
return TRUE;
}
// centre the window with respect to its parent in either (or both) directions
void wxWindowBase::Centre(int direction)
{
+ // the position/size of the parent window or of the entire screen
+ wxPoint posParent;
int widthParent, heightParent;
- wxWindow *parent = GetParent();
- if ( !parent )
+ wxWindow *parent = NULL;
+
+ if ( !(direction & wxCENTRE_ON_SCREEN) )
{
- // no other choice
- direction |= wxCENTRE_ON_SCREEN;
+ // find the parent to centre this window on: it should be the
+ // immediate parent for the controls but the top level parent for the
+ // top level windows (like dialogs)
+ parent = GetParent();
+ if ( IsTopLevel() )
+ {
+ while ( parent && !parent->IsTopLevel() )
+ {
+ parent = parent->GetParent();
+ }
+ }
+
+ // did we find the parent?
+ if ( !parent )
+ {
+ // no other choice
+ direction |= wxCENTRE_ON_SCREEN;
+ }
}
if ( direction & wxCENTRE_ON_SCREEN )
}
else
{
- // centre inside the parents rectangle
- parent->GetClientSize(&widthParent, &heightParent);
+ if ( IsTopLevel() )
+ {
+ // centre on the parent
+ parent->GetSize(&widthParent, &heightParent);
+
+ // adjust to the parents position
+ posParent = parent->GetPosition();
+ }
+ else
+ {
+ // centre inside the parents client rectangle
+ parent->GetClientSize(&widthParent, &heightParent);
+ }
}
int width, height;
if ( direction & wxVERTICAL )
yNew = (heightParent - height)/2;
- // controls are always centered on their parent because it doesn't make
- // sense to centre them on the screen
- if ( !(direction & wxCENTRE_ON_SCREEN) || !IsTopLevel() )
- {
- // the only chance to get this is to have a not top level window
- // without parent which shouldn't happen
- wxCHECK_RET( parent, wxT("this window must have a parent") );
-
- // adjust to the parents client area origin
- wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));
-
- xNew += posParent.x;
- yNew += posParent.y;
- }
+ xNew += posParent.x;
+ yNew += posParent.y;
// move the centre of this window to this position
Move(xNew, yNew);
node = node->GetNext() )
{
wxWindow *win = node->GetData();
- if ( win->IsTopLevel() )
+ if ( win->IsTopLevel() || wxDynamicCast(win, wxStatusBar) )
{
// dialogs and frames lie in different top level windows -
- // don't deal with them here
+ // don't deal with them here; as for the status bars, they
+ // don't lie in the client area at all
continue;
}
int wx, wy, ww, wh;
win->GetPosition(&wx, &wy);
+
+ // if the window hadn't been positioned yet, assume that it is in
+ // the origin
+ if ( wx == -1 )
+ wx = 0;
+ if ( wy == -1 )
+ wy = 0;
+
win->GetSize(&ww, &wh);
if ( wx + ww > maxX )
maxX = wx + ww;
{
wxCHECK_RET( child, wxT("can't add a NULL child") );
+ // this should never happen and it will lead to a crash later if it does
+ // because RemoveChild() will remove only one node from the children list
+ // and the other(s) one(s) will be left with dangling pointers in them
+ wxASSERT_MSG( !GetChildren().Find(child), _T("AddChild() called twice") );
+
GetChildren().Append(child);
child->SetParent(this);
}
bool wxWindowBase::SetCursor(const wxCursor& cursor)
{
- // don't try to set invalid cursor, always fall back to the default
- const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
-
- if ( (wxCursor&)cursorOk == m_cursor )
+ // setting an invalid cursor is ok, it means that we don't have any special
+ // cursor
+ if ( m_cursor == cursor )
{
// no change
return FALSE;
}
- m_cursor = cursorOk;
+ m_cursor = cursor;
return TRUE;
}
wxMessageBox(wxString::Format(
_T(
- " wxWindows Library (%s port)\n"
- "Version %u.%u.%u, compiled at %s %s\n"
- " Copyright (c) 1995-2000 wxWindows team"
+ " wxWindows Library (%s port)\nVersion %u.%u.%u, compiled at %s %s\n Copyright (c) 1995-2000 wxWindows team"
),
port.c_str(),
wxMAJOR_VERSION,
projects / wxWidgets.git / blobdiff