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@38655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-04-10 14:58:15 +00:00
parent f7c3b945ec
commit 12cb759190
1 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
include/wx/mac/carbon/listbox.h
View File

@@ -22,11 +22,11 @@
class wxArrayInt; class wxArrayInt;
// forward decl for GetPeer() // forward decl for GetPeer()
class wxMacListControl ; class wxMacListControl;
// List box item // List box item
WX_DEFINE_ARRAY( char * , wxListDataArray ) ; WX_DEFINE_ARRAY( char* , wxListDataArray );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// List box control // List box control
@@ -37,46 +37,58 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase
public: public:
// ctors and such // ctors and such
wxListBox(); wxListBox();
wxListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, wxListBox(
const wxSize& size = wxDefaultSize, wxWindow *parent,
int n = 0, const wxString choices[] = NULL, wxWindowID id,
long style = 0, const wxPoint& pos = wxDefaultPosition,
const wxValidator& validator = wxDefaultValidator, const wxSize& size = wxDefaultSize,
const wxString& name = wxListBoxNameStr) int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr)
{ {
Create(parent, id, pos, size, n, choices, style, validator, name); Create(parent, id, pos, size, n, choices, style, validator, name);
} }
wxListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos, wxListBox(
const wxSize& size, wxWindow *parent,
const wxArrayString& choices, wxWindowID id,
long style = 0, const wxPoint& pos,
const wxValidator& validator = wxDefaultValidator, const wxSize& size,
const wxString& name = wxListBoxNameStr) const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr)
{ {
Create(parent, id, pos, size, choices, style, validator, name); Create(parent, id, pos, size, choices, style, validator, name);
} }
bool Create(wxWindow *parent, wxWindowID id, bool Create(
const wxPoint& pos = wxDefaultPosition, wxWindow *parent,
const wxSize& size = wxDefaultSize, wxWindowID id,
int n = 0, const wxString choices[] = NULL, const wxPoint& pos = wxDefaultPosition,
long style = 0, const wxSize& size = wxDefaultSize,
const wxValidator& validator = wxDefaultValidator, int n = 0,
const wxString& name = wxListBoxNameStr); const wxString choices[] = NULL,
bool Create(wxWindow *parent, wxWindowID id, long style = 0,
const wxPoint& pos, const wxValidator& validator = wxDefaultValidator,
const wxSize& size, const wxString& name = wxListBoxNameStr);
const wxArrayString& choices,
long style = 0, bool Create(
const wxValidator& validator = wxDefaultValidator, wxWindow *parent,
const wxString& name = wxListBoxNameStr); wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
virtual ~wxListBox(); virtual ~wxListBox();
virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
// implement base class pure virtuals // implement base class pure virtuals
virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
virtual void Clear(); virtual void Clear();
virtual void Delete(unsigned int n); virtual void Delete(unsigned int n);
@@ -93,14 +105,17 @@ public:
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
wxArrayString m_stringArray ; wxMacListControl * GetPeer() const { return (wxMacListControl*)m_peer; }
wxListDataArray m_dataArray ;
wxMacListControl* GetPeer() const { return (wxMacListControl*) m_peer ; }
wxArrayString m_stringArray;
wxListDataArray m_dataArray;
protected: protected:
// common creation for all databrowser list implementations
wxMacListControl* CreateMacListControl(const wxPoint& pos, const wxSize& size, long style);
// internal storage for line n has changed, issue a redraw // internal storage for line n has changed, issue a redraw
void MacUpdateLine( int n ) ; void MacUpdateLine(int n);
virtual void DoSetSelection(int n, bool select); virtual void DoSetSelection(int n, bool select);
virtual int DoAppend(const wxString& item); virtual int DoAppend(const wxString& item);
@@ -113,18 +128,14 @@ protected:
virtual wxClientData* DoGetItemClientObject(unsigned int n) const; virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual int DoListHitTest(const wxPoint& point) const; virtual int DoListHitTest(const wxPoint& point) const;
virtual wxSize DoGetBestSize() const;
// free memory (common part of Clear() and dtor) // free memory (common part of Clear() and dtor)
// prevent collision with some BSD definitions of macro Free() // prevent collision with some BSD definitions of macro Free()
void FreeData(); void FreeData();
unsigned int m_noItems; unsigned int m_noItems;
virtual wxSize DoGetBestSize() const;
// common creation for all databrowser list implementations
wxMacListControl* CreateMacListControl(const wxPoint& pos, const wxSize& size, long style) ;
private: private:
DECLARE_DYNAMIC_CLASS(wxListBox) DECLARE_DYNAMIC_CLASS(wxListBox)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()