Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index a0af907b6ee97145f128b3ee19dd2a56b01a4ea0..f253ccb9c1a1a6572cd49b5fdab4a691dad344e6 100644 (file)
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -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
 


@@ -33,49 +33,32 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

+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:
 // object
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 {
 public:

-    bool OnInit();
-    void OnExit();
+    bool OnInit() { return true; }
+    void OnExit() { wxDELETE(gs_clipboard); }

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

-// ----------------------------------------------------------------------------
-// global data defined here
-// ----------------------------------------------------------------------------
-

 IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
 
 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
 #endif // wxUSE_CLIPBOARD