Replaced int with size_t where appropriate, added WXDLLEXPORT, corrected

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

diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h
index f669ef3cb1c67a631333773de3ad4d27d601f3d5..cbecae5fedf6e8649403bb2b41c02f1cc1ba2082 100644 (file)
--- a/include/wx/os2/checklst.h
+++ b/include/wx/os2/checklst.h
@@ -17,61 +17,87 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-class wxOwnerDrawn;    // so the compiler knows, it is a class.
+class wxOwnerDrawn; // so the compiler knows, it is a class.

 
 class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
 
 class WXDLLEXPORT wxCheckListBox : public wxListBox
 {
 
 class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
 
 class WXDLLEXPORT wxCheckListBox : public wxListBox
 {

-  DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 public:
 public:

-  // ctors
-  wxCheckListBox();
-  wxCheckListBox(wxWindow *parent, wxWindowID id,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 int nStrings = 0,
-                 const wxString choices[] = NULL,
-                 long style = 0,
+    //
+    // Ctors
+    //
+    wxCheckListBox();
+    wxCheckListBox( wxWindow*          pParent
+                   ,wxWindowID         vId
+                   ,const wxPoint&     rPos = wxDefaultPosition
+                   ,const wxSize&      vSize = wxDefaultSize
+                   ,int                nStrings = 0
+                   ,const wxString     asChoices[] = NULL
+                   ,long               lStyle = 0

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-                 const wxValidator& validator = wxDefaultValidator,
+                   ,const wxValidator& rValidator = wxDefaultValidator

 #endif
 #endif

-                 const wxString& name = wxListBoxNameStr);
-
-  // override base class virtuals
-  virtual void Delete(int n);
-  virtual void InsertItems(int nItems, const wxString items[], int pos);
-
-  virtual bool SetFont( const wxFont &font );
-
-  // items may be checked
-  bool IsChecked(size_t uiIndex) const;
-  void Check(size_t uiIndex, bool bCheck = TRUE);
-
-  // accessors
-  size_t GetItemHeight() const { return m_nItemHeight; }
+                   ,const wxString&    rsName = wxListBoxNameStr
+                  );
+
+    //
+    // Override base class virtuals
+    //
+    virtual void Delete(int n);
+    virtual void InsertItems( int            nItems
+                             ,const wxString asItems[]
+                             ,int            nPos
+                            );
+
+    virtual bool SetFont(const wxFont &rFont);
+
+    //
+    // Items may be checked
+    //
+    bool IsChecked(size_t uiIndex) const;
+    void Check( size_t uiIndex
+               ,bool   bCheck = TRUE
+              );
+
+    //
+    // Accessors
+    //
+    size_t GetItemHeight(void) const { return m_nItemHeight; }

 
 protected:
 
 protected:

-  // we create our items ourselves and they have non-standard size,
-  // so we need to override these functions
-  virtual wxOwnerDrawn *CreateItem(size_t n);
-//  virtual bool          OS2OnMeasure(WXMEASUREITEMSTRUCT *item);
-
-  // pressing space or clicking the check box toggles the item
-  void OnChar(wxKeyEvent& event);
-  void OnLeftClick(wxMouseEvent& event);
+    //
+    // We create our items ourselves and they have non-standard size,
+    // so we need to override these functions
+    //
+    virtual wxOwnerDrawn* CreateItem(size_t n);
+    virtual long          OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
+
+    //
+    // Pressing space or clicking the check box toggles the item
+    //
+    void OnChar(wxKeyEvent& rEvent);
+    void OnLeftClick(wxMouseEvent& rEvent);

 
 private:
 
 private:

-  size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
-
-  //Virtual function hiding suppression, do not use
-  virtual wxControl *CreateItem(const wxItemResource* childResource,
-                                const wxItemResource* parentResource,
-                                const wxResourceTable *table = (const wxResourceTable *) NULL)
-  { return(wxWindowBase::CreateItem(childResource, parentResource, table));};
-
-  DECLARE_EVENT_TABLE()
-};
+    size_t                          m_nItemHeight;  // height of checklistbox items (the same for all)
+
+    //
+    // Virtual function hiding suppression, do not use
+    //
+    virtual wxControl* CreateItem( const wxItemResource*  pChildResource
+                                  ,const wxItemResource*  pParentResource
+                                  ,const wxResourceTable* pTable = (const wxResourceTable *) NULL
+                                 )
+    {
+        return(wxWindowBase::CreateItem( pChildResource
+                                        ,pParentResource
+                                        ,pTable
+                                       ));
+    }
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    DECLARE_EVENT_TABLE()
+}; // end of CLASS wxCheckListBoxItem

 
 #endif
    // _WX_CHECKLST_H_
 
 #endif
    // _WX_CHECKLST_H_