Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp
index dbb6d544aa20db844f3f3e3d58edc11357c07935..c50c724772cec1011b13818aba605b896d36cc68 100644 (file)
--- a/src/cocoa/fontutil.cpp
+++ b/src/cocoa/fontutil.cpp
@@ -26,6 +26,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
 
 #ifndef WX_PRECOMP
     #include "wx/hash.h"

+    #include "wx/utils.h"

 #endif // PCH
 
 #include "wx/fontutil.h"
 #endif // PCH
 
 #include "wx/fontutil.h"


@@ -162,7 +163,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         #pragma message enable nosimpint
     #endif
 
         #pragma message enable nosimpint
     #endif
 

-    #include "wx/utils.h"       // for wxGetDisplay()

 #elif defined(__WXGTK__)
     // we have to declare struct tm to avoid problems with first forward
     // declaring it in C code (glib.h included from gdk.h does it) and then
 #elif defined(__WXGTK__)
     // we have to declare struct tm to avoid problems with first forward
     // declaring it in C code (glib.h included from gdk.h does it) and then

diff --git a/src/cocoa/settings.mm b/src/cocoa/settings.mm
index e6adf7446b10bde860d5dc02120183e48a6fe335..192911f6826f57b4f859b0b35b97aedc1440c76b 100644 (file)
--- a/src/cocoa/settings.mm
+++ b/src/cocoa/settings.mm
@@ -10,12 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/utils.h"

 #endif
 
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/settings.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 
 #include "wx/cocoa/autorelease.h"
 
 
 #include "wx/cocoa/autorelease.h"
 

diff --git a/src/cocoa/utilsexc.mm b/src/cocoa/utilsexc.mm
index 5d7fe82113b779eac21ce943ec199fc40a8adee2..20d6e25688e65ce60050234b416ca25db0a7b1a4 100644 (file)
--- a/src/cocoa/utilsexc.mm
+++ b/src/cocoa/utilsexc.mm
@@ -6,21 +6,21 @@
 // Created:     2004-10-05
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton
 // Created:     2004-10-05
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 // Notes:       This code may be useful on platforms other than Darwin.
 //              On Darwin we share the CoreFoundation code with wxMac.
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 // Notes:       This code may be useful on platforms other than Darwin.
 //              On Darwin we share the CoreFoundation code with wxMac.
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/utils.h"

 #endif
 #endif

+

 #include "wx/unix/execute.h"
 #include "wx/unix/execute.h"

-#include "wx/utils.h"

 
 #if 0
 
 
 #if 0
 

-#include "wx/utils.h"
-

 #include "wx/process.h"
 #include "wx/stream.h"
 
 #include "wx/process.h"
 #include "wx/stream.h"
 


@@ -39,14 +39,14 @@
 class wxPipeInputStream : public wxInputStream
 {
 public:
 class wxPipeInputStream : public wxInputStream
 {
 public:

-    wxPipeInputStream(NSPipe* thePipe) : 
+    wxPipeInputStream(NSPipe* thePipe) :

             m_thePipe(thePipe),
             m_theHandle([m_thePipe fileHandleForReading])
     {
     }
 
     ~wxPipeInputStream()
             m_thePipe(thePipe),
             m_theHandle([m_thePipe fileHandleForReading])
     {
     }
 
     ~wxPipeInputStream()

-    {  
+    {

         [m_thePipe release];
     }
 
         [m_thePipe release];
     }
 


@@ -57,23 +57,23 @@ protected:
         memcpy(buffer, [theData bytes], [theData length]);
         return [theData length];
     }
         memcpy(buffer, [theData bytes], [theData length]);
         return [theData length];
     }

-    
-    
-    NSPipe*            m_thePipe;
-    NSFileHandle*      m_theHandle;
+
+
+    NSPipe* m_thePipe;
+    NSFileHandle* m_theHandle;

 };
 
 class wxPipeOutputStream : public wxOutputStream
 {
 public:
 };
 
 class wxPipeOutputStream : public wxOutputStream
 {
 public:

-    wxPipeOutputStream(NSPipe* thePipe) : 
+    wxPipeOutputStream(NSPipe* thePipe) :

             m_thePipe(thePipe),
             m_theHandle([m_thePipe fileHandleForWriting])
     {
     }
 
     ~wxPipeOutputStream()
             m_thePipe(thePipe),
             m_theHandle([m_thePipe fileHandleForWriting])
     {
     }
 
     ~wxPipeOutputStream()

-    {  
+    {

         [m_thePipe release];
     }
 
         [m_thePipe release];
     }
 


@@ -81,14 +81,14 @@ protected:
 
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize)
     {
 
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize)
     {

-        NSData* theData = [NSData dataWithBytesNoCopy:(void*)buffer 
+        NSData* theData = [NSData dataWithBytesNoCopy:(void*)buffer

                                   length:bufsize];
         [m_theHandle writeData:theData];
         return bufsize;
     }
                                   length:bufsize];
         [m_theHandle writeData:theData];
         return bufsize;
     }

-        
-    NSPipe*            m_thePipe;
-    NSFileHandle*      m_theHandle;
+
+    NSPipe* m_thePipe;
+    NSFileHandle* m_theHandle;

 };
 
 @interface wxTaskHandler : NSObject
 };
 
 @interface wxTaskHandler : NSObject


@@ -102,89 +102,88 @@ protected:
 
 @implementation wxTaskHandler : NSObject
 
 
 @implementation wxTaskHandler : NSObject
 

--(id)init:(void*)handle processIdentifier:(long)pid 
+-(id)init:(void*)handle processIdentifier:(long)pid

 {
     self = [super init];
 {
     self = [super init];

-    
+

     m_handle = handle;
     m_pid = pid;
 
     m_handle = handle;
     m_pid = pid;
 

-    [[NSNotificationCenter defaultCenter] addObserver:self 
-            selector:@selector(termHandler:) 
-            name:NSTaskDidTerminateNotification 
+    [[NSNotificationCenter defaultCenter] addObserver:self
+            selector:@selector(termHandler:)
+            name:NSTaskDidTerminateNotification

             object:nil];
     return self;
 }
 
             object:nil];
     return self;
 }
 

-- (void)termHandler:(NSNotification *)aNotification 
+- (void)termHandler:(NSNotification *)aNotification

 {
     NSTask* theTask = [aNotification object];
 {
     NSTask* theTask = [aNotification object];

-    
+

     if ([theTask processIdentifier] == m_pid)
     {
     if ([theTask processIdentifier] == m_pid)
     {

-        ((wxProcess*)m_handle)->OnTerminate([theTask processIdentifier], 
+        ((wxProcess*)m_handle)->OnTerminate([theTask processIdentifier],

                           [theTask terminationStatus]);
                           [theTask terminationStatus]);

-        
+

         [self release];
     }
 }
 
 @end
 
         [self release];
     }
 }
 
 @end
 

-long wxExecute(const wxString& command, 
-                int sync, 
-                wxProcess *handle)
+long wxExecute(const wxString& command,
+               int sync,
+               wxProcess *handle)

 {
     NSTask* theTask = [[NSTask alloc] init];
 {
     NSTask* theTask = [[NSTask alloc] init];

-    
+

     if (handle && handle->IsRedirected())
     {
         NSPipe* theStdinPipe = [[NSPipe alloc] init];
         NSPipe* theStderrPipe = [[NSPipe alloc] init];
         NSPipe* theStdoutPipe = [[NSPipe alloc] init];
     if (handle && handle->IsRedirected())
     {
         NSPipe* theStdinPipe = [[NSPipe alloc] init];
         NSPipe* theStderrPipe = [[NSPipe alloc] init];
         NSPipe* theStdoutPipe = [[NSPipe alloc] init];

-    
+

         [theTask setStandardInput:theStdinPipe];
         [theTask setStandardError:theStderrPipe];
         [theTask setStandardOutput:theStdoutPipe];
         [theTask setStandardInput:theStdinPipe];
         [theTask setStandardError:theStderrPipe];
         [theTask setStandardOutput:theStdoutPipe];

-        
+

         handle->SetPipeStreams(new wxPipeInputStream(theStdoutPipe),
                                new wxPipeOutputStream(theStdinPipe),
                                new wxPipeInputStream(theStderrPipe) );
     }
         handle->SetPipeStreams(new wxPipeInputStream(theStdoutPipe),
                                new wxPipeOutputStream(theStdinPipe),
                                new wxPipeInputStream(theStderrPipe) );
     }

-    
-    NSArray* theQuoteArguments = 
+
+    NSArray* theQuoteArguments =

         [wxNSStringWithWxString(command) componentsSeparatedByString:@"\""];
         [wxNSStringWithWxString(command) componentsSeparatedByString:@"\""];

-        
-    NSMutableArray* theSeparatedArguments = 
+
+    NSMutableArray* theSeparatedArguments =

         [NSMutableArray arrayWithCapacity:10];
         [NSMutableArray arrayWithCapacity:10];

-        
+

     for (unsigned i = 0; i < [theQuoteArguments count]; ++i)
     {
         [theSeparatedArguments addObjectsFromArray:
             [[theQuoteArguments objectAtIndex:i] componentsSeparatedByString:@" "]
         ];
     for (unsigned i = 0; i < [theQuoteArguments count]; ++i)
     {
         [theSeparatedArguments addObjectsFromArray:
             [[theQuoteArguments objectAtIndex:i] componentsSeparatedByString:@" "]
         ];

-        
+

         if(++i < [theQuoteArguments count])
             [theSeparatedArguments addObject:[theQuoteArguments objectAtIndex:i]];
     }
         if(++i < [theQuoteArguments count])
             [theSeparatedArguments addObject:[theQuoteArguments objectAtIndex:i]];
     }

-    
+

     [theTask setLaunchPath:[theSeparatedArguments objectAtIndex:0]];
     [theTask setArguments:theSeparatedArguments];
     [theTask launch];
     [theTask setLaunchPath:[theSeparatedArguments objectAtIndex:0]];
     [theTask setArguments:theSeparatedArguments];
     [theTask launch];

-    
+

     if(sync & wxEXEC_ASYNC)
     {
     if(sync & wxEXEC_ASYNC)
     {

-        [[wxTaskHandler alloc]init:handle 
+        [[wxTaskHandler alloc]init:handle

                               processIdentifier:[theTask processIdentifier]];
                               processIdentifier:[theTask processIdentifier]];

-                                
+

         return 0;
     }
     else
     {
         [theTask waitUntilExit];
         return 0;
     }
     else
     {
         [theTask waitUntilExit];

-        
+

         return [theTask terminationStatus];
         return [theTask terminationStatus];

-    }                      
+    }

 }
 #endif //0
 }
 #endif //0

-

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index efc2c45cbdd055868d09595d805eeff3bbf23ebe..b16ea3d8374b207cc6c82698872aa911124d3328 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -29,9 +29,9 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/utils.h"

 #include "wx/apptrait.h"
 #include "wx/cmdline.h"
 #include "wx/confbase.h"
 #include "wx/apptrait.h"
 #include "wx/cmdline.h"
 #include "wx/confbase.h"

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index fe6e9038106dd9520a8ed3f8f26a25fbde022316..3316cced794a86c0cf87aa3ab7e75642ec55f634 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -33,6 +33,7 @@
     #include "wx/msgdlg.h"
     #include "wx/bitmap.h"
     #include "wx/confbase.h"
     #include "wx/msgdlg.h"
     #include "wx/bitmap.h"
     #include "wx/confbase.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"


@@ -40,7 +41,6 @@
 #include "wx/evtloop.h"
 #include "wx/msgout.h"
 #include "wx/thread.h"
 #include "wx/evtloop.h"
 #include "wx/msgout.h"
 #include "wx/thread.h"

-#include "wx/utils.h"

 #include "wx/ptr_scpd.h"
 
 #if defined(__WXMSW__)
 #include "wx/ptr_scpd.h"
 
 #if defined(__WXMSW__)

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index af1e4c34501ae704145520b49d2beb54930f387b..065d1851ad0b70318d0d4406bdef420fcd008a97 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -25,9 +25,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/utils.h"

 #include "wx/palette.h"
 #include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/palette.h"
 #include "wx/icon.h"
 #include "wx/image.h"

diff --git a/src/common/config.cpp b/src/common/config.cpp
index b5d811d8360ffdfbffdca6a26071e36bb41673c7..2e1430356e94485980b2f345ebc5bc302c78a8f4 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -30,6 +30,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #include "wx/arrstr.h"
 #endif //WX_PRECOMP
 
 #include "wx/arrstr.h"


@@ -37,7 +38,6 @@
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
 #include "wx/file.h"
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
 #include "wx/file.h"

-#include "wx/utils.h"

 #include "wx/math.h"
 
 #include <stdlib.h>
 #include "wx/math.h"
 
 #include <stdlib.h>

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 65270ac6123b87e7a35c742cdf6d302051751044..f400389c4a1aad2ee4f7a8f06e3de512040d1773 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -35,10 +35,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #include "wx/filefn.h"
 #endif //WX_PRECOMP
 
 #include "wx/filefn.h"

-#include "wx/utils.h"

 #include "wx/filename.h"        // for SplitPath()
 #include "wx/apptrait.h"
 
 #include "wx/filename.h"        // for SplitPath()
 #include "wx/apptrait.h"
 

diff --git a/src/common/event.cpp b/src/common/event.cpp
index ae1a10d70902c30a1010a59fc462c948a7aa2d9e..9debc5b90a773b72457a6ea74ff436702ff5c98f 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -29,10 +29,10 @@
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 
     #if wxUSE_GUI
         #include "wx/control.h"
 
     #if wxUSE_GUI
         #include "wx/control.h"

-        #include "wx/utils.h"

         #include "wx/dc.h"
         #include "wx/textctrl.h"
     #endif // wxUSE_GUI
         #include "wx/dc.h"
         #include "wx/textctrl.h"
     #endif // wxUSE_GUI

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 41d46f5fc00e1b5ff2c64a9685af98d608f45c58..fc33eb727299d1e9d92fcea78df99ac082867685 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -29,6 +29,7 @@
     #include  "wx/intl.h"
     #include  "wx/log.h"
     #include  "wx/app.h"
     #include  "wx/intl.h"
     #include  "wx/log.h"
     #include  "wx/app.h"

+    #include  "wx/utils.h"    // for wxGetHomeDir

 #endif  //WX_PRECOMP
 
 #include  "wx/file.h"
 #endif  //WX_PRECOMP
 
 #include  "wx/file.h"


@@ -42,7 +43,6 @@
     #include  "wx/stream.h"
 #endif // wxUSE_STREAMS
 
     #include  "wx/stream.h"
 #endif // wxUSE_STREAMS
 

-#include  "wx/utils.h"    // for wxGetHomeDir

 
 #if defined(__WXMAC__)
     #include  "wx/mac/private.h"  // includes mac headers
 
 #if defined(__WXMAC__)
     #include  "wx/mac/private.h"  // includes mac headers

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 4403c83db9457802cdbbeb93f7cfb1fe23330476..3bd9d7c1bb524a9d75a546c3d8092f844292c74b 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -27,9 +27,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/file.h" // This does include filefn.h
 #include "wx/filename.h"
 #include "wx/dir.h"
 #include "wx/file.h" // This does include filefn.h
 #include "wx/filename.h"
 #include "wx/dir.h"

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index c776d48846f5737f3417f844c6e135798262f4ad..300a176ee5cb499c1bfeea2abc138489da465f0a 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -72,12 +72,12 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/file.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/file.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"          // for wxExpandEnvVars
 #endif
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"          // for wxExpandEnvVars

-#include "wx/utils.h"

 #include "wx/file.h"
 #include "wx/dynlib.h"
 
 #include "wx/file.h"
 #include "wx/dynlib.h"
 

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index bd59e2360143233216c20dec7bf54c7822fe9c11..202f10f90440ddc920804b1308cb8b9e22004361 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -26,6 +26,7 @@
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/brush.h"
 #endif
 
 #include "wx/brush.h"


@@ -36,7 +37,6 @@
 #include "wx/font.h"
 #include "wx/palette.h"
 #include "wx/dc.h"
 #include "wx/font.h"
 #include "wx/palette.h"
 #include "wx/dc.h"

-#include "wx/utils.h"

 #include "wx/settings.h"
 #include "wx/hashmap.h"
 
 #include "wx/settings.h"
 #include "wx/hashmap.h"
 

diff --git a/src/common/image.cpp b/src/common/image.cpp
index cc9834d4d6d7f18395820d5ba96184fd78e23773..64f367c5216066cc9f3e6f1aa1420ce3c272b905 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -20,6 +20,7 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/hash.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/hash.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/image.h"
 #endif
 
 #include "wx/image.h"


@@ -29,7 +30,6 @@
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"

-#include "wx/utils.h"

 #include "wx/math.h"
 
 #if wxUSE_XPM
 #include "wx/math.h"
 
 #if wxUSE_XPM

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 843eddf654362673102bbdfb2923e2843bb94737..3db566fcb741be9ef7a95f4ace6c5269a3e3d359 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -74,11 +74,11 @@ license is as follows:
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
 #endif
 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"

-#include "wx/utils.h"

 #include "wx/xpmdecod.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 #include "wx/xpmdecod.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)

diff --git a/src/common/log.cpp b/src/common/log.cpp
index d7a7e7e895a5af754782b5084301811e89f8089a..a669a88cb914dd28d9fbc3f629c0a692aba73e98 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -33,6 +33,7 @@
     #include "wx/arrstr.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/arrstr.h"
     #include "wx/intl.h"
     #include "wx/string.h"

+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"


@@ -40,7 +41,6 @@
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"

-#include "wx/utils.h"

 #include "wx/wxchar.h"
 
 // other standard headers
 #include "wx/wxchar.h"
 
 // other standard headers

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index b59463514639771a5578fbe1906a7ea69316c1ff..894a190d7bdf496a3eb09c9c96b5ddc0c5e0419d 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -21,10 +21,10 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/math.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/math.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
 #include "wx/sizer.h"

-#include "wx/utils.h"

 #include "wx/statbox.h"
 #include "wx/settings.h"
 #include "wx/listimpl.cpp"
 #include "wx/statbox.h"
 #include "wx/settings.h"
 #include "wx/listimpl.cpp"

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 3f7554ef2e26d9f67b33f47eb7da2d9d7aea194e..048fe30407062d7cb71e4c528a9b4e5333b39b95 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -31,11 +31,11 @@
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/apptrait.h"
 #include "wx/timer.h"
 #endif
 
 #include "wx/apptrait.h"
 #include "wx/timer.h"

-#include "wx/utils.h"

 #include "wx/module.h"
 
 #include "wx/sckaddr.h"
 #include "wx/module.h"
 
 #include "wx/sckaddr.h"

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index a43f3a435a449909b53883fe9f511b6e431cb4af..9b2d4e2b1e8e92936edbfa257f3624fd202bbc26 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -28,10 +28,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/utils.h" // for wxStripMenuCodes()

 #endif
 
 #endif
 

-#include "wx/utils.h" // for wxStripMenuCodes()
-

 bool wxIsStockID(wxWindowID id)
 {
     switch (id)
 bool wxIsStockID(wxWindowID id)
 {
     switch (id)

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 92b18ad615587ce6388e95d492c5e790c15f10fb..eafce97c8b5b7029cad15cbb554bc9fd9a2f404a 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -18,6 +18,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/strconv.h"
 #endif
 
 #include "wx/strconv.h"


@@ -52,7 +53,6 @@
 
 #include "wx/encconv.h"
 #include "wx/fontmap.h"
 
 #include "wx/encconv.h"
 #include "wx/fontmap.h"

-#include "wx/utils.h"

 
 #ifdef __WXMAC__
 #ifndef __DARWIN__
 
 #ifdef __WXMAC__
 #ifndef __DARWIN__

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 084a93ca85d4509caa63e134684c54bc6384a974..3ece422a3443c6860cbe73e1ea6f7f7ec329a471 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -23,9 +23,9 @@
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/module.h"
 
 #include <string.h>
 #include "wx/module.h"
 
 #include <string.h>

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 6fd4fb11aa9899e1e2526394f6a6c5577b64eca8..6a4f651fc0fbfdb58676deeab88d95f007c644e4 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -102,11 +102,11 @@ license is as follows:
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/stream.h"
 #include "wx/image.h"
 #endif
 
 #include "wx/stream.h"
 #include "wx/image.h"

-#include "wx/utils.h"

 #include "wx/hashmap.h"
 #include <string.h>
 
 #include "wx/hashmap.h"
 #include <string.h>
 

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 78a447191075d716a10560b67f898e664b1474e7..1358b48275529d1a9128f5dd94a3ef2c0fb3c470 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -19,13 +19,13 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/zipstrm.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"
 #endif
 
 #include "wx/zipstrm.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"

-#include "wx/utils.h"

 #include "wx/buffer.h"
 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"
 #include "wx/buffer.h"
 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 3dc3214091766560b5a8c0e4f984388958633f36..55589614a5c564c28832d8036f6ea05f6bcaa3d1 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -23,18 +23,18 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 
 // normally, the compiler options should contain -I../zlib, but it is
 // apparently not the case for all MSW makefiles and so, unless we use
 // configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
 // the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
 #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
 
 // normally, the compiler options should contain -I../zlib, but it is
 // apparently not the case for all MSW makefiles and so, unless we use
 // configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
 // the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
 #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)

-   #include "../zlib/zlib.h"
+    #include "../zlib/zlib.h"

 #else
 #else

-   #include "zlib.h"
+    #include "zlib.h"

 #endif
 
 enum {
 #endif
 
 enum {

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 0a28ec92b6d8bcaad059ee71aa26942bab68b933..266b12c3a8379f52e121b1a906900602e70fd214 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -23,10 +23,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #include "wx/dcmemory.h"
 #endif // WX_PRECOMP
 
 #include "wx/dcmemory.h"

-#include "wx/utils.h"

 #include "wx/image.h"
 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/image.h"
 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index a29d5809e4d7ac3f5a05fc0bace62253c3dbfc64..9652d6eea8b8443ade637b71300ad97becdb579d 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -24,10 +24,10 @@
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

-#include "wx/utils.h"

 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"

diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp
index 0867643f0c212199c1f6e9bc80935c1c6495f473..c81364b05996801c3c59153c4bc538063038fde0 100644 (file)
--- a/src/generic/regiong.cpp
+++ b/src/generic/regiong.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/region.cpp
+// Name:        src/generic/region.cpp

 // Purpose:     generic wxRegion class
 // Author:      David Elliott
 // Modified by:
 // Purpose:     generic wxRegion class
 // Author:      David Elliott
 // Modified by:


@@ -9,8 +9,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #include "wx/generic/region.h"
 #include "wx/generic/region.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 // ========================================================================
 // Classes to interface with X.org code
 
 // ========================================================================
 // Classes to interface with X.org code


@@ -1953,4 +1964,3 @@ XRectInRegion(
     return(partIn ? ((ry < prect->y2) ? wxPartRegion : wxInRegion) :
                 wxOutRegion);
 }
     return(partIn ? ((ry < prect->y2) ? wxPartRegion : wxInRegion) :
                 wxOutRegion);
 }

-

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index d6ace0914c5979991c281d9943bae9724f91dd78..69c534470d66f62a03d8b6e492b6c79f99471e32 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/scrolwin.cpp
+// Name:        src/generic/scrolwin.cpp

 // Purpose:     wxScrolledWindow implementation
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement.
 // Purpose:     wxScrolledWindow implementation
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement.


@@ -29,10 +29,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/utils.h"
+#include "wx/scrolwin.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/dcclient.h"
 
 #include "wx/dcclient.h"
 

-#include "wx/scrolwin.h"

 #include "wx/panel.h"
 #if wxUSE_TIMER
 #include "wx/timer.h"
 #include "wx/panel.h"
 #if wxUSE_TIMER
 #include "wx/timer.h"


@@ -1339,4 +1343,3 @@ WXLRESULT wxScrolledWindow::MSWWindowProc(WXUINT nMsg,
 }
 
 #endif // __WXMSW__
 }
 
 #endif // __WXMSW__

-

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index d7eb518add6e64ae8d29f1f887e2aeeab414f5ac..2d830719c9f94b5f97506e05adf56e208e5b3771 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -21,10 +21,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"


@@ -95,7 +95,7 @@ FORCE_LINK(gnome_vfs)
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-bool   g_mainThreadLocked = FALSE;
+bool   g_mainThreadLocked = false;

 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;


@@ -355,7 +355,7 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
     gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
 
     wxMutexGuiEnter();
     gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
 
     wxMutexGuiEnter();

-    g_mainThreadLocked = FALSE;
+    g_mainThreadLocked = false;

 
     gdk_threads_leave();
 
 
     gdk_threads_leave();
 


@@ -384,7 +384,7 @@ void wxapp_install_idle_handler()
 
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
 
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 

-    g_isIdle = FALSE;
+    g_isIdle = false;

 
     if (g_pendingTag == 0)
         g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL );
 
     if (g_pendingTag == 0)
         g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL );


@@ -424,7 +424,7 @@ END_EVENT_TABLE()
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 #endif // __WXDEBUG__
 
     m_idleTag = 0;
 #endif // __WXDEBUG__
 
     m_idleTag = 0;


@@ -454,7 +454,7 @@ wxApp::~wxApp()
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )

-        return FALSE;
+        return false;

 
     GdkVisual *visual = gdk_visual_get_system();
 
 
     GdkVisual *visual = gdk_visual_get_system();
 


@@ -688,7 +688,7 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxC
 
     wxAppBase::OnAssert(file, line, cond, msg);
 
 
     wxAppBase::OnAssert(file, line, cond, msg);
 

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 }
 
 #endif // __WXDEBUG__
 }
 
 #endif // __WXDEBUG__

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 228ecfcf59f76bc1fb27bb1f8edc2f8d5b847209..92cc30b09076bb2cfd487c0d5aefa0676f48160c 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/dataobj.h"
 #endif
 
 #include "wx/dataobj.h"

-#include "wx/utils.h"

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 


@@ -87,7 +87,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
                 wxLogTrace( TRACE_CLIPBOARD,
                             _T("got unsupported clipboard target") );
 
                 wxLogTrace( TRACE_CLIPBOARD,
                             _T("got unsupported clipboard target") );
 

-                clipboard->m_waiting = FALSE;
+                clipboard->m_waiting = false;

                 return;
             }
         }
                 return;
             }
         }


@@ -123,7 +123,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
         }
     }
 
         }
     }
 

-    clipboard->m_waiting = FALSE;
+    clipboard->m_waiting = false;

 }
 }
 
 }
 }
 


@@ -140,7 +140,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
 {
     if (!wxTheClipboard)
     {
 {
     if (!wxTheClipboard)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -148,13 +148,13 @@ selection_received( GtkWidget *WXUNUSED(widget),
 
     if (!data_object)
     {
 
     if (!data_object)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
     if (selection_data->length <= 0)
     {
         return;
     }
 
     if (selection_data->length <= 0)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -163,7 +163,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
     // make sure we got the data in the correct format
     if (!data_object->IsSupportedFormat( format ) )
     {
     // make sure we got the data in the correct format
     if (!data_object->IsSupportedFormat( format ) )
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -173,7 +173,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
     // if so, copy data to target object
     if (selection_data->type != GDK_SELECTION_TYPE_STRING)
     {
     // if so, copy data to target object
     if (selection_data->type != GDK_SELECTION_TYPE_STRING)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 #endif
         return;
     }
 #endif


@@ -181,7 +181,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 
     wxTheClipboard->m_formatSupported = true;
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 
     wxTheClipboard->m_formatSupported = true;

-    clipboard->m_waiting = FALSE;
+    clipboard->m_waiting = false;

 }
 }
 
 }
 }
 


@@ -320,11 +320,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-    m_open = FALSE;
-    m_waiting = FALSE;
+    m_open = false;
+    m_waiting = false;

 
 

-    m_ownsClipboard = FALSE;
-    m_ownsPrimarySelection = FALSE;
+    m_ownsClipboard = false;
+    m_ownsPrimarySelection = false;

 
     m_data = (wxDataObject*) NULL;
     m_receivedData = (wxDataObject*) NULL;
 
     m_data = (wxDataObject*) NULL;
     m_receivedData = (wxDataObject*) NULL;


@@ -352,10 +352,10 @@ wxClipboard::wxClipboard()
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
     if (!g_timestampAtom) g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE);
 
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
     if (!g_timestampAtom) g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE);
 

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

     m_targetRequested = 0;
 
     m_targetRequested = 0;
 

-    m_usePrimary = FALSE;
+    m_usePrimary = false;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -388,7 +388,7 @@ void wxClipboard::Clear()
 
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {
 
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {

-            m_waiting = TRUE;
+            m_waiting = true;

 
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
                                      (guint32) GDK_CURRENT_TIME );
 
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
                                      (guint32) GDK_CURRENT_TIME );


@@ -408,23 +408,23 @@ void wxClipboard::Clear()
     }
 
     m_targetRequested = 0;
     }
 
     m_targetRequested = 0;

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

 }
 
 bool wxClipboard::Open()
 {
 }
 
 bool wxClipboard::Open()
 {

-    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
+    wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );

 
 

-    m_open = TRUE;
+    m_open = true;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
 

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
     Clear();
 
 
     Clear();
 


@@ -433,9 +433,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
 

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
     // we can only store one wxDataObject
     Clear();
 
     // we can only store one wxDataObject
     Clear();


@@ -502,7 +502,7 @@ void wxClipboard::Close()
 {
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 
 {
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 

-    m_open = FALSE;
+    m_open = false;

 }
 
 bool wxClipboard::IsOpened() const
 }
 
 bool wxClipboard::IsOpened() const


@@ -513,7 +513,7 @@ bool wxClipboard::IsOpened() const
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     /* reentrance problems */
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     /* reentrance problems */

-    if (m_waiting) return FALSE;
+    if (m_waiting) return false;

 
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;
 
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;


@@ -522,19 +522,19 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
                 wxT("wxClipboard:IsSupported: requested format: %s"),
                 format.GetId().c_str() );
 
                 wxT("wxClipboard:IsSupported: requested format: %s"),
                 format.GetId().c_str() );
 

-    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+    wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
 

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

 
     /* perform query. this will set m_formatSupported to
 
     /* perform query. this will set m_formatSupported to

-       TRUE if m_targetRequested is supported.
+       true if m_targetRequested is supported.

        also, we have to wait for the "answer" from the
        clipboard owner which is an asynchronous process.
        also, we have to wait for the "answer" from the
        clipboard owner which is an asynchronous process.

-       therefore we set m_waiting = TRUE here and wait
+       therefore we set m_waiting = true here and wait

        until the callback "targets_selection_received"
        until the callback "targets_selection_received"

-       sets it to FALSE */
+       sets it to false */

 
 

-    m_waiting = TRUE;
+    m_waiting = true;

 
     gtk_selection_convert( m_targetsWidget,
                            m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
 
     gtk_selection_convert( m_targetsWidget,
                            m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY


@@ -558,7 +558,7 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
 
 bool wxClipboard::GetData( wxDataObject& data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
     /* get formats from wxDataObjects */
     wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
 
     /* get formats from wxDataObjects */
     wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];


@@ -577,19 +577,19 @@ bool wxClipboard::GetData( wxDataObject& data )
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 

-        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+        wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
 

-        m_formatSupported = FALSE;
+        m_formatSupported = false;

 
        /* perform query. this will set m_formatSupported to
 
        /* perform query. this will set m_formatSupported to

-          TRUE if m_targetRequested is supported.
+          true if m_targetRequested is supported.

           also, we have to wait for the "answer" from the
           clipboard owner which is an asynchronous process.
           also, we have to wait for the "answer" from the
           clipboard owner which is an asynchronous process.

-          therefore we set m_waiting = TRUE here and wait
+          therefore we set m_waiting = true here and wait

           until the callback "targets_selection_received"
           until the callback "targets_selection_received"

-          sets it to FALSE */
+          sets it to false */

 
 

-        m_waiting = TRUE;
+        m_waiting = true;

 
         gtk_selection_convert( m_targetsWidget,
                            m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
 
         gtk_selection_convert( m_targetsWidget,
                            m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY


@@ -607,21 +607,21 @@ bool wxClipboard::GetData( wxDataObject& data )
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 

-        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+        wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
         /* start query */
 
         /* start query */

-        m_formatSupported = FALSE;
+        m_formatSupported = false;

 
         /* ask for clipboard contents.  this will set
 
         /* ask for clipboard contents.  this will set

-           m_formatSupported to TRUE if m_targetRequested
+           m_formatSupported to true if m_targetRequested

            is supported.
            also, we have to wait for the "answer" from the
            clipboard owner which is an asynchronous process.
            is supported.
            also, we have to wait for the "answer" from the
            clipboard owner which is an asynchronous process.

-           therefore we set m_waiting = TRUE here and wait
+           therefore we set m_waiting = true here and wait

            until the callback "targets_selection_received"
            until the callback "targets_selection_received"

-           sets it to FALSE */
+           sets it to false */

 
 

-        m_waiting = TRUE;
+        m_waiting = true;

 
         wxLogTrace( TRACE_CLIPBOARD,
                     wxT("wxClipboard::GetData: format found, start convert") );
 
         wxLogTrace( TRACE_CLIPBOARD,
                     wxT("wxClipboard::GetData: format found, start convert") );


@@ -635,11 +635,11 @@ bool wxClipboard::GetData( wxDataObject& data )
         while (m_waiting) gtk_main_iteration();
 
         /* this is a true error as we checked for the presence of such data before */
         while (m_waiting) gtk_main_iteration();
 
         /* this is a true error as we checked for the presence of such data before */

-        wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") );
+        wxCHECK_MSG( m_formatSupported, false, wxT("error retrieving data from clipboard") );

 
         /* return success */
         delete[] array;
 
         /* return success */
         delete[] array;

-        return TRUE;
+        return true;

     }
 
     wxLogTrace( TRACE_CLIPBOARD,
     }
 
     wxLogTrace( TRACE_CLIPBOARD,


@@ -647,7 +647,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 
     /* return failure */
     delete[] array;
 
     /* return failure */
     delete[] array;

-    return FALSE;
+    return false;

 }
 
 #endif
 }
 
 #endif

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 25e4e109ac894168671608b9fa0355fc3efcf46f..c975d3cf0d3474fc696a85eb8bae2cc655a98082 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -14,10 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/utils.h"
-

 #include "wx/gtk/private.h" //for idle stuff
 
 #include <gdk/gdk.h>
 #include "wx/gtk/private.h" //for idle stuff
 
 #include <gdk/gdk.h>

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 946de36ded202b6664df2ebaa9fd6eae25a4b262..b199481b30ee99356e3cc3a24bb15bb6a646a231 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -18,11 +18,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 10183aa0147b2cca3fcec31b22a6a44a58e52b6b..67d91827656a0200be1966e8e89c49a584ca607b 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -22,11 +22,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"

-#include "wx/utils.h"

 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"


@@ -62,7 +62,7 @@ public:
                   int family = wxFONTFAMILY_DEFAULT,
                   int style = wxFONTSTYLE_NORMAL,
                   int weight = wxFONTWEIGHT_NORMAL,
                   int family = wxFONTFAMILY_DEFAULT,
                   int style = wxFONTSTYLE_NORMAL,
                   int weight = wxFONTWEIGHT_NORMAL,

-                  bool underlined = FALSE,
+                  bool underlined = false,

                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 


@@ -78,7 +78,7 @@ public:
     bool HasNativeFont() const
     {
         // we always have a Pango font description
     bool HasNativeFont() const
     {
         // we always have a Pango font description

-        return TRUE;
+        return true;

     }
 
     // setters: all of them also take care to modify m_nativeFontInfo if we
     }
 
     // setters: all of them also take care to modify m_nativeFontInfo if we


@@ -91,7 +91,7 @@ public:
     void SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);
 
     void SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);
 

-    void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
+    void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }

     bool GetNoAntiAliasing() const { return m_noAA; }
 
     // and this one also modifies all the other font data fields
     bool GetNoAntiAliasing() const { return m_noAA; }
 
     // and this one also modifies all the other font data fields


@@ -159,7 +159,7 @@ void wxFontRefData::Init(int pointSize,
     m_underlined = underlined;
     m_encoding = encoding;
 
     m_underlined = underlined;
     m_encoding = encoding;
 

-    m_noAA = FALSE;
+    m_noAA = false;

 
     // Create native font info
     m_nativeFontInfo.description = pango_font_description_new();
 
     // Create native font info
     m_nativeFontInfo.description = pango_font_description_new();


@@ -196,7 +196,7 @@ void wxFontRefData::Init(int pointSize,
 
 void wxFontRefData::InitFromNative()
 {
 
 void wxFontRefData::InitFromNative()
 {

-    m_noAA = FALSE;
+    m_noAA = false;

 
     // Get native info
     PangoFontDescription *desc = m_nativeFontInfo.description;
 
     // Get native info
     PangoFontDescription *desc = m_nativeFontInfo.description;


@@ -231,7 +231,7 @@ void wxFontRefData::InitFromNative()
     }
 
     // Pango description are never underlined (?)
     }
 
     // Pango description are never underlined (?)

-    m_underlined = FALSE;
+    m_underlined = false;

 
     // always with GTK+ 2
     m_encoding = wxFONTENCODING_UTF8;
 
     // always with GTK+ 2
     m_encoding = wxFONTENCODING_UTF8;


@@ -374,7 +374,7 @@ bool wxFont::Create( int pointSize,
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 

-    return TRUE;
+    return true;

 }
 
 bool wxFont::Create(const wxString& fontname)
 }
 
 bool wxFont::Create(const wxString& fontname)


@@ -384,12 +384,12 @@ bool wxFont::Create(const wxString& fontname)
     {
         *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
     {
         *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 

-        return TRUE;
+        return true;

     }
 
     m_refData = new wxFontRefData(fontname);
 
     }
 
     m_refData = new wxFontRefData(fontname);
 

-    return TRUE;
+    return true;

 }
 
 void wxFont::Unshare()
 }
 
 void wxFont::Unshare()


@@ -483,7 +483,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );

 
     return M_FONTDATA->m_underlined;
 }
 
     return M_FONTDATA->m_underlined;
 }


@@ -511,7 +511,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 
 bool wxFont::IsFixedWidth() const
 {
 
 bool wxFont::IsFixedWidth() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );

 
     return wxFontBase::IsFixedWidth();
 }
 
     return wxFontBase::IsFixedWidth();
 }

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 50e7ad233152a4dcd2c3bdff9bea81a4eb036dc7..47efa1cfc61210e806be0c51b8b069b03ab4c92d 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/utils.h"

 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 82f03469c6ad06311acde4ebbe1ac72961086e92..21fc6d64bfdc89e02c8358a8a403073016253bce 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -19,10 +19,10 @@
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/arrstr.h"
 #endif
 
 #include "wx/arrstr.h"

-#include "wx/utils.h"

 #include "wx/checklst.h"
 #include "wx/settings.h"
 #include "wx/gtk/private.h"
 #include "wx/checklst.h"
 #include "wx/settings.h"
 #include "wx/gtk/private.h"

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 9d5cf1a053a1112e1bf42f9b6afd1ea5cef73a82..38938182da7c9a0975d506ce9d5a0c74b79d62d5 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/panel.h"
 #endif
 
 #include "wx/panel.h"

-#include "wx/utils.h"

 #include "wx/imaglist.h"
 #include "wx/bitmap.h"
 #include "wx/fontutil.h"
 #include "wx/imaglist.h"
 #include "wx/bitmap.h"
 #include "wx/fontutil.h"


@@ -99,7 +99,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
     wxCHECK_RET( !notebook->m_inSwitchPage,
                  _T("gtk_notebook_page_change_callback reentered") );
 
     wxCHECK_RET( !notebook->m_inSwitchPage,
                  _T("gtk_notebook_page_change_callback reentered") );
 

-    notebook->m_inSwitchPage = TRUE;
+    notebook->m_inSwitchPage = true;

     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 


@@ -129,7 +129,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
         notebook->GetEventHandler()->ProcessEvent( eventChanged );
     }
 
         notebook->GetEventHandler()->ProcessEvent( eventChanged );
     }
 

-    notebook->m_inSwitchPage = FALSE;
+    notebook->m_inSwitchPage = false;

 }
 }
 
 }
 }
 


@@ -292,11 +292,11 @@ END_EVENT_TABLE()
 void wxNotebook::Init()
 {
     m_padding = 0;
 void wxNotebook::Init()
 {
     m_padding = 0;

-    m_inSwitchPage = FALSE;
+    m_inSwitchPage = false;

 
     m_imageList = (wxImageList *) NULL;
     m_selection = -1;
 
     m_imageList = (wxImageList *) NULL;
     m_selection = -1;

-    m_themeEnabled = TRUE;
+    m_themeEnabled = true;

 }
 
 wxNotebook::wxNotebook()
 }
 
 wxNotebook::wxNotebook()


@@ -321,15 +321,15 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,
                         long style, const wxString& name )
 {
                         const wxPoint& pos, const wxSize& size,
                         long style, const wxString& name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

     m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxNoteBook creation failed") );
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxNoteBook creation failed") );

-        return FALSE;
+        return false;

     }
 
 
     }
 
 


@@ -357,7 +357,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
     g_signal_connect (m_widget, "realize",
                       G_CALLBACK (gtk_notebook_realized_callback), this);
 
     g_signal_connect (m_widget, "realize",
                       G_CALLBACK (gtk_notebook_realized_callback), this);
 

-    return TRUE;
+    return true;

 }
 
 int wxNotebook::GetSelection() const
 }
 
 int wxNotebook::GetSelection() const


@@ -436,17 +436,17 @@ int wxNotebook::SetSelection( size_t page )
 
 bool wxNotebook::SetPageText( size_t page, const wxString &text )
 {
 
 bool wxNotebook::SetPageText( size_t page, const wxString &text )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );

 
     wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
 
     wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 

-    wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
+    wxCHECK_MSG( nb_page, false, wxT("SetPageText: invalid page index") );

 
     nb_page->m_text = text;
 
     gtk_label_set_text( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
 
 
     nb_page->m_text = text;
 
     gtk_label_set_text( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
 

-    return TRUE;
+    return true;

 }
 
 bool wxNotebook::SetPageImage( size_t page, int image )
 }
 
 bool wxNotebook::SetPageImage( size_t page, int image )


@@ -455,13 +455,13 @@ bool wxNotebook::SetPageImage( size_t page, int image )
 
     wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 
 
     wxGtkNotebookPage* nb_page = GetNotebookPage(page);
 

-    if (!nb_page) return FALSE;
+    if (!nb_page) return false;

 
     /* Optimization posibility: return immediately if image unchanged.
      * Not enabled because it may break existing (stupid) code that
      * manipulates the imagelist to cycle images */
 
 
     /* Optimization posibility: return immediately if image unchanged.
      * Not enabled because it may break existing (stupid) code that
      * manipulates the imagelist to cycle images */
 

-    /* if (image == nb_page->m_image) return TRUE; */
+    /* if (image == nb_page->m_image) return true; */

 
     /* For different cases:
        1) no image -> no image
 
     /* For different cases:
        1) no image -> no image


@@ -470,7 +470,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
        4) image -> image */
 
     if (image == -1 && nb_page->m_image == -1)
        4) image -> image */
 
     if (image == -1 && nb_page->m_image == -1)

-        return TRUE; /* Case 1): Nothing to do. */
+        return true; /* Case 1): Nothing to do. */

 
     GtkWidget *pixmapwid = (GtkWidget*) NULL;
 
 
     GtkWidget *pixmapwid = (GtkWidget*) NULL;
 


@@ -498,7 +498,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
             gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
             nb_page->m_image = -1;
 
             gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
             nb_page->m_image = -1;
 

-            return TRUE; /* Case 2) */
+            return true; /* Case 2) */

         }
     }
 
         }
     }
 


@@ -531,7 +531,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
 
     nb_page->m_image = image;
 
 
     nb_page->m_image = image;
 

-    return TRUE;
+    return true;

 }
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 }
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )


@@ -573,7 +573,7 @@ void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
 
 bool wxNotebook::DeleteAllPages()
 {
 
 bool wxNotebook::DeleteAllPages()
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );

 
     while (m_pagesData.GetCount() > 0)
         DeletePage( m_pagesData.GetCount()-1 );
 
     while (m_pagesData.GetCount() > 0)
         DeletePage( m_pagesData.GetCount()-1 );


@@ -625,12 +625,12 @@ bool wxNotebook::InsertPage( size_t position,
                              bool select,
                              int imageId )
 {
                              bool select,
                              int imageId )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );

 
 

-    wxCHECK_MSG( win->GetParent() == this, FALSE,
+    wxCHECK_MSG( win->GetParent() == this, false,

                wxT("Can't add a page whose parent is not the notebook!") );
 
                wxT("Can't add a page whose parent is not the notebook!") );
 

-    wxCHECK_MSG( position <= GetPageCount(), FALSE,
+    wxCHECK_MSG( position <= GetPageCount(), false,

                  _T("invalid page index in wxNotebookPage::InsertPage()") );
 
     // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback
                  _T("invalid page index in wxNotebookPage::InsertPage()") );
 
     // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback


@@ -646,7 +646,7 @@ bool wxNotebook::InsertPage( size_t position,
                                           this);
 
     if (m_themeEnabled)
                                           this);
 
     if (m_themeEnabled)

-        win->SetThemeEnabled(TRUE);
+        win->SetThemeEnabled(true);

 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 


@@ -718,7 +718,7 @@ bool wxNotebook::InsertPage( size_t position,
                       G_CALLBACK (gtk_notebook_page_change_callback), this);
 
     InvalidateBestSize();
                       G_CALLBACK (gtk_notebook_page_change_callback), this);
 
     InvalidateBestSize();

-    return TRUE;
+    return true;

 }
 
 // helper for HitTest(): check if the point lies inside the given widget which
 }
 
 // helper for HitTest(): check if the point lies inside the given widget which


@@ -812,12 +812,12 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
     // don't set the sizes of the pages - their correct size is not yet known
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 {
     // don't set the sizes of the pages - their correct size is not yet known

-    wxControl::SetConstraintSizes(FALSE);
+    wxControl::SetConstraintSizes(false);

 }
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {
 }
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {

-    return TRUE;
+    return true;

 }
 
 #endif
 }
 
 #endif

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 4319b39407ca9df9289644e1db129bcf30dfc220..8f8034a0c67083db27a310d1a24f74b5fbe30a6c 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -14,7 +14,10 @@
 
 #include "wx/scrolbar.h"
 
 
 #include "wx/scrolbar.h"
 

-#include "wx/utils.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/math.h"
 #include "wx/gtk/private.h"
 
 #include "wx/math.h"
 #include "wx/gtk/private.h"
 


@@ -344,4 +347,4 @@ wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
 }
 

-#endif
+#endif // wxUSE_SCROLLBAR

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index bcaacf7a7373bdba08b0a7ffeaab230075d49c37..6003bdf6fe4d68ca6a07d962c1a77b8a16981c8e 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/slider.cpp
+// Name:        src/gtk/slider.cpp

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


@@ -10,11 +10,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_SLIDER
+

 #include "wx/slider.h"
 
 #include "wx/slider.h"
 

-#if wxUSE_SLIDER
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 

-#include "wx/utils.h"

 #include "wx/math.h"
 #include "wx/gtk/private.h"
 
 #include "wx/math.h"
 #include "wx/gtk/private.h"
 


@@ -153,14 +156,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {

-    m_acceptsFocus = TRUE;
-    m_needParent = TRUE;
+    m_acceptsFocus = true;
+    m_needParent = true;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxSlider creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxSlider creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_oldPos = 0.0;
     }
 
     m_oldPos = 0.0;


@@ -219,7 +222,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
 
     PostCreation(size);
 

-    return TRUE;
+    return true;

 }
 
 int wxSlider::GetValue() const
 }
 
 int wxSlider::GetValue() const


@@ -351,4 +354,4 @@ wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
 }
 

-#endif
+#endif // wxUSE_SLIDER

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 52efbc9d4f7666950c1e14417bcd424a5eda24ff..7c0480bb993be05ee0b16ee726d2a6c824a66a23 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.cpp
+// Name:        src/gtk/spinbutt.cpp

 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:
 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:


@@ -11,11 +11,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_SPINBTN
+

 #include "wx/spinbutt.h"
 
 #include "wx/spinbutt.h"
 

-#if wxUSE_SPINBTN
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 

-#include "wx/utils.h"

 #include "wx/math.h"
 #include "wx/gtk/private.h"
 
 #include "wx/math.h"
 #include "wx/gtk/private.h"
 


@@ -105,7 +108,7 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
                           long style,
                           const wxString& name)
 {

-    m_needParent = TRUE;
+    m_needParent = true;

 
     wxSize new_size = size,
            sizeBest = DoGetBestSize();
 
     wxSize new_size = size,
            sizeBest = DoGetBestSize();


@@ -117,7 +120,7 @@ bool wxSpinButton::Create(wxWindow *parent,
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_oldPos = 0.0;
     }
 
     m_oldPos = 0.0;


@@ -136,7 +139,7 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     PostCreation(new_size);
 
 
     PostCreation(new_size);
 

-    return TRUE;
+    return true;

 }
 
 int wxSpinButton::GetMin() const
 }
 
 int wxSpinButton::GetMin() const

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index f9cc4a95186e654bab5a6057143783b8f3ada58f..4c85508b2df96dd701c34d1bb6ab7e48eaf9057d 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -11,11 +11,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/spinctrl.h"
-

 #if wxUSE_SPINCTRL
 
 #if wxUSE_SPINCTRL
 

-#include "wx/utils.h"
+#include "wx/spinctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 #include "wx/math.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 #include "wx/math.h"

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 3b3cd28c2dc9ae147d10aa93557db71b6569fa21..73b66c7677224d26495339124451e738f0a54ffc 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"

diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index bfbdec4d7a4130ddd0f1d367b6638b5eadd33c39..fdf7740181acbcf99a6b691d99812d4f634462aa 100644 (file)
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -16,6 +16,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -25,7 +26,6 @@
 #include <sys/wait.h>
 #include <sys/prctl.h>
 #include "wx/module.h"
 #include <sys/wait.h>
 #include <sys/prctl.h>
 #include "wx/module.h"

-#include "wx/utils.h"

 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"


@@ -261,7 +261,7 @@ bool wxThreadModule::OnInit()
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex->Lock();
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex->Lock();

-    return TRUE;
+    return true;

 }
 
 void wxThreadModule::OnExit()
 }
 
 void wxThreadModule::OnExit()

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 1ab4c6e7742b1ad0bfcc03c36d309de111a9d85a..eef601151db01c2eb75682c7fad6a28d41738e86 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -20,12 +20,12 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/dcclient.h"
 #include "wx/frame.h"
 #include "wx/layout.h"
 #endif
 
 #include "wx/dcclient.h"
 #include "wx/frame.h"
 #include "wx/layout.h"

-#include "wx/utils.h"

 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 9c6a6f99371338b0d0faaf2a4970e4d42f4fbfa9..f45088ac37dc326377d8c6ba277ec2f18a9120b8 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -21,10 +21,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"


@@ -85,7 +85,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-bool   g_mainThreadLocked = FALSE;
+bool   g_mainThreadLocked = false;

 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;


@@ -109,7 +109,7 @@ static wxMutex gs_idleTagsMutex;
 // not static because used by textctrl.cpp
 //
 // MT-FIXME
 // not static because used by textctrl.cpp
 //
 // MT-FIXME

-bool wxIsInsideYield = FALSE;
+bool wxIsInsideYield = false;

 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {


@@ -120,18 +120,18 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
         // can't call gtk_main_iteration() from other threads like this
     }
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
         // can't call gtk_main_iteration() from other threads like this

-        return TRUE;
+        return true;

     }
 #endif // wxUSE_THREADS
 
     }
 #endif // wxUSE_THREADS
 

-    wxIsInsideYield = TRUE;
+    wxIsInsideYield = true;

 
     // We need to remove idle callbacks or the loop will
     // never finish.
 
     // We need to remove idle callbacks or the loop will
     // never finish.


@@ -159,9 +159,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
     wxLog::Resume();
 #endif
 
     wxLog::Resume();
 #endif
 

-    wxIsInsideYield = FALSE;
+    wxIsInsideYield = false;

 
 

-    return TRUE;
+    return true;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -353,14 +353,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
     gdk_threads_enter();
 
     wxMutexGuiLeave();
     gdk_threads_enter();
 
     wxMutexGuiLeave();

-    g_mainThreadLocked = TRUE;
+    g_mainThreadLocked = true;

 
     // we rely on the fact that glib GPollFD struct is really just pollfd but
     // I wonder how wise is this in the long term (VZ)
     gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
 
     wxMutexGuiEnter();
 
     // we rely on the fact that glib GPollFD struct is really just pollfd but
     // I wonder how wise is this in the long term (VZ)
     gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
 
     wxMutexGuiEnter();

-    g_mainThreadLocked = FALSE;
+    g_mainThreadLocked = false;

 
     gdk_threads_leave();
 
 
     gdk_threads_leave();
 


@@ -389,7 +389,7 @@ void wxapp_install_idle_handler()
 
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
 
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 

-    g_isIdle = FALSE;
+    g_isIdle = false;

 
     if (g_pendingTag == 0)
         g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
 
     if (g_pendingTag == 0)
         g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );


@@ -429,7 +429,7 @@ END_EVENT_TABLE()
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 #endif // __WXDEBUG__
 
     m_idleTag = 0;
 #endif // __WXDEBUG__
 
     m_idleTag = 0;


@@ -457,7 +457,7 @@ wxApp::~wxApp()
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )

-        return FALSE;
+        return false;

 
     GdkVisual *visual = gdk_visual_get_system();
 
 
     GdkVisual *visual = gdk_visual_get_system();
 


@@ -541,7 +541,7 @@ bool wxApp::OnInitGui()
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 GdkVisual *wxApp::GetGdkVisual()
 }
 
 GdkVisual *wxApp::GetGdkVisual()


@@ -671,11 +671,11 @@ void wxApp::CleanUp()
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {

-    m_isInAssert = TRUE;
+    m_isInAssert = true;

 
     wxAppBase::OnAssert(file, line, cond, msg);
 
 
     wxAppBase::OnAssert(file, line, cond, msg);
 

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 }
 
 #endif // __WXDEBUG__
 }
 
 #endif // __WXDEBUG__


@@ -689,6 +689,6 @@ void wxApp::RemoveIdleTag()
     {
         gtk_idle_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;
     {
         gtk_idle_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;

-        g_isIdle = TRUE;
+        g_isIdle = true;

     }
 }
     }
 }

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 02f3374010cba02bf4604bbf84f29788db08e9d6..4a09a5006f6b48d082f63a30fb2f70bea4aca97e 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/dataobj.h"
 #endif
 
 #include "wx/dataobj.h"

-#include "wx/utils.h"

 
 #include <glib.h>
 #include <gdk/gdk.h>
 
 #include <glib.h>
 #include <gdk/gdk.h>


@@ -86,7 +86,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
                 wxLogTrace( TRACE_CLIPBOARD,
                             _T("got unsupported clipboard target") );
 
                 wxLogTrace( TRACE_CLIPBOARD,
                             _T("got unsupported clipboard target") );
 

-                clipboard->m_waiting = FALSE;
+                clipboard->m_waiting = false;

                 g_free(atom_name);
                 return;
             }
                 g_free(atom_name);
                 return;
             }


@@ -117,14 +117,14 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 
             if (format == clipboard->m_targetRequested)
             {
 
             if (format == clipboard->m_targetRequested)
             {

-                clipboard->m_waiting = FALSE;
-                clipboard->m_formatSupported = TRUE;
+                clipboard->m_waiting = false;
+                clipboard->m_formatSupported = true;

                 return;
             }
         }
     }
 
                 return;
             }
         }
     }
 

-    clipboard->m_waiting = FALSE;
+    clipboard->m_waiting = false;

 }
 }
 
 }
 }
 


@@ -141,7 +141,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
 {
     if (!wxTheClipboard)
     {
 {
     if (!wxTheClipboard)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -149,13 +149,13 @@ selection_received( GtkWidget *WXUNUSED(widget),
 
     if (!data_object)
     {
 
     if (!data_object)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
     if (selection_data->length <= 0)
     {
         return;
     }
 
     if (selection_data->length <= 0)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -164,7 +164,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
     // make sure we got the data in the correct format
     if (!data_object->IsSupportedFormat( format ) )
     {
     // make sure we got the data in the correct format
     if (!data_object->IsSupportedFormat( format ) )
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -174,15 +174,15 @@ selection_received( GtkWidget *WXUNUSED(widget),
     // if so, copy data to target object
     if (selection_data->type != GDK_SELECTION_TYPE_STRING)
     {
     // if so, copy data to target object
     if (selection_data->type != GDK_SELECTION_TYPE_STRING)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 #endif
 
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 
         return;
     }
 #endif
 
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 

-    wxTheClipboard->m_formatSupported = TRUE;
-    clipboard->m_waiting = FALSE;
+    wxTheClipboard->m_formatSupported = true;
+    clipboard->m_waiting = false;

 }
 }
 
 }
 }
 


@@ -198,16 +198,16 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 
     if (event->selection == GDK_SELECTION_PRIMARY)
     {
 
     if (event->selection == GDK_SELECTION_PRIMARY)
     {

-        wxTheClipboard->m_ownsPrimarySelection = FALSE;
+        wxTheClipboard->m_ownsPrimarySelection = false;

     }
     else
     if (event->selection == g_clipboardAtom)
     {
     }
     else
     if (event->selection == g_clipboardAtom)
     {

-        wxTheClipboard->m_ownsClipboard = FALSE;
+        wxTheClipboard->m_ownsClipboard = false;

     }
     else
     {
     }
     else
     {

-        wxTheClipboard->m_waiting = FALSE;
+        wxTheClipboard->m_waiting = false;

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -224,7 +224,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
         }
     }
 
         }
     }
 

-    wxTheClipboard->m_waiting = FALSE;
+    wxTheClipboard->m_waiting = false;

     return TRUE;
 }
 }
     return TRUE;
 }
 }


@@ -308,11 +308,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-    m_open = FALSE;
-    m_waiting = FALSE;
+    m_open = false;
+    m_waiting = false;

 
 

-    m_ownsClipboard = FALSE;
-    m_ownsPrimarySelection = FALSE;
+    m_ownsClipboard = false;
+    m_ownsPrimarySelection = false;

 
     m_data = (wxDataObject*) NULL;
     m_receivedData = (wxDataObject*) NULL;
 
     m_data = (wxDataObject*) NULL;
     m_receivedData = (wxDataObject*) NULL;


@@ -346,10 +346,10 @@ wxClipboard::wxClipboard()
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
     if (!g_timestampAtom) g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE);
 
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
     if (!g_timestampAtom) g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE);
 

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

     m_targetRequested = 0;
 
     m_targetRequested = 0;
 

-    m_usePrimary = FALSE;
+    m_usePrimary = false;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -372,7 +372,7 @@ void wxClipboard::Clear()
         //  it, clear_selection is called which will set m_data to zero
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
         //  it, clear_selection is called which will set m_data to zero
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {

-            m_waiting = TRUE;
+            m_waiting = true;

 
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
                                      (guint32) GDK_CURRENT_TIME );
 
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
                                      (guint32) GDK_CURRENT_TIME );


@@ -382,7 +382,7 @@ void wxClipboard::Clear()
 
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {
 
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {

-            m_waiting = TRUE;
+            m_waiting = true;

 
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
                                      (guint32) GDK_CURRENT_TIME );
 
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
                                      (guint32) GDK_CURRENT_TIME );


@@ -402,23 +402,23 @@ void wxClipboard::Clear()
     }
 
     m_targetRequested = 0;
     }
 
     m_targetRequested = 0;

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

 }
 
 bool wxClipboard::Open()
 {
 }
 
 bool wxClipboard::Open()
 {

-    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
+    wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );

 
 

-    m_open = TRUE;
+    m_open = true;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
 

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
     Clear();
 
 
     Clear();
 


@@ -427,9 +427,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
 

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
     // we can only store one wxDataObject
     Clear();
 
     // we can only store one wxDataObject
     Clear();


@@ -497,7 +497,7 @@ void wxClipboard::Close()
 {
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 
 {
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 

-    m_open = FALSE;
+    m_open = false;

 }
 
 bool wxClipboard::IsOpened() const
 }
 
 bool wxClipboard::IsOpened() const


@@ -508,7 +508,7 @@ bool wxClipboard::IsOpened() const
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     /* reentrance problems */
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     /* reentrance problems */

-    if (m_waiting) return FALSE;
+    if (m_waiting) return false;

 
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;
 
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;


@@ -517,19 +517,19 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
                 wxT("wxClipboard:IsSupported: requested format: %s"),
                 format.GetId().c_str() );
 
                 wxT("wxClipboard:IsSupported: requested format: %s"),
                 format.GetId().c_str() );
 

-    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+    wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
 

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

 
     /* perform query. this will set m_formatSupported to
 
     /* perform query. this will set m_formatSupported to

-       TRUE if m_targetRequested is supported.
+       true if m_targetRequested is supported.

        also, we have to wait for the "answer" from the
        clipboard owner which is an asynchronous process.
        also, we have to wait for the "answer" from the
        clipboard owner which is an asynchronous process.

-       therefore we set m_waiting = TRUE here and wait
+       therefore we set m_waiting = true here and wait

        until the callback "targets_selection_received"
        until the callback "targets_selection_received"

-       sets it to FALSE */
+       sets it to false */

 
 

-    m_waiting = TRUE;
+    m_waiting = true;

 
     gtk_selection_convert( m_targetsWidget,
                            m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
 
     gtk_selection_convert( m_targetsWidget,
                            m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY


@@ -544,7 +544,7 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
 
 bool wxClipboard::GetData( wxDataObject& data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
     /* get formats from wxDataObjects */
     wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
 
     /* get formats from wxDataObjects */
     wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];


@@ -563,19 +563,19 @@ bool wxClipboard::GetData( wxDataObject& data )
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 

-        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+        wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
 

-        m_formatSupported = FALSE;
+        m_formatSupported = false;

 
        /* perform query. this will set m_formatSupported to
 
        /* perform query. this will set m_formatSupported to

-          TRUE if m_targetRequested is supported.
+          true if m_targetRequested is supported.

           also, we have to wait for the "answer" from the
           clipboard owner which is an asynchronous process.
           also, we have to wait for the "answer" from the
           clipboard owner which is an asynchronous process.

-          therefore we set m_waiting = TRUE here and wait
+          therefore we set m_waiting = true here and wait

           until the callback "targets_selection_received"
           until the callback "targets_selection_received"

-          sets it to FALSE */
+          sets it to false */

 
 

-        m_waiting = TRUE;
+        m_waiting = true;

 
         gtk_selection_convert( m_targetsWidget,
                            m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
 
         gtk_selection_convert( m_targetsWidget,
                            m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY


@@ -593,21 +593,21 @@ bool wxClipboard::GetData( wxDataObject& data )
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 

-        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+        wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
         /* start query */
 
         /* start query */

-        m_formatSupported = FALSE;
+        m_formatSupported = false;

 
         /* ask for clipboard contents.  this will set
 
         /* ask for clipboard contents.  this will set

-           m_formatSupported to TRUE if m_targetRequested
+           m_formatSupported to true if m_targetRequested

            is supported.
            also, we have to wait for the "answer" from the
            clipboard owner which is an asynchronous process.
            is supported.
            also, we have to wait for the "answer" from the
            clipboard owner which is an asynchronous process.

-           therefore we set m_waiting = TRUE here and wait
+           therefore we set m_waiting = true here and wait

            until the callback "targets_selection_received"
            until the callback "targets_selection_received"

-           sets it to FALSE */
+           sets it to false */

 
 

-        m_waiting = TRUE;
+        m_waiting = true;

 
         wxLogTrace( TRACE_CLIPBOARD,
                     wxT("wxClipboard::GetData: format found, start convert") );
 
         wxLogTrace( TRACE_CLIPBOARD,
                     wxT("wxClipboard::GetData: format found, start convert") );


@@ -621,11 +621,11 @@ bool wxClipboard::GetData( wxDataObject& data )
         while (m_waiting) gtk_main_iteration();
 
         /* this is a true error as we checked for the presence of such data before */
         while (m_waiting) gtk_main_iteration();
 
         /* this is a true error as we checked for the presence of such data before */

-        wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") );
+        wxCHECK_MSG( m_formatSupported, false, wxT("error retrieving data from clipboard") );

 
         /* return success */
         delete[] array;
 
         /* return success */
         delete[] array;

-        return TRUE;
+        return true;

     }
 
     wxLogTrace( TRACE_CLIPBOARD,
     }
 
     wxLogTrace( TRACE_CLIPBOARD,


@@ -633,7 +633,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 
     /* return failure */
     delete[] array;
 
     /* return failure */
     delete[] array;

-    return FALSE;
+    return false;

 }
 
 #endif
 }
 
 #endif

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 6e9d9f33a881c182f882111ffb55cd631efeb9a5..2a9b130532c6947a844490f6b3397300b63b8916 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -14,10 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/utils.h"
-

 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 4da84ef7b09962d9c1f00d2a619f96a2374d4d9d..1d128192e15072de1eb0c2674baac771ef72451f 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -18,11 +18,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 
 #include "wx/gtk1/private.h"
 
 
 #include "wx/gtk1/private.h"
 

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index d912375443c9459faea22f749d7340961bf1f5ee..741824b3515197b9c4165835227cdd89a28d6e26 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/utils.h"

 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index e7988ebf5859c07a8dad3964a48b8a00aeaeb91b..ab51f39ea58a24eeeb5c8935561d260894dc369c 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/arrstr.h"
 #endif
 
 #include "wx/arrstr.h"

-#include "wx/utils.h"

 #include "wx/checklst.h"
 #include "wx/settings.h"
 #include "wx/gtk1/private.h"
 #include "wx/checklst.h"
 #include "wx/settings.h"
 #include "wx/gtk1/private.h"

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index d5b088777623f501c60e840c7e5b498619dae9e3..2d8998bbe16112f365242b0413b603ded5e860d0 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/panel.h"
 #endif
 
 #include "wx/panel.h"

-#include "wx/utils.h"

 #include "wx/imaglist.h"
 #include "wx/bitmap.h"
 #include "wx/fontutil.h"
 #include "wx/imaglist.h"
 #include "wx/bitmap.h"
 #include "wx/fontutil.h"


@@ -100,7 +100,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
     wxCHECK_RET( !notebook->m_inSwitchPage,
                  _T("gtk_notebook_page_change_callback reentered") );
 
     wxCHECK_RET( !notebook->m_inSwitchPage,
                  _T("gtk_notebook_page_change_callback reentered") );
 

-    notebook->m_inSwitchPage = TRUE;
+    notebook->m_inSwitchPage = true;

     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 


@@ -292,11 +292,11 @@ END_EVENT_TABLE()
 void wxNotebook::Init()
 {
     m_padding = 0;
 void wxNotebook::Init()
 {
     m_padding = 0;

-    m_inSwitchPage = FALSE;
+    m_inSwitchPage = false;

 
     m_imageList = (wxImageList *) NULL;
     m_selection = -1;
 
     m_imageList = (wxImageList *) NULL;
     m_selection = -1;

-    m_themeEnabled = TRUE;
+    m_themeEnabled = true;

 }
 
 wxNotebook::wxNotebook()
 }
 
 wxNotebook::wxNotebook()


@@ -321,15 +321,15 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,
                         long style, const wxString& name )
 {
                         const wxPoint& pos, const wxSize& size,
                         long style, const wxString& name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

     m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxNoteBook creation failed") );
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxNoteBook creation failed") );

-        return FALSE;
+        return false;

     }
 
 
     }
 
 


@@ -357,7 +357,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                             GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                             GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
 

-    return TRUE;
+    return true;

 }
 
 int wxNotebook::GetSelection() const
 }
 
 int wxNotebook::GetSelection() const


@@ -446,7 +446,7 @@ bool wxNotebook::SetPageText( size_t page, const wxString &text )
 
     gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
 
 
     gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
 

-    return TRUE;
+    return true;

 }
 
 bool wxNotebook::SetPageImage( size_t page, int image )
 }
 
 bool wxNotebook::SetPageImage( size_t page, int image )


@@ -461,7 +461,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
      * Not enabled because it may break existing (stupid) code that
      * manipulates the imagelist to cycle images */
 
      * Not enabled because it may break existing (stupid) code that
      * manipulates the imagelist to cycle images */
 

-    /* if (image == nb_page->m_image) return TRUE; */
+    /* if (image == nb_page->m_image) return true; */

 
     /* For different cases:
        1) no image -> no image
 
     /* For different cases:
        1) no image -> no image


@@ -470,7 +470,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
        4) image -> image */
 
     if (image == -1 && nb_page->m_image == -1)
        4) image -> image */
 
     if (image == -1 && nb_page->m_image == -1)

-        return TRUE; /* Case 1): Nothing to do. */
+        return true; /* Case 1): Nothing to do. */

 
     GtkWidget *pixmapwid = (GtkWidget*) NULL;
 
 
     GtkWidget *pixmapwid = (GtkWidget*) NULL;
 


@@ -498,7 +498,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
             gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
             nb_page->m_image = -1;
 
             gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
             nb_page->m_image = -1;
 

-            return TRUE; /* Case 2) */
+            return true; /* Case 2) */

         }
     }
 
         }
     }
 


@@ -531,7 +531,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
 
     nb_page->m_image = image;
 
 
     nb_page->m_image = image;
 

-    return TRUE;
+    return true;

 }
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 }
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )


@@ -644,7 +644,7 @@ bool wxNotebook::InsertPage( size_t position,
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     if (m_themeEnabled)
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     if (m_themeEnabled)

-        win->SetThemeEnabled(TRUE);
+        win->SetThemeEnabled(true);

 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
 
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 


@@ -716,7 +716,7 @@ bool wxNotebook::InsertPage( size_t position,
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
     InvalidateBestSize();
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
 
     InvalidateBestSize();

-    return TRUE;
+    return true;

 }
 
 // helper for HitTest(): check if the point lies inside the given widget which
 }
 
 // helper for HitTest(): check if the point lies inside the given widget which


@@ -819,7 +819,7 @@ void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {
 
 bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 {

-    return TRUE;
+    return true;

 }
 
 #endif
 }
 
 #endif

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index bc2977ba69f2f99be70f2c7b414c4adece742773..4fcc4eb928fb6c4bddf0ff2480aa4997fedd30e8 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -14,7 +14,10 @@
 
 #include "wx/scrolbar.h"
 
 
 #include "wx/scrolbar.h"
 

-#include "wx/utils.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/math.h"
 #include "wx/gtk1/private.h"
 
 #include "wx/math.h"
 #include "wx/gtk1/private.h"
 


@@ -362,4 +365,4 @@ wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
 }
 

-#endif
+#endif // wxUSE_SCROLLBAR

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 594d0ae265b10c0e553355e4f13d6374c156faf3..6f37e772225bb8e75b9367fb4c3fb8f80a8fd057 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/slider.cpp
+// Name:        src/gtk1/slider.cpp

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


@@ -10,11 +10,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_SLIDER
+

 #include "wx/slider.h"
 
 #include "wx/slider.h"
 

-#if wxUSE_SLIDER
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 

-#include "wx/utils.h"

 #include "wx/math.h"
 #include "wx/gtk1/private.h"
 
 #include "wx/math.h"
 #include "wx/gtk1/private.h"
 


@@ -136,14 +139,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {

-    m_acceptsFocus = TRUE;
-    m_needParent = TRUE;
+    m_acceptsFocus = true;
+    m_needParent = true;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxSlider creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxSlider creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_oldPos = 0.0;
     }
 
     m_oldPos = 0.0;


@@ -201,7 +204,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
 
     PostCreation(size);
 

-    return TRUE;
+    return true;

 }
 
 int wxSlider::GetValue() const
 }
 
 int wxSlider::GetValue() const


@@ -339,4 +342,4 @@ wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
 }
 

-#endif
+#endif // wxUSE_SLIDER

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 0af1e68f5dd87694cf76484cacceef907d3f6533..607e7bc682e0a6b2d7fa29df431bb40386a222e3 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.cpp
+// Name:        src/gtk1/spinbutt.cpp

 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:
 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:


@@ -11,11 +11,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_SPINBTN
+

 #include "wx/spinbutt.h"
 
 #include "wx/spinbutt.h"
 

-#if wxUSE_SPINBTN
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 

-#include "wx/utils.h"

 #include "wx/math.h"
 #include "wx/gtk1/private.h"
 
 #include "wx/math.h"
 #include "wx/gtk1/private.h"
 


@@ -114,7 +117,7 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
                           long style,
                           const wxString& name)
 {

-    m_needParent = TRUE;
+    m_needParent = true;

 
     wxSize new_size = size,
            sizeBest = DoGetBestSize();
 
     wxSize new_size = size,
            sizeBest = DoGetBestSize();


@@ -126,7 +129,7 @@ bool wxSpinButton::Create(wxWindow *parent,
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_oldPos = 0.0;
     }
 
     m_oldPos = 0.0;


@@ -147,7 +150,7 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     PostCreation(new_size);
 
 
     PostCreation(new_size);
 

-    return TRUE;
+    return true;

 }
 
 int wxSpinButton::GetMin() const
 }
 
 int wxSpinButton::GetMin() const


@@ -236,4 +239,4 @@ wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_button_new);
 }
 
     return GetDefaultAttributesFromGTKWidget(gtk_button_new);
 }
 

-#endif
+#endif // wxUSE_SPINBTN

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index e0c8046cfa45629eb4c7bc026cf261264fe8d8b5..12718d6159f9ee0cdf138e7a6bd259571a15c1a3 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -11,11 +11,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/spinctrl.h"
-

 #if wxUSE_SPINCTRL
 
 #if wxUSE_SPINCTRL
 

-#include "wx/utils.h"
+#include "wx/spinctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 #include "wx/math.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 #include "wx/math.h"

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 36ac27ffd4695f56233bb5a3bbd307cedaa4dc42..59dc8c06906de3118fbc813bff36c4b7e0ef07dc 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index 914ad1ef3739cceea8dafb6425f590818c0054f9..b4e1b4ab82a630989095662da2af127b8d08c6d4 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -16,6 +16,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -25,7 +26,6 @@
 #include <sys/wait.h>
 #include <sys/prctl.h>
 #include "wx/module.h"
 #include <sys/wait.h>
 #include <sys/prctl.h>
 #include "wx/module.h"

-#include "wx/utils.h"

 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"


@@ -261,7 +261,7 @@ bool wxThreadModule::OnInit()
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex->Lock();
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex->Lock();

-    return TRUE;
+    return true;

 }
 
 void wxThreadModule::OnExit()
 }
 
 void wxThreadModule::OnExit()


@@ -270,4 +270,3 @@ void wxThreadModule::OnExit()
     wxThreadGuiExit();
     delete wxMainMutex;
 }
     wxThreadGuiExit();
     delete wxMainMutex;
 }

-

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 738fdc80866008ae0fb80fb6d3041f1bfb5f6eb2..23578f743b40601c8478e511f212bc677696b0d9 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -20,12 +20,12 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/dcclient.h"
 #include "wx/frame.h"
 #include "wx/layout.h"
 #endif
 
 #include "wx/dcclient.h"
 #include "wx/frame.h"
 #include "wx/layout.h"

-#include "wx/utils.h"

 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"


@@ -1352,7 +1352,7 @@ template<typename T> void InitMouseEvent(wxWindowGTK *win,
 static void AdjustEventButtonState(wxMouseEvent& event)
 {
     // GDK reports the old state of the button for a button press event, but
 static void AdjustEventButtonState(wxMouseEvent& event)
 {
     // GDK reports the old state of the button for a button press event, but

-    // for compatibility with MSW and common sense we want m_leftDown be TRUE
+    // for compatibility with MSW and common sense we want m_leftDown be true

     // for a LEFT_DOWN event, not FALSE, so we will invert
     // left/right/middleDown for the corresponding click events
 
     // for a LEFT_DOWN event, not FALSE, so we will invert
     // left/right/middleDown for the corresponding click events
 

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 8338c416182213a5704b643475e41d0cceacee70..4a80a2817de3510b76872dbe1334c59fef6728b1 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -16,12 +16,12 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/button.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/button.h"

-#include "wx/utils.h"

 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/brush.h"

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index ae77b03b209ff5de6c2d287b2af20f4e9b73ae20..4f56a3a6146f7bd4eef5b35c0836f35a242bc356 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -11,9 +11,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

 #include "wx/brush.h"
 
 #include "wx/brush.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)


@@ -230,4 +233,3 @@ wxMacBrushKind wxBrush::MacGetBrushKind() const
 {
     return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
 }
 {
     return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
 }

-

diff --git a/src/mac/carbon/cfsocket.cpp b/src/mac/carbon/cfsocket.cpp
index 45c8b20ecd5a76aa982be435d3d032036de59d55..cfeb84963a6efa0e1068dca1b3a110bbb4071edd 100644 (file)
--- a/src/mac/carbon/cfsocket.cpp
+++ b/src/mac/carbon/cfsocket.cpp
@@ -26,11 +26,11 @@
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/apptrait.h"
 #include "wx/timer.h"
 #endif
 
 #include "wx/apptrait.h"
 #include "wx/timer.h"

-#include "wx/utils.h"

 #include "wx/module.h"
 
 #include "wx/sckaddr.h"
 #include "wx/module.h"
 
 #include "wx/sckaddr.h"

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 1e49197c030d037abdf0a04d523b2b92817e11f2..18e8d90a5978c63b424578f632fa9e29631449cb 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -2,7 +2,7 @@
 // Name:        src/mac/carbon/clipbrd.cpp
 // Purpose:     Clipboard functionality
 // Author:      Stefan Csomor;
 // Name:        src/mac/carbon/clipbrd.cpp
 // Purpose:     Clipboard functionality
 // Author:      Stefan Csomor;

-//                   Generalized clipboard implementation by Matthew Flatt
+//              Generalized clipboard implementation by Matthew Flatt

 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$


@@ -20,11 +20,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/frame.h"
 #include "wx/bitmap.h"

-#include "wx/utils.h"

 #include "wx/metafile.h"
 
 #ifndef __DARWIN__
 #include "wx/metafile.h"
 
 #ifndef __DARWIN__

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 5eeadbf263bbaff01b9924be0a0f287e02c4c2a0..69f568b9a501d1606c1e3b7379c1ae80dc847963 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/utils.h"

 #include "wx/frame.h"
 #include "wx/settings.h"
 
 #include "wx/frame.h"
 #include "wx/settings.h"
 

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index a17768a61b251fa591e50888e64a135f9a1f1cbf..60ace1175cee30fff116843a5e2a93660e82e7e4 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -1,31 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.cpp
+// Name:        src/mac/carbon/dirdlg.cpp

 // Purpose:     wxDirDialog
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxDirDialog
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_DIRDLG
 
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_DIRDLG
 

-#include "wx/utils.h"
-#include "wx/dialog.h"

 #include "wx/dirdlg.h"
 
 #include "wx/dirdlg.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif // WX_PRECOMP
+
+#include "wx/dialog.h"
+

 #include "wx/cmndata.h"
 #include "wx/filename.h"
 
 #include "wx/mac/private.h"
 
 #ifdef __DARWIN__
 #include "wx/cmndata.h"
 #include "wx/filename.h"
 
 #include "wx/mac/private.h"
 
 #ifdef __DARWIN__

-  #include <Carbon/Carbon.h>
+    #include <Carbon/Carbon.h>

 #else
 #else

-  #include <Navigation.h>
+    #include <Navigation.h>

 #endif
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 #endif
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)


@@ -45,7 +49,7 @@ static pascal void NavEventProc(
     wxDirDialog * data = ( wxDirDialog *) ioUserData ;
     if ( inSelector == kNavCBStart )
     {
     wxDirDialog * data = ( wxDirDialog *) ioUserData ;
     if ( inSelector == kNavCBStart )
     {

-        if (data && !data->GetPath().IsEmpty() )
+        if (data && !data->GetPath().empty() )

         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151
         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151


@@ -80,15 +84,15 @@ int wxDirDialog::ShowModal()
     NavReplyRecord reply ;
     bool disposeReply = false ;
     OSStatus err = noErr;
     NavReplyRecord reply ;
     bool disposeReply = false ;
     OSStatus err = noErr;

-    
+

     err = NavGetDefaultDialogCreationOptions(&options);
     err = NavGetDefaultDialogCreationOptions(&options);

-    if (err == noErr) 
+    if (err == noErr)

     {
         wxMacCFStringHolder message(m_message, m_font.GetEncoding());
         options.message = message;
         err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);
     {
         wxMacCFStringHolder message(m_message, m_font.GetEncoding());
         options.message = message;
         err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);

-        if (err == noErr) 
-        {        
+        if (err == noErr)
+        {

             err = NavDialogRun(dialog);
             if ( err == noErr )
             {
             err = NavDialogRun(dialog);
             if ( err == noErr )
             {


@@ -97,16 +101,16 @@ int wxDirDialog::ShowModal()
             }
         }
     }
             }
         }
     }

-    
-    if ( err == noErr ) 
-    { 
+
+    if ( err == noErr )
+    {

         if ( reply.validRecord )
         {
             FSRef folderInfo;
             AEDesc specDesc ;
         if ( reply.validRecord )
         {
             FSRef folderInfo;
             AEDesc specDesc ;

-            
+

             OSErr err = ::AECoerceDesc( &reply.selection , typeFSRef, &specDesc);
             OSErr err = ::AECoerceDesc( &reply.selection , typeFSRef, &specDesc);

-            if ( err != noErr ) 
+            if ( err != noErr )

             {
                 m_path = wxEmptyString ;
             }
             {
                 m_path = wxEmptyString ;
             }


@@ -114,10 +118,10 @@ int wxDirDialog::ShowModal()
             {
                 folderInfo = **(FSRef**) specDesc.dataHandle;
                 m_path = wxMacFSRefToPath( &folderInfo ) ;
             {
                 folderInfo = **(FSRef**) specDesc.dataHandle;
                 m_path = wxMacFSRefToPath( &folderInfo ) ;

-                if (specDesc.dataHandle != nil) 
+                if (specDesc.dataHandle != nil)

                 {
                     ::AEDisposeDesc(&specDesc);
                 {
                     ::AEDisposeDesc(&specDesc);

-                }            
+                }

             }
         }
         else
             }
         }
         else


@@ -125,14 +129,14 @@ int wxDirDialog::ShowModal()
             err = paramErr ; // could be any error, only used for giving back wxID_CANCEL
         }
     }
             err = paramErr ; // could be any error, only used for giving back wxID_CANCEL
         }
     }

-    
+

     if ( disposeReply )
         ::NavDisposeReply(&reply);
     if ( disposeReply )
         ::NavDisposeReply(&reply);

-    
+

     // apparently cancelling shouldn't change m_path
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;
     // apparently cancelling shouldn't change m_path
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;

-    
+

     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }
 

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 5b668fec72d8f1d7354804a122523ca5c22a0209..dcc70f4bdbe7e43df6572303b1562912b2861bb6 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/dialog.h"
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 #include "wx/dialog.h"
 #include "wx/tokenzr.h"
 #include "wx/filename.h"


@@ -74,7 +74,7 @@ static pascal void NavEventProc(
     }
     else if ( inSelector == kNavCBStart )
     {
     }
     else if ( inSelector == kNavCBStart )
     {

-        if (data && !(data->defaultLocation).IsEmpty())
+        if (data && !(data->defaultLocation).empty())

         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151
         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 1d4d28e4d68e0307bd2274c4acdbba91647a4e6e..666b85b5f7e1e9487639989c7d4fd20daaace8f4 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -15,11 +15,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"


@@ -202,7 +202,7 @@ wxFontRefData::~wxFontRefData()
 void wxFontRefData::MacFindFont()
 {
     OSStatus status ;
 void wxFontRefData::MacFindFont()
 {
     OSStatus status ;

-    
+

     Str255 qdFontName ;
     if ( m_macThemeFontID != kThemeCurrentPortFont )
     {
     Str255 qdFontName ;
     if ( m_macThemeFontID != kThemeCurrentPortFont )
     {


@@ -219,7 +219,7 @@ void wxFontRefData::MacFindFont()
         if ( m_macFontStyle & underline )
             m_underlined = true ;
         m_pointSize = m_macFontSize ;
         if ( m_macFontStyle & underline )
             m_underlined = true ;
         m_pointSize = m_macFontSize ;

-        
+

         m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
     }
     else
         m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
     }
     else


@@ -291,7 +291,7 @@ void wxFontRefData::MacFindFont()
     wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") );
 
     m_macATSUAdditionalQDStyles = m_macFontStyle & (~intrinsicStyle );
     wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") );
 
     m_macATSUAdditionalQDStyles = m_macFontStyle & (~intrinsicStyle );

-    
+

     if ( m_macATSUStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
     if ( m_macATSUStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 91a2c995a68c23b662c6d4ffbb247f516846f901..50112e6d37610e994f33cfe3af0fa7c01cd9c459 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -19,14 +19,13 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 
 #endif
 
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 

-#include "wx/utils.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index c4e9815e8ae6c9e5c229ff80e5836051a310b9d5..94f29966bcfeb98a079aacb8e603512c25b620f9 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -23,12 +23,12 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/menuitem.h"
 #include "wx/window.h"
 #include "wx/log.h"
 #endif
 
 #include "wx/menuitem.h"
 #include "wx/window.h"
 #include "wx/log.h"

-#include "wx/utils.h"

 #include "wx/frame.h"
 
 #include "wx/mac/uma.h"
 #include "wx/frame.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index 2fb238858ad1a9e74d835a2640dbc2c24b9ecb86..7f0acfebe5349bf668a4bd69535537e51519fc6c 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -11,9 +11,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

 #include "wx/pen.h"
 
 #include "wx/pen.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 6f19bfb7dc8651e7715b7684e4094aebb4fb9074..450b800996b8c6134332030117f4009b9471bf24 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        settings.cpp
+// Name:        src/mac/carbon/settings.cpp

 // Purpose:     wxSettings
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxSettings
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,8 +12,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/gdicmn.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index b6bb94d019053038933d49e4bf3c705018e969dd..78c2ebeaaccfab0337e1245ddc58d31919528c6d 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -17,13 +17,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/utils.h"

 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 0a622adfb45a7a4d245b825b8c271a3e733cc98f..6645f1e8818d7b4af30590a17e078639c4864890 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -18,6 +18,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -42,7 +43,6 @@
 #include "wx/toplevel.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/toplevel.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"

 #include "wx/sysopt.h"
 #include "wx/menu.h"
 
 #include "wx/sysopt.h"
 #include "wx/menu.h"
 

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 674afb8bd40e161797a98c9be46fc045f33cf30e..6093f5494ea068870812b44dd11a7ce34e091ccd 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -16,12 +16,12 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/utils.h"

 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index bbce9ec7698471df75c539788ce0a756ad190109..5f4fb9e612696ebe0539053acddb24f0ed73dfab 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -20,12 +20,12 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/button.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/button.h"

-#include "wx/utils.h"

 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/brush.h"

diff --git a/src/mac/classic/brush.cpp b/src/mac/classic/brush.cpp
index bf5c4c368f334e695ca5c02768eb2e10d095324c..a2e9e6d7984d4994259b005d0ece22fe3d270232 100644 (file)
--- a/src/mac/classic/brush.cpp
+++ b/src/mac/classic/brush.cpp
@@ -11,9 +11,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

 #include "wx/brush.h"
 
 #include "wx/brush.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)

diff --git a/src/mac/classic/clipbrd.cpp b/src/mac/classic/clipbrd.cpp
index eee39f0f07fe717d1ff067c5389ab1e90267a1b7..294e8d26312c910468f249b23e6019cc8de0c353 100644 (file)
--- a/src/mac/classic/clipbrd.cpp
+++ b/src/mac/classic/clipbrd.cpp
@@ -17,11 +17,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/frame.h"
 #include "wx/bitmap.h"

-#include "wx/utils.h"

 #include "wx/metafile.h"
 
 #ifndef __DARWIN__
 #include "wx/metafile.h"
 
 #ifndef __DARWIN__

diff --git a/src/mac/classic/dialog.cpp b/src/mac/classic/dialog.cpp
index 7e5599e8ce57b671b4f474679e99bae41a14a81b..75a92a14f06decb90084eb5350a486633762a041 100644 (file)
--- a/src/mac/classic/dialog.cpp
+++ b/src/mac/classic/dialog.cpp
@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/utils.h"

 #include "wx/frame.h"
 #include "wx/settings.h"
 
 #include "wx/frame.h"
 #include "wx/settings.h"
 

diff --git a/src/mac/classic/dirdlg.cpp b/src/mac/classic/dirdlg.cpp
index d58aa0d5f46bc71f59d06d8766034bffe368fe1f..b9ee11f0b33c33c98690335a704c8809dafb09b1 100644 (file)
--- a/src/mac/classic/dirdlg.cpp
+++ b/src/mac/classic/dirdlg.cpp
@@ -15,10 +15,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/utils.h"
-#include "wx/dialog.h"

 #include "wx/dirdlg.h"
 
 #include "wx/dirdlg.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif // WX_PRECOMP
+
+#include "wx/dialog.h"
+

 #include "wx/cmndata.h"
 
 #include "wx/mac/private.h"
 #include "wx/cmndata.h"
 
 #include "wx/mac/private.h"

diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp
index 52ecefe806e852705da695a0d1dc8deec776e3d0..f80b88378e030b7e07133395478d2d1fe50e5b88 100644 (file)
--- a/src/mac/classic/filedlg.cpp
+++ b/src/mac/classic/filedlg.cpp
@@ -20,9 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/dialog.h"
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 #include "wx/dialog.h"
 #include "wx/tokenzr.h"
 #include "wx/filename.h"


@@ -98,7 +98,7 @@ NavEventProc(
     else if ( inSelector == kNavCBStart )
     {
 #if TARGET_CARBON
     else if ( inSelector == kNavCBStart )
     {
 #if TARGET_CARBON

-        if (data && !(data->defaultLocation).IsEmpty())
+        if (data && !(data->defaultLocation).empty())

         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151
         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151

diff --git a/src/mac/classic/font.cpp b/src/mac/classic/font.cpp
index 42445ce21a4629516bb43fc46daeed73ecb3adb8..09feb155c6fb581a4f1081e8bbe1ae67bc292c71 100644 (file)
--- a/src/mac/classic/font.cpp
+++ b/src/mac/classic/font.cpp
@@ -19,11 +19,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 
 #include "wx/fontutil.h"
 
 
 #include "wx/fontutil.h"
 

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index a34258969ced413746a0322fdded8ef256c2befd..303848e70caa620fd5fc4bc1206ebc81b727223a 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/src/mac/classic/listbox.cpp
@@ -19,14 +19,13 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 
 #endif
 
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 

-#include "wx/utils.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)

diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index 01345794d211527ed4bae72dbf89787405b7304f..66a7365a55485b36ab93eedddd7a4ce78140d3f9 100644 (file)
--- a/src/mac/classic/menu.cpp
+++ b/src/mac/classic/menu.cpp
@@ -23,11 +23,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/menuitem.h"
 #include "wx/window.h"
 #endif
 
 #include "wx/menuitem.h"
 #include "wx/window.h"

-#include "wx/utils.h"

 #include "wx/frame.h"
 
 #include "wx/mac/uma.h"
 #include "wx/frame.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/classic/pen.cpp b/src/mac/classic/pen.cpp
index 0a980d0c4dc50e9c5864397275d8fabb7eca4ded..cd3184992cc788b31acc9a5e00e2bd9bf3995636 100644 (file)
--- a/src/mac/classic/pen.cpp
+++ b/src/mac/classic/pen.cpp
@@ -11,9 +11,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

 #include "wx/pen.h"
 
 #include "wx/pen.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()

diff --git a/src/mac/classic/settings.cpp b/src/mac/classic/settings.cpp
index f9c75a0d0472a17da20e0865ccd23cc0348aa6d9..fda51b49280fb873c37000859a75d736ad6c9bfd 100644 (file)
--- a/src/mac/classic/settings.cpp
+++ b/src/mac/classic/settings.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        settings.cpp
+// Name:        src/mac/classic/settings.cpp

 // Purpose:     wxSettings
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxSettings
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,9 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/wxprec.h"
+

 #include "wx/settings.h"
 #include "wx/settings.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/gdicmn.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -27,7 +33,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
     int major,minor;
     wxGetOsVersion( &major, &minor );
 {
     int major,minor;
     wxGetOsVersion( &major, &minor );

-    
+

     switch( index )
     {
         case wxSYS_COLOUR_SCROLLBAR :
     switch( index )
     {
         case wxSYS_COLOUR_SCROLLBAR :


@@ -78,7 +84,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_GRAYTEXT:
             return wxColor( 0xCC , 0xCC , 0xCC ) ;
             break ;
         case wxSYS_COLOUR_GRAYTEXT:
             return wxColor( 0xCC , 0xCC , 0xCC ) ;
             break ;

-    
+

         case wxSYS_COLOUR_3DDKSHADOW:
             return wxColor( 0x44 , 0x44 , 0x44 ) ;
             break ;
         case wxSYS_COLOUR_3DDKSHADOW:
             return wxColor( 0x44 , 0x44 , 0x44 ) ;
             break ;


@@ -96,7 +102,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             }
             break ;
         case wxSYS_COLOUR_INFOBK :
             }
             break ;
         case wxSYS_COLOUR_INFOBK :

-        case wxSYS_COLOUR_APPWORKSPACE: 
+        case wxSYS_COLOUR_APPWORKSPACE:

             return *wxWHITE ;
             break ;
 
             return *wxWHITE ;
             break ;
 


@@ -106,7 +112,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_MENUHILIGHT:
             // TODO
             return *wxBLACK;
         case wxSYS_COLOUR_MENUHILIGHT:
             // TODO
             return *wxBLACK;

-         
+

         case wxSYS_COLOUR_MAX:
             wxFAIL_MSG( _T("unknown system colour index") );
             break ;
         case wxSYS_COLOUR_MAX:
             wxFAIL_MSG( _T("unknown system colour index") );
             break ;


@@ -138,7 +144,6 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
                 return *wxNORMAL_FONT ;
                     } ;
             break ;
                 return *wxNORMAL_FONT ;
                     } ;
             break ;

-                

     }
     return *wxNORMAL_FONT;
 }
     }
     return *wxNORMAL_FONT;
 }


@@ -157,7 +162,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         case wxSYS_MOUSE_BUTTONS:
             // we emulate a two button mouse (ctrl + click = right button )
             return 2;
         case wxSYS_MOUSE_BUTTONS:
             // we emulate a two button mouse (ctrl + click = right button )
             return 2;

-            
+

         // TODO case wxSYS_BORDER_X:
         // TODO case wxSYS_BORDER_Y:
         // TODO case wxSYS_CURSOR_X:
         // TODO case wxSYS_BORDER_X:
         // TODO case wxSYS_BORDER_Y:
         // TODO case wxSYS_CURSOR_X:


@@ -168,33 +173,33 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_DRAG_Y:
         // TODO case wxSYS_EDGE_X:
         // TODO case wxSYS_EDGE_Y:
         // TODO case wxSYS_DRAG_Y:
         // TODO case wxSYS_EDGE_X:
         // TODO case wxSYS_EDGE_Y:

-            
+

         case wxSYS_HSCROLL_ARROW_X:
             return 16;
         case wxSYS_HSCROLL_ARROW_Y:
             return 16;
         case wxSYS_HTHUMB_X:
             return 16;
         case wxSYS_HSCROLL_ARROW_X:
             return 16;
         case wxSYS_HSCROLL_ARROW_Y:
             return 16;
         case wxSYS_HTHUMB_X:
             return 16;

-            
+

         // TODO case wxSYS_ICON_X:
         // TODO case wxSYS_ICON_Y:
         // TODO case wxSYS_ICONSPACING_X:
         // TODO case wxSYS_ICONSPACING_Y:
         // TODO case wxSYS_WINDOWMIN_X:
         // TODO case wxSYS_WINDOWMIN_Y:
         // TODO case wxSYS_ICON_X:
         // TODO case wxSYS_ICON_Y:
         // TODO case wxSYS_ICONSPACING_X:
         // TODO case wxSYS_ICONSPACING_Y:
         // TODO case wxSYS_WINDOWMIN_X:
         // TODO case wxSYS_WINDOWMIN_Y:

-            
+

         case wxSYS_SCREEN_X:
             wxDisplaySize(&value, NULL);
             return value;
         case wxSYS_SCREEN_Y:
             wxDisplaySize(NULL, &value);
             return value;
         case wxSYS_SCREEN_X:
             wxDisplaySize(&value, NULL);
             return value;
         case wxSYS_SCREEN_Y:
             wxDisplaySize(NULL, &value);
             return value;

-            
+

         // TODO case wxSYS_FRAMESIZE_X:
         // TODO case wxSYS_FRAMESIZE_Y:
         // TODO case wxSYS_SMALLICON_X:
         // TODO case wxSYS_SMALLICON_Y:
         // TODO case wxSYS_FRAMESIZE_X:
         // TODO case wxSYS_FRAMESIZE_Y:
         // TODO case wxSYS_SMALLICON_X:
         // TODO case wxSYS_SMALLICON_Y:

-            
+

         case wxSYS_HSCROLL_Y:
             return 16;
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:
             return 16;
         case wxSYS_VSCROLL_X:


@@ -205,19 +210,19 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
             return 16;
         case wxSYS_VTHUMB_Y:
             return 16;
             return 16;
         case wxSYS_VTHUMB_Y:
             return 16;

-            
+

         // TODO case wxSYS_CAPTION_Y:
         // TODO case wxSYS_MENU_Y:
         // TODO case wxSYS_NETWORK_PRESENT:
         // TODO case wxSYS_CAPTION_Y:
         // TODO case wxSYS_MENU_Y:
         // TODO case wxSYS_NETWORK_PRESENT:

-            
+

         case wxSYS_PENWINDOWS_PRESENT:
             return 0;
         case wxSYS_PENWINDOWS_PRESENT:
             return 0;

-            
+

         // TODO case wxSYS_SHOW_SOUNDS:
         // TODO case wxSYS_SHOW_SOUNDS:

-            
+

         case wxSYS_SWAP_BUTTONS:
             return 0;
         case wxSYS_SWAP_BUTTONS:
             return 0;

-            
+

         default:
             return -1;  // unsupported metric
     }
         default:
             return -1;  // unsupported metric
     }


@@ -228,11 +233,11 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {
 {
     switch (index)
     {

-        case wxSYS_CAN_ICONIZE_FRAME: 
+        case wxSYS_CAN_ICONIZE_FRAME:

         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE;
-            
+            return true;
+

         default:
         default:

-            return FALSE;
+            return false;

     }
 }
     }
 }

diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp
index dfcfab0a42007cf3db48bd831c95c71ada890c4d..d748041bec3da0431c785868e3dca5a229d178ce 100644 (file)
--- a/src/mac/classic/stattext.cpp
+++ b/src/mac/classic/stattext.cpp
@@ -15,13 +15,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/utils.h"

 #include "wx/settings.h"
 
 #include <stdio.h>
 #include "wx/settings.h"
 
 #include <stdio.h>

diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index c482de0f2c70201da933504c6d5d29ff6fde980f..bd8363888b38cadbbefeea7c7bfc89a48e1141d9 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/src/mac/classic/textctrl.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -47,7 +48,6 @@
 #include "wx/tabctrl.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/tabctrl.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"

 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
     #include <alloc.h>
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
     #include <alloc.h>

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 73e83de9433ae853e24b194a77c80de437324aac..c18d278e5ba7804a5c48fff8139e7d53acd2dff6 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -16,12 +16,12 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/utils.h"

 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"

diff --git a/src/mac/corefoundation/hid.cpp b/src/mac/corefoundation/hid.cpp
index e052ab50636bc239f8eb2ae29cf26a3bc76fcbd7..f072b71b4610a803c9583e8c257a7e7c70870894 100644 (file)
--- a/src/mac/corefoundation/hid.cpp
+++ b/src/mac/corefoundation/hid.cpp
@@ -33,11 +33,11 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/mac/corefoundation/cfstring.h"
 
 #endif
 
 #include "wx/mac/corefoundation/cfstring.h"
 

-#include "wx/utils.h"

 #include "wx/module.h"
 
 // ============================================================================
 #include "wx/module.h"
 
 // ============================================================================

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index e65eabae6d08d95f39b2fec107f4588c3e27d08d..7f5df13f1fe09ba45a20c1008911c6ce3d633035 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -18,13 +18,13 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"
 #include "wx/dcmemory.h"
 #endif
 
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"
 #include "wx/dcmemory.h"

-#include "wx/utils.h"

 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index d678b261eea3df8c77787ad80bfa51842c1064e6..275c62c34b84ac6b64520facd0a20cf5785887e7 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -19,10 +19,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

-#include "wx/utils.h"

 #include "wx/hashmap.h"
 
 #include "wx/mgl/private.h"
 #include "wx/hashmap.h"
 
 #include "wx/mgl/private.h"

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index d619798ed01c5b138c7e8265f20a94cbdcbd8484..7c4f8903ab44d5f3a7553cdac8127f3f6fcf9d0f 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -25,11 +25,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"

-#include "wx/utils.h"

 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"


@@ -46,7 +46,7 @@ public:
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,

-                  bool underlined = FALSE,
+                  bool underlined = false,

                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     wxFontRefData(const wxFontRefData& data);
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     wxFontRefData(const wxFontRefData& data);


@@ -121,7 +121,7 @@ void wxFontRefData::Init(int pointSize,
     m_encoding = encoding;
 
     m_library = NULL;
     m_encoding = encoding;
 
     m_library = NULL;

-    m_valid = FALSE;
+    m_valid = false;

 }
 
 wxFontRefData::wxFontRefData(const wxFontRefData& data)
 }
 
 wxFontRefData::wxFontRefData(const wxFontRefData& data)


@@ -174,7 +174,7 @@ bool wxFont::Create(int pointSize,
 {
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 {
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);

-    return TRUE;
+    return true;

 }
 
 struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased)
 }
 
 struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased)


@@ -246,7 +246,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );

 
     return M_FONTDATA->m_underlined;
 }
 
     return M_FONTDATA->m_underlined;
 }


@@ -261,7 +261,7 @@ wxFontEncoding wxFont::GetEncoding() const
 
 bool wxFont::IsFixedWidth() const
 {
 
 bool wxFont::IsFixedWidth() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );

 
     return (bool)(M_FONTDATA->m_library->GetFamily()->GetInfo()->isFixed);
 }
 
     return (bool)(M_FONTDATA->m_library->GetFamily()->GetInfo()->isFixed);
 }


@@ -284,7 +284,7 @@ void wxFont::SetPointSize(int pointSize)
     AllocExclusive();
 
     M_FONTDATA->m_pointSize = pointSize;
     AllocExclusive();
 
     M_FONTDATA->m_pointSize = pointSize;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 void wxFont::SetFamily(int family)
 }
 
 void wxFont::SetFamily(int family)


@@ -292,7 +292,7 @@ void wxFont::SetFamily(int family)
     AllocExclusive();
 
     M_FONTDATA->m_family = family;
     AllocExclusive();
 
     M_FONTDATA->m_family = family;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 void wxFont::SetStyle(int style)
 }
 
 void wxFont::SetStyle(int style)


@@ -300,7 +300,7 @@ void wxFont::SetStyle(int style)
     AllocExclusive();
 
     M_FONTDATA->m_style = style;
     AllocExclusive();
 
     M_FONTDATA->m_style = style;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 void wxFont::SetWeight(int weight)
 }
 
 void wxFont::SetWeight(int weight)


@@ -308,7 +308,7 @@ void wxFont::SetWeight(int weight)
     AllocExclusive();
 
     M_FONTDATA->m_weight = weight;
     AllocExclusive();
 
     M_FONTDATA->m_weight = weight;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 void wxFont::SetFaceName(const wxString& faceName)
 }
 
 void wxFont::SetFaceName(const wxString& faceName)


@@ -316,7 +316,7 @@ void wxFont::SetFaceName(const wxString& faceName)
     AllocExclusive();
 
     M_FONTDATA->m_faceName = faceName;
     AllocExclusive();
 
     M_FONTDATA->m_faceName = faceName;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)


@@ -331,5 +331,5 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     AllocExclusive();
 
     M_FONTDATA->m_encoding = encoding;
     AllocExclusive();
 
     M_FONTDATA->m_encoding = encoding;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 }

diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
index 044e47185112db0498c7fa3639443a984205ec87..c3a523e17b0cfb55b839c4daf8740f69e94f4717 100644 (file)
--- a/src/mgl/fontenum.cpp
+++ b/src/mgl/fontenum.cpp
@@ -27,10 +27,9 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"
-

 #include "wx/encinfo.h"
 #include "wx/fontutil.h"
 
 #include "wx/encinfo.h"
 #include "wx/fontutil.h"
 

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index c1e6426f2225f2be37798f3a2dca699c58cbbe11..e3d7e23be39256abf251e7416e7bd9484839df37 100644 (file)
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include <ctype.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 #include <ctype.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 5ed71e7572d6665c5cbb66d9b9b201276da65cc4..278ceb911d0c511458355828a02ec7d2a0f7bc1d 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -23,9 +23,9 @@
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/evtloop.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/evtloop.h"

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 948b2c673a9a7ee36b7d0722b38358bd0e017f60..6d03da153a25f23a17109db22236277d852c7161 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -17,8 +17,12 @@
 #endif
 
 #include "wx/checkbox.h"
 #endif
 
 #include "wx/checkbox.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/tglbtn.h"
 #include "wx/tglbtn.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 04531704eee9215de01e5e1b5d5df092c916ea99..ba418a03e99f014d846ff7100ea802de8453f7bb 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -20,7 +20,11 @@
 #endif
 
 #include "wx/choice.h"
 #endif
 
 #include "wx/choice.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/arrstr.h"
 
 #ifdef __VMS__
 #include "wx/arrstr.h"
 
 #ifdef __VMS__

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 08c3f81d81300f894fa4867d94fc1ee21ede76f4..5684992b09ef37d32ceddf3ea9daf0048aaea9a8 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -27,10 +27,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/bitmap.h"

-#include "wx/utils.h"

 #include "wx/dataobj.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/dataobj.h"
 #include "wx/ptr_scpd.h"
 

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 18f8bbeb686c1aca9453b273173c9cbaeb164913..2c00c7cdf35634abd30d4398844e511e86ef68ec 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -13,8 +13,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/control.h"
 #include "wx/wxprec.h"
 
 #include "wx/control.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/panel.h"
 #include "wx/panel.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index a29a6d608f9ab4df698c0e22d1c1f59d4f104ed3..fdcb917d393ed4bd74ddcd4ef57baf2c48a3c2b4 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -20,9 +20,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/window.h"
 
 #if wxUSE_IMAGE
 #include "wx/window.h"
 
 #if wxUSE_IMAGE

diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index bdecb6f26bd94844ecb7395092feba2fcdfddd81..7b4f82f041074cf9124152ce13a087ca248b3903 100644 (file)
--- a/src/motif/dataobj.cpp
+++ b/src/motif/dataobj.cpp
@@ -16,10 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"
-

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 2bf8dcbd71b9d4d6ec1dc3df261954a0218f6fe6..41eeaccfff279923184f7b0e4b500994ea893741 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/motif/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:


@@ -13,8 +13,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/settings.h"
 #include "wx/settings.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index 762a7401019aed02df95785a8da6b54531520119..d3852432541d28315dce79fc406071727fac9d16 100644 (file)
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -1,21 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.cpp
+// Name:        src/motif/dcscreen.cpp

 // Purpose:     wxScreenDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxScreenDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/dcscreen.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/window.h"
 #include "wx/frame.h"

-#include "wx/dcscreen.h"
-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -38,7 +42,7 @@ wxScreenDC::wxScreenDC()
 {
     m_display = wxGetDisplay();
     Display* display = (Display*) m_display;
 {
     m_display = wxGetDisplay();
     Display* display = (Display*) m_display;

-    
+

     if (sm_overlayWindow)
     {
         m_pixmap = sm_overlayWindow;
     if (sm_overlayWindow)
     {
         m_pixmap = sm_overlayWindow;


@@ -47,7 +51,7 @@ wxScreenDC::wxScreenDC()
     }
     else
         m_pixmap = (WXPixmap) RootWindow(display, DefaultScreen(display));
     }
     else
         m_pixmap = (WXPixmap) RootWindow(display, DefaultScreen(display));

-    
+

     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));


@@ -57,7 +61,7 @@ wxScreenDC::wxScreenDC()
     m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
     m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);

-    
+

     m_backgroundPixel = (int) gcvalues.background;
     m_ok = true;
 }
     m_backgroundPixel = (int) gcvalues.background;
     m_ok = true;
 }


@@ -77,7 +81,7 @@ bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
     window->GetSize(& width, & height);
     rect.x = x; rect.y = y;
     rect.width = width; rect.height = height;
     window->GetSize(& width, & height);
     rect.x = x; rect.y = y;
     rect.width = width; rect.height = height;

-    
+

     return StartDrawingOnTop(& rect);
 }
 
     return StartDrawingOnTop(& rect);
 }
 


@@ -85,15 +89,15 @@ bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
 {
     if (sm_overlayWindow)
         return false;
 {
     if (sm_overlayWindow)
         return false;

-    
+

     Display *dpy = (Display*) wxGetDisplay();
     Pixmap screenPixmap = RootWindow(dpy, DefaultScreen(dpy));
     Display *dpy = (Display*) wxGetDisplay();
     Pixmap screenPixmap = RootWindow(dpy, DefaultScreen(dpy));

-    
+

     int x = 0;
     int y = 0;
     int width, height;
     wxDisplaySize(&width, &height);
     int x = 0;
     int y = 0;
     int width, height;
     wxDisplaySize(&width, &height);

-    
+

     if (rect)
     {
         x = rect->x; y = rect->y;
     if (rect)
     {
         x = rect->x; y = rect->y;


@@ -101,16 +105,16 @@ bool wxScreenDC::StartDrawingOnTop(wxRect* rect)
     }
     sm_overlayWindowX = x;
     sm_overlayWindowY = y;
     }
     sm_overlayWindowX = x;
     sm_overlayWindowY = y;

-    
+

     XSetWindowAttributes attributes;
     attributes.override_redirect = True;
     unsigned long valueMask = CWOverrideRedirect;
     XSetWindowAttributes attributes;
     attributes.override_redirect = True;
     unsigned long valueMask = CWOverrideRedirect;

-    
+

     sm_overlayWindow = (WXWindow) XCreateWindow(dpy, screenPixmap, x, y, width, height, 0,
         wxDisplayDepth(), InputOutput,
         DefaultVisual(dpy, 0), valueMask,
         & attributes);
     sm_overlayWindow = (WXWindow) XCreateWindow(dpy, screenPixmap, x, y, width, height, 0,
         wxDisplayDepth(), InputOutput,
         DefaultVisual(dpy, 0), valueMask,
         & attributes);

-    
+

     if (sm_overlayWindow)
     {
         XMapWindow(dpy, (Window) sm_overlayWindow);
     if (sm_overlayWindow)
     {
         XMapWindow(dpy, (Window) sm_overlayWindow);

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 11d7ac387c12fb6d149b2b6e64407b0a032a9691..22dc5a65f8f57defabeb0cc3159dcd804801569f 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -23,9 +23,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/settings.h"
 #include "wx/evtloop.h"
 
 #include "wx/settings.h"
 #include "wx/evtloop.h"
 

diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp
index 3e7014c852a420bdfa02eb0f0ba192969e50669e..aac3b27102b8dba5e6b50f3d235b5d7d70027412 100644 (file)
--- a/src/motif/dnd.cpp
+++ b/src/motif/dnd.cpp
@@ -18,11 +18,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 
 #include <X11/Xlib.h>
 
 
 #include <X11/Xlib.h>
 

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 42bc27a41cd978f38f850ba77c8dba9436c18156..bc9f15ccfa573e586d7f263010da20bcafdb2b47 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -23,9 +23,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/settings.h"
 #include "wx/tokenzr.h"
 #include "wx/stockitem.h"
 #include "wx/settings.h"
 #include "wx/tokenzr.h"
 #include "wx/stockitem.h"

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index f4653d60ade41486526cbbe0aed7420cd027a843..2d0c35bc643cacf986414a8d7418e0c25916be00 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -33,10 +33,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/utils.h"       // for wxGetDisplay()

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/utils.h"       // for wxGetDisplay()

 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.h"

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 24b8baf9cceb8f089b3032d21098f1955d26f066..24c4eb0f9da583fee49bf6d13bd15f82dcf4a6b8 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -31,13 +31,13 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
 #endif
 
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menu.h"
 #include "wx/settings.h"

-#include "wx/utils.h"

 #include "wx/icon.h"
 
 #ifdef __VMS__
 #include "wx/icon.h"
 
 #ifdef __VMS__

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 1158c22fe0840695d992edaab82734a8574fdc70..8b956b96efb24e3d01bb4489e7dc05438332630b 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -19,6 +19,7 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #ifdef __VMS
 #endif
 
 #ifdef __VMS


@@ -27,7 +28,6 @@
 #endif
 
 #include "wx/settings.h"
 #endif
 
 #include "wx/settings.h"

-#include "wx/utils.h"

 #include "wx/arrstr.h"
 
 #ifdef __VMS__
 #include "wx/arrstr.h"
 
 #ifdef __VMS__

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index b036cac8906e0526801ca6a69945446314061a4e..7ea74148a6d1c0cf598207449448c4bb4e006939 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -25,10 +25,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/menuitem.h"

-#include "wx/utils.h"

 #include "wx/frame.h"
 #include "wx/settings.h"
 
 #include "wx/frame.h"
 #include "wx/settings.h"
 

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index cbed0910f42b73c87905a418d3ee103eff0339a5..a8a899d14090ae113320354e5243b450baef4b8a 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -20,9 +20,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/menu.h"

 #include "wx/menuitem.h"
 #include "wx/menuitem.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+
+#include "wx/menu.h"

 #include "wx/frame.h"
 
 #ifdef __VMS__
 #include "wx/frame.h"
 
 #ifdef __VMS__

diff --git a/src/motif/palette.cpp b/src/motif/palette.cpp
index 672cb58071d11f52a3c84bc91f431179b0b7b7f1..12cf5a31ddf29cbdc327ada51161a155ae2cfd31 100644 (file)
--- a/src/motif/palette.cpp
+++ b/src/motif/palette.cpp
@@ -41,10 +41,10 @@ not the functionality that wxPalette::Create() aims to provide.
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #endif
 
 #include "wx/window.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 2761725f12dc09fa0afff148fff8a6d107f35f52..09b06715d1f81937d6003d77006dfdc1ca395db1 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -19,7 +19,11 @@
 #endif
 
 #include "wx/radiobox.h"
 #endif
 
 #include "wx/radiobox.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/arrstr.h"
 
 #ifdef __VMS__
 #include "wx/arrstr.h"
 
 #ifdef __VMS__

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 956e8d65aaec91c09c62c5f679376d55c7c719d6..c0886ce554b1e6e615de63f28bd9b2c81d7c8a96 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -17,7 +17,10 @@
 #endif
 
 #include "wx/radiobut.h"
 #endif
 
 #include "wx/radiobut.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 31ca0ae3e0cd51ed74821462a99ad87368c33064..8e529313354163106a244be3e3c9b253fbc35c50 100644 (file)
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -15,7 +15,10 @@
 #if wxUSE_SLIDER
 
 #include "wx/slider.h"
 #if wxUSE_SLIDER
 
 #include "wx/slider.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 744db4473144b9b8ca5e701da5d738a28c588ce2..f6d4fa2b5e1531efadaa1370446cd91b2127de15 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -17,7 +17,10 @@
 #endif
 
 #include "wx/statbox.h"
 #endif
 
 #include "wx/statbox.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 81ac9740eaa80570dc3854ca46e17806ae6f24c2..8ab3add39ff8005d4a6d8fe091c259e2db28b524 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -29,9 +29,13 @@
 #include <ctype.h>
 
 #include "wx/textctrl.h"
 #include <ctype.h>
 
 #include "wx/textctrl.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -163,8 +167,8 @@ bool wxTextCtrl::Create(wxWindow *parent,
 #if 0
         // TODO: Is this relevant? What does it do?
         int noCols = 2;
 #if 0
         // TODO: Is this relevant? What does it do?
         int noCols = 2;

-        if (!value.IsNull() && (value.Length() > (unsigned int) noCols))
-            noCols = value.Length();
+        if (!value.IsNull() && (value.length() > (unsigned int) noCols))
+            noCols = value.length();

         XtVaSetValues((Widget) m_mainWidget,
                       XmNcolumns, noCols,
                       NULL);
         XtVaSetValues((Widget) m_mainWidget,
                       XmNcolumns, noCols,
                       NULL);

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 865e4272fb110a50a56aaaffd9839b4e845f98bc..e97cc2732b4b6629e9c82b1e8826a9ce005e0e5b 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -30,12 +30,12 @@
     #include "wx/hash.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/hash.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/utils.h"

 #include "wx/layout.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/layout.h"
 #include "wx/button.h"
 #include "wx/settings.h"

diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp
index d99a47840451a3b32e307ec71d2d42827125ad2f..951244b6e4bce9b425b8ac3de5f904e62a441af6 100644 (file)
--- a/src/msw/urlmsw.cpp
+++ b/src/msw/urlmsw.cpp
@@ -21,6 +21,7 @@
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"

+    #include "wx/utils.h"

 #endif
 
 #if !wxUSE_PROTOCOL_HTTP
 #endif
 
 #if !wxUSE_PROTOCOL_HTTP


@@ -64,7 +65,6 @@ USE_PROTOCOL(wxHTTPDummyProto)
     #pragma comment(lib, "wininet.lib")
 #endif
 
     #pragma comment(lib, "wininet.lib")
 #endif
 

-#include "wx/utils.h"

 #include "wx/module.h"
 #include "wx/url.h"
 
 #include "wx/module.h"
 #include "wx/url.h"
 

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index d7e34da3c5450a9e121d7c72a3ef298aed31b632..de2ee2f15612a7e0c4a202da2a4a039f1af2b071 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        unix/baseunix.cpp
+// Name:        src/unix/baseunix.cpp

 // Purpose:     misc stuff only used in console applications under Unix
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     misc stuff only used in console applications under Unix
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -27,10 +27,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"

-#include "wx/utils.h"

 #include "wx/unix/execute.h"
 
 // for waitpid()
 #include "wx/unix/execute.h"
 
 // for waitpid()


@@ -123,4 +123,3 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 }
 
 #endif // __WXMAC__
 }
 
 #endif // __WXMAC__

-

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index e90fc222ec67fa06159a1d6262ed663f244ea44a..b71a5cc8a41cfc6e3f9220a4cdc6cca367725192 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -22,11 +22,11 @@
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif // !PCH
 
 #include "wx/timer.h"
 #include "wx/filefn.h"
 #endif // !PCH
 
 #include "wx/timer.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"

 #include "wx/ffile.h"
 #include "wx/process.h"
 #include "wx/wxchar.h"
 #include "wx/ffile.h"
 #include "wx/process.h"
 #include "wx/wxchar.h"

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index 71ba6d78499b715cd0f1d0b84964730a67d9b041..3e0766599a9c15917c1175288f8629f5a7ac1678 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -26,10 +26,10 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/app.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/regex.h"
 #endif
 
 #include "wx/regex.h"

-#include "wx/utils.h"

 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 5230c5a09e912c0285cf8f774764540c8c1afa23..2d04279540a4ac4c69b4f0d5102e8c18362cfd4d 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -28,6 +28,7 @@
     #include "wx/font.h" // wxFont enums
     #include "wx/encinfo.h"
     #include "wx/hash.h"
     #include "wx/font.h" // wxFont enums
     #include "wx/encinfo.h"
     #include "wx/hash.h"

+    #include "wx/utils.h"       // for wxGetDisplay()

 #endif // PCH
 
 #include "wx/fontutil.h"
 #endif // PCH
 
 #include "wx/fontutil.h"


@@ -343,7 +344,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         #pragma message enable nosimpint
     #endif
 
         #pragma message enable nosimpint
     #endif
 

-    #include "wx/utils.h"       // for wxGetDisplay()

 #elif defined(__WXGTK__)
     // we have to declare struct tm to avoid problems with first forward
     // declaring it in C code (glib.h included from gdk.h does it) and then
 #elif defined(__WXGTK__)
     // we have to declare struct tm to avoid problems with first forward
     // declaring it in C code (glib.h included from gdk.h does it) and then

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 5b108a67336e5977b427f9df7de023266cf3ed38..af9e6ea701af5612f6267e7a455a553a96602c6f 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -45,6 +45,7 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/file.h"
 #endif
 
 #include "wx/file.h"


@@ -53,7 +54,6 @@
 #include "wx/ffile.h"
 #include "wx/textfile.h"
 #include "wx/dir.h"
 #include "wx/ffile.h"
 #include "wx/textfile.h"
 #include "wx/dir.h"

-#include "wx/utils.h"

 #include "wx/tokenzr.h"
 #include "wx/iconloc.h"
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/iconloc.h"
 #include "wx/filename.h"

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index bdd773a19e470197655edd8c049304d09864463b..26bab35d8bcdfb1120637ce42fd8e25433bfeb83 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        unix/snglinst.cpp
+// Name:        src/unix/snglinst.cpp

 // Purpose:     implements wxSingleInstanceChecker class for Unix using
 //              lock files with fcntl(2) or flock(2)
 // Author:      Vadim Zeitlin
 // Purpose:     implements wxSingleInstanceChecker class for Unix using
 //              lock files with fcntl(2) or flock(2)
 // Author:      Vadim Zeitlin


@@ -31,10 +31,10 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/utils.h"           // wxGetHomeDir()

 #endif //WX_PRECOMP
 
 #include "wx/file.h"
 #endif //WX_PRECOMP
 
 #include "wx/file.h"

-#include "wx/utils.h"           // wxGetHomeDir()

 
 #include "wx/snglinst.h"
 
 
 #include "wx/snglinst.h"
 


@@ -183,7 +183,7 @@ LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
                               m_nameLock.c_str());
 
                 Unlock();
                               m_nameLock.c_str());
 
                 Unlock();

-                
+

                 return LOCK_ERROR;
             }
 
                 return LOCK_ERROR;
             }
 


@@ -226,11 +226,11 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
 
         case LOCK_CREATED:
             // nothing more to do
 
         case LOCK_CREATED:
             // nothing more to do

-            return TRUE;
+            return true;

 
         case LOCK_ERROR:
             // oops...
 
         case LOCK_ERROR:
             // oops...

-            return FALSE;
+            return false;

     }
 
     // Check if the file is owned by current user and has 0600 permissions.
     }
 
     // Check if the file is owned by current user and has 0600 permissions.


@@ -269,7 +269,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
         // rarely in practice that we don't care
         wxLogError(_("Failed to access lock file."));
 
         // rarely in practice that we don't care
         wxLogError(_("Failed to access lock file."));
 

-        return FALSE;
+        return false;

     }
 
     char buf[256];
     }
 
     char buf[256];


@@ -289,7 +289,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
                     wxLogError(_("Failed to remove stale lock file '%s'."),
                                name.c_str());
 
                     wxLogError(_("Failed to remove stale lock file '%s'."),
                                name.c_str());
 

-                    // return TRUE in this case for now...
+                    // return true in this case for now...

                 }
                 else
                 {
                 }
                 else
                 {


@@ -308,7 +308,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
         }
     }
 
         }
     }
 

-    // return TRUE if we could get the PID of the process owning the lock file
+    // return true if we could get the PID of the process owning the lock file

     // (whether it is still running or not), FALSE otherwise as it is
     // unexpected
     return m_pidLocker != 0;
     // (whether it is still running or not), FALSE otherwise as it is
     // unexpected
     return m_pidLocker != 0;


@@ -373,7 +373,7 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
 
 bool wxSingleInstanceChecker::IsAnotherRunning() const
 {
 
 bool wxSingleInstanceChecker::IsAnotherRunning() const
 {

-    wxCHECK_MSG( m_impl, FALSE, _T("must call Create() first") );
+    wxCHECK_MSG( m_impl, false, _T("must call Create() first") );

 
     // if another instance is running, it must own the lock file - otherwise
     // we have it and the locker PID is ours one
 
     // if another instance is running, it must own the lock file - otherwise
     // we have it and the locker PID is ours one


@@ -386,4 +386,3 @@ wxSingleInstanceChecker::~wxSingleInstanceChecker()
 }
 
 #endif // wxUSE_SNGLINST_CHECKER
 }
 
 #endif // wxUSE_SNGLINST_CHECKER

-

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 6d2db0b9567be6a2abce01d1f61227688747fb97..f6f055e6d64decdf15b52a9a5dcff735aaa208ea 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -32,10 +32,10 @@
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

-#include "wx/utils.h"

 #include "wx/timer.h"
 #include "wx/stopwatch.h"
 
 #include "wx/timer.h"
 #include "wx/stopwatch.h"
 

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 8215157322104eec7ee95254184f19f0bf441d2b..e6ac52fd44d808efa44c70117783d25e76ca6e55 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -18,10 +18,10 @@
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/frame.h"
 #endif
 
 #include "wx/frame.h"

-#include "wx/utils.h"

 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"

diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index 736dcc6cfde15cf61be7e6c23a772fcfd7da22c6..ce9e17d9dc838781bb617f6e83b1d325ad8bde6e 100644 (file)
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -12,8 +12,12 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

 #include "wx/brush.h"
 #include "wx/brush.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/bitmap.h"
 #include "wx/colour.h"
 
 #include "wx/bitmap.h"
 #include "wx/colour.h"
 

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index 479e96dff7355323f564fbe1430e9c8c85d2cffb..731d49e6685d1cd7f850851081f576221e28b7fc 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -17,10 +17,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/dataobj.h"
 #endif
 
 #include "wx/dataobj.h"

-#include "wx/utils.h"

 
 #include "wx/x11/private.h"
 
 
 #include "wx/x11/private.h"
 


@@ -88,7 +88,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
                 wxLogTrace( TRACE_CLIPBOARD,
                             _T("got unsupported clipboard target") );
 
                 wxLogTrace( TRACE_CLIPBOARD,
                             _T("got unsupported clipboard target") );
 

-                clipboard->m_waiting = FALSE;
+                clipboard->m_waiting = false;

                 return;
             }
         }
                 return;
             }
         }


@@ -113,14 +113,14 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 
             if (format == clipboard->m_targetRequested)
             {
 
             if (format == clipboard->m_targetRequested)
             {

-                clipboard->m_waiting = FALSE;
+                clipboard->m_waiting = false;

                 clipboard->m_formatSupported = true;
                 return;
             }
         }
     }
 
                 clipboard->m_formatSupported = true;
                 return;
             }
         }
     }
 

-    clipboard->m_waiting = FALSE;
+    clipboard->m_waiting = false;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -137,7 +137,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
 {
     if (!wxTheClipboard)
     {
 {
     if (!wxTheClipboard)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -145,13 +145,13 @@ selection_received( GtkWidget *WXUNUSED(widget),
 
     if (!data_object)
     {
 
     if (!data_object)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
     if (selection_data->length <= 0)
     {
         return;
     }
 
     if (selection_data->length <= 0)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -160,7 +160,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
     /* make sure we got the data in the correct format */
     if (!data_object->IsSupportedFormat( format ) )
     {
     /* make sure we got the data in the correct format */
     if (!data_object->IsSupportedFormat( format ) )
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
         return;
     }
 


@@ -168,14 +168,14 @@ selection_received( GtkWidget *WXUNUSED(widget),
        if so, copy data to target object */
     if (selection_data->type != GDK_SELECTION_TYPE_STRING)
     {
        if so, copy data to target object */
     if (selection_data->type != GDK_SELECTION_TYPE_STRING)
     {

-        clipboard->m_waiting = FALSE;
+        clipboard->m_waiting = false;

         return;
     }
 
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 
     wxTheClipboard->m_formatSupported = true;
         return;
     }
 
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 
     wxTheClipboard->m_formatSupported = true;

-    clipboard->m_waiting = FALSE;
+    clipboard->m_waiting = false;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -189,16 +189,16 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 
     if (event->selection == GDK_SELECTION_PRIMARY)
     {
 
     if (event->selection == GDK_SELECTION_PRIMARY)
     {

-        wxTheClipboard->m_ownsPrimarySelection = FALSE;
+        wxTheClipboard->m_ownsPrimarySelection = false;

     }
     else
     if (event->selection == g_clipboardAtom)
     {
     }
     else
     if (event->selection == g_clipboardAtom)
     {

-        wxTheClipboard->m_ownsClipboard = FALSE;
+        wxTheClipboard->m_ownsClipboard = false;

     }
     else
     {
     }
     else
     {

-        wxTheClipboard->m_waiting = FALSE;
+        wxTheClipboard->m_waiting = false;

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -215,7 +215,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
         }
     }
 
         }
     }
 

-    wxTheClipboard->m_waiting = FALSE;
+    wxTheClipboard->m_waiting = false;

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -283,10 +283,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-    m_open = FALSE;
+    m_open = false;

 
 

-    m_ownsClipboard = FALSE;
-    m_ownsPrimarySelection = FALSE;
+    m_ownsClipboard = false;
+    m_ownsPrimarySelection = false;

 
     m_data = (wxDataObject*) NULL;
     m_receivedData = (wxDataObject*) NULL;
 
     m_data = (wxDataObject*) NULL;
     m_receivedData = (wxDataObject*) NULL;


@@ -299,10 +299,10 @@ wxClipboard::wxClipboard()
     if (!g_targetsAtom) g_targetsAtom = XInternAtom( (Display*) wxGetDisplay(), "TARGETS", False );
 #endif
 
     if (!g_targetsAtom) g_targetsAtom = XInternAtom( (Display*) wxGetDisplay(), "TARGETS", False );
 #endif
 

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

     m_targetRequested = 0;
 
     m_targetRequested = 0;
 

-    m_usePrimary = FALSE;
+    m_usePrimary = false;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -371,9 +371,9 @@ bool wxClipboard::Open()
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
 

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
     Clear();
 
 
     Clear();
 


@@ -383,11 +383,11 @@ bool wxClipboard::SetData( wxDataObject *data )
 bool wxClipboard::AddData( wxDataObject *data )
 {
 #if wxUSE_NANOX
 bool wxClipboard::AddData( wxDataObject *data )
 {
 #if wxUSE_NANOX

-    return FALSE;
+    return false;

 #else
 #else

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
 

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
     /* we can only store one wxDataObject */
     Clear();
 
     /* we can only store one wxDataObject */
     Clear();


@@ -432,7 +432,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     /* disable GUI threads */
 #endif
 
     /* disable GUI threads */
 #endif
 

-    bool res = FALSE;
+    bool res = false;

 #if 0
     /* Tell the world we offer clipboard data */
     res = (gtk_selection_owner_set( m_clipboardWidget,
 #if 0
     /* Tell the world we offer clipboard data */
     res = (gtk_selection_owner_set( m_clipboardWidget,


@@ -457,7 +457,7 @@ void wxClipboard::Close()
 {
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 
 {
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 

-    m_open = FALSE;
+    m_open = false;

 }
 
 bool wxClipboard::IsOpened() const
 }
 
 bool wxClipboard::IsOpened() const


@@ -539,7 +539,7 @@ bool wxClipboard::GetData( wxDataObject& data )
           clipboard owner which is an asynchronous process.
           therefore we set m_waiting = true here and wait
           until the callback "targets_selection_received"
           clipboard owner which is an asynchronous process.
           therefore we set m_waiting = true here and wait
           until the callback "targets_selection_received"

-          sets it to FALSE */
+          sets it to false */

 
         m_waiting = true;
 
 
         m_waiting = true;
 


@@ -591,7 +591,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 #endif
 
         /* this is a true error as we checked for the presence of such data before */
 #endif
 
         /* this is a true error as we checked for the presence of such data before */

-        wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") );
+        wxCHECK_MSG( m_formatSupported, false, wxT("error retrieving data from clipboard") );

 
         /* return success */
         delete[] array;
 
         /* return success */
         delete[] array;

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index b94f974e5ac4a8b7a3732201dba39f5b74508568..7fbd54c0280129a461fb6e05b5652d0023e22dd4 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -16,11 +16,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/icon.h"

-#include "wx/utils.h"

 
 #include "wx/x11/private.h"
 
 
 #include "wx/x11/private.h"
 

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index c32748372eb3d0f908186e76a9f591951411f984..d1562f99bf4f99f98c907f5c67c8a7a1eaa0611d 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -17,12 +17,12 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/mstream.h"
 #include "wx/image.h"
 
 #endif
 
 #include "wx/mstream.h"
 #include "wx/image.h"
 

-#include "wx/utils.h"

 #include "wx/x11/private.h"
 
 //-------------------------------------------------------------------------
 #include "wx/x11/private.h"
 
 //-------------------------------------------------------------------------

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index 157f62a48b3cdc4460efc6cd72706cf37956f842..810e55f83ea07d44e323eb8a1df7acc054d33184 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -1,17 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/x11/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/dcmemory.h"
 #include "wx/dcmemory.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/settings.h"
 #include "wx/settings.h"

-#include "wx/utils.h"

 
 #include "wx/x11/private.h"
 
 
 #include "wx/x11/private.h"
 


@@ -19,8 +26,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {
 
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {

-    m_ok = FALSE;
-    
+    m_ok = false;
+

     m_display = (WXDisplay *) wxGlobalDisplay();
 
     int screen = DefaultScreen( wxGlobalDisplay() );
     m_display = (WXDisplay *) wxGlobalDisplay();
 
     int screen = DefaultScreen( wxGlobalDisplay() );


@@ -30,10 +37,10 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   : wxWindowDC()
 {
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   : wxWindowDC()
 {

-    m_ok = FALSE;
+    m_ok = false;

 
     m_display = (WXDisplay *) wxGlobalDisplay();
 
     m_display = (WXDisplay *) wxGlobalDisplay();

-    
+

     int screen = DefaultScreen( wxGlobalDisplay() );
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
 }
     int screen = DefaultScreen( wxGlobalDisplay() );
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
 }


@@ -45,7 +52,7 @@ wxMemoryDC::~wxMemoryDC()
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
     Destroy();
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
     Destroy();

-    
+

     m_selected = bitmap;
     if (m_selected.Ok())
     {
     m_selected = bitmap;
     if (m_selected.Ok())
     {


@@ -58,13 +65,13 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_window = m_selected.GetBitmap();
         }
 
             m_window = m_selected.GetBitmap();
         }
 

-        m_isMemDC = TRUE;
+        m_isMemDC = true;

 
         SetUpDC();
     }
     else
     {
 
         SetUpDC();
     }
     else
     {

-        m_ok = FALSE;
+        m_ok = false;

         m_window = NULL;
     }
 }
         m_window = NULL;
     }
 }

diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp
index 989ddd259f097fcf0cd5386f2c1ba2dd9bb0dffe..8b922df00cafdc1cb808ac3aec4a3a46f588dee1 100644 (file)
--- a/src/x11/dcscreen.cpp
+++ b/src/x11/dcscreen.cpp
@@ -16,11 +16,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/frame.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/frame.h"

-#include "wx/utils.h"

 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"

diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp
index ea53b0384cfc40855ae334f4536ea0986c53b409..1697027afd9d209a522638e04aabba31300830c7 100644 (file)
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -22,11 +22,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"

 
 #include <X11/Xlib.h>
 
 
 #include <X11/Xlib.h>
 

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index c1e764679674a4dbb586716df66d561b1d419cde..1dc91a3ba1db102b6d93c2973146f23e38b3fc28 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -33,10 +33,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/utils.h"       // for wxGetDisplay()

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/utils.h"       // for wxGetDisplay()

 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.h"

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index a4e41c925d8fec5cb8746c636fb5d7d43f37e298..c6aa213acc59de575ee3bb190ab5ce2b51c348ea 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -24,10 +24,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"
-

 #ifdef __VMS
 # pragma message disable nosimpint
 #endif
 #ifdef __VMS
 # pragma message disable nosimpint
 #endif

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index aa81fd4ae08d4440f66156fb252e94ea7be05c8f..e2d9504f4b10407ba8396a8bfb8e83f5aa430f0a 100644 (file)
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -41,10 +41,10 @@ not the functionality that wxPalette::Create() aims to provide.
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/window.h"
 #endif
 
 #include "wx/window.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index 5dd99899cb3b42cca2b9adef92efefadf7c4f4b5..c89e957e6bb0fe67c3ac9625504710ed129eb0ef 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -12,8 +12,12 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

 #include "wx/pen.h"
 #include "wx/pen.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/colour.h"
 #include "wx/bitmap.h"
 
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 96d2ea1e5eccb3c0cd4263d90d1258f7d2628675..75a799c5b1e7b7356dad87c74cb9b790bc62e25b 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/utils.h"

 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/clipbrd.h"
 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/clipbrd.h"

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 41032fb7fc85bc1f1fb992a555dfaafa451e7480..e5080dae51b14b640c60d3cb2662e1b2618e412c 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -30,12 +30,12 @@
     #include "wx/hash.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/hash.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/utils.h"

 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"