projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#ifdefed out the joystick code, and removed the wxBitmapList addition
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
combobox.h
diff --git
a/include/wx/gtk1/combobox.h
b/include/wx/gtk1/combobox.h
index 129321d3a4901c0443ea3dbd5dbf621058aa39b3..e7be38f91bae964dbc823fdbc3644d7d801ca12f 100644
(file)
--- a/
include/wx/gtk1/combobox.h
+++ b/
include/wx/gtk1/combobox.h
@@
-86,6
+86,7
@@
public:
int GetSelection() const;
wxString GetString( int n ) const;
wxString GetStringSelection() const;
int GetSelection() const;
wxString GetString( int n ) const;
wxString GetStringSelection() const;
+ int GetCount() const { return Number(); }
int Number() const;
void SetSelection( int n );
void SetStringSelection( const wxString &string );
int Number() const;
void SetSelection( int n );
void SetStringSelection( const wxString &string );
@@
-113,6
+114,7
@@
public:
bool m_alreadySent;
wxList m_clientDataList;
wxList m_clientObjectList;
bool m_alreadySent;
wxList m_clientDataList;
wxList m_clientObjectList;
+ int m_prevSelection;
void DisableEvents();
void EnableEvents();
void DisableEvents();
void EnableEvents();
@@
-121,6
+123,9
@@
public:
bool IsOwnGtkWindow( GdkWindow *window );
void ApplyWidgetStyle();
bool IsOwnGtkWindow( GdkWindow *window );
void ApplyWidgetStyle();
+protected:
+ virtual wxSize DoGetBestSize() const;
+
private:
DECLARE_DYNAMIC_CLASS(wxComboBox)
DECLARE_EVENT_TABLE()
private:
DECLARE_DYNAMIC_CLASS(wxComboBox)
DECLARE_EVENT_TABLE()