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

Merge branch 'rename-listctrl-checkbox-methods' of https://github.com/discnl/wxWidgets

Browse Source 
Use consistent case for wxListCtrl::{Has,Enable}CheckBoxes() methods.

Closes https://github.com/wxWidgets/wxWidgets/pull/275
This commit is contained in:
Vadim Zeitlin
2016-04-23 18:52:47 +02:00
parent b1fcf100ff 3689f0119b
commit 70b64b8c53
10 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/listctrl.h
View File

@@ -101,8 +101,8 @@ public:
void SetTextColour(const wxColour& col);
long GetTopItem() const;
virtual bool HasCheckboxes() const wxOVERRIDE;
virtual bool EnableCheckboxes(bool enable = true) wxOVERRIDE;
virtual bool HasCheckBoxes() const wxOVERRIDE;
virtual bool EnableCheckBoxes(bool enable = true) wxOVERRIDE;
virtual bool IsItemChecked(long item) const wxOVERRIDE;
virtual void CheckItem(long item, bool check) wxOVERRIDE;

8
include/wx/generic/private/listctrl.h
View File

@@ -641,8 +641,8 @@ public:
bool GetItemPosition( long item, wxPoint& pos ) const;
int GetSelectedItemCount() const;
bool HasCheckboxes() const;
bool EnableCheckboxes(bool enable = true);
bool HasCheckBoxes() const;
bool EnableCheckBoxes(bool enable = true);
bool IsItemChecked(long item) const;
void CheckItem(long item, bool check);
@@ -789,7 +789,7 @@ protected:
m_lineBeforeLastClicked,
m_lineSelectSingleOnUp;
bool m_hasCheckboxes;
bool m_hasCheckBoxes;
protected:
wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE { return GetParent(); }
@@ -853,7 +853,7 @@ private:
// Check if the given point is inside the checkbox of this item.
//
// Always returns false if there are no checkboxes.
bool IsInsideCheckbox(long item, int x, int y);
bool IsInsideCheckBox(long item, int x, int y);
// the height of one line using the current font
wxCoord m_lineHeight;

4
include/wx/listbase.h
View File

@@ -415,8 +415,8 @@ public:
virtual bool SetHeaderAttr(const wxItemAttr& WXUNUSED(attr)) { return false; }
// Checkboxes support: only implemented in wxMSW currently.
virtual bool HasCheckboxes() const { return false; }
virtual bool EnableCheckboxes(bool WXUNUSED(enable) = true) { return false; }
virtual bool HasCheckBoxes() const { return false; }
virtual bool EnableCheckBoxes(bool WXUNUSED(enable) = true) { return false; }
virtual bool IsItemChecked(long WXUNUSED(item)) const { return false; }
virtual void CheckItem(long WXUNUSED(item), bool WXUNUSED(check)) { }

4
include/wx/msw/listctrl.h
View File

@@ -221,8 +221,8 @@ public:
wxFont GetItemFont( long item ) const;
// Checkbox state of an item
virtual bool HasCheckboxes() const wxOVERRIDE;
virtual bool EnableCheckboxes(bool enable = true) wxOVERRIDE;
virtual bool HasCheckBoxes() const wxOVERRIDE;
virtual bool EnableCheckBoxes(bool enable = true) wxOVERRIDE;
virtual bool IsItemChecked(long item) const wxOVERRIDE;
virtual void CheckItem(long item, bool check) wxOVERRIDE;