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

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

@@ -19,8 +19,8 @@ WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
// forward declaration of private implementation classes // forward declaration of private implementation classes
class wxComboBoxText ; class wxComboBoxText;
class wxComboBoxChoice ; class wxComboBoxChoice;
// Combobox item // Combobox item
class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
@@ -88,16 +88,16 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void Delete(int n); virtual void Delete(int n);
virtual void Clear(); virtual void Clear();
virtual int GetSelection() const ; virtual int GetSelection() const;
int GetCurrentSelection() const { return GetSelection(); } int GetCurrentSelection() const { return GetSelection(); }
virtual void SetSelection(int n); virtual void SetSelection(int n);
virtual int FindString(const wxString& s, bool bCase = false) const; virtual int FindString(const wxString& s, bool bCase = false) const;
virtual wxString GetString(int n) const ; virtual wxString GetString(int n) const;
virtual wxString GetStringSelection() const ; virtual wxString GetStringSelection() const;
virtual void SetString(int n, const wxString& s) ; virtual void SetString(int n, const wxString& s);
// Text field functions // Text field functions
virtual wxString GetValue() const ; virtual wxString GetValue() const;
virtual void SetValue(const wxString& value); virtual void SetValue(const wxString& value);
// Clipboard operations // Clipboard operations
@@ -106,48 +106,49 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void Paste(); virtual void Paste();
virtual void SetInsertionPoint(long pos); virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd(); virtual void SetInsertionPointEnd();
virtual long GetInsertionPoint() const ; virtual long GetInsertionPoint() const;
virtual wxTextPos GetLastPosition() const ; virtual wxTextPos GetLastPosition() const;
virtual void Replace(long from, long to, const wxString& value); virtual void Replace(long from, long to, const wxString& value);
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();
virtual bool CanCopy() const ; virtual bool CanCopy() const;
virtual bool CanCut() const ; virtual bool CanCut() const;
virtual bool CanPaste() const ; virtual bool CanPaste() const;
virtual bool CanUndo() const ; virtual bool CanUndo() const;
virtual bool CanRedo() const ; virtual bool CanRedo() const;
wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event );
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 virtual int DoAppend(const wxString& item);
void Init(); virtual int DoInsert(const wxString& item, int pos);
virtual int DoAppend(const wxString& item) ; virtual void DoSetItemClientData(int n, void* clientData);
virtual int DoInsert(const wxString& item, int pos) ; virtual void * DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual void DoSetItemClientData(int n, void* clientData) ; virtual wxClientData * DoGetItemClientObject(int n) const;
virtual void* DoGetItemClientData(int n) const ;
virtual void DoSetItemClientObject(int n, wxClientData* clientData) ;
virtual wxClientData* DoGetItemClientObject(int n) const ;
void FreeData();
// the subcontrols // the subcontrols
wxComboBoxText* m_text; wxComboBoxText* m_text;
@@ -156,5 +157,4 @@ protected:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif #endif // _WX_COMBOBOX_H_
// _WX_COMBOBOX_H_