AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation warning fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-04-02 16:24:31 +00:00
parent c112e10026
commit 52d6235db0
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/toplevel.cpp
View File

@ -263,6 +263,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
// "draw" of m_client // "draw" of m_client
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __WXGTK20__
static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win ) static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win )
{ {
@ -277,6 +278,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
0, 0, -1, -1); 0, 0, -1, -1);
} }
#endif // GTK+ 1.x
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTopLevelWindowGTK itself // wxTopLevelWindowGTK itself
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -847,9 +850,11 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
wxTopLevelWindowBase::SetIcons( icons ); wxTopLevelWindowBase::SetIcons( icons );
DoSetIcon( icons.GetIcon( -1 ) ); DoSetIcon( icons.GetIcon( -1 ) );
if( window ) if ( window )
{
wxSetIconsX11( (WXDisplay*)GDK_WINDOW_XDISPLAY( window ), wxSetIconsX11( (WXDisplay*)GDK_WINDOW_XDISPLAY( window ),
(WXWindow)GDK_WINDOW_XWINDOW( window ), icons ); (WXWindow)GDK_WINDOW_XWINDOW( window ), icons );
}
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

7
src/gtk1/toplevel.cpp
View File

@ -263,6 +263,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
// "draw" of m_client // "draw" of m_client
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __WXGTK20__
static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win ) static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win )
{ {
@ -277,6 +278,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
0, 0, -1, -1); 0, 0, -1, -1);
} }
#endif // GTK+ 1.x
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTopLevelWindowGTK itself // wxTopLevelWindowGTK itself
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -847,9 +850,11 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
wxTopLevelWindowBase::SetIcons( icons ); wxTopLevelWindowBase::SetIcons( icons );
DoSetIcon( icons.GetIcon( -1 ) ); DoSetIcon( icons.GetIcon( -1 ) );
if( window ) if ( window )
{
wxSetIconsX11( (WXDisplay*)GDK_WINDOW_XDISPLAY( window ), wxSetIconsX11( (WXDisplay*)GDK_WINDOW_XDISPLAY( window ),
(WXWindow)GDK_WINDOW_XWINDOW( window ), icons ); (WXWindow)GDK_WINDOW_XWINDOW( window ), icons );
}
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------