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

Use correct #if for interface/implementation pragma.

Browse Source 
detabified


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-24 21:50:00 +00:00
parent 7eb8c6ee3e
commit 3ca7ba7403
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/wx/html/webkit.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_WEBKIT_H
#define _WX_WEBKIT_H
#ifdef __GNUG__
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "webkit.h"
#endif
@@ -32,28 +32,28 @@
class wxWebKitCtrl : public wxControl
{
public:
DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
wxWebKitCtrl() {};
wxWebKitCtrl() {};
wxWebKitCtrl(wxWindow *parent,
wxWindowID winID,
wxWindowID winID,
const wxString& strURL,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("webkitctrl"))
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("webkitctrl"))
{
Create(parent, winID, strURL, pos, size, style, validator, name);
};
bool Create(wxWindow *parent,
bool Create(wxWindow *parent,
wxWindowID winID,
const wxString& strURL,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("webkitctrl"));
virtual ~wxWebKitCtrl();
virtual ~wxWebKitCtrl();
void LoadURL(const wxString &url);
bool CanGoBack();
@@ -69,7 +69,7 @@ public:
//we need to resize the webview when the control size changes
//void OnSize(wxSizeEvent &event);
protected:
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
private:
wxWindow *m_parent;
@@ -86,11 +86,11 @@ private:
// ----------------------------------------------------------------------------
enum {
wxWEBKIT_STATE_START = 1,
wxWEBKIT_STATE_NEGOTIATING = 2,
wxWEBKIT_STATE_REDIRECTING = 4,
wxWEBKIT_STATE_TRANSFERRING = 8,
wxWEBKIT_STATE_STOP = 16,
wxWEBKIT_STATE_START = 1,
wxWEBKIT_STATE_NEGOTIATING = 2,
wxWEBKIT_STATE_REDIRECTING = 4,
wxWEBKIT_STATE_TRANSFERRING = 8,
wxWEBKIT_STATE_STOP = 16,
wxWEBKIT_STATE_FAILED = 32
};
@@ -99,17 +99,17 @@ class wxWebKitStateChangedEvent : public wxCommandEvent
DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
public:
int GetState() { return m_state; }
void SetState(const int state) { m_state = state; }
wxString GetURL() { return m_url; }
void SetURL(const wxString& url) { m_url = url; }
int GetState() { return m_state; }
void SetState(const int state) { m_state = state; }
wxString GetURL() { return m_url; }
void SetURL(const wxString& url) { m_url = url; }
wxWebKitStateChangedEvent( wxWindow* win = (wxWindow*) NULL );
wxEvent *Clone(void) const { return new wxWebKitStateChangedEvent(*this); }
wxEvent *Clone(void) const { return new wxWebKitStateChangedEvent(*this); }
protected:
int m_state;
wxString m_url;
int m_state;
wxString m_url;
};
typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);

50
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -9,7 +9,7 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "webkit.h"
#endif
@@ -57,7 +57,7 @@ wxWebKitStateChangedEvent::wxWebKitStateChangedEvent( wxWindow* win )
{
SetEventType( wxEVT_WEBKIT_STATE_CHANGED);
SetEventObject( win );
SetId(win->GetId());
SetId(win->GetId());
}
//---------------------------------------------------------
@@ -96,12 +96,12 @@ inline NSString* wxNSStringWithWxString(const wxString &wxstring)
// ----------------------------------------------------------------------------
bool wxWebKitCtrl::Create(wxWindow *parent,
wxWindowID winID,
wxWindowID winID,
const wxString& strURL,
const wxPoint& pos,
const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
m_currentURL = strURL;
@@ -110,27 +110,27 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
//still needed for wxCocoa??
/*
int width, height;
wxSize sizeInstance;
if (size.x == -1 || size.y == -1)
{
m_parent->GetClientSize(&width, &height);
sizeInstance.x = width;
sizeInstance.y = height;
}
else
{
sizeInstance.x = size.x;
sizeInstance.y = size.y;
}
*/
// now create and attach WebKit view...
wxSize sizeInstance;
if (size.x == -1 || size.y == -1)
{
m_parent->GetClientSize(&width, &height);
sizeInstance.x = width;
sizeInstance.y = height;
}
else
{
sizeInstance.x = size.x;
sizeInstance.y = size.y;
}
*/
// now create and attach WebKit view...
#ifdef __WXCOCOA__
wxControl::Create(parent, m_windowID, pos, sizeInstance, style , validator , name);
SetSize(pos.x, pos.y, sizeInstance.x, sizeInstance.y);
SetSize(pos.x, pos.y, sizeInstance.x, sizeInstance.y);
wxTopLevelWindowCocoa *topWin = wxDynamicCast(this, wxTopLevelWindowCocoa);
NSWindow* nsWin = topWin->GetNSWindow();
NSRect rect;
NSRect rect;
rect.origin.x = pos.x;
rect.origin.y = pos.y;
rect.size.width = sizeInstance.x;
@@ -155,7 +155,7 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
// Register event listener interfaces
MyFrameLoadMonitor* myFrameLoadMonitor = [[MyFrameLoadMonitor alloc] initWithWxWindow: (wxWindow*)this];
[m_webView setFrameLoadDelegate:myFrameLoadMonitor];
[m_webView setFrameLoadDelegate:myFrameLoadMonitor];
LoadURL(m_currentURL);
return true;
}
@@ -262,7 +262,7 @@ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
- initWithWxWindow: (wxWindow*)inWindow
{
[super init];
webKitWindow = inWindow; // non retained
webKitWindow = inWindow; // non retained
return self;
}
@@ -327,4 +327,4 @@ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
webKitWindow->SetTitle(wxStringWithNSString( title ));
}
}
@end
@end