Attachment #85227 for bug #130899

View | Details | Raw Unified | Return to bug 130899
Collapse All | Expand All




// Author:      Vadim Zeitlin, Robert Roebling
// Modified by:
// Created:     19.10.99
// RCS-ID:      $Id: dobjcmn.cpp,v 1.35.2.2 2006/03/30 09:52:54 RR Exp $
// Copyright:   (c) wxWidgets Team
// Licence:     wxWindows licence
///////////////////////////////////////////////////////////////////////////////


bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
{
    if ( !buf )
        return false;
        
    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
    if ( !buffer )
        return false;

    memcpy( (char*) buf, buffer, GetDataSize(format) );
    // strcpy( (char*) buf, buffer );

    return true;
}

Lines 5-11 Link Here

(-)wxWidgets-2.6.3/src/common/socket.cpp (-2 / +2 lines)
5	// Created: April 1997	5	// Created: April 1997
6	// Copyright: (C) 1999-1997, Guilhem Lavaux	6	// Copyright: (C) 1999-1997, Guilhem Lavaux
7	// (C) 2000-1999, Guillermo Rodriguez Garcia	7	// (C) 2000-1999, Guillermo Rodriguez Garcia
8	// RCS_ID: $Id: socket.cpp,v 1.133.2.2 2006/02/16 08:53:35 JS Exp $	8	// RCS_ID: $Id: socket.cpp,v 1.133.2.3 2006/03/30 15:27:59 KH Exp $
9	// License: see wxWindows licence	9	// License: see wxWindows licence
10	/////////////////////////////////////////////////////////////////////////////	10	/////////////////////////////////////////////////////////////////////////////
11		11
Lines 698-704 Link Here
698	else	698	else
699	timeout = m_timeout * 1000;	699	timeout = m_timeout * 1000;
700		700
701	bool has_event_loop = wxTheApp ? (wxTheApp->GetTraits() ? true : false) : false;	701	bool has_event_loop = wxTheApp->GetTraits() ? (wxTheApp->GetTraits()->GetSocketGUIFunctionsTable() ? true : false) : false;
702		702
703	// Wait in an active polling loop.	703	// Wait in an active polling loop.
704	//	704	//

Lines 3-9 Link Here

(-)wxWidgets-2.6.3/src/generic/listctrl.cpp (-6 / +35 lines)
3	// Purpose: generic implementation of wxListCtrl	3	// Purpose: generic implementation of wxListCtrl
4	// Author: Robert Roebling	4	// Author: Robert Roebling
5	// Vadim Zeitlin (virtual list control support)	5	// Vadim Zeitlin (virtual list control support)
6	// Id: $Id: listctrl.cpp,v 1.378.2.7 2006/03/10 21:37:20 RD Exp $	6	// Id: $Id: listctrl.cpp,v 1.378.2.8 2006/03/28 08:25:51 RR Exp $
7	// Copyright: (c) 1998 Robert Roebling	7	// Copyright: (c) 1998 Robert Roebling
8	// Licence: wxWindows licence	8	// Licence: wxWindows licence
9	/////////////////////////////////////////////////////////////////////////////	9	/////////////////////////////////////////////////////////////////////////////
Lines 2914-2919 Link Here
2914		2914
2915	void wxListMainWindow::OnMouse( wxMouseEvent &event )	2915	void wxListMainWindow::OnMouse( wxMouseEvent &event )
2916	{	2916	{
		2917
2917	#ifdef __WXMAC__	2918	#ifdef __WXMAC__
2918	// On wxMac we can't depend on the EVT_KILL_FOCUS event to properly	2919	// On wxMac we can't depend on the EVT_KILL_FOCUS event to properly
2919	// shutdown the edit control when the mouse is clicked elsewhere on the	2920	// shutdown the edit control when the mouse is clicked elsewhere on the
Lines 2937-2943 Link Here
2937	}	2938	}
2938		2939
2939	if ( !HasCurrent() \|\| IsEmpty() )	2940	if ( !HasCurrent() \|\| IsEmpty() )
		2941	{
		2942	if (event.RightDown())
		2943	{
		2944	SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
		2945	// Allow generation of context menu event
		2946	event.Skip();
		2947	}
2940	return;	2948	return;
		2949	}
2941		2950
2942	if (m_dirty)	2951	if (m_dirty)
2943	return;	2952	return;
Lines 3005-3015 Link Here
3005	m_dragCount = 0;	3014	m_dragCount = 0;
3006	}	3015	}
3007		3016
3008	if ( !hitResult )	3017	if ( !hitResult )
3009	{	3018	{
3010	// outside of any item	3019	if (event.RightDown())
3011	return;	3020	{
3012	}	3021	SendNotify( (size_t) -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
		3022	// Allow generation of context menu event
		3023	event.Skip();
		3024	}
		3025
		3026	return;
		3027	}
3013		3028
3014	bool forceClick = false;	3029	bool forceClick = false;
3015	if (event.ButtonDClick())	3030	if (event.ButtonDClick())
Lines 3319-3324 Link Here
3319		3334
3320	case WXK_PRIOR:	3335	case WXK_PRIOR:
3321	{	3336	{
		3337	// avoid floating point exception
		3338	if (m_linesPerPage == 0)
		3339	m_linesPerPage = 1;
		3340
3322	int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;	3341	int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;
3323		3342
3324	int index = m_current - steps;	3343	int index = m_current - steps;
Lines 3331-3336 Link Here
3331		3350
3332	case WXK_NEXT:	3351	case WXK_NEXT:
3333	{	3352	{
		3353	// avoid floating point exception
		3354	if (m_linesPerPage == 0)
		3355	m_linesPerPage = 1;
		3356
3334	int steps = InReportView()	3357	int steps = InReportView()
3335	? m_linesPerPage - 1	3358	? m_linesPerPage - 1
3336	: m_linesPerPage - (m_current % m_linesPerPage) - 1;	3359	: m_linesPerPage - (m_current % m_linesPerPage) - 1;
Lines 4667-4673 Link Here
4667		4690
4668	void wxListMainWindow::OnScroll(wxScrollWinEvent& event)	4691	void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
4669	{	4692	{
4670	// update our idea of which lines are shown when we redraw the window the	4693	int cw, ch, vw, vh;
		4694	GetVirtualSize(&vw, &vh);
		4695	GetClientSize(&cw, &ch);
		4696	if (event.GetOrientation() == wxVERTICAL && ch >= vh)
		4697	return;
		4698
		4699	// update our idea of which lines are shown when we redraw the window the
4671	// next time	4700	// next time
4672	ResetVisibleLinesRange();	4701	ResetVisibleLinesRange();
4673		4702




// Name:        gtk/clipbrd.cpp
// Purpose:
// Author:      Robert Roebling
// Id:          $Id: clipbrd.cpp,v 1.60.2.4 2006/03/30 01:31:36 RD Exp $
// Copyright:   (c) 1998 Robert Roebling
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

    }

    delete[] array;
    
#ifdef __WXGTK20__
    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
                        "selection_get",
                        GTK_SIGNAL_FUNC(selection_handler),
                        GUINT_TO_POINTER(
#ifdef __WXGTK20__
                                gtk_get_current_event_time()
                            ) );
#else
    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
                        "selection_get",
                        GTK_SIGNAL_FUNC(selection_handler),
                        GUINT_TO_POINTER(
                                gdk_event_get_time(gtk_get_current_event())
                            ) );
#endif
                                        ) );

#if wxUSE_THREADS
    /* disable GUI threads */




// Name:        gtk/window.cpp
// Purpose:
// Author:      Robert Roebling
// Id:          $Id: window.cpp,v 1.548.2.14 2006/03/30 10:36:22 RR Exp $
// Copyright:   (c) 1998 Robert Roebling, Julian Smart
// Licence:     wxWindows licence
/////////////////////////////////////////////////////////////////////////////

    event.m_scanCode = gdk_event->keyval;
    event.m_rawCode = (wxUint32) gdk_event->keyval;
    event.m_rawFlags = 0;
#if wxUSE_UNICODE
    event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
#endif
    wxGetMousePosition( &x, &y );
    win->ScreenToClient( &x, &y );
    event.m_x = x;

            if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' )
            {
                event.m_keyCode = key_code - 'a' + 1;
#if wxUSE_UNICODE
                event.m_uniChar = event.m_keyCode;
#endif
            }               

#if wxUSE_UNICODE
            event.m_uniChar = event.m_keyCode;
#endif
            // Implement OnCharHook by checking ancesteror top level windows
            wxWindow *parent = win;
            while (parent && !parent->IsTopLevel())

Return to bug 130899

Lines 4-10 Link Here

(-)wxWidgets-2.6.3/src/common/dobjcmn.cpp (-2 / +6 lines)
4	// Author: Vadim Zeitlin, Robert Roebling	4	// Author: Vadim Zeitlin, Robert Roebling
5	// Modified by:	5	// Modified by:
6	// Created: 19.10.99	6	// Created: 19.10.99
7	// RCS-ID: $Id: dobjcmn.cpp,v 1.35.2.1 2006/03/24 23:51:30 RD Exp $	7	// RCS-ID: $Id: dobjcmn.cpp,v 1.35.2.2 2006/03/30 09:52:54 RR Exp $
8	// Copyright: (c) wxWidgets Team	8	// Copyright: (c) wxWidgets Team
9	// Licence: wxWindows licence	9	// Licence: wxWindows licence
10	///////////////////////////////////////////////////////////////////////////////	10	///////////////////////////////////////////////////////////////////////////////
Lines 253-263 Link Here
253		253
254	bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const	254	bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
255	{	255	{
		256	if ( !buf )
		257	return false;
		258
256	wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );	259	wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
257	if ( !buffer )	260	if ( !buffer )
258	return false;	261	return false;
259		262
260	strcpy( (char*) buf, buffer );	263	memcpy( (char*) buf, buffer, GetDataSize(format) );
		264	// strcpy( (char*) buf, buffer );
261		265
262	return true;	266	return true;
263	}	267	}

Lines 2-8 Link Here

(-)wxWidgets-2.6.3/src/gtk/clipbrd.cpp (-4 / +9 lines)
2	// Name: gtk/clipbrd.cpp	2	// Name: gtk/clipbrd.cpp
3	// Purpose:	3	// Purpose:
4	// Author: Robert Roebling	4	// Author: Robert Roebling
5	// Id: $Id: clipbrd.cpp,v 1.60.2.3 2006/03/24 23:51:29 RD Exp $	5	// Id: $Id: clipbrd.cpp,v 1.60.2.4 2006/03/30 01:31:36 RD Exp $
6	// Copyright: (c) 1998 Robert Roebling	6	// Copyright: (c) 1998 Robert Roebling
7	// Licence: wxWindows licence	7	// Licence: wxWindows licence
8	/////////////////////////////////////////////////////////////////////////////	8	/////////////////////////////////////////////////////////////////////////////
Lines 493-509 Link Here
493	}	493	}
494		494
495	delete[] array;	495	delete[] array;
496		496
		497	#ifdef __WXGTK20__
497	gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),	498	gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
498	"selection_get",	499	"selection_get",
499	GTK_SIGNAL_FUNC(selection_handler),	500	GTK_SIGNAL_FUNC(selection_handler),
500	GUINT_TO_POINTER(	501	GUINT_TO_POINTER(
501	#ifdef __WXGTK20__
502	gtk_get_current_event_time()	502	gtk_get_current_event_time()
		503	) );
503	#else	504	#else
		505	gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
		506	"selection_get",
		507	GTK_SIGNAL_FUNC(selection_handler),
		508	GUINT_TO_POINTER(
504	gdk_event_get_time(gtk_get_current_event())	509	gdk_event_get_time(gtk_get_current_event())
		510	) );
505	#endif	511	#endif
506	) );
507		512
508	#if wxUSE_THREADS	513	#if wxUSE_THREADS
509	/* disable GUI threads */	514	/* disable GUI threads */

Lines 2-8 Link Here

(-)wxWidgets-2.6.3/src/gtk/window.cpp (-7 / +4 lines)
2	// Name: gtk/window.cpp	2	// Name: gtk/window.cpp
3	// Purpose:	3	// Purpose:
4	// Author: Robert Roebling	4	// Author: Robert Roebling
5	// Id: $Id: window.cpp,v 1.548.2.13 2006/03/18 21:58:19 VZ Exp $	5	// Id: $Id: window.cpp,v 1.548.2.14 2006/03/30 10:36:22 RR Exp $
6	// Copyright: (c) 1998 Robert Roebling, Julian Smart	6	// Copyright: (c) 1998 Robert Roebling, Julian Smart
7	// Licence: wxWindows licence	7	// Licence: wxWindows licence
8	/////////////////////////////////////////////////////////////////////////////	8	/////////////////////////////////////////////////////////////////////////////
Lines 1014-1022 Link Here
1014	event.m_scanCode = gdk_event->keyval;	1014	event.m_scanCode = gdk_event->keyval;
1015	event.m_rawCode = (wxUint32) gdk_event->keyval;	1015	event.m_rawCode = (wxUint32) gdk_event->keyval;
1016	event.m_rawFlags = 0;	1016	event.m_rawFlags = 0;
1017	#if wxUSE_UNICODE
1018	event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
1019	#endif
1020	wxGetMousePosition( &x, &y );	1017	wxGetMousePosition( &x, &y );
1021	win->ScreenToClient( &x, &y );	1018	win->ScreenToClient( &x, &y );
1022	event.m_x = x;	1019	event.m_x = x;
Lines 1327-1337 Link Here
1327	if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' )	1324	if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' )
1328	{	1325	{
1329	event.m_keyCode = key_code - 'a' + 1;	1326	event.m_keyCode = key_code - 'a' + 1;
1330	#if wxUSE_UNICODE
1331	event.m_uniChar = event.m_keyCode;
1332	#endif
1333	}	1327	}
1334		1328
		1329	#if wxUSE_UNICODE
		1330	event.m_uniChar = event.m_keyCode;
		1331	#endif
1335	// Implement OnCharHook by checking ancesteror top level windows	1332	// Implement OnCharHook by checking ancesteror top level windows
1336	wxWindow *parent = win;	1333	wxWindow *parent = win;
1337	while (parent && !parent->IsTopLevel())	1334	while (parent && !parent->IsTopLevel())