updates from Adrián González Alba

[wxWidgets.git] / contrib / src / applet / loadpage.cpp

diff --git a/contrib/src/applet/loadpage.cpp b/contrib/src/applet/loadpage.cpp
index 32f8af20c4fd4dcf7e5adf7ecefa7ef4cd83611a..c743228e8cff86be16f22a469e427189df51830e 100644 (file)
--- a/contrib/src/applet/loadpage.cpp
+++ b/contrib/src/applet/loadpage.cpp
@@ -26,13 +26,12 @@
 *
 ****************************************************************************/
 
 *
 ****************************************************************************/
 

-// For compilers that support precompilation
-#include "wx/wxprec.h"
-#include "wx/html/forcelnk.h"
-

 // Include private headers
 #include "wx/applet/loadpage.h"
 
 // Include private headers
 #include "wx/applet/loadpage.h"
 

+// wxWindows forcelink macro
+#include "wx/html/forcelnk.h"
+

 /*------------------------- Implementation --------------------------------*/
 
 // Implement the class functions for wxLoadPageEvent
 /*------------------------- Implementation --------------------------------*/
 
 // Implement the class functions for wxLoadPageEvent


@@ -42,10 +41,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxLoadPageEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxPageLoadedEvent, wxEvent)
 
 // Define our custom event ID for load page
 IMPLEMENT_DYNAMIC_CLASS(wxPageLoadedEvent, wxEvent)
 
 // Define our custom event ID for load page

-DEFINE_EVENT_TYPE(wxEVT_LOAD_PAGE);
+DEFINE_EVENT_TYPE(wxEVT_LOAD_PAGE)

 
 // Define our custom event ID for page loaded
 
 // Define our custom event ID for page loaded

-DEFINE_EVENT_TYPE(wxEVT_PAGE_LOADED);
+DEFINE_EVENT_TYPE(wxEVT_PAGE_LOADED)

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


@@ -59,20 +58,6 @@ wxLoadPageEvent::wxLoadPageEvent(
     m_eventType = wxEVT_LOAD_PAGE;
 }
 
     m_eventType = wxEVT_LOAD_PAGE;
 }
 

-/****************************************************************************
-REMARKS:
-Function to copy the wxLoadPageEvent object
-****************************************************************************/
-void wxLoadPageEvent::CopyObject(
-    wxObject& obj_d) const
-{
-    wxLoadPageEvent *obj = (wxLoadPageEvent*)&obj_d;
-    wxEvent::CopyObject(obj_d);
-    obj->m_hRef         = m_hRef;
-    obj->m_htmlWindow   = m_htmlWindow;
-}
-
-

 /****************************************************************************
 REMARKS:
 Constructor for the wxPageLoadedEvent class
 /****************************************************************************
 REMARKS:
 Constructor for the wxPageLoadedEvent class


@@ -82,17 +67,6 @@ wxPageLoadedEvent::wxPageLoadedEvent()
     m_eventType = wxEVT_LOAD_PAGE;
 }
 
     m_eventType = wxEVT_LOAD_PAGE;
 }
 

-/****************************************************************************
-REMARKS:
-Function to copy the wxPageLoadedEvent object
-****************************************************************************/
-void wxPageLoadedEvent::CopyObject(
-    wxObject& obj_d) const
-{
-    wxPageLoadedEvent *obj = (wxPageLoadedEvent*)&obj_d;
-    wxEvent::CopyObject(obj_d);
-}
-

 // This is out little force link hack
 FORCE_LINK_ME(loadpage)
 
 // This is out little force link hack
 FORCE_LINK_ME(loadpage)