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

cleanup - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-14 04:41:07 +00:00
parent 8dc6614e60
commit 0ce0b76b50
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/mac/carbon/combobox.h
View File

@@ -112,10 +112,10 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void Remove(long from, long to); virtual void Remove(long from, long to);
virtual void SetSelection(long from, long to); virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable); virtual void SetEditable(bool editable);
virtual int GetCount() const ;
virtual bool IsEditable() const; virtual bool IsEditable() const;
virtual int GetCount() const;
virtual void Undo(); virtual void Undo();
virtual void Redo(); virtual void Redo();
virtual void SelectAll(); virtual void SelectAll();
@@ -131,14 +131,17 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
WX_DECLARE_CONTROL_CONTAINER(); WX_DECLARE_CONTROL_CONTAINER();
protected: protected:
// common part of all ctors
void Init();
void FreeData();
// override the base class virtuals involved in geometry calculations // override the base class virtuals involved in geometry calculations
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height);
// common part of all ctors
void Init();
virtual int DoAppend(const wxString& item); virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos); virtual int DoInsert(const wxString& item, int pos);
@@ -147,8 +150,6 @@ protected:
virtual void DoSetItemClientObject(int n, wxClientData* clientData); virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData * DoGetItemClientObject(int n) const; virtual wxClientData * DoGetItemClientObject(int n) const;
void FreeData();
// the subcontrols // the subcontrols
wxComboBoxText* m_text; wxComboBoxText* m_text;
wxComboBoxChoice* m_choice; wxComboBoxChoice* m_choice;
@@ -156,5 +157,4 @@ protected:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif #endif // _WX_COMBOBOX_H_
// _WX_COMBOBOX_H_