GTK+ selects the first item initially, II

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

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 45bdc9fec1e2d9cde774758a7ffcc3c1ef0fff53..5ae3a6c659d743e8f42bc7ce4f1caa116dc10ffa 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilres.cpp
+// Name:        src/gtk/utilsres.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,11 +11,15 @@
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"

-#include "wx/string.h"
-#include "wx/list.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif
+

 #include "wx/config.h"
 #include "wx/config.h"

-#include "wx/app.h"

 
 //-----------------------------------------------------------------------------
 // resource functions
 
 //-----------------------------------------------------------------------------
 // resource functions


@@ -24,7 +28,7 @@
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );

-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.empty()) filename = wxT(".wxWindows");

 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 


@@ -60,7 +64,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );

-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.empty()) filename = wxT(".wxWindows");

 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 


@@ -69,16 +73,16 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
     wxString result;
     if (conf.Read( entry, &result ))
     {
     wxString result;
     if (conf.Read( entry, &result ))
     {

-        if (!result.IsEmpty())
+        if (!result.empty())

         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;
         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )


@@ -89,9 +93,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     {
         *value = (float)wxStrtod(s, NULL);
         delete[] s;
     {
         *value = (float)wxStrtod(s, NULL);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )


@@ -102,9 +106,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     {
         *value = wxStrtol(s, NULL, 10);
         delete[] s;
     {
         *value = wxStrtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )


@@ -115,8 +119,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         *value = (int)wxStrtol(s, NULL, 10);
         delete[] s;
     {
         *value = (int)wxStrtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 }

-