X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..c43430bbacbf26414693fcf47fe54a8090c6bfcb:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 782d3bf7d1..c6a369eb14 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -35,11 +35,14 @@ #include "wx/frame.h" #include "wx/defs.h" #include "wx/window.h" + #include "wx/control.h" #include "wx/checkbox.h" #include "wx/radiobut.h" #include "wx/textctrl.h" #include "wx/settings.h" #include "wx/dialog.h" + #include "wx/msgdlg.h" + #include "wx/statusbr.h" #endif //WX_PRECOMP #if wxUSE_CONSTRAINTS @@ -51,6 +54,10 @@ #include "wx/dnd.h" #endif // wxUSE_DRAG_AND_DROP +#if wxUSE_HELP + #include "wx/cshelp.h" +#endif // wxUSE_HELP + #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS @@ -74,6 +81,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler) BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler) EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged) EVT_INIT_DIALOG(wxWindowBase::OnInitDialog) + EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick) + +#if wxUSE_HELP + EVT_HELP(-1, wxWindowBase::OnHelp) +#endif // wxUSE_HELP + END_EVENT_TABLE() // ============================================================================ @@ -102,10 +115,6 @@ void wxWindowBase::InitBase() m_isShown = FALSE; m_isEnabled = TRUE; - // no client data (yet) - m_clientData = NULL; - m_clientDataType = ClientData_None; - // the default event handler is just this window m_eventHandler = this; @@ -115,16 +124,23 @@ void wxWindowBase::InitBase() #endif // wxUSE_VALIDATORS // use the system default colours - wxSystemSettings settings; + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); + m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + + // don't set the font here for wxMSW as we don't call WM_SETFONT here and + // so the font is *not* really set - but calls to SetFont() later won't do + // anything because m_font appears to be already set! +#ifndef __WXMSW__ + m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); +#endif // __WXMSW__ + + // the colours/fonts are default for now + m_hasBgCol = + m_hasFgCol = + m_hasFont = FALSE; - m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE); - m_foregroundColour = *wxBLACK; // TODO take this from sys settings too? -#ifndef __WXMAC__ - m_font = *wxSWISS_FONT; // and this? -#else - m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT); -#endif // no style bits + m_exStyle = m_windowStyle = 0; // an optimization for the event processing: checking this flag is much @@ -150,6 +166,9 @@ void wxWindowBase::InitBase() #if wxUSE_CARET m_caret = (wxCaret *)NULL; #endif // wxUSE_CARET + + // Whether we're using the current theme for this window (wxGTK only for now) + m_themeEnabled = FALSE; } // common part of window creation process @@ -158,13 +177,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent, const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), long style, -#if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator, -# else const wxValidator& validator, -# endif -#endif const wxString& name) { // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other @@ -178,7 +191,18 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent, SetName(name); SetWindowStyleFlag(style); SetParent(parent); + +#if wxUSE_VALIDATORS 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; } @@ -190,6 +214,8 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent, // common clean up wxWindowBase::~wxWindowBase() { + wxASSERT_MSG( GetCapture() != this, wxT("attempt to destroy window with mouse capture") ); + // FIXME if these 2 cases result from programming errors in the user code // we should probably assert here instead of silently fixing them @@ -203,16 +229,6 @@ wxWindowBase::~wxWindowBase() wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") ); - // make sure that there are no dangling pointers left pointing to us - wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); - if ( panel ) - { - if ( panel->GetLastFocus() == this ) - { - panel->SetLastFocus((wxWindow *)NULL); - } - } - #if wxUSE_CARET if ( m_caret ) delete m_caret; @@ -223,10 +239,6 @@ wxWindowBase::~wxWindowBase() delete m_windowValidator; #endif // wxUSE_VALIDATORS - // we only delete object data, not untyped - if ( m_clientDataType == ClientData_Object ) - delete m_clientObject; - #if wxUSE_CONSTRAINTS // Have to delete constraints/sizer FIRST otherwise sizers may try to look // at deleted windows as they delete themselves. @@ -255,6 +267,12 @@ wxWindowBase::~wxWindowBase() if ( m_tooltip ) delete m_tooltip; #endif // wxUSE_TOOLTIPS + + // reset the dangling pointer our parent window may keep to us + if ( m_parent && m_parent->GetDefaultItem() == this ) + { + m_parent->SetDefaultItem(NULL); + } } bool wxWindowBase::Destroy() @@ -292,6 +310,7 @@ bool wxWindowBase::DestroyChildren() wxASSERT_MSG( child, wxT("children list contains empty nodes") ); + child->Show(FALSE); delete child; wxASSERT_MSG( !GetChildren().Find(child), @@ -308,13 +327,32 @@ bool wxWindowBase::DestroyChildren() // 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 ) @@ -324,8 +362,19 @@ void wxWindowBase::Centre(int direction) } 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; @@ -340,22 +389,36 @@ void wxWindowBase::Centre(int direction) 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) || wxDynamicCast(this, wxControl) ) - { - // theo nly chance to get this is to have a wxControl without parent - wxCHECK_RET( parent, wxT("a control must have a parent") ); + xNew += posParent.x; + yNew += posParent.y; - // adjust to the parents client area origin - wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0)); + // Base size of the visible dimensions of the display + // to take into account the taskbar + wxRect rect = wxGetClientDisplayRect(); + wxSize size (rect.width,rect.height); - xNew += posParent.x; - yNew += posParent.y; + if (posParent.x >= 0) // if parent is on the main display + { + if (xNew < 0) + xNew = 0; + else if (xNew+width > size.x) + xNew = size.x-width-1; + } + if (posParent.y >= 0) // if parent is on the main display + { + if (yNew+height > size.y) + yNew = size.y-height-1; + + // Make certain that the title bar is initially visible + // always, even if this would push the bottom of the + // dialog of the visible area of the display + if (yNew < 0) + yNew = 0; } - // move the centre of this window to this position - Move(xNew, yNew); + // move the window to this position (keeping the old size but using + // SetSize() and not Move() to allow xNew and/or yNew to be -1) + SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE); } // fits the window around the children @@ -363,7 +426,14 @@ void wxWindowBase::Fit() { if ( GetChildren().GetCount() > 0 ) { - SetClientSize(DoGetBestSize()); + wxSize size = DoGetBestSize(); + + // for compatibility with the old versions and because it really looks + // slightly more pretty like this, add a pad + size.x += 7; + size.y += 14; + + SetClientSize(size); } //else: do nothing if we have no children } @@ -382,15 +452,28 @@ wxSize wxWindowBase::DoGetBestSize() const node = node->GetNext() ) { wxWindow *win = node->GetData(); - if ( win->IsTopLevel() ) + if ( win->IsTopLevel() +#if wxUSE_STATUSBAR + || wxDynamicCast(win, wxStatusBar) +#endif // wxUSE_STATUSBAR + ) { // 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; @@ -398,8 +481,7 @@ wxSize wxWindowBase::DoGetBestSize() const maxY = wy + wh; } - // leave a margin - return wxSize(maxX + 7, maxY + 14); + return wxSize(maxX, maxY); } else { @@ -409,6 +491,12 @@ wxSize wxWindowBase::DoGetBestSize() const } } +// by default the origin is not shifted +wxPoint wxWindowBase::GetClientAreaOrigin() const +{ + return wxPoint(0, 0); +} + // set the min/max size of the window void wxWindowBase::SetSizeHints(int minW, int minH, int maxW, int maxH, @@ -468,6 +556,11 @@ void wxWindowBase::AddChild(wxWindowBase *child) { 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); } @@ -551,6 +644,8 @@ bool wxWindowBase::SetBackgroundColour( const wxColour &colour ) m_backgroundColour = colour; + m_hasBgCol = TRUE; + return TRUE; } @@ -561,21 +656,22 @@ bool wxWindowBase::SetForegroundColour( const wxColour &colour ) m_foregroundColour = colour; + m_hasFgCol = TRUE; + return TRUE; } 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; } @@ -585,7 +681,7 @@ bool wxWindowBase::SetFont(const wxFont& font) // don't try to set invalid font, always fall back to the default const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT; - if ( (wxFont&)fontOk == m_font ) + if ( fontOk == m_font ) { // no change return FALSE; @@ -593,6 +689,8 @@ bool wxWindowBase::SetFont(const wxFont& font) m_font = fontOk; + m_hasFont = TRUE; + return TRUE; } @@ -619,18 +717,6 @@ void wxWindowBase::SetCaret(wxCaret *caret) // validators // ---------------------------------------------------------------------------- -# if defined(__VISAGECPP__) -void wxWindowBase::SetValidator(const wxValidator* validator) -{ - if ( m_windowValidator ) - delete m_windowValidator; - - m_windowValidator = (wxValidator *)validator->Clone(); - - if ( m_windowValidator ) - m_windowValidator->SetWindow(this) ; -} -# else void wxWindowBase::SetValidator(const wxValidator& validator) { if ( m_windowValidator ) @@ -641,13 +727,24 @@ void wxWindowBase::SetValidator(const wxValidator& validator) if ( m_windowValidator ) m_windowValidator->SetWindow(this) ; } -# endif // __VISAGECPP__ #endif // wxUSE_VALIDATORS // ---------------------------------------------------------------------------- -// update region testing +// update region stuff // ---------------------------------------------------------------------------- +wxRect wxWindowBase::GetUpdateClientRect() const +{ + wxRegion rgnUpdate = GetUpdateRegion(); + rgnUpdate.Intersect(GetClientRect()); + wxRect rectUpdate = rgnUpdate.GetBox(); + wxPoint ptOrigin = GetClientAreaOrigin(); + rectUpdate.x -= ptOrigin.x; + rectUpdate.y -= ptOrigin.y; + + return rectUpdate; +} + bool wxWindowBase::IsExposed(int x, int y) const { return m_updateRegion.Contains(x, y) != wxOutRegion; @@ -718,6 +815,8 @@ void wxWindowBase::MakeModal(bool modal) bool wxWindowBase::Validate() { #if wxUSE_VALIDATORS + bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0; + wxWindowList::Node *node; for ( node = m_children.GetFirst(); node; node = node->GetNext() ) { @@ -727,6 +826,11 @@ bool wxWindowBase::Validate() { return FALSE; } + + if ( recurse && !child->Validate() ) + { + return FALSE; + } } #endif // wxUSE_VALIDATORS @@ -736,6 +840,8 @@ bool wxWindowBase::Validate() bool wxWindowBase::TransferDataToWindow() { #if wxUSE_VALIDATORS + bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0; + wxWindowList::Node *node; for ( node = m_children.GetFirst(); node; node = node->GetNext() ) { @@ -743,15 +849,20 @@ bool wxWindowBase::TransferDataToWindow() wxValidator *validator = child->GetValidator(); if ( validator && !validator->TransferToWindow() ) { - wxLog *log = wxLog::GetActiveTarget(); - if ( log ) - { - wxLogWarning(_("Could not transfer data to window")); - log->Flush(); - } + wxLogWarning(_("Could not transfer data to window")); + wxLog::FlushActive(); return FALSE; } + + if ( recurse ) + { + if ( !child->TransferDataToWindow() ) + { + // warning already given + return FALSE; + } + } } #endif // wxUSE_VALIDATORS @@ -761,15 +872,29 @@ bool wxWindowBase::TransferDataToWindow() bool wxWindowBase::TransferDataFromWindow() { #if wxUSE_VALIDATORS + bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0; + wxWindowList::Node *node; for ( node = m_children.GetFirst(); node; node = node->GetNext() ) { wxWindow *child = node->GetData(); - if ( child->GetValidator() && - !child->GetValidator()->TransferFromWindow() ) + wxValidator *validator = child->GetValidator(); + if ( validator && !validator->TransferFromWindow() ) { + // nop warning here because the application is supposed to give + // one itself - we don't know here what might have gone wrongly + return FALSE; } + + if ( recurse ) + { + if ( !child->TransferDataFromWindow() ) + { + // warning already given + return FALSE; + } + } } #endif // wxUSE_VALIDATORS @@ -783,6 +908,64 @@ void wxWindowBase::InitDialog() GetEventHandler()->ProcessEvent(event); } +// ---------------------------------------------------------------------------- +// context-sensitive help support +// ---------------------------------------------------------------------------- + +#if wxUSE_HELP + +// associate this help text with this window +void wxWindowBase::SetHelpText(const wxString& text) +{ + wxHelpProvider *helpProvider = wxHelpProvider::Get(); + if ( helpProvider ) + { + helpProvider->AddHelp(this, text); + } +} + +// associate this help text with all windows with the same id as this +// one +void wxWindowBase::SetHelpTextForId(const wxString& text) +{ + wxHelpProvider *helpProvider = wxHelpProvider::Get(); + if ( helpProvider ) + { + helpProvider->AddHelp(GetId(), text); + } +} + +// get the help string associated with this window (may be empty) +wxString wxWindowBase::GetHelpText() const +{ + wxString text; + wxHelpProvider *helpProvider = wxHelpProvider::Get(); + if ( helpProvider ) + { + text = helpProvider->GetHelp(this); + } + + return text; +} + +// show help for this window +void wxWindowBase::OnHelp(wxHelpEvent& event) +{ + wxHelpProvider *helpProvider = wxHelpProvider::Get(); + if ( helpProvider ) + { + if ( helpProvider->ShowHelp(this) ) + { + // skip the event.Skip() below + return; + } + } + + event.Skip(); +} + +#endif // wxUSE_HELP + // ---------------------------------------------------------------------------- // tooltips // ---------------------------------------------------------------------------- @@ -936,27 +1119,37 @@ void wxWindowBase::SetSizer(wxSizer *sizer) bool wxWindowBase::Layout() { - int w, h; - GetClientSize(&w, &h); - // If there is a sizer, use it instead of the constraints if ( GetSizer() ) { + int w, h; + GetClientSize(&w, &h); + GetSizer()->SetDimension( 0, 0, w, h ); - return TRUE; } - - if ( GetConstraints() ) + else { - GetConstraints()->width.SetValue(w); - GetConstraints()->height.SetValue(h); + wxLayoutConstraints *constr = GetConstraints(); + bool wasOk = constr && constr->AreSatisfied(); + + ResetConstraints(); // Mark all constraints as unevaluated + + // if we're a top level panel (i.e. our parent is frame/dialog), our + // own constraints will never be satisfied any more unless we do it + // here + if ( wasOk ) + { + int noChanges = 1; + while ( noChanges > 0 ) + { + constr->SatisfyConstraints(this, &noChanges); + } + } + + DoPhase(1); // Layout children + DoPhase(2); // Layout grand children + SetConstraintSizes(); // Recursively set the real window sizes } - - // Evaluate child constraints - ResetConstraints(); // Mark all constraints as unevaluated - DoPhase(1); // Just one phase need if no sizers involved - DoPhase(2); - SetConstraintSizes(); // Recursively set the real window sizes return TRUE; } @@ -1042,6 +1235,7 @@ void wxWindowBase::ResetConstraints() constr->centreX.SetDone(FALSE); constr->centreY.SetDone(FALSE); } + wxWindowList::Node *node = GetChildren().GetFirst(); while (node) { @@ -1057,8 +1251,7 @@ void wxWindowBase::ResetConstraints() void wxWindowBase::SetConstraintSizes(bool recurse) { wxLayoutConstraints *constr = GetConstraints(); - if ( constr && constr->left.GetDone() && constr->right.GetDone( ) && - constr->width.GetDone() && constr->height.GetDone()) + if ( constr && constr->AreSatisfied() ) { int x = constr->left.GetValue(); int y = constr->top.GetValue(); @@ -1078,21 +1271,9 @@ void wxWindowBase::SetConstraintSizes(bool recurse) } else if ( constr ) { - wxChar *windowClass = GetClassInfo()->GetClassName(); - - wxString winName; - if ( GetName() == wxT("") ) - winName = wxT("unnamed"); - else - winName = GetName(); - wxLogDebug( wxT("Constraint(s) not satisfied for window of type %s, name %s:\n"), - (const wxChar *)windowClass, - (const wxChar *)winName); - if ( !constr->left.GetDone()) wxLogDebug( wxT(" unsatisfied 'left' constraint.\n") ); - if ( !constr->right.GetDone()) wxLogDebug( wxT(" unsatisfied 'right' constraint.\n") ); - if ( !constr->width.GetDone()) wxLogDebug( wxT(" unsatisfied 'width' constraint.\n") ); - if ( !constr->height.GetDone()) wxLogDebug( wxT(" unsatisfied 'height' constraint.\n") ); - wxLogDebug( wxT("Please check constraints: try adding AsIs() constraints.\n") ); + wxLogDebug(wxT("Constraints not satisfied for %s named '%s'."), + GetClassInfo()->GetClassName(), + GetName().c_str()); } if ( recurse ) @@ -1101,7 +1282,7 @@ void wxWindowBase::SetConstraintSizes(bool recurse) while (node) { wxWindow *win = node->GetData(); - if ( !win->IsTopLevel() ) + if ( !win->IsTopLevel() && win->GetConstraints() ) win->SetConstraintSizes(); node = node->GetNext(); } @@ -1179,6 +1360,23 @@ void wxWindowBase::GetClientSizeConstraint(int *w, int *h) const GetClientSize(w, h); } +void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) +{ + // don't do it for the dialogs/frames - they float independently of their + // parent + if ( !IsTopLevel() ) + { + wxWindow *parent = GetParent(); + if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent ) + { + wxPoint pt(parent->GetClientAreaOrigin()); + x += pt.x; + y += pt.y; + } + } +} + + void wxWindowBase::GetPositionConstraint(int *x, int *y) const { wxLayoutConstraints *constr = GetConstraints(); @@ -1203,6 +1401,7 @@ void wxWindowBase::GetPositionConstraint(int *x, int *y) const // of control classes. void wxWindowBase::UpdateWindowUI() { +#if wxUSE_CONTROLS wxUpdateUIEvent event(GetId()); event.m_eventObject = this; @@ -1213,19 +1412,21 @@ void wxWindowBase::UpdateWindowUI() if ( event.GetSetText() ) { - wxControl *control = wxDynamicCast(this, wxControl); + wxControl *control = wxDynamicCastThis(wxControl); if ( control ) { +#if wxUSE_TEXTCTRL wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl); if ( text ) text->SetValue(event.GetText()); else +#endif // wxUSE_TEXTCTRL control->SetLabel(event.GetText()); } } #if wxUSE_CHECKBOX - wxCheckBox *checkbox = wxDynamicCast(this, wxCheckBox); + wxCheckBox *checkbox = wxDynamicCastThis(wxCheckBox); if ( checkbox ) { if ( event.GetSetChecked() ) @@ -1233,15 +1434,16 @@ void wxWindowBase::UpdateWindowUI() } #endif // wxUSE_CHECKBOX -#if wxUSE_RADIOBUTTON - wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton); +#if wxUSE_RADIOBTN + wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton); if ( radiobtn ) { if ( event.GetSetChecked() ) radiobtn->SetValue(event.GetChecked()); } -#endif // wxUSE_RADIOBUTTON +#endif // wxUSE_RADIOBTN } +#endif // wxUSE_CONTROLS } // ---------------------------------------------------------------------------- @@ -1274,47 +1476,6 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) return pt2; } -// ---------------------------------------------------------------------------- -// client data -// ---------------------------------------------------------------------------- - -void wxWindowBase::DoSetClientObject( wxClientData *data ) -{ - wxASSERT_MSG( m_clientDataType != ClientData_Void, - wxT("can't have both object and void client data") ); - - if ( m_clientObject ) - delete m_clientObject; - - m_clientObject = data; - m_clientDataType = ClientData_Object; -} - -wxClientData *wxWindowBase::DoGetClientObject() const -{ - wxASSERT_MSG( m_clientDataType == ClientData_Object, - wxT("this window doesn't have object client data") ); - - return m_clientObject; -} - -void wxWindowBase::DoSetClientData( void *data ) -{ - wxASSERT_MSG( m_clientDataType != ClientData_Object, - wxT("can't have both object and void client data") ); - - m_clientData = data; - m_clientDataType = ClientData_Void; -} - -void *wxWindowBase::DoGetClientData() const -{ - wxASSERT_MSG( m_clientDataType == ClientData_Void, - wxT("this window doesn't have void client data") ); - - return m_clientData; -} - // ---------------------------------------------------------------------------- // event handlers // ---------------------------------------------------------------------------- @@ -1344,6 +1505,66 @@ void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) ) TransferDataToWindow(); } +// process Ctrl-Alt-mclick +void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) +{ +#if wxUSE_MSGDLG + if ( event.ControlDown() && event.AltDown() ) + { + // don't translate these strings + wxString port; + switch ( wxGetOsVersion() ) + { + case wxMOTIF_X: port = _T("Motif"); break; + case wxMAC: + case wxMAC_DARWIN: port = _T("Mac"); break; + case wxBEOS: port = _T("BeOS"); break; + case wxGTK: + case wxGTK_WIN32: + case wxGTK_OS2: + case wxGTK_BEOS: port = _T("GTK"); break; + case wxWINDOWS: + case wxPENWINDOWS: + case wxWINDOWS_NT: + case wxWIN32S: + case wxWIN95: + case wxWIN386: port = _T("MS Windows"); break; + case wxMGL_UNIX: + case wxMGL_X: + case wxMGL_WIN32: + case wxMGL_OS2: port = _T("MGL"); break; + case wxWINDOWS_OS2: + case wxOS2_PM: port = _T("OS/2"); break; + default: port = _T("unknown"); break; + } + + wxMessageBox(wxString::Format( + _T( + " wxWindows Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n Copyright (c) 1995-2001 wxWindows team" + ), + port.c_str(), + wxMAJOR_VERSION, + wxMINOR_VERSION, + wxRELEASE_NUMBER, +#if wxUSE_UNICODE + L" (Unicode)", +#else + "", +#endif + __TDATE__, + __TTIME__ + ), + _T("wxWindows information"), + wxICON_INFORMATION | wxOK, + (wxWindow *)this); + } + else +#endif // wxUSE_MSGDLG + { + event.Skip(); + } +} + // ---------------------------------------------------------------------------- // list classes implementation // ---------------------------------------------------------------------------- @@ -1353,3 +1574,92 @@ void wxWindowListNode::DeleteData() delete (wxWindow *)GetData(); } +// ---------------------------------------------------------------------------- +// borders +// ---------------------------------------------------------------------------- + +wxBorder wxWindowBase::GetBorder() const +{ + wxBorder border = (wxBorder)(m_windowStyle & wxBORDER_MASK); + if ( border == wxBORDER_DEFAULT ) + { + border = GetDefaultBorder(); + } + + return border; +} + +wxBorder wxWindowBase::GetDefaultBorder() const +{ + return wxBORDER_NONE; +} + +// ---------------------------------------------------------------------------- +// hit testing +// ---------------------------------------------------------------------------- + +wxHitTest wxWindowBase::DoHitTest(wxCoord x, wxCoord y) const +{ + // here we just check if the point is inside the window or not + + // check the top and left border first + bool outside = x < 0 || y < 0; + if ( !outside ) + { + // check the right and bottom borders too + wxSize size = GetSize(); + outside = x >= size.x || y >= size.y; + } + + return outside ? wxHT_WINDOW_OUTSIDE : wxHT_WINDOW_INSIDE; +} + +// ---------------------------------------------------------------------------- +// mouse capture +// ---------------------------------------------------------------------------- + +struct WXDLLEXPORT wxWindowNext +{ + wxWindow *win; + wxWindowNext *next; +} *wxWindowBase::ms_winCaptureNext = NULL; + +void wxWindowBase::CaptureMouse() +{ + wxLogTrace(_T("mousecapture"), _T("CaptureMouse(0x%08x)"), this); + + wxWindow *winOld = GetCapture(); + if ( winOld ) + { + // save it on stack + wxWindowNext *item = new wxWindowNext; + item->win = winOld; + item->next = ms_winCaptureNext; + ms_winCaptureNext = item; + } + //else: no mouse capture to save + + DoCaptureMouse(); +} + +void wxWindowBase::ReleaseMouse() +{ + wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(0x%08x)"), this); + + DoReleaseMouse(); + + if ( ms_winCaptureNext ) + { + ms_winCaptureNext->win->CaptureMouse(); + + wxWindowNext *item = ms_winCaptureNext; + ms_winCaptureNext = item->next; + delete item; + } + //else: stack is empty, no previous capture + + wxLogTrace(_T("mousecapture"), + _T("After ReleaseMouse() mouse is captured by 0x%08x"), + GetCapture()); +} +