Use wxMarkupParser in wxStaticText for dealing with markup.
No real changes, just remove markup parsing code from wxStaticText implementation and reuse wxMarkupParser methods there instead. This makes include/wx/private/stattext.h file unnecessary as it is used only in a single place now so remove it and move its remaining contents to src/gtk/mnemonics.cpp. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,40 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/private/stattext.h
|
||||
// Purpose: Internal declarations for dlgcmn.cpp and stattextcmn.cpp
|
||||
// Author: Francesco Montorsi
|
||||
// Created: 2007-01-07 (extracted from dlgcmn.cpp)
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 1999 Vadim Zeitlin
|
||||
// (c) 2007 wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_PRIVATE_STATTEXT_H_
|
||||
#define _WX_PRIVATE_STATTEXT_H_
|
||||
|
||||
enum
|
||||
{
|
||||
wxMARKUP_ENTITY_AMP,
|
||||
wxMARKUP_ENTITY_LT,
|
||||
wxMARKUP_ENTITY_GT,
|
||||
wxMARKUP_ENTITY_APOS,
|
||||
wxMARKUP_ENTITY_QUOT,
|
||||
wxMARKUP_ENTITY_MAX
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
wxMARKUP_ELEMENT_NAME,
|
||||
wxMARKUP_ELEMENT_VALUE,
|
||||
wxMARKUP_ELEMENT_MAX
|
||||
};
|
||||
|
||||
// these are the only entities treated in a special way by wxStaticText::SetLabel()
|
||||
// when the wxST_MARKUP style is used; use as:
|
||||
//
|
||||
// wxMarkupEntities[wxMARKUP_ELEMENT_NAME][wxMARKUP_ENTITY_GT] == ">"
|
||||
// wxMarkupEntities[wxMARKUP_ELEMENT_VALUE][wxMARKUP_ENTITY_GT] == ">"
|
||||
//
|
||||
extern const wxChar *const wxMarkupEntities[wxMARKUP_ELEMENT_MAX][wxMARKUP_ENTITY_MAX];
|
||||
|
||||
#endif // _WX_PRIVATE_STATTEXT_H_
|
Reference in New Issue
Block a user