X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11f4a34413ae1495a9ca2c812b00da86d90eee25..ddc7f0c97571b231f231b5abaa9f4e4eaf1e46a9:/include/wx/palmos/control.h?ds=inline

diff --git a/include/wx/palmos/control.h b/include/wx/palmos/control.h
index 94931bcce2..caa3a804a4 100644
--- a/include/wx/palmos/control.h
+++ b/include/wx/palmos/control.h
@@ -12,14 +12,10 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "control.h"
-#endif
-
 #include "wx/dynarray.h"
 
 // General item class
-class WXDLLEXPORT wxControl : public wxControlBase
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {
 public:
     wxControl() { Init(); }
@@ -52,7 +48,7 @@ public:
     virtual bool IsShown() const;
 
     virtual void SetLabel(const wxString& label);
-    virtual wxString GetLabel();
+    //virtual wxString GetLabel();
 
     // implementation from now on
     // --------------------------
@@ -74,8 +70,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 +101,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 +113,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 +144,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()