wxSEHReport renamed to wxCrashReport enhanced and debugged; seems to work

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 3621558b9f41e46a9b4b70c7a367cc8ff812d8a1..71a56be26a8a221a2c60b3962f5bab6336944df4 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -12,7 +12,7 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "app.h"
 #endif
 
@@ -33,6 +33,7 @@ class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;
+class WXDLLEXPORT wxXVisualInfo;
 
 // ----------------------------------------------------------------------------
 // the wxApp class for wxX11 - see wxAppBase for more details
@@ -54,8 +55,11 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
+
+    virtual void Exit();
+
     virtual bool Yield(bool onlyIfNeeded = FALSE);
-    virtual bool ProcessIdle();
+    virtual void WakeUpIdle();
     
     virtual bool OnInitGui();
     
@@ -64,14 +68,6 @@ public:
     
     void OnIdle(wxIdleEvent& event);
     
-    // Send idle event to all top-level windows.
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents();
-    
-    // Send idle event to window and all subwindows
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents(wxWindow* win);
-    
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
     
@@ -84,10 +80,8 @@ protected:
     
 public:
     // Implementation
-    static bool Initialize();
-    static void CleanUp();
-    
-    void DeletePendingObjects();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
@@ -107,7 +101,14 @@ public:
     // environment variable
     PangoContext* GetPangoContext();
 #endif    
-    
+
+    wxXVisualInfo* GetVisualInfo(WXDisplay* display)
+    {
+        // this should be implemented correctly for wxBitmap to work
+        // with multiple display
+        return m_visualInfo;
+    }
+
     // We need this before creating the app
     static   WXDisplay* GetDisplay() { return ms_display; }
     static   WXDisplay* ms_display;
@@ -117,24 +118,8 @@ public:
     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;
-    int                   m_visualColormapSize;
-    void                 *m_visualColormap;
-    int                   m_visualScreen;
-    unsigned long         m_visualRedMask;
-    unsigned long         m_visualGreenMask;
-    unsigned long         m_visualBlueMask;
-    int                   m_visualRedShift;
-    int                   m_visualGreenShift;
-    int                   m_visualBlueShift;
-    int                   m_visualRedPrec;
-    int                   m_visualGreenPrec;
-    int                   m_visualBluePrec;
-    
-    unsigned char        *m_colorCube;
+#if !wxUSE_NANOX
+    wxXVisualInfo*        m_visualInfo;
 #endif
     
 protected:
@@ -148,8 +133,5 @@ protected:
     DECLARE_EVENT_TABLE()
 };
 
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
-#endif
-// _WX_APP_H_
+#endif // _WX_APP_H_