Committed a couple of IPC changes I forgot to do

[wxWidgets.git] / include / wx / x11 / app.h

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 4eab1ecb67522c0383c2fbfd51fef1d717a7526a..c1e44dad6eb044022777d41ee9c099d18b264edc 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -55,6 +55,7 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool ProcessIdle();
     
     virtual bool OnInitGui();
     
@@ -74,7 +75,9 @@ public:
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
     
-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+#ifdef __WXDEBUG__
+    virtual void OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg);
+#endif // __WXDEBUG__
     
 protected:
     bool                  m_showOnInit;
@@ -85,7 +88,6 @@ public:
     static void CleanUp();
     
     void DeletePendingObjects();
-    bool ProcessIdle();
     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
@@ -107,7 +109,8 @@ public:
     static long           sm_lastMessageTime;
     bool                  m_showIconic;    
     wxSize                m_initialSize;
-    
+
+#if !wxUSE_NANOX    
     // Someone find a better place for these
     int                   m_visualType;   // TrueColor, DirectColor etc.
     int                   m_visualDepth;
@@ -125,6 +128,7 @@ public:
     int                   m_visualBluePrec;
     
     unsigned char        *m_colorCube;
+#endif
     
 protected:
     bool                  m_keepGoing;