Applied patch [ 1443707 ] kill "cast truncates constant value" warnings

[wxWidgets.git] / src / motif / clipbrd.cpp

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 7b13ed0d2bfac3076ea3ecad3c7f3bc92673214b..1353a842a924c251b42192aa36ae3f86169d43a7 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -1,19 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.cpp
+// Name:        src/motif/clipbrd.cpp

 // Purpose:     Clipboard functionality
 // Author:      Julian Smart
 // Modified by: Mattia Barbon (added support for generic wxDataObjects)
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     Clipboard functionality
 // Author:      Julian Smart
 // Modified by: Mattia Barbon (added support for generic wxDataObjects)
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#pragma implementation "clipbrd.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -72,7 +67,7 @@ bool wxClipboardOpen()
     return wxTheClipboard->IsOpened();
 }
 
     return wxTheClipboard->IsOpened();
 }
 

-bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
+bool wxIsClipboardFormatAvailable(const wxDataFormat& dataFormat)

 {
     return wxTheClipboard->IsSupported( dataFormat );
 }
 {
     return wxTheClipboard->IsSupported( dataFormat );
 }


@@ -134,7 +129,7 @@ wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len)
     return NULL; // just in case...
 }
 
     return NULL; // just in case...
 }
 

-wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
+wxDataFormat wxEnumClipboardFormats(const wxDataFormat& dataFormat)

 {
     // Only wxDF_TEXT supported
     if (dataFormat == wxDF_TEXT)
 {
     // Only wxDF_TEXT supported
     if (dataFormat == wxDF_TEXT)


@@ -149,7 +144,7 @@ wxDataFormat wxRegisterClipboardFormat(char *WXUNUSED(formatName))
     return wxDF_INVALID;
 }
 
     return wxDF_INVALID;
 }
 

-bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName,
+bool wxGetClipboardFormatName(const wxDataFormat& dataFormat, char *formatName,

                               int maxCount)
 {
     wxStrncpy( formatName, dataFormat.GetId().c_str(), maxCount );
                               int maxCount)
 {
     wxStrncpy( formatName, dataFormat.GetId().c_str(), maxCount );


@@ -173,8 +168,8 @@ struct wxDataIdToDataObject
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxDataObjectList);
-WX_DEFINE_LIST(wxDataIdToDataObjectList);
+WX_DEFINE_LIST(wxDataObjectList)
+WX_DEFINE_LIST(wxDataIdToDataObjectList)

 
 extern "C"
 {
 
 extern "C"
 {


@@ -196,7 +191,7 @@ wxClipboard::wxClipboard()
 
 wxClipboard::~wxClipboard()
 {
 
 wxClipboard::~wxClipboard()
 {

-    Clear();  
+    Clear();

 }
 
 void wxClipboard::Clear()
 }
 
 void wxClipboard::Clear()


@@ -220,7 +215,7 @@ void wxClipboard::Clear()
 bool wxClipboard::Open()
 {
     wxCHECK_MSG( !m_open, false, "clipboard already open" );
 bool wxClipboard::Open()
 {
     wxCHECK_MSG( !m_open, false, "clipboard already open" );

-  
+

     m_open = true;
 
     return true;
     m_open = true;
 
     return true;


@@ -236,15 +231,15 @@ bool wxClipboard::SetData( wxDataObject *data )
     return AddData( data );
 }
 
     return AddData( data );
 }
 

-wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
-wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
+wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray )
+wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray )

 
 #if wxCHECK_LESSTIF()
 void wxClipboardCallback( Widget xwidget, int* data_id,
 
 #if wxCHECK_LESSTIF()
 void wxClipboardCallback( Widget xwidget, int* data_id,

-                          int* priv, int* reason )
+                          int* priv, int* WXUNUSED(reason) )

 #else
 void wxClipboardCallback( Widget xwidget, long* data_id,
 #else
 void wxClipboardCallback( Widget xwidget, long* data_id,

-                          long* priv, int* reason )
+                          long* priv, int* WXUNUSED(reason) )

 #endif
 {
     Display* xdisplay = XtDisplay( xwidget );
 #endif
 {
     Display* xdisplay = XtDisplay( xwidget );


@@ -331,7 +326,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 void wxClipboard::Close()
 {
     wxCHECK_RET( m_open, "clipboard not open" );
 void wxClipboard::Close()
 {
     wxCHECK_RET( m_open, "clipboard not open" );

-    
+

     m_open = false;
 }
 
     m_open = false;
 }
 


@@ -420,7 +415,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     size_t dfcount = data.GetFormatCount( wxDataObject::Set );
     wxDataFormatScopedArray dfarr( new wxDataFormat[dfcount] );
     data.GetAllFormats( dfarr.get(), wxDataObject::Set );
     size_t dfcount = data.GetFormatCount( wxDataObject::Set );
     wxDataFormatScopedArray dfarr( new wxDataFormat[dfcount] );
     data.GetAllFormats( dfarr.get(), wxDataObject::Set );

-    
+

     if( XmClipboardInquireCount( xdisplay, xwindow, &count, &max_name_length )
         == XmClipboardSuccess )
     {
     if( XmClipboardInquireCount( xdisplay, xwindow, &count, &max_name_length )
         == XmClipboardSuccess )
     {