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

[wxWidgets.git] / src / mac / classic / clipbrd.cpp

diff --git a/src/mac/classic/clipbrd.cpp b/src/mac/classic/clipbrd.cpp
index 146534dfd25a79e49426b4c059af6e0a4ba3caf2..09bb87c8c1f90af7428682c0393a247cea79409f 100644 (file)
--- a/src/mac/classic/clipbrd.cpp
+++ b/src/mac/classic/clipbrd.cpp
@@ -15,14 +15,14 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/app.h"
-#include "wx/frame.h"

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

-#include "wx/utils.h"

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

-#include "wx/log.h"

 
 #ifndef __DARWIN__
 #include <Scrap.h>
 
 #ifndef __DARWIN__
 #include <Scrap.h>


@@ -190,12 +190,12 @@ void wxClipboard::Clear()
 
 bool wxClipboard::Flush()
 {
 
 bool wxClipboard::Flush()
 {

-    return FALSE;
+    return 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 ;
     return true ;
 }
     m_open = true ;
     return true ;
 }


@@ -207,9 +207,9 @@ bool wxClipboard::IsOpened() const
 
 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();
     // as we can only store one wxDataObject, this is the same in this
 
     Clear();
     // as we can only store one wxDataObject, this is the same in this


@@ -219,9 +219,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();


@@ -318,11 +318,11 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {

-                return TRUE ;
+                return true ;

             }
         }
     }
             }
         }
     }

-    return FALSE;
+    return false;

 
 #else
     long offset ;
 
 #else
     long offset ;


@@ -338,7 +338,7 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 
 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") );

 
     size_t formatcount = data.GetFormatCount() + 1 ;
     wxDataFormat *array = new wxDataFormat[ formatcount  ];
 
     size_t formatcount = data.GetFormatCount() + 1 ;
     wxDataFormat *array = new wxDataFormat[ formatcount  ];