From: Vadim Zeitlin Date: Thu, 27 Sep 2007 12:44:14 +0000 (+0000) Subject: added msw/textentry{cpp,h} X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/30e62fdcb24c1b62dc49f555af5ecc533f531803?hp=6987a0c4809f2a87cba1a8d72bbd31f42bcbca3e added msw/textentry{cpp,h} git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 163c6c8f26..079b73aca1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2704,6 +2704,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/tabctrl.h \ wx/msw/tbar95.h \ wx/msw/textctrl.h \ + wx/msw/textentry.h \ wx/msw/tglbtn.h \ wx/msw/tooltip.h \ wx/msw/toplevel.h \ @@ -2897,6 +2898,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/tabctrl.h \ wx/msw/tbar95.h \ wx/msw/textctrl.h \ + wx/msw/textentry.h \ wx/msw/tglbtn.h \ wx/msw/tooltip.h \ wx/msw/toplevel.h \ @@ -4786,6 +4788,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_tabctrl.o \ monodll_tbar95.o \ monodll_textctrl.o \ + monodll_textentry.o \ monodll_tglbtn.o \ monodll_treectrl.o \ monodll_checklst.o \ @@ -4917,6 +4920,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_tabctrl.o \ monodll_tbar95.o \ monodll_textctrl.o \ + monodll_textentry.o \ monodll_tglbtn.o \ monodll_treectrl.o \ monodll_dirdlgg.o \ @@ -6644,6 +6648,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_tabctrl.o \ monolib_tbar95.o \ monolib_textctrl.o \ + monolib_textentry.o \ monolib_tglbtn.o \ monolib_treectrl.o \ monolib_checklst.o \ @@ -6775,6 +6780,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_tabctrl.o \ monolib_tbar95.o \ monolib_textctrl.o \ + monolib_textentry.o \ monolib_tglbtn.o \ monolib_treectrl.o \ monolib_dirdlgg.o \ @@ -8776,6 +8782,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_tabctrl.o \ coredll_tbar95.o \ coredll_textctrl.o \ + coredll_textentry.o \ coredll_tglbtn.o \ coredll_treectrl.o \ coredll_checklst.o \ @@ -8907,6 +8914,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_tabctrl.o \ coredll_tbar95.o \ coredll_textctrl.o \ + coredll_textentry.o \ coredll_tglbtn.o \ coredll_treectrl.o \ coredll_dirdlgg.o \ @@ -10244,6 +10252,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_tabctrl.o \ corelib_tbar95.o \ corelib_textctrl.o \ + corelib_textentry.o \ corelib_tglbtn.o \ corelib_treectrl.o \ corelib_checklst.o \ @@ -10375,6 +10384,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_tabctrl.o \ corelib_tbar95.o \ corelib_textctrl.o \ + corelib_textentry.o \ corelib_tglbtn.o \ corelib_treectrl.o \ corelib_dirdlgg.o \ @@ -13914,9 +13924,6 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP) monodll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp -monodll_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp - monodll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONODLL_ODEP) $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c @@ -17085,6 +17092,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@monodll_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp @@ -18267,9 +18283,6 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP) monolib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp -monolib_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp - monolib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONOLIB_ODEP) $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c @@ -21438,6 +21451,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@monolib_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp @@ -23946,9 +23968,6 @@ coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP) coredll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp -coredll_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp - coredll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(COREDLL_ODEP) $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c @@ -26337,6 +26356,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@coredll_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp @@ -26925,9 +26953,6 @@ corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP) corelib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp -corelib_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp - corelib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(CORELIB_ODEP) $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c @@ -29316,6 +29341,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@corelib_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 7afc8de72f..3caf8ee689 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1641,6 +1641,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/tabctrl.cpp src/msw/tbar95.cpp src/msw/textctrl.cpp + src/msw/textentry.cpp src/msw/tglbtn.cpp src/msw/treectrl.cpp @@ -1723,6 +1724,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/tabctrl.h wx/msw/tbar95.h wx/msw/textctrl.h + wx/msw/textentry.h wx/msw/tglbtn.h wx/msw/tooltip.h wx/msw/toplevel.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 8993e6040c..c968acc961 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1597,6 +1597,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tabctrl.obj \ $(OBJS)\monodll_tbar95.obj \ $(OBJS)\monodll_textctrl.obj \ + $(OBJS)\monodll_textentry.obj \ $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ $(OBJS)\monodll_checklst.obj \ @@ -2237,6 +2238,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tabctrl.obj \ $(OBJS)\monolib_tbar95.obj \ $(OBJS)\monolib_textctrl.obj \ + $(OBJS)\monolib_textentry.obj \ $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ $(OBJS)\monolib_checklst.obj \ @@ -2789,6 +2791,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tabctrl.obj \ $(OBJS)\coredll_tbar95.obj \ $(OBJS)\coredll_textctrl.obj \ + $(OBJS)\coredll_textentry.obj \ $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ $(OBJS)\coredll_checklst.obj \ @@ -3252,6 +3255,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tabctrl.obj \ $(OBJS)\corelib_tbar95.obj \ $(OBJS)\corelib_textctrl.obj \ + $(OBJS)\corelib_textentry.obj \ $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ $(OBJS)\corelib_checklst.obj \ @@ -5620,6 +5624,9 @@ $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -7711,6 +7718,9 @@ $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -10180,6 +10190,9 @@ $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -11488,6 +11501,9 @@ $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 61debb466e..aa23efed59 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1615,6 +1615,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tabctrl.o \ $(OBJS)\monodll_tbar95.o \ $(OBJS)\monodll_textctrl.o \ + $(OBJS)\monodll_textentry.o \ $(OBJS)\monodll_tglbtn.o \ $(OBJS)\monodll_treectrl.o \ $(OBJS)\monodll_checklst.o \ @@ -2261,6 +2262,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tabctrl.o \ $(OBJS)\monolib_tbar95.o \ $(OBJS)\monolib_textctrl.o \ + $(OBJS)\monolib_textentry.o \ $(OBJS)\monolib_tglbtn.o \ $(OBJS)\monolib_treectrl.o \ $(OBJS)\monolib_checklst.o \ @@ -2829,6 +2831,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tabctrl.o \ $(OBJS)\coredll_tbar95.o \ $(OBJS)\coredll_textctrl.o \ + $(OBJS)\coredll_textentry.o \ $(OBJS)\coredll_tglbtn.o \ $(OBJS)\coredll_treectrl.o \ $(OBJS)\coredll_checklst.o \ @@ -3300,6 +3303,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tabctrl.o \ $(OBJS)\corelib_tbar95.o \ $(OBJS)\corelib_textctrl.o \ + $(OBJS)\corelib_textentry.o \ $(OBJS)\corelib_tglbtn.o \ $(OBJS)\corelib_treectrl.o \ $(OBJS)\corelib_checklst.o \ @@ -5789,6 +5793,9 @@ $(OBJS)\monodll_tabctrl.o: ../../src/msw/tabctrl.cpp $(OBJS)\monodll_tbar95.o: ../../src/msw/tbar95.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_textentry.o: ../../src/msw/textentry.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_treectrl.o: ../../src/msw/treectrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7980,6 +7987,9 @@ $(OBJS)\monolib_tabctrl.o: ../../src/msw/tabctrl.cpp $(OBJS)\monolib_tbar95.o: ../../src/msw/tbar95.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_textentry.o: ../../src/msw/textentry.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_treectrl.o: ../../src/msw/treectrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10549,6 +10559,9 @@ $(OBJS)\coredll_tabctrl.o: ../../src/msw/tabctrl.cpp $(OBJS)\coredll_tbar95.o: ../../src/msw/tbar95.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\coredll_textentry.o: ../../src/msw/textentry.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_treectrl.o: ../../src/msw/treectrl.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11957,6 +11970,9 @@ $(OBJS)\corelib_tabctrl.o: ../../src/msw/tabctrl.cpp $(OBJS)\corelib_tbar95.o: ../../src/msw/tbar95.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\corelib_textentry.o: ../../src/msw/textentry.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_treectrl.o: ../../src/msw/treectrl.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 3ebee8a32f..80dc641de3 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1784,6 +1784,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tabctrl.obj \ $(OBJS)\monodll_tbar95.obj \ $(OBJS)\monodll_textctrl.obj \ + $(OBJS)\monodll_textentry.obj \ $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ $(OBJS)\monodll_checklst.obj \ @@ -2430,6 +2431,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tabctrl.obj \ $(OBJS)\monolib_tbar95.obj \ $(OBJS)\monolib_textctrl.obj \ + $(OBJS)\monolib_textentry.obj \ $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ $(OBJS)\monolib_checklst.obj \ @@ -3012,6 +3014,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tabctrl.obj \ $(OBJS)\coredll_tbar95.obj \ $(OBJS)\coredll_textctrl.obj \ + $(OBJS)\coredll_textentry.obj \ $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ $(OBJS)\coredll_checklst.obj \ @@ -3481,6 +3484,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tabctrl.obj \ $(OBJS)\corelib_tbar95.obj \ $(OBJS)\corelib_textctrl.obj \ + $(OBJS)\corelib_textentry.obj \ $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ $(OBJS)\corelib_checklst.obj \ @@ -5981,6 +5985,9 @@ $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -8072,6 +8079,9 @@ $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -10541,6 +10551,9 @@ $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -11849,6 +11862,9 @@ $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index a4bb18a0cb..fc9ef540fb 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -305,6 +305,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_tabctrl.obj & $(OBJS)\monodll_tbar95.obj & $(OBJS)\monodll_textctrl.obj & + $(OBJS)\monodll_textentry.obj & $(OBJS)\monodll_tglbtn.obj & $(OBJS)\monodll_treectrl.obj & $(OBJS)\monodll_checklst.obj & @@ -956,6 +957,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_tabctrl.obj & $(OBJS)\monolib_tbar95.obj & $(OBJS)\monolib_textctrl.obj & + $(OBJS)\monolib_textentry.obj & $(OBJS)\monolib_tglbtn.obj & $(OBJS)\monolib_treectrl.obj & $(OBJS)\monolib_checklst.obj & @@ -1535,6 +1537,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_tabctrl.obj & $(OBJS)\coredll_tbar95.obj & $(OBJS)\coredll_textctrl.obj & + $(OBJS)\coredll_textentry.obj & $(OBJS)\coredll_tglbtn.obj & $(OBJS)\coredll_treectrl.obj & $(OBJS)\coredll_checklst.obj & @@ -2008,6 +2011,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_tabctrl.obj & $(OBJS)\corelib_tbar95.obj & $(OBJS)\corelib_textctrl.obj & + $(OBJS)\corelib_textentry.obj & $(OBJS)\corelib_tglbtn.obj & $(OBJS)\corelib_treectrl.obj & $(OBJS)\corelib_checklst.obj & @@ -6050,6 +6054,9 @@ $(OBJS)\monodll_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp $(OBJS)\monodll_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8241,6 +8248,9 @@ $(OBJS)\monolib_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp $(OBJS)\monolib_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10810,6 +10820,9 @@ $(OBJS)\coredll_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp $(OBJS)\coredll_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12218,6 +12231,9 @@ $(OBJS)\corelib_tabctrl.obj : .AUTODEPEND ..\..\src\msw\tabctrl.cpp $(OBJS)\corelib_tbar95.obj : .AUTODEPEND ..\..\src\msw\tbar95.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 62b4ab5aa7..25a30d6a1e 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -3813,6 +3813,69 @@ SOURCE=..\..\src\msw\textctrl.cpp !ELSEIF "$(CFG)" == "core - Win32 Debug" +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\textentry.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + + !ENDIF # End Source File @@ -8193,6 +8256,10 @@ SOURCE=..\..\include\wx\msw\textctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\textentry.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\tglbtn.h # End Source File # Begin Source File