Use treebase.h for enum duplicated in port/treectrl.h.

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

diff --git a/include/wx/palmos/control.h b/include/wx/palmos/control.h
index fb8b83cb57b8703c8a51d6f49d44eeff1c8337c0..94931bcce238408a29eec5ea8c81214b99b4dd86 100644 (file)
--- a/include/wx/palmos/control.h
+++ b/include/wx/palmos/control.h
@@ -72,13 +72,10 @@ public:
 
     void OnEraseBackground(wxEraseEvent& event);
 
 
     void OnEraseBackground(wxEraseEvent& event);
 

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-

 protected:
     // regardless how deeply we are in wxWidgets hierarchy always get correct form
     FormType* GetParentForm() const;
 protected:
     // regardless how deeply we are in wxWidgets hierarchy always get correct form
     FormType* GetParentForm() const;

-    uint16_t GetObjectIndex() const;
+    FormType* GetObjectFormIndex(uint16_t& index) const;

     void* GetObjectPtr() const;
 
     // choose the default border for this window
     void* GetObjectPtr() const;
 
     // choose the default border for this window


@@ -101,6 +98,7 @@ protected:
     // getting and setting sizes
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;
     // getting and setting sizes
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;

+    virtual void DoMoveWindow(int x, int y, int width, int height);

 
     // create the control of the given ControlStyleType: this is typically called
     // from Create() method of the derived class passing its label, pos and
 
     // create the control of the given ControlStyleType: this is typically called
     // from Create() method of the derived class passing its label, pos and


@@ -111,7 +109,7 @@ protected:
                            const wxString& label,
                            const wxPoint& pos,
                            const wxSize& size,
                            const wxString& label,
                            const wxPoint& pos,
                            const wxSize& size,

-                           int groupID = 0);
+                           uint8_t groupID = 0);

     inline bool IsPalmControl() const { return m_palmControl; }
 
     bool PalmCreateField(const wxString& label,
     inline bool IsPalmControl() const { return m_palmControl; }
 
     bool PalmCreateField(const wxString& label,


@@ -134,6 +132,14 @@ protected:
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;
 
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;
 

+    // m_label stores label in case of wxButton, wxCheckBox, wxToggleButton etc.
+    // We must ensure that it persists for as long as it is being displayed
+    // (that is, for as long as the control is displayed or until we call
+    // CtlSetLabel() with a new string), and we must free the string after
+    // it is no longer in use (typically after the form containing the
+    // control is freed).
+    wxString m_label;
+

 private:
 
     bool m_palmControl:1;
 private:
 
     bool m_palmControl:1;


@@ -143,14 +149,7 @@ private:
     void Init();
 
     virtual void DoGetBounds( RectangleType &rect ) const;
     void Init();
 
     virtual void DoGetBounds( RectangleType &rect ) const;

-
-    // m_label stores label in case of wxButton, wxCheckBox, wxToggleButton etc.
-    // We must ensure that it persists for as long as it is being displayed
-    // (that is, for as long as the control is displayed or until we call
-    // CtlSetLabel() with a new string), and we must free the string after
-    // it is no longer in use (typically after the form containing the
-    // control is freed).
-    wxString m_label;
+    virtual void DoSetBounds( RectangleType &rect );

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
     DECLARE_EVENT_TABLE()