Move code that does not need realized GdkWinow out of realize handler

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

diff --git a/src/html/helpdlg.cpp b/src/html/helpdlg.cpp
index ccd65dc032386c48927b947def273a65df6100c5..e92f95d1a961d3568ada93fedec4bb41ad436d1e 100644 (file)
--- a/src/html/helpdlg.cpp
+++ b/src/html/helpdlg.cpp
@@ -4,9 +4,8 @@
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden, Vaclav Slavik and Julian Smart
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden, Vaclav Slavik and Julian Smart

-// RCS-ID:      $Id$

 // Copyright:   (c) Harm van der Heijden, Vaclav Slavik and Julian Smart
 // Copyright:   (c) Harm van der Heijden, Vaclav Slavik and Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h"
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h"


@@ -18,7 +17,7 @@
 
 #if wxUSE_WXHTML_HELP
 
 
 #if wxUSE_WXHTML_HELP
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP

     #include "wx/object.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/object.h"
     #include "wx/intl.h"
     #include "wx/log.h"


@@ -30,7 +29,7 @@
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/msgdlg.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/msgdlg.h"

-#endif // WXPRECOMP
+#endif // WX_PRECOMP

 
 #include "wx/html/htmlwin.h"
 #include "wx/html/helpdlg.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/helpdlg.h"


@@ -88,7 +87,7 @@ bool wxHtmlHelpDialog::Create(wxWindow* parent, wxWindowID id,
 
     item4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
 
     item4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 

-    wxButton* item6 = new wxButton(item1, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize, 0);
+    wxButton* item6 = new wxButton(item1, wxID_OK, _("Close"), wxDefaultPosition, wxDefaultSize, 0);

     item4->Add(item6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10);
 #ifdef __WXMAC__
     // Add some space for the resize handle
     item4->Add(item6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10);
 #ifdef __WXMAC__
     // Add some space for the resize handle