Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-07-10 14:15:17 +00:00
parent 7007fcfced
commit 2049ba38ad
154 changed files with 481 additions and 463 deletions

View File

@@ -136,7 +136,7 @@ wxString ExpandEnvVars(const wxString& str)
Bracket_None,
Bracket_Normal = ')',
Bracket_Curly = '}',
#ifdef __WINDOWS__
#ifdef __WXMSW__
Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-)
#endif
};
@@ -144,13 +144,13 @@ wxString ExpandEnvVars(const wxString& str)
uint m;
for ( uint n = 0; n < str.Len(); n++ ) {
switch ( str[n] ) {
#ifdef __WINDOWS__
#ifdef __WXMSW__
case '%':
#endif //WINDOWS
case '$':
{
Bracket bracket;
#ifdef __WINDOWS__
#ifdef __WXMSW__
if ( str[n] == '%' )
bracket = Bracket_Windows;
else
@@ -188,7 +188,7 @@ wxString ExpandEnvVars(const wxString& str)
}
else {
// variable doesn't exist => don't change anything
#ifdef __WINDOWS__
#ifdef __WXMSW__
if ( bracket != Bracket_Windows )
#endif
if ( bracket != Bracket_None )