Return wxWindow* from wxDataViewCustomRenderer::CreateEditorCtrl().

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

diff --git a/include/wx/palmos/control.h b/include/wx/palmos/control.h
index edc21f7626115978783522b0ff33ba523fcf273d..caa3a804a4511117817347625792e516357c2281 100644 (file)
--- a/include/wx/palmos/control.h
+++ b/include/wx/palmos/control.h
@@ -12,14 +12,10 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #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
 #include "wx/dynarray.h"
 
 // General item class

-class WXDLLEXPORT wxControl : public wxControlBase
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase

 {
 public:
     wxControl() { Init(); }
 {
 public:
     wxControl() { Init(); }


@@ -52,7 +48,7 @@ public:
     virtual bool IsShown() const;
 
     virtual void SetLabel(const wxString& label);
     virtual bool IsShown() const;
 
     virtual void SetLabel(const wxString& label);

-    virtual wxString GetLabel();
+    //virtual wxString GetLabel();

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -72,13 +68,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
 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
     void* GetObjectPtr() const;
 
     // choose the default border for this window


@@ -101,13 +94,14 @@ 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
     // 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)
 
     // create the control of the given ControlStyleType: this is typically called
     // from Create() method of the derived class passing its label, pos and
     // 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,
                            const wxString& label,
                            const wxPoint& pos,
                            const wxSize& size,


@@ -119,7 +113,7 @@ protected:
                          const wxSize& size,
                          bool editable,
                          bool underlined,
                          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()
     inline bool IsPalmField() const { return m_palmField; }
 
     // this is a helper for the derived class GetClassDefaultAttributes()


@@ -134,6 +128,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;


@@ -142,15 +144,8 @@ private:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     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 DoGetBounds( WXRECTANGLEPTR rect ) const;
+    virtual void DoSetBounds( WXRECTANGLEPTR rect );

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