rename fobr95.{cpp,h} files to foobar.{cpp,h}

author Vadim Zeitlin <vadim@wxwidgets.org>

Sat, 15 Mar 2008 16:53:06 +0000 (16:53 +0000)

committer Vadim Zeitlin <vadim@wxwidgets.org>

Sat, 15 Mar 2008 16:53:06 +0000 (16:53 +0000)
author Vadim Zeitlin <vadim@wxwidgets.org>
Sat, 15 Mar 2008 16:53:06 +0000 (16:53 +0000)
committer Vadim Zeitlin <vadim@wxwidgets.org>
Sat, 15 Mar 2008 16:53:06 +0000 (16:53 +0000)
diff --git a/Makefile.in b/Makefile.in

index d6e2212c76291e792a937eaba870a2a95a521100..f63eaa3370e2eb5f717b1e9ad99db7dede8497a0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2663,7 +2663,7 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
         wx/msw/filedlg.h \
         wx/msw/font.h \
         wx/msw/frame.h \
-       wx/msw/gauge95.h \
+       wx/msw/gauge.h \
         wx/msw/gdiimage.h \
         wx/msw/icon.h \
         wx/msw/imaglist.h \
@@ -2696,16 +2696,16 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
         wx/msw/rcdefs.h \
         wx/msw/scrolbar.h \
         wx/msw/setup0.h \
-       wx/msw/slider95.h \
+       wx/msw/slider.h \
         wx/msw/spinbutt.h \
         wx/msw/spinctrl.h \
         wx/msw/statbmp.h \
         wx/msw/statbox.h \
-       wx/msw/statbr95.h \
+       wx/msw/statusbar.h \
         wx/msw/statline.h \
         wx/msw/stattext.h \
         wx/msw/tabctrl.h \
-       wx/msw/tbar95.h \
+       wx/msw/toolbar.h \
         wx/msw/textctrl.h \
         wx/msw/textentry.h \
         wx/msw/tglbtn.h \
@@ -2861,7 +2861,7 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
         wx/msw/filedlg.h \
         wx/msw/font.h \
         wx/msw/frame.h \
-       wx/msw/gauge95.h \
+       wx/msw/gauge.h \
         wx/msw/gdiimage.h \
         wx/msw/icon.h \
         wx/msw/imaglist.h \
@@ -2894,16 +2894,16 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
         wx/msw/rcdefs.h \
         wx/msw/scrolbar.h \
         wx/msw/setup0.h \
-       wx/msw/slider95.h \
+       wx/msw/slider.h \
         wx/msw/spinbutt.h \
         wx/msw/spinctrl.h \
         wx/msw/statbmp.h \
         wx/msw/statbox.h \
-       wx/msw/statbr95.h \
+       wx/msw/statusbar.h \
         wx/msw/statline.h \
         wx/msw/stattext.h \
         wx/msw/tabctrl.h \
-       wx/msw/tbar95.h \
+       wx/msw/toolbar.h \
         wx/msw/textctrl.h \
         wx/msw/textentry.h \
         wx/msw/tglbtn.h \
@@ -4823,7 +4823,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
         monodll_dragimag.o \
         monodll_filedlg.o \
         monodll_frame.o \
-       monodll_gauge95.o \
+       monodll_gauge.o \
         monodll_iniconf.o \
         monodll_listbox.o \
         monodll_listctrl.o \
@@ -4840,16 +4840,16 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
         monodll_radiobox.o \
         monodll_radiobut.o \
         monodll_scrolbar.o \
-       monodll_slider95.o \
+       monodll_slider.o \
         monodll_spinbutt.o \
         monodll_spinctrl.o \
         monodll_statbmp.o \
         monodll_statbox.o \
-       monodll_statbr95.o \
+       monodll_statusbar.o \
         monodll_statline.o \
         monodll_stattext.o \
         monodll_tabctrl.o \
-       monodll_tbar95.o \
+       monodll_toolbar.o \
         monodll_textctrl.o \
         monodll_textentry.o \
         monodll_tglbtn.o \
@@ -4965,7 +4965,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
         monodll_dragimag.o \
         monodll_filedlg.o \
         monodll_frame.o \
-       monodll_gauge95.o \
+       monodll_gauge.o \
         monodll_iniconf.o \
         monodll_listbox.o \
         monodll_listctrl.o \
@@ -4982,16 +4982,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
         monodll_radiobox.o \
         monodll_radiobut.o \
         monodll_scrolbar.o \
-       monodll_slider95.o \
+       monodll_slider.o \
         monodll_spinbutt.o \
         monodll_spinctrl.o \
         monodll_statbmp.o \
         monodll_statbox.o \
-       monodll_statbr95.o \
+       monodll_statusbar.o \
         monodll_statline.o \
         monodll_stattext.o \
         monodll_tabctrl.o \
-       monodll_tbar95.o \
+       monodll_toolbar.o \
         monodll_textctrl.o \
         monodll_textentry.o \
         monodll_tglbtn.o \
@@ -6730,7 +6730,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
         monolib_dragimag.o \
         monolib_filedlg.o \
         monolib_frame.o \
-       monolib_gauge95.o \
+       monolib_gauge.o \
         monolib_iniconf.o \
         monolib_listbox.o \
         monolib_listctrl.o \
@@ -6747,16 +6747,16 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
         monolib_radiobox.o \
         monolib_radiobut.o \
         monolib_scrolbar.o \
-       monolib_slider95.o \
+       monolib_slider.o \
         monolib_spinbutt.o \
         monolib_spinctrl.o \
         monolib_statbmp.o \
         monolib_statbox.o \
-       monolib_statbr95.o \
+       monolib_statusbar.o \
         monolib_statline.o \
         monolib_stattext.o \
         monolib_tabctrl.o \
-       monolib_tbar95.o \
+       monolib_toolbar.o \
         monolib_textctrl.o \
         monolib_textentry.o \
         monolib_tglbtn.o \
@@ -6872,7 +6872,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
         monolib_dragimag.o \
         monolib_filedlg.o \
         monolib_frame.o \
-       monolib_gauge95.o \
+       monolib_gauge.o \
         monolib_iniconf.o \
         monolib_listbox.o \
         monolib_listctrl.o \
@@ -6889,16 +6889,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
         monolib_radiobox.o \
         monolib_radiobut.o \
         monolib_scrolbar.o \
-       monolib_slider95.o \
+       monolib_slider.o \
         monolib_spinbutt.o \
         monolib_spinctrl.o \
         monolib_statbmp.o \
         monolib_statbox.o \
-       monolib_statbr95.o \
+       monolib_statusbar.o \
         monolib_statline.o \
         monolib_stattext.o \
         monolib_tabctrl.o \
-       monolib_tbar95.o \
+       monolib_toolbar.o \
         monolib_textctrl.o \
         monolib_textentry.o \
         monolib_tglbtn.o \
@@ -8930,7 +8930,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
         coredll_dragimag.o \
         coredll_filedlg.o \
         coredll_frame.o \
-       coredll_gauge95.o \
+       coredll_gauge.o \
         coredll_iniconf.o \
         coredll_listbox.o \
         coredll_listctrl.o \
@@ -8947,16 +8947,16 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
         coredll_radiobox.o \
         coredll_radiobut.o \
         coredll_scrolbar.o \
-       coredll_slider95.o \
+       coredll_slider.o \
         coredll_spinbutt.o \
         coredll_spinctrl.o \
         coredll_statbmp.o \
         coredll_statbox.o \
-       coredll_statbr95.o \
+       coredll_statusbar.o \
         coredll_statline.o \
         coredll_stattext.o \
         coredll_tabctrl.o \
-       coredll_tbar95.o \
+       coredll_toolbar.o \
         coredll_textctrl.o \
         coredll_textentry.o \
         coredll_tglbtn.o \
@@ -9072,7 +9072,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
         coredll_dragimag.o \
         coredll_filedlg.o \
         coredll_frame.o \
-       coredll_gauge95.o \
+       coredll_gauge.o \
         coredll_iniconf.o \
         coredll_listbox.o \
         coredll_listctrl.o \
@@ -9089,16 +9089,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
         coredll_radiobox.o \
         coredll_radiobut.o \
         coredll_scrolbar.o \
-       coredll_slider95.o \
+       coredll_slider.o \
         coredll_spinbutt.o \
         coredll_spinctrl.o \
         coredll_statbmp.o \
         coredll_statbox.o \
-       coredll_statbr95.o \
+       coredll_statusbar.o \
         coredll_statline.o \
         coredll_stattext.o \
         coredll_tabctrl.o \
-       coredll_tbar95.o \
+       coredll_toolbar.o \
         coredll_textctrl.o \
         coredll_textentry.o \
         coredll_tglbtn.o \
@@ -10427,7 +10427,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
         corelib_dragimag.o \
         corelib_filedlg.o \
         corelib_frame.o \
-       corelib_gauge95.o \
+       corelib_gauge.o \
         corelib_iniconf.o \
         corelib_listbox.o \
         corelib_listctrl.o \
@@ -10444,16 +10444,16 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
         corelib_radiobox.o \
         corelib_radiobut.o \
         corelib_scrolbar.o \
-       corelib_slider95.o \
+       corelib_slider.o \
         corelib_spinbutt.o \
         corelib_spinctrl.o \
         corelib_statbmp.o \
         corelib_statbox.o \
-       corelib_statbr95.o \
+       corelib_statusbar.o \
         corelib_statline.o \
         corelib_stattext.o \
         corelib_tabctrl.o \
-       corelib_tbar95.o \
+       corelib_toolbar.o \
         corelib_textctrl.o \
         corelib_textentry.o \
         corelib_tglbtn.o \
@@ -10569,7 +10569,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
         corelib_dragimag.o \
         corelib_filedlg.o \
         corelib_frame.o \
-       corelib_gauge95.o \
+       corelib_gauge.o \
         corelib_iniconf.o \
         corelib_listbox.o \
         corelib_listctrl.o \
@@ -10586,16 +10586,16 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
         corelib_radiobox.o \
         corelib_radiobut.o \
         corelib_scrolbar.o \
-       corelib_slider95.o \
+       corelib_slider.o \
         corelib_spinbutt.o \
         corelib_spinctrl.o \
         corelib_statbmp.o \
         corelib_statbox.o \
-       corelib_statbr95.o \
+       corelib_statusbar.o \
         corelib_statline.o \
         corelib_stattext.o \
         corelib_tabctrl.o \
-       corelib_tbar95.o \
+       corelib_toolbar.o \
         corelib_textctrl.o \
         corelib_textentry.o \
         corelib_tglbtn.o \
@@ -16701,6 +16701,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/mac/carbon/gauge.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gauge.cpp
  
@@ -16944,6 +16950,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/motif/slider.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/mac/carbon/slider.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/slider.cpp
  
@@ -17304,6 +17316,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/mac/carbon/toolbar.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/toolbar.cpp
  
@@ -17328,12 +17346,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
@@ -17379,17 +17391,11 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_slider95.o: $(srcdir)/src/msw/slider95.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_slider95.o: $(srcdir)/src/msw/slider95.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
@@ -17403,12 +17409,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
  
@@ -21216,6 +21216,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/mac/carbon/gauge.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gauge.cpp
  
@@ -21459,6 +21465,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/motif/slider.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/mac/carbon/slider.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/slider.cpp
  
@@ -21819,6 +21831,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/mac/carbon/toolbar.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/toolbar.cpp
  
@@ -21843,12 +21861,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
@@ -21894,17 +21906,11 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_slider95.o: $(srcdir)/src/msw/slider95.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_slider95.o: $(srcdir)/src/msw/slider95.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
@@ -21918,12 +21924,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
  
@@ -26325,6 +26325,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/mac/carbon/gauge.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gauge.cpp
  
@@ -26568,6 +26574,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/motif/slider.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/mac/carbon/slider.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/slider.cpp
  
@@ -26928,6 +26940,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/mac/carbon/toolbar.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/toolbar.cpp
  
@@ -26952,12 +26970,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
@@ -27003,17 +27015,11 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_slider95.o: $(srcdir)/src/msw/slider95.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_slider95.o: $(srcdir)/src/msw/slider95.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
@@ -27027,12 +27033,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
  
@@ -29397,6 +29397,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/mac/carbon/gauge.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gauge.cpp
  
@@ -29640,6 +29646,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/motif/slider.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/mac/carbon/slider.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/slider.cpp
  
@@ -30000,6 +30012,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/mac/carbon/toolbar.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/toolbar.cpp
  
@@ -30024,12 +30042,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge95.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
@@ -30075,17 +30087,11 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_slider95.o: $(srcdir)/src/msw/slider95.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_slider95.o: $(srcdir)/src/msw/slider95.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider95.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statbr95.o: $(srcdir)/src/msw/statbr95.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbr95.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
@@ -30099,12 +30105,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tbar95.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
  
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl

index c49c61dddc64ba38fe80df8dc2f650fa46a9a302..ca98e7d09409a4ee9e2cb51a4f4ff64ad97f0018 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1667,7 +1667,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/dragimag.cpp
      src/msw/filedlg.cpp
      src/msw/frame.cpp
-    src/msw/gauge95.cpp
+    src/msw/gauge.cpp
      src/msw/iniconf.cpp
      src/msw/listbox.cpp
      src/msw/listctrl.cpp
@@ -1684,16 +1684,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/radiobox.cpp
      src/msw/radiobut.cpp
      src/msw/scrolbar.cpp
-    src/msw/slider95.cpp
+    src/msw/slider.cpp
      src/msw/spinbutt.cpp
      src/msw/spinctrl.cpp
      src/msw/statbmp.cpp
      src/msw/statbox.cpp
-    src/msw/statbr95.cpp
+    src/msw/statusbar.cpp
      src/msw/statline.cpp
      src/msw/stattext.cpp
      src/msw/tabctrl.cpp
-    src/msw/tbar95.cpp
+    src/msw/toolbar.cpp
      src/msw/textctrl.cpp
      src/msw/textentry.cpp
      src/msw/tglbtn.cpp
@@ -1735,7 +1735,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/filedlg.h
      wx/msw/font.h
      wx/msw/frame.h
-    wx/msw/gauge95.h
+    wx/msw/gauge.h
      wx/msw/gdiimage.h
      wx/msw/icon.h
      wx/msw/imaglist.h
@@ -1768,16 +1768,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/rcdefs.h
      wx/msw/scrolbar.h
      wx/msw/setup0.h
-    wx/msw/slider95.h
+    wx/msw/slider.h
      wx/msw/spinbutt.h
      wx/msw/spinctrl.h
      wx/msw/statbmp.h
      wx/msw/statbox.h
-    wx/msw/statbr95.h
+    wx/msw/statusbar.h
      wx/msw/statline.h
      wx/msw/stattext.h
      wx/msw/tabctrl.h
-    wx/msw/tbar95.h
+    wx/msw/toolbar.h
      wx/msw/textctrl.h
      wx/msw/textentry.h
      wx/msw/tglbtn.h
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc

index 4f7686360c89e9deecdbeba6da0067c6ef59e113..e86526d16a817cc745a894e3e811774a127a8c01 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1542,7 +1542,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dragimag.obj \
         $(OBJS)\monodll_filedlg.obj \
         $(OBJS)\monodll_frame.obj \
-       $(OBJS)\monodll_gauge95.obj \
+       $(OBJS)\monodll_gauge.obj \
         $(OBJS)\monodll_iniconf.obj \
         $(OBJS)\monodll_listbox.obj \
         $(OBJS)\monodll_listctrl.obj \
@@ -1559,16 +1559,16 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_radiobox.obj \
         $(OBJS)\monodll_radiobut.obj \
         $(OBJS)\monodll_scrolbar.obj \
-       $(OBJS)\monodll_slider95.obj \
+       $(OBJS)\monodll_slider.obj \
         $(OBJS)\monodll_spinbutt.obj \
         $(OBJS)\monodll_spinctrl.obj \
         $(OBJS)\monodll_statbmp.obj \
         $(OBJS)\monodll_statbox.obj \
-       $(OBJS)\monodll_statbr95.obj \
+       $(OBJS)\monodll_statusbar.obj \
         $(OBJS)\monodll_statline.obj \
         $(OBJS)\monodll_stattext.obj \
         $(OBJS)\monodll_tabctrl.obj \
-       $(OBJS)\monodll_tbar95.obj \
+       $(OBJS)\monodll_toolbar.obj \
         $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_textentry.obj \
         $(OBJS)\monodll_tglbtn.obj \
@@ -2186,7 +2186,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dragimag.obj \
         $(OBJS)\monolib_filedlg.obj \
         $(OBJS)\monolib_frame.obj \
-       $(OBJS)\monolib_gauge95.obj \
+       $(OBJS)\monolib_gauge.obj \
         $(OBJS)\monolib_iniconf.obj \
         $(OBJS)\monolib_listbox.obj \
         $(OBJS)\monolib_listctrl.obj \
@@ -2203,16 +2203,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_radiobox.obj \
         $(OBJS)\monolib_radiobut.obj \
         $(OBJS)\monolib_scrolbar.obj \
-       $(OBJS)\monolib_slider95.obj \
+       $(OBJS)\monolib_slider.obj \
         $(OBJS)\monolib_spinbutt.obj \
         $(OBJS)\monolib_spinctrl.obj \
         $(OBJS)\monolib_statbmp.obj \
         $(OBJS)\monolib_statbox.obj \
-       $(OBJS)\monolib_statbr95.obj \
+       $(OBJS)\monolib_statusbar.obj \
         $(OBJS)\monolib_statline.obj \
         $(OBJS)\monolib_stattext.obj \
         $(OBJS)\monolib_tabctrl.obj \
-       $(OBJS)\monolib_tbar95.obj \
+       $(OBJS)\monolib_toolbar.obj \
         $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_textentry.obj \
         $(OBJS)\monolib_tglbtn.obj \
@@ -2745,7 +2745,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dragimag.obj \
         $(OBJS)\coredll_filedlg.obj \
         $(OBJS)\coredll_frame.obj \
-       $(OBJS)\coredll_gauge95.obj \
+       $(OBJS)\coredll_gauge.obj \
         $(OBJS)\coredll_iniconf.obj \
         $(OBJS)\coredll_listbox.obj \
         $(OBJS)\coredll_listctrl.obj \
@@ -2762,16 +2762,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_radiobox.obj \
         $(OBJS)\coredll_radiobut.obj \
         $(OBJS)\coredll_scrolbar.obj \
-       $(OBJS)\coredll_slider95.obj \
+       $(OBJS)\coredll_slider.obj \
         $(OBJS)\coredll_spinbutt.obj \
         $(OBJS)\coredll_spinctrl.obj \
         $(OBJS)\coredll_statbmp.obj \
         $(OBJS)\coredll_statbox.obj \
-       $(OBJS)\coredll_statbr95.obj \
+       $(OBJS)\coredll_statusbar.obj \
         $(OBJS)\coredll_statline.obj \
         $(OBJS)\coredll_stattext.obj \
         $(OBJS)\coredll_tabctrl.obj \
-       $(OBJS)\coredll_tbar95.obj \
+       $(OBJS)\coredll_toolbar.obj \
         $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_textentry.obj \
         $(OBJS)\coredll_tglbtn.obj \
@@ -3210,7 +3210,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dragimag.obj \
         $(OBJS)\corelib_filedlg.obj \
         $(OBJS)\corelib_frame.obj \
-       $(OBJS)\corelib_gauge95.obj \
+       $(OBJS)\corelib_gauge.obj \
         $(OBJS)\corelib_iniconf.obj \
         $(OBJS)\corelib_listbox.obj \
         $(OBJS)\corelib_listctrl.obj \
@@ -3227,16 +3227,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_radiobox.obj \
         $(OBJS)\corelib_radiobut.obj \
         $(OBJS)\corelib_scrolbar.obj \
-       $(OBJS)\corelib_slider95.obj \
+       $(OBJS)\corelib_slider.obj \
         $(OBJS)\corelib_spinbutt.obj \
         $(OBJS)\corelib_spinctrl.obj \
         $(OBJS)\corelib_statbmp.obj \
         $(OBJS)\corelib_statbox.obj \
-       $(OBJS)\corelib_statbr95.obj \
+       $(OBJS)\corelib_statusbar.obj \
         $(OBJS)\corelib_statline.obj \
         $(OBJS)\corelib_stattext.obj \
         $(OBJS)\corelib_tabctrl.obj \
-       $(OBJS)\corelib_tbar95.obj \
+       $(OBJS)\corelib_toolbar.obj \
         $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_textentry.obj \
         $(OBJS)\corelib_tglbtn.obj \
@@ -5542,9 +5542,6 @@ $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\monodll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
  $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
@@ -5572,21 +5569,15 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
  $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\monodll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
  $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\monodll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
  
  $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
  
-$(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
  $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
@@ -5626,9 +5617,6 @@ $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
  $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
  
@@ -5641,18 +5629,12 @@ $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
  $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
-
  $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
  $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
  
@@ -6350,6 +6332,16 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -6420,6 +6412,16 @@ $(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -6470,6 +6472,16 @@ $(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -7651,9 +7663,6 @@ $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\monolib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
  $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
@@ -7681,21 +7690,15 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
  $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\monolib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
  $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\monolib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
  
  $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
  
-$(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
  $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
@@ -7735,9 +7738,6 @@ $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
  $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
  
@@ -7750,18 +7750,12 @@ $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
  $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
-
  $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
  $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
  
@@ -8459,6 +8453,16 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -8529,6 +8533,16 @@ $(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -8579,6 +8593,16 @@ $(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -10144,9 +10168,6 @@ $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\coredll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
  $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
@@ -10174,21 +10195,15 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
  $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\coredll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
  $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\coredll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
  
  $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
  
-$(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
  $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
@@ -10228,9 +10243,6 @@ $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
  $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
  
@@ -10243,18 +10255,12 @@ $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
  $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
-
  $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
  $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
  
@@ -10628,6 +10634,16 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -10698,6 +10714,16 @@ $(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -10748,6 +10774,16 @@ $(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -11458,9 +11494,6 @@ $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\corelib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
  $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
@@ -11488,21 +11521,15 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
  $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\corelib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
  $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\corelib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
  
  $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
  
-$(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
  $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
@@ -11542,9 +11569,6 @@ $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
  $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
  
@@ -11557,18 +11581,12 @@ $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
  $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
-
  $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
  $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
  
@@ -11942,6 +11960,16 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -12012,6 +12040,16 @@ $(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -12062,6 +12100,16 @@ $(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc

index 2ca4fe96f5bceff0b09c056756bcf61a52b17832..b810e60ff1c8dc6d6dc90380db42464172c33e98 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1559,7 +1559,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dragimag.o \
         $(OBJS)\monodll_filedlg.o \
         $(OBJS)\monodll_frame.o \
-       $(OBJS)\monodll_gauge95.o \
+       $(OBJS)\monodll_gauge.o \
         $(OBJS)\monodll_iniconf.o \
         $(OBJS)\monodll_listbox.o \
         $(OBJS)\monodll_listctrl.o \
@@ -1576,16 +1576,16 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_radiobox.o \
         $(OBJS)\monodll_radiobut.o \
         $(OBJS)\monodll_scrolbar.o \
-       $(OBJS)\monodll_slider95.o \
+       $(OBJS)\monodll_slider.o \
         $(OBJS)\monodll_spinbutt.o \
         $(OBJS)\monodll_spinctrl.o \
         $(OBJS)\monodll_statbmp.o \
         $(OBJS)\monodll_statbox.o \
-       $(OBJS)\monodll_statbr95.o \
+       $(OBJS)\monodll_statusbar.o \
         $(OBJS)\monodll_statline.o \
         $(OBJS)\monodll_stattext.o \
         $(OBJS)\monodll_tabctrl.o \
-       $(OBJS)\monodll_tbar95.o \
+       $(OBJS)\monodll_toolbar.o \
         $(OBJS)\monodll_textctrl.o \
         $(OBJS)\monodll_textentry.o \
         $(OBJS)\monodll_tglbtn.o \
@@ -2209,7 +2209,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dragimag.o \
         $(OBJS)\monolib_filedlg.o \
         $(OBJS)\monolib_frame.o \
-       $(OBJS)\monolib_gauge95.o \
+       $(OBJS)\monolib_gauge.o \
         $(OBJS)\monolib_iniconf.o \
         $(OBJS)\monolib_listbox.o \
         $(OBJS)\monolib_listctrl.o \
@@ -2226,16 +2226,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_radiobox.o \
         $(OBJS)\monolib_radiobut.o \
         $(OBJS)\monolib_scrolbar.o \
-       $(OBJS)\monolib_slider95.o \
+       $(OBJS)\monolib_slider.o \
         $(OBJS)\monolib_spinbutt.o \
         $(OBJS)\monolib_spinctrl.o \
         $(OBJS)\monolib_statbmp.o \
         $(OBJS)\monolib_statbox.o \
-       $(OBJS)\monolib_statbr95.o \
+       $(OBJS)\monolib_statusbar.o \
         $(OBJS)\monolib_statline.o \
         $(OBJS)\monolib_stattext.o \
         $(OBJS)\monolib_tabctrl.o \
-       $(OBJS)\monolib_tbar95.o \
+       $(OBJS)\monolib_toolbar.o \
         $(OBJS)\monolib_textctrl.o \
         $(OBJS)\monolib_textentry.o \
         $(OBJS)\monolib_tglbtn.o \
@@ -2784,7 +2784,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dragimag.o \
         $(OBJS)\coredll_filedlg.o \
         $(OBJS)\coredll_frame.o \
-       $(OBJS)\coredll_gauge95.o \
+       $(OBJS)\coredll_gauge.o \
         $(OBJS)\coredll_iniconf.o \
         $(OBJS)\coredll_listbox.o \
         $(OBJS)\coredll_listctrl.o \
@@ -2801,16 +2801,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_radiobox.o \
         $(OBJS)\coredll_radiobut.o \
         $(OBJS)\coredll_scrolbar.o \
-       $(OBJS)\coredll_slider95.o \
+       $(OBJS)\coredll_slider.o \
         $(OBJS)\coredll_spinbutt.o \
         $(OBJS)\coredll_spinctrl.o \
         $(OBJS)\coredll_statbmp.o \
         $(OBJS)\coredll_statbox.o \
-       $(OBJS)\coredll_statbr95.o \
+       $(OBJS)\coredll_statusbar.o \
         $(OBJS)\coredll_statline.o \
         $(OBJS)\coredll_stattext.o \
         $(OBJS)\coredll_tabctrl.o \
-       $(OBJS)\coredll_tbar95.o \
+       $(OBJS)\coredll_toolbar.o \
         $(OBJS)\coredll_textctrl.o \
         $(OBJS)\coredll_textentry.o \
         $(OBJS)\coredll_tglbtn.o \
@@ -3257,7 +3257,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dragimag.o \
         $(OBJS)\corelib_filedlg.o \
         $(OBJS)\corelib_frame.o \
-       $(OBJS)\corelib_gauge95.o \
+       $(OBJS)\corelib_gauge.o \
         $(OBJS)\corelib_iniconf.o \
         $(OBJS)\corelib_listbox.o \
         $(OBJS)\corelib_listctrl.o \
@@ -3274,16 +3274,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_radiobox.o \
         $(OBJS)\corelib_radiobut.o \
         $(OBJS)\corelib_scrolbar.o \
-       $(OBJS)\corelib_slider95.o \
+       $(OBJS)\corelib_slider.o \
         $(OBJS)\corelib_spinbutt.o \
         $(OBJS)\corelib_spinctrl.o \
         $(OBJS)\corelib_statbmp.o \
         $(OBJS)\corelib_statbox.o \
-       $(OBJS)\corelib_statbr95.o \
+       $(OBJS)\corelib_statusbar.o \
         $(OBJS)\corelib_statline.o \
         $(OBJS)\corelib_stattext.o \
         $(OBJS)\corelib_tabctrl.o \
-       $(OBJS)\corelib_tbar95.o \
+       $(OBJS)\corelib_toolbar.o \
         $(OBJS)\corelib_textctrl.o \
         $(OBJS)\corelib_textentry.o \
         $(OBJS)\corelib_tglbtn.o \
@@ -5684,9 +5684,6 @@ $(OBJS)\monodll_filedlg.o: ../../src/msw/filedlg.cpp
  $(OBJS)\monodll_frame.o: ../../src/msw/frame.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monodll_gauge95.o: ../../src/msw/gauge95.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monodll_iniconf.o: ../../src/msw/iniconf.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
@@ -5714,21 +5711,15 @@ $(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp
  $(OBJS)\monodll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monodll_slider95.o: ../../src/msw/slider95.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monodll_spinctrl.o: ../../src/msw/spinctrl.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monodll_statbr95.o: ../../src/msw/statbr95.cpp
+$(OBJS)\monodll_statusbar.o: ../../src/msw/statusbar.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\monodll_tabctrl.o: ../../src/msw/tabctrl.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(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) $<
  
@@ -5768,9 +5759,6 @@ $(OBJS)\monodll_ctrlrend.o: ../../src/univ/ctrlrend.cpp
  $(OBJS)\monodll_framuniv.o: ../../src/univ/framuniv.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monodll_gauge.o: ../../src/univ/gauge.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monodll_inpcons.o: ../../src/univ/inpcons.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
@@ -5783,18 +5771,12 @@ $(OBJS)\monodll_scrarrow.o: ../../src/univ/scrarrow.cpp
  $(OBJS)\monodll_scrthumb.o: ../../src/univ/scrthumb.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monodll_slider.o: ../../src/univ/slider.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monodll_stdrend.o: ../../src/univ/stdrend.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\monodll_theme.o: ../../src/univ/theme.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monodll_toolbar.o: ../../src/univ/toolbar.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monodll_topluniv.o: ../../src/univ/topluniv.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
  
@@ -6528,6 +6510,20 @@ $(OBJS)\monodll_dialog.o: ../../src/univ/dialog.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\monodll_gauge.o: ../../src/msw/gauge.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monodll_gauge.o: ../../src/univ/gauge.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\monodll_listbox.o: ../../src/msw/listbox.cpp
@@ -6626,6 +6622,20 @@ $(OBJS)\monodll_scrolbar.o: ../../src/univ/scrolbar.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\monodll_slider.o: ../../src/msw/slider.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monodll_slider.o: ../../src/univ/slider.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\monodll_spinbutt.o: ../../src/msw/spinbutt.cpp
@@ -6696,6 +6706,20 @@ $(OBJS)\monodll_stattext.o: ../../src/univ/stattext.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\monodll_toolbar.o: ../../src/msw/toolbar.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monodll_toolbar.o: ../../src/univ/toolbar.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\monodll_textctrl.o: ../../src/msw/textctrl.cpp
@@ -7895,9 +7919,6 @@ $(OBJS)\monolib_filedlg.o: ../../src/msw/filedlg.cpp
  $(OBJS)\monolib_frame.o: ../../src/msw/frame.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monolib_gauge95.o: ../../src/msw/gauge95.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monolib_iniconf.o: ../../src/msw/iniconf.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
@@ -7925,21 +7946,15 @@ $(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp
  $(OBJS)\monolib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monolib_slider95.o: ../../src/msw/slider95.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monolib_spinctrl.o: ../../src/msw/spinctrl.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monolib_statbr95.o: ../../src/msw/statbr95.cpp
+$(OBJS)\monolib_statusbar.o: ../../src/msw/statusbar.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\monolib_tabctrl.o: ../../src/msw/tabctrl.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(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) $<
  
@@ -7979,9 +7994,6 @@ $(OBJS)\monolib_ctrlrend.o: ../../src/univ/ctrlrend.cpp
  $(OBJS)\monolib_framuniv.o: ../../src/univ/framuniv.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monolib_gauge.o: ../../src/univ/gauge.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monolib_inpcons.o: ../../src/univ/inpcons.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
@@ -7994,18 +8006,12 @@ $(OBJS)\monolib_scrarrow.o: ../../src/univ/scrarrow.cpp
  $(OBJS)\monolib_scrthumb.o: ../../src/univ/scrthumb.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monolib_slider.o: ../../src/univ/slider.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monolib_stdrend.o: ../../src/univ/stdrend.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\monolib_theme.o: ../../src/univ/theme.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\monolib_toolbar.o: ../../src/univ/toolbar.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\monolib_topluniv.o: ../../src/univ/topluniv.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
  
@@ -8739,6 +8745,20 @@ $(OBJS)\monolib_dialog.o: ../../src/univ/dialog.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\monolib_gauge.o: ../../src/msw/gauge.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monolib_gauge.o: ../../src/univ/gauge.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\monolib_listbox.o: ../../src/msw/listbox.cpp
@@ -8837,6 +8857,20 @@ $(OBJS)\monolib_scrolbar.o: ../../src/univ/scrolbar.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\monolib_slider.o: ../../src/msw/slider.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monolib_slider.o: ../../src/univ/slider.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\monolib_spinbutt.o: ../../src/msw/spinbutt.cpp
@@ -8907,6 +8941,20 @@ $(OBJS)\monolib_stattext.o: ../../src/univ/stattext.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\monolib_toolbar.o: ../../src/msw/toolbar.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\monolib_toolbar.o: ../../src/univ/toolbar.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\monolib_textctrl.o: ../../src/msw/textctrl.cpp
@@ -10490,9 +10538,6 @@ $(OBJS)\coredll_filedlg.o: ../../src/msw/filedlg.cpp
  $(OBJS)\coredll_frame.o: ../../src/msw/frame.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\coredll_gauge95.o: ../../src/msw/gauge95.cpp
-       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\coredll_iniconf.o: ../../src/msw/iniconf.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
@@ -10520,21 +10565,15 @@ $(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp
  $(OBJS)\coredll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\coredll_slider95.o: ../../src/msw/slider95.cpp
-       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\coredll_spinctrl.o: ../../src/msw/spinctrl.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\coredll_statbr95.o: ../../src/msw/statbr95.cpp
+$(OBJS)\coredll_statusbar.o: ../../src/msw/statusbar.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\coredll_tabctrl.o: ../../src/msw/tabctrl.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(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) $<
  
@@ -10574,9 +10613,6 @@ $(OBJS)\coredll_ctrlrend.o: ../../src/univ/ctrlrend.cpp
  $(OBJS)\coredll_framuniv.o: ../../src/univ/framuniv.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\coredll_gauge.o: ../../src/univ/gauge.cpp
-       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\coredll_inpcons.o: ../../src/univ/inpcons.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
@@ -10589,18 +10625,12 @@ $(OBJS)\coredll_scrarrow.o: ../../src/univ/scrarrow.cpp
  $(OBJS)\coredll_scrthumb.o: ../../src/univ/scrthumb.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\coredll_slider.o: ../../src/univ/slider.cpp
-       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\coredll_stdrend.o: ../../src/univ/stdrend.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\coredll_theme.o: ../../src/univ/theme.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\coredll_toolbar.o: ../../src/univ/toolbar.cpp
-       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\coredll_topluniv.o: ../../src/univ/topluniv.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
  
@@ -11010,6 +11040,20 @@ $(OBJS)\coredll_dialog.o: ../../src/univ/dialog.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\coredll_gauge.o: ../../src/msw/gauge.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\coredll_gauge.o: ../../src/univ/gauge.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\coredll_listbox.o: ../../src/msw/listbox.cpp
@@ -11108,6 +11152,20 @@ $(OBJS)\coredll_scrolbar.o: ../../src/univ/scrolbar.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\coredll_slider.o: ../../src/msw/slider.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\coredll_slider.o: ../../src/univ/slider.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\coredll_spinbutt.o: ../../src/msw/spinbutt.cpp
@@ -11178,6 +11236,20 @@ $(OBJS)\coredll_stattext.o: ../../src/univ/stattext.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\coredll_toolbar.o: ../../src/msw/toolbar.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\coredll_toolbar.o: ../../src/univ/toolbar.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\coredll_textctrl.o: ../../src/msw/textctrl.cpp
@@ -11904,9 +11976,6 @@ $(OBJS)\corelib_filedlg.o: ../../src/msw/filedlg.cpp
  $(OBJS)\corelib_frame.o: ../../src/msw/frame.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\corelib_gauge95.o: ../../src/msw/gauge95.cpp
-       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\corelib_iniconf.o: ../../src/msw/iniconf.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
@@ -11934,21 +12003,15 @@ $(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp
  $(OBJS)\corelib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\corelib_slider95.o: ../../src/msw/slider95.cpp
-       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\corelib_spinctrl.o: ../../src/msw/spinctrl.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\corelib_statbr95.o: ../../src/msw/statbr95.cpp
+$(OBJS)\corelib_statusbar.o: ../../src/msw/statusbar.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\corelib_tabctrl.o: ../../src/msw/tabctrl.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(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) $<
  
@@ -11988,9 +12051,6 @@ $(OBJS)\corelib_ctrlrend.o: ../../src/univ/ctrlrend.cpp
  $(OBJS)\corelib_framuniv.o: ../../src/univ/framuniv.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\corelib_gauge.o: ../../src/univ/gauge.cpp
-       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\corelib_inpcons.o: ../../src/univ/inpcons.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
@@ -12003,18 +12063,12 @@ $(OBJS)\corelib_scrarrow.o: ../../src/univ/scrarrow.cpp
  $(OBJS)\corelib_scrthumb.o: ../../src/univ/scrthumb.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\corelib_slider.o: ../../src/univ/slider.cpp
-       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\corelib_stdrend.o: ../../src/univ/stdrend.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
  $(OBJS)\corelib_theme.o: ../../src/univ/theme.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
-$(OBJS)\corelib_toolbar.o: ../../src/univ/toolbar.cpp
-       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
  $(OBJS)\corelib_topluniv.o: ../../src/univ/topluniv.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
  
@@ -12424,6 +12478,20 @@ $(OBJS)\corelib_dialog.o: ../../src/univ/dialog.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\corelib_gauge.o: ../../src/msw/gauge.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\corelib_gauge.o: ../../src/univ/gauge.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\corelib_listbox.o: ../../src/msw/listbox.cpp
@@ -12522,6 +12590,20 @@ $(OBJS)\corelib_scrolbar.o: ../../src/univ/scrolbar.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\corelib_slider.o: ../../src/msw/slider.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\corelib_slider.o: ../../src/univ/slider.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\corelib_spinbutt.o: ../../src/msw/spinbutt.cpp
@@ -12592,6 +12674,20 @@ $(OBJS)\corelib_stattext.o: ../../src/univ/stattext.cpp
  endif
  endif
  
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),0)
+$(OBJS)\corelib_toolbar.o: ../../src/msw/toolbar.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
+ifeq ($(USE_GUI),1)
+ifeq ($(WXUNIV),1)
+$(OBJS)\corelib_toolbar.o: ../../src/univ/toolbar.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+endif
+
  ifeq ($(USE_GUI),1)
  ifeq ($(WXUNIV),0)
  $(OBJS)\corelib_textctrl.o: ../../src/msw/textctrl.cpp
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc

index d5a3c2bf914cad5fbcdcb6974d3c6aaad68690c1..a4a99aae7a92391899a7ade847debb4414b25bdd 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1716,7 +1716,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dragimag.obj \
         $(OBJS)\monodll_filedlg.obj \
         $(OBJS)\monodll_frame.obj \
-       $(OBJS)\monodll_gauge95.obj \
+       $(OBJS)\monodll_gauge.obj \
         $(OBJS)\monodll_iniconf.obj \
         $(OBJS)\monodll_listbox.obj \
         $(OBJS)\monodll_listctrl.obj \
@@ -1733,16 +1733,16 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_radiobox.obj \
         $(OBJS)\monodll_radiobut.obj \
         $(OBJS)\monodll_scrolbar.obj \
-       $(OBJS)\monodll_slider95.obj \
+       $(OBJS)\monodll_slider.obj \
         $(OBJS)\monodll_spinbutt.obj \
         $(OBJS)\monodll_spinctrl.obj \
         $(OBJS)\monodll_statbmp.obj \
         $(OBJS)\monodll_statbox.obj \
-       $(OBJS)\monodll_statbr95.obj \
+       $(OBJS)\monodll_statusbar.obj \
         $(OBJS)\monodll_statline.obj \
         $(OBJS)\monodll_stattext.obj \
         $(OBJS)\monodll_tabctrl.obj \
-       $(OBJS)\monodll_tbar95.obj \
+       $(OBJS)\monodll_toolbar.obj \
         $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_textentry.obj \
         $(OBJS)\monodll_tglbtn.obj \
@@ -2366,7 +2366,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dragimag.obj \
         $(OBJS)\monolib_filedlg.obj \
         $(OBJS)\monolib_frame.obj \
-       $(OBJS)\monolib_gauge95.obj \
+       $(OBJS)\monolib_gauge.obj \
         $(OBJS)\monolib_iniconf.obj \
         $(OBJS)\monolib_listbox.obj \
         $(OBJS)\monolib_listctrl.obj \
@@ -2383,16 +2383,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_radiobox.obj \
         $(OBJS)\monolib_radiobut.obj \
         $(OBJS)\monolib_scrolbar.obj \
-       $(OBJS)\monolib_slider95.obj \
+       $(OBJS)\monolib_slider.obj \
         $(OBJS)\monolib_spinbutt.obj \
         $(OBJS)\monolib_spinctrl.obj \
         $(OBJS)\monolib_statbmp.obj \
         $(OBJS)\monolib_statbox.obj \
-       $(OBJS)\monolib_statbr95.obj \
+       $(OBJS)\monolib_statusbar.obj \
         $(OBJS)\monolib_statline.obj \
         $(OBJS)\monolib_stattext.obj \
         $(OBJS)\monolib_tabctrl.obj \
-       $(OBJS)\monolib_tbar95.obj \
+       $(OBJS)\monolib_toolbar.obj \
         $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_textentry.obj \
         $(OBJS)\monolib_tglbtn.obj \
@@ -2955,7 +2955,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dragimag.obj \
         $(OBJS)\coredll_filedlg.obj \
         $(OBJS)\coredll_frame.obj \
-       $(OBJS)\coredll_gauge95.obj \
+       $(OBJS)\coredll_gauge.obj \
         $(OBJS)\coredll_iniconf.obj \
         $(OBJS)\coredll_listbox.obj \
         $(OBJS)\coredll_listctrl.obj \
@@ -2972,16 +2972,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_radiobox.obj \
         $(OBJS)\coredll_radiobut.obj \
         $(OBJS)\coredll_scrolbar.obj \
-       $(OBJS)\coredll_slider95.obj \
+       $(OBJS)\coredll_slider.obj \
         $(OBJS)\coredll_spinbutt.obj \
         $(OBJS)\coredll_spinctrl.obj \
         $(OBJS)\coredll_statbmp.obj \
         $(OBJS)\coredll_statbox.obj \
-       $(OBJS)\coredll_statbr95.obj \
+       $(OBJS)\coredll_statusbar.obj \
         $(OBJS)\coredll_statline.obj \
         $(OBJS)\coredll_stattext.obj \
         $(OBJS)\coredll_tabctrl.obj \
-       $(OBJS)\coredll_tbar95.obj \
+       $(OBJS)\coredll_toolbar.obj \
         $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_textentry.obj \
         $(OBJS)\coredll_tglbtn.obj \
@@ -3426,7 +3426,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dragimag.obj \
         $(OBJS)\corelib_filedlg.obj \
         $(OBJS)\corelib_frame.obj \
-       $(OBJS)\corelib_gauge95.obj \
+       $(OBJS)\corelib_gauge.obj \
         $(OBJS)\corelib_iniconf.obj \
         $(OBJS)\corelib_listbox.obj \
         $(OBJS)\corelib_listctrl.obj \
@@ -3443,16 +3443,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_radiobox.obj \
         $(OBJS)\corelib_radiobut.obj \
         $(OBJS)\corelib_scrolbar.obj \
-       $(OBJS)\corelib_slider95.obj \
+       $(OBJS)\corelib_slider.obj \
         $(OBJS)\corelib_spinbutt.obj \
         $(OBJS)\corelib_spinctrl.obj \
         $(OBJS)\corelib_statbmp.obj \
         $(OBJS)\corelib_statbox.obj \
-       $(OBJS)\corelib_statbr95.obj \
+       $(OBJS)\corelib_statusbar.obj \
         $(OBJS)\corelib_statline.obj \
         $(OBJS)\corelib_stattext.obj \
         $(OBJS)\corelib_tabctrl.obj \
-       $(OBJS)\corelib_tbar95.obj \
+       $(OBJS)\corelib_toolbar.obj \
         $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_textentry.obj \
         $(OBJS)\corelib_tglbtn.obj \
@@ -5874,9 +5874,6 @@ $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\monodll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
  $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
@@ -5904,21 +5901,15 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
  $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\monodll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
  $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\monodll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
  
  $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
  
-$(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
  $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
@@ -5958,9 +5949,6 @@ $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
  $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
  
@@ -5973,18 +5961,12 @@ $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
  $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
-
  $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
  $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
  
@@ -6682,6 +6664,16 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -6752,6 +6744,16 @@ $(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -6802,6 +6804,16 @@ $(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -7983,9 +7995,6 @@ $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\monolib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
  $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
@@ -8013,21 +8022,15 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
  $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\monolib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
  $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\monolib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
  
  $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
  
-$(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
  $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
@@ -8067,9 +8070,6 @@ $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
  $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
  
@@ -8082,18 +8082,12 @@ $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
  $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
-
  $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
  $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
  
@@ -8791,6 +8785,16 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -8861,6 +8865,16 @@ $(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -8911,6 +8925,16 @@ $(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -10476,9 +10500,6 @@ $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\coredll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
  $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
@@ -10506,21 +10527,15 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
  $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\coredll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
  $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\coredll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
  
  $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
  
-$(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
  $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
@@ -10560,9 +10575,6 @@ $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
  $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
  
@@ -10575,18 +10587,12 @@ $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
  $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
-
  $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
  $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
  
@@ -10960,6 +10966,16 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -11030,6 +11046,16 @@ $(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -11080,6 +11106,16 @@ $(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -11790,9 +11826,6 @@ $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\corelib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
  $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
@@ -11820,21 +11853,15 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
  $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\corelib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
  $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\corelib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
  
  $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
  
-$(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
  $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
@@ -11874,9 +11901,6 @@ $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
  $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
  
@@ -11889,18 +11913,12 @@ $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
  $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
-
  $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
  $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
  
@@ -12274,6 +12292,16 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -12344,6 +12372,16 @@ $(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -12394,6 +12432,16 @@ $(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
  !endif
  
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat

index d0569b7a58108c6a8534bd28a9bb42225195d9e4..e7c4ecd50dfdd264c08fccc9af48e033d25d7bb0 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -278,7 +278,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
         $(OBJS)\monodll_dragimag.obj &
         $(OBJS)\monodll_filedlg.obj &
         $(OBJS)\monodll_frame.obj &
-       $(OBJS)\monodll_gauge95.obj &
+       $(OBJS)\monodll_gauge.obj &
         $(OBJS)\monodll_iniconf.obj &
         $(OBJS)\monodll_listbox.obj &
         $(OBJS)\monodll_listctrl.obj &
@@ -295,16 +295,16 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
         $(OBJS)\monodll_radiobox.obj &
         $(OBJS)\monodll_radiobut.obj &
         $(OBJS)\monodll_scrolbar.obj &
-       $(OBJS)\monodll_slider95.obj &
+       $(OBJS)\monodll_slider.obj &
         $(OBJS)\monodll_spinbutt.obj &
         $(OBJS)\monodll_spinctrl.obj &
         $(OBJS)\monodll_statbmp.obj &
         $(OBJS)\monodll_statbox.obj &
-       $(OBJS)\monodll_statbr95.obj &
+       $(OBJS)\monodll_statusbar.obj &
         $(OBJS)\monodll_statline.obj &
         $(OBJS)\monodll_stattext.obj &
         $(OBJS)\monodll_tabctrl.obj &
-       $(OBJS)\monodll_tbar95.obj &
+       $(OBJS)\monodll_toolbar.obj &
         $(OBJS)\monodll_textctrl.obj &
         $(OBJS)\monodll_textentry.obj &
         $(OBJS)\monodll_tglbtn.obj &
@@ -933,7 +933,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
         $(OBJS)\monolib_dragimag.obj &
         $(OBJS)\monolib_filedlg.obj &
         $(OBJS)\monolib_frame.obj &
-       $(OBJS)\monolib_gauge95.obj &
+       $(OBJS)\monolib_gauge.obj &
         $(OBJS)\monolib_iniconf.obj &
         $(OBJS)\monolib_listbox.obj &
         $(OBJS)\monolib_listctrl.obj &
@@ -950,16 +950,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
         $(OBJS)\monolib_radiobox.obj &
         $(OBJS)\monolib_radiobut.obj &
         $(OBJS)\monolib_scrolbar.obj &
-       $(OBJS)\monolib_slider95.obj &
+       $(OBJS)\monolib_slider.obj &
         $(OBJS)\monolib_spinbutt.obj &
         $(OBJS)\monolib_spinctrl.obj &
         $(OBJS)\monolib_statbmp.obj &
         $(OBJS)\monolib_statbox.obj &
-       $(OBJS)\monolib_statbr95.obj &
+       $(OBJS)\monolib_statusbar.obj &
         $(OBJS)\monolib_statline.obj &
         $(OBJS)\monolib_stattext.obj &
         $(OBJS)\monolib_tabctrl.obj &
-       $(OBJS)\monolib_tbar95.obj &
+       $(OBJS)\monolib_toolbar.obj &
         $(OBJS)\monolib_textctrl.obj &
         $(OBJS)\monolib_textentry.obj &
         $(OBJS)\monolib_tglbtn.obj &
@@ -1519,7 +1519,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
         $(OBJS)\coredll_dragimag.obj &
         $(OBJS)\coredll_filedlg.obj &
         $(OBJS)\coredll_frame.obj &
-       $(OBJS)\coredll_gauge95.obj &
+       $(OBJS)\coredll_gauge.obj &
         $(OBJS)\coredll_iniconf.obj &
         $(OBJS)\coredll_listbox.obj &
         $(OBJS)\coredll_listctrl.obj &
@@ -1536,16 +1536,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
         $(OBJS)\coredll_radiobox.obj &
         $(OBJS)\coredll_radiobut.obj &
         $(OBJS)\coredll_scrolbar.obj &
-       $(OBJS)\coredll_slider95.obj &
+       $(OBJS)\coredll_slider.obj &
         $(OBJS)\coredll_spinbutt.obj &
         $(OBJS)\coredll_spinctrl.obj &
         $(OBJS)\coredll_statbmp.obj &
         $(OBJS)\coredll_statbox.obj &
-       $(OBJS)\coredll_statbr95.obj &
+       $(OBJS)\coredll_statusbar.obj &
         $(OBJS)\coredll_statline.obj &
         $(OBJS)\coredll_stattext.obj &
         $(OBJS)\coredll_tabctrl.obj &
-       $(OBJS)\coredll_tbar95.obj &
+       $(OBJS)\coredll_toolbar.obj &
         $(OBJS)\coredll_textctrl.obj &
         $(OBJS)\coredll_textentry.obj &
         $(OBJS)\coredll_tglbtn.obj &
@@ -1994,7 +1994,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
         $(OBJS)\corelib_dragimag.obj &
         $(OBJS)\corelib_filedlg.obj &
         $(OBJS)\corelib_frame.obj &
-       $(OBJS)\corelib_gauge95.obj &
+       $(OBJS)\corelib_gauge.obj &
         $(OBJS)\corelib_iniconf.obj &
         $(OBJS)\corelib_listbox.obj &
         $(OBJS)\corelib_listctrl.obj &
@@ -2011,16 +2011,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
         $(OBJS)\corelib_radiobox.obj &
         $(OBJS)\corelib_radiobut.obj &
         $(OBJS)\corelib_scrolbar.obj &
-       $(OBJS)\corelib_slider95.obj &
+       $(OBJS)\corelib_slider.obj &
         $(OBJS)\corelib_spinbutt.obj &
         $(OBJS)\corelib_spinctrl.obj &
         $(OBJS)\corelib_statbmp.obj &
         $(OBJS)\corelib_statbox.obj &
-       $(OBJS)\corelib_statbr95.obj &
+       $(OBJS)\corelib_statusbar.obj &
         $(OBJS)\corelib_statline.obj &
         $(OBJS)\corelib_stattext.obj &
         $(OBJS)\corelib_tabctrl.obj &
-       $(OBJS)\corelib_tbar95.obj &
+       $(OBJS)\corelib_toolbar.obj &
         $(OBJS)\corelib_textctrl.obj &
         $(OBJS)\corelib_textentry.obj &
         $(OBJS)\corelib_tglbtn.obj &
@@ -5916,9 +5916,6 @@ $(OBJS)\monodll_filedlg.obj :  .AUTODEPEND ..\..\src\msw\filedlg.cpp
  $(OBJS)\monodll_frame.obj :  .AUTODEPEND ..\..\src\msw\frame.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
-$(OBJS)\monodll_gauge95.obj :  .AUTODEPEND ..\..\src\msw\gauge95.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
  $(OBJS)\monodll_iniconf.obj :  .AUTODEPEND ..\..\src\msw\iniconf.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
@@ -5946,21 +5943,15 @@ $(OBJS)\monodll_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
  $(OBJS)\monodll_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
-$(OBJS)\monodll_slider95.obj :  .AUTODEPEND ..\..\src\msw\slider95.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
  $(OBJS)\monodll_spinctrl.obj :  .AUTODEPEND ..\..\src\msw\spinctrl.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
-$(OBJS)\monodll_statbr95.obj :  .AUTODEPEND ..\..\src\msw\statbr95.cpp
+$(OBJS)\monodll_statusbar.obj :  .AUTODEPEND ..\..\src\msw\statusbar.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
  $(OBJS)\monodll_tabctrl.obj :  .AUTODEPEND ..\..\src\msw\tabctrl.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
-$(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) $<
  
@@ -6000,9 +5991,6 @@ $(OBJS)\monodll_ctrlrend.obj :  .AUTODEPEND ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\monodll_framuniv.obj :  .AUTODEPEND ..\..\src\univ\framuniv.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
-$(OBJS)\monodll_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
  $(OBJS)\monodll_inpcons.obj :  .AUTODEPEND ..\..\src\univ\inpcons.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
@@ -6015,18 +6003,12 @@ $(OBJS)\monodll_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
  $(OBJS)\monodll_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
-$(OBJS)\monodll_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
  $(OBJS)\monodll_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
  $(OBJS)\monodll_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
-$(OBJS)\monodll_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
  $(OBJS)\monodll_topluniv.obj :  .AUTODEPEND ..\..\src\univ\topluniv.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
  
@@ -6760,6 +6742,20 @@ $(OBJS)\monodll_dialog.obj :  .AUTODEPEND ..\..\src\univ\dialog.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\monodll_gauge.obj :  .AUTODEPEND ..\..\src\msw\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\monodll_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\monodll_listbox.obj :  .AUTODEPEND ..\..\src\msw\listbox.cpp
@@ -6858,6 +6854,20 @@ $(OBJS)\monodll_scrolbar.obj :  .AUTODEPEND ..\..\src\univ\scrolbar.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\monodll_slider.obj :  .AUTODEPEND ..\..\src\msw\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\monodll_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\monodll_spinbutt.obj :  .AUTODEPEND ..\..\src\msw\spinbutt.cpp
@@ -6928,6 +6938,20 @@ $(OBJS)\monodll_stattext.obj :  .AUTODEPEND ..\..\src\univ\stattext.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\monodll_toolbar.obj :  .AUTODEPEND ..\..\src\msw\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\monodll_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\monodll_textctrl.obj :  .AUTODEPEND ..\..\src\msw\textctrl.cpp
@@ -8127,9 +8151,6 @@ $(OBJS)\monolib_filedlg.obj :  .AUTODEPEND ..\..\src\msw\filedlg.cpp
  $(OBJS)\monolib_frame.obj :  .AUTODEPEND ..\..\src\msw\frame.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
-$(OBJS)\monolib_gauge95.obj :  .AUTODEPEND ..\..\src\msw\gauge95.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
  $(OBJS)\monolib_iniconf.obj :  .AUTODEPEND ..\..\src\msw\iniconf.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
@@ -8157,21 +8178,15 @@ $(OBJS)\monolib_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
  $(OBJS)\monolib_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
-$(OBJS)\monolib_slider95.obj :  .AUTODEPEND ..\..\src\msw\slider95.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
  $(OBJS)\monolib_spinctrl.obj :  .AUTODEPEND ..\..\src\msw\spinctrl.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
-$(OBJS)\monolib_statbr95.obj :  .AUTODEPEND ..\..\src\msw\statbr95.cpp
+$(OBJS)\monolib_statusbar.obj :  .AUTODEPEND ..\..\src\msw\statusbar.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
  $(OBJS)\monolib_tabctrl.obj :  .AUTODEPEND ..\..\src\msw\tabctrl.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
-$(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) $<
  
@@ -8211,9 +8226,6 @@ $(OBJS)\monolib_ctrlrend.obj :  .AUTODEPEND ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\monolib_framuniv.obj :  .AUTODEPEND ..\..\src\univ\framuniv.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
-$(OBJS)\monolib_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
  $(OBJS)\monolib_inpcons.obj :  .AUTODEPEND ..\..\src\univ\inpcons.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
@@ -8226,18 +8238,12 @@ $(OBJS)\monolib_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
  $(OBJS)\monolib_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
-$(OBJS)\monolib_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
  $(OBJS)\monolib_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
  $(OBJS)\monolib_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
-$(OBJS)\monolib_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
  $(OBJS)\monolib_topluniv.obj :  .AUTODEPEND ..\..\src\univ\topluniv.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
  
@@ -8971,6 +8977,20 @@ $(OBJS)\monolib_dialog.obj :  .AUTODEPEND ..\..\src\univ\dialog.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\monolib_gauge.obj :  .AUTODEPEND ..\..\src\msw\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\monolib_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\monolib_listbox.obj :  .AUTODEPEND ..\..\src\msw\listbox.cpp
@@ -9069,6 +9089,20 @@ $(OBJS)\monolib_scrolbar.obj :  .AUTODEPEND ..\..\src\univ\scrolbar.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\monolib_slider.obj :  .AUTODEPEND ..\..\src\msw\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\monolib_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\monolib_spinbutt.obj :  .AUTODEPEND ..\..\src\msw\spinbutt.cpp
@@ -9139,6 +9173,20 @@ $(OBJS)\monolib_stattext.obj :  .AUTODEPEND ..\..\src\univ\stattext.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\monolib_toolbar.obj :  .AUTODEPEND ..\..\src\msw\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\monolib_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\monolib_textctrl.obj :  .AUTODEPEND ..\..\src\msw\textctrl.cpp
@@ -10722,9 +10770,6 @@ $(OBJS)\coredll_filedlg.obj :  .AUTODEPEND ..\..\src\msw\filedlg.cpp
  $(OBJS)\coredll_frame.obj :  .AUTODEPEND ..\..\src\msw\frame.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
-$(OBJS)\coredll_gauge95.obj :  .AUTODEPEND ..\..\src\msw\gauge95.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
  $(OBJS)\coredll_iniconf.obj :  .AUTODEPEND ..\..\src\msw\iniconf.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
@@ -10752,21 +10797,15 @@ $(OBJS)\coredll_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
  $(OBJS)\coredll_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
-$(OBJS)\coredll_slider95.obj :  .AUTODEPEND ..\..\src\msw\slider95.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
  $(OBJS)\coredll_spinctrl.obj :  .AUTODEPEND ..\..\src\msw\spinctrl.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
-$(OBJS)\coredll_statbr95.obj :  .AUTODEPEND ..\..\src\msw\statbr95.cpp
+$(OBJS)\coredll_statusbar.obj :  .AUTODEPEND ..\..\src\msw\statusbar.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
  $(OBJS)\coredll_tabctrl.obj :  .AUTODEPEND ..\..\src\msw\tabctrl.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
-$(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) $<
  
@@ -10806,9 +10845,6 @@ $(OBJS)\coredll_ctrlrend.obj :  .AUTODEPEND ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\coredll_framuniv.obj :  .AUTODEPEND ..\..\src\univ\framuniv.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
-$(OBJS)\coredll_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
  $(OBJS)\coredll_inpcons.obj :  .AUTODEPEND ..\..\src\univ\inpcons.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
@@ -10821,18 +10857,12 @@ $(OBJS)\coredll_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
  $(OBJS)\coredll_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
-$(OBJS)\coredll_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
  $(OBJS)\coredll_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
  $(OBJS)\coredll_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
-$(OBJS)\coredll_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
  $(OBJS)\coredll_topluniv.obj :  .AUTODEPEND ..\..\src\univ\topluniv.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
  
@@ -11242,6 +11272,20 @@ $(OBJS)\coredll_dialog.obj :  .AUTODEPEND ..\..\src\univ\dialog.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\coredll_gauge.obj :  .AUTODEPEND ..\..\src\msw\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\coredll_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\coredll_listbox.obj :  .AUTODEPEND ..\..\src\msw\listbox.cpp
@@ -11340,6 +11384,20 @@ $(OBJS)\coredll_scrolbar.obj :  .AUTODEPEND ..\..\src\univ\scrolbar.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\coredll_slider.obj :  .AUTODEPEND ..\..\src\msw\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\coredll_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\coredll_spinbutt.obj :  .AUTODEPEND ..\..\src\msw\spinbutt.cpp
@@ -11410,6 +11468,20 @@ $(OBJS)\coredll_stattext.obj :  .AUTODEPEND ..\..\src\univ\stattext.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\coredll_toolbar.obj :  .AUTODEPEND ..\..\src\msw\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\coredll_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\coredll_textctrl.obj :  .AUTODEPEND ..\..\src\msw\textctrl.cpp
@@ -12136,9 +12208,6 @@ $(OBJS)\corelib_filedlg.obj :  .AUTODEPEND ..\..\src\msw\filedlg.cpp
  $(OBJS)\corelib_frame.obj :  .AUTODEPEND ..\..\src\msw\frame.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
-$(OBJS)\corelib_gauge95.obj :  .AUTODEPEND ..\..\src\msw\gauge95.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
  $(OBJS)\corelib_iniconf.obj :  .AUTODEPEND ..\..\src\msw\iniconf.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
@@ -12166,21 +12235,15 @@ $(OBJS)\corelib_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
  $(OBJS)\corelib_ownerdrw.obj :  .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
-$(OBJS)\corelib_slider95.obj :  .AUTODEPEND ..\..\src\msw\slider95.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
  $(OBJS)\corelib_spinctrl.obj :  .AUTODEPEND ..\..\src\msw\spinctrl.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
-$(OBJS)\corelib_statbr95.obj :  .AUTODEPEND ..\..\src\msw\statbr95.cpp
+$(OBJS)\corelib_statusbar.obj :  .AUTODEPEND ..\..\src\msw\statusbar.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
  $(OBJS)\corelib_tabctrl.obj :  .AUTODEPEND ..\..\src\msw\tabctrl.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
-$(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) $<
  
@@ -12220,9 +12283,6 @@ $(OBJS)\corelib_ctrlrend.obj :  .AUTODEPEND ..\..\src\univ\ctrlrend.cpp
  $(OBJS)\corelib_framuniv.obj :  .AUTODEPEND ..\..\src\univ\framuniv.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
-$(OBJS)\corelib_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
  $(OBJS)\corelib_inpcons.obj :  .AUTODEPEND ..\..\src\univ\inpcons.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
@@ -12235,18 +12295,12 @@ $(OBJS)\corelib_scrarrow.obj :  .AUTODEPEND ..\..\src\univ\scrarrow.cpp
  $(OBJS)\corelib_scrthumb.obj :  .AUTODEPEND ..\..\src\univ\scrthumb.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
-$(OBJS)\corelib_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
  $(OBJS)\corelib_stdrend.obj :  .AUTODEPEND ..\..\src\univ\stdrend.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
  $(OBJS)\corelib_theme.obj :  .AUTODEPEND ..\..\src\univ\theme.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
-$(OBJS)\corelib_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
  $(OBJS)\corelib_topluniv.obj :  .AUTODEPEND ..\..\src\univ\topluniv.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
  
@@ -12656,6 +12710,20 @@ $(OBJS)\corelib_dialog.obj :  .AUTODEPEND ..\..\src\univ\dialog.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\corelib_gauge.obj :  .AUTODEPEND ..\..\src\msw\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\corelib_gauge.obj :  .AUTODEPEND ..\..\src\univ\gauge.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\corelib_listbox.obj :  .AUTODEPEND ..\..\src\msw\listbox.cpp
@@ -12754,6 +12822,20 @@ $(OBJS)\corelib_scrolbar.obj :  .AUTODEPEND ..\..\src\univ\scrolbar.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\corelib_slider.obj :  .AUTODEPEND ..\..\src\msw\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\corelib_slider.obj :  .AUTODEPEND ..\..\src\univ\slider.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\corelib_spinbutt.obj :  .AUTODEPEND ..\..\src\msw\spinbutt.cpp
@@ -12824,6 +12906,20 @@ $(OBJS)\corelib_stattext.obj :  .AUTODEPEND ..\..\src\univ\stattext.cpp
  !endif
  !endif
  
+!ifeq USE_GUI 1
+!ifeq WXUNIV 0
+$(OBJS)\corelib_toolbar.obj :  .AUTODEPEND ..\..\src\msw\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+!endif
+
+!ifeq USE_GUI 1
+!ifeq WXUNIV 1
+$(OBJS)\corelib_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+!endif
+
  !ifeq USE_GUI 1
  !ifeq WXUNIV 0
  $(OBJS)\corelib_textctrl.obj :  .AUTODEPEND ..\..\src\msw\textctrl.cpp
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp

index af4ace255a4ef8cdf343298bbc5f430ee4808cda..7b12b93c4e62646a586314113172ceb6b79af589 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -1388,7 +1388,7 @@ SOURCE=..\..\src\msw\frame.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\gauge95.cpp\r
+SOURCE=..\..\src\msw\gauge.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -2028,7 +2028,7 @@ SOURCE=..\..\src\msw\settings.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\slider95.cpp\r
+SOURCE=..\..\src\msw\slider.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -2203,7 +2203,7 @@ SOURCE=..\..\src\msw\statbox.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\statbr95.cpp\r
+SOURCE=..\..\src\msw\statline.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -2238,7 +2238,7 @@ SOURCE=..\..\src\msw\statbr95.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\statline.cpp\r
+SOURCE=..\..\src\msw\stattext.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -2273,7 +2273,7 @@ SOURCE=..\..\src\msw\statline.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\stattext.cpp\r
+SOURCE=..\..\src\msw\statusbar.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -2343,7 +2343,7 @@ SOURCE=..\..\src\msw\tabctrl.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\tbar95.cpp\r
+SOURCE=..\..\src\msw\textctrl.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -2378,7 +2378,7 @@ SOURCE=..\..\src\msw\tbar95.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\textctrl.cpp\r
+SOURCE=..\..\src\msw\textentry.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -2413,7 +2413,7 @@ SOURCE=..\..\src\msw\textctrl.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\textentry.cpp\r
+SOURCE=..\..\src\msw\tglbtn.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -2448,7 +2448,7 @@ SOURCE=..\..\src\msw\textentry.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\msw\tglbtn.cpp\r
+SOURCE=..\..\src\msw\toolbar.cpp\r
  \r
  !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
  \r
@@ -4828,7 +4828,7 @@ SOURCE=..\..\include\wx\msw\frame.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\msw\gauge95.h\r
+SOURCE=..\..\include\wx\msw\gauge.h\r
  # End Source File\r
  # Begin Source File\r
  \r
@@ -5055,7 +5055,7 @@ SOURCE=..\..\include\wx\msw\setup0.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\msw\slider95.h\r
+SOURCE=..\..\include\wx\msw\slider.h\r
  # End Source File\r
  # Begin Source File\r
  \r
@@ -5079,10 +5079,6 @@ SOURCE=..\..\include\wx\msw\statbox.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\msw\statbr95.h\r
-# End Source File\r
-# Begin Source File\r
-\r
  SOURCE=..\..\include\wx\msw\statline.h\r
  # End Source File\r
  # Begin Source File\r
@@ -5091,15 +5087,15 @@ SOURCE=..\..\include\wx\msw\stattext.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\msw\tabctrl.h\r
+SOURCE=..\..\include\wx\msw\statusbar.h\r
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\msw\taskbar.h\r
+SOURCE=..\..\include\wx\msw\tabctrl.h\r
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\msw\tbar95.h\r
+SOURCE=..\..\include\wx\msw\taskbar.h\r
  # End Source File\r
  # Begin Source File\r
  \r
@@ -5115,6 +5111,10 @@ SOURCE=..\..\include\wx\msw\tglbtn.h
  # End Source File\r
  # Begin Source File\r
  \r
+SOURCE=..\..\include\wx\msw\toolbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\msw\tooltip.h\r
  # End Source File\r
  # Begin Source File\r
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj

index 25241e418ab5a262e0ed875865f4256b27f099b0..5b97a3ea311458de8bc6ac68bd521f04656dbb3f 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1162,7 +1162,7 @@
                                         ExcludedFromBuild="true"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\gauge95.cpp">\r
+                               RelativePath="..\..\src\msw\gauge.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -1442,7 +1442,7 @@
                         <File\r
                                 RelativePath="..\..\src\msw\settings.cpp"/>\r
                         <File\r
-                               RelativePath="..\..\src\msw\slider95.cpp">\r
+                               RelativePath="..\..\src\msw\slider.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -1517,7 +1517,7 @@
                                         ExcludedFromBuild="true"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\statbr95.cpp">\r
+                               RelativePath="..\..\src\msw\statline.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -1532,7 +1532,7 @@
                                         ExcludedFromBuild="true"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\statline.cpp">\r
+                               RelativePath="..\..\src\msw\stattext.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -1547,7 +1547,7 @@
                                         ExcludedFromBuild="true"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\stattext.cpp">\r
+                               RelativePath="..\..\src\msw\statusbar.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -1577,7 +1577,7 @@
                                         ExcludedFromBuild="true"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\tbar95.cpp">\r
+                               RelativePath="..\..\src\msw\textctrl.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -1592,7 +1592,7 @@
                                         ExcludedFromBuild="true"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\textctrl.cpp">\r
+                               RelativePath="..\..\src\msw\textentry.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -1607,7 +1607,7 @@
                                         ExcludedFromBuild="true"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\textentry.cpp">\r
+                               RelativePath="..\..\src\msw\tglbtn.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -1622,7 +1622,7 @@
                                         ExcludedFromBuild="true"/>\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\msw\tglbtn.cpp">\r
+                               RelativePath="..\..\src\msw\toolbar.cpp">\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Release|Win32"\r
                                         ExcludedFromBuild="true"/>\r
@@ -2708,7 +2708,7 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\frame.h"/>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\gauge95.h"/>\r
+                               RelativePath="..\..\include\wx\msw\gauge.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\gdiimage.h"/>\r
                         <File\r
@@ -2853,7 +2853,7 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup0.h"/>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\slider95.h"/>\r
+                               RelativePath="..\..\include\wx\msw\slider.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\sound.h"/>\r
                         <File\r
@@ -2864,24 +2864,24 @@
                                 RelativePath="..\..\include\wx\msw\statbmp.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\statbox.h"/>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\statbr95.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\statline.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\stattext.h"/>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\statusbar.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\tabctrl.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\taskbar.h"/>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tbar95.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\textctrl.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\textentry.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\tglbtn.h"/>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h"/>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\tooltip.h"/>\r
                         <File\r
diff --git a/include/wx/gauge.h b/include/wx/gauge.h

index 11605c9d1a14942148c4306c098f936668bb9a07..6a6317a5f25c7a4dda9a9e72d095f1e0592a0925 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -106,8 +106,7 @@ protected:
  #if defined(__WXUNIVERSAL__)
      #include "wx/univ/gauge.h"
  #elif defined(__WXMSW__)
-    #include "wx/msw/gauge95.h"
-    #define wxGauge wxGauge95
+    #include "wx/msw/gauge.h"
  #elif defined(__WXMOTIF__)
      #include "wx/motif/gauge.h"
  #elif defined(__WXGTK20__)
diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h

new file mode 100644 (file)

index 0000000..b3c434a
--- /dev/null
+++ b/include/wx/msw/gauge.h
@@ -0,0 +1,72 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/gauge.h
+// Purpose:     wxGauge implementation for MSW
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_GAUGE_H_
+#define _WX_MSW_GAUGE_H_
+
+#if wxUSE_GAUGE
+
+extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[];
+
+// Group box
+class WXDLLEXPORT wxGauge : public wxGaugeBase
+{
+public:
+    wxGauge() { }
+
+    wxGauge(wxWindow *parent,
+            wxWindowID id,
+            int range,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxGA_HORIZONTAL,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxGaugeNameStr)
+    {
+        (void)Create(parent, id, range, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                int range,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxGA_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxGaugeNameStr);
+
+    // set gauge range/value
+    virtual void SetRange(int range);
+    virtual void SetValue(int pos);
+
+    // overriden base class virtuals
+    virtual bool SetForegroundColour(const wxColour& col);
+    virtual bool SetBackgroundColour(const wxColour& col);
+
+
+    void SetIndeterminateMode();
+    void SetDeterminateMode();
+    void Pulse();
+
+    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
+};
+
+#endif // wxUSE_GAUGE
+
+#endif // _WX_MSW_GAUGE_H_
diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h

deleted file mode 100644 (file)

index 26919ab..0000000
--- a/include/wx/msw/gauge95.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        gauge95.h
-// Purpose:     wxGauge95 class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _GAUGE95_H_
-#define _GAUGE95_H_
-
-#if wxUSE_GAUGE
-
-extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[];
-
-// Group box
-class WXDLLEXPORT wxGauge95 : public wxGaugeBase
-{
-public:
-    wxGauge95() { }
-
-    wxGauge95(wxWindow *parent,
-              wxWindowID id,
-              int range,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = wxGA_HORIZONTAL,
-              const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxGaugeNameStr)
-    {
-        (void)Create(parent, id, range, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                int range,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxGA_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxGaugeNameStr);
-
-    // set gauge range/value
-    virtual void SetRange(int range);
-    virtual void SetValue(int pos);
-
-    // overriden base class virtuals
-    virtual bool SetForegroundColour(const wxColour& col);
-    virtual bool SetBackgroundColour(const wxColour& col);
-
-
-    void SetIndeterminateMode();
-    void SetDeterminateMode();
-    void Pulse();
-
-    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
-};
-
-#endif // wxUSE_GAUGE
-
-#endif
-    // _GAUGEMSW_H_
diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h

new file mode 100644 (file)

index 0000000..4dfe3dd
--- /dev/null
+++ b/include/wx/msw/slider.h
@@ -0,0 +1,136 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/slider.h
+// Purpose:     wxSlider class implementation using trackbar control
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SLIDER_H_
+#define _WX_SLIDER_H_
+
+class WXDLLIMPEXP_FWD_CORE wxSubwindows;
+
+// Slider
+class WXDLLEXPORT wxSlider : public wxSliderBase
+{
+public:
+    wxSlider() { Init(); }
+
+    wxSlider(wxWindow *parent,
+             wxWindowID id,
+             int value,
+             int minValue,
+             int maxValue,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxSL_HORIZONTAL,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxSliderNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, value, minValue, maxValue,
+                     pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                int value,
+                int minValue, int maxValue,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSL_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxSliderNameStr);
+
+    virtual ~wxSlider();
+
+    // slider methods
+    virtual int GetValue() const;
+    virtual void SetValue(int);
+
+    void SetRange(int minValue, int maxValue);
+
+    int GetMin() const { return m_rangeMin; }
+    int GetMax() const { return m_rangeMax; }
+
+    // Win32-specific slider methods
+    void SetTickFreq(int n, int pos);
+    int GetTickFreq() const { return m_tickFreq; }
+    void SetPageSize(int pageSize);
+    int GetPageSize() const;
+    void ClearSel();
+    void ClearTicks();
+    void SetLineSize(int lineSize);
+    int GetLineSize() const;
+    int GetSelEnd() const;
+    int GetSelStart() const;
+    void SetSelection(int minPos, int maxPos);
+    void SetThumbLength(int len);
+    int GetThumbLength() const;
+    void SetTick(int tickPos);
+
+    // implementation only from now on
+    WXHWND GetStaticMin() const;
+    WXHWND GetStaticMax() const;
+    WXHWND GetEditValue() const;
+    virtual bool ContainsHWND(WXHWND hWnd) const;
+
+    // we should let background show through the slider (and its labels)
+    virtual bool HasTransparentBackground() { return true; }
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+
+    void Command(wxCommandEvent& event);
+    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
+                             WXWORD pos, WXHWND control);
+
+    virtual bool Show(bool show = true);
+    virtual bool Enable(bool show = true);
+    virtual bool SetFont(const wxFont& font);
+
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    // format an integer value as string
+    static wxString Format(int n) { return wxString::Format(_T("%d"), n); }
+
+    // get the boundig box for the slider and possible labels
+    wxRect GetBoundingBox() const;
+
+    // get the height and, if the pointer is not NULL, width of our labels
+    int GetLabelsSize(int *width = NULL) const;
+
+
+    // overridden base class virtuals
+    virtual void DoGetPosition(int *x, int *y) const;
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual wxSize DoGetBestSize() const;
+
+    // the labels windows, if any
+    wxSubwindows  *m_labels;
+
+    int           m_rangeMin;
+    int           m_rangeMax;
+    int           m_pageSize;
+    int           m_lineSize;
+    int           m_tickFreq;
+
+    // flag needed to detect whether we're getting THUMBRELEASE event because
+    // of dragging the thumb or scrolling the mouse wheel
+    bool m_isDragging;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
+};
+
+#endif // _WX_SLIDER_H_
+
diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h

deleted file mode 100644 (file)

index 7d50a97..0000000
--- a/include/wx/msw/slider95.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/slider95.h
-// Purpose:     wxSlider class, using the Win95 (and later) trackbar control
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SLIDER95_H_
-#define _WX_SLIDER95_H_
-
-class WXDLLIMPEXP_FWD_CORE wxSubwindows;
-
-// Slider
-class WXDLLEXPORT wxSlider : public wxSliderBase
-{
-public:
-    wxSlider() { Init(); }
-
-    wxSlider(wxWindow *parent,
-             wxWindowID id,
-             int value,
-             int minValue,
-             int maxValue,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = wxSL_HORIZONTAL,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxSliderNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, value, minValue, maxValue,
-                     pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                int value,
-                int minValue, int maxValue,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSL_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
-
-    virtual ~wxSlider();
-
-    // slider methods
-    virtual int GetValue() const;
-    virtual void SetValue(int);
-
-    void SetRange(int minValue, int maxValue);
-
-    int GetMin() const { return m_rangeMin; }
-    int GetMax() const { return m_rangeMax; }
-
-    // Win32-specific slider methods
-    void SetTickFreq(int n, int pos);
-    int GetTickFreq() const { return m_tickFreq; }
-    void SetPageSize(int pageSize);
-    int GetPageSize() const;
-    void ClearSel();
-    void ClearTicks();
-    void SetLineSize(int lineSize);
-    int GetLineSize() const;
-    int GetSelEnd() const;
-    int GetSelStart() const;
-    void SetSelection(int minPos, int maxPos);
-    void SetThumbLength(int len);
-    int GetThumbLength() const;
-    void SetTick(int tickPos);
-
-    // implementation only from now on
-    WXHWND GetStaticMin() const;
-    WXHWND GetStaticMax() const;
-    WXHWND GetEditValue() const;
-    virtual bool ContainsHWND(WXHWND hWnd) const;
-
-    // we should let background show through the slider (and its labels)
-    virtual bool HasTransparentBackground() { return true; }
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-    void Command(wxCommandEvent& event);
-    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
-                             WXWORD pos, WXHWND control);
-
-    virtual bool Show(bool show = true);
-    virtual bool Enable(bool show = true);
-    virtual bool SetFont(const wxFont& font);
-
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // format an integer value as string
-    static wxString Format(int n) { return wxString::Format(_T("%d"), n); }
-
-    // get the boundig box for the slider and possible labels
-    wxRect GetBoundingBox() const;
-
-    // get the height and, if the pointer is not NULL, width of our labels
-    int GetLabelsSize(int *width = NULL) const;
-
-
-    // overridden base class virtuals
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual wxSize DoGetBestSize() const;
-
-    // the labels windows, if any
-    wxSubwindows  *m_labels;
-
-    int           m_rangeMin;
-    int           m_rangeMax;
-    int           m_pageSize;
-    int           m_lineSize;
-    int           m_tickFreq;
-
-    // flag needed to detect whether we're getting THUMBRELEASE event because
-    // of dragging the thumb or scrolling the mouse wheel
-    bool m_isDragging;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
-};
-
-#endif // _WX_SLIDER95_H_
-
diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h

deleted file mode 100644 (file)

index 3b26a1f..0000000
--- a/include/wx/msw/statbr95.h
+++ /dev/null
@@ -1,77 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/statbr95.h
-// Purpose:     native implementation of wxStatusBar
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     04.04.98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef   _STATBR95_H
-#define   _STATBR95_H
-
-#if wxUSE_NATIVE_STATUSBAR
-
-class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase
-{
-public:
-    // ctors and such
-    wxStatusBar95();
-    wxStatusBar95(wxWindow *parent,
-                  wxWindowID id = wxID_ANY,
-                  long style = wxST_SIZEGRIP,
-                  const wxString& name = wxStatusBarNameStr)
-    {
-        (void)Create(parent, id, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                long style = wxST_SIZEGRIP,
-                const wxString& name = wxStatusBarNameStr);
-
-    virtual ~wxStatusBar95();
-
-    // a status line can have several (<256) fields numbered from 0
-    virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
-
-    // each field of status line has it's own text
-    virtual void     SetStatusText(const wxString& text, int number = 0);
-    virtual wxString GetStatusText(int number = 0) const;
-
-    // set status line fields' widths
-    virtual void SetStatusWidths(int n, const int widths_field[]);
-
-    // set status line fields' styles
-    virtual void SetStatusStyles(int n, const int styles[]);
-
-    // sets the minimal vertical size of the status bar
-    virtual void SetMinHeight(int height);
-
-    // get the position and size of the field's internal bounding rectangle
-    virtual bool GetFieldRect(int i, wxRect& rect) const;
-
-    // get the border size
-    virtual int GetBorderX() const;
-    virtual int GetBorderY() const;
-
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
-                                    WXWPARAM wParam,
-                                    WXLPARAM lParam);
-protected:
-    void CopyFieldsWidth(const int widths[]);
-    void SetFieldsWidth();
-
-    // override some base class virtuals
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
-};
-
-#endif  // wxUSE_NATIVE_STATUSBAR
-
-#endif
diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h

new file mode 100644 (file)

index 0000000..3882203
--- /dev/null
+++ b/include/wx/msw/statusbar.h
@@ -0,0 +1,77 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/statbr.h
+// Purpose:     native implementation of wxStatusBar
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     04.04.98
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_STATUSBAR_H_
+#define _WX_MSW_STATUSBAR_H_
+
+#if wxUSE_NATIVE_STATUSBAR
+
+class WXDLLEXPORT wxStatusBar : public wxStatusBarBase
+{
+public:
+    // ctors and such
+    wxStatusBar();
+    wxStatusBar(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxStatusBarNameStr)
+    {
+        (void)Create(parent, id, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxStatusBarNameStr);
+
+    virtual ~wxStatusBar();
+
+    // a status line can have several (<256) fields numbered from 0
+    virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
+
+    // each field of status line has it's own text
+    virtual void     SetStatusText(const wxString& text, int number = 0);
+    virtual wxString GetStatusText(int number = 0) const;
+
+    // set status line fields' widths
+    virtual void SetStatusWidths(int n, const int widths_field[]);
+
+    // set status line fields' styles
+    virtual void SetStatusStyles(int n, const int styles[]);
+
+    // sets the minimal vertical size of the status bar
+    virtual void SetMinHeight(int height);
+
+    // get the position and size of the field's internal bounding rectangle
+    virtual bool GetFieldRect(int i, wxRect& rect) const;
+
+    // get the border size
+    virtual int GetBorderX() const;
+    virtual int GetBorderY() const;
+
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam);
+protected:
+    void CopyFieldsWidth(const int widths[]);
+    void SetFieldsWidth();
+
+    // override some base class virtuals
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar)
+};
+
+#endif  // wxUSE_NATIVE_STATUSBAR
+
+#endif // _WX_MSW_STATUSBAR_H_
diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h

deleted file mode 100644 (file)

index 92fcfd7..0000000
--- a/include/wx/msw/tbar95.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/tbar95.h
-// Purpose:     wxToolBar (Windows 95 toolbar) class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_TBAR95_H_
-#define _WX_MSW_TBAR95_H_
-
-#if wxUSE_TOOLBAR
-
-#include "wx/dynarray.h"
-#include "wx/imaglist.h"
-
-class WXDLLEXPORT wxToolBar : public wxToolBarBase
-{
-public:
-    // ctors and dtor
-    wxToolBar() { Init(); }
-
-    wxToolBar(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                const wxString& name = wxToolBarNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                const wxString& name = wxToolBarNameStr);
-
-    virtual ~wxToolBar();
-
-    // override/implement base class virtuals
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-
-    virtual bool Realize();
-
-    virtual void SetToolBitmapSize(const wxSize& size);
-    virtual wxSize GetToolSize() const;
-
-    virtual void SetRows(int nRows);
-
-    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
-    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
-
-    // implementation only from now on
-    // -------------------------------
-
-    virtual void SetWindowStyleFlag(long style);
-
-    virtual bool MSWCommand(WXUINT param, WXWORD id);
-    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
-    void OnMouseEvent(wxMouseEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-    void OnEraseBackground(wxEraseEvent& event);
-
-    void SetFocus() {}
-
-    static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
-
-    // override WndProc mainly to process WM_SIZE
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // create the native toolbar control
-    bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size);
-
-    // recreate the control completely
-    void Recreate();
-
-    // implement base class pure virtuals
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
-    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled,
-                                          wxItemKind kind,
-                                          wxObject *clientData,
-                                          const wxString& shortHelp,
-                                          const wxString& longHelp);
-
-    virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
-
-    // return the appropriate size and flags for the toolbar control
-    virtual wxSize DoGetBestSize() const;
-
-    // handlers for various events
-    bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
-    bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
-    void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
-
-    // should be called whenever the toolbar size changes
-    void UpdateSize();
-
-    // create m_disabledImgList (but doesn't fill it), set it to NULL if it is
-    // unneeded
-    void CreateDisabledImageList();
-
-    // get the Windows toolbar style of this control
-    long GetMSWToolbarStyle() const;
-
-
-    // the big bitmap containing all bitmaps of the toolbar buttons
-    WXHBITMAP m_hBitmap;
-
-    // the image list with disabled images, may be NULL if we use
-    // system-provided versions of them
-    wxImageList *m_disabledImgList;
-
-    // the total number of toolbar elements
-    size_t m_nButtons;
-
-    // the tool the cursor is in
-    wxToolBarToolBase *m_pInTool;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
-    DECLARE_NO_COPY_CLASS(wxToolBar)
-};
-
-#endif // wxUSE_TOOLBAR
-
-#endif // _WX_MSW_TBAR95_H_
-
diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h

new file mode 100644 (file)

index 0000000..92fcfd7
--- /dev/null
+++ b/include/wx/msw/toolbar.h
@@ -0,0 +1,155 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/tbar95.h
+// Purpose:     wxToolBar (Windows 95 toolbar) class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_TBAR95_H_
+#define _WX_MSW_TBAR95_H_
+
+#if wxUSE_TOOLBAR
+
+#include "wx/dynarray.h"
+#include "wx/imaglist.h"
+
+class WXDLLEXPORT wxToolBar : public wxToolBarBase
+{
+public:
+    // ctors and dtor
+    wxToolBar() { Init(); }
+
+    wxToolBar(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                const wxString& name = wxToolBarNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                const wxString& name = wxToolBarNameStr);
+
+    virtual ~wxToolBar();
+
+    // override/implement base class virtuals
+    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
+
+    virtual bool Realize();
+
+    virtual void SetToolBitmapSize(const wxSize& size);
+    virtual wxSize GetToolSize() const;
+
+    virtual void SetRows(int nRows);
+
+    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+
+    // implementation only from now on
+    // -------------------------------
+
+    virtual void SetWindowStyleFlag(long style);
+
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+
+    void OnMouseEvent(wxMouseEvent& event);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
+    void OnEraseBackground(wxEraseEvent& event);
+
+    void SetFocus() {}
+
+    static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
+
+    // override WndProc mainly to process WM_SIZE
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    // create the native toolbar control
+    bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size);
+
+    // recreate the control completely
+    void Recreate();
+
+    // implement base class pure virtuals
+    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
+    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+
+    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
+    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
+    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+
+    virtual wxToolBarToolBase *CreateTool(int id,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
+                                          wxObject *clientData,
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
+
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
+
+    // return the appropriate size and flags for the toolbar control
+    virtual wxSize DoGetBestSize() const;
+
+    // handlers for various events
+    bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
+    bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
+    void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
+
+    // should be called whenever the toolbar size changes
+    void UpdateSize();
+
+    // create m_disabledImgList (but doesn't fill it), set it to NULL if it is
+    // unneeded
+    void CreateDisabledImageList();
+
+    // get the Windows toolbar style of this control
+    long GetMSWToolbarStyle() const;
+
+
+    // the big bitmap containing all bitmaps of the toolbar buttons
+    WXHBITMAP m_hBitmap;
+
+    // the image list with disabled images, may be NULL if we use
+    // system-provided versions of them
+    wxImageList *m_disabledImgList;
+
+    // the total number of toolbar elements
+    size_t m_nButtons;
+
+    // the tool the cursor is in
+    wxToolBarToolBase *m_pInTool;
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    DECLARE_NO_COPY_CLASS(wxToolBar)
+};
+
+#endif // wxUSE_TOOLBAR
+
+#endif // _WX_MSW_TBAR95_H_
+
diff --git a/include/wx/slider.h b/include/wx/slider.h

index 14aca4445b102050a1a30e140d9021118d0f8dc6..c48b0044733c7332010b387e1234ffc5dd68538a 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -128,7 +128,7 @@ private:
  #if defined(__WXUNIVERSAL__)
      #include "wx/univ/slider.h"
  #elif defined(__WXMSW__)
-    #include "wx/msw/slider95.h"
+    #include "wx/msw/slider.h"
  #elif defined(__WXMOTIF__)
      #include "wx/motif/slider.h"
  #elif defined(__WXGTK20__)
diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h

index be584f3c8948c9501c4040e86f70162aecd385f9..d1f666a055cf2bd0bd76180f373864c2276d5eca 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -158,9 +158,7 @@ protected:
  
      #include "wx/palmos/statusbr.h"
  #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
-    #define wxStatusBar95 wxStatusBar
-
-    #include "wx/msw/statbr95.h"
+    #include "wx/msw/statusbar.h"
  #elif defined(__WXMAC__)
      #define wxStatusBarMac wxStatusBar
  
diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h

index 3949098df509e22321e4f739eb4a64c207ee31f5..cb1c66eb456e2150bdae8114bbfe967697372c62 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -71,7 +71,7 @@ enum
      #elif defined(__WXPALMOS__)
         #include "wx/palmos/toolbar.h"
      #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
-       #include "wx/msw/tbar95.h"
+       #include "wx/msw/toolbar.h"
      #elif defined(__WXWINCE__)
         #include "wx/msw/wince/tbarwce.h"
      #elif defined(__WXMOTIF__)
diff --git a/src/msw/gauge.cpp b/src/msw/gauge.cpp

new file mode 100644 (file)

index 0000000..9a26e9b
--- /dev/null
+++ b/src/msw/gauge.cpp
@@ -0,0 +1,276 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/gauge95.cpp
+// Purpose:     wxGauge class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_GAUGE
+
+#include "wx/gauge.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+#endif
+
+#include "wx/msw/private.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// old commctrl.h (< 4.71) don't have those
+#ifndef PBS_SMOOTH
+    #define PBS_SMOOTH 0x01
+#endif
+
+#ifndef PBS_VERTICAL
+    #define PBS_VERTICAL 0x04
+#endif
+
+#ifndef PBM_SETBARCOLOR
+    #define PBM_SETBARCOLOR         (WM_USER+9)
+#endif
+
+#ifndef PBM_SETBKCOLOR
+    #define PBM_SETBKCOLOR          0x2001
+#endif
+
+#ifndef PBS_MARQUEE
+    #define PBS_MARQUEE             0x08
+#endif
+
+#ifndef PBM_SETMARQUEE
+    #define PBM_SETMARQUEE          (WM_USER+10)
+#endif
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxGaugeStyle )
+
+wxBEGIN_FLAGS( wxGaugeStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxGA_HORIZONTAL)
+    wxFLAGS_MEMBER(wxGA_VERTICAL)
+#if WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
+#endif // WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxGA_SMOOTH)
+
+wxEND_FLAGS( wxGaugeStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGauge)
+    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxGaugeStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxGauge)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxGauge , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
+#endif
+
+// ============================================================================
+// wxGauge implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxGauge creation
+// ----------------------------------------------------------------------------
+
+bool wxGauge::Create(wxWindow *parent,
+                     wxWindowID id,
+                     int range,
+                     const wxPoint& pos,
+                     const wxSize& size,
+                     long style,
+                     const wxValidator& validator,
+                     const wxString& name)
+{
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    if ( !MSWCreateControl(PROGRESS_CLASS, wxEmptyString, pos, size) )
+        return false;
+
+    SetRange(range);
+
+    // in case we need to emulate indeterminate mode...
+    m_nDirection = wxRIGHT;
+
+    return true;
+}
+
+WXDWORD wxGauge::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
+
+    if ( style & wxGA_VERTICAL )
+        msStyle |= PBS_VERTICAL;
+
+    if ( style & wxGA_SMOOTH )
+        msStyle |= PBS_SMOOTH;
+
+    return msStyle;
+}
+
+// ----------------------------------------------------------------------------
+// wxGauge geometry
+// ----------------------------------------------------------------------------
+
+wxSize wxGauge::DoGetBestSize() const
+{
+    // VZ: no idea where does 28 come from, it was there before my changes and
+    //     as nobody ever complained I guess we can leave it...
+    if (HasFlag(wxGA_VERTICAL))
+        return wxSize(28, 100);
+    else
+        return wxSize(100, 28);
+}
+
+// ----------------------------------------------------------------------------
+// wxGauge setters
+// ----------------------------------------------------------------------------
+
+void wxGauge::SetRange(int r)
+{
+    // switch to determinate mode if required
+    SetDeterminateMode();
+
+    m_rangeMax = r;
+
+#ifdef PBM_SETRANGE32
+    ::SendMessage(GetHwnd(), PBM_SETRANGE32, 0, r);
+#else // !PBM_SETRANGE32
+    // fall back to PBM_SETRANGE (limited to 16 bits)
+    ::SendMessage(GetHwnd(), PBM_SETRANGE, 0, MAKELPARAM(0, r));
+#endif // PBM_SETRANGE32/!PBM_SETRANGE32
+}
+
+void wxGauge::SetValue(int pos)
+{
+    // switch to determinate mode if required
+    SetDeterminateMode();
+
+    m_gaugePos = pos;
+
+    ::SendMessage(GetHwnd(), PBM_SETPOS, pos, 0);
+}
+
+bool wxGauge::SetForegroundColour(const wxColour& col)
+{
+    if ( !wxControl::SetForegroundColour(col) )
+        return false;
+
+    ::SendMessage(GetHwnd(), PBM_SETBARCOLOR, 0, (LPARAM)wxColourToRGB(col));
+
+    return true;
+}
+
+bool wxGauge::SetBackgroundColour(const wxColour& col)
+{
+    if ( !wxControl::SetBackgroundColour(col) )
+        return false;
+
+    ::SendMessage(GetHwnd(), PBM_SETBKCOLOR, 0, (LPARAM)wxColourToRGB(col));
+
+    return true;
+}
+
+void wxGauge::SetIndeterminateMode()
+{
+    // add the PBS_MARQUEE style to the progress bar
+    LONG style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+    if ((style & PBS_MARQUEE) == 0)
+        ::SetWindowLong(GetHwnd(), GWL_STYLE, style|PBS_MARQUEE);
+
+    // now the control can only run in indeterminate mode
+}
+
+void wxGauge::SetDeterminateMode()
+{
+    // remove the PBS_MARQUEE style to the progress bar
+    LONG style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+    if ((style & PBS_MARQUEE) != 0)
+        ::SetWindowLong(GetHwnd(), GWL_STYLE, style & ~PBS_MARQUEE);
+
+    // now the control can only run in determinate mode
+}
+
+void wxGauge::Pulse()
+{
+    if (wxApp::GetComCtl32Version() >= 600)
+    {
+        // switch to indeterminate mode if required
+        SetIndeterminateMode();
+
+        // NOTE: when in indeterminate mode, the PBM_SETPOS message will just make
+        //       the bar's blocks move a bit and the WPARAM value is just ignored
+        //       so that we can safely use zero
+        SendMessage(GetHwnd(), (UINT) PBM_SETPOS, (WPARAM)0, (LPARAM)0);
+    }
+    else
+    {
+        // emulate indeterminate mode
+        wxGaugeBase::Pulse();
+    }
+}
+
+#endif // wxUSE_GAUGE
diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp

deleted file mode 100644 (file)

index 6f8d872..0000000
--- a/src/msw/gauge95.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/gauge95.cpp
-// Purpose:     wxGauge95 class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_GAUGE
-
-#include "wx/gauge.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-#endif
-
-#include "wx/msw/private.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// old commctrl.h (< 4.71) don't have those
-#ifndef PBS_SMOOTH
-    #define PBS_SMOOTH 0x01
-#endif
-
-#ifndef PBS_VERTICAL
-    #define PBS_VERTICAL 0x04
-#endif
-
-#ifndef PBM_SETBARCOLOR
-    #define PBM_SETBARCOLOR         (WM_USER+9)
-#endif
-
-#ifndef PBM_SETBKCOLOR
-    #define PBM_SETBKCOLOR          0x2001
-#endif
-
-#ifndef PBS_MARQUEE
-    #define PBS_MARQUEE             0x08
-#endif
-
-#ifndef PBM_SETMARQUEE
-    #define PBM_SETMARQUEE          (WM_USER+10)
-#endif
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxGaugeStyle )
-
-wxBEGIN_FLAGS( wxGaugeStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxGA_HORIZONTAL)
-    wxFLAGS_MEMBER(wxGA_VERTICAL)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxGA_SMOOTH)
-
-wxEND_FLAGS( wxGaugeStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGauge95)
-    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxGaugeStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxGauge95)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxGauge95 , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
-#endif
-
-// ============================================================================
-// wxGauge95 implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxGauge95 creation
-// ----------------------------------------------------------------------------
-
-bool wxGauge95::Create(wxWindow *parent,
-                       wxWindowID id,
-                       int range,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxValidator& validator,
-                       const wxString& name)
-{
-    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    if ( !MSWCreateControl(PROGRESS_CLASS, wxEmptyString, pos, size) )
-        return false;
-
-    SetRange(range);
-
-    // in case we need to emulate indeterminate mode...
-    m_nDirection = wxRIGHT;
-
-    return true;
-}
-
-WXDWORD wxGauge95::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
-
-    if ( style & wxGA_VERTICAL )
-        msStyle |= PBS_VERTICAL;
-
-    if ( style & wxGA_SMOOTH )
-        msStyle |= PBS_SMOOTH;
-
-    return msStyle;
-}
-
-// ----------------------------------------------------------------------------
-// wxGauge95 geometry
-// ----------------------------------------------------------------------------
-
-wxSize wxGauge95::DoGetBestSize() const
-{
-    // VZ: no idea where does 28 come from, it was there before my changes and
-    //     as nobody ever complained I guess we can leave it...
-    if (HasFlag(wxGA_VERTICAL))
-        return wxSize(28, 100);
-    else
-        return wxSize(100, 28);
-}
-
-// ----------------------------------------------------------------------------
-// wxGauge95 setters
-// ----------------------------------------------------------------------------
-
-void wxGauge95::SetRange(int r)
-{
-    // switch to determinate mode if required
-    SetDeterminateMode();
-
-    m_rangeMax = r;
-
-#ifdef PBM_SETRANGE32
-    ::SendMessage(GetHwnd(), PBM_SETRANGE32, 0, r);
-#else // !PBM_SETRANGE32
-    // fall back to PBM_SETRANGE (limited to 16 bits)
-    ::SendMessage(GetHwnd(), PBM_SETRANGE, 0, MAKELPARAM(0, r));
-#endif // PBM_SETRANGE32/!PBM_SETRANGE32
-}
-
-void wxGauge95::SetValue(int pos)
-{
-    // switch to determinate mode if required
-    SetDeterminateMode();
-
-    m_gaugePos = pos;
-
-    ::SendMessage(GetHwnd(), PBM_SETPOS, pos, 0);
-}
-
-bool wxGauge95::SetForegroundColour(const wxColour& col)
-{
-    if ( !wxControl::SetForegroundColour(col) )
-        return false;
-
-    ::SendMessage(GetHwnd(), PBM_SETBARCOLOR, 0, (LPARAM)wxColourToRGB(col));
-
-    return true;
-}
-
-bool wxGauge95::SetBackgroundColour(const wxColour& col)
-{
-    if ( !wxControl::SetBackgroundColour(col) )
-        return false;
-
-    ::SendMessage(GetHwnd(), PBM_SETBKCOLOR, 0, (LPARAM)wxColourToRGB(col));
-
-    return true;
-}
-
-void wxGauge95::SetIndeterminateMode()
-{
-    // add the PBS_MARQUEE style to the progress bar
-    LONG style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-    if ((style & PBS_MARQUEE) == 0)
-        ::SetWindowLong(GetHwnd(), GWL_STYLE, style|PBS_MARQUEE);
-
-    // now the control can only run in indeterminate mode
-}
-
-void wxGauge95::SetDeterminateMode()
-{
-    // remove the PBS_MARQUEE style to the progress bar
-    LONG style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-    if ((style & PBS_MARQUEE) != 0)
-        ::SetWindowLong(GetHwnd(), GWL_STYLE, style & ~PBS_MARQUEE);
-
-    // now the control can only run in determinate mode
-}
-
-void wxGauge95::Pulse()
-{
-    if (wxApp::GetComCtl32Version() >= 600)
-    {
-        // switch to indeterminate mode if required
-        SetIndeterminateMode();
-
-        // NOTE: when in indeterminate mode, the PBM_SETPOS message will just make
-        //       the bar's blocks move a bit and the WPARAM value is just ignored
-        //       so that we can safely use zero
-        SendMessage(GetHwnd(), (UINT) PBM_SETPOS, (WPARAM)0, (LPARAM)0);
-    }
-    else
-    {
-        // emulate indeterminate mode
-        wxGaugeBase::Pulse();
-    }
-}
-
-#endif // wxUSE_GAUGE
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp

index f641e35638f0ff91ba154d3b922633e6e42e1fb9..4dd4bcc41c26154e2aea8c82163e80a1314dd628 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -44,10 +44,6 @@
  #include "wx/stockitem.h"
  #include "wx/msw/private.h"
  
-#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
-    #include "wx/msw/statbr95.h"
-#endif
-
  #include <string.h>
  
  // ---------------------------------------------------------------------------
diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp

new file mode 100644 (file)

index 0000000..5eabd63
--- /dev/null
+++ b/src/msw/slider.cpp
@@ -0,0 +1,692 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/slider.cpp
+// Purpose:     wxSlider, using the Win95 (and later) trackbar control
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart 1998
+//                  Vadim Zeitlin 2004
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_SLIDER
+
+#include "wx/slider.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/brush.h"
+#endif
+
+#include "wx/msw/subwin.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// indices of labels in wxSlider::m_labels
+enum
+{
+    SliderLabel_Min,
+    SliderLabel_Max,
+    SliderLabel_Value,
+    SliderLabel_Last
+};
+
+// the gap between the slider and the labels, in pixels
+static const int HGAP = 5;
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxSliderStyle )
+
+wxBEGIN_FLAGS( wxSliderStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSL_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSL_VERTICAL)
+    wxFLAGS_MEMBER(wxSL_AUTOTICKS)
+    wxFLAGS_MEMBER(wxSL_LABELS)
+    wxFLAGS_MEMBER(wxSL_LEFT)
+    wxFLAGS_MEMBER(wxSL_TOP)
+    wxFLAGS_MEMBER(wxSL_RIGHT)
+    wxFLAGS_MEMBER(wxSL_BOTTOM)
+    wxFLAGS_MEMBER(wxSL_BOTH)
+    wxFLAGS_MEMBER(wxSL_SELRANGE)
+    wxFLAGS_MEMBER(wxSL_INVERSE)
+
+wxEND_FLAGS( wxSliderStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/slider.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSlider)
+    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )
+    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
+
+    wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxSlider)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_8( wxSlider , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
+#endif
+
+// ============================================================================
+// wxSlider implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// construction
+// ----------------------------------------------------------------------------
+
+void wxSlider::Init()
+{
+    m_labels = NULL;
+
+    m_pageSize = 1;
+    m_lineSize = 1;
+    m_rangeMax = 0;
+    m_rangeMin = 0;
+    m_tickFreq = 0;
+
+    m_isDragging = false;
+}
+
+bool
+wxSlider::Create(wxWindow *parent,
+                 wxWindowID id,
+                 int value,
+                 int minValue,
+                 int maxValue,
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 long style,
+                 const wxValidator& validator,
+                 const wxString& name)
+{
+    // our styles are redundant: wxSL_LEFT/RIGHT imply wxSL_VERTICAL and
+    // wxSL_TOP/BOTTOM imply wxSL_HORIZONTAL, but for backwards compatibility
+    // reasons we can't really change it, instead try to infer the orientation
+    // from the flags given to us here
+    switch ( style & (wxSL_LEFT | wxSL_RIGHT | wxSL_TOP | wxSL_BOTTOM) )
+    {
+        case wxSL_LEFT:
+        case wxSL_RIGHT:
+            style |= wxSL_VERTICAL;
+            break;
+
+        case wxSL_TOP:
+        case wxSL_BOTTOM:
+            style |= wxSL_HORIZONTAL;
+            break;
+
+        case 0:
+            // no specific direction, do we have at least the orientation?
+            if ( !(style & (wxSL_HORIZONTAL | wxSL_VERTICAL)) )
+            {
+                // no, choose default
+                style |= wxSL_BOTTOM | wxSL_HORIZONTAL;
+            }
+    };
+
+    wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL),
+                    _T("incompatible slider direction and orientation") );
+
+
+    // initialize everything
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    // ensure that we have correct values for GetLabelsSize()
+    m_rangeMin = minValue;
+    m_rangeMax = maxValue;
+
+    // create the labels first, so that our DoGetBestSize() could take them
+    // into account
+    //
+    // note that we could simply create 3 wxStaticTexts here but it could
+    // result in some observable side effects at wx level (e.g. the parent of
+    // wxSlider would have 3 more children than expected) and so we prefer not
+    // to do it like this
+    if ( m_windowStyle & wxSL_LABELS )
+    {
+        m_labels = new wxSubwindows(SliderLabel_Last);
+
+        HWND hwndParent = GetHwndOf(parent);
+        for ( size_t n = 0; n < SliderLabel_Last; n++ )
+        {
+            wxWindowIDRef lblid = NewControlId();
+
+            HWND wnd = ::CreateWindow
+                         (
+                            wxT("STATIC"),
+                            NULL,
+                            WS_CHILD | WS_VISIBLE | SS_CENTER,
+                            0, 0, 0, 0,
+                            hwndParent,
+                            (HMENU)wxUIntToPtr(lblid.GetValue()),
+                            wxGetInstance(),
+                            NULL
+                         );
+
+            m_labels->Set(n, wnd, lblid);
+        }
+
+        m_labels->SetFont(GetFont());
+    }
+
+    // now create the main control too
+    if ( !MSWCreateControl(TRACKBAR_CLASS, wxEmptyString, pos, size) )
+        return false;
+
+    // and initialize everything
+    SetRange(minValue, maxValue);
+    SetValue(value);
+    SetPageSize((maxValue - minValue)/10);
+
+    // we need to position the labels correctly if we have them and if
+    // SetSize() hadn't been called before (when best size was determined by
+    // MSWCreateControl()) as in this case they haven't been put in place yet
+    if ( m_labels && size.x != wxDefaultCoord && size.y != wxDefaultCoord )
+    {
+        SetSize(size);
+    }
+
+    return true;
+}
+
+WXDWORD wxSlider::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
+
+    // TBS_HORZ, TBS_RIGHT and TBS_BOTTOM are 0 but do include them for clarity
+    msStyle |= style & wxSL_VERTICAL ? TBS_VERT : TBS_HORZ;
+
+    if ( style & wxSL_BOTH )
+    {
+        // this fully specifies the style combined with TBS_VERT/HORZ above
+        msStyle |= TBS_BOTH;
+    }
+    else // choose one direction
+    {
+        if ( style & wxSL_LEFT )
+            msStyle |= TBS_LEFT;
+        else if ( style & wxSL_RIGHT )
+            msStyle |= TBS_RIGHT;
+        else if ( style & wxSL_TOP )
+            msStyle |= TBS_TOP;
+        else if ( style & wxSL_BOTTOM )
+            msStyle |= TBS_BOTTOM;
+    }
+
+    if ( style & wxSL_AUTOTICKS )
+        msStyle |= TBS_AUTOTICKS;
+    else
+        msStyle |= TBS_NOTICKS;
+
+    if ( style & wxSL_SELRANGE )
+        msStyle |= TBS_ENABLESELRANGE;
+
+    return msStyle;
+}
+
+wxSlider::~wxSlider()
+{
+    delete m_labels;
+}
+
+// ----------------------------------------------------------------------------
+// event handling
+// ----------------------------------------------------------------------------
+
+bool wxSlider::MSWOnScroll(int WXUNUSED(orientation),
+                           WXWORD wParam,
+                           WXWORD WXUNUSED(pos),
+                           WXHWND control)
+{
+    wxEventType scrollEvent;
+    switch ( wParam )
+    {
+        case SB_TOP:
+            scrollEvent = wxEVT_SCROLL_TOP;
+            break;
+
+        case SB_BOTTOM:
+            scrollEvent = wxEVT_SCROLL_BOTTOM;
+            break;
+
+        case SB_LINEUP:
+            scrollEvent = wxEVT_SCROLL_LINEUP;
+            break;
+
+        case SB_LINEDOWN:
+            scrollEvent = wxEVT_SCROLL_LINEDOWN;
+            break;
+
+        case SB_PAGEUP:
+            scrollEvent = wxEVT_SCROLL_PAGEUP;
+            break;
+
+        case SB_PAGEDOWN:
+            scrollEvent = wxEVT_SCROLL_PAGEDOWN;
+            break;
+
+        case SB_THUMBTRACK:
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+            m_isDragging = true;
+            break;
+
+        case SB_THUMBPOSITION:
+            if ( m_isDragging )
+            {
+                scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+                m_isDragging = false;
+            }
+            else
+            {
+                // this seems to only happen when the mouse wheel is used: in
+                // this case, as it might be unexpected to get THUMBRELEASE
+                // without preceding THUMBTRACKs, we don't generate it at all
+                // but generate CHANGED event because the control itself does
+                // not send us SB_ENDSCROLL for whatever reason when mouse
+                // wheel is used
+                scrollEvent = wxEVT_SCROLL_CHANGED;
+            }
+            break;
+
+        case SB_ENDSCROLL:
+            scrollEvent = wxEVT_SCROLL_CHANGED;
+            break;
+
+        default:
+            // unknown scroll event?
+            return false;
+    }
+
+    int newPos = ValueInvertOrNot((int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0));
+    if ( (newPos < GetMin()) || (newPos > GetMax()) )
+    {
+        // out of range - but we did process it
+        return true;
+    }
+
+    SetValue(newPos);
+
+    wxScrollEvent event(scrollEvent, m_windowId);
+    event.SetPosition(newPos);
+    event.SetEventObject( this );
+    HandleWindowEvent(event);
+
+    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+    cevent.SetInt( newPos );
+    cevent.SetEventObject( this );
+
+    return HandleWindowEvent( cevent );
+}
+
+void wxSlider::Command (wxCommandEvent & event)
+{
+    SetValue (event.GetInt());
+    ProcessCommand (event);
+}
+
+// ----------------------------------------------------------------------------
+// geometry stuff
+// ----------------------------------------------------------------------------
+
+wxRect wxSlider::GetBoundingBox() const
+{
+    // take care not to call our own functions which would call us recursively
+    int x, y, w, h;
+    wxSliderBase::DoGetPosition(&x, &y);
+    wxSliderBase::DoGetSize(&w, &h);
+
+    wxRect rect(x, y, w, h);
+    if ( m_labels )
+    {
+        wxRect lrect = m_labels->GetBoundingBox();
+        GetParent()->ScreenToClient(&lrect.x, &lrect.y);
+        rect.Union(lrect);
+    }
+
+    return rect;
+}
+
+void wxSlider::DoGetSize(int *width, int *height) const
+{
+    wxRect rect = GetBoundingBox();
+
+    if ( width )
+        *width = rect.width;
+    if ( height )
+        *height = rect.height;
+}
+
+void wxSlider::DoGetPosition(int *x, int *y) const
+{
+    wxRect rect = GetBoundingBox();
+
+    if ( x )
+        *x = rect.x;
+    if ( y )
+        *y = rect.y;
+}
+
+int wxSlider::GetLabelsSize(int *width) const
+{
+    int cy;
+
+    if ( width )
+    {
+        // find the max label width
+        int wLabelMin, wLabelMax;
+        GetTextExtent(Format(m_rangeMin), &wLabelMin, &cy);
+        GetTextExtent(Format(m_rangeMax), &wLabelMax, &cy);
+
+        *width = wxMax(wLabelMin, wLabelMax);
+    }
+    else
+    {
+        cy = GetCharHeight();
+    }
+
+    return EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+}
+
+void wxSlider::DoMoveWindow(int x, int y, int width, int height)
+{
+    // all complications below are because we need to position the labels,
+    // without them everything is easy
+    if ( !m_labels )
+    {
+        wxSliderBase::DoMoveWindow(x, y, width, height);
+        return;
+    }
+
+    // be careful to position the slider itself after moving the labels as
+    // otherwise our GetBoundingBox(), which is called from WM_SIZE handler,
+    // would return a wrong result and wrong size would be cached internally
+    if ( HasFlag(wxSL_VERTICAL) )
+    {
+        int wLabel;
+        int hLabel = GetLabelsSize(&wLabel);
+
+        int xLabel = HasFlag(wxSL_LEFT) ? x + width - wLabel : x;
+
+        // position all labels: min at the top, value in the middle and max at
+        // the bottom
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
+                     xLabel, y, wLabel, hLabel);
+
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
+                     xLabel, y + (height - hLabel)/2, wLabel, hLabel);
+
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
+                      xLabel, y + height - hLabel, wLabel, hLabel);
+
+        // position the slider itself along the left/right edge
+        wxSliderBase::DoMoveWindow(HasFlag(wxSL_LEFT) ? x : x + wLabel + HGAP,
+                                   y + hLabel/2,
+                                   width - wLabel - HGAP,
+                                   height - hLabel);
+    }
+    else // horizontal
+    {
+        int wLabel;
+        int hLabel = GetLabelsSize(&wLabel);
+
+        int yLabel = HasFlag(wxSL_TOP) ? y + height - hLabel : y;
+
+        // position all labels: min on the left, value in the middle and max to
+        // the right
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
+                      x, yLabel, wLabel, hLabel);
+
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
+                      x + (width - wLabel)/2, yLabel, wLabel, hLabel);
+
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
+                      x + width - wLabel, yLabel, wLabel, hLabel);
+
+        // position the slider itself along the top/bottom edge
+        wxSliderBase::DoMoveWindow(x,
+                                   HasFlag(wxSL_TOP) ? y : y + hLabel,
+                                   width,
+                                   height - hLabel);
+    }
+}
+
+wxSize wxSlider::DoGetBestSize() const
+{
+    // these values are arbitrary
+    static const int length = 100;
+    static const int thumb = 24;
+    static const int ticks = 8;
+
+    int *width;
+    wxSize size;
+    if ( HasFlag(wxSL_VERTICAL) )
+    {
+        size.x = thumb;
+        size.y = length;
+        width = &size.x;
+
+        if ( m_labels )
+        {
+            int wLabel;
+            int hLabel = GetLabelsSize(&wLabel);
+
+            // account for the labels
+            size.x += HGAP + wLabel;
+
+            // labels are indented relative to the slider itself
+            size.y += hLabel;
+        }
+    }
+    else // horizontal
+    {
+        size.x = length;
+        size.y = thumb;
+        width = &size.y;
+
+        if ( m_labels )
+        {
+            // labels add extra height
+            size.y += GetLabelsSize();
+        }
+    }
+
+    // need extra space to show ticks
+    if ( HasFlag(wxSL_TICKS) )
+    {
+        *width += ticks;
+
+        // and maybe twice as much if we show them on both sides
+        if ( HasFlag(wxSL_BOTH) )
+            *width += ticks;
+    }
+
+    return size;
+}
+
+// ----------------------------------------------------------------------------
+// slider-specific methods
+// ----------------------------------------------------------------------------
+
+int wxSlider::GetValue() const
+{
+    return ValueInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0));
+}
+
+void wxSlider::SetValue(int value)
+{
+    ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value));
+
+    if ( m_labels )
+    {
+        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).wx_str());
+    }
+}
+
+void wxSlider::SetRange(int minValue, int maxValue)
+{
+    m_rangeMin = minValue;
+    m_rangeMax = maxValue;
+
+    ::SendMessage(GetHwnd(), TBM_SETRANGEMIN, TRUE, m_rangeMin);
+    ::SendMessage(GetHwnd(), TBM_SETRANGEMAX, TRUE, m_rangeMax);
+
+    if ( m_labels )
+    {
+        ::SetWindowText((*m_labels)[SliderLabel_Min],
+                        Format(ValueInvertOrNot(m_rangeMin)).wx_str());
+        ::SetWindowText((*m_labels)[SliderLabel_Max],
+                        Format(ValueInvertOrNot(m_rangeMax)).wx_str());
+    }
+}
+
+void wxSlider::SetTickFreq(int n, int pos)
+{
+    m_tickFreq = n;
+    ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );
+}
+
+void wxSlider::SetPageSize(int pageSize)
+{
+    ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
+    m_pageSize = pageSize;
+}
+
+int wxSlider::GetPageSize() const
+{
+    return m_pageSize;
+}
+
+void wxSlider::ClearSel()
+{
+    ::SendMessage(GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0);
+}
+
+void wxSlider::ClearTicks()
+{
+    ::SendMessage(GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0);
+}
+
+void wxSlider::SetLineSize(int lineSize)
+{
+    m_lineSize = lineSize;
+    ::SendMessage(GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize);
+}
+
+int wxSlider::GetLineSize() const
+{
+    return (int)::SendMessage(GetHwnd(), TBM_GETLINESIZE, 0, 0);
+}
+
+int wxSlider::GetSelEnd() const
+{
+    return (int)::SendMessage(GetHwnd(), TBM_GETSELEND, 0, 0);
+}
+
+int wxSlider::GetSelStart() const
+{
+    return (int)::SendMessage(GetHwnd(), TBM_GETSELSTART, 0, 0);
+}
+
+void wxSlider::SetSelection(int minPos, int maxPos)
+{
+    ::SendMessage(GetHwnd(), TBM_SETSEL,
+                  (WPARAM) TRUE /* redraw */,
+                  (LPARAM) MAKELONG( minPos, maxPos) );
+}
+
+void wxSlider::SetThumbLength(int len)
+{
+    ::SendMessage(GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0);
+}
+
+int wxSlider::GetThumbLength() const
+{
+    return (int)::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, 0, 0);
+}
+
+void wxSlider::SetTick(int tickPos)
+{
+    ::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
+}
+
+// ----------------------------------------------------------------------------
+// composite control methods
+// ----------------------------------------------------------------------------
+
+WXHWND wxSlider::GetStaticMin() const
+{
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Min] : NULL;
+}
+
+WXHWND wxSlider::GetStaticMax() const
+{
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Max] : NULL;
+}
+
+WXHWND wxSlider::GetEditValue() const
+{
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL;
+}
+
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxSlider, wxSliderBase, m_labels)
+
+#endif // wxUSE_SLIDER
diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp

deleted file mode 100644 (file)

index 5eabd63..0000000
--- a/src/msw/slider95.cpp
+++ /dev/null
@@ -1,692 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/slider.cpp
-// Purpose:     wxSlider, using the Win95 (and later) trackbar control
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart 1998
-//                  Vadim Zeitlin 2004
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_SLIDER
-
-#include "wx/slider.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-    #include "wx/brush.h"
-#endif
-
-#include "wx/msw/subwin.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// indices of labels in wxSlider::m_labels
-enum
-{
-    SliderLabel_Min,
-    SliderLabel_Max,
-    SliderLabel_Value,
-    SliderLabel_Last
-};
-
-// the gap between the slider and the labels, in pixels
-static const int HGAP = 5;
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxSliderStyle )
-
-wxBEGIN_FLAGS( wxSliderStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSL_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSL_VERTICAL)
-    wxFLAGS_MEMBER(wxSL_AUTOTICKS)
-    wxFLAGS_MEMBER(wxSL_LABELS)
-    wxFLAGS_MEMBER(wxSL_LEFT)
-    wxFLAGS_MEMBER(wxSL_TOP)
-    wxFLAGS_MEMBER(wxSL_RIGHT)
-    wxFLAGS_MEMBER(wxSL_BOTTOM)
-    wxFLAGS_MEMBER(wxSL_BOTH)
-    wxFLAGS_MEMBER(wxSL_SELRANGE)
-    wxFLAGS_MEMBER(wxSL_INVERSE)
-
-wxEND_FLAGS( wxSliderStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/slider.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSlider)
-    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )
-    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
-
-    wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxSlider)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_8( wxSlider , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-#endif
-
-// ============================================================================
-// wxSlider implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// construction
-// ----------------------------------------------------------------------------
-
-void wxSlider::Init()
-{
-    m_labels = NULL;
-
-    m_pageSize = 1;
-    m_lineSize = 1;
-    m_rangeMax = 0;
-    m_rangeMin = 0;
-    m_tickFreq = 0;
-
-    m_isDragging = false;
-}
-
-bool
-wxSlider::Create(wxWindow *parent,
-                 wxWindowID id,
-                 int value,
-                 int minValue,
-                 int maxValue,
-                 const wxPoint& pos,
-                 const wxSize& size,
-                 long style,
-                 const wxValidator& validator,
-                 const wxString& name)
-{
-    // our styles are redundant: wxSL_LEFT/RIGHT imply wxSL_VERTICAL and
-    // wxSL_TOP/BOTTOM imply wxSL_HORIZONTAL, but for backwards compatibility
-    // reasons we can't really change it, instead try to infer the orientation
-    // from the flags given to us here
-    switch ( style & (wxSL_LEFT | wxSL_RIGHT | wxSL_TOP | wxSL_BOTTOM) )
-    {
-        case wxSL_LEFT:
-        case wxSL_RIGHT:
-            style |= wxSL_VERTICAL;
-            break;
-
-        case wxSL_TOP:
-        case wxSL_BOTTOM:
-            style |= wxSL_HORIZONTAL;
-            break;
-
-        case 0:
-            // no specific direction, do we have at least the orientation?
-            if ( !(style & (wxSL_HORIZONTAL | wxSL_VERTICAL)) )
-            {
-                // no, choose default
-                style |= wxSL_BOTTOM | wxSL_HORIZONTAL;
-            }
-    };
-
-    wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL),
-                    _T("incompatible slider direction and orientation") );
-
-
-    // initialize everything
-    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    // ensure that we have correct values for GetLabelsSize()
-    m_rangeMin = minValue;
-    m_rangeMax = maxValue;
-
-    // create the labels first, so that our DoGetBestSize() could take them
-    // into account
-    //
-    // note that we could simply create 3 wxStaticTexts here but it could
-    // result in some observable side effects at wx level (e.g. the parent of
-    // wxSlider would have 3 more children than expected) and so we prefer not
-    // to do it like this
-    if ( m_windowStyle & wxSL_LABELS )
-    {
-        m_labels = new wxSubwindows(SliderLabel_Last);
-
-        HWND hwndParent = GetHwndOf(parent);
-        for ( size_t n = 0; n < SliderLabel_Last; n++ )
-        {
-            wxWindowIDRef lblid = NewControlId();
-
-            HWND wnd = ::CreateWindow
-                         (
-                            wxT("STATIC"),
-                            NULL,
-                            WS_CHILD | WS_VISIBLE | SS_CENTER,
-                            0, 0, 0, 0,
-                            hwndParent,
-                            (HMENU)wxUIntToPtr(lblid.GetValue()),
-                            wxGetInstance(),
-                            NULL
-                         );
-
-            m_labels->Set(n, wnd, lblid);
-        }
-
-        m_labels->SetFont(GetFont());
-    }
-
-    // now create the main control too
-    if ( !MSWCreateControl(TRACKBAR_CLASS, wxEmptyString, pos, size) )
-        return false;
-
-    // and initialize everything
-    SetRange(minValue, maxValue);
-    SetValue(value);
-    SetPageSize((maxValue - minValue)/10);
-
-    // we need to position the labels correctly if we have them and if
-    // SetSize() hadn't been called before (when best size was determined by
-    // MSWCreateControl()) as in this case they haven't been put in place yet
-    if ( m_labels && size.x != wxDefaultCoord && size.y != wxDefaultCoord )
-    {
-        SetSize(size);
-    }
-
-    return true;
-}
-
-WXDWORD wxSlider::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
-
-    // TBS_HORZ, TBS_RIGHT and TBS_BOTTOM are 0 but do include them for clarity
-    msStyle |= style & wxSL_VERTICAL ? TBS_VERT : TBS_HORZ;
-
-    if ( style & wxSL_BOTH )
-    {
-        // this fully specifies the style combined with TBS_VERT/HORZ above
-        msStyle |= TBS_BOTH;
-    }
-    else // choose one direction
-    {
-        if ( style & wxSL_LEFT )
-            msStyle |= TBS_LEFT;
-        else if ( style & wxSL_RIGHT )
-            msStyle |= TBS_RIGHT;
-        else if ( style & wxSL_TOP )
-            msStyle |= TBS_TOP;
-        else if ( style & wxSL_BOTTOM )
-            msStyle |= TBS_BOTTOM;
-    }
-
-    if ( style & wxSL_AUTOTICKS )
-        msStyle |= TBS_AUTOTICKS;
-    else
-        msStyle |= TBS_NOTICKS;
-
-    if ( style & wxSL_SELRANGE )
-        msStyle |= TBS_ENABLESELRANGE;
-
-    return msStyle;
-}
-
-wxSlider::~wxSlider()
-{
-    delete m_labels;
-}
-
-// ----------------------------------------------------------------------------
-// event handling
-// ----------------------------------------------------------------------------
-
-bool wxSlider::MSWOnScroll(int WXUNUSED(orientation),
-                           WXWORD wParam,
-                           WXWORD WXUNUSED(pos),
-                           WXHWND control)
-{
-    wxEventType scrollEvent;
-    switch ( wParam )
-    {
-        case SB_TOP:
-            scrollEvent = wxEVT_SCROLL_TOP;
-            break;
-
-        case SB_BOTTOM:
-            scrollEvent = wxEVT_SCROLL_BOTTOM;
-            break;
-
-        case SB_LINEUP:
-            scrollEvent = wxEVT_SCROLL_LINEUP;
-            break;
-
-        case SB_LINEDOWN:
-            scrollEvent = wxEVT_SCROLL_LINEDOWN;
-            break;
-
-        case SB_PAGEUP:
-            scrollEvent = wxEVT_SCROLL_PAGEUP;
-            break;
-
-        case SB_PAGEDOWN:
-            scrollEvent = wxEVT_SCROLL_PAGEDOWN;
-            break;
-
-        case SB_THUMBTRACK:
-            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
-            m_isDragging = true;
-            break;
-
-        case SB_THUMBPOSITION:
-            if ( m_isDragging )
-            {
-                scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
-                m_isDragging = false;
-            }
-            else
-            {
-                // this seems to only happen when the mouse wheel is used: in
-                // this case, as it might be unexpected to get THUMBRELEASE
-                // without preceding THUMBTRACKs, we don't generate it at all
-                // but generate CHANGED event because the control itself does
-                // not send us SB_ENDSCROLL for whatever reason when mouse
-                // wheel is used
-                scrollEvent = wxEVT_SCROLL_CHANGED;
-            }
-            break;
-
-        case SB_ENDSCROLL:
-            scrollEvent = wxEVT_SCROLL_CHANGED;
-            break;
-
-        default:
-            // unknown scroll event?
-            return false;
-    }
-
-    int newPos = ValueInvertOrNot((int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0));
-    if ( (newPos < GetMin()) || (newPos > GetMax()) )
-    {
-        // out of range - but we did process it
-        return true;
-    }
-
-    SetValue(newPos);
-
-    wxScrollEvent event(scrollEvent, m_windowId);
-    event.SetPosition(newPos);
-    event.SetEventObject( this );
-    HandleWindowEvent(event);
-
-    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
-    cevent.SetInt( newPos );
-    cevent.SetEventObject( this );
-
-    return HandleWindowEvent( cevent );
-}
-
-void wxSlider::Command (wxCommandEvent & event)
-{
-    SetValue (event.GetInt());
-    ProcessCommand (event);
-}
-
-// ----------------------------------------------------------------------------
-// geometry stuff
-// ----------------------------------------------------------------------------
-
-wxRect wxSlider::GetBoundingBox() const
-{
-    // take care not to call our own functions which would call us recursively
-    int x, y, w, h;
-    wxSliderBase::DoGetPosition(&x, &y);
-    wxSliderBase::DoGetSize(&w, &h);
-
-    wxRect rect(x, y, w, h);
-    if ( m_labels )
-    {
-        wxRect lrect = m_labels->GetBoundingBox();
-        GetParent()->ScreenToClient(&lrect.x, &lrect.y);
-        rect.Union(lrect);
-    }
-
-    return rect;
-}
-
-void wxSlider::DoGetSize(int *width, int *height) const
-{
-    wxRect rect = GetBoundingBox();
-
-    if ( width )
-        *width = rect.width;
-    if ( height )
-        *height = rect.height;
-}
-
-void wxSlider::DoGetPosition(int *x, int *y) const
-{
-    wxRect rect = GetBoundingBox();
-
-    if ( x )
-        *x = rect.x;
-    if ( y )
-        *y = rect.y;
-}
-
-int wxSlider::GetLabelsSize(int *width) const
-{
-    int cy;
-
-    if ( width )
-    {
-        // find the max label width
-        int wLabelMin, wLabelMax;
-        GetTextExtent(Format(m_rangeMin), &wLabelMin, &cy);
-        GetTextExtent(Format(m_rangeMax), &wLabelMax, &cy);
-
-        *width = wxMax(wLabelMin, wLabelMax);
-    }
-    else
-    {
-        cy = GetCharHeight();
-    }
-
-    return EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-}
-
-void wxSlider::DoMoveWindow(int x, int y, int width, int height)
-{
-    // all complications below are because we need to position the labels,
-    // without them everything is easy
-    if ( !m_labels )
-    {
-        wxSliderBase::DoMoveWindow(x, y, width, height);
-        return;
-    }
-
-    // be careful to position the slider itself after moving the labels as
-    // otherwise our GetBoundingBox(), which is called from WM_SIZE handler,
-    // would return a wrong result and wrong size would be cached internally
-    if ( HasFlag(wxSL_VERTICAL) )
-    {
-        int wLabel;
-        int hLabel = GetLabelsSize(&wLabel);
-
-        int xLabel = HasFlag(wxSL_LEFT) ? x + width - wLabel : x;
-
-        // position all labels: min at the top, value in the middle and max at
-        // the bottom
-        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
-                     xLabel, y, wLabel, hLabel);
-
-        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
-                     xLabel, y + (height - hLabel)/2, wLabel, hLabel);
-
-        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
-                      xLabel, y + height - hLabel, wLabel, hLabel);
-
-        // position the slider itself along the left/right edge
-        wxSliderBase::DoMoveWindow(HasFlag(wxSL_LEFT) ? x : x + wLabel + HGAP,
-                                   y + hLabel/2,
-                                   width - wLabel - HGAP,
-                                   height - hLabel);
-    }
-    else // horizontal
-    {
-        int wLabel;
-        int hLabel = GetLabelsSize(&wLabel);
-
-        int yLabel = HasFlag(wxSL_TOP) ? y + height - hLabel : y;
-
-        // position all labels: min on the left, value in the middle and max to
-        // the right
-        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
-                      x, yLabel, wLabel, hLabel);
-
-        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
-                      x + (width - wLabel)/2, yLabel, wLabel, hLabel);
-
-        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
-                      x + width - wLabel, yLabel, wLabel, hLabel);
-
-        // position the slider itself along the top/bottom edge
-        wxSliderBase::DoMoveWindow(x,
-                                   HasFlag(wxSL_TOP) ? y : y + hLabel,
-                                   width,
-                                   height - hLabel);
-    }
-}
-
-wxSize wxSlider::DoGetBestSize() const
-{
-    // these values are arbitrary
-    static const int length = 100;
-    static const int thumb = 24;
-    static const int ticks = 8;
-
-    int *width;
-    wxSize size;
-    if ( HasFlag(wxSL_VERTICAL) )
-    {
-        size.x = thumb;
-        size.y = length;
-        width = &size.x;
-
-        if ( m_labels )
-        {
-            int wLabel;
-            int hLabel = GetLabelsSize(&wLabel);
-
-            // account for the labels
-            size.x += HGAP + wLabel;
-
-            // labels are indented relative to the slider itself
-            size.y += hLabel;
-        }
-    }
-    else // horizontal
-    {
-        size.x = length;
-        size.y = thumb;
-        width = &size.y;
-
-        if ( m_labels )
-        {
-            // labels add extra height
-            size.y += GetLabelsSize();
-        }
-    }
-
-    // need extra space to show ticks
-    if ( HasFlag(wxSL_TICKS) )
-    {
-        *width += ticks;
-
-        // and maybe twice as much if we show them on both sides
-        if ( HasFlag(wxSL_BOTH) )
-            *width += ticks;
-    }
-
-    return size;
-}
-
-// ----------------------------------------------------------------------------
-// slider-specific methods
-// ----------------------------------------------------------------------------
-
-int wxSlider::GetValue() const
-{
-    return ValueInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0));
-}
-
-void wxSlider::SetValue(int value)
-{
-    ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value));
-
-    if ( m_labels )
-    {
-        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).wx_str());
-    }
-}
-
-void wxSlider::SetRange(int minValue, int maxValue)
-{
-    m_rangeMin = minValue;
-    m_rangeMax = maxValue;
-
-    ::SendMessage(GetHwnd(), TBM_SETRANGEMIN, TRUE, m_rangeMin);
-    ::SendMessage(GetHwnd(), TBM_SETRANGEMAX, TRUE, m_rangeMax);
-
-    if ( m_labels )
-    {
-        ::SetWindowText((*m_labels)[SliderLabel_Min],
-                        Format(ValueInvertOrNot(m_rangeMin)).wx_str());
-        ::SetWindowText((*m_labels)[SliderLabel_Max],
-                        Format(ValueInvertOrNot(m_rangeMax)).wx_str());
-    }
-}
-
-void wxSlider::SetTickFreq(int n, int pos)
-{
-    m_tickFreq = n;
-    ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );
-}
-
-void wxSlider::SetPageSize(int pageSize)
-{
-    ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
-    m_pageSize = pageSize;
-}
-
-int wxSlider::GetPageSize() const
-{
-    return m_pageSize;
-}
-
-void wxSlider::ClearSel()
-{
-    ::SendMessage(GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0);
-}
-
-void wxSlider::ClearTicks()
-{
-    ::SendMessage(GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0);
-}
-
-void wxSlider::SetLineSize(int lineSize)
-{
-    m_lineSize = lineSize;
-    ::SendMessage(GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize);
-}
-
-int wxSlider::GetLineSize() const
-{
-    return (int)::SendMessage(GetHwnd(), TBM_GETLINESIZE, 0, 0);
-}
-
-int wxSlider::GetSelEnd() const
-{
-    return (int)::SendMessage(GetHwnd(), TBM_GETSELEND, 0, 0);
-}
-
-int wxSlider::GetSelStart() const
-{
-    return (int)::SendMessage(GetHwnd(), TBM_GETSELSTART, 0, 0);
-}
-
-void wxSlider::SetSelection(int minPos, int maxPos)
-{
-    ::SendMessage(GetHwnd(), TBM_SETSEL,
-                  (WPARAM) TRUE /* redraw */,
-                  (LPARAM) MAKELONG( minPos, maxPos) );
-}
-
-void wxSlider::SetThumbLength(int len)
-{
-    ::SendMessage(GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0);
-}
-
-int wxSlider::GetThumbLength() const
-{
-    return (int)::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, 0, 0);
-}
-
-void wxSlider::SetTick(int tickPos)
-{
-    ::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
-}
-
-// ----------------------------------------------------------------------------
-// composite control methods
-// ----------------------------------------------------------------------------
-
-WXHWND wxSlider::GetStaticMin() const
-{
-    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Min] : NULL;
-}
-
-WXHWND wxSlider::GetStaticMax() const
-{
-    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Max] : NULL;
-}
-
-WXHWND wxSlider::GetEditValue() const
-{
-    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL;
-}
-
-WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxSlider, wxSliderBase, m_labels)
-
-#endif // wxUSE_SLIDER
diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp

deleted file mode 100644 (file)

index d7f2672..0000000
--- a/src/msw/statbr95.cpp
+++ /dev/null
@@ -1,468 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/statbr95.cpp
-// Purpose:     native implementation of wxStatusBar
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     04.04.98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
-
-#include "wx/statusbr.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-    #include "wx/frame.h"
-    #include "wx/settings.h"
-    #include "wx/dcclient.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/msw/private.h"
-#include <windowsx.h>
-
-#if wxUSE_UXTHEME
-    #include "wx/msw/uxtheme.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// windowsx.h and commctrl.h don't define those, so we do it here
-#define StatusBar_SetParts(h, n, w) SendMessage(h, SB_SETPARTS, (WPARAM)n, (LPARAM)w)
-#define StatusBar_SetText(h, n, t)  SendMessage(h, SB_SETTEXT, (WPARAM)n, (LPARAM)(LPCTSTR)t)
-#define StatusBar_GetTextLen(h, n)  LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0))
-#define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s))
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxStatusBar95 class
-// ----------------------------------------------------------------------------
-
-wxStatusBar95::wxStatusBar95()
-{
-    SetParent(NULL);
-    m_hWnd = 0;
-    m_windowId = 0;
-}
-
-bool wxStatusBar95::Create(wxWindow *parent,
-                           wxWindowID id,
-                           long style,
-                           const wxString& name)
-{
-    wxCHECK_MSG( parent, false, wxT("status bar must have a parent") );
-
-    SetName(name);
-    SetWindowStyleFlag(style);
-    SetParent(parent);
-
-    parent->AddChild(this);
-
-    m_windowId = id == wxID_ANY ? NewControlId() : id;
-
-    DWORD wstyle = WS_CHILD | WS_VISIBLE;
-
-    if ( style & wxCLIP_SIBLINGS )
-        wstyle |= WS_CLIPSIBLINGS;
-
-    // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
-    // (at least in the version of comctl32.dll I'm using), and the only way to
-    // turn it off is to use CCS_TOP style - as we position the status bar
-    // manually anyhow (see DoMoveWindow), use CCS_TOP style if wxST_SIZEGRIP
-    // is not given
-    if ( !(style & wxST_SIZEGRIP) )
-    {
-        wstyle |= CCS_TOP;
-    }
-    else
-    {
-#ifndef __WXWINCE__
-        // may be some versions of comctl32.dll do need it - anyhow, it won't
-        // do any harm
-        wstyle |= SBARS_SIZEGRIP;
-#endif
-    }
-
-    m_hWnd = CreateWindow
-             (
-                STATUSCLASSNAME,
-                _T(""),
-                wstyle,
-                0, 0, 0, 0,
-                GetHwndOf(parent),
-                (HMENU)wxUIntToPtr(m_windowId.GetValue()),
-                wxGetInstance(),
-                NULL
-             );
-    if ( m_hWnd == 0 )
-    {
-        wxLogSysError(_("Failed to create a status bar."));
-
-        return false;
-    }
-
-    SetFieldsCount(1);
-    SubclassWin(m_hWnd);
-    InheritAttributes();
-
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
-
-    // we must refresh the frame size when the statusbar is created, because
-    // its client area might change
-    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
-    if ( frame )
-    {
-        frame->SendSizeEvent();
-    }
-
-    return true;
-}
-
-wxStatusBar95::~wxStatusBar95()
-{
-    // we must refresh the frame size when the statusbar is deleted but the
-    // frame is not - otherwise statusbar leaves a hole in the place it used to
-    // occupy
-    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
-    if ( frame && !frame->IsBeingDeleted() )
-    {
-        frame->SendSizeEvent();
-    }
-}
-
-void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
-{
-    // this is a Windows limitation
-    wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
-
-    wxStatusBarBase::SetFieldsCount(nFields, widths);
-
-    SetFieldsWidth();
-}
-
-void wxStatusBar95::SetStatusWidths(int n, const int widths[])
-{
-    wxStatusBarBase::SetStatusWidths(n, widths);
-
-    SetFieldsWidth();
-}
-
-void wxStatusBar95::SetFieldsWidth()
-{
-    if ( !m_nFields )
-        return;
-
-    int aBorders[3];
-    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
-
-    int extraWidth = aBorders[2]; // space between fields
-
-    wxArrayInt widthsAbs =
-        CalculateAbsWidths(GetClientSize().x - extraWidth*(m_nFields - 1));
-
-    int *pWidths = new int[m_nFields];
-
-    int nCurPos = 0;
-    for ( int i = 0; i < m_nFields; i++ ) {
-        nCurPos += widthsAbs[i] + extraWidth;
-        pWidths[i] = nCurPos;
-    }
-
-    if ( !StatusBar_SetParts(GetHwnd(), m_nFields, pWidths) ) {
-        wxLogLastError(wxT("StatusBar_SetParts"));
-    }
-
-    delete [] pWidths;
-}
-
-void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
-{
-    wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
-                 _T("invalid statusbar field index") );
-
-    if ( strText == GetStatusText(nField) )
-    {
-       // don't call StatusBar_SetText() to avoid flicker
-       return;
-    }
-
-    // Get field style, if any
-    int style;
-    if (m_statusStyles)
-    {
-        switch(m_statusStyles[nField])
-        {
-        case wxSB_RAISED:
-            style = SBT_POPOUT;
-            break;
-        case wxSB_FLAT:
-            style = SBT_NOBORDERS;
-            break;
-        case wxSB_NORMAL:
-        default:
-            style = 0;
-            break;
-        }
-    }
-    else
-        style = 0;
-
-    // Pass both field number and style. MSDN library doesn't mention
-    // that nField and style have to be 'ORed'
-    if ( !StatusBar_SetText(GetHwnd(), nField | style, strText.wx_str()) )
-    {
-        wxLogLastError(wxT("StatusBar_SetText"));
-    }
-}
-
-wxString wxStatusBar95::GetStatusText(int nField) const
-{
-    wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString,
-                 _T("invalid statusbar field index") );
-
-    wxString str;
-    int len = StatusBar_GetTextLen(GetHwnd(), nField);
-    if ( len > 0 )
-    {
-        StatusBar_GetText(GetHwnd(), nField, wxStringBuffer(str, len));
-    }
-
-    return str;
-}
-
-int wxStatusBar95::GetBorderX() const
-{
-    int aBorders[3];
-    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
-
-    return aBorders[0];
-}
-
-int wxStatusBar95::GetBorderY() const
-{
-    int aBorders[3];
-    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
-
-    return aBorders[1];
-}
-
-void wxStatusBar95::SetMinHeight(int height)
-{
-    SendMessage(GetHwnd(), SB_SETMINHEIGHT, height + 2*GetBorderY(), 0);
-
-    // have to send a (dummy) WM_SIZE to redraw it now
-    SendMessage(GetHwnd(), WM_SIZE, 0, 0);
-}
-
-bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
-{
-    wxCHECK_MSG( (i >= 0) && (i < m_nFields), false,
-                 _T("invalid statusbar field index") );
-
-    RECT r;
-    if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
-    {
-        wxLogLastError(wxT("SendMessage(SB_GETRECT)"));
-    }
-
-#if wxUSE_UXTHEME
-    wxUxThemeHandle theme((wxStatusBar95 *)this, L"Status"); // const_cast
-    if ( theme )
-    {
-        // by default Windows has a 2 pixel border to the right of the left
-        // divider (or it could be a bug) but it looks wrong so remove it
-        if ( i != 0 )
-        {
-            r.left -= 2;
-        }
-
-        wxUxThemeEngine::Get()->GetThemeBackgroundContentRect(theme, NULL,
-                                                              1 /* SP_PANE */, 0,
-                                                              &r, &r);
-    }
-#endif
-
-    wxCopyRECTToRect(r, rect);
-
-    return true;
-}
-
-// no idea for a default width, just choose something
-#define DEFAULT_FIELD_WIDTH 25
-
-wxSize wxStatusBar95::DoGetBestSize() const
-{
-    int borders[3];
-    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)borders);
-
-    // calculate width
-    int width = 0;
-    for ( int i = 0; i < m_nFields; ++i )
-    {
-        int widthField = m_statusWidths ? m_statusWidths[i]
-                                        : DEFAULT_FIELD_WIDTH;
-        if ( widthField >= 0 )
-        {
-            width += widthField;
-        }
-        else
-        {
-            // variable width field, its width is really a proportion
-            // related to the other fields
-            width += -widthField*DEFAULT_FIELD_WIDTH;
-        }
-
-        // add the space between fields
-        width += borders[2];
-    }
-
-    if ( !width )
-    {
-        // still need something even for an empty status bar
-        width = 2*DEFAULT_FIELD_WIDTH;
-    }
-
-
-    // calculate height
-    int height;
-    wxGetCharSize(GetHWND(), NULL, &height, GetFont());
-    height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(height);
-    height += borders[1];
-
-    wxSize best(width, height);
-    CacheBestSize(best);
-    return best;
-}
-
-void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
-{
-    if ( GetParent()->IsSizeDeferred() )
-    {
-        wxWindowMSW::DoMoveWindow(x, y, width, height);
-    }
-    else
-    {
-        // parent pos/size isn't deferred so do it now but don't send
-        // WM_WINDOWPOSCHANGING since we don't want to change pos/size later
-        // we must use SWP_NOCOPYBITS here otherwise it paints incorrectly
-        // if other windows are size deferred
-        ::SetWindowPos(GetHwnd(), NULL, x, y, width, height,
-                       SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE
-#ifndef __WXWINCE__
-                       | SWP_NOCOPYBITS | SWP_NOSENDCHANGING
-#endif
-                       );
-    }
-
-    // adjust fields widths to the new size
-    SetFieldsWidth();
-
-    // we have to trigger wxSizeEvent if there are children window in status
-    // bar because GetFieldRect returned incorrect (not updated) values up to
-    // here, which almost certainly resulted in incorrectly redrawn statusbar
-    if ( m_children.GetCount() > 0 )
-    {
-        wxSizeEvent event(GetClientSize(), m_windowId);
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
-    }
-}
-
-void wxStatusBar95::SetStatusStyles(int n, const int styles[])
-{
-    wxStatusBarBase::SetStatusStyles(n, styles);
-
-    if (n != m_nFields)
-        return;
-
-    for (int i = 0; i < n; i++)
-    {
-        int style;
-        switch(styles[i])
-        {
-        case wxSB_RAISED:
-            style = SBT_POPOUT;
-            break;
-        case wxSB_FLAT:
-            style = SBT_NOBORDERS;
-            break;
-        case wxSB_NORMAL:
-        default:
-            style = 0;
-            break;
-        }
-        // The SB_SETTEXT message is both used to set the field's text as well as
-        // the fields' styles. MSDN library doesn't mention
-        // that nField and style have to be 'ORed'
-        wxString text = GetStatusText(i);
-        if (!StatusBar_SetText(GetHwnd(), style | i, text.wx_str()))
-        {
-            wxLogLastError(wxT("StatusBar_SetText"));
-        }
-    }
-}
-
-WXLRESULT
-wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-#ifndef __WXWINCE__
-    if ( nMsg == WM_WINDOWPOSCHANGING )
-    {
-        WINDOWPOS *lpPos = (WINDOWPOS *)lParam;
-        int x, y, w, h;
-        GetPosition(&x, &y);
-        GetSize(&w, &h);
-
-        // we need real window coords and not wx client coords
-        AdjustForParentClientOrigin(x, y);
-
-        lpPos->x  = x;
-        lpPos->y  = y;
-        lpPos->cx = w;
-        lpPos->cy = h;
-
-        return 0;
-    }
-
-    if ( nMsg == WM_NCLBUTTONDOWN )
-    {
-        // if hit-test is on gripper then send message to TLW to begin
-        // resizing. It is possible to send this message to any window.
-        if ( wParam == HTBOTTOMRIGHT )
-        {
-            wxWindow *win;
-
-            for ( win = GetParent(); win; win = win->GetParent() )
-            {
-                if ( win->IsTopLevel() )
-                {
-                    SendMessage(GetHwndOf(win), WM_NCLBUTTONDOWN,
-                                wParam, lParam);
-
-                    return 0;
-                }
-            }
-        }
-    }
-#endif
-
-    return wxStatusBarBase::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-#endif // wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp

new file mode 100644 (file)

index 0000000..aef8e5c
--- /dev/null
+++ b/src/msw/statusbar.cpp
@@ -0,0 +1,468 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/statusbar.cpp
+// Purpose:     native implementation of wxStatusBar
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     04.04.98
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
+
+#include "wx/statusbr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/msw/private.h"
+#include <windowsx.h>
+
+#if wxUSE_UXTHEME
+    #include "wx/msw/uxtheme.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// windowsx.h and commctrl.h don't define those, so we do it here
+#define StatusBar_SetParts(h, n, w) SendMessage(h, SB_SETPARTS, (WPARAM)n, (LPARAM)w)
+#define StatusBar_SetText(h, n, t)  SendMessage(h, SB_SETTEXT, (WPARAM)n, (LPARAM)(LPCTSTR)t)
+#define StatusBar_GetTextLen(h, n)  LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0))
+#define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s))
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxStatusBar class
+// ----------------------------------------------------------------------------
+
+wxStatusBar::wxStatusBar()
+{
+    SetParent(NULL);
+    m_hWnd = 0;
+    m_windowId = 0;
+}
+
+bool wxStatusBar::Create(wxWindow *parent,
+                         wxWindowID id,
+                         long style,
+                         const wxString& name)
+{
+    wxCHECK_MSG( parent, false, wxT("status bar must have a parent") );
+
+    SetName(name);
+    SetWindowStyleFlag(style);
+    SetParent(parent);
+
+    parent->AddChild(this);
+
+    m_windowId = id == wxID_ANY ? NewControlId() : id;
+
+    DWORD wstyle = WS_CHILD | WS_VISIBLE;
+
+    if ( style & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+
+    // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
+    // (at least in the version of comctl32.dll I'm using), and the only way to
+    // turn it off is to use CCS_TOP style - as we position the status bar
+    // manually anyhow (see DoMoveWindow), use CCS_TOP style if wxST_SIZEGRIP
+    // is not given
+    if ( !(style & wxST_SIZEGRIP) )
+    {
+        wstyle |= CCS_TOP;
+    }
+    else
+    {
+#ifndef __WXWINCE__
+        // may be some versions of comctl32.dll do need it - anyhow, it won't
+        // do any harm
+        wstyle |= SBARS_SIZEGRIP;
+#endif
+    }
+
+    m_hWnd = CreateWindow
+             (
+                STATUSCLASSNAME,
+                _T(""),
+                wstyle,
+                0, 0, 0, 0,
+                GetHwndOf(parent),
+                (HMENU)wxUIntToPtr(m_windowId.GetValue()),
+                wxGetInstance(),
+                NULL
+             );
+    if ( m_hWnd == 0 )
+    {
+        wxLogSysError(_("Failed to create a status bar."));
+
+        return false;
+    }
+
+    SetFieldsCount(1);
+    SubclassWin(m_hWnd);
+    InheritAttributes();
+
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
+
+    // we must refresh the frame size when the statusbar is created, because
+    // its client area might change
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame )
+    {
+        frame->SendSizeEvent();
+    }
+
+    return true;
+}
+
+wxStatusBar::~wxStatusBar()
+{
+    // we must refresh the frame size when the statusbar is deleted but the
+    // frame is not - otherwise statusbar leaves a hole in the place it used to
+    // occupy
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && !frame->IsBeingDeleted() )
+    {
+        frame->SendSizeEvent();
+    }
+}
+
+void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
+{
+    // this is a Windows limitation
+    wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
+
+    wxStatusBarBase::SetFieldsCount(nFields, widths);
+
+    SetFieldsWidth();
+}
+
+void wxStatusBar::SetStatusWidths(int n, const int widths[])
+{
+    wxStatusBarBase::SetStatusWidths(n, widths);
+
+    SetFieldsWidth();
+}
+
+void wxStatusBar::SetFieldsWidth()
+{
+    if ( !m_nFields )
+        return;
+
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
+
+    int extraWidth = aBorders[2]; // space between fields
+
+    wxArrayInt widthsAbs =
+        CalculateAbsWidths(GetClientSize().x - extraWidth*(m_nFields - 1));
+
+    int *pWidths = new int[m_nFields];
+
+    int nCurPos = 0;
+    for ( int i = 0; i < m_nFields; i++ ) {
+        nCurPos += widthsAbs[i] + extraWidth;
+        pWidths[i] = nCurPos;
+    }
+
+    if ( !StatusBar_SetParts(GetHwnd(), m_nFields, pWidths) ) {
+        wxLogLastError(wxT("StatusBar_SetParts"));
+    }
+
+    delete [] pWidths;
+}
+
+void wxStatusBar::SetStatusText(const wxString& strText, int nField)
+{
+    wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
+                 _T("invalid statusbar field index") );
+
+    if ( strText == GetStatusText(nField) )
+    {
+       // don't call StatusBar_SetText() to avoid flicker
+       return;
+    }
+
+    // Get field style, if any
+    int style;
+    if (m_statusStyles)
+    {
+        switch(m_statusStyles[nField])
+        {
+        case wxSB_RAISED:
+            style = SBT_POPOUT;
+            break;
+        case wxSB_FLAT:
+            style = SBT_NOBORDERS;
+            break;
+        case wxSB_NORMAL:
+        default:
+            style = 0;
+            break;
+        }
+    }
+    else
+        style = 0;
+
+    // Pass both field number and style. MSDN library doesn't mention
+    // that nField and style have to be 'ORed'
+    if ( !StatusBar_SetText(GetHwnd(), nField | style, strText.wx_str()) )
+    {
+        wxLogLastError(wxT("StatusBar_SetText"));
+    }
+}
+
+wxString wxStatusBar::GetStatusText(int nField) const
+{
+    wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString,
+                 _T("invalid statusbar field index") );
+
+    wxString str;
+    int len = StatusBar_GetTextLen(GetHwnd(), nField);
+    if ( len > 0 )
+    {
+        StatusBar_GetText(GetHwnd(), nField, wxStringBuffer(str, len));
+    }
+
+    return str;
+}
+
+int wxStatusBar::GetBorderX() const
+{
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
+
+    return aBorders[0];
+}
+
+int wxStatusBar::GetBorderY() const
+{
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
+
+    return aBorders[1];
+}
+
+void wxStatusBar::SetMinHeight(int height)
+{
+    SendMessage(GetHwnd(), SB_SETMINHEIGHT, height + 2*GetBorderY(), 0);
+
+    // have to send a (dummy) WM_SIZE to redraw it now
+    SendMessage(GetHwnd(), WM_SIZE, 0, 0);
+}
+
+bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const
+{
+    wxCHECK_MSG( (i >= 0) && (i < m_nFields), false,
+                 _T("invalid statusbar field index") );
+
+    RECT r;
+    if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
+    {
+        wxLogLastError(wxT("SendMessage(SB_GETRECT)"));
+    }
+
+#if wxUSE_UXTHEME
+    wxUxThemeHandle theme((wxStatusBar *)this, L"Status"); // const_cast
+    if ( theme )
+    {
+        // by default Windows has a 2 pixel border to the right of the left
+        // divider (or it could be a bug) but it looks wrong so remove it
+        if ( i != 0 )
+        {
+            r.left -= 2;
+        }
+
+        wxUxThemeEngine::Get()->GetThemeBackgroundContentRect(theme, NULL,
+                                                              1 /* SP_PANE */, 0,
+                                                              &r, &r);
+    }
+#endif
+
+    wxCopyRECTToRect(r, rect);
+
+    return true;
+}
+
+// no idea for a default width, just choose something
+#define DEFAULT_FIELD_WIDTH 25
+
+wxSize wxStatusBar::DoGetBestSize() const
+{
+    int borders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)borders);
+
+    // calculate width
+    int width = 0;
+    for ( int i = 0; i < m_nFields; ++i )
+    {
+        int widthField = m_statusWidths ? m_statusWidths[i]
+                                        : DEFAULT_FIELD_WIDTH;
+        if ( widthField >= 0 )
+        {
+            width += widthField;
+        }
+        else
+        {
+            // variable width field, its width is really a proportion
+            // related to the other fields
+            width += -widthField*DEFAULT_FIELD_WIDTH;
+        }
+
+        // add the space between fields
+        width += borders[2];
+    }
+
+    if ( !width )
+    {
+        // still need something even for an empty status bar
+        width = 2*DEFAULT_FIELD_WIDTH;
+    }
+
+
+    // calculate height
+    int height;
+    wxGetCharSize(GetHWND(), NULL, &height, GetFont());
+    height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(height);
+    height += borders[1];
+
+    wxSize best(width, height);
+    CacheBestSize(best);
+    return best;
+}
+
+void wxStatusBar::DoMoveWindow(int x, int y, int width, int height)
+{
+    if ( GetParent()->IsSizeDeferred() )
+    {
+        wxWindowMSW::DoMoveWindow(x, y, width, height);
+    }
+    else
+    {
+        // parent pos/size isn't deferred so do it now but don't send
+        // WM_WINDOWPOSCHANGING since we don't want to change pos/size later
+        // we must use SWP_NOCOPYBITS here otherwise it paints incorrectly
+        // if other windows are size deferred
+        ::SetWindowPos(GetHwnd(), NULL, x, y, width, height,
+                       SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE
+#ifndef __WXWINCE__
+                       | SWP_NOCOPYBITS | SWP_NOSENDCHANGING
+#endif
+                       );
+    }
+
+    // adjust fields widths to the new size
+    SetFieldsWidth();
+
+    // we have to trigger wxSizeEvent if there are children window in status
+    // bar because GetFieldRect returned incorrect (not updated) values up to
+    // here, which almost certainly resulted in incorrectly redrawn statusbar
+    if ( m_children.GetCount() > 0 )
+    {
+        wxSizeEvent event(GetClientSize(), m_windowId);
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+    }
+}
+
+void wxStatusBar::SetStatusStyles(int n, const int styles[])
+{
+    wxStatusBarBase::SetStatusStyles(n, styles);
+
+    if (n != m_nFields)
+        return;
+
+    for (int i = 0; i < n; i++)
+    {
+        int style;
+        switch(styles[i])
+        {
+        case wxSB_RAISED:
+            style = SBT_POPOUT;
+            break;
+        case wxSB_FLAT:
+            style = SBT_NOBORDERS;
+            break;
+        case wxSB_NORMAL:
+        default:
+            style = 0;
+            break;
+        }
+        // The SB_SETTEXT message is both used to set the field's text as well as
+        // the fields' styles. MSDN library doesn't mention
+        // that nField and style have to be 'ORed'
+        wxString text = GetStatusText(i);
+        if (!StatusBar_SetText(GetHwnd(), style | i, text.wx_str()))
+        {
+            wxLogLastError(wxT("StatusBar_SetText"));
+        }
+    }
+}
+
+WXLRESULT
+wxStatusBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+#ifndef __WXWINCE__
+    if ( nMsg == WM_WINDOWPOSCHANGING )
+    {
+        WINDOWPOS *lpPos = (WINDOWPOS *)lParam;
+        int x, y, w, h;
+        GetPosition(&x, &y);
+        GetSize(&w, &h);
+
+        // we need real window coords and not wx client coords
+        AdjustForParentClientOrigin(x, y);
+
+        lpPos->x  = x;
+        lpPos->y  = y;
+        lpPos->cx = w;
+        lpPos->cy = h;
+
+        return 0;
+    }
+
+    if ( nMsg == WM_NCLBUTTONDOWN )
+    {
+        // if hit-test is on gripper then send message to TLW to begin
+        // resizing. It is possible to send this message to any window.
+        if ( wParam == HTBOTTOMRIGHT )
+        {
+            wxWindow *win;
+
+            for ( win = GetParent(); win; win = win->GetParent() )
+            {
+                if ( win->IsTopLevel() )
+                {
+                    SendMessage(GetHwndOf(win), WM_NCLBUTTONDOWN,
+                                wParam, lParam);
+
+                    return 0;
+                }
+            }
+        }
+    }
+#endif
+
+    return wxStatusBarBase::MSWWindowProc(nMsg, wParam, lParam);
+}
+
+#endif // wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp

deleted file mode 100644 (file)

index 16ebe1f..0000000
--- a/src/msw/tbar95.cpp
+++ /dev/null
@@ -1,1909 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/tbar95.cpp
-// Purpose:     wxToolBar
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
-
-#include "wx/toolbar.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-    #include "wx/dynarray.h"
-    #include "wx/frame.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/settings.h"
-    #include "wx/bitmap.h"
-    #include "wx/dcmemory.h"
-    #include "wx/control.h"
-    #include "wx/app.h"         // for GetComCtl32Version
-    #include "wx/image.h"
-    #include "wx/stattext.h"
-#endif
-
-#include "wx/sysopt.h"
-#include "wx/dcclient.h"
-
-#include "wx/msw/private.h"
-#include "wx/msw/dc.h"
-
-#if wxUSE_UXTHEME
-#include "wx/msw/uxtheme.h"
-#endif
-
-// this define controls whether the code for button colours remapping (only
-// useful for 16 or 256 colour images) is active at all, it's always turned off
-// for CE where it doesn't compile (and is probably not needed anyhow) and may
-// also be turned off for other systems if you always use 24bpp images and so
-// never need it
-#ifndef __WXWINCE__
-    #define wxREMAP_BUTTON_COLOURS
-#endif // !__WXWINCE__
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// these standard constants are not always defined in compilers headers
-
-// Styles
-#ifndef TBSTYLE_FLAT
-    #define TBSTYLE_LIST            0x1000
-    #define TBSTYLE_FLAT            0x0800
-#endif
-
-#ifndef TBSTYLE_TRANSPARENT
-    #define TBSTYLE_TRANSPARENT     0x8000
-#endif
-
-#ifndef TBSTYLE_TOOLTIPS
-    #define TBSTYLE_TOOLTIPS        0x0100
-#endif
-
-// Messages
-#ifndef TB_GETSTYLE
-    #define TB_SETSTYLE             (WM_USER + 56)
-    #define TB_GETSTYLE             (WM_USER + 57)
-#endif
-
-#ifndef TB_HITTEST
-    #define TB_HITTEST              (WM_USER + 69)
-#endif
-
-#ifndef TB_GETMAXSIZE
-    #define TB_GETMAXSIZE           (WM_USER + 83)
-#endif
-
-// these values correspond to those used by comctl32.dll
-#define DEFAULTBITMAPX   16
-#define DEFAULTBITMAPY   15
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
-
-/*
-    TOOLBAR PROPERTIES
-        tool
-            bitmap
-            bitmap2
-            tooltip
-            longhelp
-            radio (bool)
-            toggle (bool)
-        separator
-        style ( wxNO_BORDER | wxTB_HORIZONTAL)
-        bitmapsize
-        margins
-        packing
-        separation
-
-        dontattachtoframe
-*/
-
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
-    EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
-    EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
-    EVT_ERASE_BACKGROUND(wxToolBar::OnEraseBackground)
-END_EVENT_TABLE()
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class wxToolBarTool : public wxToolBarToolBase
-{
-public:
-    wxToolBarTool(wxToolBar *tbar,
-                  int id,
-                  const wxString& label,
-                  const wxBitmap& bmpNormal,
-                  const wxBitmap& bmpDisabled,
-                  wxItemKind kind,
-                  wxObject *clientData,
-                  const wxString& shortHelp,
-                  const wxString& longHelp)
-        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
-                            clientData, shortHelp, longHelp)
-    {
-        m_nSepCount = 0;
-        m_staticText = 0;
-    }
-
-    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
-        : wxToolBarToolBase(tbar, control, label)
-    {
-        if ( IsControl() && !m_label.empty() )
-        {
-            // create a control to render the control's label
-            m_staticText = new wxStaticText
-                               (
-                                 m_tbar,
-                                 wxID_ANY,
-                                 m_label,
-                                 wxDefaultPosition,
-                                 wxDefaultSize,
-                                 wxALIGN_CENTRE | wxST_NO_AUTORESIZE
-                               );
-        }
-        else // no label
-        {
-            m_staticText = NULL;
-        }
-
-        m_nSepCount = 1;
-    }
-
-    virtual ~wxToolBarTool()
-    {
-        delete m_staticText;
-    }
-
-    virtual void SetLabel(const wxString& label)
-    {
-        if ( label == m_label )
-            return;
-
-        wxToolBarToolBase::SetLabel(label);
-
-        if ( m_staticText )
-            m_staticText->SetLabel(label);
-
-        // we need to update the label shown in the toolbar because it has a
-        // pointer to the internal buffer of the old label
-        //
-        // TODO: use TB_SETBUTTONINFO
-    }
-
-    wxStaticText* GetStaticText()
-    {
-        wxASSERT_MSG( IsControl(),
-                      _T("only makes sense for embedded control tools") );
-
-        return m_staticText;
-    }
-
-    // set/get the number of separators which we use to cover the space used by
-    // a control in the toolbar
-    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
-    size_t GetSeparatorsCount() const { return m_nSepCount; }
-
-private:
-    size_t m_nSepCount;
-    wxStaticText *m_staticText;
-
-    DECLARE_NO_COPY_CLASS(wxToolBarTool)
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxToolBarTool
-// ----------------------------------------------------------------------------
-
-wxToolBarToolBase *wxToolBar::CreateTool(int id,
-                                         const wxString& label,
-                                         const wxBitmap& bmpNormal,
-                                         const wxBitmap& bmpDisabled,
-                                         wxItemKind kind,
-                                         wxObject *clientData,
-                                         const wxString& shortHelp,
-                                         const wxString& longHelp)
-{
-    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
-                             clientData, shortHelp, longHelp);
-}
-
-wxToolBarToolBase *
-wxToolBar::CreateTool(wxControl *control, const wxString& label)
-{
-    return new wxToolBarTool(this, control, label);
-}
-
-// ----------------------------------------------------------------------------
-// wxToolBar construction
-// ----------------------------------------------------------------------------
-
-void wxToolBar::Init()
-{
-    m_hBitmap = 0;
-    m_disabledImgList = NULL;
-
-    m_nButtons = 0;
-
-    m_defaultWidth = DEFAULTBITMAPX;
-    m_defaultHeight = DEFAULTBITMAPY;
-
-    m_pInTool = NULL;
-}
-
-bool wxToolBar::Create(wxWindow *parent,
-                       wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxString& name)
-{
-    // common initialisation
-    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return false;
-
-    FixupStyle();
-
-    // MSW-specific initialisation
-    if ( !MSWCreateToolbar(pos, size) )
-        return false;
-
-    wxSetCCUnicodeFormat(GetHwnd());
-
-    // workaround for flat toolbar on Windows XP classic style: we have to set
-    // the style after creating the control; doing it at creation time doesn't work
-#if wxUSE_UXTHEME
-    if ( style & wxTB_FLAT )
-    {
-        LRESULT style = GetMSWToolbarStyle();
-
-        if ( !(style & TBSTYLE_FLAT) )
-            ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
-    }
-#endif // wxUSE_UXTHEME
-
-    return true;
-}
-
-bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
-{
-    if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )
-        return false;
-
-    // toolbar-specific post initialisation
-    ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
-
-#ifdef TB_SETEXTENDEDSTYLE
-    if ( wxApp::GetComCtl32Version() >= 471 )
-        ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
-#endif
-
-    return true;
-}
-
-void wxToolBar::Recreate()
-{
-    const HWND hwndOld = GetHwnd();
-    if ( !hwndOld )
-    {
-        // we haven't been created yet, no need to recreate
-        return;
-    }
-
-    // get the position and size before unsubclassing the old toolbar
-    const wxPoint pos = GetPosition();
-    const wxSize size = GetSize();
-
-    UnsubclassWin();
-
-    if ( !MSWCreateToolbar(pos, size) )
-    {
-        // what can we do?
-        wxFAIL_MSG( _T("recreating the toolbar failed") );
-
-        return;
-    }
-
-    // reparent all our children under the new toolbar
-    for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow *win = node->GetData();
-        if ( !win->IsTopLevel() )
-            ::SetParent(GetHwndOf(win), GetHwnd());
-    }
-
-    // only destroy the old toolbar now --
-    // after all the children had been reparented
-    ::DestroyWindow(hwndOld);
-
-    // it is for the old bitmap control and can't be used with the new one
-    if ( m_hBitmap )
-    {
-        ::DeleteObject((HBITMAP) m_hBitmap);
-        m_hBitmap = 0;
-    }
-
-    if ( m_disabledImgList )
-    {
-        delete m_disabledImgList;
-        m_disabledImgList = NULL;
-    }
-
-    Realize();
-}
-
-wxToolBar::~wxToolBar()
-{
-    // we must refresh the frame size when the toolbar is deleted but the frame
-    // is not - otherwise toolbar leaves a hole in the place it used to occupy
-    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
-    if ( frame && !frame->IsBeingDeleted() )
-        frame->SendSizeEvent();
-
-    if ( m_hBitmap )
-        ::DeleteObject((HBITMAP) m_hBitmap);
-
-    delete m_disabledImgList;
-}
-
-wxSize wxToolBar::DoGetBestSize() const
-{
-    wxSize sizeBest;
-
-    SIZE size;
-    if ( !::SendMessage(GetHwnd(), TB_GETMAXSIZE, 0, (LPARAM)&size) )
-    {
-        // maybe an old (< 0x400) Windows version? try to approximate the
-        // toolbar size ourselves
-        sizeBest = GetToolSize();
-        sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER); // Add borders
-        sizeBest.x *= GetToolsCount();
-
-        // reverse horz and vertical components if necessary
-        if ( IsVertical() )
-        {
-            int t = sizeBest.x;
-            sizeBest.x = sizeBest.y;
-            sizeBest.y = t;
-        }
-    }
-    else
-    {
-        sizeBest.x = size.cx;
-        sizeBest.y = size.cy;
-    }
-
-    if (!IsVertical())
-    {
-        // Without the extra height, DoGetBestSize can report a size that's
-        // smaller than the actual window, causing windows to overlap slightly
-        // in some circumstances, leading to missing borders (especially noticeable
-        // in AUI layouts).
-        if (!(GetWindowStyle() & wxTB_NODIVIDER))
-            sizeBest.y += 2;
-        sizeBest.y ++;
-    }
-
-    CacheBestSize(sizeBest);
-
-    return sizeBest;
-}
-
-WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    // toolbars never have border, giving one to them results in broken
-    // appearance
-    WXDWORD msStyle = wxControl::MSWGetStyle
-                      (
-                        (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
-                      );
-
-    if ( !(style & wxTB_NO_TOOLTIPS) )
-        msStyle |= TBSTYLE_TOOLTIPS;
-
-    if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
-    {
-        // static as it doesn't change during the program lifetime
-        static const int s_verComCtl = wxApp::GetComCtl32Version();
-
-        // comctl32.dll 4.00 doesn't support the flat toolbars and using this
-        // style with 6.00 (part of Windows XP) leads to the toolbar with
-        // incorrect background colour - and not using it still results in the
-        // correct (flat) toolbar, so don't use it there
-        if ( s_verComCtl > 400 && s_verComCtl < 600 )
-            msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
-
-        if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
-            msStyle |= TBSTYLE_LIST;
-    }
-
-    if ( style & wxTB_NODIVIDER )
-        msStyle |= CCS_NODIVIDER;
-
-    if ( style & wxTB_NOALIGN )
-        msStyle |= CCS_NOPARENTALIGN;
-
-    if ( style & wxTB_VERTICAL )
-        msStyle |= CCS_VERT;
-
-    if( style & wxTB_BOTTOM )
-        msStyle |= CCS_BOTTOM;
-
-    if ( style & wxTB_RIGHT )
-        msStyle |= CCS_RIGHT;
-
-    return msStyle;
-}
-
-// ----------------------------------------------------------------------------
-// adding/removing tools
-// ----------------------------------------------------------------------------
-
-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
-{
-    // nothing special to do here - we really create the toolbar buttons in
-    // Realize() later
-    tool->Attach(this);
-
-    InvalidateBestSize();
-    return true;
-}
-
-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
-{
-    // the main difficulty we have here is with the controls in the toolbars:
-    // as we (sometimes) use several separators to cover up the space used by
-    // them, the indices are not the same for us and the toolbar
-
-    // first determine the position of the first button to delete: it may be
-    // different from pos if we use several separators to cover the space used
-    // by a control
-    wxToolBarToolsList::compatibility_iterator node;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        wxToolBarToolBase *tool2 = node->GetData();
-        if ( tool2 == tool )
-        {
-            // let node point to the next node in the list
-            node = node->GetNext();
-
-            break;
-        }
-
-        if ( tool2->IsControl() )
-            pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
-    }
-
-    // now determine the number of buttons to delete and the area taken by them
-    size_t nButtonsToDelete = 1;
-
-    // get the size of the button we're going to delete
-    RECT r;
-    if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT, pos, (LPARAM)&r) )
-    {
-        wxLogLastError(_T("TB_GETITEMRECT"));
-    }
-
-    int width = r.right - r.left;
-
-    if ( tool->IsControl() )
-    {
-        nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
-        width *= nButtonsToDelete;
-        tool->GetControl()->Destroy();
-    }
-
-    // do delete all buttons
-    m_nButtons -= nButtonsToDelete;
-    while ( nButtonsToDelete-- > 0 )
-    {
-        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, pos, 0) )
-        {
-            wxLogLastError(wxT("TB_DELETEBUTTON"));
-
-            return false;
-        }
-    }
-
-    tool->Detach();
-
-    // and finally reposition all the controls after this button (the toolbar
-    // takes care of all normal items)
-    for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
-    {
-        wxToolBarTool *tool2 = (wxToolBarTool*)node->GetData();
-        if ( tool2->IsControl() )
-        {
-            int x;
-            wxControl *control = tool2->GetControl();
-            control->GetPosition(&x, NULL);
-            control->Move(x - width, wxDefaultCoord);
-
-            wxStaticText* staticText = tool2->GetStaticText();
-            staticText->Move(x - width, wxDefaultCoord);
-        }
-    }
-
-    InvalidateBestSize();
-
-    return true;
-}
-
-void wxToolBar::CreateDisabledImageList()
-{
-    if (m_disabledImgList != NULL)
-    {
-        delete m_disabledImgList;
-        m_disabledImgList = NULL;
-    }
-
-    // as we can't use disabled image list with older versions of comctl32.dll,
-    // don't even bother creating it
-    if ( wxApp::GetComCtl32Version() >= 470 )
-    {
-        // search for the first disabled button img in the toolbar, if any
-        for ( wxToolBarToolsList::compatibility_iterator
-                node = m_tools.GetFirst(); node; node = node->GetNext() )
-        {
-            wxToolBarToolBase *tool = node->GetData();
-            wxBitmap bmpDisabled = tool->GetDisabledBitmap();
-            if ( bmpDisabled.Ok() )
-            {
-                m_disabledImgList = new wxImageList
-                                        (
-                                            m_defaultWidth,
-                                            m_defaultHeight,
-                                            bmpDisabled.GetMask() != NULL,
-                                            GetToolsCount()
-                                        );
-                break;
-            }
-        }
-
-        // we don't have any disabled bitmaps
-    }
-}
-
-bool wxToolBar::Realize()
-{
-    const size_t nTools = GetToolsCount();
-    if ( nTools == 0 )
-        // nothing to do
-        return true;
-
-#ifdef wxREMAP_BUTTON_COLOURS
-    // don't change the values of these constants, they can be set from the
-    // user code via wxSystemOptions
-    enum
-    {
-        Remap_None = -1,
-        Remap_Bg,
-        Remap_Buttons,
-        Remap_TransparentBg
-    };
-
-    // the user-specified option overrides anything, but if it wasn't set, only
-    // remap the buttons on 8bpp displays as otherwise the bitmaps usually look
-    // much worse after remapping
-    static const wxChar *remapOption = wxT("msw.remap");
-    const int remapValue = wxSystemOptions::HasOption(remapOption)
-                                ? wxSystemOptions::GetOptionInt(remapOption)
-                                : wxDisplayDepth() <= 8 ? Remap_Buttons
-                                                        : Remap_None;
-
-#endif // wxREMAP_BUTTON_COLOURS
-
-    // delete all old buttons, if any
-    for ( size_t pos = 0; pos < m_nButtons; pos++ )
-    {
-        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
-        {
-            wxLogDebug(wxT("TB_DELETEBUTTON failed"));
-        }
-    }
-
-    // First, add the bitmap: we use one bitmap for all toolbar buttons
-    // ----------------------------------------------------------------
-
-    wxToolBarToolsList::compatibility_iterator node;
-    int bitmapId = 0;
-
-    wxSize sizeBmp;
-    if ( HasFlag(wxTB_NOICONS) )
-    {
-        // no icons, don't leave space for them
-        sizeBmp.x =
-        sizeBmp.y = 0;
-    }
-    else // do show icons
-    {
-        // if we already have a bitmap, we'll replace the existing one --
-        // otherwise we'll install a new one
-        HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;
-
-        sizeBmp.x = m_defaultWidth;
-        sizeBmp.y = m_defaultHeight;
-
-        const wxCoord totalBitmapWidth  = m_defaultWidth *
-                                          wx_truncate_cast(wxCoord, nTools),
-                      totalBitmapHeight = m_defaultHeight;
-
-        // Create a bitmap and copy all the tool bitmaps into it
-        wxMemoryDC dcAllButtons;
-        wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
-        dcAllButtons.SelectObject(bitmap);
-
-#ifdef wxREMAP_BUTTON_COLOURS
-        if ( remapValue != Remap_TransparentBg )
-#endif // wxREMAP_BUTTON_COLOURS
-        {
-            // VZ: why do we hardcode grey colour for CE?
-            dcAllButtons.SetBackground(wxBrush(
-#ifdef __WXWINCE__
-                                        wxColour(0xc0, 0xc0, 0xc0)
-#else // !__WXWINCE__
-                                        GetBackgroundColour()
-#endif // __WXWINCE__/!__WXWINCE__
-                                       ));
-            dcAllButtons.Clear();
-        }
-
-        m_hBitmap = bitmap.GetHBITMAP();
-        HBITMAP hBitmap = (HBITMAP)m_hBitmap;
-
-#ifdef wxREMAP_BUTTON_COLOURS
-        if ( remapValue == Remap_Bg )
-        {
-            dcAllButtons.SelectObject(wxNullBitmap);
-
-            // Even if we're not remapping the bitmap
-            // content, we still have to remap the background.
-            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
-                totalBitmapWidth, totalBitmapHeight);
-
-            dcAllButtons.SelectObject(bitmap);
-        }
-#endif // wxREMAP_BUTTON_COLOURS
-
-        // the button position
-        wxCoord x = 0;
-
-        // the number of buttons (not separators)
-        int nButtons = 0;
-
-        CreateDisabledImageList();
-        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-        {
-            wxToolBarToolBase *tool = node->GetData();
-            if ( tool->IsButton() )
-            {
-                const wxBitmap& bmp = tool->GetNormalBitmap();
-
-                const int w = bmp.GetWidth();
-                const int h = bmp.GetHeight();
-
-                if ( bmp.Ok() )
-                {
-                    int xOffset = wxMax(0, (m_defaultWidth - w)/2);
-                    int yOffset = wxMax(0, (m_defaultHeight - h)/2);
-
-                    // notice the last parameter: do use mask
-                    dcAllButtons.DrawBitmap(bmp, x + xOffset, yOffset, true);
-                }
-                else
-                {
-                    wxFAIL_MSG( _T("invalid tool button bitmap") );
-                }
-
-                // also deal with disabled bitmap if we want to use them
-                if ( m_disabledImgList )
-                {
-                    wxBitmap bmpDisabled = tool->GetDisabledBitmap();
-#if wxUSE_IMAGE && wxUSE_WXDIB
-                    if ( !bmpDisabled.Ok() )
-                    {
-                        // no disabled bitmap specified but we still need to
-                        // fill the space in the image list with something, so
-                        // we grey out the normal bitmap
-                        wxImage
-                          imgGreyed = bmp.ConvertToImage().ConvertToGreyscale();
-
-#ifdef wxREMAP_BUTTON_COLOURS
-                        if ( remapValue == Remap_Buttons )
-                        {
-                            // we need to have light grey background colour for
-                            // MapBitmap() to work correctly
-                            for ( int y = 0; y < h; y++ )
-                            {
-                                for ( int x = 0; x < w; x++ )
-                                {
-                                    if ( imgGreyed.IsTransparent(x, y) )
-                                        imgGreyed.SetRGB(x, y,
-                                                         wxLIGHT_GREY->Red(),
-                                                         wxLIGHT_GREY->Green(),
-                                                         wxLIGHT_GREY->Blue());
-                                }
-                            }
-                        }
-#endif // wxREMAP_BUTTON_COLOURS
-
-                        bmpDisabled = wxBitmap(imgGreyed);
-                    }
-#endif // wxUSE_IMAGE
-
-#ifdef wxREMAP_BUTTON_COLOURS
-                    if ( remapValue == Remap_Buttons )
-                        MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
-#endif // wxREMAP_BUTTON_COLOURS
-
-                    m_disabledImgList->Add(bmpDisabled);
-                }
-
-                // still inc width and number of buttons because otherwise the
-                // subsequent buttons will all be shifted which is rather confusing
-                // (and like this you'd see immediately which bitmap was bad)
-                x += m_defaultWidth;
-                nButtons++;
-            }
-        }
-
-        dcAllButtons.SelectObject(wxNullBitmap);
-
-        // don't delete this HBITMAP!
-        bitmap.SetHBITMAP(0);
-
-#ifdef wxREMAP_BUTTON_COLOURS
-        if ( remapValue == Remap_Buttons )
-        {
-            // Map to system colours
-            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
-                                         totalBitmapWidth, totalBitmapHeight);
-        }
-#endif // wxREMAP_BUTTON_COLOURS
-
-        bool addBitmap = true;
-
-        if ( oldToolBarBitmap )
-        {
-#ifdef TB_REPLACEBITMAP
-            if ( wxApp::GetComCtl32Version() >= 400 )
-            {
-                TBREPLACEBITMAP replaceBitmap;
-                replaceBitmap.hInstOld = NULL;
-                replaceBitmap.hInstNew = NULL;
-                replaceBitmap.nIDOld = (UINT_PTR)oldToolBarBitmap;
-                replaceBitmap.nIDNew = (UINT_PTR)hBitmap;
-                replaceBitmap.nButtons = nButtons;
-                if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
-                                    0, (LPARAM) &replaceBitmap) )
-                {
-                    wxFAIL_MSG(wxT("Could not replace the old bitmap"));
-                }
-
-                ::DeleteObject(oldToolBarBitmap);
-
-                // already done
-                addBitmap = false;
-            }
-            else
-#endif // TB_REPLACEBITMAP
-            {
-                // we can't replace the old bitmap, so we will add another one
-                // (awfully inefficient, but what else to do?) and shift the bitmap
-                // indices accordingly
-                addBitmap = true;
-
-                bitmapId = m_nButtons;
-            }
-        }
-
-        if ( addBitmap ) // no old bitmap or we can't replace it
-        {
-            TBADDBITMAP addBitmap;
-            addBitmap.hInst = 0;
-            addBitmap.nID = (UINT_PTR)hBitmap;
-            if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
-                               (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )
-            {
-                wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
-            }
-        }
-
-        // disable image lists are only supported in comctl32.dll 4.70+
-        if ( wxApp::GetComCtl32Version() >= 470 )
-        {
-            HIMAGELIST hil = m_disabledImgList
-                                ? GetHimagelistOf(m_disabledImgList)
-                                : 0;
-
-            // notice that we set the image list even if don't have one right
-            // now as we could have it before and need to reset it in this case
-            HIMAGELIST oldImageList = (HIMAGELIST)
-              ::SendMessage(GetHwnd(), TB_SETDISABLEDIMAGELIST, 0, (LPARAM)hil);
-
-            // delete previous image list if any
-            if ( oldImageList )
-                ::DeleteObject(oldImageList);
-        }
-    }
-
-    // don't call SetToolBitmapSize() as we don't want to change the values of
-    // m_defaultWidth/Height
-    if ( !::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0,
-                        MAKELONG(sizeBmp.x, sizeBmp.y)) )
-    {
-        wxLogLastError(_T("TB_SETBITMAPSIZE"));
-    }
-
-    // Next add the buttons and separators
-    // -----------------------------------
-
-    TBBUTTON *buttons = new TBBUTTON[nTools];
-
-    // this array will hold the indices of all controls in the toolbar
-    wxArrayInt controlIds;
-
-    bool lastWasRadio = false;
-    int i = 0;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        wxToolBarToolBase *tool = node->GetData();
-
-        // don't add separators to the vertical toolbar with old comctl32.dll
-        // versions as they didn't handle this properly
-        if ( IsVertical() && tool->IsSeparator() &&
-                wxApp::GetComCtl32Version() <= 472 )
-        {
-            continue;
-        }
-
-        TBBUTTON& button = buttons[i];
-
-        wxZeroMemory(button);
-
-        bool isRadio = false;
-        switch ( tool->GetStyle() )
-        {
-            case wxTOOL_STYLE_CONTROL:
-                button.idCommand = tool->GetId();
-                // fall through: create just a separator too
-
-            case wxTOOL_STYLE_SEPARATOR:
-                button.fsState = TBSTATE_ENABLED;
-                button.fsStyle = TBSTYLE_SEP;
-                break;
-
-            case wxTOOL_STYLE_BUTTON:
-                if ( !HasFlag(wxTB_NOICONS) )
-                    button.iBitmap = bitmapId;
-
-                if ( HasFlag(wxTB_TEXT) )
-                {
-                    const wxString& label = tool->GetLabel();
-                    if ( !label.empty() )
-                        button.iString = (INT_PTR)label.wx_str();
-                }
-
-                button.idCommand = tool->GetId();
-
-                if ( tool->IsEnabled() )
-                    button.fsState |= TBSTATE_ENABLED;
-                if ( tool->IsToggled() )
-                    button.fsState |= TBSTATE_CHECKED;
-
-                switch ( tool->GetKind() )
-                {
-                    case wxITEM_RADIO:
-                        button.fsStyle = TBSTYLE_CHECKGROUP;
-
-                        if ( !lastWasRadio )
-                        {
-                            // the first item in the radio group is checked by
-                            // default to be consistent with wxGTK and the menu
-                            // radio items
-                            button.fsState |= TBSTATE_CHECKED;
-
-                            if (tool->Toggle(true))
-                            {
-                                DoToggleTool(tool, true);
-                            }
-                        }
-                        else if ( tool->IsToggled() )
-                        {
-                            wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
-                            int prevIndex = i - 1;
-                            while ( nodePrev )
-                            {
-                                TBBUTTON& prevButton = buttons[prevIndex];
-                                wxToolBarToolBase *tool = nodePrev->GetData();
-                                if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
-                                    break;
-
-                                if ( tool->Toggle(false) )
-                                    DoToggleTool(tool, false);
-
-                                prevButton.fsState &= ~TBSTATE_CHECKED;
-                                nodePrev = nodePrev->GetPrevious();
-                                prevIndex--;
-                            }
-                        }
-
-                        isRadio = true;
-                        break;
-
-                    case wxITEM_CHECK:
-                        button.fsStyle = TBSTYLE_CHECK;
-                        break;
-
-                    case wxITEM_NORMAL:
-                        button.fsStyle = TBSTYLE_BUTTON;
-                        break;
-
-                   case wxITEM_DROPDOWN:
-                        button.fsStyle = TBSTYLE_DROPDOWN;
-                        break;
-
-                    default:
-                        wxFAIL_MSG( _T("unexpected toolbar button kind") );
-                        button.fsStyle = TBSTYLE_BUTTON;
-                        break;
-                }
-
-                bitmapId++;
-                break;
-        }
-
-        lastWasRadio = isRadio;
-
-        i++;
-    }
-
-    if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)buttons) )
-    {
-        wxLogLastError(wxT("TB_ADDBUTTONS"));
-    }
-
-    delete [] buttons;
-
-    // Deal with the controls finally
-    // ------------------------------
-
-    // adjust the controls size to fit nicely in the toolbar
-    int y = 0;
-    size_t index = 0;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext(), index++ )
-    {
-        wxToolBarTool *tool = (wxToolBarTool*)node->GetData();
-
-        // we calculate the running y coord for vertical toolbars so we need to
-        // get the items size for all items but for the horizontal ones we
-        // don't need to deal with the non controls
-        bool isControl = tool->IsControl();
-        if ( !isControl && !IsVertical() )
-            continue;
-
-        // note that we use TB_GETITEMRECT and not TB_GETRECT because the
-        // latter only appeared in v4.70 of comctl32.dll
-        RECT r;
-        if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
-                            index, (LPARAM)(LPRECT)&r) )
-        {
-            wxLogLastError(wxT("TB_GETITEMRECT"));
-        }
-
-        if ( !isControl )
-        {
-            // can only be control if isVertical
-            y += r.bottom - r.top;
-
-            continue;
-        }
-
-        wxControl *control = tool->GetControl();
-        wxStaticText * const staticText = tool->GetStaticText();
-
-        wxSize size = control->GetSize();
-        wxSize staticTextSize;
-        if ( staticText )
-        {
-            staticTextSize = staticText->GetSize();
-            staticTextSize.y += 3; // margin between control and its label
-        }
-
-        // the position of the leftmost controls corner
-        int left = wxDefaultCoord;
-
-        // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
-#ifdef TB_SETBUTTONINFO
-        // available in headers, now check whether it is available now
-        // (during run-time)
-        if ( wxApp::GetComCtl32Version() >= 471 )
-        {
-            // set the (underlying) separators width to be that of the
-            // control
-            TBBUTTONINFO tbbi;
-            tbbi.cbSize = sizeof(tbbi);
-            tbbi.dwMask = TBIF_SIZE;
-            tbbi.cx = (WORD)size.x;
-            if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
-                                tool->GetId(), (LPARAM)&tbbi) )
-            {
-                // the id is probably invalid?
-                wxLogLastError(wxT("TB_SETBUTTONINFO"));
-            }
-        }
-        else
-#endif // comctl32.dll 4.71
-        // TB_SETBUTTONINFO unavailable
-        {
-            // try adding several separators to fit the controls width
-            int widthSep = r.right - r.left;
-            left = r.left;
-
-            TBBUTTON tbb;
-            wxZeroMemory(tbb);
-            tbb.idCommand = 0;
-            tbb.fsState = TBSTATE_ENABLED;
-            tbb.fsStyle = TBSTYLE_SEP;
-
-            size_t nSeparators = size.x / widthSep;
-            for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
-            {
-                if ( !::SendMessage(GetHwnd(), TB_INSERTBUTTON,
-                                    index, (LPARAM)&tbb) )
-                {
-                    wxLogLastError(wxT("TB_INSERTBUTTON"));
-                }
-
-                index++;
-            }
-
-            // remember the number of separators we used - we'd have to
-            // delete all of them later
-            ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
-
-            // adjust the controls width to exactly cover the separators
-            size.x = (nSeparators + 1)*widthSep;
-            control->SetSize(size.x, wxDefaultCoord);
-        }
-
-        // position the control itself correctly vertically centering it on the
-        // icon area of the toolbar
-        int height = r.bottom - r.top - staticTextSize.y;
-
-        int diff = height - size.y;
-        if ( diff < 0 || !HasFlag(wxTB_TEXT) )
-        {
-            // not enough room for the static text
-            if ( staticText )
-                staticText->Hide();
-
-            // recalculate height & diff without the staticText control
-            height = r.bottom - r.top;
-            diff = height - size.y;
-            if ( diff < 0 )
-            {
-                // the control is too high, resize to fit
-                control->SetSize(wxDefaultCoord, height - 2);
-
-                diff = 2;
-            }
-        }
-        else // enough space for both the control and the label
-        {
-            if ( staticText )
-                staticText->Show();
-        }
-
-        int top;
-        if ( IsVertical() )
-        {
-            left = 0;
-            top = y;
-
-            y += height + 2 * GetMargins().y;
-        }
-        else // horizontal toolbar
-        {
-            if ( left == wxDefaultCoord )
-                left = r.left;
-
-            top = r.top;
-        }
-
-        control->Move(left, top + (diff + 1) / 2);
-        if ( staticText )
-        {
-            staticText->Move(left + (size.x - staticTextSize.x)/2,
-                             r.bottom - staticTextSize.y);
-        }
-    }
-
-    // the max index is the "real" number of buttons - i.e. counting even the
-    // separators which we added just for aligning the controls
-    m_nButtons = index;
-
-    if ( !IsVertical() )
-    {
-        if ( m_maxRows == 0 )
-            // if not set yet, only one row
-            SetRows(1);
-    }
-    else if ( m_nButtons > 0 ) // vertical non empty toolbar
-    {
-        // if not set yet, have one column
-        m_maxRows = 1;
-        SetRows(m_nButtons);
-    }
-
-    InvalidateBestSize();
-    UpdateSize();
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// message handlers
-// ----------------------------------------------------------------------------
-
-bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
-{
-    // cast to signed is important as we compare this id with (signed) ints in
-    // FindById() and without the cast we'd get a positive int from a
-    // "negative" (i.e. > 32767) WORD
-    const int id = (signed short)id_;
-
-    wxToolBarToolBase *tool = FindById(id);
-    if ( !tool )
-        return false;
-
-    bool toggled = false; // just to suppress warnings
-
-    if ( tool->CanBeToggled() )
-    {
-        LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);
-        toggled = (state & TBSTATE_CHECKED) != 0;
-
-        // ignore the event when a radio button is released, as this doesn't
-        // seem to happen at all, and is handled otherwise
-        if ( tool->GetKind() == wxITEM_RADIO && !toggled )
-            return true;
-
-        tool->Toggle(toggled);
-        UnToggleRadioGroup(tool);
-    }
-
-    // OnLeftClick() can veto the button state change - for buttons which
-    // may be toggled only, of couse
-    if ( !OnLeftClick(id, toggled) && tool->CanBeToggled() )
-    {
-        // revert back
-        tool->Toggle(!toggled);
-
-        ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(!toggled, 0));
-    }
-
-    return true;
-}
-
-bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
-                            WXLPARAM lParam,
-                            WXLPARAM *WXUNUSED(result))
-{
-    LPNMHDR hdr = (LPNMHDR)lParam;
-    if ( hdr->code == TBN_DROPDOWN )
-    {
-        LPNMTOOLBAR tbhdr = (LPNMTOOLBAR)lParam;
-
-        wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tbhdr->iItem);
-        if ( HandleWindowEvent(evt) )
-        {
-            // Event got handled, don't display default popup menu
-            return false;
-        }
-
-        const wxToolBarToolBase * const tool = FindById(tbhdr->iItem);
-        wxCHECK_MSG( tool, false, _T("drop down message for unknown tool") );
-
-        wxMenu * const menu = tool->GetDropdownMenu();
-        if ( !menu )
-            return false;
-
-        // Display popup menu below button
-        RECT r;
-        if (::SendMessage(GetHwnd(), TB_GETITEMRECT, GetToolPos(tbhdr->iItem), (LPARAM)&r))
-            PopupMenu(menu, r.left, r.bottom);
-
-        return true;
-    }
-
-
-    if( !HasFlag(wxTB_NO_TOOLTIPS) )
-    {
-#if wxUSE_TOOLTIPS
-        // First check if this applies to us
-
-        // the tooltips control created by the toolbar is sometimes Unicode, even
-        // in an ANSI application - this seems to be a bug in comctl32.dll v5
-        UINT code = hdr->code;
-        if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )
-            return false;
-
-        HWND toolTipWnd = (HWND)::SendMessage(GetHwnd(), TB_GETTOOLTIPS, 0, 0);
-        if ( toolTipWnd != hdr->hwndFrom )
-            return false;
-
-        LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
-        int id = (int)ttText->hdr.idFrom;
-
-        wxToolBarToolBase *tool = FindById(id);
-        if ( tool )
-            return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
-#else
-        wxUnusedVar(lParam);
-#endif
-    }
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// toolbar geometry
-// ----------------------------------------------------------------------------
-
-void wxToolBar::SetToolBitmapSize(const wxSize& size)
-{
-    wxToolBarBase::SetToolBitmapSize(size);
-
-    ::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y));
-}
-
-void wxToolBar::SetRows(int nRows)
-{
-    if ( nRows == m_maxRows )
-    {
-        // avoid resizing the frame uselessly
-        return;
-    }
-
-    // TRUE in wParam means to create at least as many rows, FALSE -
-    // at most as many
-    RECT rect;
-    ::SendMessage(GetHwnd(), TB_SETROWS,
-                  MAKEWPARAM(nRows, !(GetWindowStyle() & wxTB_VERTICAL)),
-                  (LPARAM) &rect);
-
-    m_maxRows = nRows;
-
-    UpdateSize();
-}
-
-// The button size is bigger than the bitmap size
-wxSize wxToolBar::GetToolSize() const
-{
-    // TB_GETBUTTONSIZE is supported from version 4.70
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
-    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
-    && !defined (__DIGITALMARS__)
-    if ( wxApp::GetComCtl32Version() >= 470 )
-    {
-        DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
-
-        return wxSize(LOWORD(dw), HIWORD(dw));
-    }
-    else
-#endif // comctl32.dll 4.70+
-    {
-        // defaults
-        return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
-    }
-}
-
-static
-wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
-                                               size_t index )
-{
-    wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();
-
-    for ( ; current ; current = current->GetNext() )
-    {
-        if ( index == 0 )
-            return current->GetData();
-
-        wxToolBarTool *tool = (wxToolBarTool *)current->GetData();
-        size_t separators = tool->GetSeparatorsCount();
-
-        // if it is a normal button, sepcount == 0, so skip 1 item (the button)
-        // otherwise, skip as many items as the separator count, plus the
-        // control itself
-        index -= separators ? separators + 1 : 1;
-    }
-
-    return 0;
-}
-
-wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
-{
-    POINT pt;
-    pt.x = x;
-    pt.y = y;
-    int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
-
-    // MBN: when the point ( x, y ) is close to the toolbar border
-    //      TB_HITTEST returns m_nButtons ( not -1 )
-    if ( index < 0 || (size_t)index >= m_nButtons )
-        // it's a separator or there is no tool at all there
-        return (wxToolBarToolBase *)NULL;
-
-    // when TB_SETBUTTONINFO is available (both during compile- and run-time),
-    // we don't use the dummy separators hack
-#ifdef TB_SETBUTTONINFO
-    if ( wxApp::GetComCtl32Version() >= 471 )
-    {
-        return m_tools.Item((size_t)index)->GetData();
-    }
-    else
-#endif // TB_SETBUTTONINFO
-    {
-        return GetItemSkippingDummySpacers( m_tools, (size_t) index );
-    }
-}
-
-void wxToolBar::UpdateSize()
-{
-    wxPoint pos = GetPosition();
-    ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
-    if (pos != GetPosition())
-        Move(pos);
-
-    // In case Realize is called after the initial display (IOW the programmer
-    // may have rebuilt the toolbar) give the frame the option of resizing the
-    // toolbar to full width again, but only if the parent is a frame and the
-    // toolbar is managed by the frame.  Otherwise assume that some other
-    // layout mechanism is controlling the toolbar size and leave it alone.
-    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
-    if ( frame && frame->GetToolBar() == this )
-    {
-        frame->SendSizeEvent();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// toolbar styles
-// ---------------------------------------------------------------------------
-
-// get the TBSTYLE of the given toolbar window
-long wxToolBar::GetMSWToolbarStyle() const
-{
-    return ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
-}
-
-void wxToolBar::SetWindowStyleFlag(long style)
-{
-    // the style bits whose changes force us to recreate the toolbar
-    static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS;
-
-    const long styleOld = GetWindowStyle();
-
-    wxToolBarBase::SetWindowStyleFlag(style);
-
-    // don't recreate an empty toolbar: not only this is unnecessary, but it is
-    // also fatal as we'd then try to recreate the toolbar when it's just being
-    // created
-    if ( GetToolsCount() &&
-            (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) )
-    {
-        // to remove the text labels, simply re-realizing the toolbar is enough
-        // but I don't know of any way to add the text to an existing toolbar
-        // other than by recreating it entirely
-        Recreate();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// tool state
-// ----------------------------------------------------------------------------
-
-void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
-{
-    ::SendMessage(GetHwnd(), TB_ENABLEBUTTON,
-                  (WPARAM)tool->GetId(), (LPARAM)MAKELONG(enable, 0));
-}
-
-void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle)
-{
-    ::SendMessage(GetHwnd(), TB_CHECKBUTTON,
-                  (WPARAM)tool->GetId(), (LPARAM)MAKELONG(toggle, 0));
-}
-
-void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
-{
-    // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or
-    //     without, so we really need to delete the button and recreate it here
-    wxFAIL_MSG( _T("not implemented") );
-}
-
-void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
-{
-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
-    if ( tool )
-    {
-        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
-
-        tool->SetNormalBitmap(bitmap);
-        Realize();
-    }
-}
-
-void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
-{
-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
-    if ( tool )
-    {
-        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
-
-        tool->SetDisabledBitmap(bitmap);
-        Realize();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-// Responds to colour changes, and passes event on to children.
-void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    wxRGBToColour(m_backgroundColour, ::GetSysColor(COLOR_BTNFACE));
-
-    // Remap the buttons
-    Realize();
-
-    // Relayout the toolbar
-    int nrows = m_maxRows;
-    m_maxRows = 0;      // otherwise SetRows() wouldn't do anything
-    SetRows(nrows);
-
-    Refresh();
-
-    // let the event propagate further
-    event.Skip();
-}
-
-void wxToolBar::OnMouseEvent(wxMouseEvent& event)
-{
-    if ( event.Leaving() )
-    {
-        if ( m_pInTool )
-        {
-            OnMouseEnter(wxID_ANY);
-            m_pInTool = NULL;
-        }
-
-        event.Skip();
-        return;
-    }
-
-    if ( event.RightDown() )
-    {
-        // find the tool under the mouse
-        wxCoord x = 0, y = 0;
-        event.GetPosition(&x, &y);
-
-        wxToolBarToolBase *tool = FindToolForPosition(x, y);
-        OnRightClick(tool ? tool->GetId() : -1, x, y);
-    }
-    else
-    {
-        event.Skip();
-    }
-}
-
-// This handler is required to allow the toolbar to be set to a non-default
-// colour: for example, when it must blend in with a notebook page.
-void wxToolBar::OnEraseBackground(wxEraseEvent& event)
-{
-    RECT rect = wxGetClientRect(GetHwnd());
-    
-    wxDC *dc = event.GetDC();
-    if (!dc) return;
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl();
-    HDC hdc = GetHdcOf(*impl);
-
-    int majorVersion, minorVersion;
-    wxGetOsVersion(& majorVersion, & minorVersion);
-
-#if wxUSE_UXTHEME
-    // we may need to draw themed colour so that we appear correctly on
-    // e.g. notebook page under XP with themes but only do it if the parent
-    // draws themed background itself
-    if ( !UseBgCol() && !GetParent()->UseBgCol() )
-    {
-        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
-        if ( theme )
-        {
-            HRESULT
-                hr = theme->DrawThemeParentBackground(GetHwnd(), hdc, &rect);
-            if ( hr == S_OK )
-                return;
-
-            // it can also return S_FALSE which seems to simply say that it
-            // didn't draw anything but no error really occurred
-            if ( FAILED(hr) )
-                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
-        }
-    }
-
-    // Only draw a rebar theme on Vista, since it doesn't jive so well with XP
-    if ( !UseBgCol() && majorVersion >= 6 )
-    {
-        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
-        if ( theme )
-        {
-            wxUxThemeHandle hTheme(this, L"REBAR");
-
-            RECT r;
-            wxRect rect = GetClientRect();
-            wxCopyRectToRECT(rect, r);
-
-            HRESULT hr = theme->DrawThemeBackground(hTheme, hdc, 0, 0, & r, NULL);
-            if ( hr == S_OK )
-                return;
-
-            // it can also return S_FALSE which seems to simply say that it
-            // didn't draw anything but no error really occurred
-            if ( FAILED(hr) )
-                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
-        }
-    }
-
-#endif // wxUSE_UXTHEME
-
-    // we need to always draw our background under XP, as otherwise it doesn't
-    // appear correctly with some themes (e.g. Zune one)
-    if ( majorVersion == 5 ||
-            UseBgCol() || (GetMSWToolbarStyle() & TBSTYLE_TRANSPARENT) )
-    {
-        // do draw our background
-        //
-        // notice that this 'dumb' implementation may cause flicker for some of
-        // the controls in which case they should intercept wxEraseEvent and
-        // process it themselves somehow
-        AutoHBRUSH hBrush(wxColourToRGB(GetBackgroundColour()));
-
-        wxCHANGE_HDC_MAP_MODE(hdc, MM_TEXT);
-        ::FillRect(hdc, &rect, hBrush);
-    }
-    else // we have no non default background colour
-    {
-        // let the system do it for us
-        event.Skip();
-    }
-}
-
-bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
-{
-    // calculate our minor dimension ourselves - we're confusing the standard
-    // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
-    RECT r;
-    if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )
-    {
-        int w, h;
-
-        if ( IsVertical() )
-        {
-            w = r.right - r.left;
-            if ( m_maxRows )
-            {
-                w *= (m_nButtons + m_maxRows - 1)/m_maxRows;
-            }
-            h = HIWORD(lParam);
-        }
-        else
-        {
-            w = LOWORD(lParam);
-            if (HasFlag( wxTB_FLAT ))
-                h = r.bottom - r.top - 3;
-            else
-                h = r.bottom - r.top;
-            if ( m_maxRows )
-            {
-                // FIXME: hardcoded separator line height...
-                h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
-                h *= m_maxRows;
-            }
-        }
-
-        if ( MAKELPARAM(w, h) != lParam )
-        {
-            // size really changed
-            SetSize(w, h);
-        }
-
-        // message processed
-        return true;
-    }
-
-    return false;
-}
-
-bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
-{
-    // erase any dummy separators which were used
-    // for aligning the controls if any here
-
-    // first of all, are there any controls at all?
-    wxToolBarToolsList::compatibility_iterator node;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        if ( node->GetData()->IsControl() )
-            break;
-    }
-
-    if ( !node )
-        // no controls, nothing to erase
-        return false;
-
-    wxSize clientSize = GetClientSize();
-    int majorVersion, minorVersion;
-    wxGetOsVersion(& majorVersion, & minorVersion);
-
-    // prepare the DC on which we'll be drawing
-    wxClientDC dc(this);
-    dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-    RECT r;
-    if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )
-        // nothing to redraw anyhow
-        return false;
-
-    wxRect rectUpdate;
-    wxCopyRECTToRect(r, rectUpdate);
-
-    dc.SetClippingRegion(rectUpdate);
-
-    // draw the toolbar tools, separators &c normally
-    wxControl::MSWWindowProc(WM_PAINT, wParam, lParam);
-
-    // for each control in the toolbar find all the separators intersecting it
-    // and erase them
-    //
-    // NB: this is really the only way to do it as we don't know if a separator
-    //     corresponds to a control (i.e. is a dummy one) or a real one
-    //     otherwise
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        wxToolBarTool *tool = (wxToolBarTool*)node->GetData();
-        if ( tool->IsControl() )
-        {
-            // get the control rect in our client coords
-            wxControl *control = tool->GetControl();
-            wxStaticText *staticText = tool->GetStaticText();
-            wxRect rectCtrl = control->GetRect();
-            wxRect rectStaticText(0,0,0,0);
-            if ( staticText )
-            {
-                rectStaticText = staticText->GetRect();
-            }
-
-            // iterate over all buttons
-            TBBUTTON tbb;
-            int count = ::SendMessage(GetHwnd(), TB_BUTTONCOUNT, 0, 0);
-            for ( int n = 0; n < count; n++ )
-            {
-                // is it a separator?
-                if ( !::SendMessage(GetHwnd(), TB_GETBUTTON,
-                                    n, (LPARAM)&tbb) )
-                {
-                    wxLogDebug(_T("TB_GETBUTTON failed?"));
-
-                    continue;
-                }
-
-                if ( tbb.fsStyle != TBSTYLE_SEP )
-                    continue;
-
-                // get the bounding rect of the separator
-                RECT r;
-                if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
-                                    n, (LPARAM)&r) )
-                {
-                    wxLogDebug(_T("TB_GETITEMRECT failed?"));
-
-                    continue;
-                }
-
-                // does it intersect the control?
-                wxRect rectItem;
-                wxCopyRECTToRect(r, rectItem);
-                if ( rectCtrl.Intersects(rectItem) || (staticText && rectStaticText.Intersects(rectItem)))
-                {
-                    // yes, do erase it!
-
-                    bool haveRefreshed = false;
-
-#if wxUSE_UXTHEME
-                    if ( !UseBgCol() && !GetParent()->UseBgCol() )
-                    {
-                        // Don't use DrawThemeBackground
-                    }
-                    else if ( !UseBgCol() && majorVersion >= 6 )
-                    {
-                        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
-                        if ( theme )
-                        {
-                            wxUxThemeHandle hTheme(this, L"REBAR");
-
-                            RECT clipRect = r;
-
-                            // Draw the whole background since the pattern may be position sensitive;
-                            // but clip it to the area of interest.
-                            r.left = 0;
-                            r.right = clientSize.x;
-                            r.top = 0;
-                            r.bottom = clientSize.y;
-                            
-                            wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-                            HRESULT hr = theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), 0, 0, & r, & clipRect);
-                            if ( hr == S_OK )
-                                haveRefreshed = true;
-                        }
-                    }
-#endif
-
-                    if (!haveRefreshed)
-                        dc.DrawRectangle(rectItem);
-                }
-
-                if ( rectCtrl.Intersects(rectItem) )
-                {
-                    // Necessary in case we use a no-paint-on-size
-                    // style in the parent: the controls can disappear
-                    control->Refresh(false);
-                }
-
-                if ( staticText && rectStaticText.Intersects(rectItem) )
-                {
-                    // Necessary in case we use a no-paint-on-size
-                    // style in the parent: the controls can disappear
-                    staticText->Refresh(false);
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
-{
-    wxCoord x = GET_X_LPARAM(lParam),
-            y = GET_Y_LPARAM(lParam);
-    wxToolBarToolBase* tool = FindToolForPosition( x, y );
-
-    // has the current tool changed?
-    if ( tool != m_pInTool )
-    {
-        m_pInTool = tool;
-        OnMouseEnter(tool ? tool->GetId() : wxID_ANY);
-    }
-}
-
-WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    switch ( nMsg )
-    {
-        case WM_MOUSEMOVE:
-            // we don't handle mouse moves, so always pass the message to
-            // wxControl::MSWWindowProc (HandleMouseMove just calls OnMouseEnter)
-            HandleMouseMove(wParam, lParam);
-            break;
-
-        case WM_SIZE:
-            if ( HandleSize(wParam, lParam) )
-                return 0;
-            break;
-
-#ifndef __WXWINCE__
-        case WM_PAINT:
-            if ( HandlePaint(wParam, lParam) )
-                return 0;
-#endif
-
-        default:
-            break;
-    }
-
-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-#ifdef wxREMAP_BUTTON_COLOURS
-
-WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
-{
-    MemoryHDC hdcMem;
-
-    if ( !hdcMem )
-    {
-        wxLogLastError(_T("CreateCompatibleDC"));
-
-        return bitmap;
-    }
-
-    SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap);
-
-    if ( !bmpInHDC )
-    {
-        wxLogLastError(_T("SelectObject"));
-
-        return bitmap;
-    }
-
-    wxCOLORMAP *cmap = wxGetStdColourMap();
-
-    for ( int i = 0; i < width; i++ )
-    {
-        for ( int j = 0; j < height; j++ )
-        {
-            COLORREF pixel = ::GetPixel(hdcMem, i, j);
-
-            for ( size_t k = 0; k < wxSTD_COL_MAX; k++ )
-            {
-                COLORREF col = cmap[k].from;
-                if ( abs(GetRValue(pixel) - GetRValue(col)) < 10 &&
-                     abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
-                     abs(GetBValue(pixel) - GetBValue(col)) < 10 )
-                {
-                    if ( cmap[k].to != pixel )
-                        ::SetPixel(hdcMem, i, j, cmap[k].to);
-                    break;
-                }
-            }
-        }
-    }
-
-    return bitmap;
-}
-
-#endif // wxREMAP_BUTTON_COLOURS
-
-#endif // wxUSE_TOOLBAR
diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp

new file mode 100644 (file)

index 0000000..3bfec13
--- /dev/null
+++ b/src/msw/toolbar.cpp
@@ -0,0 +1,1909 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/toolbar.cpp
+// Purpose:     wxToolBar
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
+
+#include "wx/toolbar.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/dynarray.h"
+    #include "wx/frame.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/bitmap.h"
+    #include "wx/dcmemory.h"
+    #include "wx/control.h"
+    #include "wx/app.h"         // for GetComCtl32Version
+    #include "wx/image.h"
+    #include "wx/stattext.h"
+#endif
+
+#include "wx/sysopt.h"
+#include "wx/dcclient.h"
+
+#include "wx/msw/private.h"
+#include "wx/msw/dc.h"
+
+#if wxUSE_UXTHEME
+#include "wx/msw/uxtheme.h"
+#endif
+
+// this define controls whether the code for button colours remapping (only
+// useful for 16 or 256 colour images) is active at all, it's always turned off
+// for CE where it doesn't compile (and is probably not needed anyhow) and may
+// also be turned off for other systems if you always use 24bpp images and so
+// never need it
+#ifndef __WXWINCE__
+    #define wxREMAP_BUTTON_COLOURS
+#endif // !__WXWINCE__
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// these standard constants are not always defined in compilers headers
+
+// Styles
+#ifndef TBSTYLE_FLAT
+    #define TBSTYLE_LIST            0x1000
+    #define TBSTYLE_FLAT            0x0800
+#endif
+
+#ifndef TBSTYLE_TRANSPARENT
+    #define TBSTYLE_TRANSPARENT     0x8000
+#endif
+
+#ifndef TBSTYLE_TOOLTIPS
+    #define TBSTYLE_TOOLTIPS        0x0100
+#endif
+
+// Messages
+#ifndef TB_GETSTYLE
+    #define TB_SETSTYLE             (WM_USER + 56)
+    #define TB_GETSTYLE             (WM_USER + 57)
+#endif
+
+#ifndef TB_HITTEST
+    #define TB_HITTEST              (WM_USER + 69)
+#endif
+
+#ifndef TB_GETMAXSIZE
+    #define TB_GETMAXSIZE           (WM_USER + 83)
+#endif
+
+// these values correspond to those used by comctl32.dll
+#define DEFAULTBITMAPX   16
+#define DEFAULTBITMAPY   15
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+/*
+    TOOLBAR PROPERTIES
+        tool
+            bitmap
+            bitmap2
+            tooltip
+            longhelp
+            radio (bool)
+            toggle (bool)
+        separator
+        style ( wxNO_BORDER | wxTB_HORIZONTAL)
+        bitmapsize
+        margins
+        packing
+        separation
+
+        dontattachtoframe
+*/
+
+BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+    EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
+    EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
+    EVT_ERASE_BACKGROUND(wxToolBar::OnEraseBackground)
+END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxToolBarTool : public wxToolBarToolBase
+{
+public:
+    wxToolBarTool(wxToolBar *tbar,
+                  int id,
+                  const wxString& label,
+                  const wxBitmap& bmpNormal,
+                  const wxBitmap& bmpDisabled,
+                  wxItemKind kind,
+                  wxObject *clientData,
+                  const wxString& shortHelp,
+                  const wxString& longHelp)
+        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+                            clientData, shortHelp, longHelp)
+    {
+        m_nSepCount = 0;
+        m_staticText = 0;
+    }
+
+    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)
+    {
+        if ( IsControl() && !m_label.empty() )
+        {
+            // create a control to render the control's label
+            m_staticText = new wxStaticText
+                               (
+                                 m_tbar,
+                                 wxID_ANY,
+                                 m_label,
+                                 wxDefaultPosition,
+                                 wxDefaultSize,
+                                 wxALIGN_CENTRE | wxST_NO_AUTORESIZE
+                               );
+        }
+        else // no label
+        {
+            m_staticText = NULL;
+        }
+
+        m_nSepCount = 1;
+    }
+
+    virtual ~wxToolBarTool()
+    {
+        delete m_staticText;
+    }
+
+    virtual void SetLabel(const wxString& label)
+    {
+        if ( label == m_label )
+            return;
+
+        wxToolBarToolBase::SetLabel(label);
+
+        if ( m_staticText )
+            m_staticText->SetLabel(label);
+
+        // we need to update the label shown in the toolbar because it has a
+        // pointer to the internal buffer of the old label
+        //
+        // TODO: use TB_SETBUTTONINFO
+    }
+
+    wxStaticText* GetStaticText()
+    {
+        wxASSERT_MSG( IsControl(),
+                      _T("only makes sense for embedded control tools") );
+
+        return m_staticText;
+    }
+
+    // set/get the number of separators which we use to cover the space used by
+    // a control in the toolbar
+    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
+    size_t GetSeparatorsCount() const { return m_nSepCount; }
+
+private:
+    size_t m_nSepCount;
+    wxStaticText *m_staticText;
+
+    DECLARE_NO_COPY_CLASS(wxToolBarTool)
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+                                         const wxString& label,
+                                         const wxBitmap& bmpNormal,
+                                         const wxBitmap& bmpDisabled,
+                                         wxItemKind kind,
+                                         wxObject *clientData,
+                                         const wxString& shortHelp,
+                                         const wxString& longHelp)
+{
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);
+}
+
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)
+{
+    return new wxToolBarTool(this, control, label);
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar construction
+// ----------------------------------------------------------------------------
+
+void wxToolBar::Init()
+{
+    m_hBitmap = 0;
+    m_disabledImgList = NULL;
+
+    m_nButtons = 0;
+
+    m_defaultWidth = DEFAULTBITMAPX;
+    m_defaultHeight = DEFAULTBITMAPY;
+
+    m_pInTool = NULL;
+}
+
+bool wxToolBar::Create(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxString& name)
+{
+    // common initialisation
+    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return false;
+
+    FixupStyle();
+
+    // MSW-specific initialisation
+    if ( !MSWCreateToolbar(pos, size) )
+        return false;
+
+    wxSetCCUnicodeFormat(GetHwnd());
+
+    // workaround for flat toolbar on Windows XP classic style: we have to set
+    // the style after creating the control; doing it at creation time doesn't work
+#if wxUSE_UXTHEME
+    if ( style & wxTB_FLAT )
+    {
+        LRESULT style = GetMSWToolbarStyle();
+
+        if ( !(style & TBSTYLE_FLAT) )
+            ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
+    }
+#endif // wxUSE_UXTHEME
+
+    return true;
+}
+
+bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
+{
+    if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )
+        return false;
+
+    // toolbar-specific post initialisation
+    ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
+
+#ifdef TB_SETEXTENDEDSTYLE
+    if ( wxApp::GetComCtl32Version() >= 471 )
+        ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
+#endif
+
+    return true;
+}
+
+void wxToolBar::Recreate()
+{
+    const HWND hwndOld = GetHwnd();
+    if ( !hwndOld )
+    {
+        // we haven't been created yet, no need to recreate
+        return;
+    }
+
+    // get the position and size before unsubclassing the old toolbar
+    const wxPoint pos = GetPosition();
+    const wxSize size = GetSize();
+
+    UnsubclassWin();
+
+    if ( !MSWCreateToolbar(pos, size) )
+    {
+        // what can we do?
+        wxFAIL_MSG( _T("recreating the toolbar failed") );
+
+        return;
+    }
+
+    // reparent all our children under the new toolbar
+    for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel() )
+            ::SetParent(GetHwndOf(win), GetHwnd());
+    }
+
+    // only destroy the old toolbar now --
+    // after all the children had been reparented
+    ::DestroyWindow(hwndOld);
+
+    // it is for the old bitmap control and can't be used with the new one
+    if ( m_hBitmap )
+    {
+        ::DeleteObject((HBITMAP) m_hBitmap);
+        m_hBitmap = 0;
+    }
+
+    if ( m_disabledImgList )
+    {
+        delete m_disabledImgList;
+        m_disabledImgList = NULL;
+    }
+
+    Realize();
+}
+
+wxToolBar::~wxToolBar()
+{
+    // we must refresh the frame size when the toolbar is deleted but the frame
+    // is not - otherwise toolbar leaves a hole in the place it used to occupy
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && !frame->IsBeingDeleted() )
+        frame->SendSizeEvent();
+
+    if ( m_hBitmap )
+        ::DeleteObject((HBITMAP) m_hBitmap);
+
+    delete m_disabledImgList;
+}
+
+wxSize wxToolBar::DoGetBestSize() const
+{
+    wxSize sizeBest;
+
+    SIZE size;
+    if ( !::SendMessage(GetHwnd(), TB_GETMAXSIZE, 0, (LPARAM)&size) )
+    {
+        // maybe an old (< 0x400) Windows version? try to approximate the
+        // toolbar size ourselves
+        sizeBest = GetToolSize();
+        sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER); // Add borders
+        sizeBest.x *= GetToolsCount();
+
+        // reverse horz and vertical components if necessary
+        if ( IsVertical() )
+        {
+            int t = sizeBest.x;
+            sizeBest.x = sizeBest.y;
+            sizeBest.y = t;
+        }
+    }
+    else
+    {
+        sizeBest.x = size.cx;
+        sizeBest.y = size.cy;
+    }
+
+    if (!IsVertical())
+    {
+        // Without the extra height, DoGetBestSize can report a size that's
+        // smaller than the actual window, causing windows to overlap slightly
+        // in some circumstances, leading to missing borders (especially noticeable
+        // in AUI layouts).
+        if (!(GetWindowStyle() & wxTB_NODIVIDER))
+            sizeBest.y += 2;
+        sizeBest.y ++;
+    }
+
+    CacheBestSize(sizeBest);
+
+    return sizeBest;
+}
+
+WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    // toolbars never have border, giving one to them results in broken
+    // appearance
+    WXDWORD msStyle = wxControl::MSWGetStyle
+                      (
+                        (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
+                      );
+
+    if ( !(style & wxTB_NO_TOOLTIPS) )
+        msStyle |= TBSTYLE_TOOLTIPS;
+
+    if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
+    {
+        // static as it doesn't change during the program lifetime
+        static const int s_verComCtl = wxApp::GetComCtl32Version();
+
+        // comctl32.dll 4.00 doesn't support the flat toolbars and using this
+        // style with 6.00 (part of Windows XP) leads to the toolbar with
+        // incorrect background colour - and not using it still results in the
+        // correct (flat) toolbar, so don't use it there
+        if ( s_verComCtl > 400 && s_verComCtl < 600 )
+            msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
+
+        if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
+            msStyle |= TBSTYLE_LIST;
+    }
+
+    if ( style & wxTB_NODIVIDER )
+        msStyle |= CCS_NODIVIDER;
+
+    if ( style & wxTB_NOALIGN )
+        msStyle |= CCS_NOPARENTALIGN;
+
+    if ( style & wxTB_VERTICAL )
+        msStyle |= CCS_VERT;
+
+    if( style & wxTB_BOTTOM )
+        msStyle |= CCS_BOTTOM;
+
+    if ( style & wxTB_RIGHT )
+        msStyle |= CCS_RIGHT;
+
+    return msStyle;
+}
+
+// ----------------------------------------------------------------------------
+// adding/removing tools
+// ----------------------------------------------------------------------------
+
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
+{
+    // nothing special to do here - we really create the toolbar buttons in
+    // Realize() later
+    tool->Attach(this);
+
+    InvalidateBestSize();
+    return true;
+}
+
+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+{
+    // the main difficulty we have here is with the controls in the toolbars:
+    // as we (sometimes) use several separators to cover up the space used by
+    // them, the indices are not the same for us and the toolbar
+
+    // first determine the position of the first button to delete: it may be
+    // different from pos if we use several separators to cover the space used
+    // by a control
+    wxToolBarToolsList::compatibility_iterator node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool2 = node->GetData();
+        if ( tool2 == tool )
+        {
+            // let node point to the next node in the list
+            node = node->GetNext();
+
+            break;
+        }
+
+        if ( tool2->IsControl() )
+            pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
+    }
+
+    // now determine the number of buttons to delete and the area taken by them
+    size_t nButtonsToDelete = 1;
+
+    // get the size of the button we're going to delete
+    RECT r;
+    if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT, pos, (LPARAM)&r) )
+    {
+        wxLogLastError(_T("TB_GETITEMRECT"));
+    }
+
+    int width = r.right - r.left;
+
+    if ( tool->IsControl() )
+    {
+        nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
+        width *= nButtonsToDelete;
+        tool->GetControl()->Destroy();
+    }
+
+    // do delete all buttons
+    m_nButtons -= nButtonsToDelete;
+    while ( nButtonsToDelete-- > 0 )
+    {
+        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, pos, 0) )
+        {
+            wxLogLastError(wxT("TB_DELETEBUTTON"));
+
+            return false;
+        }
+    }
+
+    tool->Detach();
+
+    // and finally reposition all the controls after this button (the toolbar
+    // takes care of all normal items)
+    for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
+    {
+        wxToolBarTool *tool2 = (wxToolBarTool*)node->GetData();
+        if ( tool2->IsControl() )
+        {
+            int x;
+            wxControl *control = tool2->GetControl();
+            control->GetPosition(&x, NULL);
+            control->Move(x - width, wxDefaultCoord);
+
+            wxStaticText* staticText = tool2->GetStaticText();
+            staticText->Move(x - width, wxDefaultCoord);
+        }
+    }
+
+    InvalidateBestSize();
+
+    return true;
+}
+
+void wxToolBar::CreateDisabledImageList()
+{
+    if (m_disabledImgList != NULL)
+    {
+        delete m_disabledImgList;
+        m_disabledImgList = NULL;
+    }
+
+    // as we can't use disabled image list with older versions of comctl32.dll,
+    // don't even bother creating it
+    if ( wxApp::GetComCtl32Version() >= 470 )
+    {
+        // search for the first disabled button img in the toolbar, if any
+        for ( wxToolBarToolsList::compatibility_iterator
+                node = m_tools.GetFirst(); node; node = node->GetNext() )
+        {
+            wxToolBarToolBase *tool = node->GetData();
+            wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+            if ( bmpDisabled.Ok() )
+            {
+                m_disabledImgList = new wxImageList
+                                        (
+                                            m_defaultWidth,
+                                            m_defaultHeight,
+                                            bmpDisabled.GetMask() != NULL,
+                                            GetToolsCount()
+                                        );
+                break;
+            }
+        }
+
+        // we don't have any disabled bitmaps
+    }
+}
+
+bool wxToolBar::Realize()
+{
+    const size_t nTools = GetToolsCount();
+    if ( nTools == 0 )
+        // nothing to do
+        return true;
+
+#ifdef wxREMAP_BUTTON_COLOURS
+    // don't change the values of these constants, they can be set from the
+    // user code via wxSystemOptions
+    enum
+    {
+        Remap_None = -1,
+        Remap_Bg,
+        Remap_Buttons,
+        Remap_TransparentBg
+    };
+
+    // the user-specified option overrides anything, but if it wasn't set, only
+    // remap the buttons on 8bpp displays as otherwise the bitmaps usually look
+    // much worse after remapping
+    static const wxChar *remapOption = wxT("msw.remap");
+    const int remapValue = wxSystemOptions::HasOption(remapOption)
+                                ? wxSystemOptions::GetOptionInt(remapOption)
+                                : wxDisplayDepth() <= 8 ? Remap_Buttons
+                                                        : Remap_None;
+
+#endif // wxREMAP_BUTTON_COLOURS
+
+    // delete all old buttons, if any
+    for ( size_t pos = 0; pos < m_nButtons; pos++ )
+    {
+        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
+        {
+            wxLogDebug(wxT("TB_DELETEBUTTON failed"));
+        }
+    }
+
+    // First, add the bitmap: we use one bitmap for all toolbar buttons
+    // ----------------------------------------------------------------
+
+    wxToolBarToolsList::compatibility_iterator node;
+    int bitmapId = 0;
+
+    wxSize sizeBmp;
+    if ( HasFlag(wxTB_NOICONS) )
+    {
+        // no icons, don't leave space for them
+        sizeBmp.x =
+        sizeBmp.y = 0;
+    }
+    else // do show icons
+    {
+        // if we already have a bitmap, we'll replace the existing one --
+        // otherwise we'll install a new one
+        HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;
+
+        sizeBmp.x = m_defaultWidth;
+        sizeBmp.y = m_defaultHeight;
+
+        const wxCoord totalBitmapWidth  = m_defaultWidth *
+                                          wx_truncate_cast(wxCoord, nTools),
+                      totalBitmapHeight = m_defaultHeight;
+
+        // Create a bitmap and copy all the tool bitmaps into it
+        wxMemoryDC dcAllButtons;
+        wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
+        dcAllButtons.SelectObject(bitmap);
+
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue != Remap_TransparentBg )
+#endif // wxREMAP_BUTTON_COLOURS
+        {
+            // VZ: why do we hardcode grey colour for CE?
+            dcAllButtons.SetBackground(wxBrush(
+#ifdef __WXWINCE__
+                                        wxColour(0xc0, 0xc0, 0xc0)
+#else // !__WXWINCE__
+                                        GetBackgroundColour()
+#endif // __WXWINCE__/!__WXWINCE__
+                                       ));
+            dcAllButtons.Clear();
+        }
+
+        m_hBitmap = bitmap.GetHBITMAP();
+        HBITMAP hBitmap = (HBITMAP)m_hBitmap;
+
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue == Remap_Bg )
+        {
+            dcAllButtons.SelectObject(wxNullBitmap);
+
+            // Even if we're not remapping the bitmap
+            // content, we still have to remap the background.
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);
+
+            dcAllButtons.SelectObject(bitmap);
+        }
+#endif // wxREMAP_BUTTON_COLOURS
+
+        // the button position
+        wxCoord x = 0;
+
+        // the number of buttons (not separators)
+        int nButtons = 0;
+
+        CreateDisabledImageList();
+        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+        {
+            wxToolBarToolBase *tool = node->GetData();
+            if ( tool->IsButton() )
+            {
+                const wxBitmap& bmp = tool->GetNormalBitmap();
+
+                const int w = bmp.GetWidth();
+                const int h = bmp.GetHeight();
+
+                if ( bmp.Ok() )
+                {
+                    int xOffset = wxMax(0, (m_defaultWidth - w)/2);
+                    int yOffset = wxMax(0, (m_defaultHeight - h)/2);
+
+                    // notice the last parameter: do use mask
+                    dcAllButtons.DrawBitmap(bmp, x + xOffset, yOffset, true);
+                }
+                else
+                {
+                    wxFAIL_MSG( _T("invalid tool button bitmap") );
+                }
+
+                // also deal with disabled bitmap if we want to use them
+                if ( m_disabledImgList )
+                {
+                    wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+#if wxUSE_IMAGE && wxUSE_WXDIB
+                    if ( !bmpDisabled.Ok() )
+                    {
+                        // no disabled bitmap specified but we still need to
+                        // fill the space in the image list with something, so
+                        // we grey out the normal bitmap
+                        wxImage
+                          imgGreyed = bmp.ConvertToImage().ConvertToGreyscale();
+
+#ifdef wxREMAP_BUTTON_COLOURS
+                        if ( remapValue == Remap_Buttons )
+                        {
+                            // we need to have light grey background colour for
+                            // MapBitmap() to work correctly
+                            for ( int y = 0; y < h; y++ )
+                            {
+                                for ( int x = 0; x < w; x++ )
+                                {
+                                    if ( imgGreyed.IsTransparent(x, y) )
+                                        imgGreyed.SetRGB(x, y,
+                                                         wxLIGHT_GREY->Red(),
+                                                         wxLIGHT_GREY->Green(),
+                                                         wxLIGHT_GREY->Blue());
+                                }
+                            }
+                        }
+#endif // wxREMAP_BUTTON_COLOURS
+
+                        bmpDisabled = wxBitmap(imgGreyed);
+                    }
+#endif // wxUSE_IMAGE
+
+#ifdef wxREMAP_BUTTON_COLOURS
+                    if ( remapValue == Remap_Buttons )
+                        MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+#endif // wxREMAP_BUTTON_COLOURS
+
+                    m_disabledImgList->Add(bmpDisabled);
+                }
+
+                // still inc width and number of buttons because otherwise the
+                // subsequent buttons will all be shifted which is rather confusing
+                // (and like this you'd see immediately which bitmap was bad)
+                x += m_defaultWidth;
+                nButtons++;
+            }
+        }
+
+        dcAllButtons.SelectObject(wxNullBitmap);
+
+        // don't delete this HBITMAP!
+        bitmap.SetHBITMAP(0);
+
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue == Remap_Buttons )
+        {
+            // Map to system colours
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                                         totalBitmapWidth, totalBitmapHeight);
+        }
+#endif // wxREMAP_BUTTON_COLOURS
+
+        bool addBitmap = true;
+
+        if ( oldToolBarBitmap )
+        {
+#ifdef TB_REPLACEBITMAP
+            if ( wxApp::GetComCtl32Version() >= 400 )
+            {
+                TBREPLACEBITMAP replaceBitmap;
+                replaceBitmap.hInstOld = NULL;
+                replaceBitmap.hInstNew = NULL;
+                replaceBitmap.nIDOld = (UINT_PTR)oldToolBarBitmap;
+                replaceBitmap.nIDNew = (UINT_PTR)hBitmap;
+                replaceBitmap.nButtons = nButtons;
+                if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
+                                    0, (LPARAM) &replaceBitmap) )
+                {
+                    wxFAIL_MSG(wxT("Could not replace the old bitmap"));
+                }
+
+                ::DeleteObject(oldToolBarBitmap);
+
+                // already done
+                addBitmap = false;
+            }
+            else
+#endif // TB_REPLACEBITMAP
+            {
+                // we can't replace the old bitmap, so we will add another one
+                // (awfully inefficient, but what else to do?) and shift the bitmap
+                // indices accordingly
+                addBitmap = true;
+
+                bitmapId = m_nButtons;
+            }
+        }
+
+        if ( addBitmap ) // no old bitmap or we can't replace it
+        {
+            TBADDBITMAP addBitmap;
+            addBitmap.hInst = 0;
+            addBitmap.nID = (UINT_PTR)hBitmap;
+            if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
+                               (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )
+            {
+                wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
+            }
+        }
+
+        // disable image lists are only supported in comctl32.dll 4.70+
+        if ( wxApp::GetComCtl32Version() >= 470 )
+        {
+            HIMAGELIST hil = m_disabledImgList
+                                ? GetHimagelistOf(m_disabledImgList)
+                                : 0;
+
+            // notice that we set the image list even if don't have one right
+            // now as we could have it before and need to reset it in this case
+            HIMAGELIST oldImageList = (HIMAGELIST)
+              ::SendMessage(GetHwnd(), TB_SETDISABLEDIMAGELIST, 0, (LPARAM)hil);
+
+            // delete previous image list if any
+            if ( oldImageList )
+                ::DeleteObject(oldImageList);
+        }
+    }
+
+    // don't call SetToolBitmapSize() as we don't want to change the values of
+    // m_defaultWidth/Height
+    if ( !::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0,
+                        MAKELONG(sizeBmp.x, sizeBmp.y)) )
+    {
+        wxLogLastError(_T("TB_SETBITMAPSIZE"));
+    }
+
+    // Next add the buttons and separators
+    // -----------------------------------
+
+    TBBUTTON *buttons = new TBBUTTON[nTools];
+
+    // this array will hold the indices of all controls in the toolbar
+    wxArrayInt controlIds;
+
+    bool lastWasRadio = false;
+    int i = 0;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool = node->GetData();
+
+        // don't add separators to the vertical toolbar with old comctl32.dll
+        // versions as they didn't handle this properly
+        if ( IsVertical() && tool->IsSeparator() &&
+                wxApp::GetComCtl32Version() <= 472 )
+        {
+            continue;
+        }
+
+        TBBUTTON& button = buttons[i];
+
+        wxZeroMemory(button);
+
+        bool isRadio = false;
+        switch ( tool->GetStyle() )
+        {
+            case wxTOOL_STYLE_CONTROL:
+                button.idCommand = tool->GetId();
+                // fall through: create just a separator too
+
+            case wxTOOL_STYLE_SEPARATOR:
+                button.fsState = TBSTATE_ENABLED;
+                button.fsStyle = TBSTYLE_SEP;
+                break;
+
+            case wxTOOL_STYLE_BUTTON:
+                if ( !HasFlag(wxTB_NOICONS) )
+                    button.iBitmap = bitmapId;
+
+                if ( HasFlag(wxTB_TEXT) )
+                {
+                    const wxString& label = tool->GetLabel();
+                    if ( !label.empty() )
+                        button.iString = (INT_PTR)label.wx_str();
+                }
+
+                button.idCommand = tool->GetId();
+
+                if ( tool->IsEnabled() )
+                    button.fsState |= TBSTATE_ENABLED;
+                if ( tool->IsToggled() )
+                    button.fsState |= TBSTATE_CHECKED;
+
+                switch ( tool->GetKind() )
+                {
+                    case wxITEM_RADIO:
+                        button.fsStyle = TBSTYLE_CHECKGROUP;
+
+                        if ( !lastWasRadio )
+                        {
+                            // the first item in the radio group is checked by
+                            // default to be consistent with wxGTK and the menu
+                            // radio items
+                            button.fsState |= TBSTATE_CHECKED;
+
+                            if (tool->Toggle(true))
+                            {
+                                DoToggleTool(tool, true);
+                            }
+                        }
+                        else if ( tool->IsToggled() )
+                        {
+                            wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+                            int prevIndex = i - 1;
+                            while ( nodePrev )
+                            {
+                                TBBUTTON& prevButton = buttons[prevIndex];
+                                wxToolBarToolBase *tool = nodePrev->GetData();
+                                if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+                                    break;
+
+                                if ( tool->Toggle(false) )
+                                    DoToggleTool(tool, false);
+
+                                prevButton.fsState &= ~TBSTATE_CHECKED;
+                                nodePrev = nodePrev->GetPrevious();
+                                prevIndex--;
+                            }
+                        }
+
+                        isRadio = true;
+                        break;
+
+                    case wxITEM_CHECK:
+                        button.fsStyle = TBSTYLE_CHECK;
+                        break;
+
+                    case wxITEM_NORMAL:
+                        button.fsStyle = TBSTYLE_BUTTON;
+                        break;
+
+                   case wxITEM_DROPDOWN:
+                        button.fsStyle = TBSTYLE_DROPDOWN;
+                        break;
+
+                    default:
+                        wxFAIL_MSG( _T("unexpected toolbar button kind") );
+                        button.fsStyle = TBSTYLE_BUTTON;
+                        break;
+                }
+
+                bitmapId++;
+                break;
+        }
+
+        lastWasRadio = isRadio;
+
+        i++;
+    }
+
+    if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)buttons) )
+    {
+        wxLogLastError(wxT("TB_ADDBUTTONS"));
+    }
+
+    delete [] buttons;
+
+    // Deal with the controls finally
+    // ------------------------------
+
+    // adjust the controls size to fit nicely in the toolbar
+    int y = 0;
+    size_t index = 0;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext(), index++ )
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->GetData();
+
+        // we calculate the running y coord for vertical toolbars so we need to
+        // get the items size for all items but for the horizontal ones we
+        // don't need to deal with the non controls
+        bool isControl = tool->IsControl();
+        if ( !isControl && !IsVertical() )
+            continue;
+
+        // note that we use TB_GETITEMRECT and not TB_GETRECT because the
+        // latter only appeared in v4.70 of comctl32.dll
+        RECT r;
+        if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
+                            index, (LPARAM)(LPRECT)&r) )
+        {
+            wxLogLastError(wxT("TB_GETITEMRECT"));
+        }
+
+        if ( !isControl )
+        {
+            // can only be control if isVertical
+            y += r.bottom - r.top;
+
+            continue;
+        }
+
+        wxControl *control = tool->GetControl();
+        wxStaticText * const staticText = tool->GetStaticText();
+
+        wxSize size = control->GetSize();
+        wxSize staticTextSize;
+        if ( staticText )
+        {
+            staticTextSize = staticText->GetSize();
+            staticTextSize.y += 3; // margin between control and its label
+        }
+
+        // the position of the leftmost controls corner
+        int left = wxDefaultCoord;
+
+        // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
+#ifdef TB_SETBUTTONINFO
+        // available in headers, now check whether it is available now
+        // (during run-time)
+        if ( wxApp::GetComCtl32Version() >= 471 )
+        {
+            // set the (underlying) separators width to be that of the
+            // control
+            TBBUTTONINFO tbbi;
+            tbbi.cbSize = sizeof(tbbi);
+            tbbi.dwMask = TBIF_SIZE;
+            tbbi.cx = (WORD)size.x;
+            if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
+                                tool->GetId(), (LPARAM)&tbbi) )
+            {
+                // the id is probably invalid?
+                wxLogLastError(wxT("TB_SETBUTTONINFO"));
+            }
+        }
+        else
+#endif // comctl32.dll 4.71
+        // TB_SETBUTTONINFO unavailable
+        {
+            // try adding several separators to fit the controls width
+            int widthSep = r.right - r.left;
+            left = r.left;
+
+            TBBUTTON tbb;
+            wxZeroMemory(tbb);
+            tbb.idCommand = 0;
+            tbb.fsState = TBSTATE_ENABLED;
+            tbb.fsStyle = TBSTYLE_SEP;
+
+            size_t nSeparators = size.x / widthSep;
+            for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
+            {
+                if ( !::SendMessage(GetHwnd(), TB_INSERTBUTTON,
+                                    index, (LPARAM)&tbb) )
+                {
+                    wxLogLastError(wxT("TB_INSERTBUTTON"));
+                }
+
+                index++;
+            }
+
+            // remember the number of separators we used - we'd have to
+            // delete all of them later
+            ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
+
+            // adjust the controls width to exactly cover the separators
+            size.x = (nSeparators + 1)*widthSep;
+            control->SetSize(size.x, wxDefaultCoord);
+        }
+
+        // position the control itself correctly vertically centering it on the
+        // icon area of the toolbar
+        int height = r.bottom - r.top - staticTextSize.y;
+
+        int diff = height - size.y;
+        if ( diff < 0 || !HasFlag(wxTB_TEXT) )
+        {
+            // not enough room for the static text
+            if ( staticText )
+                staticText->Hide();
+
+            // recalculate height & diff without the staticText control
+            height = r.bottom - r.top;
+            diff = height - size.y;
+            if ( diff < 0 )
+            {
+                // the control is too high, resize to fit
+                control->SetSize(wxDefaultCoord, height - 2);
+
+                diff = 2;
+            }
+        }
+        else // enough space for both the control and the label
+        {
+            if ( staticText )
+                staticText->Show();
+        }
+
+        int top;
+        if ( IsVertical() )
+        {
+            left = 0;
+            top = y;
+
+            y += height + 2 * GetMargins().y;
+        }
+        else // horizontal toolbar
+        {
+            if ( left == wxDefaultCoord )
+                left = r.left;
+
+            top = r.top;
+        }
+
+        control->Move(left, top + (diff + 1) / 2);
+        if ( staticText )
+        {
+            staticText->Move(left + (size.x - staticTextSize.x)/2,
+                             r.bottom - staticTextSize.y);
+        }
+    }
+
+    // the max index is the "real" number of buttons - i.e. counting even the
+    // separators which we added just for aligning the controls
+    m_nButtons = index;
+
+    if ( !IsVertical() )
+    {
+        if ( m_maxRows == 0 )
+            // if not set yet, only one row
+            SetRows(1);
+    }
+    else if ( m_nButtons > 0 ) // vertical non empty toolbar
+    {
+        // if not set yet, have one column
+        m_maxRows = 1;
+        SetRows(m_nButtons);
+    }
+
+    InvalidateBestSize();
+    UpdateSize();
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// message handlers
+// ----------------------------------------------------------------------------
+
+bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
+{
+    // cast to signed is important as we compare this id with (signed) ints in
+    // FindById() and without the cast we'd get a positive int from a
+    // "negative" (i.e. > 32767) WORD
+    const int id = (signed short)id_;
+
+    wxToolBarToolBase *tool = FindById(id);
+    if ( !tool )
+        return false;
+
+    bool toggled = false; // just to suppress warnings
+
+    if ( tool->CanBeToggled() )
+    {
+        LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);
+        toggled = (state & TBSTATE_CHECKED) != 0;
+
+        // ignore the event when a radio button is released, as this doesn't
+        // seem to happen at all, and is handled otherwise
+        if ( tool->GetKind() == wxITEM_RADIO && !toggled )
+            return true;
+
+        tool->Toggle(toggled);
+        UnToggleRadioGroup(tool);
+    }
+
+    // OnLeftClick() can veto the button state change - for buttons which
+    // may be toggled only, of couse
+    if ( !OnLeftClick(id, toggled) && tool->CanBeToggled() )
+    {
+        // revert back
+        tool->Toggle(!toggled);
+
+        ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(!toggled, 0));
+    }
+
+    return true;
+}
+
+bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
+                            WXLPARAM lParam,
+                            WXLPARAM *WXUNUSED(result))
+{
+    LPNMHDR hdr = (LPNMHDR)lParam;
+    if ( hdr->code == TBN_DROPDOWN )
+    {
+        LPNMTOOLBAR tbhdr = (LPNMTOOLBAR)lParam;
+
+        wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tbhdr->iItem);
+        if ( HandleWindowEvent(evt) )
+        {
+            // Event got handled, don't display default popup menu
+            return false;
+        }
+
+        const wxToolBarToolBase * const tool = FindById(tbhdr->iItem);
+        wxCHECK_MSG( tool, false, _T("drop down message for unknown tool") );
+
+        wxMenu * const menu = tool->GetDropdownMenu();
+        if ( !menu )
+            return false;
+
+        // Display popup menu below button
+        RECT r;
+        if (::SendMessage(GetHwnd(), TB_GETITEMRECT, GetToolPos(tbhdr->iItem), (LPARAM)&r))
+            PopupMenu(menu, r.left, r.bottom);
+
+        return true;
+    }
+
+
+    if( !HasFlag(wxTB_NO_TOOLTIPS) )
+    {
+#if wxUSE_TOOLTIPS
+        // First check if this applies to us
+
+        // the tooltips control created by the toolbar is sometimes Unicode, even
+        // in an ANSI application - this seems to be a bug in comctl32.dll v5
+        UINT code = hdr->code;
+        if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )
+            return false;
+
+        HWND toolTipWnd = (HWND)::SendMessage(GetHwnd(), TB_GETTOOLTIPS, 0, 0);
+        if ( toolTipWnd != hdr->hwndFrom )
+            return false;
+
+        LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
+        int id = (int)ttText->hdr.idFrom;
+
+        wxToolBarToolBase *tool = FindById(id);
+        if ( tool )
+            return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
+#else
+        wxUnusedVar(lParam);
+#endif
+    }
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// toolbar geometry
+// ----------------------------------------------------------------------------
+
+void wxToolBar::SetToolBitmapSize(const wxSize& size)
+{
+    wxToolBarBase::SetToolBitmapSize(size);
+
+    ::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y));
+}
+
+void wxToolBar::SetRows(int nRows)
+{
+    if ( nRows == m_maxRows )
+    {
+        // avoid resizing the frame uselessly
+        return;
+    }
+
+    // TRUE in wParam means to create at least as many rows, FALSE -
+    // at most as many
+    RECT rect;
+    ::SendMessage(GetHwnd(), TB_SETROWS,
+                  MAKEWPARAM(nRows, !(GetWindowStyle() & wxTB_VERTICAL)),
+                  (LPARAM) &rect);
+
+    m_maxRows = nRows;
+
+    UpdateSize();
+}
+
+// The button size is bigger than the bitmap size
+wxSize wxToolBar::GetToolSize() const
+{
+    // TB_GETBUTTONSIZE is supported from version 4.70
+#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
+    && !defined (__DIGITALMARS__)
+    if ( wxApp::GetComCtl32Version() >= 470 )
+    {
+        DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
+
+        return wxSize(LOWORD(dw), HIWORD(dw));
+    }
+    else
+#endif // comctl32.dll 4.70+
+    {
+        // defaults
+        return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
+    }
+}
+
+static
+wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
+                                               size_t index )
+{
+    wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();
+
+    for ( ; current ; current = current->GetNext() )
+    {
+        if ( index == 0 )
+            return current->GetData();
+
+        wxToolBarTool *tool = (wxToolBarTool *)current->GetData();
+        size_t separators = tool->GetSeparatorsCount();
+
+        // if it is a normal button, sepcount == 0, so skip 1 item (the button)
+        // otherwise, skip as many items as the separator count, plus the
+        // control itself
+        index -= separators ? separators + 1 : 1;
+    }
+
+    return 0;
+}
+
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
+{
+    POINT pt;
+    pt.x = x;
+    pt.y = y;
+    int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
+
+    // MBN: when the point ( x, y ) is close to the toolbar border
+    //      TB_HITTEST returns m_nButtons ( not -1 )
+    if ( index < 0 || (size_t)index >= m_nButtons )
+        // it's a separator or there is no tool at all there
+        return (wxToolBarToolBase *)NULL;
+
+    // when TB_SETBUTTONINFO is available (both during compile- and run-time),
+    // we don't use the dummy separators hack
+#ifdef TB_SETBUTTONINFO
+    if ( wxApp::GetComCtl32Version() >= 471 )
+    {
+        return m_tools.Item((size_t)index)->GetData();
+    }
+    else
+#endif // TB_SETBUTTONINFO
+    {
+        return GetItemSkippingDummySpacers( m_tools, (size_t) index );
+    }
+}
+
+void wxToolBar::UpdateSize()
+{
+    wxPoint pos = GetPosition();
+    ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
+    if (pos != GetPosition())
+        Move(pos);
+
+    // In case Realize is called after the initial display (IOW the programmer
+    // may have rebuilt the toolbar) give the frame the option of resizing the
+    // toolbar to full width again, but only if the parent is a frame and the
+    // toolbar is managed by the frame.  Otherwise assume that some other
+    // layout mechanism is controlling the toolbar size and leave it alone.
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && frame->GetToolBar() == this )
+    {
+        frame->SendSizeEvent();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// toolbar styles
+// ---------------------------------------------------------------------------
+
+// get the TBSTYLE of the given toolbar window
+long wxToolBar::GetMSWToolbarStyle() const
+{
+    return ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
+}
+
+void wxToolBar::SetWindowStyleFlag(long style)
+{
+    // the style bits whose changes force us to recreate the toolbar
+    static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS;
+
+    const long styleOld = GetWindowStyle();
+
+    wxToolBarBase::SetWindowStyleFlag(style);
+
+    // don't recreate an empty toolbar: not only this is unnecessary, but it is
+    // also fatal as we'd then try to recreate the toolbar when it's just being
+    // created
+    if ( GetToolsCount() &&
+            (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) )
+    {
+        // to remove the text labels, simply re-realizing the toolbar is enough
+        // but I don't know of any way to add the text to an existing toolbar
+        // other than by recreating it entirely
+        Recreate();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// tool state
+// ----------------------------------------------------------------------------
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
+{
+    ::SendMessage(GetHwnd(), TB_ENABLEBUTTON,
+                  (WPARAM)tool->GetId(), (LPARAM)MAKELONG(enable, 0));
+}
+
+void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle)
+{
+    ::SendMessage(GetHwnd(), TB_CHECKBUTTON,
+                  (WPARAM)tool->GetId(), (LPARAM)MAKELONG(toggle, 0));
+}
+
+void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
+{
+    // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or
+    //     without, so we really need to delete the button and recreate it here
+    wxFAIL_MSG( _T("not implemented") );
+}
+
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetNormalBitmap(bitmap);
+        Realize();
+    }
+}
+
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetDisabledBitmap(bitmap);
+        Realize();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+// Responds to colour changes, and passes event on to children.
+void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    wxRGBToColour(m_backgroundColour, ::GetSysColor(COLOR_BTNFACE));
+
+    // Remap the buttons
+    Realize();
+
+    // Relayout the toolbar
+    int nrows = m_maxRows;
+    m_maxRows = 0;      // otherwise SetRows() wouldn't do anything
+    SetRows(nrows);
+
+    Refresh();
+
+    // let the event propagate further
+    event.Skip();
+}
+
+void wxToolBar::OnMouseEvent(wxMouseEvent& event)
+{
+    if ( event.Leaving() )
+    {
+        if ( m_pInTool )
+        {
+            OnMouseEnter(wxID_ANY);
+            m_pInTool = NULL;
+        }
+
+        event.Skip();
+        return;
+    }
+
+    if ( event.RightDown() )
+    {
+        // find the tool under the mouse
+        wxCoord x = 0, y = 0;
+        event.GetPosition(&x, &y);
+
+        wxToolBarToolBase *tool = FindToolForPosition(x, y);
+        OnRightClick(tool ? tool->GetId() : -1, x, y);
+    }
+    else
+    {
+        event.Skip();
+    }
+}
+
+// This handler is required to allow the toolbar to be set to a non-default
+// colour: for example, when it must blend in with a notebook page.
+void wxToolBar::OnEraseBackground(wxEraseEvent& event)
+{
+    RECT rect = wxGetClientRect(GetHwnd());
+    
+    wxDC *dc = event.GetDC();
+    if (!dc) return;
+    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl();
+    HDC hdc = GetHdcOf(*impl);
+
+    int majorVersion, minorVersion;
+    wxGetOsVersion(& majorVersion, & minorVersion);
+
+#if wxUSE_UXTHEME
+    // we may need to draw themed colour so that we appear correctly on
+    // e.g. notebook page under XP with themes but only do it if the parent
+    // draws themed background itself
+    if ( !UseBgCol() && !GetParent()->UseBgCol() )
+    {
+        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+        if ( theme )
+        {
+            HRESULT
+                hr = theme->DrawThemeParentBackground(GetHwnd(), hdc, &rect);
+            if ( hr == S_OK )
+                return;
+
+            // it can also return S_FALSE which seems to simply say that it
+            // didn't draw anything but no error really occurred
+            if ( FAILED(hr) )
+                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+        }
+    }
+
+    // Only draw a rebar theme on Vista, since it doesn't jive so well with XP
+    if ( !UseBgCol() && majorVersion >= 6 )
+    {
+        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+        if ( theme )
+        {
+            wxUxThemeHandle hTheme(this, L"REBAR");
+
+            RECT r;
+            wxRect rect = GetClientRect();
+            wxCopyRectToRECT(rect, r);
+
+            HRESULT hr = theme->DrawThemeBackground(hTheme, hdc, 0, 0, & r, NULL);
+            if ( hr == S_OK )
+                return;
+
+            // it can also return S_FALSE which seems to simply say that it
+            // didn't draw anything but no error really occurred
+            if ( FAILED(hr) )
+                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+        }
+    }
+
+#endif // wxUSE_UXTHEME
+
+    // we need to always draw our background under XP, as otherwise it doesn't
+    // appear correctly with some themes (e.g. Zune one)
+    if ( majorVersion == 5 ||
+            UseBgCol() || (GetMSWToolbarStyle() & TBSTYLE_TRANSPARENT) )
+    {
+        // do draw our background
+        //
+        // notice that this 'dumb' implementation may cause flicker for some of
+        // the controls in which case they should intercept wxEraseEvent and
+        // process it themselves somehow
+        AutoHBRUSH hBrush(wxColourToRGB(GetBackgroundColour()));
+
+        wxCHANGE_HDC_MAP_MODE(hdc, MM_TEXT);
+        ::FillRect(hdc, &rect, hBrush);
+    }
+    else // we have no non default background colour
+    {
+        // let the system do it for us
+        event.Skip();
+    }
+}
+
+bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+{
+    // calculate our minor dimension ourselves - we're confusing the standard
+    // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
+    RECT r;
+    if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )
+    {
+        int w, h;
+
+        if ( IsVertical() )
+        {
+            w = r.right - r.left;
+            if ( m_maxRows )
+            {
+                w *= (m_nButtons + m_maxRows - 1)/m_maxRows;
+            }
+            h = HIWORD(lParam);
+        }
+        else
+        {
+            w = LOWORD(lParam);
+            if (HasFlag( wxTB_FLAT ))
+                h = r.bottom - r.top - 3;
+            else
+                h = r.bottom - r.top;
+            if ( m_maxRows )
+            {
+                // FIXME: hardcoded separator line height...
+                h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
+                h *= m_maxRows;
+            }
+        }
+
+        if ( MAKELPARAM(w, h) != lParam )
+        {
+            // size really changed
+            SetSize(w, h);
+        }
+
+        // message processed
+        return true;
+    }
+
+    return false;
+}
+
+bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
+{
+    // erase any dummy separators which were used
+    // for aligning the controls if any here
+
+    // first of all, are there any controls at all?
+    wxToolBarToolsList::compatibility_iterator node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        if ( node->GetData()->IsControl() )
+            break;
+    }
+
+    if ( !node )
+        // no controls, nothing to erase
+        return false;
+
+    wxSize clientSize = GetClientSize();
+    int majorVersion, minorVersion;
+    wxGetOsVersion(& majorVersion, & minorVersion);
+
+    // prepare the DC on which we'll be drawing
+    wxClientDC dc(this);
+    dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
+    dc.SetPen(*wxTRANSPARENT_PEN);
+
+    RECT r;
+    if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )
+        // nothing to redraw anyhow
+        return false;
+
+    wxRect rectUpdate;
+    wxCopyRECTToRect(r, rectUpdate);
+
+    dc.SetClippingRegion(rectUpdate);
+
+    // draw the toolbar tools, separators &c normally
+    wxControl::MSWWindowProc(WM_PAINT, wParam, lParam);
+
+    // for each control in the toolbar find all the separators intersecting it
+    // and erase them
+    //
+    // NB: this is really the only way to do it as we don't know if a separator
+    //     corresponds to a control (i.e. is a dummy one) or a real one
+    //     otherwise
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarTool *tool = (wxToolBarTool*)node->GetData();
+        if ( tool->IsControl() )
+        {
+            // get the control rect in our client coords
+            wxControl *control = tool->GetControl();
+            wxStaticText *staticText = tool->GetStaticText();
+            wxRect rectCtrl = control->GetRect();
+            wxRect rectStaticText(0,0,0,0);
+            if ( staticText )
+            {
+                rectStaticText = staticText->GetRect();
+            }
+
+            // iterate over all buttons
+            TBBUTTON tbb;
+            int count = ::SendMessage(GetHwnd(), TB_BUTTONCOUNT, 0, 0);
+            for ( int n = 0; n < count; n++ )
+            {
+                // is it a separator?
+                if ( !::SendMessage(GetHwnd(), TB_GETBUTTON,
+                                    n, (LPARAM)&tbb) )
+                {
+                    wxLogDebug(_T("TB_GETBUTTON failed?"));
+
+                    continue;
+                }
+
+                if ( tbb.fsStyle != TBSTYLE_SEP )
+                    continue;
+
+                // get the bounding rect of the separator
+                RECT r;
+                if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
+                                    n, (LPARAM)&r) )
+                {
+                    wxLogDebug(_T("TB_GETITEMRECT failed?"));
+
+                    continue;
+                }
+
+                // does it intersect the control?
+                wxRect rectItem;
+                wxCopyRECTToRect(r, rectItem);
+                if ( rectCtrl.Intersects(rectItem) || (staticText && rectStaticText.Intersects(rectItem)))
+                {
+                    // yes, do erase it!
+
+                    bool haveRefreshed = false;
+
+#if wxUSE_UXTHEME
+                    if ( !UseBgCol() && !GetParent()->UseBgCol() )
+                    {
+                        // Don't use DrawThemeBackground
+                    }
+                    else if ( !UseBgCol() && majorVersion >= 6 )
+                    {
+                        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+                        if ( theme )
+                        {
+                            wxUxThemeHandle hTheme(this, L"REBAR");
+
+                            RECT clipRect = r;
+
+                            // Draw the whole background since the pattern may be position sensitive;
+                            // but clip it to the area of interest.
+                            r.left = 0;
+                            r.right = clientSize.x;
+                            r.top = 0;
+                            r.bottom = clientSize.y;
+                            
+                            wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+                            HRESULT hr = theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), 0, 0, & r, & clipRect);
+                            if ( hr == S_OK )
+                                haveRefreshed = true;
+                        }
+                    }
+#endif
+
+                    if (!haveRefreshed)
+                        dc.DrawRectangle(rectItem);
+                }
+
+                if ( rectCtrl.Intersects(rectItem) )
+                {
+                    // Necessary in case we use a no-paint-on-size
+                    // style in the parent: the controls can disappear
+                    control->Refresh(false);
+                }
+
+                if ( staticText && rectStaticText.Intersects(rectItem) )
+                {
+                    // Necessary in case we use a no-paint-on-size
+                    // style in the parent: the controls can disappear
+                    staticText->Refresh(false);
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+{
+    wxCoord x = GET_X_LPARAM(lParam),
+            y = GET_Y_LPARAM(lParam);
+    wxToolBarToolBase* tool = FindToolForPosition( x, y );
+
+    // has the current tool changed?
+    if ( tool != m_pInTool )
+    {
+        m_pInTool = tool;
+        OnMouseEnter(tool ? tool->GetId() : wxID_ANY);
+    }
+}
+
+WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    switch ( nMsg )
+    {
+        case WM_MOUSEMOVE:
+            // we don't handle mouse moves, so always pass the message to
+            // wxControl::MSWWindowProc (HandleMouseMove just calls OnMouseEnter)
+            HandleMouseMove(wParam, lParam);
+            break;
+
+        case WM_SIZE:
+            if ( HandleSize(wParam, lParam) )
+                return 0;
+            break;
+
+#ifndef __WXWINCE__
+        case WM_PAINT:
+            if ( HandlePaint(wParam, lParam) )
+                return 0;
+#endif
+
+        default:
+            break;
+    }
+
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+#ifdef wxREMAP_BUTTON_COLOURS
+
+WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
+{
+    MemoryHDC hdcMem;
+
+    if ( !hdcMem )
+    {
+        wxLogLastError(_T("CreateCompatibleDC"));
+
+        return bitmap;
+    }
+
+    SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap);
+
+    if ( !bmpInHDC )
+    {
+        wxLogLastError(_T("SelectObject"));
+
+        return bitmap;
+    }
+
+    wxCOLORMAP *cmap = wxGetStdColourMap();
+
+    for ( int i = 0; i < width; i++ )
+    {
+        for ( int j = 0; j < height; j++ )
+        {
+            COLORREF pixel = ::GetPixel(hdcMem, i, j);
+
+            for ( size_t k = 0; k < wxSTD_COL_MAX; k++ )
+            {
+                COLORREF col = cmap[k].from;
+                if ( abs(GetRValue(pixel) - GetRValue(col)) < 10 &&
+                     abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
+                     abs(GetBValue(pixel) - GetBValue(col)) < 10 )
+                {
+                    if ( cmap[k].to != pixel )
+                        ::SetPixel(hdcMem, i, j, cmap[k].to);
+                    break;
+                }
+            }
+        }
+    }
+
+    return bitmap;
+}
+
+#endif // wxREMAP_BUTTON_COLOURS
+
+#endif // wxUSE_TOOLBAR
author	Vadim Zeitlin <vadim@wxwidgets.org>
	Sat, 15 Mar 2008 16:53:06 +0000 (16:53 +0000)
committer	Vadim Zeitlin <vadim@wxwidgets.org>
	Sat, 15 Mar 2008 16:53:06 +0000 (16:53 +0000)
Makefile.in		patch \| blob \| blame \| history
build/bakefiles/files.bkl		patch \| blob \| blame \| history
build/msw/makefile.bcc		patch \| blob \| blame \| history
build/msw/makefile.gcc		patch \| blob \| blame \| history
build/msw/makefile.vc		patch \| blob \| blame \| history
build/msw/makefile.wat		patch \| blob \| blame \| history
build/msw/wx_core.dsp		patch \| blob \| blame \| history
build/msw/wx_vc7_core.vcproj		patch \| blob \| blame \| history
include/wx/gauge.h		patch \| blob \| blame \| history
include/wx/msw/gauge.h	[new file with mode: 0644]	patch \| blob
include/wx/msw/gauge95.h	[deleted file]	patch \| blob \| blame \| history
include/wx/msw/slider.h	[new file with mode: 0644]	patch \| blob
include/wx/msw/slider95.h	[deleted file]	patch \| blob \| blame \| history
include/wx/msw/statbr95.h	[deleted file]	patch \| blob \| blame \| history
include/wx/msw/statusbar.h	[new file with mode: 0644]	patch \| blob
include/wx/msw/tbar95.h	[deleted file]	patch \| blob \| blame \| history
include/wx/msw/toolbar.h	[new file with mode: 0644]	patch \| blob
include/wx/slider.h		patch \| blob \| blame \| history
include/wx/statusbr.h		patch \| blob \| blame \| history
include/wx/toolbar.h		patch \| blob \| blame \| history
src/msw/gauge.cpp	[new file with mode: 0644]	patch \| blob
src/msw/gauge95.cpp	[deleted file]	patch \| blob \| blame \| history
src/msw/mdi.cpp		patch \| blob \| blame \| history
src/msw/slider.cpp	[new file with mode: 0644]	patch \| blob
src/msw/slider95.cpp	[deleted file]	patch \| blob \| blame \| history
src/msw/statbr95.cpp	[deleted file]	patch \| blob \| blame \| history
src/msw/statusbar.cpp	[new file with mode: 0644]	patch \| blob
src/msw/tbar95.cpp	[deleted file]	patch \| blob \| blame \| history
src/msw/toolbar.cpp	[new file with mode: 0644]	patch \| blob