Lock whole screen when popup is open under GTK+.

[wxWidgets.git] / src / common / config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index f2d95677a4497c200be971ab2d89089f15b24a6c..a0c3a75738bb00bdeef6e92426e53ca7c90f0368 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -39,9 +39,9 @@
 #include "wx/textfile.h"
 #include "wx/utils.h"
 #include "wx/utils.h"
 #include "wx/textfile.h"
 #include "wx/utils.h"
 #include "wx/utils.h"

+#include "wx/math.h"

 
 #include <stdlib.h>
 
 #include <stdlib.h>

-#include <math.h>

 #include <ctype.h>
 #include <limits.h>     // for INT_MAX
 
 #include <ctype.h>
 #include <limits.h>     // for INT_MAX
 


@@ -91,6 +91,8 @@ wxConfigBase *wxConfigBase::Create()
     ms_pConfig =
     #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
         new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
     ms_pConfig =
     #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
         new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());

+    #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
+        new wxPrefConfig(wxTheApp->GetAppName());

     #else // either we're under Unix or wish to use files even under Windows
       new wxFileConfig(wxTheApp->GetAppName());
     #endif
     #else // either we're under Unix or wish to use files even under Windows
       new wxFileConfig(wxTheApp->GetAppName());
     #endif


@@ -234,13 +236,13 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
   wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
 
   // except in the special case of "/keyname" when there is nothing before "/"
   wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
 
   // except in the special case of "/keyname" when there is nothing before "/"

-  if ( strPath.IsEmpty() &&
-       ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )
+  if ( strPath.empty() &&
+       ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )

   {
     strPath = wxCONFIG_PATH_SEPARATOR;
   }
 
   {
     strPath = wxCONFIG_PATH_SEPARATOR;
   }
 

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

   {
     if ( m_pContainer->GetPath() != strPath )
     {
   {
     if ( m_pContainer->GetPath() != strPath )
     {


@@ -433,7 +435,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
 
         strCurrent.Empty();
       }
 
         strCurrent.Empty();
       }

-      else if ( !strCurrent.IsEmpty() ) {
+      else if ( !strCurrent.empty() ) {

         aParts.push_back(strCurrent);
         strCurrent.Empty();
       }
         aParts.push_back(strCurrent);
         strCurrent.Empty();
       }