Fix uniconizing hidden top level windows in wxMSW.

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index e2438860f003afcd9265d71961cbbe886308e09f..1ca75fa2cfb983e1d69935457fcda7a3a6d65c17 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -63,7 +63,7 @@ bool          wxConfigBase::ms_bAutoCreate = true;
 wxConfigBase *wxAppTraitsBase::CreateConfig()
 {
     return new
 wxConfigBase *wxAppTraitsBase::CreateConfig()
 {
     return new

-    #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
+    #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE

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


@@ -385,7 +385,7 @@ enum Bracket
   Bracket_None,
   Bracket_Normal  = ')',
   Bracket_Curly   = '}',
   Bracket_None,
   Bracket_Normal  = ')',
   Bracket_Curly   = '}',

-#ifdef  __WXMSW__
+#ifdef  __WINDOWS__

   Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
 #endif
   Bracket_Max
   Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
 #endif
   Bracket_Max


@@ -399,17 +399,17 @@ wxString wxExpandEnvVars(const wxString& str)
   size_t m;
   for ( size_t n = 0; n < str.length(); n++ ) {
     switch ( str[n].GetValue() ) {
   size_t m;
   for ( size_t n = 0; n < str.length(); n++ ) {
     switch ( str[n].GetValue() ) {

-#ifdef  __WXMSW__
+#ifdef __WINDOWS__

       case wxT('%'):
       case wxT('%'):

-#endif  //WINDOWS
+#endif // __WINDOWS__

       case wxT('$'):
         {
           Bracket bracket;
       case wxT('$'):
         {
           Bracket bracket;

-          #ifdef  __WXMSW__
+          #ifdef __WINDOWS__

             if ( str[n] == wxT('%') )
               bracket = Bracket_Windows;
             else
             if ( str[n] == wxT('%') )
               bracket = Bracket_Windows;
             else

-          #endif  //WINDOWS
+          #endif // __WINDOWS__

           if ( n == str.length() - 1 ) {
             bracket = Bracket_None;
           }
           if ( n == str.length() - 1 ) {
             bracket = Bracket_None;
           }


@@ -453,7 +453,7 @@ wxString wxExpandEnvVars(const wxString& str)
 #endif
           {
             // variable doesn't exist => don't change anything
 #endif
           {
             // variable doesn't exist => don't change anything

-            #ifdef  __WXMSW__
+            #ifdef  __WINDOWS__

               if ( bracket != Bracket_Windows )
             #endif
                 if ( bracket != Bracket_None )
               if ( bracket != Bracket_Windows )
             #endif
                 if ( bracket != Bracket_None )


@@ -470,10 +470,10 @@ wxString wxExpandEnvVars(const wxString& str)
               //
               // under Unix, OTOH, this warning could be useful for the user to
               // understand why isn't the variable expanded as intended
               //
               // under Unix, OTOH, this warning could be useful for the user to
               // understand why isn't the variable expanded as intended

-              #ifndef __WXMSW__
+              #ifndef __WINDOWS__

                 wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."),
                              (char)bracket, (unsigned int) (m + 1), str.c_str());
                 wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."),
                              (char)bracket, (unsigned int) (m + 1), str.c_str());

-              #endif // __WXMSW__
+              #endif // __WINDOWS__

             }
             else {
               // skip closing bracket unless the variables wasn't expanded
             }
             else {
               // skip closing bracket unless the variables wasn't expanded