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

Rename wxExternalField methods to not mention "Window"

Browse Source 
This class doesn't have to be used with wxWindow or similar as object
type, so use a more neutral "Object" instead of "Window".
This commit is contained in:
Vadim Zeitlin
2017-11-22 00:16:45 +01:00
parent 1863f494f3
commit 020c598c18
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/window.cpp
View File

@@ -2687,7 +2687,7 @@ wxWindowGTK::~wxWindowGTK()
#endif
#ifdef wxGTK_HAS_GESTURES_SUPPORT
wxWindowGestures::EraseForWindow(this);
wxWindowGestures::EraseForObject(this);
#endif // wxGTK_HAS_GESTURES_SUPPORT
if (m_widget)
@@ -2923,7 +2923,7 @@ pan_gesture_begin_callback(GtkGesture* WXUNUSED(gesture), GdkEventSequence* WXUN
static void
horizontal_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* sequence, wxWindowGTK* win)
{
wxWindowGesturesData* const data = wxWindowGestures::FromWindow(win);
wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
if ( !data )
return;
@@ -2954,7 +2954,7 @@ horizontal_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* seque
static void
vertical_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* sequence, wxWindowGTK* win)
{
wxWindowGesturesData* const data = wxWindowGestures::FromWindow(win);
wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
if ( !data )
return;
@@ -3006,7 +3006,7 @@ pan_gesture_callback(GtkGesture* gesture, GtkPanDirection direction, gdouble off
event.SetEventObject(win);
event.SetPosition(wxPoint(wxRound(x), wxRound(y)));
wxWindowGesturesData* const data = wxWindowGestures::FromWindow(win);
wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
if ( !data )
return;
@@ -3070,7 +3070,7 @@ zoom_gesture_callback(GtkGesture* gesture, gdouble scale, wxWindowGTK* win)
event.SetPosition(wxPoint(wxRound(x), wxRound(y)));
event.SetZoomFactor(scale);
wxWindowGesturesData* const data = wxWindowGestures::FromWindow(win);
wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
if ( !data )
return;
@@ -3210,7 +3210,7 @@ wxEmitTwoFingerTapEvent(GdkEventTouch* gdk_event, wxWindowGTK* win)
event.SetEventObject(win);
wxWindowGesturesData* const data = wxWindowGestures::FromWindow(win);
wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
if ( !data )
return;
@@ -3241,7 +3241,7 @@ wxEmitPressAndTapEvent(GdkEventTouch* gdk_event, wxWindowGTK* win)
event.SetEventObject(win);
wxWindowGesturesData* const data = wxWindowGestures::FromWindow(win);
wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
if ( !data )
return;
@@ -3273,7 +3273,7 @@ wxEmitPressAndTapEvent(GdkEventTouch* gdk_event, wxWindowGTK* win)
static void
touch_callback(GtkWidget* WXUNUSED(widget), GdkEventTouch* gdk_event, wxWindowGTK* win)
{
wxWindowGesturesData* const data = wxWindowGestures::FromWindow(win);
wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
if ( !data )
return;
@@ -3528,11 +3528,11 @@ bool wxWindowGTK::EnableTouchEvents(int eventsMask)
{
if ( eventsMask == wxTOUCH_NONE )
{
wxWindowGestures::EraseForWindow(this);
wxWindowGestures::EraseForObject(this);
}
else
{
wxWindowGestures::StoreForWindow
wxWindowGestures::StoreForObject
(
this,
new wxWindowGesturesData(this, GetConnectWidget(), eventsMask)