make OSX defines to be 1, not only defined, for backwards compatibility reasons

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 416a3e2ae3d43e57188cf365e5a01751aa7237e9..d5de438792f67f1d549c90c01f9025494e1ae6f7 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,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_APP_H_
-#define _WX_APP_H_
+#ifndef _WX_X11_APP_H_
+#define _WX_X11_APP_H_

 
 // ----------------------------------------------------------------------------
 // headers
 
 // ----------------------------------------------------------------------------
 // headers


@@ -23,21 +23,19 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // 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
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // the wxApp class for wxX11 - see wxAppBase for more details
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxApp : public wxAppBase
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxApp)
-

 public:
     wxApp();
     virtual ~wxApp();
 public:
     wxApp();
     virtual ~wxApp();


@@ -47,7 +45,6 @@ public:
 
     virtual void Exit();
 
 
     virtual void Exit();
 

-    virtual bool Yield(bool onlyIfNeeded = FALSE);

     virtual void WakeUpIdle();
 
     virtual bool OnInitGui();
     virtual void WakeUpIdle();
 
     virtual bool OnInitGui();


@@ -62,9 +59,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);


@@ -89,17 +83,13 @@ public:
     PangoContext* GetPangoContext();
 #endif
 
     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;
     }
 
     {
         // 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;
 public:
     static long           sm_lastMessageTime;
     bool                  m_showIconic;


@@ -110,14 +100,12 @@ 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_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxApp)

 };
 
 };
 

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