From a3870b2ff595ba4bb4f0397ace77ceeb9628e94d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 4 Jul 2001 18:07:15 +0000 Subject: [PATCH] reverted Julians changes to the pragmas git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/univ/bmpbuttn.h | 2 +- include/wx/univ/button.h | 2 +- include/wx/univ/checkbox.h | 2 +- include/wx/univ/checklst.h | 2 +- include/wx/univ/combobox.h | 2 +- include/wx/univ/frame.h | 2 +- include/wx/univ/gauge.h | 2 +- include/wx/univ/listbox.h | 4 ++-- include/wx/univ/menu.h | 2 +- include/wx/univ/menuitem.h | 2 +- include/wx/univ/notebook.h | 2 +- include/wx/univ/radiobox.h | 2 +- include/wx/univ/radiobut.h | 2 +- include/wx/univ/scrarrow.h | 2 +- include/wx/univ/scrolbar.h | 2 +- include/wx/univ/scrthumb.h | 2 +- include/wx/univ/slider.h | 2 +- include/wx/univ/spinbutt.h | 2 +- include/wx/univ/statbmp.h | 2 +- include/wx/univ/statbox.h | 2 +- include/wx/univ/statline.h | 2 +- include/wx/univ/stattext.h | 2 +- include/wx/univ/textctrl.h | 2 +- src/univ/bmpbuttn.cpp | 2 +- src/univ/button.cpp | 2 +- src/univ/checkbox.cpp | 2 +- src/univ/checklst.cpp | 2 +- src/univ/combobox.cpp | 2 +- src/univ/framuniv.cpp | 2 +- src/univ/gauge.cpp | 2 +- src/univ/listbox.cpp | 2 +- src/univ/menu.cpp | 4 ++-- src/univ/notebook.cpp | 2 +- src/univ/radiobox.cpp | 2 +- src/univ/radiobut.cpp | 2 +- src/univ/scrarrow.cpp | 2 +- src/univ/scrolbar.cpp | 2 +- src/univ/scrthumb.cpp | 2 +- src/univ/slider.cpp | 2 +- src/univ/spinbutt.cpp | 4 ++-- src/univ/statbmp.cpp | 2 +- src/univ/statbox.cpp | 2 +- src/univ/statline.cpp | 2 +- src/univ/stattext.cpp | 2 +- src/univ/textctrl.cpp | 2 +- 45 files changed, 48 insertions(+), 48 deletions(-) diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index 49c91d7d00..07a07b89bb 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -13,7 +13,7 @@ #define _WX_UNIV_BMPBUTTN_H_ #ifdef __GNUG__ - #pragma interface "bmpbuttn.h" + #pragma interface "univbmpbuttn.h" #endif class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index c6710499de..10cd169412 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -13,7 +13,7 @@ #define _WX_UNIV_BUTTON_H_ #ifdef __GNUG__ - #pragma interface "button.h" + #pragma interface "univbutton.h" #endif class WXDLLEXPORT wxInputHandler; diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h index e7c6e2f65e..437ec78b10 100644 --- a/include/wx/univ/checkbox.h +++ b/include/wx/univ/checkbox.h @@ -13,7 +13,7 @@ #define _WX_UNIV_CHECKBOX_H_ #ifdef __GNUG__ - #pragma interface "checkbox.h" + #pragma interface "univcheckbox.h" #endif #include "wx/button.h" // for wxStdButtonInputHandler diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h index 2579bdcfa5..7c8b261ac4 100644 --- a/include/wx/univ/checklst.h +++ b/include/wx/univ/checklst.h @@ -13,7 +13,7 @@ #define _WX_UNIV_CHECKLST_H_ #ifdef __GNUG__ - #pragma interface "checklst.h" + #pragma interface "univchecklst.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index cb61271782..8537da5563 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -37,7 +37,7 @@ #define _WX_UNIV_COMBOBOX_H_ #ifdef __GNUG__ - #pragma implementation "combobox.h" + #pragma implementation "univcombobox.h" #endif class WXDLLEXPORT wxComboControl; diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index d47e67e3ba..608296c560 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -13,7 +13,7 @@ #define _WX_UNIV_FRAME_H_ #ifdef __GNUG__ - #pragma interface "frame.h" + #pragma interface "univframe.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h index b4587d788e..73af591d5f 100644 --- a/include/wx/univ/gauge.h +++ b/include/wx/univ/gauge.h @@ -10,7 +10,7 @@ /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ - #pragma implementation "gauge.h" + #pragma implementation "gaugeuniv.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h index 9db855bc9e..03f87df5c0 100644 --- a/include/wx/univ/listbox.h +++ b/include/wx/univ/listbox.h @@ -5,7 +5,7 @@ // Modified by: // Created: 30.08.00 // RCS-ID: $Id$ -// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2000 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -13,7 +13,7 @@ #define _WX_UNIV_LISTBOX_H_ #ifdef __GNUG__ - #pragma implementation "listbox.h" + #pragma implementation "univlistbox.h" #endif #include "wx/scrolwin.h" // for wxScrollHelper diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h index e5a5a3fa8e..1dbc2b3345 100644 --- a/include/wx/univ/menu.h +++ b/include/wx/univ/menu.h @@ -13,7 +13,7 @@ #define _WX_UNIV_MENU_H_ #ifdef __GNUG__ - #pragma interface "menu.h" + #pragma interface "univmenu.h" #endif #if wxUSE_ACCEL diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h index 4022b33113..784433f95f 100644 --- a/include/wx/univ/menuitem.h +++ b/include/wx/univ/menuitem.h @@ -13,7 +13,7 @@ #define _WX_UNIV_MENUITEM_H_ #ifdef __GNUG__ - #pragma interface "menuitem.h" + #pragma interface "univmenuitem.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index f0040b4266..2654e7956e 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -13,7 +13,7 @@ #define _WX_UNIV_NOTEBOOK_H_ #ifdef __GNUG__ - #pragma interface "notebook.h" + #pragma interface "univnotebook.h" #endif class WXDLLEXPORT wxSpinButton; diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index 713b9b0c52..0b9a6c48c3 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -13,7 +13,7 @@ #define _WX_UNIV_RADIOBOX_H_ #ifdef __GNUG__ - #pragma interface "radiobox.h" + #pragma interface "univradiobox.h" #endif class WXDLLEXPORT wxRadioButton; diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h index deb136ebe0..375fac1505 100644 --- a/include/wx/univ/radiobut.h +++ b/include/wx/univ/radiobut.h @@ -13,7 +13,7 @@ #define _WX_UNIV_RADIOBUT_H_ #ifdef __GNUG__ - #pragma interface "radiobut.h" + #pragma interface "univradiobut.h" #endif #include "wx/checkbox.h" diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h index 043dfad837..226f27a50f 100644 --- a/include/wx/univ/scrarrow.h +++ b/include/wx/univ/scrarrow.h @@ -13,7 +13,7 @@ #define _WX_UNIV_SCRARROW_H_ #ifdef __GNUG__ - #pragma interface "scrarrow.h" + #pragma interface "univscrarrow.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h index 3dd5249ca3..f43002deb5 100644 --- a/include/wx/univ/scrolbar.h +++ b/include/wx/univ/scrolbar.h @@ -13,7 +13,7 @@ #define _WX_UNIV_SCROLBAR_H_ #ifdef __GNUG__ - #pragma interface "scrolbar.h" + #pragma interface "univscrolbar.h" #endif class WXDLLEXPORT wxScrollTimer; diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h index 19811cde79..1e4fbf4874 100644 --- a/include/wx/univ/scrthumb.h +++ b/include/wx/univ/scrthumb.h @@ -13,7 +13,7 @@ #define _WX_UNIV_SCRTHUMB_H_ #ifdef __GNUG__ - #pragma interface "scrthumb.h" + #pragma interface "univscrthumb.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h index 8a679bc61e..b9a0bf9e9a 100644 --- a/include/wx/univ/slider.h +++ b/include/wx/univ/slider.h @@ -10,7 +10,7 @@ /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ - #pragma interface "slider.h" + #pragma interface "univslider.h" #endif #ifndef _WX_UNIV_SLIDER_H_ diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index 07b66be03d..884618a626 100644 --- a/include/wx/univ/spinbutt.h +++ b/include/wx/univ/spinbutt.h @@ -13,7 +13,7 @@ #define _WX_UNIV_SPINBUTT_H_ #ifdef __GNUG__ - #pragma interface "spinbutt.h" + #pragma interface "univspinbutt.h" #endif #include "wx/univ/scrarrow.h" diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h index 940827f806..42fbf0b0ee 100644 --- a/include/wx/univ/statbmp.h +++ b/include/wx/univ/statbmp.h @@ -13,7 +13,7 @@ #define _WX_UNIV_STATBMP_H_ #ifdef __GNUG__ - #pragma interface "statbmp.h" + #pragma interface "univstatbmp.h" #endif #include "wx/bitmap.h" diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h index cd43d75f36..87913032c8 100644 --- a/include/wx/univ/statbox.h +++ b/include/wx/univ/statbox.h @@ -13,7 +13,7 @@ #define _WX_UNIV_STATBOX_H_ #ifdef __GNUG__ - #pragma interface "statbox.h" + #pragma interface "univstatbox.h" #endif class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h index 5896a48060..ffee40b952 100644 --- a/include/wx/univ/statline.h +++ b/include/wx/univ/statline.h @@ -9,7 +9,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ - #pragma interface "statline.h" + #pragma interface "univstatline.h" #endif #ifndef _WX_UNIV_STATLINE_H_ diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index 2de8c76d10..e08731b5b1 100644 --- a/include/wx/univ/stattext.h +++ b/include/wx/univ/stattext.h @@ -13,7 +13,7 @@ #define _WX_UNIV_STATTEXT_H_ #ifdef __GNUG__ - #pragma interface "stattext.h" + #pragma interface "univstattext.h" #endif class WXDLLEXPORT wxStaticText : public wxStaticTextBase diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 54f62629d7..e0732db03f 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -13,7 +13,7 @@ #define _WX_UNIV_TEXTCTRL_H_ #ifdef __GNUG__ - #pragma interface "textctrl.h" + #pragma interface "univtextctrl.h" #endif class WXDLLEXPORT wxCaret; diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index b3a8114343..597d656323 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "bmpbuttn.h" + #pragma implementation "univbmpbuttn.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 7a7a9fa771..95d4ce4aee 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "button.h" + #pragma implementation "univbutton.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp index 447e93e216..916ea5c501 100644 --- a/src/univ/checkbox.cpp +++ b/src/univ/checkbox.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "checkbox.h" + #pragma implementation "univcheckbox.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp index 5a1c9c0cd5..df130aa290 100644 --- a/src/univ/checklst.cpp +++ b/src/univ/checklst.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "checklst.h" + #pragma implementation "univchecklst.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index 4d64edca3a..b90ef9ff70 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -28,7 +28,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "combobox.h" + #pragma implementation "univcombobox.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 17e59adcaf..fdd0927bf6 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -18,7 +18,7 @@ // --------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "framuniv.h" + #pragma implementation "univframe.h" #endif // For compilers that support precompilation, includes "wx.h". diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp index 0c29caa6da..16e38f7e69 100644 --- a/src/univ/gauge.cpp +++ b/src/univ/gauge.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "gauge.h" + #pragma implementation "gaugeuniv.h" #endif // For compilers that support precompilation, includes "wx.h". diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index 541fa506b4..af3ca7eee5 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "listbox.h" + #pragma implementation "univlistbox.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 11d1187870..ed3bd429ff 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -18,8 +18,8 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "menuitem.h" - #pragma implementation "menu.h" + #pragma implementation "univmenuitem.h" + #pragma implementation "univmenu.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index f5757e953b..fc7ba86ffa 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "notebook.h" + #pragma implementation "univnotebook.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp index bb573abf26..342374f9d2 100644 --- a/src/univ/radiobox.cpp +++ b/src/univ/radiobox.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "radiobox.h" + #pragma implementation "univradiobox.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp index afcabdacd7..c272d76264 100644 --- a/src/univ/radiobut.cpp +++ b/src/univ/radiobut.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "radiobut.h" + #pragma implementation "univradiobut.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/scrarrow.cpp b/src/univ/scrarrow.cpp index 149832c4de..3bcf176b16 100644 --- a/src/univ/scrarrow.cpp +++ b/src/univ/scrarrow.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "scrarrow.h" + #pragma implementation "univscrarrow.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp index b848808a14..5526d7ef42 100644 --- a/src/univ/scrolbar.cpp +++ b/src/univ/scrolbar.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "scrolbar.h" + #pragma implementation "univscrolbar.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp index de21964d41..4d46b9c35b 100644 --- a/src/univ/scrthumb.cpp +++ b/src/univ/scrthumb.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "scrthumb.h" + #pragma implementation "univscrthumb.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/slider.cpp b/src/univ/slider.cpp index 3c89f0acb7..9bffd276ac 100644 --- a/src/univ/slider.cpp +++ b/src/univ/slider.cpp @@ -43,7 +43,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "slider.h" + #pragma implementation "univslider.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp index e93d9b68c0..9721e5062c 100644 --- a/src/univ/spinbutt.cpp +++ b/src/univ/spinbutt.cpp @@ -18,8 +18,8 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ -// #pragma implementation "butbase.h" - #pragma implementation "spinbutt.h" + #pragma implementation "spinbutbase.h" + #pragma implementation "univspinbutt.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp index e063d46d94..39282b88d0 100644 --- a/src/univ/statbmp.cpp +++ b/src/univ/statbmp.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "statbmp.h" + #pragma implementation "univstatbmp.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/statbox.cpp b/src/univ/statbox.cpp index e9fbbd2cac..3c8b948466 100644 --- a/src/univ/statbox.cpp +++ b/src/univ/statbox.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "statbox.h" + #pragma implementation "univstatbox.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/statline.cpp b/src/univ/statline.cpp index e915dcf3e7..4f6e832458 100644 --- a/src/univ/statline.cpp +++ b/src/univ/statline.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "statline.h" + #pragma implementation "univstatline.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp index d5fcb0846c..589179cd9c 100644 --- a/src/univ/stattext.cpp +++ b/src/univ/stattext.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "stattext.h" + #pragma implementation "univstattext.h" #endif #include "wx/wxprec.h" diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 805c207216..b6a4b8810d 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -118,7 +118,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "textctrl.h" + #pragma implementation "univtextctrl.h" #endif #include "wx/wxprec.h" -- 2.45.2