Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-02 10:39:23 +00:00
parent a8461d3170
commit de6185e212
138 changed files with 642 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/gtk1/clipbrd.cpp
View File

@@ -16,10 +16,10 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/utils.h"
#endif
#include "wx/dataobj.h"
#include "wx/utils.h"
#include <glib.h>
#include <gdk/gdk.h>
@@ -86,7 +86,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
wxLogTrace( TRACE_CLIPBOARD,
_T("got unsupported clipboard target") );
clipboard->m_waiting = FALSE;
clipboard->m_waiting = false;
g_free(atom_name);
return;
}
@@ -117,14 +117,14 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
if (format == clipboard->m_targetRequested)
{
clipboard->m_waiting = FALSE;
clipboard->m_formatSupported = TRUE;
clipboard->m_waiting = false;
clipboard->m_formatSupported = true;
return;
}
}
}
clipboard->m_waiting = FALSE;
clipboard->m_waiting = false;
}
}
@@ -141,7 +141,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
{
if (!wxTheClipboard)
{
clipboard->m_waiting = FALSE;
clipboard->m_waiting = false;
return;
}
@@ -149,13 +149,13 @@ selection_received( GtkWidget *WXUNUSED(widget),
if (!data_object)
{
clipboard->m_waiting = FALSE;
clipboard->m_waiting = false;
return;
}
if (selection_data->length <= 0)
{
clipboard->m_waiting = FALSE;
clipboard->m_waiting = false;
return;
}
@@ -164,7 +164,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
// make sure we got the data in the correct format
if (!data_object->IsSupportedFormat( format ) )
{
clipboard->m_waiting = FALSE;
clipboard->m_waiting = false;
return;
}
@@ -174,15 +174,15 @@ selection_received( GtkWidget *WXUNUSED(widget),
// if so, copy data to target object
if (selection_data->type != GDK_SELECTION_TYPE_STRING)
{
clipboard->m_waiting = FALSE;
clipboard->m_waiting = false;
return;
}
#endif
data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
wxTheClipboard->m_formatSupported = TRUE;
clipboard->m_waiting = FALSE;
wxTheClipboard->m_formatSupported = true;
clipboard->m_waiting = false;
}
}
@@ -198,16 +198,16 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
if (event->selection == GDK_SELECTION_PRIMARY)
{
wxTheClipboard->m_ownsPrimarySelection = FALSE;
wxTheClipboard->m_ownsPrimarySelection = false;
}
else
if (event->selection == g_clipboardAtom)
{
wxTheClipboard->m_ownsClipboard = FALSE;
wxTheClipboard->m_ownsClipboard = false;
}
else
{
wxTheClipboard->m_waiting = FALSE;
wxTheClipboard->m_waiting = false;
return FALSE;
}
@@ -224,7 +224,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
}
}
wxTheClipboard->m_waiting = FALSE;
wxTheClipboard->m_waiting = false;
return TRUE;
}
}
@@ -308,11 +308,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
wxClipboard::wxClipboard()
{
m_open = FALSE;
m_waiting = FALSE;
m_open = false;
m_waiting = false;
m_ownsClipboard = FALSE;
m_ownsPrimarySelection = FALSE;
m_ownsClipboard = false;
m_ownsPrimarySelection = false;
m_data = (wxDataObject*) NULL;
m_receivedData = (wxDataObject*) NULL;
@@ -346,10 +346,10 @@ wxClipboard::wxClipboard()
if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
if (!g_timestampAtom) g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE);
m_formatSupported = FALSE;
m_formatSupported = false;
m_targetRequested = 0;
m_usePrimary = FALSE;
m_usePrimary = false;
}
wxClipboard::~wxClipboard()
@@ -372,7 +372,7 @@ void wxClipboard::Clear()
// it, clear_selection is called which will set m_data to zero
if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
{
m_waiting = TRUE;
m_waiting = true;
gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
(guint32) GDK_CURRENT_TIME );
@@ -382,7 +382,7 @@ void wxClipboard::Clear()
if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
{
m_waiting = TRUE;
m_waiting = true;
gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
(guint32) GDK_CURRENT_TIME );
@@ -402,23 +402,23 @@ void wxClipboard::Clear()
}
m_targetRequested = 0;
m_formatSupported = FALSE;
m_formatSupported = false;
}
bool wxClipboard::Open()
{
wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );
m_open = TRUE;
m_open = true;
return TRUE;
return true;
}
bool wxClipboard::SetData( wxDataObject *data )
{
wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
wxCHECK_MSG( data, false, wxT("data is invalid") );
Clear();
@@ -427,9 +427,9 @@ bool wxClipboard::SetData( wxDataObject *data )
bool wxClipboard::AddData( wxDataObject *data )
{
wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
wxCHECK_MSG( data, false, wxT("data is invalid") );
// we can only store one wxDataObject
Clear();
@@ -497,7 +497,7 @@ void wxClipboard::Close()
{
wxCHECK_RET( m_open, wxT("clipboard not open") );
m_open = FALSE;
m_open = false;
}
bool wxClipboard::IsOpened() const
@@ -508,7 +508,7 @@ bool wxClipboard::IsOpened() const
bool wxClipboard::IsSupported( const wxDataFormat& format )
{
/* reentrance problems */
if (m_waiting) return FALSE;
if (m_waiting) return false;
/* store requested format to be asked for by callbacks */
m_targetRequested = format;
@@ -517,19 +517,19 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
wxT("wxClipboard:IsSupported: requested format: %s"),
format.GetId().c_str() );
wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );
m_formatSupported = FALSE;
m_formatSupported = false;
/* perform query. this will set m_formatSupported to
TRUE if m_targetRequested is supported.
true if m_targetRequested is supported.
also, we have to wait for the "answer" from the
clipboard owner which is an asynchronous process.
therefore we set m_waiting = TRUE here and wait
therefore we set m_waiting = true here and wait
until the callback "targets_selection_received"
sets it to FALSE */
sets it to false */
m_waiting = TRUE;
m_waiting = true;
gtk_selection_convert( m_targetsWidget,
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
@@ -544,7 +544,7 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
bool wxClipboard::GetData( wxDataObject& data )
{
wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
/* get formats from wxDataObjects */
wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
@@ -563,19 +563,19 @@ bool wxClipboard::GetData( wxDataObject& data )
/* store requested format to be asked for by callbacks */
m_targetRequested = format;
wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );
m_formatSupported = FALSE;
m_formatSupported = false;
/* perform query. this will set m_formatSupported to
TRUE if m_targetRequested is supported.
true if m_targetRequested is supported.
also, we have to wait for the "answer" from the
clipboard owner which is an asynchronous process.
therefore we set m_waiting = TRUE here and wait
therefore we set m_waiting = true here and wait
until the callback "targets_selection_received"
sets it to FALSE */
sets it to false */
m_waiting = TRUE;
m_waiting = true;
gtk_selection_convert( m_targetsWidget,
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
@@ -593,21 +593,21 @@ bool wxClipboard::GetData( wxDataObject& data )
/* store requested format to be asked for by callbacks */
m_targetRequested = format;
wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );
/* start query */
m_formatSupported = FALSE;
m_formatSupported = false;
/* ask for clipboard contents. this will set
m_formatSupported to TRUE if m_targetRequested
m_formatSupported to true if m_targetRequested
is supported.
also, we have to wait for the "answer" from the
clipboard owner which is an asynchronous process.
therefore we set m_waiting = TRUE here and wait
therefore we set m_waiting = true here and wait
until the callback "targets_selection_received"
sets it to FALSE */
sets it to false */
m_waiting = TRUE;
m_waiting = true;
wxLogTrace( TRACE_CLIPBOARD,
wxT("wxClipboard::GetData: format found, start convert") );
@@ -621,11 +621,11 @@ bool wxClipboard::GetData( wxDataObject& data )
while (m_waiting) gtk_main_iteration();
/* this is a true error as we checked for the presence of such data before */
wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") );
wxCHECK_MSG( m_formatSupported, false, wxT("error retrieving data from clipboard") );
/* return success */
delete[] array;
return TRUE;
return true;
}
wxLogTrace( TRACE_CLIPBOARD,
@@ -633,7 +633,7 @@ bool wxClipboard::GetData( wxDataObject& data )
/* return failure */
delete[] array;
return FALSE;
return false;
}
#endif