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

move class function out of extern "C" block

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-10-31 05:14:13 +00:00
parent 98185146b3
commit f0b87ef91c
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/gtk/window.cpp
View File

@@ -1893,35 +1893,6 @@ static void unrealize(GtkWidget*, wxWindowGTK* win)
gtk_im_context_set_client_window(win->m_imData->context, NULL);
}
void wxWindowGTK::GTKHandleRealized()
{
if (m_imData)
{
gtk_im_context_set_client_window
(
m_imData->context,
m_wxwindow ? GTKGetDrawingWindow()
: gtk_widget_get_window(m_widget)
);
}
// We cannot set colours and fonts before the widget
// been realized, so we do this directly after realization
// or otherwise in idle time
if (m_needsStyleChange)
{
SetBackgroundStyle(GetBackgroundStyle());
m_needsStyleChange = false;
}
wxWindowCreateEvent event( this );
event.SetEventObject( this );
GTKProcessEvent( event );
GTKUpdateCursor(true, false);
}
//-----------------------------------------------------------------------------
// "size_allocate" from m_wxwindow or m_widget
//-----------------------------------------------------------------------------
@@ -2000,6 +1971,35 @@ void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget),
} // extern "C"
void wxWindowGTK::GTKHandleRealized()
{
if (m_imData)
{
gtk_im_context_set_client_window
(
m_imData->context,
m_wxwindow ? GTKGetDrawingWindow()
: gtk_widget_get_window(m_widget)
);
}
// We cannot set colours and fonts before the widget
// been realized, so we do this directly after realization
// or otherwise in idle time
if (m_needsStyleChange)
{
SetBackgroundStyle(GetBackgroundStyle());
m_needsStyleChange = false;
}
wxWindowCreateEvent event( this );
event.SetEventObject( this );
GTKProcessEvent( event );
GTKUpdateCursor(true, false);
}
// ----------------------------------------------------------------------------
// this wxWindowBase function is implemented here (in platform-specific file)
// because it is static and so couldn't be made virtual