Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / palmos / clipbrd.cpp

diff --git a/src/palmos/clipbrd.cpp b/src/palmos/clipbrd.cpp
index 8a7cec26049c84c677d2871d325dc552483b9508..49877140262c19441f79df01e03d9a46b5cd22ad 100644 (file)
--- a/src/palmos/clipbrd.cpp
+++ b/src/palmos/clipbrd.cpp
@@ -24,12 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/setup.h"
-#endif
-

 #if wxUSE_CLIPBOARD
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/clipbrd.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"


@@ -38,25 +36,20 @@
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"

+    #include "wx/log.h"
+    #include "wx/dataobj.h"

 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 
 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 

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

 #include <string.h>
 
 #include "wx/palmos/private.h"
 
 #if wxUSE_WXDIB
 #include <string.h>
 
 #include "wx/palmos/private.h"
 
 #if wxUSE_WXDIB

-#include "wx/palmos/dib.h"
-#endif
-
-#if wxUSE_DATAOBJ
-    #include "wx/dataobj.h"
+    #include "wx/palmos/dib.h"

 #endif
 
 #if wxUSE_OLE && !defined(__WXWINCE__)
 #endif
 
 #if wxUSE_OLE && !defined(__WXWINCE__)


@@ -79,7 +72,7 @@
 // old-style clipboard functions
 // ---------------------------------------------------------------------------
 
 // old-style clipboard functions
 // ---------------------------------------------------------------------------
 

-static bool gs_wxClipboardIsOpen = FALSE;
+static bool gs_wxClipboardIsOpen = false;

 
 bool wxOpenClipboard()
 {
 
 bool wxOpenClipboard()
 {


@@ -146,8 +139,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-    m_clearOnExit = FALSE;
-    m_isOpened = FALSE;
+    m_clearOnExit = false;
+    m_isOpened = false;

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


@@ -203,4 +196,3 @@ bool wxClipboard::GetData( wxDataObject& data )
 }
 
 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD

-