Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced all int/size_t indices in wxControlWithItems API with unsigned int (committing on behalf of ABX)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-23 22:05:23 +00:00
parent 5aa67d6619
commit aa61d35253
112 changed files with 1367 additions and 1414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/os2/checklst.h
View File

@@ -49,17 +49,15 @@ public:
//
// Override base class virtuals
//
virtual void Delete(int n);
virtual void Delete(unsigned int n);
virtual bool SetFont(const wxFont &rFont);
//
// Items may be checked
//
bool IsChecked(size_t uiIndex) const;
void Check( size_t uiIndex
,bool bCheck = true
);
bool IsChecked(unsigned int uiIndex) const;
void Check(unsigned int uiIndex, bool bCheck = true);
//
// Accessors
@@ -74,7 +72,7 @@ protected:
virtual wxOwnerDrawn* CreateItem(size_t n);
virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
virtual void DoInsertItems(const wxArrayString& items, int pos);
virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
//
// Pressing space or clicking the check box toggles the item
@@ -83,7 +81,7 @@ protected:
void OnLeftClick(wxMouseEvent& rEvent);
private:
size_t m_nItemHeight; // height of checklistbox items (the same for all)
size_t m_nItemHeight; // height of checklistbox items (the same for all)
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
DECLARE_EVENT_TABLE()

26
include/wx/os2/choice.h
View File

@@ -90,18 +90,16 @@ public:
// Implement base class virtuals
//
virtual int DoAppend(const wxString& rsItem);
virtual int DoInsert(const wxString& rsItem, int pos);
virtual void Delete(int n);
virtual int DoInsert(const wxString& rsItem, unsigned int pos);
virtual void Delete(unsigned int n);
virtual void Clear(void);
virtual size_t GetCount() const;
virtual int GetSelection(void) const ;
virtual unsigned int GetCount() const;
virtual int GetSelection(void) const;
virtual void SetSelection(int n);
virtual wxString GetString(int n) const ;
virtual void SetString( int n
,const wxString& rsStr
);
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& rsStr);
//
// OS2 only
@@ -115,14 +113,10 @@ public:
);
protected:
virtual void DoSetItemClientData( int n
,void* pClientData
);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject( int n
,wxClientData* pClientData
);
virtual wxClientData* DoGetItemClientObject(int n) const;
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

26
include/wx/os2/listbox.h
View File

@@ -104,11 +104,11 @@ public:
// Implement base class pure virtuals
//
virtual void Clear(void);
virtual void Delete(int n);
virtual void Delete(unsigned int n);
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& rsString);
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& rsString);
virtual bool IsSelected(int n) const;
virtual void DoSetSelection(int n, bool bSelect);
@@ -116,21 +116,17 @@ public:
virtual int GetSelections(wxArrayInt& raSelections) const;
virtual int DoAppend(const wxString& rsItem);
virtual void DoInsertItems( const wxArrayString& raItems, int rPos );
virtual void DoInsertItems( const wxArrayString& raItems, unsigned int rPos );
virtual void DoSetItems( const wxArrayString& raItems
,void ** ppClientData
);
virtual void DoSetFirstItem(int n);
virtual void DoSetItemClientData( int n
,void* pClientData
);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject( int n
,wxClientData* pClientData
);
virtual wxClientData* DoGetItemClientObject(int n) const;
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;
//
// wxCheckListBox support
@@ -154,8 +150,8 @@ protected:
bool HasMultipleSelection(void) const;
virtual wxSize DoGetBestSize(void) const;
size_t m_nNumItems;
int m_nSelected;
unsigned int m_nNumItems;
int m_nSelected;
#if wxUSE_OWNER_DRAWN
//

20
include/wx/os2/radiobox.h
View File

@@ -102,7 +102,7 @@ public:
void Command(wxCommandEvent& rEvent);
bool ContainsHWND(WXHWND hWnd) const;
virtual bool Enable(bool bEnable = true);
virtual bool Enable(int nItem, bool bEnable = true);
virtual bool Enable(unsigned int nItem, bool bEnable = true);
virtual WXHBRUSH OnCtlColor( WXHDC hDC
,WXHWND hWnd
@@ -115,7 +115,7 @@ public:
,WXWORD wId
);
void SendNotificationEvent(void);
virtual bool Show(int nItem, bool bShow = true);
virtual bool Show(unsigned int nItem, bool bShow = true);
virtual bool Show(bool bShow = true);
MRESULT WindowProc( WXUINT uMsg
,WXWPARAM wParam
@@ -125,24 +125,20 @@ public:
virtual size_t GetCount() const;
virtual unsigned int GetCount() const;
inline WXHWND* GetRadioButtons(void) const { return m_ahRadioButtons; }
int GetSelection(void) const;
void GetSize( int* pnX
,int* pnY
) const;
void GetSize(int* pnX, int* pnY) const;
inline int GetSizeFlags(void) const { return m_nSizeFlags; }
wxString GetString(int nIndex) const;
virtual wxString GetString(unsigned int nIndex) const;
virtual wxString GetStringSelection(void) const;
inline void SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
void SetFocus(void);
virtual bool SetFont(const wxFont& rFont);
inline void SetLabelFont(const wxFont& WXUNUSED(font)) {};
void SetSelection(int nIndex);
virtual void SetString( int nNum
,const wxString& rsLabel
);
virtual void SetSelection(int nIndex);
virtual void SetString(unsigned int nNum, const wxString& rsLabel);
virtual bool SetStringSelection(const wxString& rsStr);
virtual void SetLabel(const wxString& rsLabel)
@@ -175,7 +171,7 @@ protected:
private:
size_t m_nNoItems;
unsigned int m_nNoItems;
DECLARE_DYNAMIC_CLASS(wxRadioBox)
}; // end of wxRadioBox