X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac32ba44a150c9de37a9b56ef7cb10521d0e9347..b6a20a20d010d643e52914f51aa0700df0da925f:/src/x11/window.cpp?ds=sidebyside diff --git a/src/x11/window.cpp b/src/x11/window.cpp index fe52bbff49..666f2d0157 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "window.h" #endif @@ -62,8 +62,6 @@ // global variables for this module // ---------------------------------------------------------------------------- -extern wxHashTable *wxWidgetHashTable; -extern wxHashTable *wxClientWidgetHashTable; static wxWindow* g_captureWindow = NULL; static GC g_eraseGC; @@ -99,9 +97,6 @@ END_EVENT_TABLE() void wxWindowX11::Init() { - // generic initializations first - InitBase(); - // X11-specific m_mainWindow = (WXWindow) 0; m_clientWindow = (WXWindow) 0; @@ -111,7 +106,6 @@ void wxWindowX11::Init() m_winCaptured = FALSE; m_needsInputFocus = FALSE; m_isShown = TRUE; - m_isBeingDeleted = FALSE; m_lastTS = 0; m_lastButton = 0; } @@ -123,7 +117,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" ); + wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") ); CreateBase(parent, id, pos, size, style, wxDefaultValidator, name); @@ -224,7 +218,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | PropertyChangeMask | VisibilityChangeMask ; - if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE )) + if (!HasFlag( wxFULL_REPAINT_ON_RESIZE )) { xattributes_mask |= CWBitGravity; xattributes.bit_gravity = StaticGravity; @@ -304,7 +298,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | PropertyChangeMask | VisibilityChangeMask ; - if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE )) + if (!HasFlag( wxFULL_REPAINT_ON_RESIZE )) { xattributes_mask |= CWBitGravity; xattributes.bit_gravity = NorthWestGravity; @@ -348,9 +342,6 @@ wxWindowX11::~wxWindowX11() m_isBeingDeleted = TRUE; - if (m_parent) - m_parent->RemoveChild( this ); - DestroyChildren(); if (m_clientWindow != m_mainWindow) @@ -471,7 +462,7 @@ void wxWindowX11::DoCaptureMouse() { if ((g_captureWindow != NULL) && (g_captureWindow != this)) { - wxASSERT_MSG(FALSE, "Trying to capture before mouse released."); + wxASSERT_MSG(FALSE, wxT("Trying to capture before mouse released.")); // Core dump now int *tmp = NULL; @@ -989,7 +980,7 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int wxWindowX11::GetCharHeight() const { - wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); + wxCHECK_MSG( m_font.Ok(), 0, wxT("valid window font needed") ); #if wxUSE_UNICODE // There should be an easier way. @@ -1016,7 +1007,7 @@ int wxWindowX11::GetCharHeight() const int wxWindowX11::GetCharWidth() const { - wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); + wxCHECK_MSG( m_font.Ok(), 0, wxT("valid window font needed") ); #if wxUSE_UNICODE // There should be an easier way. @@ -1163,14 +1154,6 @@ void wxWindowX11::Update() } } -void wxWindowX11::Clear() -{ -// wxClientDC dc((wxWindow*) this); -// wxBrush brush(GetBackgroundColour(), wxSOLID); -// dc.SetBackground(brush); -// dc.Clear(); -} - void wxWindowX11::SendEraseEvents() { if (m_clearRegion.IsEmpty()) return; @@ -1308,73 +1291,71 @@ void wxWindowX11::OnInternalIdle() } // ---------------------------------------------------------------------------- -// function which maintain the global hash table mapping Widgets to wxWindows +// function which maintain the global hash table mapping Widgets to wxWidgets // ---------------------------------------------------------------------------- -bool wxAddWindowToTable(Window w, wxWindow *win) +static bool DoAddWindowToTable(wxWindowHash *hash, Window w, wxWindow *win) { - wxWindow *oldItem = NULL; - if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w))) + if ( !hash->insert(wxWindowHash::value_type(w, win)).second ) { - wxLogDebug( wxT("Widget table clash: new widget is %ld, %s"), - (long)w, win->GetClassInfo()->GetClassName()); + wxLogDebug( wxT("Widget table clash: new widget is 0x%08x, %s"), + (unsigned int)w, win->GetClassInfo()->GetClassName()); return FALSE; } - wxWidgetHashTable->Put((long) w, win); - wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"), (unsigned int) w, win, win->GetClassInfo()->GetClassName()); return TRUE; } -wxWindow *wxGetWindowFromTable(Window w) +static inline wxWindow *DoGetWindowFromTable(wxWindowHash *hash, Window w) { - return (wxWindow *)wxWidgetHashTable->Get((long) w); + wxWindowHash::iterator i = hash->find(w); + return i == hash->end() ? NULL : i->second; } -void wxDeleteWindowFromTable(Window w) +static inline void DoDeleteWindowFromTable(wxWindowHash *hash, Window w) { - wxWidgetHashTable->Delete((long)w); + wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x deleted"), (unsigned int) w); + + hash->erase(w); } // ---------------------------------------------------------------------------- -// function which maintain the global hash table mapping client widgets +// public wrappers // ---------------------------------------------------------------------------- -bool wxAddClientWindowToTable(Window w, wxWindow *win) +bool wxAddWindowToTable(Window w, wxWindow *win) { - wxWindow *oldItem = NULL; - if ((oldItem = (wxWindow *)wxClientWidgetHashTable->Get ((long) w))) - { - wxLogDebug( wxT("Client window table clash: new window is %ld, %s"), - (long)w, win->GetClassInfo()->GetClassName()); - return FALSE; - } + return DoAddWindowToTable(wxWidgetHashTable, w, win); +} - wxClientWidgetHashTable->Put((long) w, win); +wxWindow *wxGetWindowFromTable(Window w) +{ + return DoGetWindowFromTable(wxWidgetHashTable, w); +} - wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"), - (unsigned int) w, win, win->GetClassInfo()->GetClassName()); +void wxDeleteWindowFromTable(Window w) +{ + DoDeleteWindowFromTable(wxWidgetHashTable, w); +} - return TRUE; +bool wxAddClientWindowToTable(Window w, wxWindow *win) +{ + return DoAddWindowToTable(wxClientWidgetHashTable, w, win); } wxWindow *wxGetClientWindowFromTable(Window w) { - return (wxWindow *)wxClientWidgetHashTable->Get((long) w); + return DoGetWindowFromTable(wxClientWidgetHashTable, w); } void wxDeleteClientWindowFromTable(Window w) { - wxClientWidgetHashTable->Delete((long)w); + DoDeleteWindowFromTable(wxClientWidgetHashTable, w); } -// ---------------------------------------------------------------------------- -// add/remove window from the table -// ---------------------------------------------------------------------------- - // ---------------------------------------------------------------------------- // X11-specific accessors // ---------------------------------------------------------------------------- @@ -1594,7 +1575,7 @@ bool wxWindowX11::SetForegroundColour(const wxColour& col) wxWindow *wxGetActiveWindow() { // TODO - wxFAIL_MSG("Not implemented"); + wxFAIL_MSG(wxT("Not implemented")); return NULL; }