Make OSX patch style consistent.
This commit is contained in:
parent
01054ae49a
commit
e5064231f9
|
@ -1,7 +1,6 @@
|
||||||
diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
|
=== modified file 'src/osx/dataview_osx.cpp'
|
||||||
index 332d375..492b237 100644
|
--- src/osx/dataview_osx.cpp
|
||||||
--- a/src/osx/dataview_osx.cpp
|
+++ src/osx/dataview_osx.cpp
|
||||||
+++ b/src/osx/dataview_osx.cpp
|
|
||||||
@@ -378,7 +378,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
|
@@ -378,7 +378,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
|
||||||
const wxValidator& validator,
|
const wxValidator& validator,
|
||||||
const wxString& name)
|
const wxString& name)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
diff -rupN include/wx/event.h include/wx/event.h
|
=== modified file 'include/wx/event.h'
|
||||||
--- include/wx/event.h 2015-05-21 23:18:15.126136156 +0200
|
--- include/wx/event.h 2015-05-21 23:18:15.126136156 +0200
|
||||||
+++ include/wx/event.h 2015-05-21 23:20:35.112797127 +0200
|
+++ include/wx/event.h 2015-05-21 23:20:35.112797127 +0200
|
||||||
@@ -11,6 +11,8 @@
|
@@ -11,6 +11,8 @@
|
||||||
|
@ -63,7 +63,7 @@ diff -rupN include/wx/event.h include/wx/event.h
|
||||||
|
|
||||||
// Scrolling from wxWindow (sent to wxScrolledWindow)
|
// Scrolling from wxWindow (sent to wxScrolledWindow)
|
||||||
#define EVT_SCROLLWIN_TOP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(func))
|
#define EVT_SCROLLWIN_TOP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(func))
|
||||||
diff -rupN src/common/event.cpp src/common/event.cpp
|
=== modified file 'src/common/event.cpp'
|
||||||
--- src/common/event.cpp 2015-05-21 23:18:15.049469492 +0200
|
--- src/common/event.cpp 2015-05-21 23:18:15.049469492 +0200
|
||||||
+++ src/common/event.cpp 2015-05-21 23:18:23.566135812 +0200
|
+++ src/common/event.cpp 2015-05-21 23:18:23.566135812 +0200
|
||||||
@@ -208,6 +208,7 @@ wxDEFINE_EVENT( wxEVT_AUX1_DCLICK, wxMou
|
@@ -208,6 +208,7 @@ wxDEFINE_EVENT( wxEVT_AUX1_DCLICK, wxMou
|
||||||
|
@ -92,7 +92,7 @@ diff -rupN src/common/event.cpp src/common/event.cpp
|
||||||
}
|
}
|
||||||
|
|
||||||
// return true if was a button dclick event
|
// return true if was a button dclick event
|
||||||
diff -rupN src/osx/cocoa/window.mm src/osx/cocoa/window.mm
|
=== modified file 'src/osx/cocoa/window.mm'
|
||||||
--- src/osx/cocoa/window.mm 2015-05-21 23:18:15.032802826 +0200
|
--- src/osx/cocoa/window.mm 2015-05-21 23:18:15.032802826 +0200
|
||||||
+++ src/osx/cocoa/window.mm 2015-05-21 23:18:23.566135812 +0200
|
+++ src/osx/cocoa/window.mm 2015-05-21 23:18:23.566135812 +0200
|
||||||
@@ -741,6 +741,12 @@ void wxWidgetCocoaImpl::SetupMouseEvent(
|
@@ -741,6 +741,12 @@ void wxWidgetCocoaImpl::SetupMouseEvent(
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
diff -rupN include/wx/glcanvas.h include/wx/glcanvas.h
|
=== modified file 'include/wx/glcanvas.h'
|
||||||
--- include/wx/glcanvas.h 2015-05-21 00:36:27.406145182 +0200
|
--- include/wx/glcanvas.h 2015-05-21 00:36:27.406145182 +0200
|
||||||
+++ include/wx/glcanvas.h 2015-05-21 00:37:59.169474782 +0200
|
+++ include/wx/glcanvas.h 2015-05-21 00:37:59.169474782 +0200
|
||||||
@@ -19,6 +19,8 @@
|
@@ -19,6 +19,8 @@
|
||||||
|
@ -10,7 +10,7 @@ diff -rupN include/wx/glcanvas.h include/wx/glcanvas.h
|
||||||
class WXDLLIMPEXP_FWD_GL wxGLCanvas;
|
class WXDLLIMPEXP_FWD_GL wxGLCanvas;
|
||||||
class WXDLLIMPEXP_FWD_GL wxGLContext;
|
class WXDLLIMPEXP_FWD_GL wxGLContext;
|
||||||
|
|
||||||
diff -rupN include/wx/osx/glcanvas.h include/wx/osx/glcanvas.h
|
=== modified file 'include/wx/osx/glcanvas.h'
|
||||||
--- include/wx/osx/glcanvas.h 2015-05-21 00:36:27.419478515 +0200
|
--- include/wx/osx/glcanvas.h 2015-05-21 00:36:27.419478515 +0200
|
||||||
+++ include/wx/osx/glcanvas.h 2015-05-21 00:36:37.319478112 +0200
|
+++ include/wx/osx/glcanvas.h 2015-05-21 00:36:37.319478112 +0200
|
||||||
@@ -88,6 +88,9 @@ public:
|
@@ -88,6 +88,9 @@ public:
|
||||||
|
@ -23,7 +23,7 @@ diff -rupN include/wx/osx/glcanvas.h include/wx/osx/glcanvas.h
|
||||||
|
|
||||||
// deprecated methods
|
// deprecated methods
|
||||||
// ------------------
|
// ------------------
|
||||||
diff -rupN src/osx/cocoa/glcanvas.mm src/osx/cocoa/glcanvas.mm
|
=== modified file 'src/osx/cocoa/glcanvas.mm'
|
||||||
--- src/osx/cocoa/glcanvas.mm 2015-05-21 00:36:27.542811843 +0200
|
--- src/osx/cocoa/glcanvas.mm 2015-05-21 00:36:27.542811843 +0200
|
||||||
+++ src/osx/cocoa/glcanvas.mm 2015-05-21 00:36:37.322811445 +0200
|
+++ src/osx/cocoa/glcanvas.mm 2015-05-21 00:36:37.322811445 +0200
|
||||||
@@ -313,6 +313,22 @@ bool wxGLCanvas::SwapBuffers()
|
@@ -313,6 +313,22 @@ bool wxGLCanvas::SwapBuffers()
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
--- src/osx/webview_webkit.mm.orig 2014-09-16 07:27:52.000000000 -0600
|
=== modified file 'src/osx/webview_webkit.mm'
|
||||||
|
--- src/osx/webview_webkit.mm 2014-09-16 07:27:52.000000000 -0600
|
||||||
+++ src/osx/webview_webkit.mm 2014-09-16 07:28:12.000000000 -0600
|
+++ src/osx/webview_webkit.mm 2014-09-16 07:28:12.000000000 -0600
|
||||||
@@ -28,7 +28,7 @@
|
@@ -28,7 +28,7 @@
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
|
|
Loading…
Reference in New Issue