Implementation of wxSysColourChangedEvent on wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2116,8 +2116,65 @@ gtk_window_grab_broken( GtkWidget*,
|
||||
}
|
||||
#endif
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// "style_set"
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
static
|
||||
void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget),
|
||||
GtkStyle *previous_style,
|
||||
wxWindow* win )
|
||||
{
|
||||
//wxLogDebug(wxT("gtk_window_style_set_callback"));
|
||||
if (win && previous_style)
|
||||
{
|
||||
wxString name(win->GetName());
|
||||
//wxLogDebug(wxT("gtk_window_style_set_callback %s"), name.c_str());
|
||||
wxSysColourChangedEvent event;
|
||||
event.SetEventObject(win);
|
||||
|
||||
win->GTKProcessEvent( event );
|
||||
}
|
||||
}
|
||||
|
||||
} // extern "C"
|
||||
|
||||
// Connect/disconnect style-set
|
||||
|
||||
void wxConnectStyleSet(wxWindow* win)
|
||||
{
|
||||
if (win->m_wxwindow)
|
||||
g_signal_connect (win->m_wxwindow, "style_set",
|
||||
G_CALLBACK (gtk_window_style_set_callback), win);
|
||||
}
|
||||
|
||||
void wxDisconnectStyleSet(wxWindow* win)
|
||||
{
|
||||
if (win->m_wxwindow)
|
||||
g_signal_handlers_disconnect_by_func (win->m_wxwindow,
|
||||
(gpointer) gtk_window_style_set_callback,
|
||||
win);
|
||||
}
|
||||
|
||||
// Helper to suspend colour change event event processing while we change a widget's style
|
||||
class wxSuspendStyleEvents
|
||||
{
|
||||
public:
|
||||
wxSuspendStyleEvents(wxWindow* win)
|
||||
{
|
||||
m_win = win;
|
||||
if (win->IsTopLevel())
|
||||
wxDisconnectStyleSet(win);
|
||||
}
|
||||
~wxSuspendStyleEvents()
|
||||
{
|
||||
if (m_win->IsTopLevel())
|
||||
wxConnectStyleSet(m_win);
|
||||
}
|
||||
|
||||
wxWindow* m_win;
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// this wxWindowBase function is implemented here (in platform-specific file)
|
||||
// because it is static and so couldn't be made virtual
|
||||
@@ -2614,6 +2671,10 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
|
||||
G_CALLBACK (gtk_window_enter_callback), this);
|
||||
g_signal_connect (widget, "leave_notify_event",
|
||||
G_CALLBACK (gtk_window_leave_callback), this);
|
||||
|
||||
if (IsTopLevel() && m_wxwindow)
|
||||
g_signal_connect (m_wxwindow, "style_set",
|
||||
G_CALLBACK (gtk_window_style_set_callback), this);
|
||||
}
|
||||
|
||||
bool wxWindowGTK::Destroy()
|
||||
@@ -3918,6 +3979,8 @@ void wxWindowGTK::ApplyWidgetStyle(bool forceStyle)
|
||||
|
||||
void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
|
||||
{
|
||||
wxSuspendStyleEvents s(this);
|
||||
|
||||
if (m_wxwindow)
|
||||
gtk_widget_modify_style(m_wxwindow, style);
|
||||
else
|
||||
|
Reference in New Issue
Block a user