wxButton, wxCheckBox, wxSlider, wxToggleButton native implementations for PalmOS.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 94befa571fbafb1b0c00799a035044c95c06ce48..1c012610e8bafaf7535f36b44fa45dc34ddcfccb 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -114,6 +114,9 @@ wxPalmOS:
 - native wxColourDialog implementation
 - native wxSystemSettings colours
 - native wxButton implementation
 - native wxColourDialog implementation
 - native wxSystemSettings colours
 - native wxButton implementation

+- native wxCheckBox implementation
+- native wxSlider implementation
+- native wxToggleButton implementation

 
 
 2.5.3
 
 
 2.5.3

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 93e59fa1a3c19f45f1078bedf4ea9368a6ed5a87..9f9b5e83d9c072b1b7369923bf0200dabc60e7c0 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -135,6 +135,8 @@ private:
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/checkbox.h"

 #endif
 
 #endif // wxUSE_CHECKBOX
 #endif
 
 #endif // wxUSE_CHECKBOX

diff --git a/include/wx/palmos/button.h b/include/wx/palmos/button.h
index 62d8e5f0378e1b9e5a670dbcdca5d2d369f48a16..b94fb8731c7cd9bbb07619203a6d530feb2e9f83 100644 (file)
--- a/include/wx/palmos/button.h
+++ b/include/wx/palmos/button.h
@@ -51,7 +51,6 @@ public:
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);

-    virtual bool MSWCommand(WXUINT param, WXWORD id);

 
     virtual void ApplyParentThemeBackground(const wxColour& bg)
     {
 
     virtual void ApplyParentThemeBackground(const wxColour& bg)
     {


@@ -72,7 +71,6 @@ protected:
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)

diff --git a/include/wx/palmos/checkbox.h b/include/wx/palmos/checkbox.h
index e081d630275ecebad857928005c1f4078e012458..d2f7628a2664bf2d0a28b3fe899601224f6700bd 100644 (file)
--- a/include/wx/palmos/checkbox.h
+++ b/include/wx/palmos/checkbox.h
@@ -2,10 +2,10 @@
 // Name:        wx/palmos/checkbox.h
 // Purpose:     wxCheckBox class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        wx/palmos/checkbox.h
 // Purpose:     wxCheckBox class
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -45,9 +45,6 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const;
 
     virtual void SetValue(bool value);
     virtual bool GetValue() const;
 

-    virtual void SetLabel(const wxString& label);
-
-    virtual bool MSWCommand(WXUINT param, WXWORD id);

     virtual void Command(wxCommandEvent& event);
 
 protected:
     virtual void Command(wxCommandEvent& event);
 
 protected:

diff --git a/include/wx/palmos/control.h b/include/wx/palmos/control.h
index 82fb415c0e107ce7da2412b49abf48da331d55fb..db397571b0573f889f18c34f28ac447c1742dcc6 100644 (file)
--- a/include/wx/palmos/control.h
+++ b/include/wx/palmos/control.h
@@ -2,10 +2,10 @@
 // Name:        wx/palmos/control.h
 // Purpose:     wxControl class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        wx/palmos/control.h
 // Purpose:     wxControl class
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -50,6 +50,9 @@ public:
     virtual bool Show( bool show = true );
     virtual bool IsShown() const;
 
     virtual bool Show( bool show = true );
     virtual bool IsShown() const;
 

+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel();
+

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


@@ -103,7 +106,6 @@ protected:
     wxArrayLong m_subControls;
 
     ControlType *m_control;
     wxArrayLong m_subControls;
 
     ControlType *m_control;

-    uint16_t m_objectIndex;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 78647314851877e1b508a8a16f3e2af30801e867..c268fc861caabdcf077a0307591235482a4b764f 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -512,7 +512,7 @@
 #define wxUSE_BUTTON       1    // wxButton
 #define wxUSE_BMPBUTTON    0    // wxBitmapButton
 #define wxUSE_CALENDARCTRL 0    // wxCalendarCtrl
 #define wxUSE_BUTTON       1    // wxButton
 #define wxUSE_BMPBUTTON    0    // wxBitmapButton
 #define wxUSE_CALENDARCTRL 0    // wxCalendarCtrl

-#define wxUSE_CHECKBOX     0    // wxCheckBox
+#define wxUSE_CHECKBOX     1    // wxCheckBox

 #define wxUSE_CHECKLISTBOX 0    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
 #define wxUSE_CHOICE       0    // wxChoice
 #define wxUSE_COMBOBOX     0    // wxComboBox
 #define wxUSE_CHECKLISTBOX 0    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
 #define wxUSE_CHOICE       0    // wxChoice
 #define wxUSE_COMBOBOX     0    // wxComboBox


@@ -523,7 +523,7 @@
 #define wxUSE_RADIOBOX     0    // wxRadioBox
 #define wxUSE_RADIOBTN     0    // wxRadioButton
 #define wxUSE_SCROLLBAR    0    // wxScrollBar
 #define wxUSE_RADIOBOX     0    // wxRadioBox
 #define wxUSE_RADIOBTN     0    // wxRadioButton
 #define wxUSE_SCROLLBAR    0    // wxScrollBar

-#define wxUSE_SLIDER       0    // wxSlider
+#define wxUSE_SLIDER       1    // wxSlider

 #define wxUSE_SPINBTN      0    // wxSpinButton
 #define wxUSE_SPINCTRL     0    // wxSpinCtrl
 #define wxUSE_STATBOX      0    // wxStaticBox
 #define wxUSE_SPINBTN      0    // wxSpinButton
 #define wxUSE_SPINCTRL     0    // wxSpinCtrl
 #define wxUSE_STATBOX      0    // wxStaticBox


@@ -531,7 +531,7 @@
 #define wxUSE_STATTEXT     0    // wxStaticText
 #define wxUSE_STATBMP      0    // wxStaticBitmap
 #define wxUSE_TEXTCTRL     0    // wxTextCtrl
 #define wxUSE_STATTEXT     0    // wxStaticText
 #define wxUSE_STATBMP      0    // wxStaticBitmap
 #define wxUSE_TEXTCTRL     0    // wxTextCtrl

-#define wxUSE_TOGGLEBTN    0    // requires wxButton
+#define wxUSE_TOGGLEBTN    1    // requires wxButton

 #define wxUSE_TREECTRL     0    // wxTreeCtrl
 
 // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
 #define wxUSE_TREECTRL     0    // wxTreeCtrl
 
 // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR

diff --git a/include/wx/palmos/slider.h b/include/wx/palmos/slider.h
index fb97c2e1641efe3903a776cf85b1c1a82471ead0..4433437a010971fb57b86c992b4c2d5a69b7a1be 100644 (file)
--- a/include/wx/palmos/slider.h
+++ b/include/wx/palmos/slider.h
@@ -2,10 +2,10 @@
 // Name:        wx/palmos/slider95.h
 // Purpose:     wxSlider class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        wx/palmos/slider95.h
 // Purpose:     wxSlider class
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -48,16 +48,14 @@ public:
 
     void GetPosition(int *x, int *y) const;
 
 
     void GetPosition(int *x, int *y) const;
 

-    bool Show(bool show = TRUE);
-

     void SetRange(int minValue, int maxValue);
 
     void SetRange(int minValue, int maxValue);
 

-    int GetMin() const { return m_rangeMin; }
-    int GetMax() const { return m_rangeMax; }
+    int GetMin() const;
+    int GetMax() const;

 
     // For trackbars only
     void SetTickFreq(int n, int pos);
 
     // For trackbars only
     void SetTickFreq(int n, int pos);

-    int GetTickFreq() const { return m_tickFreq; }
+    int GetTickFreq() const { return GetPageSize(); }

     void SetPageSize(int pageSize);
     int GetPageSize() const;
     void ClearSel();
     void SetPageSize(int pageSize);
     int GetPageSize() const;
     void ClearSel();


@@ -71,28 +69,10 @@ public:
     int GetThumbLength() const;
     void SetTick(int tickPos);
 
     int GetThumbLength() const;
     void SetTick(int tickPos);
 

-    // IMPLEMENTATION
-    WXHWND GetStaticMin() const { return m_staticMin; }
-    WXHWND GetStaticMax() const { return m_staticMax; }
-    WXHWND GetEditValue() const { return m_staticValue; }
-    virtual bool ContainsHWND(WXHWND hWnd) const;
-
+    // implementation

     void Command(wxCommandEvent& event);
     void Command(wxCommandEvent& event);

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
-                             WXWORD pos, WXHWND control);

 
 protected:
 
 protected:

-    WXHWND        m_staticMin;
-    WXHWND        m_staticMax;
-    WXHWND        m_staticValue;
-    int           m_rangeMin;
-    int           m_rangeMax;
-    int           m_pageSize;
-    int           m_lineSize;
-    int           m_tickFreq;
-

     virtual void DoGetSize(int *width, int *height) const;
 
     virtual void DoSetSize(int x, int y,
     virtual void DoGetSize(int *width, int *height) const;
 
     virtual void DoSetSize(int x, int y,

diff --git a/include/wx/palmos/tglbtn.h b/include/wx/palmos/tglbtn.h
index b3ed4f3647e0c85c3d9ae1860839355dd9e7fb72..4b8f99def884619020acc28e3e274f2c5a1cbbca 100644 (file)
--- a/include/wx/palmos/tglbtn.h
+++ b/include/wx/palmos/tglbtn.h
@@ -3,10 +3,10 @@
 // Purpose:     Declaration of the wxToggleButton class, which implements a
 //              toggle button under Palm OS.
 // Author:      William Osborne - minimal working wxPalmOS port
 // Purpose:     Declaration of the wxToggleButton class, which implements a
 //              toggle button under Palm OS.
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -44,14 +44,11 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const ;
 
     virtual void SetValue(bool value);
     virtual bool GetValue() const ;
 

-    virtual bool MSWCommand(WXUINT param, WXWORD id);
-    virtual void SetLabel(const wxString& label);

     virtual void Command(wxCommandEvent& event);
 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual wxBorder GetDefaultBorder() const;
     virtual void Command(wxCommandEvent& event);
 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual wxBorder GetDefaultBorder() const;

-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)

diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h
index 9783f91ad6e8486d9b621096ae0811e25e01d479..f53a646cff2b78ef5a2714cf8a68acf2129ef538 100644 (file)
--- a/include/wx/palmos/toplevel.h
+++ b/include/wx/palmos/toplevel.h
@@ -81,6 +81,9 @@ public:
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 

+    // interface to native frame structure
+    FormType *GetForm();
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 257e8bde8fd21f48c62832072cd5ad2d1d0fe58b..0e5d0939b17e9b9b7713f57c59755f9043fc8724 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -108,6 +108,8 @@ private:
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)
     #include "wx/os2/slider.h"
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)
     #include "wx/os2/slider.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/slider.h"

 #endif
 
 #endif // wxUSE_SLIDER
 #endif
 
 #endif // wxUSE_SLIDER

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 8796bd899357ba057175815fecfea2b5949f2bd2..22e136c7fedebd0ba46b9d64503c91c865a80b18 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -34,6 +34,8 @@ END_DECLARE_EVENT_TYPES()
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/tglbtn.h"
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/tglbtn.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/tglbtn.h"

 /*
 # elif defined(__WXPM__)
 #  include "wx/os2/tglbtn.h"
 /*
 # elif defined(__WXPM__)
 #  include "wx/os2/tglbtn.h"

diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp
index f9be99b62a6b9c7d469d48be5c84302b16403ce4..c72fc9402ff7ee23b75c19a4ff8e14cea4aabe83 100644 (file)
--- a/src/palmos/button.cpp
+++ b/src/palmos/button.cpp
@@ -134,15 +134,6 @@ wxButton::~wxButton()
 {
 }
 
 {
 }
 

-// ----------------------------------------------------------------------------
-// flags
-// ----------------------------------------------------------------------------
-
-WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    return 0;
-}
-

 // ----------------------------------------------------------------------------
 // size management including autosizing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // size management including autosizing
 // ----------------------------------------------------------------------------


@@ -189,14 +180,5 @@ void wxButton::Command(wxCommandEvent & event)
 {
 }
 
 {
 }
 

-// ----------------------------------------------------------------------------
-// event/message handlers
-// ----------------------------------------------------------------------------
-
-bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
-{
-    return false;
-}
-

 #endif // wxUSE_BUTTON
 
 #endif // wxUSE_BUTTON
 

diff --git a/src/palmos/checkbox.cpp b/src/palmos/checkbox.cpp
index 4d756ff5fe6406b8bae22f1c220e831e091450ed..77f06f5409afb04451ae43f5807a6a398dcc32d2 100644 (file)
--- a/src/palmos/checkbox.cpp
+++ b/src/palmos/checkbox.cpp
@@ -2,10 +2,10 @@
 // Name:        src/palmos/checkbox.cpp
 // Purpose:     wxCheckBox
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        src/palmos/checkbox.cpp
 // Purpose:     wxCheckBox
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -37,20 +37,6 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

-#include "wx/palmos/private.h"
-
-#ifndef BST_UNCHECKED
-    #define BST_UNCHECKED 0x0000
-#endif
-
-#ifndef BST_CHECKED
-    #define BST_CHECKED 0x0001
-#endif
-
-#ifndef BST_INDETERMINATE
-    #define BST_INDETERMINATE 0x0002
-#endif
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -112,11 +98,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 // wxCheckBox
 // ----------------------------------------------------------------------------
 
 // wxCheckBox
 // ----------------------------------------------------------------------------
 

-bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
-{
-    return true;
-}
-

 bool wxCheckBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& label,
 bool wxCheckBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& label,


@@ -125,11 +106,8 @@ bool wxCheckBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

-    return false;
-}
-
-void wxCheckBox::SetLabel(const wxString& label)
-{
+    wxControl::PalmCreateControl(checkboxCtl, parent, id, label, pos, size);
+    return true;

 }
 
 wxSize wxCheckBox::DoGetBestSize() const
 }
 
 wxSize wxCheckBox::DoGetBestSize() const


@@ -150,10 +128,6 @@ void wxCheckBox::Command(wxCommandEvent& event)
 {
 }
 
 {
 }
 

-wxCOMPILE_TIME_ASSERT(wxCHK_UNCHECKED == BST_UNCHECKED
-    && wxCHK_CHECKED == BST_CHECKED
-    && wxCHK_UNDETERMINED == BST_INDETERMINATE, EnumValuesIncorrect);
-

 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {
 }
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {
 }

diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index c4360886e7d9753eb0ad9ad76ccb891a7a2ea655..df1399f819b7aa04d0e0330f0e7aba65d44fe54b 100644 (file)
--- a/src/palmos/control.cpp
+++ b/src/palmos/control.cpp
@@ -2,10 +2,10 @@
 // Name:        src/palmos/control.cpp
 // Purpose:     wxControl class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        src/palmos/control.cpp
 // Purpose:     wxControl class
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -39,6 +39,10 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+#include "wx/toplevel.h"
+#include "wx/button.h"
+#include "wx/checkbox.h"
+#include "wx/tglbtn.h"

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -92,8 +96,19 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
                                   const wxPoint& pos,
                                   const wxSize& size)
 {
                                   const wxPoint& pos,
                                   const wxSize& size)
 {

-    FormType* form = FrmGetActiveForm ();
-    m_control = CtlNewControl (
+    wxWindow* parentTLW = parent;
+    while ( parentTLW && !parentTLW->IsTopLevel() )
+    {
+        parentTLW = parentTLW->GetParent();
+    }
+    wxTopLevelWindowPalm* tlw = wxDynamicCast(parentTLW, wxTopLevelWindowPalm);
+    if(!tlw)
+        return false;
+    FormType* form = tlw->GetForm();
+
+    SetParent(parent);
+
+    m_control = CtlNewControl(

                     (void **)&form,
                     id,
                     style,
                     (void **)&form,
                     id,
                     style,


@@ -110,8 +125,6 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
     if(m_control==NULL)
         return false;
 
     if(m_control==NULL)
         return false;
 

-    form = FrmGetActiveForm ();
-    m_objectIndex = FrmGetObjectIndex(form, id);

     Show();
     return true;
 }
     Show();
     return true;
 }


@@ -158,12 +171,36 @@ bool wxControl::IsShown() const
 bool wxControl::Show( bool show )
 {
     if(show)
 bool wxControl::Show( bool show )
 {
     if(show)

-        FrmShowObject(FrmGetActiveForm(), m_objectIndex);
+        CtlShowControl(m_control);

     else
     else

-        FrmHideObject(FrmGetActiveForm(), m_objectIndex);
+        CtlHideControl(m_control);

     return true;
 }
 
     return true;
 }
 

+void wxControl::SetLabel(const wxString& label)
+{
+    // setting in wrong control causes crash
+    if ( ( wxDynamicCast(this,wxButton) != NULL ) ||
+         ( wxDynamicCast(this,wxCheckBox) != NULL ) ||
+         ( wxDynamicCast(this,wxToggleButton) != NULL ) )
+    {
+        CtlSetLabel(m_control,label);
+    }
+}
+
+wxString wxControl::GetLabel()
+{
+    // setting in wrong control causes crash
+    if ( wxDynamicCast(this,wxButton) ||
+         wxDynamicCast(this,wxCheckBox) ||
+         wxDynamicCast(this,wxToggleButton) )
+    {
+        return CtlGetLabel(m_control);
+    }
+
+    return wxEmptyString;
+}
+

 /* static */ wxVisualAttributes
 wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 /* static */ wxVisualAttributes
 wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index b71a9a400479b093c136a69f00bc2ae1cf6e11d3..a6341e03a280073fd5796dd238912f540e17470a 100644 (file)
--- a/src/palmos/slider.cpp
+++ b/src/palmos/slider.cpp
@@ -2,10 +2,10 @@
 // Name:        src/palmos/slider.cpp
 // Purpose:     wxSlider
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        src/palmos/slider.cpp
 // Purpose:     wxSlider
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -28,8 +28,7 @@
 #include "wx/slider.h"
 #endif
 
 #include "wx/slider.h"
 #endif
 

-#include "wx/palmos/slider.h"
-#include "wx/palmos/private.h"
+#include "wx/toplevel.h"

 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxSliderStyle )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxSliderStyle )


@@ -110,22 +109,74 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-    return false;
+    wxWindow* parentTLW = GetParent();
+    while ( parentTLW && !parentTLW->IsTopLevel() )
+    {
+        parentTLW = parentTLW->GetParent();
+    }
+    wxTopLevelWindowPalm* tlw = wxDynamicCast(parentTLW, wxTopLevelWindowPalm);
+    if(!tlw)
+        return false;
+    FormType* form = tlw->GetForm();
+
+    SetParent(parent);
+
+    SliderControlType *slider = CtlNewSliderControl (
+                                   (void **)&form,
+                                   id,
+                                   feedbackSliderCtl,
+                                   NULL,
+                                   0,
+                                   0,
+                                   pos.x,
+                                   pos.y,
+                                   size.x,
+                                   size.y,
+                                   minValue,
+                                   maxValue,
+                                   1,
+                                   value
+                              );
+
+    m_control = (ControlType*) slider;
+
+    if(m_control==NULL)
+        return false;
+
+    Show();
+    return true;

 }
 
 }
 

-bool wxSlider::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
-                             WXWORD WXUNUSED(pos), WXHWND control)
+wxSlider::~wxSlider()

 {
 {

-    return false;

 }
 
 }
 

-wxSlider::~wxSlider()
+int wxSlider::GetMin() const
+{
+    uint16_t ret;
+    CtlGetSliderValues(m_control, &ret, NULL, NULL, NULL);
+    return ret;
+}
+
+int wxSlider::GetMax() const
+{
+    uint16_t ret;
+    CtlGetSliderValues(m_control, NULL, &ret, NULL, NULL);
+    return ret;
+}
+
+int wxSlider::GetPageSize() const

 {
 {

+    uint16_t ret;
+    CtlGetSliderValues(m_control, NULL, NULL, &ret, NULL);
+    return ret;

 }
 
 int wxSlider::GetValue() const
 {
 }
 
 int wxSlider::GetValue() const
 {

-    return 0;
+    uint16_t ret;
+    CtlGetSliderValues(m_control, NULL, NULL, NULL, &ret);
+    return ret;

 }
 
 void wxSlider::SetValue(int value)
 }
 
 void wxSlider::SetValue(int value)


@@ -155,12 +206,6 @@ void wxSlider::SetRange(int minValue, int maxValue)
 {
 }
 
 {
 }
 

-WXHBRUSH wxSlider::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-    return 0;
-}
-

 void wxSlider::SetTickFreq(int n, int pos)
 {
 }
 void wxSlider::SetTickFreq(int n, int pos)
 {
 }


@@ -169,11 +214,6 @@ void wxSlider::SetPageSize(int pageSize)
 {
 }
 
 {
 }
 

-int wxSlider::GetPageSize() const
-{
-  return 0;
-}
-

 void wxSlider::ClearSel()
 {
 }
 void wxSlider::ClearSel()
 {
 }


@@ -218,18 +258,8 @@ void wxSlider::SetTick(int tickPos)
 {
 }
 
 {
 }
 

-bool wxSlider::ContainsHWND(WXHWND hWnd) const
-{
-    return false;
-}
-

 void wxSlider::Command (wxCommandEvent & event)
 {
 }
 
 void wxSlider::Command (wxCommandEvent & event)
 {
 }
 

-bool wxSlider::Show(bool show)
-{
-    return false;
-}
-

 #endif // wxUSE_SLIDER
 #endif // wxUSE_SLIDER

diff --git a/src/palmos/tglbtn.cpp b/src/palmos/tglbtn.cpp
index ec2845948f69f497d1c178cd0aab37a0449a05ad..9e69fc4b8291ea8ff0001e1559be4ea822d63b24 100644 (file)
--- a/src/palmos/tglbtn.cpp
+++ b/src/palmos/tglbtn.cpp
@@ -3,10 +3,10 @@
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button.
 // Author:      William Osborne - minimal working wxPalmOS port
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button.
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/tglbtn.h"
-

 #if wxUSE_TOGGLEBTN
 
 #ifndef WX_PRECOMP
 #if wxUSE_TOGGLEBTN
 
 #ifndef WX_PRECOMP


@@ -37,7 +35,7 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

-#include "wx/palmos/private.h"
+#include "wx/tglbtn.h"

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -46,8 +44,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 

-#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -56,15 +52,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 // wxToggleButton
 // ----------------------------------------------------------------------------
 
 // wxToggleButton
 // ----------------------------------------------------------------------------
 

-bool wxToggleButton::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
-{
-   wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
-   event.SetInt(GetValue());
-   event.SetEventObject(this);
-   ProcessCommand(event);
-   return TRUE;
-}
-

 // Single check box item
 bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxString& label,
 // Single check box item
 bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxString& label,


@@ -73,7 +60,8 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString& name)
 {
                             const wxValidator& validator,
                             const wxString& name)
 {

-    return false;
+    wxControl::PalmCreateControl(pushButtonCtl, parent, id, label, pos, size);
+    return true;

 }
 
 wxBorder wxToggleButton::GetDefaultBorder() const
 }
 
 wxBorder wxToggleButton::GetDefaultBorder() const


@@ -81,15 +69,6 @@ wxBorder wxToggleButton::GetDefaultBorder() const
     return wxBORDER_NONE;
 }
 
     return wxBORDER_NONE;
 }
 

-WXDWORD wxToggleButton::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    return 0;
-}
-
-void wxToggleButton::SetLabel(const wxString& label)
-{
-}
-

 wxSize wxToggleButton::DoGetBestSize() const
 {
    return wxSize(0,0);
 wxSize wxToggleButton::DoGetBestSize() const
 {
    return wxSize(0,0);


@@ -99,10 +78,6 @@ void wxToggleButton::SetValue(bool val)
 {
 }
 
 {
 }
 

-#ifndef BST_CHECKED
-#define BST_CHECKED 0x0001
-#endif
-

 bool wxToggleButton::GetValue() const
 {
     return false;
 bool wxToggleButton::GetValue() const
 {
     return false;

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 2d67f37da62780cc4e46b97fc2fc471cd6bdcaaa..58fe1ddc4661615deafaf676665bb977a248a30f 100644 (file)
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -210,6 +210,11 @@ bool wxTopLevelWindowPalm::EnableCloseButton(bool enable)
     return false;
 }
 
     return false;
 }
 

+FormType *wxTopLevelWindowPalm::GetForm()
+{
+    return FrmGetActiveForm ();
+}
+

 #ifndef __WXWINCE__
 
 bool wxTopLevelWindowPalm::SetShape(const wxRegion& region)
 #ifndef __WXWINCE__
 
 bool wxTopLevelWindowPalm::SetShape(const wxRegion& region)