fix memory leak; allocate the DC before SetFont() is called on the status bar

[wxWidgets.git] / include / wx / os2 / clipbrd.h

diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h
index f637d8de70534cb951d1e7de09c700c86568f4ff..decb449531ce5c8383cb72cb063b99bad5f35aca 100644 (file)
--- a/include/wx/os2/clipbrd.h
+++ b/include/wx/os2/clipbrd.h
@@ -2,8 +2,8 @@
 // Name:        clipbrd.h
 // Purpose:     Clipboard functionality.
 //              Note: this functionality is under review, and
 // Name:        clipbrd.h
 // Purpose:     Clipboard functionality.
 //              Note: this functionality is under review, and

-//              is derived from wxWindows 1.xx code. Please contact
-//              the wxWindows developers for further information.
+//              is derived from wxWidgets 1.xx code. Please contact
+//              the wxWidgets developers for further information.

 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99


@@ -25,24 +25,24 @@
 // implement wxClipboard, and for compatibility.
 
 // open/close the clipboard
 // implement wxClipboard, and for compatibility.
 
 // open/close the clipboard

-WXDLLEXPORT bool wxOpenClipboard();
-WXDLLEXPORT bool wxIsClipboardOpened();
+WXDLLIMPEXP_CORE bool wxOpenClipboard();
+WXDLLIMPEXP_CORE bool wxIsClipboardOpened();

 #define wxClipboardOpen wxIsClipboardOpened
 #define wxClipboardOpen wxIsClipboardOpened

-WXDLLEXPORT bool wxCloseClipboard();
+WXDLLIMPEXP_CORE bool wxCloseClipboard();

 
 // get/set data
 
 // get/set data

-WXDLLEXPORT bool wxEmptyClipboard();
-WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE bool wxEmptyClipboard();
+WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat,

                                     const void *data,
                                     int width = 0, int height = 0);
                                     const void *data,
                                     int width = 0, int height = 0);

-WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat,

                                      long *len = NULL);
 
 // clipboard formats
                                      long *len = NULL);
 
 // clipboard formats

-WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLEXPORT int  wxRegisterClipboardFormat(wxChar *formatName);
-WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
+WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
+WXDLLIMPEXP_CORE int  wxRegisterClipboardFormat(wxChar *formatName);
+WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat,

                                           wxChar *formatName,
                                           int maxCount);
 
                                           wxChar *formatName,
                                           int maxCount);
 


@@ -50,14 +50,14 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 // wxClipboard
 //-----------------------------------------------------------------------------
 
 // wxClipboard
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxClipboard : public wxObject
+class WXDLLIMPEXP_FWD_CORE wxDataObject;
+class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase

 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
     wxClipboard();
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
     wxClipboard();

-    ~wxClipboard();
+    virtual ~wxClipboard();

 
     // open the clipboard before SetData() and GetData()
     virtual bool Open();
 
     // open the clipboard before SetData() and GetData()
     virtual bool Open();


@@ -75,7 +75,7 @@ public:
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available

-    virtual bool IsSupported( wxDataFormat format );
+    virtual bool IsSupported( const wxDataFormat& format );

 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );


@@ -88,13 +88,9 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 

-    // X11 has two clipboards which get selected by this call. Empty on MSW.
-    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
-

 private:
     bool m_clearOnExit;
 };
 
 #endif // wxUSE_CLIPBOARD
 private:
     bool m_clearOnExit;
 };
 
 #endif // wxUSE_CLIPBOARD

-#endif
-    // _WX_CLIPBRD_H_
+#endif // _WX_CLIPBRD_H_