1. wxNotebook::GetPageCount() returns only the number of pages actually added

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

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index db55e4f964498e5272902aa2aeb1c48a9906d90e..d743ad554e8872c577e39ac1983752af06c506d9 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -2,8 +2,7 @@
 // Name:        utils.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        utils.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -83,7 +82,7 @@ static char *GetResourcePath(char *buf, char *name, bool create)
 // the Real User, then determine the Real home dir.
 static char *GetIniFile(char *dest, const char *filename)
 {
 // the Real User, then determine the Real home dir.
 static char *GetIniFile(char *dest, const char *filename)
 {

-    char *home = NULL;
+    char *home = (char *) NULL;

     if (filename && wxIsAbsolutePath(filename))
     {
       strcpy(dest, filename);
     if (filename && wxIsAbsolutePath(filename))
     {
       strcpy(dest, filename);


@@ -133,7 +132,7 @@ static void wxXMergeDatabases(void)
     if (XResourceManagerString(GDK_DISPLAY()) != NULL) {
         serverDB = XrmGetStringDatabase(XResourceManagerString(GDK_DISPLAY()));
     } else {
     if (XResourceManagerString(GDK_DISPLAY()) != NULL) {
         serverDB = XrmGetStringDatabase(XResourceManagerString(GDK_DISPLAY()));
     } else {

-        (void)GetIniFile(filename, NULL);
+        (void)GetIniFile(filename, (char *) NULL);

         serverDB = XrmGetFileDatabase(filename);
     }
     if (serverDB)
         serverDB = XrmGetFileDatabase(filename);
     }
     if (serverDB)


@@ -144,7 +143,7 @@ static void wxXMergeDatabases(void)
 
     if ((environment = getenv("XENVIRONMENT")) == NULL) {
         size_t len;
 
     if ((environment = getenv("XENVIRONMENT")) == NULL) {
         size_t len;

-        environment = GetIniFile(filename, NULL);
+        environment = GetIniFile(filename, (const char *) NULL);

         len = strlen(environment);
 #if !defined(SVR4) || defined(__sgi)
         (void)gethostname(environment + len, 1024 - len);
         len = strlen(environment);
 #if !defined(SVR4) || defined(__sgi)
         (void)gethostname(environment + len, 1024 - len);


@@ -166,7 +165,8 @@ void wxFlushResources(void)
 
     wxNode *node = wxTheResourceCache->First();
     while (node) {
 
     wxNode *node = wxTheResourceCache->First();
     while (node) {

-        char *file = node->key.string;
+        wxString str = node->GetKeyString();
+        char *file = WXSTRINGCAST str;

         // If file doesn't exist, create it first.
         (void)GetResourcePath(nameBuffer, file, TRUE);
 
         // If file doesn't exist, create it first.
         (void)GetResourcePath(nameBuffer, file, TRUE);
 


@@ -291,10 +291,10 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 
 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 )
 {

-    char *s = NULL;
+    char *s = (char *) NULL;

     bool succ = wxGetResource(section, entry, &s, file);
     if (succ) {
     bool succ = wxGetResource(section, entry, &s, file);
     if (succ) {

-        *value = (float)strtod(s, NULL);
+        *value = (float)strtod(s, (char **) NULL);

         delete[]s;
         return TRUE;
     } else
         delete[]s;
         return TRUE;
     } else


@@ -303,10 +303,10 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
 
 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 )
 {

-    char *s = NULL;
+    char *s = (char *) NULL;

     bool succ = wxGetResource(section, entry, &s, file);
     if (succ) {
     bool succ = wxGetResource(section, entry, &s, file);
     if (succ) {

-        *value = strtol(s, NULL, 10);
+        *value = strtol(s, (char **) NULL, 10);

         delete[]s;
         return TRUE;
     } else
         delete[]s;
         return TRUE;
     } else


@@ -315,7 +315,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
 
 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 )
 {

-    char *s = NULL;
+    char *s = (char *) NULL;

     bool succ = wxGetResource(section, entry, &s, file);
     if (succ) {
         // Handle True, False here
     bool succ = wxGetResource(section, entry, &s, file);
     if (succ) {
         // Handle True, False here


@@ -327,7 +327,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
             *value = FALSE;
         // Handle as Integer
         else
             *value = FALSE;
         // Handle as Integer
         else

-            *value = (int)strtol(s, NULL, 10);
+            *value = (int)strtol(s, (char **) NULL, 10);

         delete[]s;
         return TRUE;
     } else
         delete[]s;
         return TRUE;
     } else