removing RTTI classinfo #define redirections, not needed anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,7 +22,6 @@
|
|||||||
#include "wx/generic/colrdlgg.h"
|
#include "wx/generic/colrdlgg.h"
|
||||||
|
|
||||||
#define wxColourDialog wxGenericColourDialog
|
#define wxColourDialog wxGenericColourDialog
|
||||||
#define sm_classwxColourDialog sm_classwxGenericColourDialog
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// get the colour from user and return it
|
// get the colour from user and return it
|
||||||
|
@@ -323,14 +323,11 @@ private:
|
|||||||
#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
|
#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
|
||||||
#ifdef __WIN32__
|
#ifdef __WIN32__
|
||||||
#define wxConfig wxRegConfig
|
#define wxConfig wxRegConfig
|
||||||
#define sm_classwxConfig sm_classwxRegConfig
|
|
||||||
#else //WIN16
|
#else //WIN16
|
||||||
#define wxConfig wxIniConfig
|
#define wxConfig wxIniConfig
|
||||||
#define sm_classwxConfig sm_classwxIniConfig
|
|
||||||
#endif
|
#endif
|
||||||
#else // either we're under Unix or wish to use files even under Windows
|
#else // either we're under Unix or wish to use files even under Windows
|
||||||
#define wxConfig wxFileConfig
|
#define wxConfig wxFileConfig
|
||||||
#define sm_classwxConfig sm_classwxFileConfig
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // wxUSE_CONFIG
|
#endif // wxUSE_CONFIG
|
||||||
|
@@ -11,7 +11,6 @@ class WXDLLEXPORT wxDC;
|
|||||||
#if defined(__WIN16__) || defined(__WXUNIVERSAL__)
|
#if defined(__WIN16__) || defined(__WXUNIVERSAL__)
|
||||||
#include "wx/generic/dragimgg.h"
|
#include "wx/generic/dragimgg.h"
|
||||||
#define wxDragImage wxGenericDragImage
|
#define wxDragImage wxGenericDragImage
|
||||||
#define sm_classwxDragImage sm_classwxGenericDragImage
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#include "wx/msw/dragimag.h"
|
#include "wx/msw/dragimag.h"
|
||||||
@@ -19,27 +18,22 @@ class WXDLLEXPORT wxDC;
|
|||||||
#elif defined(__WXMOTIF__)
|
#elif defined(__WXMOTIF__)
|
||||||
#include "wx/generic/dragimgg.h"
|
#include "wx/generic/dragimgg.h"
|
||||||
#define wxDragImage wxGenericDragImage
|
#define wxDragImage wxGenericDragImage
|
||||||
#define sm_classwxDragImage sm_classwxGenericDragImage
|
|
||||||
|
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
#include "wx/generic/dragimgg.h"
|
#include "wx/generic/dragimgg.h"
|
||||||
#define wxDragImage wxGenericDragImage
|
#define wxDragImage wxGenericDragImage
|
||||||
#define sm_classwxDragImage sm_classwxGenericDragImage
|
|
||||||
|
|
||||||
#elif defined(__WXX11__)
|
#elif defined(__WXX11__)
|
||||||
#include "wx/generic/dragimgg.h"
|
#include "wx/generic/dragimgg.h"
|
||||||
#define wxDragImage wxGenericDragImage
|
#define wxDragImage wxGenericDragImage
|
||||||
#define sm_classwxDragImage sm_classwxGenericDragImage
|
|
||||||
|
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
#include "wx/generic/dragimgg.h"
|
#include "wx/generic/dragimgg.h"
|
||||||
#define wxDragImage wxGenericDragImage
|
#define wxDragImage wxGenericDragImage
|
||||||
#define sm_classwxDragImage sm_classwxGenericDragImage
|
|
||||||
|
|
||||||
#elif defined(__WXPM__)
|
#elif defined(__WXPM__)
|
||||||
#include "wx/generic/dragimgg.h"
|
#include "wx/generic/dragimgg.h"
|
||||||
#define wxDragImage wxGenericDragImage
|
#define wxDragImage wxGenericDragImage
|
||||||
#define sm_classwxDragImage sm_classwxGenericDragImage
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -133,7 +133,6 @@ protected:
|
|||||||
#include "wx/msw/fdrepdlg.h"
|
#include "wx/msw/fdrepdlg.h"
|
||||||
#else
|
#else
|
||||||
#define wxGenericFindReplaceDialog wxFindReplaceDialog
|
#define wxGenericFindReplaceDialog wxFindReplaceDialog
|
||||||
#define sm_classwxGenericFindReplaceDialog sm_classwxFindReplaceDialog
|
|
||||||
|
|
||||||
#include "wx/generic/fdrepdlg.h"
|
#include "wx/generic/fdrepdlg.h"
|
||||||
#endif
|
#endif
|
||||||
|
@@ -69,7 +69,6 @@ protected:
|
|||||||
|| defined(__WXWINCE__)
|
|| defined(__WXWINCE__)
|
||||||
#include "wx/generic/fontdlgg.h"
|
#include "wx/generic/fontdlgg.h"
|
||||||
#define wxFontDialog wxGenericFontDialog
|
#define wxFontDialog wxGenericFontDialog
|
||||||
#define sm_classwxFontDialog sm_classwxGenericFontDialog
|
|
||||||
#elif defined(__WXMSW__)
|
#elif defined(__WXMSW__)
|
||||||
#include "wx/msw/fontdlg.h"
|
#include "wx/msw/fontdlg.h"
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
|
@@ -95,7 +95,6 @@ protected:
|
|||||||
#ifdef __WIN95__
|
#ifdef __WIN95__
|
||||||
#include "wx/msw/gauge95.h"
|
#include "wx/msw/gauge95.h"
|
||||||
#define wxGauge wxGauge95
|
#define wxGauge wxGauge95
|
||||||
#define sm_classwxGauge sm_classwxGauge95
|
|
||||||
#else // !__WIN95__
|
#else // !__WIN95__
|
||||||
// Gauge no longer supported on 16-bit Windows
|
// Gauge no longer supported on 16-bit Windows
|
||||||
#endif
|
#endif
|
||||||
|
@@ -9,22 +9,18 @@
|
|||||||
#include "wx/msw/wince/helpwce.h"
|
#include "wx/msw/wince/helpwce.h"
|
||||||
|
|
||||||
#define wxHelpController wxWinceHelpController
|
#define wxHelpController wxWinceHelpController
|
||||||
#define sm_classwxHelpController sm_classwxWinceHelpController
|
|
||||||
#elif defined(__WXMSW__)
|
#elif defined(__WXMSW__)
|
||||||
#include "wx/msw/helpwin.h"
|
#include "wx/msw/helpwin.h"
|
||||||
|
|
||||||
#define wxHelpController wxWinHelpController
|
#define wxHelpController wxWinHelpController
|
||||||
#define sm_classwxHelpController sm_classwxWinHelpController
|
|
||||||
#else // !MSW
|
#else // !MSW
|
||||||
|
|
||||||
#if wxUSE_WXHTML_HELP
|
#if wxUSE_WXHTML_HELP
|
||||||
#include "wx/html/helpctrl.h"
|
#include "wx/html/helpctrl.h"
|
||||||
#define wxHelpController wxHtmlHelpController
|
#define wxHelpController wxHtmlHelpController
|
||||||
#define sm_classwxHelpController sm_classwxHtmlHelpController
|
|
||||||
#else
|
#else
|
||||||
#include "wx/generic/helpext.h"
|
#include "wx/generic/helpext.h"
|
||||||
#define wxHelpController wxExtHelpController
|
#define wxHelpController wxExtHelpController
|
||||||
#define sm_classwxHelpController sm_classwxExtHelpController
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // MSW/!MSW
|
#endif // MSW/!MSW
|
||||||
|
@@ -27,11 +27,9 @@
|
|||||||
|
|
||||||
#ifndef wxPrinter
|
#ifndef wxPrinter
|
||||||
#define wxPrinter wxPostScriptPrinter
|
#define wxPrinter wxPostScriptPrinter
|
||||||
#define sm_classwxPrinter sm_classwxPostScriptPrinter
|
|
||||||
#endif
|
#endif
|
||||||
#ifndef wxPrintPreview
|
#ifndef wxPrintPreview
|
||||||
#define wxPrintPreview wxPostScriptPrintPreview
|
#define wxPrintPreview wxPostScriptPrintPreview
|
||||||
#define sm_classwxPrintPreview sm_classwxPostScriptPrintPreview
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -21,13 +21,10 @@
|
|||||||
|
|
||||||
#if (defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) ) || (!defined(__WXMSW__) && !defined(__WXMAC__))
|
#if (defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) ) || (!defined(__WXMSW__) && !defined(__WXMAC__))
|
||||||
#define wxPrintDialog wxGenericPrintDialog
|
#define wxPrintDialog wxGenericPrintDialog
|
||||||
#define sm_classwxPrintDialog sm_classwxGenericPrintDialog
|
|
||||||
|
|
||||||
#define wxPrintSetupDialog wxGenericPrintSetupDialog
|
#define wxPrintSetupDialog wxGenericPrintSetupDialog
|
||||||
#define sm_classwxPrintSetupDialog sm_classwxGenericPrintSetupDialog
|
|
||||||
|
|
||||||
#define wxPageSetupDialog wxGenericPageSetupDialog
|
#define wxPageSetupDialog wxGenericPageSetupDialog
|
||||||
#define sm_classwxPageSetupDialog sm_classwxGenericPageSetupDialog
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -93,7 +93,6 @@ private:
|
|||||||
#elif defined(__WXMSW__)
|
#elif defined(__WXMSW__)
|
||||||
#include "wx/msw/slider95.h"
|
#include "wx/msw/slider95.h"
|
||||||
#define wxSlider wxSlider95
|
#define wxSlider wxSlider95
|
||||||
#define sm_classwxSlider sm_classwxSlider95
|
|
||||||
#elif defined(__WXMOTIF__)
|
#elif defined(__WXMOTIF__)
|
||||||
#include "wx/motif/slider.h"
|
#include "wx/motif/slider.h"
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
|
@@ -122,23 +122,19 @@ protected:
|
|||||||
|
|
||||||
#if defined(__WXUNIVERSAL__)
|
#if defined(__WXUNIVERSAL__)
|
||||||
#define wxStatusBarUniv wxStatusBar
|
#define wxStatusBarUniv wxStatusBar
|
||||||
#define sm_classwxStatusBarUniv sm_classwxStatusBar
|
|
||||||
|
|
||||||
#include "wx/univ/statusbr.h"
|
#include "wx/univ/statusbr.h"
|
||||||
#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
|
#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
|
||||||
#define wxStatusBar95 wxStatusBar
|
#define wxStatusBar95 wxStatusBar
|
||||||
#define sm_classwxStatusBar95 sm_classwxStatusBar
|
|
||||||
|
|
||||||
#include "wx/msw/statbr95.h"
|
#include "wx/msw/statbr95.h"
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
#define wxStatusBarMac wxStatusBar
|
#define wxStatusBarMac wxStatusBar
|
||||||
#define sm_classwxStatusBarMac sm_classwxStatusBar
|
|
||||||
|
|
||||||
#include "wx/generic/statusbr.h"
|
#include "wx/generic/statusbr.h"
|
||||||
#include "wx/mac/statusbr.h"
|
#include "wx/mac/statusbr.h"
|
||||||
#else
|
#else
|
||||||
#define wxStatusBarGeneric wxStatusBar
|
#define wxStatusBarGeneric wxStatusBar
|
||||||
#define sm_classwxStatusBarGeneric sm_classwxStatusBar
|
|
||||||
|
|
||||||
#include "wx/generic/statusbr.h"
|
#include "wx/generic/statusbr.h"
|
||||||
#endif
|
#endif
|
||||||
|
@@ -30,7 +30,6 @@
|
|||||||
/*
|
/*
|
||||||
#if !defined(__WXMSW__)
|
#if !defined(__WXMSW__)
|
||||||
#define wxTreeCtrl wxGenericTreeCtrl
|
#define wxTreeCtrl wxGenericTreeCtrl
|
||||||
#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl
|
|
||||||
#endif
|
#endif
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@@ -1148,10 +1148,6 @@ private:
|
|||||||
#define wxWindowNative wxWindowMSW
|
#define wxWindowNative wxWindowMSW
|
||||||
#else // !wxUniv
|
#else // !wxUniv
|
||||||
#define wxWindowMSW wxWindow
|
#define wxWindowMSW wxWindow
|
||||||
#define sm_classwxWindowMSW sm_classwxWindow
|
|
||||||
#define sm_constructorPropertiesCountwxWindowMSW sm_constructorPropertiesCountwxWindow
|
|
||||||
#define sm_constructorPropertieswxWindowMSW sm_constructorPropertieswxWindow
|
|
||||||
#define sm_constructorwxWindowMSW sm_constructorwxWindow
|
|
||||||
#endif // wxUniv/!wxUniv
|
#endif // wxUniv/!wxUniv
|
||||||
#include "wx/msw/window.h"
|
#include "wx/msw/window.h"
|
||||||
#elif defined(__WXMOTIF__)
|
#elif defined(__WXMOTIF__)
|
||||||
@@ -1161,7 +1157,6 @@ private:
|
|||||||
#define wxWindowNative wxWindowGTK
|
#define wxWindowNative wxWindowGTK
|
||||||
#else // !wxUniv
|
#else // !wxUniv
|
||||||
#define wxWindowGTK wxWindow
|
#define wxWindowGTK wxWindow
|
||||||
#define sm_classwxWindowGTK sm_classwxWindow
|
|
||||||
#endif // wxUniv
|
#endif // wxUniv
|
||||||
#include "wx/gtk/window.h"
|
#include "wx/gtk/window.h"
|
||||||
#elif defined(__WXX11__)
|
#elif defined(__WXX11__)
|
||||||
@@ -1169,7 +1164,6 @@ private:
|
|||||||
#define wxWindowNative wxWindowX11
|
#define wxWindowNative wxWindowX11
|
||||||
#else // !wxUniv
|
#else // !wxUniv
|
||||||
#define wxWindowX11 wxWindow
|
#define wxWindowX11 wxWindow
|
||||||
#define sm_classwxWindowX11 sm_classwxWindow
|
|
||||||
#endif // wxUniv
|
#endif // wxUniv
|
||||||
#include "wx/x11/window.h"
|
#include "wx/x11/window.h"
|
||||||
#elif defined(__WXMGL__)
|
#elif defined(__WXMGL__)
|
||||||
@@ -1177,7 +1171,6 @@ private:
|
|||||||
#define wxWindowNative wxWindowMGL
|
#define wxWindowNative wxWindowMGL
|
||||||
#else // !wxUniv
|
#else // !wxUniv
|
||||||
#define wxWindowMGL wxWindow
|
#define wxWindowMGL wxWindow
|
||||||
#define sm_classwxWindowMGL sm_classwxWindow
|
|
||||||
#endif // wxUniv
|
#endif // wxUniv
|
||||||
#include "wx/mgl/window.h"
|
#include "wx/mgl/window.h"
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
@@ -1185,7 +1178,6 @@ private:
|
|||||||
#define wxWindowNative wxWindowMac
|
#define wxWindowNative wxWindowMac
|
||||||
#else // !wxUniv
|
#else // !wxUniv
|
||||||
#define wxWindowMac wxWindow
|
#define wxWindowMac wxWindow
|
||||||
#define sm_classwxWindowMac sm_classwxWindow
|
|
||||||
#endif // wxUniv
|
#endif // wxUniv
|
||||||
#include "wx/mac/window.h"
|
#include "wx/mac/window.h"
|
||||||
#elif defined(__WXCOCOA__)
|
#elif defined(__WXCOCOA__)
|
||||||
@@ -1193,7 +1185,6 @@ private:
|
|||||||
#define wxWindowNative wxWindowCocoa
|
#define wxWindowNative wxWindowCocoa
|
||||||
#else // !wxUniv
|
#else // !wxUniv
|
||||||
#define wxWindowCocoa wxWindow
|
#define wxWindowCocoa wxWindow
|
||||||
#define sm_classwxWindowCocoa sm_classwxWindow
|
|
||||||
#endif // wxUniv
|
#endif // wxUniv
|
||||||
#include "wx/cocoa/window.h"
|
#include "wx/cocoa/window.h"
|
||||||
#elif defined(__WXPM__)
|
#elif defined(__WXPM__)
|
||||||
@@ -1201,7 +1192,6 @@ private:
|
|||||||
#define wxWindowNative wxWindowOS2
|
#define wxWindowNative wxWindowOS2
|
||||||
#else // !wxUniv
|
#else // !wxUniv
|
||||||
#define wxWindowOS2 wxWindow
|
#define wxWindowOS2 wxWindow
|
||||||
#define sm_classwxWindowOS2 sm_classwxWindow
|
|
||||||
#endif // wxUniv/!wxUniv
|
#endif // wxUniv/!wxUniv
|
||||||
#include "wx/os2/window.h"
|
#include "wx/os2/window.h"
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user