From c9cacf3e495f3aacb919ee1046338a25982db86c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 17 Oct 2003 19:48:20 +0000 Subject: [PATCH] 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 --- include/wx/colordlg.h | 1 - include/wx/confbase.h | 3 --- include/wx/dragimag.h | 6 ------ include/wx/fdrepdlg.h | 1 - include/wx/fontdlg.h | 1 - include/wx/gauge.h | 1 - include/wx/help.h | 4 ---- include/wx/print.h | 2 -- include/wx/printdlg.h | 3 --- include/wx/slider.h | 1 - include/wx/statusbr.h | 4 ---- include/wx/treectrl.h | 1 - include/wx/window.h | 10 ---------- 13 files changed, 38 deletions(-) diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index d961b8b535..f08d224b5b 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -22,7 +22,6 @@ #include "wx/generic/colrdlgg.h" #define wxColourDialog wxGenericColourDialog - #define sm_classwxColourDialog sm_classwxGenericColourDialog #endif // get the colour from user and return it diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 415c770efd..6ce5b907a4 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -323,14 +323,11 @@ private: #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE #ifdef __WIN32__ #define wxConfig wxRegConfig - #define sm_classwxConfig sm_classwxRegConfig #else //WIN16 #define wxConfig wxIniConfig - #define sm_classwxConfig sm_classwxIniConfig #endif #else // either we're under Unix or wish to use files even under Windows #define wxConfig wxFileConfig - #define sm_classwxConfig sm_classwxFileConfig #endif #endif // wxUSE_CONFIG diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h index 91fd90c11f..6cea95e034 100644 --- a/include/wx/dragimag.h +++ b/include/wx/dragimag.h @@ -11,7 +11,6 @@ class WXDLLEXPORT wxDC; #if defined(__WIN16__) || defined(__WXUNIVERSAL__) #include "wx/generic/dragimgg.h" #define wxDragImage wxGenericDragImage -#define sm_classwxDragImage sm_classwxGenericDragImage #else #include "wx/msw/dragimag.h" @@ -19,27 +18,22 @@ class WXDLLEXPORT wxDC; #elif defined(__WXMOTIF__) #include "wx/generic/dragimgg.h" #define wxDragImage wxGenericDragImage -#define sm_classwxDragImage sm_classwxGenericDragImage #elif defined(__WXGTK__) #include "wx/generic/dragimgg.h" #define wxDragImage wxGenericDragImage -#define sm_classwxDragImage sm_classwxGenericDragImage #elif defined(__WXX11__) #include "wx/generic/dragimgg.h" #define wxDragImage wxGenericDragImage -#define sm_classwxDragImage sm_classwxGenericDragImage #elif defined(__WXMAC__) #include "wx/generic/dragimgg.h" #define wxDragImage wxGenericDragImage -#define sm_classwxDragImage sm_classwxGenericDragImage #elif defined(__WXPM__) #include "wx/generic/dragimgg.h" #define wxDragImage wxGenericDragImage -#define sm_classwxDragImage sm_classwxGenericDragImage #endif diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index 0cf31e798f..9f047c2672 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -133,7 +133,6 @@ protected: #include "wx/msw/fdrepdlg.h" #else #define wxGenericFindReplaceDialog wxFindReplaceDialog - #define sm_classwxGenericFindReplaceDialog sm_classwxFindReplaceDialog #include "wx/generic/fdrepdlg.h" #endif diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index b400315a40..5eda6077a0 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -69,7 +69,6 @@ protected: || defined(__WXWINCE__) #include "wx/generic/fontdlgg.h" #define wxFontDialog wxGenericFontDialog - #define sm_classwxFontDialog sm_classwxGenericFontDialog #elif defined(__WXMSW__) #include "wx/msw/fontdlg.h" #elif defined(__WXGTK__) diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 4add88a2f3..ddabd1d88e 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -95,7 +95,6 @@ protected: #ifdef __WIN95__ #include "wx/msw/gauge95.h" #define wxGauge wxGauge95 - #define sm_classwxGauge sm_classwxGauge95 #else // !__WIN95__ // Gauge no longer supported on 16-bit Windows #endif diff --git a/include/wx/help.h b/include/wx/help.h index bd4b00f3af..8fd7026427 100644 --- a/include/wx/help.h +++ b/include/wx/help.h @@ -9,22 +9,18 @@ #include "wx/msw/wince/helpwce.h" #define wxHelpController wxWinceHelpController - #define sm_classwxHelpController sm_classwxWinceHelpController #elif defined(__WXMSW__) #include "wx/msw/helpwin.h" #define wxHelpController wxWinHelpController - #define sm_classwxHelpController sm_classwxWinHelpController #else // !MSW #if wxUSE_WXHTML_HELP #include "wx/html/helpctrl.h" #define wxHelpController wxHtmlHelpController - #define sm_classwxHelpController sm_classwxHtmlHelpController #else #include "wx/generic/helpext.h" #define wxHelpController wxExtHelpController - #define sm_classwxHelpController sm_classwxExtHelpController #endif #endif // MSW/!MSW diff --git a/include/wx/print.h b/include/wx/print.h index e154348937..7bfd959b65 100644 --- a/include/wx/print.h +++ b/include/wx/print.h @@ -27,11 +27,9 @@ #ifndef wxPrinter #define wxPrinter wxPostScriptPrinter -#define sm_classwxPrinter sm_classwxPostScriptPrinter #endif #ifndef wxPrintPreview #define wxPrintPreview wxPostScriptPrintPreview -#define sm_classwxPrintPreview sm_classwxPostScriptPrintPreview #endif #endif diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h index 32d9821515..2ba6f3a2f0 100644 --- a/include/wx/printdlg.h +++ b/include/wx/printdlg.h @@ -21,13 +21,10 @@ #if (defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) ) || (!defined(__WXMSW__) && !defined(__WXMAC__)) #define wxPrintDialog wxGenericPrintDialog -#define sm_classwxPrintDialog sm_classwxGenericPrintDialog #define wxPrintSetupDialog wxGenericPrintSetupDialog -#define sm_classwxPrintSetupDialog sm_classwxGenericPrintSetupDialog #define wxPageSetupDialog wxGenericPageSetupDialog -#define sm_classwxPageSetupDialog sm_classwxGenericPageSetupDialog #endif #endif diff --git a/include/wx/slider.h b/include/wx/slider.h index 31fbe554bc..894b8515fa 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -93,7 +93,6 @@ private: #elif defined(__WXMSW__) #include "wx/msw/slider95.h" #define wxSlider wxSlider95 - #define sm_classwxSlider sm_classwxSlider95 #elif defined(__WXMOTIF__) #include "wx/motif/slider.h" #elif defined(__WXGTK__) diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h index 515417d7ad..594f9b1659 100644 --- a/include/wx/statusbr.h +++ b/include/wx/statusbr.h @@ -122,23 +122,19 @@ protected: #if defined(__WXUNIVERSAL__) #define wxStatusBarUniv wxStatusBar - #define sm_classwxStatusBarUniv sm_classwxStatusBar #include "wx/univ/statusbr.h" #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR #define wxStatusBar95 wxStatusBar - #define sm_classwxStatusBar95 sm_classwxStatusBar #include "wx/msw/statbr95.h" #elif defined(__WXMAC__) #define wxStatusBarMac wxStatusBar - #define sm_classwxStatusBarMac sm_classwxStatusBar #include "wx/generic/statusbr.h" #include "wx/mac/statusbr.h" #else #define wxStatusBarGeneric wxStatusBar - #define sm_classwxStatusBarGeneric sm_classwxStatusBar #include "wx/generic/statusbr.h" #endif diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h index 4ba0dc7821..5f2c44557a 100644 --- a/include/wx/treectrl.h +++ b/include/wx/treectrl.h @@ -30,7 +30,6 @@ /* #if !defined(__WXMSW__) #define wxTreeCtrl wxGenericTreeCtrl -#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl #endif */ diff --git a/include/wx/window.h b/include/wx/window.h index f91e96671a..b17fcf0e7f 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -1148,10 +1148,6 @@ private: #define wxWindowNative wxWindowMSW #else // !wxUniv #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 #include "wx/msw/window.h" #elif defined(__WXMOTIF__) @@ -1161,7 +1157,6 @@ private: #define wxWindowNative wxWindowGTK #else // !wxUniv #define wxWindowGTK wxWindow - #define sm_classwxWindowGTK sm_classwxWindow #endif // wxUniv #include "wx/gtk/window.h" #elif defined(__WXX11__) @@ -1169,7 +1164,6 @@ private: #define wxWindowNative wxWindowX11 #else // !wxUniv #define wxWindowX11 wxWindow - #define sm_classwxWindowX11 sm_classwxWindow #endif // wxUniv #include "wx/x11/window.h" #elif defined(__WXMGL__) @@ -1177,7 +1171,6 @@ private: #define wxWindowNative wxWindowMGL #else // !wxUniv #define wxWindowMGL wxWindow - #define sm_classwxWindowMGL sm_classwxWindow #endif // wxUniv #include "wx/mgl/window.h" #elif defined(__WXMAC__) @@ -1185,7 +1178,6 @@ private: #define wxWindowNative wxWindowMac #else // !wxUniv #define wxWindowMac wxWindow - #define sm_classwxWindowMac sm_classwxWindow #endif // wxUniv #include "wx/mac/window.h" #elif defined(__WXCOCOA__) @@ -1193,7 +1185,6 @@ private: #define wxWindowNative wxWindowCocoa #else // !wxUniv #define wxWindowCocoa wxWindow - #define sm_classwxWindowCocoa sm_classwxWindow #endif // wxUniv #include "wx/cocoa/window.h" #elif defined(__WXPM__) @@ -1201,7 +1192,6 @@ private: #define wxWindowNative wxWindowOS2 #else // !wxUniv #define wxWindowOS2 wxWindow - #define sm_classwxWindowOS2 sm_classwxWindow #endif // wxUniv/!wxUniv #include "wx/os2/window.h" #endif -- 2.45.2