Warning fixes for Cygwin

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

diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h
index fbb7560f32006d97463d540af7e0c2ed2f9141e3..337e52a69ff6d6b288a982cf5cf00586c56566bc 100644 (file)
--- a/include/wx/palmos/radiobox.h
+++ b/include/wx/palmos/radiobox.h
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/radiobox.h
 // Purpose:     wxRadioBox class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/radiobox.h
 // Purpose:     wxRadioBox class

-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Wlodzimierz ABX Skiba - native wxRadioBox implementation

 // Created:     10/13/04
 // Created:     10/13/04

-// RCS-ID:      $Id: 
-// Copyright:   (c) William Osborne
+// RCS-ID:      $Id$
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

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


@@ -17,6 +17,7 @@
 #endif
 
 class WXDLLEXPORT wxBitmap;
 #endif
 
 class WXDLLEXPORT wxBitmap;

+class WXDLLEXPORT wxRadioButton;

 
 // ----------------------------------------------------------------------------
 // wxRadioBox
 
 // ----------------------------------------------------------------------------
 // wxRadioBox


@@ -25,7 +26,10 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
 public:
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
 public:

-    wxRadioBox();
+    wxRadioBox():m_radios(wxKEY_INTEGER,32)
+    {
+        Init();
+    }

 
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
 
     wxRadioBox(wxWindow *parent,
                wxWindowID id,


@@ -34,13 +38,16 @@ public:
                const wxSize& size = wxDefaultSize,
                int n = 0, const wxString choices[] = NULL,
                int majorDim = 0,
                const wxSize& size = wxDefaultSize,
                int n = 0, const wxString choices[] = NULL,
                int majorDim = 0,

-               long style = wxRA_HORIZONTAL,
+               long style = wxRA_SPECIFY_COLS,

                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)

+              :m_radios(wxKEY_INTEGER,n+1)

     {
     {

+        Init();

         (void)Create(parent, id, title, pos, size, n, choices, majorDim,
                      style, val, name);
     }
         (void)Create(parent, id, title, pos, size, n, choices, majorDim,
                      style, val, name);
     }

+

     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,


@@ -48,10 +55,12 @@ public:
                const wxSize& size,
                const wxArrayString& choices,
                int majorDim = 0,
                const wxSize& size,
                const wxArrayString& choices,
                int majorDim = 0,

-               long style = wxRA_HORIZONTAL,
+               long style = wxRA_SPECIFY_COLS,

                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)

+              :m_radios(wxKEY_INTEGER,choices.GetCount()+1)

     {
     {

+        Init();

         (void)Create(parent, id, title, pos, size, choices, majorDim,
                      style, val, name);
     }
         (void)Create(parent, id, title, pos, size, choices, majorDim,
                      style, val, name);
     }


@@ -65,9 +74,10 @@ public:
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 int majorDim = 0,
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 int majorDim = 0,

-                long style = wxRA_HORIZONTAL,
+                long style = wxRA_SPECIFY_COLS,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);

+

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,


@@ -75,7 +85,7 @@ public:
                 const wxSize& size,
                 const wxArrayString& choices,
                 int majorDim = 0,
                 const wxSize& size,
                 const wxArrayString& choices,
                 int majorDim = 0,

-                long style = wxRA_HORIZONTAL,
+                long style = wxRA_SPECIFY_COLS,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 


@@ -85,17 +95,32 @@ public:
     virtual int GetCount() const;
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
     virtual int GetCount() const;
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);

-    virtual void Enable(int n, bool enable = TRUE);
-    virtual void Show(int n, bool show = TRUE);
+
+    virtual bool Enable(bool enable = true);
+    virtual bool Enable(int n, bool enable = true);
+
+    virtual bool Show(bool show = true);
+    virtual bool Show(int n, bool show = true);
+
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel();
+

     virtual int GetColumnCount() const;
     virtual int GetRowCount() const;
 
     virtual int GetColumnCount() const;
     virtual int GetRowCount() const;
 

-    virtual bool Show(bool show = TRUE);
+    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);
+
+    virtual wxPoint GetClientAreaOrigin() const;
+

     void SetFocus();
     void SetFocus();

-    virtual bool Enable(bool enable = TRUE);

     void SetLabelFont(const wxFont& WXUNUSED(font)) {};
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 
     void SetLabelFont(const wxFont& WXUNUSED(font)) {};
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 

+    virtual void Refresh( bool eraseBackground = true,
+                          const wxRect *rect = NULL );
+

     void Command(wxCommandEvent& event);
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void Command(wxCommandEvent& event);
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }


@@ -104,43 +129,24 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    virtual bool MSWCommand(WXUINT param, WXWORD id);
-
-    // FIXME: are they used? missing "Do" prefix?
-    void GetSize(int *x, int *y) const;
-    void GetPosition(int *x, int *y) const;
-

     virtual bool SetFont(const wxFont& font);
 
     virtual bool SetFont(const wxFont& font);
 

-    WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message,
-                                WXWPARAM wParam, WXLPARAM lParam);
-    WXHWND *GetRadioButtons() const { return m_radioButtons; }
-    bool ContainsHWND(WXHWND hWnd) const;

     void SendNotificationEvent();
 
     // get the number of buttons per column/row
     int GetNumVer() const;
     int GetNumHor() const;
 
     void SendNotificationEvent();
 
     // get the number of buttons per column/row
     int GetNumVer() const;
     int GetNumHor() const;
 

-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
-

 protected:
     // we can't compute our best size before the items are added to the control
     virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
 
 protected:
     // we can't compute our best size before the items are added to the control
     virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
 

-    // subclass one radio button
-    void SubclassRadioButton(WXHWND hWndBtn);
-

     // get the max size of radio buttons
     wxSize GetMaxButtonSize() const;
 
     // get the total size occupied by the radio box buttons
     wxSize GetTotalButtonSize(const wxSize& sizeBtn) const;
 
     // get the max size of radio buttons
     wxSize GetMaxButtonSize() const;
 
     // get the total size occupied by the radio box buttons
     wxSize GetTotalButtonSize(const wxSize& sizeBtn) const;
 

-    WXHWND *          m_radioButtons;

     int               m_majorDim;
     int *             m_radioWidth;  // for bitmaps
     int *             m_radioHeight;
     int               m_majorDim;
     int *             m_radioWidth;  // for bitmaps
     int *             m_radioHeight;


@@ -149,12 +155,17 @@ protected:
     int               m_noRowsOrCols;
     int               m_selectedButton;
 
     int               m_noRowsOrCols;
     int               m_selectedButton;
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);

     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private:

+
+    void Init();
+    wxRadioButton *GetRadioButton(int i) const;
+
+    wxPoint m_pos;
+    wxSize m_size;
+    wxHashTable m_radios;
+

     DECLARE_DYNAMIC_CLASS(wxRadioBox)
     DECLARE_NO_COPY_CLASS(wxRadioBox)
 };
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
     DECLARE_NO_COPY_CLASS(wxRadioBox)
 };