projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wide char codeset detection for systems which do support LE/BE variants (broken...
[wxWidgets.git]
/
src
/
html
/
htmlwin.cpp
diff --git
a/src/html/htmlwin.cpp
b/src/html/htmlwin.cpp
index 2ec463d64184b44955346c5ac209e5217763abac..353f589c3aa1573b424e6821be66aec9cdd42e18 100644
(file)
--- a/
src/html/htmlwin.cpp
+++ b/
src/html/htmlwin.cpp
@@
-7,12
+7,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "htmlwin.h"
-#pragma implementation "htmlproc.h"
-#endif
-
#include "wx/wxprec.h"
#include "wx/defs.h"
#include "wx/wxprec.h"
#include "wx/defs.h"
@@
-141,10
+135,10
@@
private:
//-----------------------------------------------------------------------------
WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);
//-----------------------------------------------------------------------------
WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);
-WX_DEFINE_OBJARRAY(wxHtmlHistoryArray)
;
+WX_DEFINE_OBJARRAY(wxHtmlHistoryArray)
WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);
WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);
-WX_DEFINE_LIST(wxHtmlProcessorList)
;
+WX_DEFINE_LIST(wxHtmlProcessorList)
//-----------------------------------------------------------------------------
// wxHtmlWindow
//-----------------------------------------------------------------------------
// wxHtmlWindow
@@
-241,7
+235,7
@@
void wxHtmlWindow::SetRelatedStatusBar(int bar)
-void wxHtmlWindow::SetFonts(
wxString normal_face, wxString
fixed_face, const int *sizes)
+void wxHtmlWindow::SetFonts(
const wxString& normal_face, const wxString&
fixed_face, const int *sizes)
{
wxString op = m_OpenedPage;
{
wxString op = m_OpenedPage;
@@
-826,6
+820,8
@@
bool wxHtmlWindow::CopySelection(ClipboardType t)
return true;
}
}
return true;
}
}
+#else
+ wxUnusedVar(t);
#endif // wxUSE_CLIPBOARD
return false;
#endif // wxUSE_CLIPBOARD
return false;
@@
-1027,6
+1023,8
@@
void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
CaptureMouse();
}
}
CaptureMouse();
}
}
+#else
+ wxUnusedVar(event);
#endif // wxUSE_CLIPBOARD
}
#endif // wxUSE_CLIPBOARD
}