fixes for the compilation warnings with Sun CC:
1. some fixes for "String literal to char * conversion" warnings (many more left in the *.xpm files) 2. fixes for "assignment of function to extern "C" function" 3. a few other miscellaneous ones git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -270,7 +270,7 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFram
|
||||
// wxMiniFrame
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
static char *cross_xpm[] = {
|
||||
static const char *cross_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"5 5 16 1",
|
||||
" c Gray0",
|
||||
@@ -321,7 +321,13 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
|
||||
((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
|
||||
{
|
||||
GdkBitmap *mask = (GdkBitmap*) NULL;
|
||||
GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, cross_xpm );
|
||||
GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d
|
||||
(
|
||||
wxGetRootWindow()->window,
|
||||
&mask,
|
||||
NULL,
|
||||
(char **)cross_xpm
|
||||
);
|
||||
|
||||
GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
|
||||
gdk_bitmap_unref( mask );
|
||||
|
Reference in New Issue
Block a user