cleaned some relics - mod_* instead of m_* in wxHTML modules
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -361,9 +361,9 @@ bool wxHtmlWindow::HistoryBack()
|
|||||||
if (a == wxEmptyString) LoadPage(l);
|
if (a == wxEmptyString) LoadPage(l);
|
||||||
else LoadPage(l + "#" + a);
|
else LoadPage(l + "#" + a);
|
||||||
m_HistoryOn = TRUE;
|
m_HistoryOn = TRUE;
|
||||||
Scroll(0, m_History[m_HistoryPos].GetPos());
|
wxYield();
|
||||||
// wxYield();
|
|
||||||
m_tmpCanDrawLocks--;
|
m_tmpCanDrawLocks--;
|
||||||
|
Scroll(0, m_History[m_HistoryPos].GetPos());
|
||||||
Refresh();
|
Refresh();
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
@@ -387,9 +387,9 @@ bool wxHtmlWindow::HistoryForward()
|
|||||||
if (a == wxEmptyString) LoadPage(l);
|
if (a == wxEmptyString) LoadPage(l);
|
||||||
else LoadPage(l + "#" + a);
|
else LoadPage(l + "#" + a);
|
||||||
m_HistoryOn = TRUE;
|
m_HistoryOn = TRUE;
|
||||||
Scroll(0, m_History[m_HistoryPos].GetPos());
|
wxYield();
|
||||||
// wxYield();
|
|
||||||
m_tmpCanDrawLocks--;
|
m_tmpCanDrawLocks--;
|
||||||
|
Scroll(0, m_History[m_HistoryPos].GetPos());
|
||||||
Refresh();
|
Refresh();
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
@@ -586,14 +586,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
|
|||||||
|
|
||||||
///// default mod handlers are forced there:
|
///// default mod handlers are forced there:
|
||||||
|
|
||||||
FORCE_LINK(mod_layout)
|
FORCE_LINK(m_layout)
|
||||||
FORCE_LINK(mod_fonts)
|
FORCE_LINK(m_fonts)
|
||||||
FORCE_LINK(mod_image)
|
FORCE_LINK(m_image)
|
||||||
FORCE_LINK(mod_list)
|
FORCE_LINK(m_list)
|
||||||
FORCE_LINK(mod_pre)
|
FORCE_LINK(m_dflist)
|
||||||
FORCE_LINK(mod_hline)
|
FORCE_LINK(m_pre)
|
||||||
FORCE_LINK(mod_links)
|
FORCE_LINK(m_hline)
|
||||||
FORCE_LINK(mod_tables)
|
FORCE_LINK(m_links)
|
||||||
|
FORCE_LINK(m_tables)
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mod_hline.cpp
|
// Name: m_hline.cpp
|
||||||
// Purpose: wxHtml module for horizontal line (HR tag)
|
// Purpose: wxHtml module for horizontal line (HR tag)
|
||||||
// Author: Vaclav Slavik
|
// Author: Vaclav Slavik
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
#include "wx/html/htmlcell.h"
|
#include "wx/html/htmlcell.h"
|
||||||
|
|
||||||
FORCE_LINK_ME(mod_hline)
|
FORCE_LINK_ME(m_hline)
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mod_image.cpp
|
// Name: m_image.cpp
|
||||||
// Purpose: wxHtml module for displaying images
|
// Purpose: wxHtml module for displaying images
|
||||||
// Author: Vaclav Slavik
|
// Author: Vaclav Slavik
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
|
|
||||||
FORCE_LINK_ME(mod_image)
|
FORCE_LINK_ME(m_image)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mod_layout.cpp
|
// Name: m_layout.cpp
|
||||||
// Purpose: wxHtml module for basic paragraphs/layout handling
|
// Purpose: wxHtml module for basic paragraphs/layout handling
|
||||||
// Author: Vaclav Slavik
|
// Author: Vaclav Slavik
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
#include "wx/html/htmlwin.h"
|
#include "wx/html/htmlwin.h"
|
||||||
|
|
||||||
FORCE_LINK_ME(mod_layout)
|
FORCE_LINK_ME(m_layout)
|
||||||
|
|
||||||
|
|
||||||
TAG_HANDLER_BEGIN(P, "P")
|
TAG_HANDLER_BEGIN(P, "P")
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mod_links.cpp
|
// Name: m_links.cpp
|
||||||
// Purpose: wxHtml module for links & anchors
|
// Purpose: wxHtml module for links & anchors
|
||||||
// Author: Vaclav Slavik
|
// Author: Vaclav Slavik
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
#include "wx/html/m_templ.h"
|
#include "wx/html/m_templ.h"
|
||||||
|
|
||||||
|
|
||||||
FORCE_LINK_ME(mod_links)
|
FORCE_LINK_ME(m_links)
|
||||||
|
|
||||||
|
|
||||||
class wxHtmlAnchorCell : public wxHtmlCell
|
class wxHtmlAnchorCell : public wxHtmlCell
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mod_list.cpp
|
// Name: m_list.cpp
|
||||||
// Purpose: wxHtml module for lists
|
// Purpose: wxHtml module for lists
|
||||||
// Author: Vaclav Slavik
|
// Author: Vaclav Slavik
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
#include "wx/html/htmlcell.h"
|
#include "wx/html/htmlcell.h"
|
||||||
|
|
||||||
FORCE_LINK_ME(mod_list)
|
FORCE_LINK_ME(m_list)
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mod_pre.cpp
|
// Name: m_pre.cpp
|
||||||
// Purpose: wxHtml module for <PRE> ... </PRE> tag (code citation)
|
// Purpose: wxHtml module for <PRE> ... </PRE> tag (code citation)
|
||||||
// Author: Vaclav Slavik
|
// Author: Vaclav Slavik
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
#include "wx/html/htmlcell.h"
|
#include "wx/html/htmlcell.h"
|
||||||
#include "wx/tokenzr.h"
|
#include "wx/tokenzr.h"
|
||||||
|
|
||||||
FORCE_LINK_ME(mod_pre)
|
FORCE_LINK_ME(m_pre)
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mod_tables.cpp
|
// Name: m_tables.cpp
|
||||||
// Purpose: wxHtml module for tables
|
// Purpose: wxHtml module for tables
|
||||||
// Author: Vaclav Slavik
|
// Author: Vaclav Slavik
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
REMARKS:
|
REMARKS:
|
||||||
1. This version of mod_tables doesn't support auto-layout algorithm.
|
1. This version of m_tables doesn't support auto-layout algorithm.
|
||||||
This means that all columns are of same width unless explicitly specified.
|
This means that all columns are of same width unless explicitly specified.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ REMARKS:
|
|||||||
|
|
||||||
#include "wx/html/htmlcell.h"
|
#include "wx/html/htmlcell.h"
|
||||||
|
|
||||||
FORCE_LINK_ME(mod_tables)
|
FORCE_LINK_ME(m_tables)
|
||||||
|
|
||||||
|
|
||||||
#define TABLE_BORDER_CLR_1 wxColour(0xC5, 0xC2, 0xC5)
|
#define TABLE_BORDER_CLR_1 wxColour(0xC5, 0xC2, 0xC5)
|
||||||
|
Reference in New Issue
Block a user