Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / palmos / settings.cpp

diff --git a/src/palmos/settings.cpp b/src/palmos/settings.cpp
index 25239aba83dea300eca5e6e1ddf6e77421cfcf5e..ecb01c9bd5a3cbf8895275ec3a9d8c8e9656faa5 100644 (file)
--- a/src/palmos/settings.cpp
+++ b/src/palmos/settings.cpp
@@ -24,15 +24,18 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/settings.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/gdicmn.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/settings.h"
-#include "wx/module.h"

 #include "wx/fontutil.h"
 
 #include "wx/fontutil.h"
 

+#include <UIColor.h>
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -73,6 +76,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_APPWORKSPACE:
         case wxSYS_COLOUR_HIGHLIGHT:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_APPWORKSPACE:
         case wxSYS_COLOUR_HIGHLIGHT:

+        case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:

         case wxSYS_COLOUR_HIGHLIGHTTEXT:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_BTNSHADOW:
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_BTNSHADOW:


@@ -123,7 +127,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 // ----------------------------------------------------------------------------
 
 // Get a system metric, e.g. scrollbar size
 // ----------------------------------------------------------------------------
 
 // Get a system metric, e.g. scrollbar size

-int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))

 {
     int metric = -1;
     uint32_t attrP;
 {
     int metric = -1;
     uint32_t attrP;