Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxColourButton with GTK+4

Browse Source 
gtk_color_button_get_rgba()/gtk_color_button_set_rgba() are gone
This commit is contained in:
Paul Cornett
2017-12-15 10:48:56 -08:00
parent bb13e9f3da
commit f5ab4757a6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/clrpicker.cpp
View File

@@ -36,9 +36,14 @@ static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget,
{ {
// update the m_colour member of the wxColourButton // update the m_colour member of the wxColourButton
wxASSERT(p); wxASSERT(p);
#ifdef __WXGTK3__ #ifdef __WXGTK4__
GdkRGBA gdkColor;
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &gdkColor);
#elif defined(__WXGTK3__)
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
GdkRGBA gdkColor; GdkRGBA gdkColor;
gtk_color_button_get_rgba(widget, &gdkColor); gtk_color_button_get_rgba(widget, &gdkColor);
wxGCC_WARNING_RESTORE()
#else #else
GdkColor gdkColor; GdkColor gdkColor;
gtk_color_button_get_color(widget, &gdkColor); gtk_color_button_get_color(widget, &gdkColor);
@@ -100,8 +105,12 @@ wxColourButton::~wxColourButton()
void wxColourButton::UpdateColour() void wxColourButton::UpdateColour()
{ {
#ifdef __WXGTK3__ #ifdef __WXGTK4__
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(m_widget), m_colour);
#elif defined(__WXGTK3__)
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
gtk_color_button_set_rgba(GTK_COLOR_BUTTON(m_widget), m_colour); gtk_color_button_set_rgba(GTK_COLOR_BUTTON(m_widget), m_colour);
wxGCC_WARNING_RESTORE()
#else #else
gtk_color_button_set_color(GTK_COLOR_BUTTON(m_widget), m_colour.GetColor()); gtk_color_button_set_color(GTK_COLOR_BUTTON(m_widget), m_colour.GetColor());
#endif #endif