Last active
May 9, 2016 18:38
-
-
Save metacollin/2d5760743df73c939d53 to your computer and use it in GitHub Desktop.
wxkicad patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
=== modified file 'Makefile.in' | |
--- Makefile.in 2014-06-08 14:30:42 +0000 | |
+++ Makefile.in 2014-06-08 14:30:57 +0000 | |
@@ -14619,7 +14619,7 @@ | |
monodll_carbon_frame.o \ | |
monodll_carbon_mdi.o \ | |
monodll_carbon_metafile.o \ | |
- monodll_carbon_overlay.o \ | |
+ monodll_osx_cocoa_overlay.o \ | |
monodll_carbon_popupwin.o \ | |
monodll_carbon_renderer.o \ | |
monodll_carbon_settings.o \ | |
@@ -14766,7 +14766,7 @@ | |
monolib_carbon_frame.o \ | |
monolib_carbon_mdi.o \ | |
monolib_carbon_metafile.o \ | |
- monolib_carbon_overlay.o \ | |
+ monolib_osx_cocoa_overlay.o \ | |
monolib_carbon_popupwin.o \ | |
monolib_carbon_renderer.o \ | |
monolib_carbon_settings.o \ | |
@@ -14913,7 +14913,7 @@ | |
coredll_carbon_frame.o \ | |
coredll_carbon_mdi.o \ | |
coredll_carbon_metafile.o \ | |
- coredll_carbon_overlay.o \ | |
+ coredll_osx_cocoa_overlay.o \ | |
coredll_carbon_popupwin.o \ | |
coredll_carbon_renderer.o \ | |
coredll_carbon_settings.o \ | |
@@ -15045,7 +15045,7 @@ | |
corelib_carbon_frame.o \ | |
corelib_carbon_mdi.o \ | |
corelib_carbon_metafile.o \ | |
- corelib_carbon_overlay.o \ | |
+ corelib_osx_cocoa_overlay.o \ | |
corelib_carbon_popupwin.o \ | |
corelib_carbon_renderer.o \ | |
corelib_carbon_settings.o \ | |
@@ -17792,6 +17792,9 @@ | |
monodll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONODLL_ODEP) | |
$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm | |
+monodll_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONODLL_ODEP) | |
+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm | |
+ | |
monodll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONODLL_ODEP) | |
$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm | |
@@ -23666,6 +23669,9 @@ | |
monolib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONOLIB_ODEP) | |
$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm | |
+monolib_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONOLIB_ODEP) | |
+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm | |
+ | |
monolib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONOLIB_ODEP) | |
$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm | |
@@ -33620,8 +33626,8 @@ | |
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) | |
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp | |
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) | |
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp | |
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(COREDLL_ODEP) | |
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm | |
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) | |
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp | |
@@ -38003,8 +38009,8 @@ | |
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) | |
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp | |
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) | |
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp | |
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(CORELIB_ODEP) | |
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm | |
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) | |
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp | |
=== modified file 'include/wx/osx/cocoa/private/overlay.h' | |
--- include/wx/osx/cocoa/private/overlay.h 2014-06-08 14:30:42 +0000 | |
+++ include/wx/osx/cocoa/private/overlay.h 2014-06-11 12:07:05 +0000 | |
@@ -41,15 +41,8 @@ | |
void CreateOverlayWindow(); | |
WXWindow m_overlayWindow; | |
- WXWindow m_overlayParentWindow; | |
- CGContextRef m_overlayContext ; | |
// we store the window in case we would have to issue a Refresh() | |
wxWindow* m_window ; | |
- | |
- int m_x ; | |
- int m_y ; | |
- int m_width ; | |
- int m_height ; | |
} ; | |
#endif // _WX_MAC_CARBON_PRIVATE_OVERLAY_H_ | |
=== modified file 'include/wx/overlay.h' | |
--- include/wx/overlay.h 2014-06-08 14:30:42 +0000 | |
+++ include/wx/overlay.h 2014-06-08 14:30:57 +0000 | |
@@ -13,7 +13,7 @@ | |
#include "wx/defs.h" | |
-#if defined(__WXMAC__) && wxOSX_USE_CARBON | |
+#if defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON | |
#define wxHAS_NATIVE_OVERLAY 1 | |
#elif defined(__WXDFB__) | |
#define wxHAS_NATIVE_OVERLAY 1 | |
=== modified file 'include/wx/private/overlay.h' | |
--- include/wx/private/overlay.h 2014-06-08 14:30:42 +0000 | |
+++ include/wx/private/overlay.h 2014-06-08 14:30:57 +0000 | |
@@ -16,7 +16,11 @@ | |
#ifdef wxHAS_NATIVE_OVERLAY | |
#if defined(__WXMAC__) | |
+#if wxOSX_USE_CARBON | |
#include "wx/osx/carbon/private/overlay.h" | |
+#else | |
+ #include "wx/osx/cocoa/private/overlay.h" | |
+#endif | |
#elif defined(__WXDFB__) | |
#include "wx/dfb/private/overlay.h" | |
#else | |
=== modified file 'src/osx/cocoa/overlay.mm' | |
--- src/osx/cocoa/overlay.mm 2014-06-08 14:30:42 +0000 | |
+++ src/osx/cocoa/overlay.mm 2014-06-11 12:06:53 +0000 | |
@@ -34,6 +34,7 @@ | |
#include "wx/private/overlay.h" | |
#ifdef wxHAS_NATIVE_OVERLAY | |
+#import <Foundation/NSGeometry.h> | |
// ============================================================================ | |
// implementation | |
@@ -42,7 +43,6 @@ | |
wxOverlayImpl::wxOverlayImpl() | |
{ | |
m_window = NULL ; | |
- m_overlayContext = NULL ; | |
m_overlayWindow = NULL ; | |
} | |
@@ -58,48 +58,6 @@ | |
void wxOverlayImpl::CreateOverlayWindow() | |
{ | |
- if ( m_window ) | |
- { | |
- m_overlayParentWindow = m_window->MacGetTopLevelWindowRef(); | |
- [m_overlayParentWindow makeKeyAndOrderFront:nil]; | |
- | |
- NSView* view = m_window->GetHandle(); | |
- | |
- NSPoint viewOriginBase, viewOriginScreen; | |
- viewOriginBase = [view convertPoint:NSMakePoint(0, 0) toView:nil]; | |
- viewOriginScreen = [m_overlayParentWindow convertBaseToScreen:viewOriginBase]; | |
- | |
- NSSize viewSize = [view frame].size; | |
- if ( [view isFlipped] ) | |
- viewOriginScreen.y -= viewSize.height; | |
- | |
- m_overlayWindow=[[NSWindow alloc] initWithContentRect:NSMakeRect(viewOriginScreen.x,viewOriginScreen.y, | |
- viewSize.width, | |
- viewSize.height) | |
- styleMask:NSBorderlessWindowMask | |
- backing:NSBackingStoreBuffered | |
- defer:YES]; | |
- | |
- [m_overlayParentWindow addChildWindow:m_overlayWindow ordered:NSWindowAbove]; | |
- } | |
- else | |
- { | |
- m_overlayParentWindow = NULL ; | |
- CGRect cgbounds ; | |
- cgbounds = CGDisplayBounds(CGMainDisplayID()); | |
- | |
- m_overlayWindow=[[NSWindow alloc] initWithContentRect:NSMakeRect(cgbounds.origin.x,cgbounds.origin.y, | |
- cgbounds.size.width, | |
- cgbounds.size.height) | |
- styleMask:NSBorderlessWindowMask | |
- backing:NSBackingStoreBuffered | |
- defer:YES]; | |
- } | |
- [m_overlayWindow setOpaque:NO]; | |
- [m_overlayWindow setIgnoresMouseEvents:YES]; | |
- [m_overlayWindow setAlphaValue:1.0]; | |
- | |
- [m_overlayWindow orderFront:nil]; | |
} | |
void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height ) | |
@@ -107,84 +65,49 @@ | |
wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") ); | |
m_window = dc->GetWindow(); | |
- m_x = x ; | |
- m_y = y ; | |
- if ( dc->IsKindOf( CLASSINFO( wxClientDC ) )) | |
- { | |
- wxPoint origin = m_window->GetClientAreaOrigin(); | |
- m_x += origin.x; | |
- m_y += origin.y; | |
- } | |
- m_width = width ; | |
- m_height = height ; | |
- | |
- CreateOverlayWindow(); | |
- wxASSERT_MSG( m_overlayWindow != NULL , _("Couldn't create the overlay window") ); | |
- m_overlayContext = (CGContextRef) [[m_overlayWindow graphicsContext] graphicsPort]; | |
- wxASSERT_MSG( m_overlayContext != NULL , _("Couldn't init the context on the overlay window") ); | |
- | |
- int ySize = 0; | |
- if ( m_window ) | |
- { | |
- NSView* view = m_window->GetHandle(); | |
- NSSize viewSize = [view frame].size; | |
- ySize = viewSize.height; | |
- } | |
- else | |
- { | |
- CGRect cgbounds ; | |
- cgbounds = CGDisplayBounds(CGMainDisplayID()); | |
- ySize = cgbounds.size.height; | |
- | |
- | |
- | |
- } | |
- CGContextTranslateCTM( m_overlayContext, 0, ySize ); | |
- CGContextScaleCTM( m_overlayContext, 1, -1 ); | |
- CGContextTranslateCTM( m_overlayContext, -m_x , -m_y ); | |
+ m_overlayWindow = m_window->MacGetTopLevelWindowRef(); | |
+ | |
+ NSRect box = [m_overlayWindow frame]; | |
+ box.origin.x = 0; | |
+ box.origin.y = 0; | |
+ | |
+ if( [m_overlayWindow isVisible] ) | |
+ { | |
+ [m_overlayWindow discardCachedImage]; | |
+ [m_overlayWindow cacheImageInRect:box]; | |
+ } | |
} | |
void wxOverlayImpl::BeginDrawing( wxDC* dc) | |
{ | |
- wxDCImpl *impl = dc->GetImpl(); | |
- wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl); | |
- if (win_impl) | |
- { | |
- win_impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) ); | |
- dc->SetClippingRegion( m_x , m_y , m_width , m_height ) ; | |
- } | |
} | |
void wxOverlayImpl::EndDrawing( wxDC* dc) | |
{ | |
- wxDCImpl *impl = dc->GetImpl(); | |
- wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl); | |
- if (win_impl) | |
- win_impl->SetGraphicsContext(NULL); | |
- | |
- CGContextFlush( m_overlayContext ); | |
} | |
-void wxOverlayImpl::Clear(wxDC* WXUNUSED(dc)) | |
+void wxOverlayImpl::Clear( wxDC* WXUNUSED(dc) ) | |
{ | |
wxASSERT_MSG( IsOk() , _("You cannot Clear an overlay that is not inited") ); | |
- CGRect box = CGRectMake( m_x - 1, m_y - 1 , m_width + 2 , m_height + 2 ); | |
- CGContextClearRect( m_overlayContext, box ); | |
+ | |
+ if( [m_overlayWindow isVisible] ) | |
+ { | |
+ [m_overlayWindow restoreCachedImage]; | |
+// [m_overlayWindow flushWindow]; | |
+ } | |
} | |
void wxOverlayImpl::Reset() | |
{ | |
- if ( m_overlayContext ) | |
- { | |
- m_overlayContext = NULL ; | |
- } | |
- | |
// todo : don't dispose, only hide and reposition on next run | |
- if (m_overlayWindow) | |
+ if (m_overlayWindow && [m_overlayWindow isVisible]) | |
{ | |
- [m_overlayParentWindow removeChildWindow:m_overlayWindow]; | |
- [m_overlayWindow release]; | |
- m_overlayWindow = NULL ; | |
+ NSRect box = [m_overlayWindow frame]; | |
+ box.origin.x = 0; | |
+ box.origin.y = 0; | |
+ | |
+ [m_overlayWindow discardCachedImage]; | |
+ [m_overlayWindow cacheImageInRect:box]; | |
} | |
} | |
=== modified file 'src/common/stockitem.cpp' | |
--- src/common/stockitem.cpp 2014-10-06 15:33:44.000000000 -0600 | |
+++ src/common/stockitem.cpp 2016-05-07 01:02:05.000000000 -0600 | |
@@ -142,11 +142,19 @@ | |
STOCKITEM(wxID_BACKWARD, _("&Back"), _("Back")); | |
STOCKITEM(wxID_BOLD, _("&Bold"), _("Bold")); | |
STOCKITEM(wxID_BOTTOM, _("&Bottom"), _("Bottom")); | |
+#ifdef __APPLE__ | |
+ STOCKITEM(wxID_CANCEL, _("Cancel"), _("Cancel")); | |
+ STOCKITEM(wxID_CDROM, _("CD-Rom"), _("CD-Rom")); | |
+ STOCKITEM(wxID_CLEAR, _("Clear"), _("Clear")); | |
+ STOCKITEM(wxID_CLOSE, _("Close"), _("Close")); | |
+ STOCKITEM(wxID_CONVERT, _("Convert"), _("Convert")); | |
+#else | |
STOCKITEM(wxID_CANCEL, _("&Cancel"), _("Cancel")); | |
STOCKITEM(wxID_CDROM, _("&CD-Rom"), _("CD-Rom")); | |
STOCKITEM(wxID_CLEAR, _("&Clear"), _("Clear")); | |
STOCKITEM(wxID_CLOSE, _("&Close"), _("Close")); | |
STOCKITEM(wxID_CONVERT, _("&Convert"), _("Convert")); | |
+#endif | |
STOCKITEM(wxID_COPY, _("&Copy"), _("Copy")); | |
STOCKITEM(wxID_CUT, _("Cu&t"), _("Cut")); | |
STOCKITEM(wxID_DELETE, _("&Delete"), _("Delete")); | |
=== modified file 'src/common/translation.cpp' | |
--- src/common/translation.cpp 2014-01-26 13:59:40 +0000 | |
+++ src/common/translation.cpp 2014-01-26 15:18:47 +0000 | |
@@ -1611,6 +1611,9 @@ | |
/* static */ | |
const wxString& wxTranslations::GetUntranslatedString(const wxString& str) | |
{ | |
+ // Marco Serantoni - Dirty Patch | |
+ // Awaiting for http://trac.wxwidgets.org/ticket/15908 | |
+ if( gs_translationsOwned == false) return str; | |
wxLocaleUntranslatedStrings& strings = wxThreadInfo.untranslatedStrings; | |
wxLocaleUntranslatedStrings::iterator i = strings.find(str); | |
Index: configure | |
=================================================================== | |
--- configure (revision 77757) | |
+++ configure (working copy) | |
@@ -29176,7 +29176,7 @@ | |
*-*-darwin* ) | |
install_name_tool=`which ${HOST_PREFIX}install_name_tool` | |
if test "$install_name_tool" -a -x "$install_name_tool"; then | |
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" | |
+ DYLIB_RPATH_POSTLINK="" | |
cat <<EOF >change-install-names | |
#!/bin/sh | |
libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` | |
@@ -29189,7 +29189,7 @@ | |
done | |
EOF | |
chmod +x change-install-names | |
- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" | |
+ DYLIB_RPATH_INSTALL="" | |
fi | |
HEADER_PAD_OPTION="-headerpad_max_install_names" | |
Index: configure.in | |
=================================================================== | |
--- configure.in (revision 77757) | |
+++ configure.in (working copy) | |
@@ -3772,7 +3772,7 @@ | |
*-*-darwin* ) | |
install_name_tool=`which ${HOST_PREFIX}install_name_tool` | |
if test "$install_name_tool" -a -x "$install_name_tool"; then | |
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" | |
+ DYLIB_RPATH_POSTLINK="" | |
cat <<EOF >change-install-names | |
#!/bin/sh | |
libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` | |
@@ -3785,7 +3785,7 @@ | |
done | |
EOF | |
chmod +x change-install-names | |
- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" | |
+ DYLIB_RPATH_INSTALL="" | |
fi | |
dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error: | |
=== modified file 'src/generic/scrlwing.cpp' | |
--- src/generic/scrlwing.cpp 2013-12-16 05:42:30 -0800 | |
+++ src/generic/scrlwing.cpp 2014-10-21 01:19:02 -0700 | |
@@ -214,9 +214,6 @@ | |
return true; | |
} | |
- if ( processed && event.IsCommandEvent()) | |
- return true; | |
- | |
// For wxEVT_PAINT the user code can either handle this event as usual or | |
// override virtual OnDraw(), so if the event hasn't been handled we need | |
// to call this virtual function ourselves. | |
@@ -235,6 +232,11 @@ | |
return true; | |
} | |
+ // If the user code handled this event, it should prevent the default | |
+ // handling from taking place, so don't do anything else in this case. | |
+ if ( processed ) | |
+ return true; | |
+ | |
if ( evType == wxEVT_CHILD_FOCUS ) | |
{ | |
m_scrollHelper->HandleOnChildFocus((wxChildFocusEvent &)event); | |
=== modified file 'src/generic/vscroll.cpp' | |
--- src/generic/vscroll.cpp 2013-12-16 05:42:30 -0800 | |
+++ src/generic/vscroll.cpp 2014-10-21 01:19:09 -0700 | |
@@ -89,9 +89,6 @@ | |
return true; | |
} | |
- if ( processed && event.IsCommandEvent()) | |
- return true; | |
- | |
// For wxEVT_PAINT the user code can either handle this event as usual or | |
// override virtual OnDraw(), so if the event hasn't been handled we need | |
// to call this virtual function ourselves. | |
@@ -110,6 +107,11 @@ | |
return true; | |
} | |
+ // If the user code handled this event, it should prevent the default | |
+ // handling from taking place, so don't do anything else in this case. | |
+ if ( processed ) | |
+ return true; | |
+ | |
// reset the skipped flag (which might have been set to true in | |
// ProcessEvent() above) to be able to test it below | |
bool wasSkipped = event.GetSkipped(); | |
diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp | |
index 332d375..492b237 100644 | |
--- src/osx/dataview_osx.cpp | |
+++ src/osx/dataview_osx.cpp | |
@@ -378,7 +378,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent, | |
const wxValidator& validator, | |
const wxString& name) | |
{ | |
- DontCreatePeer(); | |
if (!(wxControl::Create(parent,id,pos,size,style,validator,name))) | |
return false; | |
SetPeer(::CreateDataView(this,parent,id,pos,size,style,GetExtraStyle())); | |
--- src/osx/webview_webkit.mm.orig 2014-09-16 07:27:52.000000000 -0600 | |
+++ src/osx/webview_webkit.mm 2014-09-16 07:28:12.000000000 -0600 | |
@@ -28,7 +28,7 @@ | |
#include "wx/hashmap.h" | |
#include "wx/filesys.h" | |
-#include <WebKit/WebKit.h> | |
+#include <WebKit/WebKitLegacy.h> | |
#include <WebKit/HIWebView.h> | |
#include <WebKit/CarbonUtils.h> | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment