Global platform header (<PalmOS.h>) removed from public wx-headers (but included in wxprec.h) with all consequences in wxPalmOS specific API.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/palmos/app.h

@@ -93,16 +93,21 @@ extern int WXDLLEXPORT
 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_

include/wx/palmos/control.h

@@ -74,8 +74,8 @@ public:
 
 protected:
     // regardless how deeply we are in wxWidgets hierarchy always get correct form
-    FormType* GetParentForm() const;
-    FormType* GetObjectFormIndex(uint16_t& index) const;
+    WXFORMPTR GetParentForm() const;
+    WXFORMPTR GetObjectFormIndex(uint16_t& index) const;
     void* GetObjectPtr() const;
 
     // choose the default border for this window
@@ -105,7 +105,7 @@ protected:
     // size parameter (style parameter is not needed because m_windowStyle is
     // supposed to had been already set and so is used instead when this
     // function is called)
-    bool PalmCreateControl(ControlStyleType style,
+    bool PalmCreateControl(int palmStyle,
                            const wxString& label,
                            const wxPoint& pos,
                            const wxSize& size,
@@ -117,7 +117,7 @@ protected:
                          const wxSize& size,
                          bool editable,
                          bool underlined,
-                         JustificationType justification);
+                         int justification);
     inline bool IsPalmField() const { return m_palmField; }
 
     // this is a helper for the derived class GetClassDefaultAttributes()
@@ -148,8 +148,8 @@ private:
     // common part of all ctors
     void Init();
 
-    virtual void DoGetBounds( RectangleType &rect ) const;
-    virtual void DoSetBounds( RectangleType &rect );
+    virtual void DoGetBounds( WXRECTANGLEPTR rect ) const;
+    virtual void DoSetBounds( WXRECTANGLEPTR rect );
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
     DECLARE_EVENT_TABLE()

include/wx/palmos/frame.h

@@ -70,7 +70,7 @@ public:
 
 #if wxUSE_MENUS_NATIVE
     bool HandleMenuOpen();
-    bool HandleMenuSelect(EventType* event);
+    bool HandleMenuSelect(WXEVENTPTR event);
 #endif // wxUSE_MENUS_NATIVE
 
 protected:

include/wx/palmos/progdlg.h

@@ -37,11 +37,11 @@ public:
     void Resume();
     virtual bool Show( bool show = true );
 
-    Boolean Callback(PrgCallbackData *data);
+    Boolean Callback(/*PrgCallbackData */ void *data);
 
 private:
 
-    ProgressType *m_prgFrame;
+    /*ProgressType*/ void *m_prgFrame;
     wxString m_msg;
     int m_max,m_cur;
     bool m_canSkip;

include/wx/palmos/radiobut.h

@@ -66,7 +66,7 @@ private:
     uint8_t m_groupID;
 
     // pushButtonCtl or checkboxCtl
-    ControlStyleType m_radioStyle;
+    int m_radioStyle;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton)
 };
 

include/wx/palmos/slider.h

@@ -76,7 +76,7 @@ public:
 
     // send a notification event, return true if processed
     bool SendUpdatedEvent();
-    bool SendScrollEvent(EventType* event);
+    bool SendScrollEvent(WXEVENTPTR event);
 
 protected:
 

include/wx/palmos/toplevel.h

@@ -82,12 +82,12 @@ public:
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
     // interface to native frame structure
-    FormType *GetForm() const;
+    WXFORMPTR GetForm() const;
 
     // handle native events
-    bool HandleControlSelect(EventType* event);
-    bool HandleControlRepeat(EventType* event);
-    bool HandleSize(EventType* event);
+    bool HandleControlSelect(WXEVENTPTR event);
+    bool HandleControlRepeat(WXEVENTPTR event);
+    bool HandleSize(WXEVENTPTR event);
 
     virtual WXWINHANDLE GetWinHandle() const;
 
@@ -125,7 +125,5 @@ protected:
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm)
 };
 
-static Boolean FrameFormHandleEvent(EventType* pEvent);
-
 #endif // _WX_PALMOS_TOPLEVEL_H_
 

include/wx/palmos/window.h

@@ -211,11 +211,11 @@ public:
 
 protected:
     // the window handle
-    WinHandle m_handle;
-    FormType *FrameForm;
+    WXWINHANDLE m_handle;
+    WXFORMPTR FrameForm;
 
-    FormType *GetFormPtr();
-    void SetFormPtr(FormType *FormPtr);
+    WXFORMPTR GetFormPtr();
+    void SetFormPtr(WXFORMPTR FormPtr);
 
     // additional (Palm specific) flags
     bool                  m_mouseInWindow:1;