compilation fix: include wx/iconbndl.h

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 402a8dbf092b1d5e7037a84e1b171ee57f9e08ae..aec0f3e3675af7a35a2b3b29adddd5dd29f80cfd 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -35,7 +35,7 @@ class WXDLLEXPORT wxLog;
 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
@@ -58,8 +58,6 @@ public:
     
     virtual bool OnInitGui();
     
-    virtual wxIcon GetStdIcon(int which) const;
-    
     // implementation from now on
     // --------------------------
     
@@ -74,7 +72,7 @@ public:
     bool SendIdleEvents(wxWindow* win);
     
     // Processes an X event.
-    virtual void ProcessXEvent(WXEvent* event);
+    virtual bool ProcessXEvent(WXEvent* event);
     
     virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
     
@@ -94,16 +92,21 @@ public:
     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     
     // This handler is called when a property change event occurs
-    virtual void   HandlePropertyChange(WXEvent *event);
+    virtual bool HandlePropertyChange(WXEvent *event);
     
     // 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;
-    int            m_nCmdShow;
-    
+    static long           sm_lastMessageTime;
+    bool                  m_showIconic;    
+    wxSize                m_initialSize;
 protected:
     bool                  m_keepGoing;