projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added mini docs to wxListbook
[wxWidgets.git]
/
src
/
gtk
/
checkbox.cpp
diff --git
a/src/gtk/checkbox.cpp
b/src/gtk/checkbox.cpp
index f3352a13977f767c1450af8bee067361ec3c3c80..1e25d81b9d76f4724f4f0d78e1c5548e03084359 100644
(file)
--- a/
src/gtk/checkbox.cpp
+++ b/
src/gtk/checkbox.cpp
@@
-14,7
+14,7
@@
#include "wx/checkbox.h"
#include "wx/checkbox.h"
-#include
"wx/gtk/private.h"
+#include
<gtk/gtk.h>
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
// data
@@
-29,8
+29,6
@@
extern bool g_blockEventsOnDrag;
extern "C" {
static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
{
extern "C" {
static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
{
- if (g_isIdle) wxapp_install_idle_handler();
-
if (!cb->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
if (!cb->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
@@
-109,7
+107,6
@@
bool wxCheckBox::Create(wxWindow *parent,
const wxValidator& validator,
const wxString &name )
{
const wxValidator& validator,
const wxString &name )
{
- m_needParent = true;
m_blockEvent = false;
if (!PreCreation( parent, pos, size ) ||
m_blockEvent = false;
if (!PreCreation( parent, pos, size ) ||
@@
-203,6
+200,9
@@
void wxCheckBox::SetLabel( const wxString& label )
{
wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
{
wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
+ // save the label inside m_label in case user calls GetLabel() later
+ wxControl::SetLabel(label);
+
GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label);
}
GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label);
}