X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0badb709a86b91a203416784b649e3d00c699c7..850df2d78866c3edcf848103b5dbc7e7fa1ee5fa:/src/x11/app.cpp?ds=inline

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index a63e55214f..c7ec2a5de7 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -22,17 +22,17 @@
     #include "wx/frame.h"
     #include "wx/icon.h"
     #include "wx/dialog.h"
-    #include "wx/timer.h"
+    #include "wx/memory.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
 #endif
 
-#include "wx/gdicmn.h"
-#include "wx/module.h"
-#include "wx/memory.h"
 #include "wx/evtloop.h"
 #include "wx/filename.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
+#include "wx/generic/private/timer.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
@@ -46,8 +46,6 @@
 //   global data
 //------------------------------------------------------------------------
 
-extern wxList wxPendingDelete;
-
 wxWindowHash *wxWidgetHashTable = NULL;
 wxWindowHash *wxClientWidgetHashTable = NULL;
 
@@ -85,14 +83,9 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 //------------------------------------------------------------------------
 
 long wxApp::sm_lastMessageTime = 0;
-WXDisplay *wxApp::ms_display = NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-
 bool wxApp::Initialize(int& argC, wxChar **argV)
 {
 #if defined(__WXDEBUG__) && !wxUSE_NANOX
@@ -167,34 +160,24 @@ bool wxApp::Initialize(int& argC, wxChar **argV)
         }
     }
 
-    // X11 display stuff
-    Display *xdisplay;
-    if ( displayName.empty() )
-        xdisplay = XOpenDisplay( NULL );
-    else
-        xdisplay = XOpenDisplay( displayName.ToAscii() );
-    if (!xdisplay)
+    // open and set up the X11 display
+    if ( !wxSetDisplay(displayName) )
     {
-        wxLogError( _("wxWidgets could not open display. Exiting.") );
+        wxLogError(_("wxWidgets could not open display. Exiting."));
         return false;
     }
 
+    Display *dpy = wxGlobalDisplay();
     if (syncDisplay)
-        XSynchronize(xdisplay, True);
+        XSynchronize(dpy, True);
 
-    ms_display = (WXDisplay*) xdisplay;
+    XSelectInput(dpy, XDefaultRootWindow(dpy), PropertyChangeMask);
 
-    XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
-
-    // Misc.
     wxSetDetectableAutoRepeat( true );
 
-    if ( !wxAppBase::Initialize(argC, argV) )
-    {
-        XCloseDisplay(xdisplay);
 
+    if ( !wxAppBase::Initialize(argC, argV) )
         return false;
-    }
 
 #if wxUSE_UNICODE
     // Glib's type system required by Pango
@@ -223,12 +206,8 @@ void wxApp::CleanUp()
 
 wxApp::wxApp()
 {
-    // TODO: parse the command line
-    argc = 0;
-    argv = NULL;
-
-    m_mainColormap = (WXColormap) NULL;
-    m_topLevelWidget = (WXWindow) NULL;
+    m_mainColormap = NULL;
+    m_topLevelWidget = NULL;
     m_maxRequestSize = 0;
     m_showIconic = false;
     m_initialSize = wxDefaultSize;
@@ -258,7 +237,7 @@ struct wxExposeInfo
 };
 
 extern "C"
-Bool wxX11ExposePredicate (Display *display, XEvent *xevent, XPointer arg)
+Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg)
 {
     wxExposeInfo *info = (wxExposeInfo*) arg;
 
@@ -415,8 +394,8 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             keyEvent.SetEventType(wxEVT_CHAR);
             // Do the translation again, retaining the ASCII
             // code.
-            wxTranslateKeyEvent(keyEvent, win, window, event, true);
-            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+            if (wxTranslateKeyEvent(keyEvent, win, window, event, true) &&
+                win->GetEventHandler()->ProcessEvent( keyEvent ))
                 return true;
 
             if ( (keyEvent.m_keyCode == WXK_TAB) &&
@@ -561,7 +540,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
             if (event->type == ButtonPress)
             {
-                if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+                if ((win != wxWindow::FindFocus()) && win->CanAcceptFocus())
                 {
                     // This might actually be done in wxWindow::SetFocus()
                     // and not here. TODO.
@@ -651,7 +630,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
-bool wxApp::HandlePropertyChange(WXEvent *event)
+bool wxApp::HandlePropertyChange(WXEvent *WXUNUSED(event))
 {
     // by default do nothing special
     // TODO: what to do for X11
@@ -670,21 +649,24 @@ void wxApp::WakeUpIdle()
 // Create display, and other initialization
 bool wxApp::OnInitGui()
 {
+#if wxUSE_LOG
     // Eventually this line will be removed, but for
     // now we don't want to try popping up a dialog
     // for error messages.
     delete wxLog::SetActiveTarget(new wxLogStderr);
+#endif
 
     if (!wxAppBase::OnInitGui())
         return false;
 
-    GetMainColormap( wxApp::GetDisplay() );
+    Display *dpy = wxGlobalDisplay();
+    GetMainColormap(dpy);
 
-    m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
+    m_maxRequestSize = XMaxRequestSize(dpy);
 
 #if !wxUSE_NANOX
     m_visualInfo = new wxXVisualInfo;
-    wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() );
+    wxFillXVisualInfo(m_visualInfo, dpy);
 #endif
 
     return true;
@@ -700,33 +682,34 @@ bool wxApp::OnInitGui()
 
 PangoContext* wxApp::GetPangoContext()
 {
-    static PangoContext *ret = NULL;
-    if (ret)
-        return ret;
-
-    Display *xdisplay = (Display*) wxApp::GetDisplay();
+    static PangoContext *s_pangoContext = NULL;
+    if ( !s_pangoContext )
+    {
+        Display *dpy = wxGlobalDisplay();
 
 #ifdef HAVE_PANGO_XFT
-    int xscreen = DefaultScreen(xdisplay);
-    static int use_xft = -1;
-    if (use_xft == -1)
-    {
-        wxString val = wxGetenv( L"GDK_USE_XFT" );
-        use_xft = (val == L"1");
-    }
+        int xscreen = DefaultScreen(dpy);
+        static int use_xft = -1;
+        if (use_xft == -1)
+        {
+            wxString val = wxGetenv( L"GDK_USE_XFT" );
+            use_xft = val == L"1";
+        }
 
-    if (use_xft)
-        ret = pango_xft_get_context( xdisplay, xscreen );
-    else
-#endif
-        ret = pango_x_get_context( xdisplay );
+        if (use_xft)
+            s_pangoContext = pango_xft_get_context(dpy, xscreen);
+        else
+#endif // HAVE_PANGO_XFT
+            s_pangoContext = pango_x_get_context(dpy);
 
-    if (!PANGO_IS_CONTEXT(ret))
-        wxLogError( wxT("No pango context.") );
+        if (!PANGO_IS_CONTEXT(s_pangoContext))
+            wxLogError( wxT("No pango context.") );
+    }
 
-    return ret;
+    return s_pangoContext;
 }
-#endif
+
+#endif // wxUSE_UNICODE
 
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
@@ -809,7 +792,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
         // Make sure we have an event loop object,
         // or Pending/Dispatch will fail
-        wxEventLoop* eventLoop = wxEventLoop::GetActive();
+        wxEventLoopBase * const eventLoop = wxEventLoop::GetActive();
         wxEventLoop* newEventLoop = NULL;
         if (!eventLoop)
         {
@@ -825,7 +808,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxTheApp->Dispatch();
 
 #if wxUSE_TIMER
-        wxTimer::NotifyTimers();
+        wxGenericTimerImpl::NotifyTimers();
 #endif
         ProcessIdle();