cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,13 +19,13 @@ WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
// forward declaration of private implementation classes
class wxComboBoxText ;
class wxComboBoxChoice ;
class wxComboBoxText;
class wxComboBoxChoice;
// Combobox item
class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
{
DECLARE_DYNAMIC_CLASS(wxComboBox)
DECLARE_DYNAMIC_CLASS(wxComboBox)
public:
virtual ~wxComboBox();
@ -52,7 +52,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
Init();
Create(parent, id, value, pos, size, n, choices, style, validator, name);
}
wxComboBox(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos,
@ -88,16 +88,16 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void Delete(int n);
virtual void Clear();
virtual int GetSelection() const ;
virtual int GetSelection() const;
int GetCurrentSelection() const { return GetSelection(); }
virtual void SetSelection(int n);
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual wxString GetString(int n) const ;
virtual wxString GetStringSelection() const ;
virtual void SetString(int n, const wxString& s) ;
virtual wxString GetString(int n) const;
virtual wxString GetStringSelection() const;
virtual void SetString(int n, const wxString& s);
// Text field functions
virtual wxString GetValue() const ;
virtual wxString GetValue() const;
virtual void SetValue(const wxString& value);
// Clipboard operations
@ -106,48 +106,49 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void Paste();
virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd();
virtual long GetInsertionPoint() const ;
virtual wxTextPos GetLastPosition() const ;
virtual long GetInsertionPoint() const;
virtual wxTextPos GetLastPosition() const;
virtual void Replace(long from, long to, const wxString& value);
virtual void Remove(long from, long to);
virtual void SetSelection(long from, long to);
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 Redo() ;
virtual void SelectAll() ;
virtual void Undo();
virtual void Redo();
virtual void SelectAll();
virtual bool CanCopy() const ;
virtual bool CanCut() const ;
virtual bool CanPaste() const ;
virtual bool CanUndo() const ;
virtual bool CanRedo() const ;
virtual bool CanCopy() const;
virtual bool CanCut() const;
virtual bool CanPaste() const;
virtual bool CanUndo() const;
virtual bool CanRedo() const;
wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event );
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
WX_DECLARE_CONTROL_CONTAINER();
protected:
// common part of all ctors
void Init();
void FreeData();
// override the base class virtuals involved in geometry calculations
virtual wxSize DoGetBestSize() const;
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 DoInsert(const wxString& item, int pos);
virtual int DoAppend(const wxString& item) ;
virtual int DoInsert(const wxString& item, int pos) ;
virtual void DoSetItemClientData(int n, void* clientData) ;
virtual void* DoGetItemClientData(int n) const ;
virtual void DoSetItemClientObject(int n, wxClientData* clientData) ;
virtual wxClientData* DoGetItemClientObject(int n) const ;
void FreeData();
virtual void DoSetItemClientData(int n, void* clientData);
virtual void * DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData * DoGetItemClientObject(int n) const;
// the subcontrols
wxComboBoxText* m_text;
@ -156,5 +157,4 @@ protected:
DECLARE_EVENT_TABLE()
};
#endif
// _WX_COMBOBOX_H_
#endif // _WX_COMBOBOX_H_