X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..c04c7a3d0ae9f09bd7219b97799d9b185f1c2bab:/src/common/clipcmn.cpp

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index e1181ce03f..4b9225b042 100644
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/clipcmn.cpp
+// Name:        src/common/clipcmn.cpp
 // Purpose:     common (to all ports) wxClipboard functions
 // Author:      Robert Roebling
 // Modified by:
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "clipboardbase.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,54 +24,40 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CLIPBOARD
+
 #include "wx/clipbrd.h"
-#include "wx/module.h"
 
-#if wxUSE_CLIPBOARD
+#ifndef WX_PRECOMP
+    #include "wx/module.h"
+#endif
+
+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
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 {
 public:
-    bool OnInit();
-    void OnExit();
+    bool OnInit() { return true; }
+    void OnExit() { wxDELETE(gs_clipboard); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 
-// ----------------------------------------------------------------------------
-// global data defined here
-// ----------------------------------------------------------------------------
-
 IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
 
-wxClipboard* wxTheClipboard = (wxClipboard *)NULL;
-
-// ----------------------------------------------------------------------------
-// implementation
-// ----------------------------------------------------------------------------
-
-wxClipboardBase::wxClipboardBase()
-{
-}
-
-bool wxClipboardModule::OnInit()
-{
-    wxTheClipboard = new wxClipboard;
-
-    return TRUE;
-}
-
-void wxClipboardModule::OnExit()
-{
-    delete wxTheClipboard;
-
-    wxTheClipboard = (wxClipboard *)NULL;
-}
-
 #endif // wxUSE_CLIPBOARD