Added wxListCtrl to derive from wxGenericListCtrl,

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 4eab1ecb67522c0383c2fbfd51fef1d717a7526a..77927b4f49e4c4cfcc6988d12eb80a1f76f4409b 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -74,7 +74,9 @@ public:
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
     
     // 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;
     
 protected:
     bool                  m_showOnInit;


@@ -107,7 +109,8 @@ public:
     static long           sm_lastMessageTime;
     bool                  m_showIconic;    
     wxSize                m_initialSize;
     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;
     // 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;
     int                   m_visualBluePrec;
     
     unsigned char        *m_colorCube;

+#endif

     
 protected:
     bool                  m_keepGoing;
     
 protected:
     bool                  m_keepGoing;