take old (wx 2.2? older?) wxGrid compatibility functions inside WXWIN_COMPATIBILITY_2...

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

diff --git a/include/wx/palmos/app.h b/include/wx/palmos/app.h
index 1b294ed5d8646222dd37a35c5b94211e9beddd3d..c2f4fa6e93f2d8f13d84435d23ab31ffd5bea51b 100644 (file)
--- a/include/wx/palmos/app.h
+++ b/include/wx/palmos/app.h
@@ -12,22 +12,18 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "app.h"
-#endif
-
 #include "wx/event.h"
 #include "wx/icon.h"
 
-class WXDLLIMPEXP_CORE wxFrame;
-class WXDLLIMPEXP_CORE wxWindow;
-class WXDLLIMPEXP_CORE wxApp;
-class WXDLLIMPEXP_CORE wxKeyEvent;
-class WXDLLIMPEXP_BASE wxLog;
+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;
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
-class WXDLLEXPORT wxApp : public wxAppBase
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 
@@ -46,7 +42,6 @@ public:
     virtual int GetPrintMode() const { return m_printMode; }
 
     // implementation only
-    void OnIdle(wxIdleEvent& event);
     void OnEndSession(wxCloseEvent& event);
     void OnQueryEndSession(wxCloseEvent& event);
 
@@ -89,20 +84,24 @@ protected:
     #define SW_SHOWNORMAL 1
 #endif
 
-extern int WXDLLEXPORT
-wxEntry();
+extern WXDLLIMPEXP_CORE int wxEntry();
 
 #define IMPLEMENT_WXWIN_MAIN                                              \
+                                                                          \
+    extern "C" {                                                          \
+                                                                          \
     uint32_t PilotMain(uint16_t cmd, MemPtr cmdPBP, uint16_t launchFlags) \
     {                                                                     \
         switch (cmd) {                                                    \
-            case sysAppLaunchCmdNormalLaunch:                             \
+            case 0 /* sysAppLaunchCmdNormalLaunch */ :                    \
                 wxEntry();                                                \
                 break;                                                    \
             default:                                                      \
                 break;                                                    \
         }                                                                 \
-        return errNone;                                                   \
+        return 0 /* errNone */ ;                                          \
+    }                                                                     \
+                                                                          \
     }
 
 #endif // _WX_APP_H_