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

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

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
 

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

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;

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

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
 
 // ----------------------------------------------------------------------------

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;

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
 
 // ----------------------------------------------------------------------------

include/wx/univ/gauge.h

@@ -10,7 +10,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-    #pragma implementation "gaugeuniv.h"
+    #pragma implementation "gauge.h"
 #endif
 
 // ----------------------------------------------------------------------------

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

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

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
 
 // ----------------------------------------------------------------------------

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;

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;

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"

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
 
 // ----------------------------------------------------------------------------

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;

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
 
 // ----------------------------------------------------------------------------

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_

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"

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"

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

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_

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

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;

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

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".

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

src/univ/bmpbuttn.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univbmpbuttn.h"
+    #pragma implementation "bmpbuttn.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/button.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univbutton.h"
+    #pragma implementation "button.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/checkbox.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univcheckbox.h"
+    #pragma implementation "checkbox.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/checklst.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univchecklst.h"
+    #pragma implementation "checklst.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/combobox.cpp

@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univcombobox.h"
+    #pragma implementation "combobox.h"
 #endif
 
 #include "wx/wxprec.h"

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".

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".

src/univ/listbox.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univlistbox.h"
+    #pragma implementation "listbox.h"
 #endif
 
 #include "wx/wxprec.h"

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"

src/univ/notebook.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univnotebook.h"
+    #pragma implementation "notebook.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/radiobox.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univradiobox.h"
+    #pragma implementation "radiobox.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/radiobut.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univradiobut.h"
+    #pragma implementation "radiobut.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/scrarrow.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univscrarrow.h"
+    #pragma implementation "scrarrow.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/scrolbar.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univscrolbar.h"
+    #pragma implementation "scrolbar.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/scrthumb.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univscrthumb.h"
+    #pragma implementation "scrthumb.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/slider.cpp

@@ -43,7 +43,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univslider.h"
+    #pragma implementation "slider.h"
 #endif
 
 #include "wx/wxprec.h"

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"

src/univ/statbmp.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univstatbmp.h"
+    #pragma implementation "statbmp.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/statbox.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univstatbox.h"
+    #pragma implementation "statbox.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/statline.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univstatline.h"
+    #pragma implementation "statline.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/stattext.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univstattext.h"
+    #pragma implementation "stattext.h"
 #endif
 
 #include "wx/wxprec.h"

src/univ/textctrl.cpp

@@ -118,7 +118,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "univtextctrl.h"
+    #pragma implementation "textctrl.h"
 #endif
 
 #include "wx/wxprec.h"

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".