m_isShown = FALSE;
m_isEnabled = TRUE;
- // no client data (yet)
- m_clientData = NULL;
- m_clientDataType = wxClientData_None;
-
// the default event handler is just this window
m_eventHandler = this;
#endif // wxUSE_VALIDATORS
// use the system default colours
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE);
- m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
+ 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::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
#endif // __WXMSW__
+ // the colours/fonts are default for now
+ m_hasBgCol =
+ m_hasFgCol =
+ m_hasFont = FALSE;
+
// no style bits
m_exStyle =
m_windowStyle = 0;
// 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
delete m_windowValidator;
#endif // wxUSE_VALIDATORS
- // we only delete object data, not untyped
- if ( m_clientDataType == wxClientData_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.
return handlerA;
}
+bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
+{
+ wxCHECK_MSG( handler, FALSE, _T("RemoveEventHandler(NULL) called") );
+
+ wxEvtHandler *handlerPrev = NULL,
+ *handlerCur = GetEventHandler();
+ while ( handlerCur )
+ {
+ wxEvtHandler *handlerNext = handlerCur->GetNextHandler();
+
+ if ( handlerCur == handler )
+ {
+ if ( handlerPrev )
+ {
+ handlerPrev->SetNextHandler(handlerNext);
+ }
+ else
+ {
+ SetEventHandler(handlerNext);
+ }
+
+ handler->SetNextHandler(NULL);
+
+ return TRUE;
+ }
+
+ handlerPrev = handlerCur;
+ handlerCur = handlerNext;
+ }
+
+ wxFAIL_MSG( _T("where has the event handler gone?") );
+
+ return FALSE;
+}
+
// ----------------------------------------------------------------------------
// cursors, fonts &c
// ----------------------------------------------------------------------------
m_backgroundColour = colour;
+ m_hasBgCol = TRUE;
+
return TRUE;
}
m_foregroundColour = colour;
+ m_hasFgCol = TRUE;
+
return TRUE;
}
m_font = fontOk;
+ m_hasFont = TRUE;
+
return TRUE;
}
return pt2;
}
-// ----------------------------------------------------------------------------
-// client data
-// ----------------------------------------------------------------------------
-
-void wxWindowBase::DoSetClientObject( wxClientData *data )
-{
- wxASSERT_MSG( m_clientDataType != wxClientData_Void,
- wxT("can't have both object and void client data") );
-
- if ( m_clientObject )
- delete m_clientObject;
-
- m_clientObject = data;
- m_clientDataType = wxClientData_Object;
-}
-
-wxClientData *wxWindowBase::DoGetClientObject() const
-{
- // it's not an error to call GetClientObject() on a window which doesn't
- // have client data at all - NULL will be returned
- wxASSERT_MSG( m_clientDataType != wxClientData_Void,
- wxT("this window doesn't have object client data") );
-
- return m_clientObject;
-}
-
-void wxWindowBase::DoSetClientData( void *data )
-{
- wxASSERT_MSG( m_clientDataType != wxClientData_Object,
- wxT("can't have both object and void client data") );
-
- m_clientData = data;
- m_clientDataType = wxClientData_Void;
-}
-
-void *wxWindowBase::DoGetClientData() const
-{
- // it's not an error to call GetClientData() on a window which doesn't have
- // client data at all - NULL will be returned
- wxASSERT_MSG( m_clientDataType != wxClientData_Object,
- wxT("this window doesn't have void client data") );
-
- return m_clientData;
-}
-
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
switch ( wxGetOsVersion() )
{
case wxMOTIF_X: port = _T("Motif"); break;
- case wxMACINTOSH: port = _T("Mac"); break;
+ case wxMAC:
+ case wxMAC_DARWIN: port = _T("Mac"); break;
case wxBEOS: port = _T("BeOS"); break;
case wxGTK:
case wxGTK_WIN32:
wxMessageBox(wxString::Format(
_T(
- " wxWindows Library (%s port)\nVersion %u.%u.%u, compiled at %s %s\n Copyright (c) 1995-2000 wxWindows team"
+ " 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,
- __DATE__,
- __TIME__
+#if wxUSE_UNICODE
+ L" (Unicode)",
+#else
+ "",
+#endif
+ __TDATE__,
+ __TTIME__
),
_T("wxWindows information"),
wxICON_INFORMATION | wxOK,
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);
+
+ wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") )
+
+ 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());
+}
+
projects / wxWidgets.git / blobdiff