Fix recursion problems when loading pages from a virtual file system using the WebKit...

[wxWidgets.git] / src / common / toplvcmn.cpp

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index ceee633abfb8dc1478b376dd086031fb86c504ec..1ce788ef1f3b40907a7240f5e6f33b42f17ec2ba 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -39,11 +39,8 @@
 BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow)
     EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow)
     EVT_SIZE(wxTopLevelWindowBase::OnSize)
 BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow)
     EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow)
     EVT_SIZE(wxTopLevelWindowBase::OnSize)

-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxTopLevelWindowBase)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxTopLevelWindowBase, wxWindow)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -58,8 +55,6 @@ wxTopLevelWindowBase::wxTopLevelWindowBase()
 {
     // Unlike windows, top level windows are created hidden by default.
     m_isShown = false;
 {
     // Unlike windows, top level windows are created hidden by default.
     m_isShown = false;

-
-    WX_INIT_CONTROL_CONTAINER();

 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()
 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()


@@ -352,7 +347,7 @@ void wxTopLevelWindowBase::SetIcon(const wxIcon& icon)
     // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
     // have any icon), but adding an invalid icon to wxIconBundle is not
     wxIconBundle icons;
     // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
     // have any icon), but adding an invalid icon to wxIconBundle is not
     wxIconBundle icons;

-    if ( icon.Ok() )
+    if ( icon.IsOk() )

         icons.AddIcon(icon);
 
     SetIcons(icons);
         icons.AddIcon(icon);
 
     SetIcons(icons);