added wxGenericStaticBitmap (#9608)

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

diff --git a/include/wx/palmos/app.h b/include/wx/palmos/app.h
index 7e2c362e08751f5f4e10ee9c6b144ece329f2a1c..c2f4fa6e93f2d8f13d84435d23ab31ffd5bea51b 100644 (file)
--- a/include/wx/palmos/app.h
+++ b/include/wx/palmos/app.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.h
+// Name:        wx/palmos/app.h

 // Purpose:     wxApp class
 // Purpose:     wxApp class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/17/04
 // Modified by:
 // Created:     10/17/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,22 +12,18 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 #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"
 
 #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
 
 // 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)
 
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 


@@ -46,7 +42,6 @@ public:
     virtual int GetPrintMode() const { return m_printMode; }
 
     // implementation only
     virtual int GetPrintMode() const { return m_printMode; }
 
     // implementation only

-    void OnIdle(wxIdleEvent& event);

     void OnEndSession(wxCloseEvent& event);
     void OnQueryEndSession(wxCloseEvent& event);
 
     void OnEndSession(wxCloseEvent& event);
     void OnQueryEndSession(wxCloseEvent& event);
 


@@ -54,13 +49,6 @@ public:
     virtual bool OnExceptionInMainLoop();
 #endif // wxUSE_EXCEPTIONS
 
     virtual bool OnExceptionInMainLoop();
 #endif // wxUSE_EXCEPTIONS
 

-    // deprecated functions, use wxEventLoop directly instead
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( void DoMessage(WXMSG *pMsg) );
-    wxDEPRECATED( bool DoMessage() );
-    wxDEPRECATED( bool ProcessMessage(WXMSG* pMsg) );
-#endif // WXWIN_COMPATIBILITY_2_4
-

 protected:
     int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
 protected:
     int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 


@@ -96,22 +84,25 @@ protected:
     #define SW_SHOWNORMAL 1
 #endif
 
     #define SW_SHOWNORMAL 1
 #endif
 

-extern int WXDLLEXPORT
-wxEntry();
+extern WXDLLIMPEXP_CORE int wxEntry();

 
 

-#include <PalmOS.h>

 #define IMPLEMENT_WXWIN_MAIN                                              \
 #define IMPLEMENT_WXWIN_MAIN                                              \

+                                                                          \
+    extern "C" {                                                          \
+                                                                          \

     uint32_t PilotMain(uint16_t cmd, MemPtr cmdPBP, uint16_t launchFlags) \
     {                                                                     \
         switch (cmd) {                                                    \
     uint32_t PilotMain(uint16_t cmd, MemPtr cmdPBP, uint16_t launchFlags) \
     {                                                                     \
         switch (cmd) {                                                    \

-            case sysAppLaunchCmdNormalLaunch:                             \
+            case 0 /* sysAppLaunchCmdNormalLaunch */ :                    \

                 wxEntry();                                                \
                 break;                                                    \
             default:                                                      \
                 break;                                                    \
         }                                                                 \
                 wxEntry();                                                \
                 break;                                                    \
             default:                                                      \
                 break;                                                    \
         }                                                                 \

-        return errNone;                                                   \
+        return 0 /* errNone */ ;                                          \
+    }                                                                     \
+                                                                          \

     }
     }

-    
+

 #endif // _WX_APP_H_
 
 #endif // _WX_APP_H_