Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move variable definitions to more appropriate places, remove now-empty src/common/datacmn.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-01-05 18:27:58 +00:00
parent 07e99d8782
commit f313deaa38
34 changed files with 73 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/stattextcmn.cpp
View File

@@ -24,20 +24,8 @@
#pragma hdrstop
#endif
#include "wx/textwrapper.h"
#include "wx/private/stattext.h"
#ifndef WX_PRECOMP
#include "wx/button.h"
#include "wx/dcclient.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/stattext.h"
#include "wx/sizer.h"
#include "wx/containr.h"
#endif
const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
{
// the entities handled by SetLabel() when wxST_MARKUP is used and their referenced string
@@ -48,6 +36,21 @@ const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
#if wxUSE_STATTEXT
#ifndef WX_PRECOMP
#include "wx/stattext.h"
#include "wx/button.h"
#include "wx/dcclient.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/sizer.h"
#include "wx/containr.h"
#endif
#include "wx/textwrapper.h"
extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[] = "staticText";
// ----------------------------------------------------------------------------
// XTI
// ----------------------------------------------------------------------------