compilation fixes for old gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -508,7 +508,8 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
|
|||||||
m_waiting = TRUE;
|
m_waiting = TRUE;
|
||||||
|
|
||||||
gtk_selection_convert( m_targetsWidget,
|
gtk_selection_convert( m_targetsWidget,
|
||||||
m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom,
|
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
|
||||||
|
: g_clipboardAtom,
|
||||||
g_targetsAtom,
|
g_targetsAtom,
|
||||||
GDK_CURRENT_TIME );
|
GDK_CURRENT_TIME );
|
||||||
|
|
||||||
@@ -562,7 +563,8 @@ bool wxClipboard::GetData( wxDataObject& data )
|
|||||||
wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
|
wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
|
||||||
|
|
||||||
gtk_selection_convert( m_clipboardWidget,
|
gtk_selection_convert( m_clipboardWidget,
|
||||||
m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom,
|
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
|
||||||
|
: g_clipboardAtom,
|
||||||
m_targetRequested,
|
m_targetRequested,
|
||||||
GDK_CURRENT_TIME );
|
GDK_CURRENT_TIME );
|
||||||
|
|
||||||
|
@@ -508,7 +508,8 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
|
|||||||
m_waiting = TRUE;
|
m_waiting = TRUE;
|
||||||
|
|
||||||
gtk_selection_convert( m_targetsWidget,
|
gtk_selection_convert( m_targetsWidget,
|
||||||
m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom,
|
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
|
||||||
|
: g_clipboardAtom,
|
||||||
g_targetsAtom,
|
g_targetsAtom,
|
||||||
GDK_CURRENT_TIME );
|
GDK_CURRENT_TIME );
|
||||||
|
|
||||||
@@ -562,7 +563,8 @@ bool wxClipboard::GetData( wxDataObject& data )
|
|||||||
wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
|
wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
|
||||||
|
|
||||||
gtk_selection_convert( m_clipboardWidget,
|
gtk_selection_convert( m_clipboardWidget,
|
||||||
m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom,
|
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
|
||||||
|
: g_clipboardAtom,
|
||||||
m_targetRequested,
|
m_targetRequested,
|
||||||
GDK_CURRENT_TIME );
|
GDK_CURRENT_TIME );
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user