added SpinCtrl,
updated a few headers, tried to set window size hints, no effect with KWM, git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -42,12 +42,9 @@ extern const wxChar* wxEmptyString;
|
||||
|
||||
class wxComboBox : public wxControl
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxComboBox)
|
||||
|
||||
public:
|
||||
|
||||
inline wxComboBox() {}
|
||||
inline wxComboBox(wxWindow *parent, wxWindowID id,
|
||||
inline wxComboBox() {}
|
||||
inline wxComboBox(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
@@ -55,11 +52,11 @@ public:
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxComboBoxNameStr)
|
||||
{
|
||||
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
||||
}
|
||||
~wxComboBox();
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
{
|
||||
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
||||
}
|
||||
~wxComboBox();
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
@@ -68,63 +65,65 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxComboBoxNameStr);
|
||||
|
||||
void Append( const wxString &item );
|
||||
void Append( const wxString &item, void* clientData );
|
||||
void Append( const wxString &item, wxClientData* clientData );
|
||||
void Append( const wxString &item );
|
||||
void Append( const wxString &item, void* clientData );
|
||||
void Append( const wxString &item, wxClientData* clientData );
|
||||
|
||||
void SetClientData( int n, void* clientData );
|
||||
void* GetClientData( int n );
|
||||
void SetClientObject( int n, wxClientData* clientData );
|
||||
wxClientData* GetClientObject( int n );
|
||||
void SetClientData( int n, void* clientData );
|
||||
void* GetClientData( int n );
|
||||
void SetClientObject( int n, wxClientData* clientData );
|
||||
wxClientData* GetClientObject( int n );
|
||||
|
||||
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
|
||||
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
|
||||
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
|
||||
void *GetClientData() const { return wxControl::GetClientData(); }
|
||||
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
|
||||
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
|
||||
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
|
||||
void *GetClientData() const { return wxControl::GetClientData(); }
|
||||
|
||||
void Clear();
|
||||
void Delete( int n );
|
||||
void Clear();
|
||||
void Delete( int n );
|
||||
|
||||
int FindString( const wxString &item );
|
||||
int GetSelection() const;
|
||||
wxString GetString( int n ) const;
|
||||
wxString GetStringSelection() const;
|
||||
int Number() const;
|
||||
void SetSelection( int n );
|
||||
void SetStringSelection( const wxString &string );
|
||||
int FindString( const wxString &item );
|
||||
int GetSelection() const;
|
||||
wxString GetString( int n ) const;
|
||||
wxString GetStringSelection() const;
|
||||
int Number() const;
|
||||
void SetSelection( int n );
|
||||
void SetStringSelection( const wxString &string );
|
||||
|
||||
wxString GetValue() const;
|
||||
void SetValue(const wxString& value);
|
||||
wxString GetValue() const;
|
||||
void SetValue(const wxString& value);
|
||||
|
||||
void Copy();
|
||||
void Cut();
|
||||
void Paste();
|
||||
void SetInsertionPoint( long pos );
|
||||
void SetInsertionPointEnd();
|
||||
long GetInsertionPoint() const;
|
||||
long GetLastPosition() const;
|
||||
void Replace( long from, long to, const wxString& value );
|
||||
void Remove( long from, long to );
|
||||
void SetSelection( long from, long to );
|
||||
void SetEditable( bool editable );
|
||||
void Copy();
|
||||
void Cut();
|
||||
void Paste();
|
||||
void SetInsertionPoint( long pos );
|
||||
void SetInsertionPointEnd();
|
||||
long GetInsertionPoint() const;
|
||||
long GetLastPosition() const;
|
||||
void Replace( long from, long to, const wxString& value );
|
||||
void Remove( long from, long to );
|
||||
void SetSelection( long from, long to );
|
||||
void SetEditable( bool editable );
|
||||
|
||||
void OnSize( wxSizeEvent &event );
|
||||
void OnChar( wxKeyEvent &event );
|
||||
|
||||
// implementation
|
||||
// implementation
|
||||
|
||||
bool m_alreadySent;
|
||||
wxList m_clientDataList;
|
||||
wxList m_clientObjectList;
|
||||
|
||||
void DisableEvents();
|
||||
void EnableEvents();
|
||||
void AppendCommon( const wxString &item );
|
||||
GtkWidget* GetConnectWidget();
|
||||
bool IsOwnGtkWindow( GdkWindow *window );
|
||||
void ApplyWidgetStyle();
|
||||
void OnSize( wxSizeEvent &event );
|
||||
void OnChar( wxKeyEvent &event );
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
bool m_alreadySent;
|
||||
wxList m_clientDataList;
|
||||
wxList m_clientObjectList;
|
||||
|
||||
void DisableEvents();
|
||||
void EnableEvents();
|
||||
void AppendCommon( const wxString &item );
|
||||
GtkWidget* GetConnectWidget();
|
||||
bool IsOwnGtkWindow( GdkWindow *window );
|
||||
void ApplyWidgetStyle();
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxComboBox)
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user