account for the label size in wxDisclosureTriangle under Carbon

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index ea22fa9b6edb0bb7b02e0997d031529795f8c29e..63f4c1ae47e19b8b83a28221e75672a322578553 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -55,7 +55,6 @@
 #include "wx/fontenum.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
 #include "wx/fontenum.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"

-#include "wx/app.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
 


@@ -82,7 +81,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     // Simply pass the pointer on to the help window
     m_Data = data;
     m_HtmlHelpWin = NULL;
     // Simply pass the pointer on to the help window
     m_Data = data;
     m_HtmlHelpWin = NULL;

-    m_helpController = (wxHtmlHelpController*) NULL;
+    m_helpController = NULL;

 }
 
 void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
 }
 
 void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)


@@ -114,7 +113,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);
 
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);
 

-    SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_HELP_BROWSER));
+    SetIcons(wxArtProvider::GetIconBundle(wxART_HELP, wxART_FRAME_ICON));

 
     // On the Mac, each modeless frame must have a menubar.
     // TODO: add more menu items, and perhaps add a style to show
 
     // On the Mac, each modeless frame must have a menubar.
     // TODO: add more menu items, and perhaps add a style to show


@@ -246,11 +245,4 @@ void wxHtmlHelpFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 #endif
 
 }
 #endif
 

-// we don't want to prevent the app from closing just because a help window
-// remains opened
-bool wxHtmlHelpFrame::ShouldPreventAppExit() const
-{
-    return (wx_const_cast(wxHtmlHelpFrame*, this) == wxTheApp->GetTopWindow());
-}
-

 #endif // wxUSE_WXHTML_HELP
 #endif // wxUSE_WXHTML_HELP