Correct Mac OX/iPhone check in libpng.

[wxWidgets.git] / src / x11 / app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 772abba8c6003fd25eb740631f56cfc291efe511..775f77de6b91fd5b4bbd6eab48c07eb7d85e691f 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -64,7 +64,6 @@ static wxWindow *g_prevFocus = NULL;
 //   X11 error handling
 //------------------------------------------------------------------------
 
 //   X11 error handling
 //------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__

 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 
 XErrorHandlerFunc gs_pfnXErrorHandler = 0;
 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 
 XErrorHandlerFunc gs_pfnXErrorHandler = 0;


@@ -77,7 +76,6 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
     else
         return 0;
 }
     else
         return 0;
 }

-#endif // __WXDEBUG__

 
 //------------------------------------------------------------------------
 //   wxApp
 
 //------------------------------------------------------------------------
 //   wxApp


@@ -89,10 +87,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 bool wxApp::Initialize(int& argC, wxChar **argV)
 {
 
 bool wxApp::Initialize(int& argC, wxChar **argV)
 {

-#if defined(__WXDEBUG__) && !wxUSE_NANOX
+#if !wxUSE_NANOX

     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );

-#endif // __WXDEBUG__
+#endif

 
     wxString displayName;
     bool syncDisplay = false;
 
     wxString displayName;
     bool syncDisplay = false;


@@ -100,9 +98,9 @@ bool wxApp::Initialize(int& argC, wxChar **argV)
     int argCOrig = argC;
     for ( int i = 0; i < argCOrig; i++ )
     {
     int argCOrig = argC;
     for ( int i = 0; i < argCOrig; i++ )
     {

-        if (wxStrcmp( argV[i], _T("-display") ) == 0)
+        if (wxStrcmp( argV[i], wxT("-display") ) == 0)

         {
         {

-            if (i < (argC - 1))
+            if (i < (argCOrig - 1))

             {
                 argV[i++] = NULL;
 
             {
                 argV[i++] = NULL;
 


@@ -112,14 +110,14 @@ bool wxApp::Initialize(int& argC, wxChar **argV)
                 argC -= 2;
             }
         }
                 argC -= 2;
             }
         }

-        else if (wxStrcmp( argV[i], _T("-geometry") ) == 0)
+        else if (wxStrcmp( argV[i], wxT("-geometry") ) == 0)

         {
         {

-            if (i < (argC - 1))
+            if (i < (argCOrig - 1))

             {
                 argV[i++] = NULL;
 
                 int w, h;
             {
                 argV[i++] = NULL;
 
                 int w, h;

-                if (wxSscanf(argV[i], _T("%dx%d"), &w, &h) != 2)
+                if (wxSscanf(argV[i], wxT("%dx%d"), &w, &h) != 2)

                 {
                     wxLogError( _("Invalid geometry specification '%s'"),
                                 wxString(argV[i]).c_str() );
                 {
                     wxLogError( _("Invalid geometry specification '%s'"),
                                 wxString(argV[i]).c_str() );


@@ -133,14 +131,14 @@ bool wxApp::Initialize(int& argC, wxChar **argV)
                 argC -= 2;
             }
         }
                 argC -= 2;
             }
         }

-        else if (wxStrcmp( argV[i], _T("-sync") ) == 0)
+        else if (wxStrcmp( argV[i], wxT("-sync") ) == 0)

         {
             syncDisplay = true;
 
             argV[i] = NULL;
             argC--;
         }
         {
             syncDisplay = true;
 
             argV[i] = NULL;
             argC--;
         }

-        else if (wxStrcmp( argV[i], _T("-iconic") ) == 0)
+        else if (wxStrcmp( argV[i], wxT("-iconic") ) == 0)

         {
             g_showIconic = true;
 
         {
             g_showIconic = true;
 


@@ -151,12 +149,12 @@ bool wxApp::Initialize(int& argC, wxChar **argV)
 
     if ( argC != argCOrig )
     {
 
     if ( argC != argCOrig )
     {

-        // remove the argumens we consumed
+        // remove the arguments we consumed

         for ( int i = 0; i < argC; i++ )
         {
             while ( !argV[i] )
             {
         for ( int i = 0; i < argC; i++ )
         {
             while ( !argV[i] )
             {

-                memmove(argV + i, argV + i + 1, argCOrig - i);
+                memmove(argV + i, argV + i + 1, (argCOrig - i)*sizeof(wxChar *));

             }
         }
     }
             }
         }
     }


@@ -197,10 +195,8 @@ bool wxApp::Initialize(int& argC, wxChar **argV)
 
 void wxApp::CleanUp()
 {
 
 void wxApp::CleanUp()
 {

-    delete wxWidgetHashTable;
-    wxWidgetHashTable = NULL;
-    delete wxClientWidgetHashTable;
-    wxClientWidgetHashTable = NULL;
+    wxDELETE(wxWidgetHashTable);
+    wxDELETE(wxClientWidgetHashTable);

 
     wxAppBase::CleanUp();
 }
 
     wxAppBase::CleanUp();
 }


@@ -292,9 +288,6 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             return false;
     }
 
             return false;
     }
 

-#ifdef __WXDEBUG__
-    wxString windowClass = win->GetClassInfo()->GetClassName();
-#endif

 
     switch (event->type)
     {
 
     switch (event->type)
     {


@@ -343,7 +336,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.

-                if (win->GetMainWindow() == win->GetClientAreaWindow())
+                if (win->X11GetMainWindow() == win->GetClientAreaWindow())

                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.
                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.


@@ -359,7 +352,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 #if !wxUSE_NANOX
         case GraphicsExpose:
         {
 #if !wxUSE_NANOX
         case GraphicsExpose:
         {

-            wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());
+            wxLogTrace( wxT("expose"), wxT("GraphicsExpose from %s"), win->GetName().c_str());

 
             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                           event->xgraphicsexpose.width, event->xgraphicsexpose.height);
 
             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                           event->xgraphicsexpose.width, event->xgraphicsexpose.height);


@@ -453,10 +446,8 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         }
 #if !wxUSE_NANOX
         case PropertyNotify:
         }
 #if !wxUSE_NANOX
         case PropertyNotify:

-        {
-            //wxLogDebug("PropertyNotify: %s", windowClass.c_str());

             return HandlePropertyChange(_event);
             return HandlePropertyChange(_event);

-        }
+

         case ClientMessage:
         {
             if (!win->IsEnabled())
         case ClientMessage:
         {
             if (!win->IsEnabled())


@@ -548,7 +539,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                     g_prevFocus = wxWindow::FindFocus();
                     g_nextFocus = win;
 
                     g_prevFocus = wxWindow::FindFocus();
                     g_nextFocus = win;
 

-                    wxLogTrace( _T("focus"), _T("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+                    wxLogTrace( wxT("focus"), wxT("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );

 
                     // Record the fact that this window is
                     // getting the focus, because we'll need to
 
                     // Record the fact that this window is
                     // getting the focus, because we'll need to


@@ -579,7 +570,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 (event->xfocus.mode == NotifyNormal))
 #endif
             {
                 (event->xfocus.mode == NotifyNormal))
 #endif
             {

-                wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+                wxLogTrace( wxT("focus"), wxT("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );

 
                 extern wxWindow* g_GettingFocus;
                 if (g_GettingFocus && g_GettingFocus->GetParent() == win)
 
                 extern wxWindow* g_GettingFocus;
                 if (g_GettingFocus && g_GettingFocus->GetParent() == win)


@@ -587,7 +578,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                     // Ignore this, this can be a spurious FocusIn
                     // caused by a child having its focus set.
                     g_GettingFocus = NULL;
                     // Ignore this, this can be a spurious FocusIn
                     // caused by a child having its focus set.
                     g_GettingFocus = NULL;

-                    wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+                    wxLogTrace( wxT("focus"), wxT("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );

                     return true;
                 }
                 else
                     return true;
                 }
                 else


@@ -608,7 +599,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 (event->xfocus.mode == NotifyNormal))
 #endif
             {
                 (event->xfocus.mode == NotifyNormal))
 #endif
             {

-                wxLogTrace( _T("focus"), _T("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+                wxLogTrace( wxT("focus"), wxT("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );

 
                 wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                 focusEvent.SetEventObject(win);
 
                 wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                 focusEvent.SetEventObject(win);


@@ -617,13 +608,6 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 return win->HandleWindowEvent(focusEvent);
             }
             return false;
                 return win->HandleWindowEvent(focusEvent);
             }
             return false;

-
-#ifdef __WXDEBUG__
-        default:
-            //wxString eventName = wxGetXEventName(XEvent& event);
-            //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
-            break;
-#endif // __WXDEBUG__

     }
 
     return false;
     }
 
     return false;


@@ -704,7 +688,9 @@ PangoContext* wxApp::GetPangoContext()
             s_pangoContext = pango_x_get_context(dpy);
 
         if (!PANGO_IS_CONTEXT(s_pangoContext))
             s_pangoContext = pango_x_get_context(dpy);
 
         if (!PANGO_IS_CONTEXT(s_pangoContext))

+        {

             wxLogError( wxT("No pango context.") );
             wxLogError( wxT("No pango context.") );

+        }

     }
 
     return s_pangoContext;
     }
 
     return s_pangoContext;


@@ -730,7 +716,7 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 
 Window wxGetWindowParent(Window window)
 {
 
 Window wxGetWindowParent(Window window)
 {

-    wxASSERT_MSG( window, _T("invalid window") );
+    wxASSERT_MSG( window, wxT("invalid window") );

 
     return (Window) 0;
 
 
     return (Window) 0;
 


@@ -767,63 +753,3 @@ void wxApp::Exit()
     wxAppConsole::Exit();
 }
 
     wxAppConsole::Exit();
 }
 

-// Yield to other processes
-
-bool wxApp::Yield(bool onlyIfNeeded)
-{
-    // Sometimes only 2 yields seem
-    // to do the trick, e.g. in the
-    // progress dialog
-    int i;
-    for (i = 0; i < 2; i++)
-    {
-        if ( m_isInsideYield )
-        {
-            if ( !onlyIfNeeded )
-            {
-                wxFAIL_MSG( wxT("wxYield called recursively" ) );
-            }
-
-            return false;
-        }
-
-        m_isInsideYield = true;
-
-        // Make sure we have an event loop object,
-        // or Pending/Dispatch will fail
-        wxEventLoopGuarantor dummyLoopIfNeeded;
-
-        // Call dispatch at least once so that sockets
-        // can be tested
-        wxTheApp->Dispatch();
-
-        while (wxTheApp && wxTheApp->Pending())
-            wxTheApp->Dispatch();
-
-#if wxUSE_TIMER
-        wxGenericTimerImpl::NotifyTimers();
-#endif
-        ProcessIdle();
-
-        m_isInsideYield = false;
-    }
-
-    return true;
-}
-
-#ifdef __WXDEBUG__
-
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
-{
-    // While the GUI isn't working that well, just print out the
-    // message.
-#if 1
-    wxAppBase::OnAssert(file, line, cond, msg);
-#else
-    wxString msg2;
-    msg2.Printf("At file %s:%d: %s", file, line, msg);
-    wxLogDebug(msg2);
-#endif
-}
-
-#endif // __WXDEBUG__