projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace use of deprecated GtkPixmap, gtk_container_border_width
[wxWidgets.git]
/
src
/
html
/
helpwnd.cpp
diff --git
a/src/html/helpwnd.cpp
b/src/html/helpwnd.cpp
index e9aac75806a72bfd8c99f19d1c1fa27eb72d7304..1b55a9c21a6a230ce20c3f62149816b54d955ca7 100644
(file)
--- a/
src/html/helpwnd.cpp
+++ b/
src/html/helpwnd.cpp
@@
-14,32
+14,37
@@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+
#pragma hdrstop
#endif
#if wxUSE_WXHTML_HELP
#ifndef WXPRECOMP
#endif
#if wxUSE_WXHTML_HELP
#ifndef WXPRECOMP
+ #include "wx/object.h"
+ #include "wx/dynarray.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/log.h"
+ #if wxUSE_STREAMS
+ #include "wx/stream.h"
+ #endif
- #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/menu.h"
+ #include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/msgdlg.h"
-#endif
+ #include "wx/textctrl.h"
+ #include "wx/toolbar.h"
+ #include "wx/choicdlg.h"
+ #include "wx/filedlg.h"
+#endif // WXPRECOMP
#include "wx/html/helpfrm.h"
#include "wx/html/helpdlg.h"
#include "wx/html/helpctrl.h"
#include "wx/html/helpfrm.h"
#include "wx/html/helpdlg.h"
#include "wx/html/helpctrl.h"
-#include "wx/textctrl.h"
#include "wx/notebook.h"
#include "wx/imaglist.h"
#include "wx/treectrl.h"
#include "wx/notebook.h"
#include "wx/imaglist.h"
#include "wx/treectrl.h"
@@
-48,15
+53,9
@@
#include "wx/html/htmlwin.h"
#include "wx/busyinfo.h"
#include "wx/progdlg.h"
#include "wx/html/htmlwin.h"
#include "wx/busyinfo.h"
#include "wx/progdlg.h"
-#include "wx/toolbar.h"
#include "wx/fontenum.h"
#include "wx/fontenum.h"
-#include "wx/stream.h"
-#include "wx/filedlg.h"
#include "wx/artprov.h"
#include "wx/spinctrl.h"
#include "wx/artprov.h"
#include "wx/spinctrl.h"
-#include "wx/dynarray.h"
-#include "wx/choicdlg.h"
-#include "wx/settings.h"
// what is considered "small index"?
#define INDEX_IS_SMALL 100
// what is considered "small index"?
#define INDEX_IS_SMALL 100
@@
-94,7
+93,7
@@
class wxHtmlHelpHashData : public wxObject
public:
wxHtmlHelpHashData(int index, wxTreeItemId id) : wxObject()
{ m_Index = index; m_Id = id;}
public:
wxHtmlHelpHashData(int index, wxTreeItemId id) : wxObject()
{ m_Index = index; m_Id = id;}
- ~wxHtmlHelpHashData() {}
+
virtual
~wxHtmlHelpHashData() {}
int m_Index;
wxTreeItemId m_Id;
int m_Index;
wxTreeItemId m_Id;
@@
-1282,18
+1281,14
@@
void wxHtmlHelpWindow::OptionsDialog()
if (m_NormalFonts == NULL)
{
if (m_NormalFonts == NULL)
{
- wxFontEnumerator enu;
- enu.EnumerateFacenames();
- m_NormalFonts = new wxArrayString;
- *m_NormalFonts = *enu.GetFacenames();
+ m_NormalFonts = new wxArrayString(wxFontEnumerator::GetFacenames());
m_NormalFonts->Sort(); // ascending sort
}
if (m_FixedFonts == NULL)
{
m_NormalFonts->Sort(); // ascending sort
}
if (m_FixedFonts == NULL)
{
- wxFontEnumerator enu;
- enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, true /*enum fixed width only*/);
- m_FixedFonts = new wxArrayString;
- *m_FixedFonts = *enu.GetFacenames();
+ m_FixedFonts = new wxArrayString(
+ wxFontEnumerator::GetFacenames(wxFONTENCODING_SYSTEM,
+ true /*enum fixed width only*/));
m_FixedFonts->Sort(); // ascending sort
}
m_FixedFonts->Sort(); // ascending sort
}
@@
-1538,7
+1533,7
@@
void wxHtmlHelpWindow::OnToolbar(wxCommandEvent& event)
wxEmptyString,
wxEmptyString,
filemask,
wxEmptyString,
wxEmptyString,
filemask,
- wx
OPEN | wx
FILE_MUST_EXIST,
+ wx
FD_OPEN | wxFD_
FILE_MUST_EXIST,
this);
if (!s.empty())
{
this);
if (!s.empty())
{