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

Move GTK3 wxNO_BORDER handling to wxControl

Browse Source 
So wxNO_BORDER works with other controls, such as wxBitmapButton.
Also use GTK prefix on ApplyCssStyle(), and add an overload that
creates the GtkCssProvider.
This commit is contained in:
Paul Cornett
2017-11-15 10:51:38 -08:00
parent ef0309c141
commit 21620da3e5
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/window.cpp
View File

@@ -4476,7 +4476,7 @@ PangoContext *wxWindowGTK::GTKGetPangoDefaultContext()
}
#ifdef __WXGTK3__
void wxWindowGTK::ApplyCssStyle(GtkCssProvider* provider, const char* style)
void wxWindowGTK::GTKApplyCssStyle(GtkCssProvider* provider, const char* style)
{
wxCHECK_RET(m_widget, "invalid window");
@@ -4489,6 +4489,13 @@ void wxWindowGTK::ApplyCssStyle(GtkCssProvider* provider, const char* style)
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
void wxWindowGTK::GTKApplyCssStyle(const char* style)
{
GtkCssProvider* provider = gtk_css_provider_new();
GTKApplyCssStyle(provider, style);
g_object_unref(provider);
}
#else // GTK+ < 3
GtkRcStyle* wxWindowGTK::GTKCreateWidgetStyle()
{