X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..763163a80ae0d5a0684633e72f928302578c1214:/src/os2/clipbrd.cpp diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp index e27f3bc58a..e4bd46af6f 100644 --- a/src/os2/clipbrd.cpp +++ b/src/os2/clipbrd.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: clipbrd.cpp +// Name: src/os2/clipbrd.cpp // Purpose: Clipboard functionality // Author: David Webster // Modified by: @@ -12,12 +12,10 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifndef WX_PRECOMP - #include "wx/setup.h" -#endif - #if wxUSE_CLIPBOARD +#include "wx/clipbrd.h" + #ifndef WX_PRECOMP #include "wx/object.h" #include "wx/event.h" @@ -26,26 +24,20 @@ #include "wx/bitmap.h" #include "wx/utils.h" #include "wx/intl.h" + #include "wx/log.h" + #include "wx/dataobj.h" #endif #if wxUSE_METAFILE #include "wx/metafile.h" #endif -#include "wx/log.h" -#include "wx/clipbrd.h" - #include #include "wx/os2/private.h" // wxDataObject is tied to OLE/drag and drop implementation, // therefore so is wxClipboard :-( -#if wxUSE_DRAG_AND_DROP - #include "wx/dataobj.h" - -// static bool wxSetClipboardData(wxDataObject *data); -#endif // =========================================================================== // implementation @@ -55,11 +47,11 @@ // old-style clipboard functions using Windows API // --------------------------------------------------------------------------- -static bool gs_wxClipboardIsOpen = FALSE; +static bool gs_wxClipboardIsOpen = false; bool wxOpenClipboard() { - wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, wxT("clipboard already opened.") ); + wxCHECK_MSG( !gs_wxClipboardIsOpen, true, wxT("clipboard already opened.") ); // TODO: /* wxWindow *win = wxTheApp->GetTopWindow(); @@ -76,27 +68,27 @@ bool wxOpenClipboard() { wxLogDebug(wxT("Can not open clipboard without a main window.")); - return FALSE; + return false; } */ - return FALSE; + return false; } bool wxCloseClipboard() { - wxCHECK_MSG( gs_wxClipboardIsOpen, FALSE, wxT("clipboard is not opened") ); + wxCHECK_MSG( gs_wxClipboardIsOpen, false, wxT("clipboard is not opened") ); // TODO: /* - gs_wxClipboardIsOpen = FALSE; + gs_wxClipboardIsOpen = false; if ( ::CloseClipboard() == 0 ) { wxLogSysError(_("Failed to close the clipboard.")); - return FALSE; + return false; } */ - return TRUE; + return true; } bool wxEmptyClipboard() @@ -107,10 +99,10 @@ bool wxEmptyClipboard() { wxLogSysError(_("Failed to empty the clipboard.")); - return FALSE; + return false; } */ - return TRUE; + return true; } bool wxIsClipboardOpened() @@ -118,10 +110,10 @@ bool wxIsClipboardOpened() return gs_wxClipboardIsOpen; } -bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat) +bool wxIsClipboardFormatAvailable(wxDataFormat WXUNUSED(dataFormat)) { // TODO: return ::IsClipboardFormatAvailable(dataFormat) != 0; - return FALSE; + return false; } #if 0 @@ -137,7 +129,7 @@ static bool wxSetClipboardData(wxDataObject *data) wxLogSysError(_("Failed to allocate %dKb of memory for clipboard " "transfer."), size / 1024); - return FALSE; + return false; } LPVOID lpGlobalMemory = ::GlobalLock(hGlobal); @@ -152,17 +144,17 @@ static bool wxSetClipboardData(wxDataObject *data) wxLogSysError(_("Failed to set clipboard data in format %s"), wxDataObject::GetFormatName(format)); - return FALSE; + return false; } */ - return TRUE; + return true; } #endif // wxUSE_DRAG_AND_DROP #endif -bool wxSetClipboardData(wxDataFormat dataFormat, - const void *data, - int width, int height) +bool wxSetClipboardData(wxDataFormat WXUNUSED(dataFormat), + const void *WXUNUSED(data), + int WXUNUSED(width), int WXUNUSED(height)) { // TODO: /* @@ -185,7 +177,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, SelectObject(hdcSrc, old); DeleteDC(hdcMem); DeleteDC(hdcSrc); - return FALSE; + return false; } HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap); @@ -242,7 +234,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, default: { wxLogError(_("Unsupported clipboard format.")); - return FALSE; + return false; } case wxDF_OEMTEXT: @@ -275,13 +267,13 @@ bool wxSetClipboardData(wxDataFormat dataFormat, { wxLogSysError(_("Failed to set clipboard data.")); - return FALSE; + return false; } */ - return TRUE; + return true; } -void *wxGetClipboardData(wxDataFormat dataFormat, long *len) +void *wxGetClipboardData(wxDataFormat WXUNUSED(dataFormat), long *WXUNUSED(len)) { // void *retval = NULL; // TODO: @@ -329,7 +321,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) wxBM->SetWidth(bm.bmWidth); wxBM->SetHeight(bm.bmHeight); wxBM->SetDepth(bm.bmPlanes); - wxBM->SetOk(TRUE); + wxBM->SetOk(true); retval = wxBM; break; } @@ -342,7 +334,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) case wxDF_DIB: { wxLogError(_("Unsupported clipboard format.")); - return FALSE; + return NULL; } case wxDF_OEMTEXT: @@ -414,15 +406,15 @@ wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat) return dataFormat; } -int wxRegisterClipboardFormat(wxChar *formatName) +int wxRegisterClipboardFormat(wxChar *WXUNUSED(formatName)) { // TODO: return ::RegisterClipboardFormat(formatName); return 0; } -bool wxGetClipboardFormatName(wxDataFormat dataFormat, - wxChar *formatName, - int maxCount) +bool wxGetClipboardFormatName(wxDataFormat WXUNUSED(dataFormat), + wxChar *WXUNUSED(formatName), + int WXUNUSED(maxCount)) { // TODO: return ::GetClipboardFormatName((int)dataFormat, formatName, maxCount) > 0; return 0; @@ -450,7 +442,7 @@ void wxClipboard::Clear() bool wxClipboard::Flush() { // TODO: - return FALSE; + return false; } bool wxClipboard::Open() @@ -463,7 +455,7 @@ bool wxClipboard::IsOpened() const return wxIsClipboardOpened(); } -bool wxClipboard::SetData( wxDataObject *data ) +bool wxClipboard::SetData( wxDataObject *WXUNUSED(data) ) { (void)wxEmptyClipboard(); // TODO: @@ -471,17 +463,17 @@ bool wxClipboard::SetData( wxDataObject *data ) if ( data ) return AddData(data); else - return TRUE; + return true; */ - return TRUE; + return true; } bool wxClipboard::AddData( wxDataObject *data ) { - wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); + wxCHECK_MSG( data, false, wxT("data is invalid") ); #if wxUSE_DRAG_AND_DROP - wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") ); // wxDataFormat format = data->GetPreferredFormat(); // TODO: @@ -521,9 +513,9 @@ bool wxClipboard::AddData( wxDataObject *data ) } #else // !wxUSE_DRAG_AND_DROP */ - return FALSE; + return false; #else - return FALSE; + return false; #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP } @@ -532,14 +524,14 @@ void wxClipboard::Close() wxCloseClipboard(); } -bool wxClipboard::IsSupported( wxDataFormat format ) +bool wxClipboard::IsSupported( const wxDataFormat& format ) { return wxIsClipboardFormatAvailable(format); } -bool wxClipboard::GetData( wxDataObject& data ) +bool wxClipboard::GetData( wxDataObject& WXUNUSED(data) ) { - wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") ); #if wxUSE_DRAG_AND_DROP // wxDataFormat format = data.GetPreferredFormat(); @@ -556,10 +548,10 @@ bool wxClipboard::GetData( wxDataObject& data ) { textDataObject.SetText(s); delete[] s; - return TRUE; + return true; } else - return FALSE; + return false; } case wxDF_BITMAP: @@ -571,10 +563,10 @@ bool wxClipboard::GetData( wxDataObject& data ) { bitmapDataObject.SetBitmap(* bitmap); delete bitmap; - return TRUE; + return true; } else - return FALSE; + return false; } #if wxUSE_METAFILE case wxDF_METAFILE: @@ -585,10 +577,10 @@ bool wxClipboard::GetData( wxDataObject& data ) { metaFileDataObject.SetMetafile(*metaFile); delete metaFile; - return TRUE; + return true; } else - return FALSE; + return false; } #endif default: @@ -597,25 +589,22 @@ bool wxClipboard::GetData( wxDataObject& data ) void *buf = wxGetClipboardData(format, &len); if ( buf ) { - // FIXME this is for testing only!! + // FIXME this is for testing only! ((wxPrivateDataObject &)data).SetData(buf, len); free(buf); - return TRUE; + return true; } } - return FALSE; + return false; } #else */ - return FALSE; + return false; #else - return FALSE; + return false; #endif } -#else - #error "Please turn wxUSE_CLIPBOARD on to compile this file." #endif // wxUSE_CLIPBOARD -