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

Added further 'missing' wxTextCtrl-like functions to wxComboBox

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-12-09 15:16:51 +00:00
parent 8d7ea2312e
commit 150e31d208
18 changed files with 1155 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/cocoa/combobox.h
View File

@@ -122,6 +122,24 @@ public:
{ wxTextCtrl::SetSelection(from,to); }
virtual void SetEditable(bool editable)
{ wxTextCtrl::SetEditable(editable); }
virtual bool IsEditable() const
{ return !HasFlag(wxCB_READONLY); }
virtual void Undo()
{ wxTextCtrl::Undo(); }
virtual void Redo()
{ wxTextCtrl::Redo(); }
virtual void SelectAll()
{ wxTextCtrl::SelectAll(); }
virtual bool CanCopy() const
{ return wxTextCtrl::CanCopy(); }
virtual bool CanCut() const = 0
{ return wxTextCtrl::CanCut(); }
virtual bool CanPaste() const
{ return wxTextCtrl::CanPaste(); }
virtual bool CanUndo() const
{ return wxTextCtrl::CanUndo(); }
virtual bool CanRedo() const
{ return wxTextCtrl::CanRedo(); }
};
#endif // __WX_COCOA_COMBOBOX_H__

13
include/wx/combobox.h
View File

@@ -45,6 +45,19 @@ public:
{ SetInsertionPoint(GetLastPosition()); }
virtual void Remove(long from, long to)
{ Replace(from, to, wxEmptyString); }
virtual bool IsEditable() const = 0;
virtual void Undo() = 0;
virtual void Redo() = 0;
virtual void SelectAll() = 0;
virtual bool CanCopy() const = 0;
virtual bool CanCut() const = 0;
virtual bool CanPaste() const = 0;
virtual bool CanUndo() const = 0;
virtual bool CanRedo() const = 0;
};
// ----------------------------------------------------------------------------

30
include/wx/gtk/combobox.h
View File

@@ -105,6 +105,9 @@ public:
void Copy();
void Cut();
void Paste();
bool CanCopy() const;
bool CanCut() const;
bool CanPaste() const;
void SetInsertionPoint( long pos );
void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
long GetInsertionPoint() const;
@@ -112,7 +115,15 @@ public:
void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
void Replace( long from, long to, const wxString& value );
void SetSelection( long from, long to );
void GetSelection( long* from, long* to ) const;
void SetEditable( bool editable );
void Undo() ;
void Redo() ;
bool CanUndo() const;
bool CanRedo() const;
void SelectAll();
bool IsEditable() const { return !HasFlag(wxCB_READONLY); }
bool HasSelection() const ;
// implementation
@@ -121,6 +132,23 @@ public:
void OnSize( wxSizeEvent &event );
void OnChar( wxKeyEvent &event );
// Standard event handling
void OnCut(wxCommandEvent& event);
void OnCopy(wxCommandEvent& event);
void OnPaste(wxCommandEvent& event);
void OnUndo(wxCommandEvent& event);
void OnRedo(wxCommandEvent& event);
void OnDelete(wxCommandEvent& event);
void OnSelectAll(wxCommandEvent& event);
void OnUpdateCut(wxUpdateUIEvent& event);
void OnUpdateCopy(wxUpdateUIEvent& event);
void OnUpdatePaste(wxUpdateUIEvent& event);
void OnUpdateUndo(wxUpdateUIEvent& event);
void OnUpdateRedo(wxUpdateUIEvent& event);
void OnUpdateDelete(wxUpdateUIEvent& event);
void OnUpdateSelectAll(wxUpdateUIEvent& event);
bool m_ignoreNextUpdate:1;
wxList m_clientDataList;
wxList m_clientObjectList;
@@ -136,7 +164,7 @@ public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected:
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);

30
include/wx/gtk1/combobox.h
View File

@@ -105,6 +105,9 @@ public:
void Copy();
void Cut();
void Paste();
bool CanCopy() const;
bool CanCut() const;
bool CanPaste() const;
void SetInsertionPoint( long pos );
void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
long GetInsertionPoint() const;
@@ -112,7 +115,15 @@ public:
void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
void Replace( long from, long to, const wxString& value );
void SetSelection( long from, long to );
void GetSelection( long* from, long* to ) const;
void SetEditable( bool editable );
void Undo() ;
void Redo() ;
bool CanUndo() const;
bool CanRedo() const;
void SelectAll();
bool IsEditable() const { return !HasFlag(wxCB_READONLY); }
bool HasSelection() const ;
// implementation
@@ -121,6 +132,23 @@ public:
void OnSize( wxSizeEvent &event );
void OnChar( wxKeyEvent &event );
// Standard event handling
void OnCut(wxCommandEvent& event);
void OnCopy(wxCommandEvent& event);
void OnPaste(wxCommandEvent& event);
void OnUndo(wxCommandEvent& event);
void OnRedo(wxCommandEvent& event);
void OnDelete(wxCommandEvent& event);
void OnSelectAll(wxCommandEvent& event);
void OnUpdateCut(wxUpdateUIEvent& event);
void OnUpdateCopy(wxUpdateUIEvent& event);
void OnUpdatePaste(wxUpdateUIEvent& event);
void OnUpdateUndo(wxUpdateUIEvent& event);
void OnUpdateRedo(wxUpdateUIEvent& event);
void OnUpdateDelete(wxUpdateUIEvent& event);
void OnUpdateSelectAll(wxUpdateUIEvent& event);
bool m_ignoreNextUpdate:1;
wxList m_clientDataList;
wxList m_clientObjectList;
@@ -136,7 +164,7 @@ public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected:
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);

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

@@ -117,6 +117,19 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual int GetCount() const ;
virtual bool IsEditable() const ;
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 ;
wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST

13
include/wx/mac/classic/combobox.h
View File

@@ -112,6 +112,19 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual int GetCount() const { return m_choice->GetCount() ; }
virtual bool IsEditable() const ;
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 ;
void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST

29
include/wx/msw/combobox.h
View File

@@ -86,6 +86,9 @@ public:
virtual void Copy();
virtual void Cut();
virtual void Paste();
virtual bool CanCopy() const;
virtual bool CanCut() const;
virtual bool CanPaste() const;
virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd();
virtual long GetInsertionPoint() const;
@@ -99,6 +102,14 @@ public:
virtual void SetEditable(bool editable);
virtual void Clear() { wxChoice::Clear(); m_selectionOld = -1; }
virtual void Undo() ;
virtual void Redo() ;
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual void SelectAll();
virtual bool IsEditable() const ;
virtual bool HasSelection() const;
// implementation only from now on
virtual bool MSWCommand(WXUINT param, WXWORD id);
bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
@@ -106,6 +117,23 @@ public:
WXHWND GetEditHWND() const;
// Standard event handling
void OnCut(wxCommandEvent& event);
void OnCopy(wxCommandEvent& event);
void OnPaste(wxCommandEvent& event);
void OnUndo(wxCommandEvent& event);
void OnRedo(wxCommandEvent& event);
void OnDelete(wxCommandEvent& event);
void OnSelectAll(wxCommandEvent& event);
void OnUpdateCut(wxUpdateUIEvent& event);
void OnUpdateCopy(wxUpdateUIEvent& event);
void OnUpdatePaste(wxUpdateUIEvent& event);
void OnUpdateUndo(wxUpdateUIEvent& event);
void OnUpdateRedo(wxUpdateUIEvent& event);
void OnUpdateDelete(wxUpdateUIEvent& event);
void OnUpdateSelectAll(wxUpdateUIEvent& event);
protected:
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
@@ -121,6 +149,7 @@ protected:
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
DECLARE_EVENT_TABLE()
};
#endif // wxUSE_COMBOBOX

13
include/wx/palmos/combobox.h
View File

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -91,6 +91,17 @@ public:
virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual bool IsEditable() const;
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;
// implementation only from now on
virtual bool MSWCommand(WXUINT param, WXWORD id);

11
include/wx/univ/combobox.h
View File

@@ -282,6 +282,17 @@ public:
virtual void Remove(long from, long to);
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual bool IsEditable() const;
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;
// wxControlWithItems methods
virtual void Clear();