From 0b83552acf359689c43d641175f7292391f6a9e6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 10 Dec 2009 03:04:07 +0000 Subject: [PATCH] Rename gtk{,1}/tbargtk.{h,cpp} to toolbar.{h,cpp}. We don't use crptknm$port.cpp naming convention even for MSW any more and there is really no reason to continue to do it for just this one file in wxGTK. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 48 +++++++++--------------- build/bakefiles/files.bkl | 8 ++-- include/wx/gtk/{tbargtk.h => toolbar.h} | 8 ++-- include/wx/gtk1/{tbargtk.h => toolbar.h} | 8 ++-- include/wx/toolbar.h | 4 +- src/gtk/descrip.mms | 6 +-- src/gtk/{tbargtk.cpp => toolbar.cpp} | 2 +- src/gtk1/descrip.mms | 6 +-- src/gtk1/font.cpp | 2 +- src/gtk1/{tbargtk.cpp => toolbar.cpp} | 2 +- 10 files changed, 41 insertions(+), 53 deletions(-) rename include/wx/gtk/{tbargtk.h => toolbar.h} (96%) rename include/wx/gtk1/{tbargtk.h => toolbar.h} (96%) rename src/gtk/{tbargtk.cpp => toolbar.cpp} (99%) rename src/gtk1/{tbargtk.cpp => toolbar.cpp} (99%) diff --git a/Makefile.in b/Makefile.in index 61f9b7d1f7..febf89f088 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2707,7 +2707,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR = \ wx/gtk1/statbox.h \ wx/gtk1/statline.h \ wx/gtk1/stattext.h \ - wx/gtk1/tbargtk.h \ + wx/gtk1/tooltip.h \ wx/gtk1/textctrl.h \ wx/gtk1/tglbtn.h \ wx/gtk1/treectrl.h @@ -2759,7 +2759,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \ wx/gtk/statbox.h \ wx/gtk/statline.h \ wx/gtk/stattext.h \ - wx/gtk/tbargtk.h \ + wx/gtk/toolbar.h \ wx/gtk/textctrl.h \ wx/gtk/textentry.h \ wx/gtk/tglbtn.h \ @@ -4987,7 +4987,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_gtk1_statbox.o \ monodll_gtk1_statline.o \ monodll_gtk1_stattext.o \ - monodll_gtk1_tbargtk.o \ + monodll_gtk1_tooltip.o \ monodll_gtk1_textctrl.o \ monodll_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS) @@ -5040,7 +5040,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_gtk_statbox.o \ monodll_gtk_statline.o \ monodll_gtk_stattext.o \ - monodll_gtk_tbargtk.o \ + monodll_gtk_toolbar.o \ monodll_gtk_textctrl.o \ monodll_gtk_textentry.o \ monodll_gtk_tglbtn.o \ @@ -6807,7 +6807,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_gtk1_statbox.o \ monolib_gtk1_statline.o \ monolib_gtk1_stattext.o \ - monolib_gtk1_tbargtk.o \ + monolib_gtk1_tooltip.o \ monolib_gtk1_textctrl.o \ monolib_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1) @@ -6860,7 +6860,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_gtk_statbox.o \ monolib_gtk_statline.o \ monolib_gtk_stattext.o \ - monolib_gtk_tbargtk.o \ + monolib_gtk_toolbar.o \ monolib_gtk_textctrl.o \ monolib_gtk_textentry.o \ monolib_gtk_tglbtn.o \ @@ -8816,7 +8816,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_gtk1_statbox.o \ coredll_gtk1_statline.o \ coredll_gtk1_stattext.o \ - coredll_gtk1_tbargtk.o \ + coredll_gtk1_tooltip.o \ coredll_gtk1_textctrl.o \ coredll_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2) @@ -8869,7 +8869,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_gtk_statbox.o \ coredll_gtk_statline.o \ coredll_gtk_stattext.o \ - coredll_gtk_tbargtk.o \ + coredll_gtk_toolbar.o \ coredll_gtk_textctrl.o \ coredll_gtk_textentry.o \ coredll_gtk_tglbtn.o \ @@ -10309,7 +10309,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_gtk1_statbox.o \ corelib_gtk1_statline.o \ corelib_gtk1_stattext.o \ - corelib_gtk1_tbargtk.o \ + corelib_gtk1_tooltip.o \ corelib_gtk1_textctrl.o \ corelib_gtk1_tglbtn.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3) @@ -10362,7 +10362,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_gtk_statbox.o \ corelib_gtk_statline.o \ corelib_gtk_stattext.o \ - corelib_gtk_tbargtk.o \ + corelib_gtk_toolbar.o \ corelib_gtk_textctrl.o \ corelib_gtk_textentry.o \ corelib_gtk_tglbtn.o \ @@ -15149,8 +15149,8 @@ monodll_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONODLL_ODEP) monodll_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp -monodll_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp +monodll_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp monodll_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp @@ -15245,9 +15245,6 @@ monodll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONODLL_ODEP) monodll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp -monodll_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp - monodll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp @@ -19949,8 +19946,8 @@ monolib_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONOLIB_ODEP) monolib_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp -monolib_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp +monolib_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp monolib_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp @@ -20045,9 +20042,6 @@ monolib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONOLIB_ODEP) monolib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp -monolib_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp - monolib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp @@ -25460,8 +25454,8 @@ coredll_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(COREDLL_ODEP) coredll_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp -coredll_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp +coredll_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp coredll_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp @@ -25556,9 +25550,6 @@ coredll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(COREDLL_ODEP) coredll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp -coredll_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp - coredll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp @@ -28991,8 +28982,8 @@ corelib_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(CORELIB_ODEP) corelib_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp -corelib_gtk_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp +corelib_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp corelib_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp @@ -29087,9 +29078,6 @@ corelib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(CORELIB_ODEP) corelib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp -corelib_gtk1_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp - corelib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 7686643cf4..790f4a4041 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1126,7 +1126,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/statbox.cpp src/gtk/statline.cpp src/gtk/stattext.cpp - src/gtk/tbargtk.cpp + src/gtk/toolbar.cpp src/gtk/textctrl.cpp src/gtk/textentry.cpp src/gtk/tglbtn.cpp @@ -1179,7 +1179,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk/statbox.h wx/gtk/statline.h wx/gtk/stattext.h - wx/gtk/tbargtk.h + wx/gtk/toolbar.h wx/gtk/textctrl.h wx/gtk/textentry.h wx/gtk/tglbtn.h @@ -1297,7 +1297,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk1/statbox.cpp src/gtk1/statline.cpp src/gtk1/stattext.cpp - src/gtk1/tbargtk.cpp + src/gtk1/tooltip.cpp src/gtk1/textctrl.cpp src/gtk1/tglbtn.cpp @@ -1343,7 +1343,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk1/statbox.h wx/gtk1/statline.h wx/gtk1/stattext.h - wx/gtk1/tbargtk.h + wx/gtk1/tooltip.h wx/gtk1/textctrl.h wx/gtk1/tglbtn.h wx/gtk1/treectrl.h diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/toolbar.h similarity index 96% rename from include/wx/gtk/tbargtk.h rename to include/wx/gtk/toolbar.h index 07bff7128a..ffefa73a58 100644 --- a/include/wx/gtk/tbargtk.h +++ b/include/wx/gtk/toolbar.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tbargtk.h +// Name: wx/gtk/toolbar.h // Purpose: GTK toolbar // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,8 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_GTK_TBARGTK_H_ -#define _WX_GTK_TBARGTK_H_ +#ifndef _WX_GTK_TOOLBAR_H_ +#define _WX_GTK_TOOLBAR_H_ #if wxUSE_TOOLBAR @@ -97,4 +97,4 @@ private: #endif // wxUSE_TOOLBAR #endif - // _WX_GTK_TBARGTK_H_ + // _WX_GTK_TOOLBAR_H_ diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/toolbar.h similarity index 96% rename from include/wx/gtk1/tbargtk.h rename to include/wx/gtk1/toolbar.h index 9055c1fc1e..616fba913f 100644 --- a/include/wx/gtk1/tbargtk.h +++ b/include/wx/gtk1/toolbar.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/tbargtk.h +// Name: wx/gtk1/toolbar.h // Purpose: GTK toolbar // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,8 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_GTK_TBARGTK_H_ -#define _WX_GTK_TBARGTK_H_ +#ifndef _WX_GTK_TOOLBAR_H_ +#define _WX_GTK_TOOLBAR_H_ #if wxUSE_TOOLBAR @@ -97,4 +97,4 @@ private: #endif // wxUSE_TOOLBAR #endif - // _WX_GTK_TBARGTK_H_ + // _WX_GTK_TOOLBAR_H_ diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h index 0fec2feea7..60b3ce10d7 100644 --- a/include/wx/toolbar.h +++ b/include/wx/toolbar.h @@ -77,9 +77,9 @@ enum #elif defined(__WXMOTIF__) #include "wx/motif/toolbar.h" #elif defined(__WXGTK20__) - #include "wx/gtk/tbargtk.h" + #include "wx/gtk/toolbar.h" #elif defined(__WXGTK__) - #include "wx/gtk1/tbargtk.h" + #include "wx/gtk1/toolbar.h" #elif defined(__WXMAC__) #include "wx/osx/toolbar.h" #elif defined(__WXCOCOA__) diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms index 0fa2bb23a9..cf4536a347 100644 --- a/src/gtk/descrip.mms +++ b/src/gtk/descrip.mms @@ -94,7 +94,7 @@ OBJECTS0= \ statbox.obj,\ statline.obj,\ stattext.obj,\ - tbargtk.obj,\ + toolbar.obj,\ textctrl.obj,\ tglbtn.obj,\ msgdlg.obj,\ @@ -156,7 +156,7 @@ SOURCES =\ statbox.cpp,\ statline.cpp,\ stattext.cpp,\ - tbargtk.cpp,\ + toolbar.cpp,\ textctrl.cpp,\ tglbtn.cpp,\ timer.cpp,\ @@ -243,7 +243,7 @@ statbmp.obj : statbmp.cpp statbox.obj : statbox.cpp statline.obj : statline.cpp stattext.obj : stattext.cpp -tbargtk.obj : tbargtk.cpp +toolbar.obj : toolbar.cpp textctrl.obj : textctrl.cpp tglbtn.obj : tglbtn.cpp timer.obj : timer.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/toolbar.cpp similarity index 99% rename from src/gtk/tbargtk.cpp rename to src/gtk/toolbar.cpp index 5a675ea8d0..701ec64a84 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/toolbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/tbargtk.cpp +// Name: src/gtk/toolbar.cpp // Purpose: GTK toolbar // Author: Robert Roebling // Modified: 13.12.99 by VZ to derive from wxToolBarBase diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index beab0a9eed..b0c323cbad 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -87,7 +87,7 @@ OBJECTS0= \ statbox.obj,\ statline.obj,\ stattext.obj,\ - tbargtk.obj,\ + toolbar.obj,\ textctrl.obj,\ tglbtn.obj,\ msgdlg.obj @@ -145,7 +145,7 @@ SOURCES =\ statbox.cpp,\ statline.cpp,\ stattext.cpp,\ - tbargtk.cpp,\ + toolbar.cpp,\ textctrl.cpp,\ tglbtn.cpp,\ timer.cpp,\ @@ -220,7 +220,7 @@ statbmp.obj : statbmp.cpp statbox.obj : statbox.cpp statline.obj : statline.cpp stattext.obj : stattext.cpp -tbargtk.obj : tbargtk.cpp +toolbar.obj : toolbar.cpp textctrl.obj : textctrl.cpp tglbtn.obj : tglbtn.cpp timer.obj : timer.cpp diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index 176dde8d15..9970976eff 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -668,7 +668,7 @@ void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info ) static GdkFont *g_systemDefaultGuiFont = NULL; -// this is also used from tbargtk.cpp and tooltip.cpp, hence extern +// this is also used from toolbar.cpp and tooltip.cpp, hence extern extern GdkFont *GtkGetDefaultGuiFont() { if (!g_systemDefaultGuiFont) diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/toolbar.cpp similarity index 99% rename from src/gtk1/tbargtk.cpp rename to src/gtk1/toolbar.cpp index be2f5ff3c6..21ed937b0c 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/toolbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk1/tbargtk.cpp +// Name: src/gtk1/toolbar.cpp // Purpose: GTK toolbar // Author: Robert Roebling // Modified: 13.12.99 by VZ to derive from wxToolBarBase -- 2.49.0