Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/palmos/clipbrd.cpp b/src/palmos/clipbrd.cpp
index 8cc26b6813c389f4aa46a3b6d8ee69276d7c442f..49877140262c19441f79df01e03d9a46b5cd22ad 100644 (file)
--- a/src/palmos/clipbrd.cpp
+++ b/src/palmos/clipbrd.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_CLIPBOARD
 
+#include "wx/clipbrd.h"
+
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"
@@ -34,25 +36,20 @@
     #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
 
-#include "wx/log.h"
-#include "wx/clipbrd.h"
-
 #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__)
@@ -75,7 +72,7 @@
 // old-style clipboard functions
 // ---------------------------------------------------------------------------
 
-static bool gs_wxClipboardIsOpen = FALSE;
+static bool gs_wxClipboardIsOpen = false;
 
 bool wxOpenClipboard()
 {
@@ -142,8 +139,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
-    m_clearOnExit = FALSE;
-    m_isOpened = FALSE;
+    m_clearOnExit = false;
+    m_isOpened = false;
 }
 
 wxClipboard::~wxClipboard()