Corrected wxlistBox, wxRadioBox, wxComboBox and

wxChoice in that they do no longer send events
    after programmatic calls
  Corrected wxStaticBitmap
  Reimplemented wxRadioButton as per wxMSW
  Updated docs for the above
  Update testconf for socket changes
  Other minor fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-22 23:28:55 +00:00
parent 1e7fd31108
commit 953704c1c7
43 changed files with 502 additions and 141 deletions

View File

@@ -71,7 +71,6 @@ public:
// implementation
void ApplyWidgetStyle();
bool m_blockFirstEvent;
GtkWidget *m_widgetCheckbox;
GtkWidget *m_widgetLabel;
};

View File

@@ -93,6 +93,8 @@ public:
wxList m_clientDataList;
wxList m_clientObjectList;
void DisableEvents();
void EnableEvents();
void AppendCommon( const wxString &item );
void ApplyWidgetStyle();
};

View File

@@ -117,6 +117,8 @@ public:
wxList m_clientDataList;
wxList m_clientObjectList;
void DisableEvents();
void EnableEvents();
void AppendCommon( const wxString &item );
GtkWidget* GetConnectWidget();
bool IsOwnGtkWindow( GdkWindow *window );

View File

@@ -109,6 +109,8 @@ public:
// implementation
void DisableEvents();
void EnableEvents();
void AppendCommon( const wxString &item );
int GetIndex( GtkWidget *item ) const;
GtkWidget *GetConnectWidget();

View File

@@ -96,6 +96,8 @@ public:
// implementation
void DisableEvents();
void EnableEvents();
bool IsOwnGtkWindow( GdkWindow *window );
void ApplyWidgetStyle();
wxSize LayoutItems();

View File

@@ -41,36 +41,34 @@ extern const char* wxRadioButtonNameStr;
class wxRadioButton: public wxControl
{
DECLARE_DYNAMIC_CLASS(wxRadioButton)
DECLARE_DYNAMIC_CLASS(wxRadioButton)
public:
inline wxRadioButton() {}
inline wxRadioButton( wxWindow *parent, wxWindowID id,
public:
inline wxRadioButton() {}
inline wxRadioButton( wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr )
{
{
Create( parent, id, label, pos, size, style, validator, name );
}
bool Create(wxWindow *parent, wxWindowID id,
}
bool Create(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr );
virtual void SetLabel(const wxString& label);
virtual void SetValue(bool val);
virtual bool GetValue() const;
bool Enable( bool enable );
virtual void SetLabel(const wxString& label);
virtual void SetValue(bool val);
virtual bool GetValue() const;
bool Enable( bool enable );
// implementation
void ApplyWidgetStyle();
bool m_blockFirstEvent;
GtkWidget* m_theOtherRadioButtton;
GSList *m_radioButtonGroup;
void ApplyWidgetStyle();
};
#endif

View File

@@ -187,6 +187,7 @@ public:
bool m_sizeSet:1;
bool m_resizing:1;
bool m_isStaticBox:1; /* faster than IS_KIND_OF */
bool m_isRadioButton:1; /* faster than IS_KIND_OF */
bool m_isFrame:1; /* faster than IS_KIND_OF */
bool m_acceptsFocus:1; /* ! wxStaticBox etc. */