make XPM data const to avoid warnings from mingw 4.0 (patch 1874995)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *magick[] = {
|
||||
static const char * magick[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 15 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *bmpcombobox_xpm[] = {
|
||||
static const char * bmpcombobox_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *button_xpm[] = {
|
||||
static const char * button_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *checkbox_xpm[] = {
|
||||
static const char * checkbox_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *choicebk_xpm[] = {
|
||||
static const char * choicebk_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *clrpicker_xpm[]={
|
||||
static const char * clrpicker_xpm[]={
|
||||
"32 32 158 2",
|
||||
" c None",
|
||||
"** c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *combobox_xpm[] = {
|
||||
static const char * combobox_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *datepick_xpm[] = {
|
||||
static const char * datepick_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 163 2",
|
||||
" c None",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *dirctrl_xpm[] = {
|
||||
static const char * dirctrl_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *dirpicker_xpm[]={
|
||||
static const char * dirpicker_xpm[]={
|
||||
"32 32 178 2",
|
||||
" c None",
|
||||
"f6 c #9BACC2",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *filepicker_xpm[]={
|
||||
static const char * filepicker_xpm[]={
|
||||
"32 32 179 2",
|
||||
" c None",
|
||||
"f= c #97C4E7",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *fontpicker_xpm[]={
|
||||
static const char * fontpicker_xpm[]={
|
||||
"32 32 150 2",
|
||||
" c None",
|
||||
"BB c Black",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *gauge_xpm[] = {
|
||||
static const char * gauge_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *hyperlnk_xpm[] = {
|
||||
static const char * hyperlnk_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *listbook_xpm[] = {
|
||||
static const char * listbook_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *listbox_xpm[] = {
|
||||
static const char * listbox_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *notebook_xpm[] = {
|
||||
static const char * notebook_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *odcombobox_xpm[] = {
|
||||
static const char * odcombobox_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *radio_xpm[] = {
|
||||
static const char * radio_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *magick[] = {
|
||||
static const char * magick[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *slider_xpm[] = {
|
||||
static const char * slider_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *spinbtn_xpm[] = {
|
||||
static const char * spinbtn_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 2 1",
|
||||
"$ c None",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *statbox_xpm[] = {
|
||||
static const char * statbox_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *stattext_xpm[] = {
|
||||
static const char * stattext_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *text_xpm[] = {
|
||||
static const char * text_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *toggle_xpm[] = {
|
||||
static const char * toggle_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 16 1",
|
||||
" c Gray0",
|
||||
|
@@ -86,7 +86,7 @@ enum Orient
|
||||
class BookWidgetsPage : public WidgetsPage
|
||||
{
|
||||
public:
|
||||
BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, char* icon[]);
|
||||
BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char* icon[]);
|
||||
virtual ~BookWidgetsPage();
|
||||
|
||||
virtual wxControl *GetWidget() const { return m_book; }
|
||||
@@ -192,7 +192,7 @@ END_EVENT_TABLE()
|
||||
// implementation
|
||||
// ============================================================================
|
||||
|
||||
BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, char* icon[])
|
||||
BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char* icon[])
|
||||
:WidgetsPage(book, imaglist, icon)
|
||||
{
|
||||
// init everything
|
||||
|
@@ -921,7 +921,7 @@ WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
|
||||
|
||||
WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
|
||||
wxImageList *imaglist,
|
||||
char* icon[])
|
||||
const char* icon[])
|
||||
: wxPanel(book, wxID_ANY,
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
wxNO_FULL_REPAINT_ON_RESIZE |
|
||||
|
@@ -91,7 +91,7 @@ class WidgetsPage : public wxPanel
|
||||
public:
|
||||
WidgetsPage(WidgetsBookCtrl *book,
|
||||
wxImageList *imaglist,
|
||||
char* icon[]);
|
||||
const char* icon[]);
|
||||
|
||||
// return the control shown by this page
|
||||
virtual wxControl *GetWidget() const = 0;
|
||||
|
Reference in New Issue
Block a user