Applied patch [ 1117207 ] changed the test for SQL_C_WCHAR

[wxWidgets.git] / src / common / clipcmn.cpp

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index 7dc2ef20307c885a8aa8a1e64d8ec730e349e758..f253ccb9c1a1a6572cd49b5fdab4a691dad344e6 100644 (file)
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "clipboardbase.h"
 #endif
 
     #pragma implementation "clipboardbase.h"
 #endif
 


@@ -29,31 +29,36 @@
 #endif
 
 #include "wx/clipbrd.h"
 #endif
 
 #include "wx/clipbrd.h"

+#include "wx/module.h"

 
 

-//--------------------------------------------------------------------------
-// wxClipboardBase
-//--------------------------------------------------------------------------
+#if wxUSE_CLIPBOARD

 
 

-wxClipboardBase::wxClipboardBase()
+static wxClipboard *gs_clipboard = NULL;
+
+/*static*/ wxClipboard *wxClipboardBase::Get()

 {
 {

+    if ( !gs_clipboard )
+    {
+        gs_clipboard = new wxClipboard;
+    }
+    return gs_clipboard;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxClipboardModule: module responsible for initializing the global clipboard
+// wxClipboardModule: module responsible for destroying the global clipboard

 // object
 // object

-//
-// NB: IMPLEMENT_DYNAMIC_CLASS() for it is in common/appcmn.cpp

 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 {
 public:
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 {
 public:

-    bool OnInit()
-        { wxTheClipboard = new wxClipboard; return TRUE; }
-    void OnExit()
-        { delete wxTheClipboard; wxTheClipboard = (wxClipboard *)NULL; }
+    bool OnInit() { return true; }
+    void OnExit() { wxDELETE(gs_clipboard); }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 

+IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
+
+#endif // wxUSE_CLIPBOARD