Unicode compilation fixes

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

diff --git a/src/mac/classic/clipbrd.cpp b/src/mac/classic/clipbrd.cpp
index 81fe955bf53c13a9ec8ca46b6d5089ba3301ec4d..2f82e1b74ef2cf9d060a84a788b81f081b2e45ab 100644 (file)
--- a/src/mac/classic/clipbrd.cpp
+++ b/src/mac/classic/clipbrd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Clipboard functionality
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     Clipboard functionality
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,14 +9,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/app.h"
-#include "wx/frame.h"
-#include "wx/bitmap.h"
-#include "wx/utils.h"
-#include "wx/metafile.h"
+#include "wx/wxprec.h"
+

 #include "wx/clipbrd.h"
 #include "wx/clipbrd.h"

-#include "wx/intl.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/bitmap.h"
+#endif
+
+#include "wx/metafile.h"

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


@@ -184,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 ;
 }


@@ -201,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


@@ -213,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();


@@ -240,7 +246,7 @@ bool wxClipboard::AddData( wxDataObject *data )
         size_t sz = data->GetDataSize( array[i] ) ;
         void* buf = malloc( sz + 1 ) ;
         if ( buf )
         size_t sz = data->GetDataSize( array[i] ) ;
         void* buf = malloc( sz + 1 ) ;
         if ( buf )

-        {        
+        {

             data->GetDataHere( array[i] , buf ) ;
             OSType mactype = 0 ;
             switch ( array[i].GetType() )
             data->GetDataHere( array[i] , buf ) ;
             OSType mactype = 0 ;
             switch ( array[i].GetType() )


@@ -281,15 +287,15 @@ void wxClipboard::Close()
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 
     m_open = false ;
     wxCHECK_RET( m_open, wxT("clipboard not open") );
 
     m_open = false ;

-    
-       // Get rid of cached object.  If this is not done copying from another application will
-       // only work once
+
+    // Get rid of cached object.  If this is not done copying from another application will
+    // only work once

     if (m_data)
     {
         delete m_data;
         m_data = (wxDataObject*) NULL;
     if (m_data)
     {
         delete m_data;
         m_data = (wxDataObject*) NULL;

-    }    
-           
+    }
+

 }
 
 bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 }
 
 bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )


@@ -312,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 ;


@@ -332,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  ];