1. moved m_majorDim duplicated in many ports to wxRadioBoxBase

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

diff --git a/include/wx/palmos/app.h b/include/wx/palmos/app.h
index 153d1e6968f4c5a2a82501bb7840027d72d5fb69..65f4303b011dc155290854187d3631a9b5687369 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,10 +12,6 @@
 #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"
 


@@ -93,16 +89,21 @@ extern int WXDLLEXPORT
 wxEntry();
 
 #define IMPLEMENT_WXWIN_MAIN                                              \
 wxEntry();
 
 #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_