projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use C++ compiler for va_copy test, at least under IRIX the C99 C compiler has it...
[wxWidgets.git]
/
src
/
gtk
/
clrpicker.cpp
diff --git
a/src/gtk/clrpicker.cpp
b/src/gtk/clrpicker.cpp
index a710f9fa336f7f8df99f13cbbd4a856d3e81b4d9..9184ed70257df6e7589ee722434c3963cc583470 100644
(file)
--- a/
src/gtk/clrpicker.cpp
+++ b/
src/gtk/clrpicker.cpp
@@
-61,8
+61,6
@@
bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
{
if (!gtk_check_version(2,4,0))
{
{
if (!gtk_check_version(2,4,0))
{
- m_needParent = true;
-
if (!PreCreation( parent, pos, size ) ||
!wxControl::CreateBase(parent, id, pos, size, style, validator, name))
{
if (!PreCreation( parent, pos, size ) ||
!wxControl::CreateBase(parent, id, pos, size, style, validator, name))
{
@@
-72,7
+70,7
@@
bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
m_colour = col;
m_widget = gtk_color_button_new_with_color( m_colour.GetColor() );
m_colour = col;
m_widget = gtk_color_button_new_with_color( m_colour.GetColor() );
- gtk_widget_show(
GTK_WIDGET(m_widget)
);
+ gtk_widget_show(
m_widget
);
// GtkColourButton signals
g_signal_connect(m_widget, "color-set",
// GtkColourButton signals
g_signal_connect(m_widget, "color-set",