Fix so OGL can build without wxBuffer

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 621cf13a3385d06195cf64ff477eaac8399fd8f6..1f487dbbc84833e1d285f8e30506be897a3c4ccb 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -35,7 +35,7 @@ class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxEventLoop;
 
 // ----------------------------------------------------------------------------

-// the wxApp class for Motif - see wxAppBase for more details
+// the wxApp class for wxX11 - see wxAppBase for more details

 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxApp : public wxAppBase
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxApp : public wxAppBase


@@ -76,6 +76,8 @@ public:
     // Processes an X event.
     virtual void ProcessXEvent(WXEvent* event);
     
     // Processes an X event.
     virtual void ProcessXEvent(WXEvent* event);
     

+    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+    

 protected:
     bool                  m_showOnInit;
     
 protected:
     bool                  m_showOnInit;
     


@@ -89,22 +91,29 @@ public:
     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);

-    WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }

     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);
     
     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);
     

-public:
-    static long    sm_lastMessageTime;
-    int            m_nCmdShow;
+    // We need this before create the app
+    static   WXDisplay* GetDisplay() { return ms_display; }
+    static   WXDisplay* ms_display;
+
+    // Values that can be passed on the command line.
+    // Returns -1, -1 if none specified.
+    const wxSize& GetInitialSize() const { return m_initialSize; }
+    bool GetShowIconic() const { return m_showIconic; }

     
     

+public:
+    static long           sm_lastMessageTime;
+    bool                  m_showIconic;    
+    wxSize                m_initialSize;

 protected:
     bool                  m_keepGoing;
     
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
 protected:
     bool                  m_keepGoing;
     
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;

-    WXDisplay*            m_initialDisplay;

     long                  m_maxRequestSize;
     wxEventLoop*          m_mainLoop;
     
     long                  m_maxRequestSize;
     wxEventLoop*          m_mainLoop;