Updated makefile for mobile sample.

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index e923a61920f72c90864d4604adf16555875c7897..1ca16bb8e24da0060046a068fd46fee85aeb2aa8 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -399,17 +399,21 @@ wxApp::wxApp()
     m_showIconic = FALSE;
     m_initialSize = wxDefaultSize;
     
     m_showIconic = FALSE;
     m_initialSize = wxDefaultSize;
     

+#if !wxUSE_NANOX

     m_visualColormap = NULL;
     m_colorCube = NULL;
     m_visualColormap = NULL;
     m_colorCube = NULL;

+#endif

 }
 
 wxApp::~wxApp()
 {
 }
 
 wxApp::~wxApp()
 {

+#if !wxUSE_NANOX

     if (m_colorCube)
         free( m_colorCube );
         
     if (m_visualColormap)
         delete [] (XColor*)m_visualColormap;
     if (m_colorCube)
         free( m_colorCube );
         
     if (m_visualColormap)
         delete [] (XColor*)m_visualColormap;

+#endif

 }
 
 bool wxApp::Initialized()
 }
 
 bool wxApp::Initialized()


@@ -505,7 +509,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
     {
         case Expose:
         {
     {
         case Expose:
         {

-#if wxUSE_TWO_WINDOWS
+#if wxUSE_TWO_WINDOWS && !wxUSE_NANOX

             if (event->xexpose.window != (Window)win->GetClientWindow())
             {
                 XEvent tmp_event;
             if (event->xexpose.window != (Window)win->GetClientWindow())
             {
                 XEvent tmp_event;


@@ -920,8 +924,6 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
     win->GetEventHandler()->ProcessEvent(event);
 
 
     win->GetEventHandler()->ProcessEvent(event);
 

-    win->OnInternalIdle();
-

     if (event.MoreRequested())
         needMore = TRUE;
 
     if (event.MoreRequested())
         needMore = TRUE;
 


@@ -935,6 +937,8 @@ bool wxApp::SendIdleEvents(wxWindow* win)
         node = node->Next();
     }
 
         node = node->Next();
     }
 

+    win->OnInternalIdle();
+

     return needMore;
 }
 
     return needMore;
 }
 


@@ -989,6 +993,7 @@ bool wxApp::OnInitGui()
 
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
 
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 

+#if !wxUSE_NANOX

     // Get info about the current visual. It is enough
     // to do this once here unless we support different
     // visuals, displays and screens. Given that wxX11
     // Get info about the current visual. It is enough
     // to do this once here unless we support different
     // visuals, displays and screens. Given that wxX11


@@ -1082,6 +1087,7 @@ bool wxApp::OnInitGui()
             }
         }
     }
             }
         }
     }

+#endif

     
     return TRUE;
 }
     
     return TRUE;
 }


@@ -1196,7 +1202,7 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 {
     // While the GUI isn't working that well, just print out the
     // message.
 {
     // While the GUI isn't working that well, just print out the
     // message.

-#if 0
+#if 1

     wxAppBase::OnAssert(file, line, msg);
 #else
     wxString msg2;
     wxAppBase::OnAssert(file, line, msg);
 #else
     wxString msg2;