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

Fix compilation errors under OSX.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-26 11:44:03 +00:00
parent 906c935a80
commit b132a83bff
2 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/osx/webview_webkit.h
View File

@@ -15,7 +15,7 @@
#include "wx/setup.h"
#if wxUSE_WEBKIT && (defined(__WXMAC__) || defined(__WXCOCOA__))
//#if wxUSE_WEBKIT && (defined(__WXMAC__) || defined(__WXCOCOA__))
#include "wx/control.h"
#include "wx/webview.h"
@@ -80,9 +80,9 @@ public:
virtual void ClearHistory() {}
virtual void EnableHistory(bool enable = true) {}
virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory()
{ return wxVector<wxSharedPtr<wxWebHistoryItem> >() }
{ return wxVector<wxSharedPtr<wxWebHistoryItem> >(); }
virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory()
{ return wxVector<wxSharedPtr<wxWebHistoryItem> >() }
{ return wxVector<wxSharedPtr<wxWebHistoryItem> >(); }
virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item) {}
//Undo / redo functionality
@@ -105,7 +105,7 @@ public:
//Selection
virtual void DeleteSelection();
virtual bool HasSelection() { return false };
virtual bool HasSelection() { return false; };
virtual void SelectAll() {};
virtual wxString GetSelectedText();
virtual wxString GetSelectedSource() { return ""; }
@@ -158,8 +158,14 @@ private:
void* m_webKitCtrlEventHandler;
//It should be WebView*, but WebView is an Objective-C class
//TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
#if wxOSX_USE_CARBON
wxMacControl *m_peer;
#else
wxWidgetCocoaImpl *m_peer;
#endif
};
#endif // wxUSE_WEBKIT
//#endif // wxUSE_WEBKIT
#endif // _WX_WEBKIT_H_