added operator-(const wxChar *, const wxCStrData&) to allow compilation of the code...

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 5fedad11f9653097e3ad59e2d9db8b8155ca2922..b78e4abae924b4fa8141d435c4c35cd2ec6b5c33 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:
 // Purpose:     wxApp class
 // Author:      Julian Smart
 // Modified by:


@@ -9,12 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 // ----------------------------------------------------------------------------
 // headers


@@ -40,21 +36,13 @@ class WXDLLEXPORT wxXVisualInfo;
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {

-    DECLARE_DYNAMIC_CLASS(wxApp)
-

 public:
     wxApp();
 public:
     wxApp();

-    ~wxApp();
+    virtual ~wxApp();

 
     // override base class (pure) virtuals
     // -----------------------------------
 
 
     // override base class (pure) virtuals
     // -----------------------------------
 

-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual bool Dispatch();
-

     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);


@@ -72,9 +60,6 @@ public:
     virtual void OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg);
 #endif // __WXDEBUG__
 
     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);
 public:
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);


@@ -106,10 +91,6 @@ public:
         return m_visualInfo;
     }
 
         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;
 public:
     static long           sm_lastMessageTime;
     bool                  m_showIconic;


@@ -120,14 +101,13 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

-    bool                  m_keepGoing;
-

     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
     long                  m_maxRequestSize;
 
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
     long                  m_maxRequestSize;
 

+    DECLARE_DYNAMIC_CLASS(wxApp)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif // _WX_APP_H_
+#endif // _WX_X11_APP_H_