projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow wxPreferencesEditor::Dismiss() to work when using modal dialogs too.
[wxWidgets.git]
/
src
/
generic
/
htmllbox.cpp
diff --git
a/src/generic/htmllbox.cpp
b/src/generic/htmllbox.cpp
index 0e89d1e8f1c00c0f731c8c9bd1e008761787a2c2..af7666efe346d206657944cdbee1959f80f2e32a 100644
(file)
--- a/
src/generic/htmllbox.cpp
+++ b/
src/generic/htmllbox.cpp
@@
-1,5
+1,5
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: generic/htmllbox.cpp
+// Name:
src/
generic/htmllbox.cpp
// Purpose: implementation of wxHtmlListBox
// Author: Vadim Zeitlin
// Modified by:
// Purpose: implementation of wxHtmlListBox
// Author: Vadim Zeitlin
// Modified by:
@@
-308,7
+308,7
@@
void wxHtmlListBox::CacheItem(size_t n) const
m_htmlParser->SetDC(new wxClientDC(self));
m_htmlParser->SetFS(&self->m_filesystem);
#if !wxUSE_UNICODE
m_htmlParser->SetDC(new wxClientDC(self));
m_htmlParser->SetFS(&self->m_filesystem);
#if !wxUSE_UNICODE
- if (GetFont().Ok())
+ if (GetFont().
Is
Ok())
m_htmlParser->SetInputEncoding(GetFont().GetEncoding());
#endif
// use system's default GUI font by default:
m_htmlParser->SetInputEncoding(GetFont().GetEncoding());
#endif
// use system's default GUI font by default:
@@
-599,6
+599,9
@@
void wxHtmlListBox::OnLeftDown(wxMouseEvent& event)
// wxSimpleHtmlListBox
// ----------------------------------------------------------------------------
// wxSimpleHtmlListBox
// ----------------------------------------------------------------------------
+IMPLEMENT_ABSTRACT_CLASS(wxSimpleHtmlListBox, wxHtmlListBox)
+
+
bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
@@
-686,7
+689,7
@@
int wxSimpleHtmlListBox::DoInsertItems(const wxArrayStringsAdapter& items,
UpdateCount();
UpdateCount();
- return pos;
+ return pos
- 1
;
}
void wxSimpleHtmlListBox::SetString(unsigned int n, const wxString& s)
}
void wxSimpleHtmlListBox::SetString(unsigned int n, const wxString& s)