wxAnimationCtrl fix to display inactive bitmap at start (patch 1590192)

[wxWidgets.git] / include / wx / os2 / choice.h

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 11358cd4ddcbd346a674b17f11e8c6633e6c536e..8054f2234422fe39a64df49439cd20cbfec36452 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.h
+// Name:        wx/os2/choice.h

 // Purpose:     wxChoice class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxChoice class
 // Author:      David Webster
 // Modified by:


@@ -12,9 +12,10 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-
+// ----------------------------------------------------------------------------

 // Choice item
 // Choice item

+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)


@@ -22,58 +23,112 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 public:
     // ctors
     inline wxChoice() { }
 public:
     // ctors
     inline wxChoice() { }

+    virtual ~wxChoice();

 
 

-    inline wxChoice(wxWindow *parent, wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = NULL,
-             long style = 0,
-#if wxUSE_VALIDATORS
-             const wxValidator& validator = wxDefaultValidator,
-#endif
-             const wxString& name = wxChoiceNameStr)
+    inline wxChoice( wxWindow*          pParent
+                    ,wxWindowID         vId
+                    ,const wxPoint&     rPos = wxDefaultPosition
+                    ,const wxSize&      rSize = wxDefaultSize
+                    ,int                n = 0
+                    ,const wxString     asChoices[] = NULL
+                    ,long               lStyle = 0
+                    ,const wxValidator& rValidator = wxDefaultValidator
+                    ,const wxString&    rsName = wxChoiceNameStr
+                   )

     {
     {

-        Create(parent, id, pos, size, n, choices, style, validator, name);
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,n
+               ,asChoices
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );

     }
 
     }
 

-    bool Create(wxWindow *parent, wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = NULL,
-             long style = 0,
-#if wxUSE_VALIDATORS
-             const wxValidator& validator = wxDefaultValidator,
-#endif
-             const wxString& name = wxChoiceNameStr);
+    inline wxChoice( wxWindow*            pParent
+                    ,wxWindowID           vId
+                    ,const wxPoint&       rPos
+                    ,const wxSize&        rSize
+                    ,const wxArrayString& asChoices
+                    ,long                 lStyle = 0
+                    ,const wxValidator&   rValidator = wxDefaultValidator
+                    ,const wxString&      rsName = wxChoiceNameStr
+                   )
+    {
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,asChoices
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }

 
 

+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,int                n = 0
+                ,const wxString     asChoices[] = NULL
+                ,long               lStyle = 0
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxChoiceNameStr
+               );
+
+    bool Create( wxWindow*            pParent
+                ,wxWindowID           vId
+                ,const wxPoint&       rPos
+                ,const wxSize&        rSize
+                ,const wxArrayString& asChoices
+                ,long                 lStyle = 0
+                ,const wxValidator&   rValidator = wxDefaultValidator
+                ,const wxString&      rsName = wxChoiceNameStr
+               );
+
+    //

     // Implement base class virtuals
     // Implement base class virtuals

-    virtual int  DoAppend(const wxString& item);
-    virtual void Delete(int n);
-    virtual void Clear();
+    //
+    virtual void     Delete(unsigned int n);
+    virtual void     Clear(void);

 
 

-    virtual int GetCount() const;
-    virtual int GetSelection() const ;
-    virtual void SetSelection(int n);
+    virtual unsigned int GetCount() const;
+    virtual int      GetSelection(void) const;
+    virtual void     SetSelection(int n);

 
 

-    virtual int FindString(const wxString& s) const;
-    virtual wxString GetString(int n) const ;
-    virtual void SetString(int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
+    virtual void     SetString(unsigned int n, const wxString& rsStr);

 
 

+    //

     // OS2 only
     // OS2 only

-    virtual bool OS2Command(WXUINT param, WXWORD id);
-    MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    //
+    virtual bool     OS2Command( WXUINT uParam
+                                ,WXWORD wId
+                               );
+    MRESULT          OS2WindowProc( WXUINT   uMsg
+                                   ,WXWPARAM wParam
+                                   ,WXLPARAM lParam
+                                  );

 
 protected:
 
 protected:

-    virtual void DoSetItemClientData( int n, void* clientData );
-    virtual void* DoGetItemClientData( int n ) const;
-    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
-    virtual wxClientData* DoGetItemClientObject( int n ) const;
-
-    // OS2 implementation
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-};
+    virtual int           DoAppend(const wxString& rsItem);
+    virtual int           DoInsert(const wxString& rsItem, unsigned int pos);
+    virtual void          DoSetItemClientData(unsigned int n, void* pClientData);
+    virtual void*         DoGetItemClientData(unsigned int n) const;
+    virtual void          DoSetItemClientObject(unsigned int n, wxClientData* pClientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
+    virtual wxSize        DoGetBestSize(void) const;
+    virtual void          DoSetSize( int nX
+                                    ,int nY
+                                    ,int nWidth
+                                    ,int nHeight
+                                    ,int nsizeFlags = wxSIZE_AUTO
+                                   );
+    void                  Free(void);
+}; // end of CLASS wxChoice

 
 #endif // _WX_CHOICE_H_
 
 #endif // _WX_CHOICE_H_