get wxSYS_COLOUR_MENU from a menu bar and not from a button (patch 1887197)

[wxWidgets.git] / src / gtk / utilsres.cpp

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 3efcd634f91c472156dd1b2653beae194b875a79..bee27c4457a79ccc776fb8866d93db6dea6854ad 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -10,15 +10,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/utils.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/utils.h"
-#include "wx/string.h"
-#include "wx/log.h"
 #include "wx/config.h"
-#include "wx/app.h"
 
 //-----------------------------------------------------------------------------
 // resource functions
@@ -90,7 +91,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
-        *value = (float)wxStrtod(s, NULL);
+        *value = (float)wxStrtod(s, (wchar_t**) NULL);
         delete[] s;
         return true;
     }
@@ -103,7 +104,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
-        *value = wxStrtol(s, NULL, 10);
+        *value = wxStrtol(s, (wchar_t**) NULL, 10);
         delete[] s;
         return true;
     }
@@ -116,7 +117,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
     if (succ)
     {
-        *value = (int)wxStrtol(s, NULL, 10);
+        *value = (int)wxStrtol(s, (wchar_t**) NULL, 10);
         delete[] s;
         return true;
     }