Changed the pragmas to allow debugging under Linux

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index e69b19b4201126c9a5b37a590484ac1b98e11953..103cc3fb55fc703c739576a24ce2cac3a0ee7f78 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -229,13 +229,16 @@
 #   endif
 #endif /* !defined(wxUSE_LOGWINDOW) */
 
+/* For now... */
+#ifndef __WXGTK__
 #ifndef wxUSE_LOG_DIALOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_LOG_DIALOG must be defined."
 #   else
 #       define wxUSE_LOG_DIALOG 0
 #   endif
-#endif /* !defined(wxUSE_LOGWINDOW) */
+#endif /* !defined(wxUSE_LOG_DIALOG) */
+#endif
 
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 52bf67cbeb4d8f12202a50461b01b8c01361e7c5..5186c9b0011a05dbe71d8032e5ae303958717eef 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -14,7 +14,7 @@
 
 #ifdef __GNUG__
     #if !defined(__WXMOTIF__) && !defined(__WXMAC__) // because there is no matching .cpp
-        #pragma interface "spinbutbase.h"
+        #pragma interface "spinbutt.h"
     #endif
 #endif
 

diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h
index 07a07b89bbe971054d6422101eb78c405304e9f4..49c91d7d001ce74cdcd0418b3a610e37c40da1fb 100644 (file)
--- 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 "univbmpbuttn.h"
+    #pragma interface "bmpbuttn.h"
 #endif
 
 class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase

diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h
index 10cd169412857f12dade05a590318492c8721284..c6710499de6e653ede466511300eecb7fa43b250 100644 (file)
--- 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 "univbutton.h"
+    #pragma interface "button.h"
 #endif
 
 class WXDLLEXPORT wxInputHandler;

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index 437ec78b109de128e1fe70b75597ffe86680c19d..e7c6e2f65ee8312693141c5df631283af1c18b0c 100644 (file)
--- 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 "univcheckbox.h"
+    #pragma interface "checkbox.h"
 #endif
 
 #include "wx/button.h" // for wxStdButtonInputHandler

diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index 7c8b261ac4d6673160dc6eae4c34a991d0852ee0..2579bdcfa537bd4271603879fe8df0e84c6cf485 100644 (file)
--- 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 "univchecklst.h"
+    #pragma interface "checklst.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 8537da556308ec0164c9f051971b807d9f20fe23..cb61271782b578f849b1574763b02e5d346b1ee9 100644 (file)
--- 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 "univcombobox.h"
+    #pragma implementation "combobox.h"
 #endif
 
 class WXDLLEXPORT wxComboControl;

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 608296c560fd457b4679ca7e8f38b73fea008979..d47e67e3ba4ae8bbee7019cad29ddc8d4487bad0 100644 (file)
--- 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 "univframe.h"
+    #pragma interface "frame.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h
index 73af591d5ff50b95df22f77cadbd955704f29cdd..b4587d788e8a14876c76a0d0675308949999a8eb 100644 (file)
--- a/include/wx/univ/gauge.h
+++ b/include/wx/univ/gauge.h
@@ -10,7 +10,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-    #pragma implementation "gaugeuniv.h"
+    #pragma implementation "gauge.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 8ce6de7d5e4e813e3d8d45280a408f0edd62fb3a..9db855bc9ebe47cd456e225c9a6fa9890275eee1 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -13,7 +13,7 @@
 #define _WX_UNIV_LISTBOX_H_
 
 #ifdef __GNUG__
-    #pragma implementation "univlistbox.h"
+    #pragma implementation "listbox.h"
 #endif
 
 #include "wx/scrolwin.h"    // for wxScrollHelper

diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index 1dbc2b334597304aaa6c6dc5fdfb91a01b379326..e5a5a3fa8ec761260b395bcce263cebd04f36853 100644 (file)
--- 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 "univmenu.h"
+    #pragma interface "menu.h"
 #endif
 
 #if wxUSE_ACCEL

diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index 784433f95fcafeb255629ab9924db0aba53035bc..4022b3311359e0dd385fde88a0ce833fb1a477c7 100644 (file)
--- 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 "univmenuitem.h"
+    #pragma interface "menuitem.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 2654e7956e6ebcc99885e1d8b685489e7aa46cd0..f0040b4266c63d171509c9c8ce1f3c1c2c856a69 100644 (file)
--- 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 "univnotebook.h"
+    #pragma interface "notebook.h"
 #endif
 
 class WXDLLEXPORT wxSpinButton;

diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 0b9a6c48c36109b70f3061810ee6d0a7d589d635..713b9b0c5210611f28d28442c61914a123cd3153 100644 (file)
--- 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 "univradiobox.h"
+    #pragma interface "radiobox.h"
 #endif
 
 class WXDLLEXPORT wxRadioButton;

diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h
index 375fac1505370a1ad00282cf26037774b8284f1e..deb136ebe020b935e2c87ae36fd4658e62215620 100644 (file)
--- 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 "univradiobut.h"
+    #pragma interface "radiobut.h"
 #endif
 
 #include "wx/checkbox.h"

diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h
index 226f27a50fbe6ecd78f151a1bd6d00e3ef000d33..043dfad83725941c6cd25408a354142fa4ebe439 100644 (file)
--- 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 "univscrarrow.h"
+    #pragma interface "scrarrow.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index f43002deb5fd73f6b25cf39ab22354c55a6799bb..3dd5249ca34595b0eb1da7cba7a06da18567b3ac 100644 (file)
--- 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 "univscrolbar.h"
+    #pragma interface "scrolbar.h"
 #endif
 
 class WXDLLEXPORT wxScrollTimer;

diff --git a/include/wx/univ/scrthumb.h b/include/wx/univ/scrthumb.h
index 1e4fbf4874a1d3fb94f918cdf23f2b63535aaee7..19811cde79431e4ec63c52caed9c99e001126b25 100644 (file)
--- 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 "univscrthumb.h"
+    #pragma interface "scrthumb.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h
index b9a0bf9e9a82a5170fa51d168588c6ceba78d20a..8a679bc61e2e534c3c373d823545dd2822c48fba 100644 (file)
--- a/include/wx/univ/slider.h
+++ b/include/wx/univ/slider.h
@@ -10,7 +10,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-    #pragma interface "univslider.h"
+    #pragma interface "slider.h"
 #endif
 
 #ifndef _WX_UNIV_SLIDER_H_

diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h
index 884618a626be54dcdfb0f4addaf3344c8fa480b5..07b66be03d3dcb3696115c8640742c4f8ba007c5 100644 (file)
--- 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 "univspinbutt.h"
+    #pragma interface "spinbutt.h"
 #endif
 
 #include "wx/univ/scrarrow.h"

diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index 42fbf0b0ee5b93b9ff448e158848132ba1cade64..940827f806dad40958053ace76eefe57d54cd7b7 100644 (file)
--- 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 "univstatbmp.h"
+    #pragma interface "statbmp.h"
 #endif
 
 #include "wx/bitmap.h"

diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index 87913032c81b408ec62d26f089519811ac506f6c..cd43d75f36407e651f4e42b3f9cd80e84627be5a 100644 (file)
--- 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 "univstatbox.h"
+    #pragma interface "statbox.h"
 #endif
 
 class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase

diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h
index ffee40b95296ca79ae9dadb51c8fc61497fa957d..5896a480607ae4ddf83d82ff33bf527bd8c27ee3 100644 (file)
--- a/include/wx/univ/statline.h
+++ b/include/wx/univ/statline.h
@@ -9,7 +9,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-    #pragma interface "univstatline.h"
+    #pragma interface "statline.h"
 #endif
 
 #ifndef _WX_UNIV_STATLINE_H_

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index e08731b5b18eb84ccc12df1acab0daea23e5d25f..2de8c76d1050bc6ba5af4fcd78bcc9a420310bd3 100644 (file)
--- 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 "univstattext.h"
+    #pragma interface "stattext.h"
 #endif
 
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index e0732db03fc5f4fa485c4cd0154b68a3aa839acf..54f62629d7ac0cafc19db03e29a15b3c25ea2d7f 100644 (file)
--- 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 "univtextctrl.h"
+    #pragma interface "textctrl.h"
 #endif
 
 class WXDLLEXPORT wxCaret;

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 39949a871fbdbb372edc77e248c0ea6c1862032a..4ecfa23d2d04acf42b6ed80e65fcf5ddf13fba08 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -15,7 +15,7 @@
 #define _WX_UNIV_WINDOW_H_
 
 #ifdef __GNUG__
-    #pragma interface "univwindow.h"
+    #pragma interface "window.h"
 #endif
 
 #include "wx/bitmap.h"      // for m_bitmapBg

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 8188227df17a01ad176597cafb520f42f37540fd..39d538651f5e8f974c6d68c912e6698a52d4628d 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -18,8 +18,8 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "minimal.cpp"
-    #pragma interface "minimal.cpp"
+//    #pragma implementation "minimal.cpp"
+//    #pragma interface "minimal.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index f0611d2b0690eee150a327e5a839f06e525d1552..0f72f50256da3099c9595e5efd41048d2adeaecd 100644 (file)
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -328,6 +328,10 @@ cleanwx:
        -$(RM) ../common/*.bak
        -$(RM) ../generic/*.o
        -$(RM) ../generic/*.bak
+       -$(RM) ../univ/*.o
+       -$(RM) ../univ/*.bak
+       -$(RM) ../unix/*.o
+       -$(RM) ../unix/*.bak
        -$(RM) ../html/*.o
        -$(RM) ../zlib/*.o
        -$(RM) ../zlib/*.bak

diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index 597d65632345e4fbc79c3a7b4c757778e7ccf6c1..b3a81143430316c2f361817685b3f1dcc37b5afa 100644 (file)
--- a/src/univ/bmpbuttn.cpp
+++ b/src/univ/bmpbuttn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univbmpbuttn.h"
+    #pragma implementation "bmpbuttn.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 95d4ce4aee40b65e7ea17e67e9aa5674a88a686e..7a7a9fa771bda7f31ce86b69adc435103b8f45f7 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univbutton.h"
+    #pragma implementation "button.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp
index 916ea5c501fe28e03174072fa4ea9a66949196d1..447e93e2160c739b596f8ee47a9b7c7aea71f78e 100644 (file)
--- a/src/univ/checkbox.cpp
+++ b/src/univ/checkbox.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univcheckbox.h"
+    #pragma implementation "checkbox.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp
index df130aa29070a7e692aee154e8882fef90eee7c2..5a1c9c0cd5fc0b91856230dfe6dfb7223b22fc6c 100644 (file)
--- a/src/univ/checklst.cpp
+++ b/src/univ/checklst.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univchecklst.h"
+    #pragma implementation "checklst.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index b90ef9ff703ad11eee1d077e2dbfd6fd3d869673..4d64edca3ac054a1c0f9aaf99c3b2af83a71ecfd 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univcombobox.h"
+    #pragma implementation "combobox.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index fdd0927bf699d5f5cc0f56691a2cc07ff6332b9e..17e59adcafcc58febc7379f618d116b9a0786e9c 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -18,7 +18,7 @@
 // ---------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univframe.h"
+    #pragma implementation "framuniv.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp
index 16e38f7e6937ac0c21ba9304c6d342e25059e3e3..0c29caa6da3bfc40bd7dd4388b75d6f8dec040bb 100644 (file)
--- a/src/univ/gauge.cpp
+++ b/src/univ/gauge.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "gaugeuniv.h"
+    #pragma implementation "gauge.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index af3ca7eee50b80c66fd9f4cf3884ed6ba7181c01..541fa506b49ef77d38c1137102f8fae22a48cfe7 100644 (file)
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univlistbox.h"
+    #pragma implementation "listbox.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index ed3bd429ff1d8e2025258db6ce3b5f1bcf7b9f48..11d118787078a67f53446cec5f96b1651c4c398e 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -18,8 +18,8 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univmenuitem.h"
-    #pragma implementation "univmenu.h"
+    #pragma implementation "menuitem.h"
+    #pragma implementation "menu.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index fc7ba86ffa471f3b89888f7664801aefee8faffe..f5757e953bf7dfb256d2000055c788cce4a26126 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univnotebook.h"
+    #pragma implementation "notebook.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 342374f9d28710befe6fe18f2521ac98c16f137a..bb573abf26c98fb3aab8c11dec819f5f715d501d 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univradiobox.h"
+    #pragma implementation "radiobox.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp
index c272d762647ea0a537ca0f25ee0b0c4664b72409..afcabdacd7c438f5bc6cab8997dc77aaa662817a 100644 (file)
--- a/src/univ/radiobut.cpp
+++ b/src/univ/radiobut.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univradiobut.h"
+    #pragma implementation "radiobut.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/scrarrow.cpp b/src/univ/scrarrow.cpp
index 3bcf176b16977ddd3f2eec5f4f31d7925024e688..149832c4de706a83b838e3a70839cccb82173b44 100644 (file)
--- a/src/univ/scrarrow.cpp
+++ b/src/univ/scrarrow.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univscrarrow.h"
+    #pragma implementation "scrarrow.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 5526d7ef42b7a1f5aa4e9dede699ec25b0b4bbf3..b848808a1445d04df6f9c2ec80db89ab49c14ebf 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univscrolbar.h"
+    #pragma implementation "scrolbar.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp
index 4d46b9c35b1a806a11fa83435638c90b053fbbf5..de21964d41e99ae7e1dd9298c54b871667c6db67 100644 (file)
--- a/src/univ/scrthumb.cpp
+++ b/src/univ/scrthumb.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univscrthumb.h"
+    #pragma implementation "scrthumb.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/slider.cpp b/src/univ/slider.cpp
index 9bffd276ac2bd14f8986880439028cb283bcf335..3c89f0acb7998a66229e19103e3b5ed634066b1d 100644 (file)
--- a/src/univ/slider.cpp
+++ b/src/univ/slider.cpp
@@ -43,7 +43,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univslider.h"
+    #pragma implementation "slider.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp
index 9721e5062c46fd1595a4beadee98eb68e35ac56a..e93d9b68c0ef29d1579cab333e4c115de5f7edc6 100644 (file)
--- a/src/univ/spinbutt.cpp
+++ b/src/univ/spinbutt.cpp
@@ -18,8 +18,8 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "spinbutbase.h"
-    #pragma implementation "univspinbutt.h"
+//    #pragma implementation "butbase.h"
+    #pragma implementation "spinbutt.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp
index 39282b88d0cce49f2dc1cd593e641b161d202b24..e063d46d94ced616a72b9a7d93260e3d19c50ace 100644 (file)
--- a/src/univ/statbmp.cpp
+++ b/src/univ/statbmp.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univstatbmp.h"
+    #pragma implementation "statbmp.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/statbox.cpp b/src/univ/statbox.cpp
index 3c8b948466647c4b701147dfb2ea70c9753cf27d..e9fbbd2cac995f880638a27bf88635bc1519abde 100644 (file)
--- a/src/univ/statbox.cpp
+++ b/src/univ/statbox.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univstatbox.h"
+    #pragma implementation "statbox.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/statline.cpp b/src/univ/statline.cpp
index 4f6e832458bbb122bb1d373336fa4d63b1dbb716..e915dcf3e76ece27329a8e11d1d1d903e75b664f 100644 (file)
--- a/src/univ/statline.cpp
+++ b/src/univ/statline.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univstatline.h"
+    #pragma implementation "statline.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 589179cd9c6c43742848594881dfce542036bca2..d5fcb0846cc5bfa22d3cbc66acfbc0a6f8cee44a 100644 (file)
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univstattext.h"
+    #pragma implementation "stattext.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index b6a4b8810db6edced8395b39b0a4b47d4054f570..805c207216b6ed18530833553228958746dfc3f6 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -118,7 +118,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univtextctrl.h"
+    #pragma implementation "textctrl.h"
 #endif
 
 #include "wx/wxprec.h"

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index b3d73e3ed4fc7ce57fe30fbe80205608a7cc9ff0..ca2c7c4be5878c65672c417bcb9f1f3f6ed32d72 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -18,7 +18,7 @@
 // ---------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univwindow.h"
+    #pragma implementation "window.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".