more Sun C++ compiler warning fixes: in particular, added an ugly but

necessary workaround for avoiding warning in the .xpm files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-11 19:33:37 +00:00
parent 40325b2630
commit 295272bdcd
17 changed files with 116 additions and 66 deletions

View File

@@ -868,11 +868,16 @@ int wxEntry( int argc, char *argv[] )
#ifndef __WXUNIVERSAL__
// XPM hack: make the arrays const
#define static static const
#include "wx/gtk/info.xpm"
#include "wx/gtk/error.xpm"
#include "wx/gtk/question.xpm"
#include "wx/gtk/warning.xpm"
#undef static
wxIcon wxApp::GetStdIcon(int which) const
{
switch(which)

View File

@@ -84,7 +84,7 @@ struct wxlistbox_idle_struct
gint m_tag;
};
static gint wxlistbox_idle_callback( gpointer gdata )
extern "C" gint wxlistbox_idle_callback( gpointer gdata )
{
wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
gdk_threads_enter();

View File

@@ -3755,9 +3755,9 @@ static void SetInvokingWindow( wxMenu *menu, wxWindowGTK *win )
static gint gs_pop_x = 0;
static gint gs_pop_y = 0;
static void wxPopupMenuPositionCallback( GtkMenu *menu,
gint *x, gint *y,
gpointer WXUNUSED(user_data) )
extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu,
gint *x, gint *y,
gpointer WXUNUSED(user_data) )
{
// ensure that the menu appears entirely on screen
GtkRequisition req;