X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a36d790a7bdb3f30378010a9d657584868b2e7ab..252d21bd383ac3c94c45bfd919bdfb82f43345d8:/include/wx/msw/clipbrd.h?ds=inline diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h index c4a2594970..ce57d79a5c 100644 --- a/include/wx/msw/clipbrd.h +++ b/include/wx/msw/clipbrd.h @@ -12,7 +12,7 @@ #ifndef _WX_CLIPBRD_H_ #define _WX_CLIPBRD_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "clipbrd.h" #endif @@ -52,7 +52,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, //----------------------------------------------------------------------------- class WXDLLEXPORT wxDataObject; -class WXDLLEXPORT wxClipboard : public wxObject +class WXDLLEXPORT wxClipboard : public wxClipboardBase { DECLARE_DYNAMIC_CLASS(wxClipboard) @@ -76,7 +76,7 @@ public: 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 ); @@ -90,7 +90,7 @@ public: virtual bool Flush(); // X11 has two clipboards which get selected by this call. Empty on MSW. - void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { } + void UsePrimarySelection( bool WXUNUSED(primary) = false ) { } private: bool m_clearOnExit;