Always NUL-terminate wxPrintfConvSpec::m_szFlags.

[wxWidgets.git] / include / wx / html / webkit.h

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 994fb62d4795415b4869578261175399b620afc0..d927a8b1820a6ddeec67882735073931564220f4 100644 (file)
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -24,7 +24,9 @@
 // Web Kit Control
 // ----------------------------------------------------------------------------
 
 // Web Kit Control
 // ----------------------------------------------------------------------------
 

-class wxWebKitCtrl : public wxControl
+extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[];
+
+class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl

 {
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
 {
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)


@@ -36,7 +38,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,

-                    const wxString& name = wxT("webkitctrl"))
+                    const wxString& name = wxWebKitCtrlNameStr)

     {
         Create(parent, winID, strURL, pos, size, style, validator, name);
     };
     {
         Create(parent, winID, strURL, pos, size, style, validator, name);
     };


@@ -46,7 +48,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = wxT("webkitctrl"));
+                const wxString& name = wxWebKitCtrlNameStr);

     virtual ~wxWebKitCtrl();
 
     void LoadURL(const wxString &url);
     virtual ~wxWebKitCtrl();
 
     void LoadURL(const wxString &url);


@@ -75,9 +77,9 @@ public:
     bool CanDecreaseTextSize();
     void DecreaseTextSize();
 
     bool CanDecreaseTextSize();
     void DecreaseTextSize();
 

-    void Print(bool showPrompt=FALSE);
+    void Print(bool showPrompt = false);

 
 

-    void MakeEditable(bool enable=TRUE);
+    void MakeEditable(bool enable = true);

     bool IsEditable();
 
     wxString RunScript(const wxString& javascript);
     bool IsEditable();
 
     wxString RunScript(const wxString& javascript);


@@ -85,6 +87,12 @@ public:
     void SetScrollPos(int pos);
     int GetScrollPos();
 
     void SetScrollPos(int pos);
     int GetScrollPos();
 

+    // don't hide base class virtuals
+    virtual void SetScrollPos( int orient, int pos, bool refresh = true )
+        { return wxControl::SetScrollPos(orient, pos, refresh); }
+    virtual int GetScrollPos( int orient ) const
+        { return wxControl::GetScrollPos(orient); }
+

     //we need to resize the webview when the control size changes
     void OnSize(wxSizeEvent &event);
     void OnMove(wxMoveEvent &event);
     //we need to resize the webview when the control size changes
     void OnSize(wxSizeEvent &event);
     void OnMove(wxMoveEvent &event);


@@ -133,7 +141,7 @@ enum {
 
 
 
 
 
 

-class wxWebKitBeforeLoadEvent : public wxCommandEvent
+class WXDLLIMPEXP_CORE wxWebKitBeforeLoadEvent : public wxCommandEvent

 {
     DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
 
 {
     DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
 


@@ -145,7 +153,7 @@ public:
     void SetNavigationType(int navType) { m_navType = navType; }
     int GetNavigationType() { return m_navType; }
 
     void SetNavigationType(int navType) { m_navType = navType; }
     int GetNavigationType() { return m_navType; }
 

-    wxWebKitBeforeLoadEvent( wxWindow* win = (wxWindow*) NULL );
+    wxWebKitBeforeLoadEvent( wxWindow* win = NULL );

     wxEvent *Clone(void) const { return new wxWebKitBeforeLoadEvent(*this); }
 
 protected:
     wxEvent *Clone(void) const { return new wxWebKitBeforeLoadEvent(*this); }
 
 protected:


@@ -154,7 +162,7 @@ protected:
     int m_navType;
 };
 
     int m_navType;
 };
 

-class wxWebKitStateChangedEvent : public wxCommandEvent
+class WXDLLIMPEXP_CORE wxWebKitStateChangedEvent : public wxCommandEvent

 {
     DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
 
 {
     DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
 


@@ -164,7 +172,7 @@ public:
     wxString GetURL() { return m_url; }
     void SetURL(const wxString& url) { m_url = url; }
 
     wxString GetURL() { return m_url; }
     void SetURL(const wxString& url) { m_url = url; }
 

-    wxWebKitStateChangedEvent( wxWindow* win = (wxWindow*) NULL );
+    wxWebKitStateChangedEvent( wxWindow* win = NULL );

     wxEvent *Clone(void) const { return new wxWebKitStateChangedEvent(*this); }
 
 protected:
     wxEvent *Clone(void) const { return new wxWebKitStateChangedEvent(*this); }
 
 protected:


@@ -173,7 +181,7 @@ protected:
 };
 
 
 };
 
 

-class wxWebKitNewWindowEvent : public wxCommandEvent
+class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent

 {
     DECLARE_DYNAMIC_CLASS( wxWebViewNewWindowEvent )
 public:
 {
     DECLARE_DYNAMIC_CLASS( wxWebViewNewWindowEvent )
 public:


@@ -203,30 +211,30 @@ typedef void (wxEvtHandler::*wxWebKitNewWindowEventFunction)(wxWebKitNewWindowEv
 #define wxWebKitNewWindowEventHandler( func ) \
     wxEVENT_HANDLER_CAST( wxWebKitNewWindowEventFunction, func )
 
 #define wxWebKitNewWindowEventHandler( func ) \
     wxEVENT_HANDLER_CAST( wxWebKitNewWindowEventFunction, func )
 

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_STATE_CHANGED, wxWebKitStateChangedEvent )
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_BEFORE_LOAD, wxWebKitBeforeLoadEvent )
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent )
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_STATE_CHANGED, wxWebKitStateChangedEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_BEFORE_LOAD, wxWebKitBeforeLoadEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent );

 
 #define EVT_WEBKIT_STATE_CHANGED(func) \
 
 #define EVT_WEBKIT_STATE_CHANGED(func) \

-            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \
+            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \

                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitStateChangedEventHandler( func ), \
                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitStateChangedEventHandler( func ), \

-                            (wxObject *) NULL ),
+                            NULL ),

 
 #define EVT_WEBKIT_BEFORE_LOAD(func) \
 
 #define EVT_WEBKIT_BEFORE_LOAD(func) \

-            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \
+            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \

                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitBeforeLoadEventHandler( func ), \
                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitBeforeLoadEventHandler( func ), \

-                            (wxObject *) NULL ),
+                            NULL ),

 
 #define EVT_WEBKIT_NEW_WINDOW(func)                              \
 
 #define EVT_WEBKIT_NEW_WINDOW(func)                              \

-            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \
+            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \

                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitNewWindowEventFunction( func ), \
                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitNewWindowEventFunction( func ), \

-                            (wxObject *) NULL ),
+                            NULL ),

 #endif // wxUSE_WEBKIT
 
 #endif
 #endif // wxUSE_WEBKIT
 
 #endif