Renderer should only be used for GTK+ 2

[wxWidgets.git] / contrib / include / wx / applet / loadpage.h

diff --git a/contrib/include/wx/applet/loadpage.h b/contrib/include/wx/applet/loadpage.h
index f20cd0c3fef2006ff0fc5d1511cc37e327397da2..223dabc4b7f8bb9a53f98e7cc2982881dce8433b 100644 (file)
--- a/contrib/include/wx/applet/loadpage.h
+++ b/contrib/include/wx/applet/loadpage.h
@@ -68,20 +68,21 @@ public:
             // Destructor
             ~wxLoadPageEvent() {}
 
             // Destructor
             ~wxLoadPageEvent() {}
 

+            // Clone Virtual
+            virtual wxEvent *Clone() const { return new wxLoadPageEvent(m_hRef, m_htmlWindow); }
+

             // Return the hmtl window for the load page operation
             wxHtmlAppletWindow  *GetHtmlWindow() { return m_htmlWindow; };
 
             // Get the hRef string for the load page operation
             const wxString & GetHRef() { return m_hRef; };
 
             // Return the hmtl window for the load page operation
             wxHtmlAppletWindow  *GetHtmlWindow() { return m_htmlWindow; };
 
             // Get the hRef string for the load page operation
             const wxString & GetHRef() { return m_hRef; };
 

-            // Copy constructor for the object
-            void CopyObject(wxObject& obj) const;

     };
 
 
 // Define the macro to create our event type
 typedef void (wxEvtHandler::*wxLoadPageEventFunction)(wxLoadPageEvent&);
     };
 
 
 // Define the macro to create our event type
 typedef void (wxEvtHandler::*wxLoadPageEventFunction)(wxLoadPageEvent&);

-#define EVT_LOAD_PAGE(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LOAD_PAGE, -1, -1, (wxObjectEventFunction)(wxEventFunction)(wxLoadPageEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_LOAD_PAGE(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LOAD_PAGE, -1, -1, (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxLoadPageEventFunction, & fn ), (wxObject *) NULL ),

 
 /****************************************************************************
 REMARKS:
 
 /****************************************************************************
 REMARKS:


@@ -97,13 +98,15 @@ public:
             // Destructor
             ~wxPageLoadedEvent() {}
 
             // Destructor
             ~wxPageLoadedEvent() {}
 

-            // Copy constructor for the object
-            void CopyObject(wxObject& obj) const;
+            // Clone Virtual
+            virtual wxEvent *Clone() const {
+                return new wxPageLoadedEvent(); }
+

     };
 
 // Define the macro to create our event type
 typedef void (wxEvtHandler::*wxPageLoadedEventFunction)(wxPageLoadedEvent&);
     };
 
 // Define the macro to create our event type
 typedef void (wxEvtHandler::*wxPageLoadedEventFunction)(wxPageLoadedEvent&);

-#define EVT_PAGE_LOADED(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAGE_LOADED, -1, -1, (wxObjectEventFunction)(wxEventFunction)(wxPageLoadedEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PAGE_LOADED(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAGE_LOADED, -1, -1, (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxPageLoadedEventFunction, & fn ), (wxObject *) NULL ),

 
 
 #endif // __WX_LOAD_PAGE_H
 
 
 #endif // __WX_LOAD_PAGE_H