reverted Julian's r44600, it broke help window behavior so that it prevented apps...

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 034385a84a47c21949e070ad672e1b48c6df49e5..0aa5f73d7fd582867aa86a311a46f2f20f38410a 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
+// Name:        wx/x11/app.h
 // Purpose:     wxApp class
 // Author:      Julian Smart
 // Modified by:
@@ -9,12 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_APP_H_
-#define _WX_APP_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "app.h"
-#endif
+#ifndef _WX_X11_APP_H_
+#define _WX_X11_APP_H_
 
 // ----------------------------------------------------------------------------
 // headers
@@ -27,12 +23,12 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxXVisualInfo;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_BASE wxLog;
+class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
 
 // ----------------------------------------------------------------------------
 // the wxApp class for wxX11 - see wxAppBase for more details
@@ -40,17 +36,13 @@ class WXDLLEXPORT wxXVisualInfo;
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {
-    DECLARE_DYNAMIC_CLASS(wxApp)
-
 public:
     wxApp();
-    ~wxApp();
+    virtual ~wxApp();
 
     // override base class (pure) virtuals
     // -----------------------------------
 
-    virtual bool Initialized();
-
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
@@ -68,9 +60,6 @@ public:
     virtual void OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg);
 #endif // __WXDEBUG__
 
-protected:
-    bool                  m_showOnInit;
-
 public:
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);
@@ -95,17 +84,13 @@ public:
     PangoContext* GetPangoContext();
 #endif
 
-    wxXVisualInfo* GetVisualInfo(WXDisplay* display)
+    wxXVisualInfo* GetVisualInfo(WXDisplay* WXUNUSED(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;
-
 public:
     static long           sm_lastMessageTime;
     bool                  m_showIconic;
@@ -116,14 +101,12 @@ public:
 #endif
 
 protected:
-    bool                  m_keepGoing;
-
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
     long                  m_maxRequestSize;
 
-    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxApp)
 };
 
-#endif // _WX_APP_H_
+#endif // _WX_X11_APP_H_