wXMotif compilation fixes

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

diff --git a/include/wx/stubs/app.h b/include/wx/stubs/app.h
index 2eafa1f15f822a8c664ff6f3367bccfe04dc6774..fba1c3f2416568306bf94aaad9ab8fbd07c62311 100644 (file)
--- a/include/wx/stubs/app.h
+++ b/include/wx/stubs/app.h
@@ -18,6 +18,8 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"

+#include "wx/gdicmn.h"
+#include "wx/event.h"

 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;


@@ -30,10 +32,6 @@ class WXDLLEXPORT wxLog;
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 

-void WXDLLEXPORT wxCleanUp();
-void WXDLLEXPORT wxCommonCleanUp(); // Call this from the platform's wxCleanUp()
-void WXDLLEXPORT wxCommonInit();    // Call this from the platform's initialization
-

 // Force an exit from main loop
 void WXDLLEXPORT wxExit();
 
 // Force an exit from main loop
 void WXDLLEXPORT wxExit();
 


@@ -57,7 +55,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual bool Pending() ;
   virtual void Dispatch() ;
 
   virtual bool Pending() ;
   virtual void Dispatch() ;
 

-  virtual void OnIdle(wxIdleEvent& event);
+  void OnIdle(wxIdleEvent& event);

 
 // Generic
   virtual bool OnInit() { return FALSE; };
 
 // Generic
   virtual bool OnInit() { return FALSE; };


@@ -69,6 +67,10 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 
   virtual int OnRun() { return MainLoop(); };
   virtual int OnExit() { return 0; }
 

+  /** Returns the standard icons for the msg dialogs, implemented in 
+      src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+  virtual wxIcon GetStdIcon(int which) const;
+

   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 
   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline int GetPrintMode() const { return m_printMode; }
 


@@ -130,9 +132,9 @@ protected:
 public:
 
   // Implementation
 public:
 
   // Implementation

-  static void CommonInit();
+  static bool Initialize();

   static void CleanUp();
   static void CleanUp();

-  static void CommonCleanUp();
+

   void DeletePendingObjects();
   bool ProcessIdle();
 
   void DeletePendingObjects();
   bool ProcessIdle();
 


@@ -146,8 +148,8 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

-// TODO: add platform-specific arguments, e.g. int argc, char* argv[]
-int WXDLLEXPORT wxEntry();
+// TODO: add platform-specific arguments
+int WXDLLEXPORT wxEntry( int argc, char *argv[] );

 
 #endif
     // _WX_APP_H_
 
 #endif
     // _WX_APP_H_