missing commit

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

diff --git a/src/html/helpdlg.cpp b/src/html/helpdlg.cpp
index d8d72d9afc4cc21ce59fb36de01e136f4f80f57d..3dd8bf659e0a77ebe852a533929d8da6eced96d0 100644 (file)
--- a/src/html/helpdlg.cpp
+++ b/src/html/helpdlg.cpp
@@ -1,43 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpdlg.cpp
+// Name:        src/html/helpdlg.cpp

 // Purpose:     wxHtmlHelpDialog
 // 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
 // Purpose:     wxHtmlHelpDialog
 // 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

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "helpdlgex.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h"
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h"
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_WXHTML_HELP
 
 #endif
 
 #if wxUSE_WXHTML_HELP
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
+    #include "wx/object.h"

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

-    #include "wx/object.h"

     #include "wx/sizer.h"
 
     #include "wx/bmpbuttn.h"
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
     #include "wx/sizer.h"
 
     #include "wx/bmpbuttn.h"
     #include "wx/statbox.h"
     #include "wx/radiobox.h"

-#endif // WXPRECOMP
-
-#ifdef __WXMAC__

     #include "wx/menu.h"
     #include "wx/msgdlg.h"
     #include "wx/menu.h"
     #include "wx/msgdlg.h"

-#endif
+#endif // WX_PRECOMP

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


@@ -71,11 +64,11 @@ bool wxHtmlHelpDialog::Create(wxWindow* parent, wxWindowID id,
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
 
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
 

-    wxDialog::Create(parent, id, _("Help"), 
+    wxDialog::Create(parent, id, _("Help"),

                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),

-                    wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h), 
+                    wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h),

                     wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER, wxT("wxHtmlHelp"));
                     wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER, wxT("wxHtmlHelp"));

-    m_HtmlHelpWin->Create(this, -1, wxDefaultPosition, GetClientSize(),
+    m_HtmlHelpWin->Create(this, wxID_ANY, wxDefaultPosition, GetClientSize(),

         wxTAB_TRAVERSAL|wxNO_BORDER, style);
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);
         wxTAB_TRAVERSAL|wxNO_BORDER, style);
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);


@@ -95,13 +88,13 @@ 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(5, 5, 0, wxALIGN_CENTER_VERTICAL, 0);
 #endif
     item4->Add(item6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10);
 #ifdef __WXMAC__
     // Add some space for the resize handle
     item4->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 0);
 #endif

-    
+

     Layout();
     Centre();
 
     Layout();
     Centre();
 


@@ -137,4 +130,3 @@ void wxHtmlHelpDialog::OnCloseWindow(wxCloseEvent& evt)
 }
 
 #endif // wxUSE_WXHTML_HELP
 }
 
 #endif // wxUSE_WXHTML_HELP

-