Revert "Make wxMSW stack walking methods work with Unicode identifiers."

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

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index a3691d7e0f5a7bf25bb58365b4d18b61309257dd..7bd6843a13d9154828b2406cca9862089460b4db 100644 (file)
--- a/src/os2/clipbrd.cpp
+++ b/src/os2/clipbrd.cpp
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,6 +13,8 @@
 
 #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"


@@ -22,26 +23,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/os2/private.h"
 
 // wxDataObject is tied to OLE/drag and drop implementation,
 // therefore so is wxClipboard :-(
 #include <string.h>
 
 #include "wx/os2/private.h"
 
 // wxDataObject is tied to OLE/drag and drop implementation,
 // therefore so is wxClipboard :-(

-#if wxUSE_DRAG_AND_DROP
-    #include "wx/dataobj.h"
-
-//    static bool wxSetClipboardData(wxDataObject *data);
-#endif

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -64,13 +59,15 @@ bool wxOpenClipboard()
         gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0;
 
         if ( !gs_wxClipboardIsOpen )
         gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0;
 
         if ( !gs_wxClipboardIsOpen )

+        {

             wxLogSysError(_("Failed to open the clipboard."));
             wxLogSysError(_("Failed to open the clipboard."));

+        }

 
         return gs_wxClipboardIsOpen;
     }
     else
     {
 
         return gs_wxClipboardIsOpen;
     }
     else
     {

-        wxLogDebug(wxT("Can not open clipboard without a main window."));
+        wxLogDebug(wxT("Cannot open clipboard without a main window."));

 
         return false;
     }
 
         return false;
     }