wx/unix/taskbarx11.h \
wx/generic/animate.h
@COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR)
-@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = \
-@COND_TOOLKIT_MSW@ wx/msw/notifmsg.h wx/msw/sound.h wx/msw/taskbar.h \
-@COND_TOOLKIT_MSW@ wx/msw/joystick.h
+COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR = \
+ wx/msw/commandlinkbutton.h \
+ wx/msw/notifmsg.h \
+ wx/msw/sound.h \
+ wx/msw/taskbar.h \
+ wx/msw/joystick.h
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR)
COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR = \
wx/generic/animate.h \
wx/osx/dataview.h \
@COND_TOOLKIT_OSX_IPHONE@ wx/generic/animate.h wx/osx/sound.h
@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_PM@ wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h
-@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \
-@COND_TOOLKIT_WINCE@ wx/msw/notifmsg.h wx/msw/sound.h wx/msw/taskbar.h
+COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR = \
+ wx/msw/commandlinkbutton.h \
+ wx/msw/notifmsg.h \
+ wx/msw/sound.h \
+ wx/msw/taskbar.h
+@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR)
@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \
wx/animate.h \
wx/bmpcbox.h \
wx/calctrl.h \
+ wx/commandlinkbutton.h \
wx/dataview.h \
wx/datectrl.h \
wx/dateevt.h \
wx/animate.h \
wx/bmpcbox.h \
wx/calctrl.h \
+ wx/commandlinkbutton.h \
wx/dataview.h \
wx/datectrl.h \
wx/dateevt.h \
monodll_aboutdlgg.o \
monodll_bmpcboxg.o \
monodll_calctrlg.o \
+ monodll_commandlinkbuttong.o \
monodll_datavgen.o \
monodll_datectlg.o \
monodll_editlbox.o \
monodll_aboutdlgg.o \
monodll_bmpcboxg.o \
monodll_calctrlg.o \
+ monodll_commandlinkbuttong.o \
monodll_datavgen.o \
monodll_datectlg.o \
monodll_editlbox.o \
monolib_aboutdlgg.o \
monolib_bmpcboxg.o \
monolib_calctrlg.o \
+ monolib_commandlinkbuttong.o \
monolib_datavgen.o \
monolib_datectlg.o \
monolib_editlbox.o \
monolib_aboutdlgg.o \
monolib_bmpcboxg.o \
monolib_calctrlg.o \
+ monolib_commandlinkbuttong.o \
monolib_datavgen.o \
monolib_datectlg.o \
monolib_editlbox.o \
advdll_aboutdlgg.o \
advdll_bmpcboxg.o \
advdll_calctrlg.o \
+ advdll_commandlinkbuttong.o \
advdll_datavgen.o \
advdll_datectlg.o \
advdll_editlbox.o \
advdll_aboutdlgg.o \
advdll_bmpcboxg.o \
advdll_calctrlg.o \
+ advdll_commandlinkbuttong.o \
advdll_datavgen.o \
advdll_datectlg.o \
advdll_editlbox.o \
advlib_aboutdlgg.o \
advlib_bmpcboxg.o \
advlib_calctrlg.o \
+ advlib_commandlinkbuttong.o \
advlib_datavgen.o \
advlib_datectlg.o \
advlib_editlbox.o \
advlib_aboutdlgg.o \
advlib_bmpcboxg.o \
advlib_calctrlg.o \
+ advlib_commandlinkbuttong.o \
advlib_datavgen.o \
advlib_datectlg.o \
advlib_editlbox.o \
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_msw_aboutdlg.o \
+ monodll_commandlinkbutton.o \
monodll_msw_notifmsg.o \
monodll_msw_sound.o \
monodll_msw_taskbar.o \
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_msw_aboutdlg.o \
+ monodll_commandlinkbutton.o \
monodll_msw_notifmsg.o \
monodll_msw_sound.o \
monodll_msw_taskbar.o
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
monolib_msw_aboutdlg.o \
+ monolib_commandlinkbutton.o \
monolib_msw_notifmsg.o \
monolib_msw_sound.o \
monolib_msw_taskbar.o \
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
monolib_msw_aboutdlg.o \
+ monolib_commandlinkbutton.o \
monolib_msw_notifmsg.o \
monolib_msw_sound.o \
monolib_msw_taskbar.o
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
advdll_msw_aboutdlg.o \
+ advdll_commandlinkbutton.o \
advdll_msw_notifmsg.o \
advdll_msw_sound.o \
advdll_msw_taskbar.o \
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
advdll_msw_aboutdlg.o \
+ advdll_commandlinkbutton.o \
advdll_msw_notifmsg.o \
advdll_msw_sound.o \
advdll_msw_taskbar.o
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
advlib_msw_aboutdlg.o \
+ advlib_commandlinkbutton.o \
advlib_msw_notifmsg.o \
advlib_msw_sound.o \
advlib_msw_taskbar.o \
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
advlib_msw_aboutdlg.o \
+ advlib_commandlinkbutton.o \
advlib_msw_notifmsg.o \
advlib_msw_sound.o \
advlib_msw_taskbar.o
@COND_USE_GUI_1@monodll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
+@COND_USE_GUI_1@monodll_commandlinkbuttong.o: $(srcdir)/src/generic/commandlinkbuttong.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/commandlinkbuttong.cpp
+
@COND_USE_GUI_1@monodll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
@COND_USE_GUI_1@monolib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
+@COND_USE_GUI_1@monolib_commandlinkbuttong.o: $(srcdir)/src/generic/commandlinkbuttong.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/commandlinkbuttong.cpp
+
@COND_USE_GUI_1@monolib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
advdll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(ADVDLL_ODEP)
$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
+advdll_commandlinkbuttong.o: $(srcdir)/src/generic/commandlinkbuttong.cpp $(ADVDLL_ODEP)
+ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/commandlinkbuttong.cpp
+
advdll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVDLL_ODEP)
$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
@COND_TOOLKIT_WINCE@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+@COND_TOOLKIT_MSW@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
@COND_TOOLKIT_MSW@advdll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
advlib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(ADVLIB_ODEP)
$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
+advlib_commandlinkbuttong.o: $(srcdir)/src/generic/commandlinkbuttong.cpp $(ADVLIB_ODEP)
+ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/commandlinkbuttong.cpp
+
advlib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVLIB_ODEP)
$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
@COND_TOOLKIT_WINCE@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+@COND_TOOLKIT_MSW@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
@COND_TOOLKIT_MSW@advlib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
src/generic/aboutdlgg.cpp
src/generic/bmpcboxg.cpp
src/generic/calctrlg.cpp
+ src/generic/commandlinkbuttong.cpp
src/generic/datavgen.cpp
src/generic/datectlg.cpp
src/generic/editlbox.cpp
wx/animate.h
wx/bmpcbox.h
wx/calctrl.h
+ wx/commandlinkbutton.h
wx/dataview.h
wx/datectrl.h
wx/dateevt.h
<set var="ADVANCED_MSW_SRC" hints="files">
src/common/taskbarcmn.cpp
src/msw/aboutdlg.cpp
+ src/msw/commandlinkbutton.cpp
src/msw/notifmsg.cpp
src/msw/sound.cpp
src/msw/taskbar.cpp
</set>
<set var="ADVANCED_MSW_HDR" hints="files">
+ wx/msw/commandlinkbutton.h
wx/msw/notifmsg.h
wx/msw/sound.h
wx/msw/taskbar.h
!if "$(USE_GUI)" == "1"\r
__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
!endif\r
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
__wxscintilla_usingdll_p = -DWXUSINGDLL\r
!endif\r
!if "$(MONOLITHIC)" == "0"\r
$(OBJS)\monodll_aboutdlgg.obj \\r
$(OBJS)\monodll_bmpcboxg.obj \\r
$(OBJS)\monodll_calctrlg.obj \\r
+ $(OBJS)\monodll_commandlinkbuttong.obj \\r
$(OBJS)\monodll_datavgen.obj \\r
$(OBJS)\monodll_datectlg.obj \\r
$(OBJS)\monodll_editlbox.obj \\r
$(OBJS)\monodll_wizard.obj \\r
$(OBJS)\monodll_taskbarcmn.obj \\r
$(OBJS)\monodll_aboutdlg.obj \\r
+ $(OBJS)\monodll_commandlinkbutton.obj \\r
$(OBJS)\monodll_notifmsg.obj \\r
$(OBJS)\monodll_sound.obj \\r
$(OBJS)\monodll_taskbar.obj \\r
$(OBJS)\monodll_aboutdlgg.obj \\r
$(OBJS)\monodll_bmpcboxg.obj \\r
$(OBJS)\monodll_calctrlg.obj \\r
+ $(OBJS)\monodll_commandlinkbuttong.obj \\r
$(OBJS)\monodll_datavgen.obj \\r
$(OBJS)\monodll_datectlg.obj \\r
$(OBJS)\monodll_editlbox.obj \\r
$(OBJS)\monodll_wizard.obj \\r
$(OBJS)\monodll_taskbarcmn.obj \\r
$(OBJS)\monodll_aboutdlg.obj \\r
+ $(OBJS)\monodll_commandlinkbutton.obj \\r
$(OBJS)\monodll_notifmsg.obj \\r
$(OBJS)\monodll_sound.obj \\r
$(OBJS)\monodll_taskbar.obj \\r
$(OBJS)\monolib_aboutdlgg.obj \\r
$(OBJS)\monolib_bmpcboxg.obj \\r
$(OBJS)\monolib_calctrlg.obj \\r
+ $(OBJS)\monolib_commandlinkbuttong.obj \\r
$(OBJS)\monolib_datavgen.obj \\r
$(OBJS)\monolib_datectlg.obj \\r
$(OBJS)\monolib_editlbox.obj \\r
$(OBJS)\monolib_wizard.obj \\r
$(OBJS)\monolib_taskbarcmn.obj \\r
$(OBJS)\monolib_aboutdlg.obj \\r
+ $(OBJS)\monolib_commandlinkbutton.obj \\r
$(OBJS)\monolib_notifmsg.obj \\r
$(OBJS)\monolib_sound.obj \\r
$(OBJS)\monolib_taskbar.obj \\r
$(OBJS)\monolib_aboutdlgg.obj \\r
$(OBJS)\monolib_bmpcboxg.obj \\r
$(OBJS)\monolib_calctrlg.obj \\r
+ $(OBJS)\monolib_commandlinkbuttong.obj \\r
$(OBJS)\monolib_datavgen.obj \\r
$(OBJS)\monolib_datectlg.obj \\r
$(OBJS)\monolib_editlbox.obj \\r
$(OBJS)\monolib_wizard.obj \\r
$(OBJS)\monolib_taskbarcmn.obj \\r
$(OBJS)\monolib_aboutdlg.obj \\r
+ $(OBJS)\monolib_commandlinkbutton.obj \\r
$(OBJS)\monolib_notifmsg.obj \\r
$(OBJS)\monolib_sound.obj \\r
$(OBJS)\monolib_taskbar.obj \\r
$(OBJS)\advdll_aboutdlgg.obj \\r
$(OBJS)\advdll_bmpcboxg.obj \\r
$(OBJS)\advdll_calctrlg.obj \\r
+ $(OBJS)\advdll_commandlinkbuttong.obj \\r
$(OBJS)\advdll_datavgen.obj \\r
$(OBJS)\advdll_datectlg.obj \\r
$(OBJS)\advdll_editlbox.obj \\r
$(OBJS)\advdll_wizard.obj \\r
$(OBJS)\advdll_taskbarcmn.obj \\r
$(OBJS)\advdll_aboutdlg.obj \\r
+ $(OBJS)\advdll_commandlinkbutton.obj \\r
$(OBJS)\advdll_notifmsg.obj \\r
$(OBJS)\advdll_sound.obj \\r
$(OBJS)\advdll_taskbar.obj \\r
$(OBJS)\advdll_aboutdlgg.obj \\r
$(OBJS)\advdll_bmpcboxg.obj \\r
$(OBJS)\advdll_calctrlg.obj \\r
+ $(OBJS)\advdll_commandlinkbuttong.obj \\r
$(OBJS)\advdll_datavgen.obj \\r
$(OBJS)\advdll_datectlg.obj \\r
$(OBJS)\advdll_editlbox.obj \\r
$(OBJS)\advdll_wizard.obj \\r
$(OBJS)\advdll_taskbarcmn.obj \\r
$(OBJS)\advdll_aboutdlg.obj \\r
+ $(OBJS)\advdll_commandlinkbutton.obj \\r
$(OBJS)\advdll_notifmsg.obj \\r
$(OBJS)\advdll_sound.obj \\r
$(OBJS)\advdll_taskbar.obj \\r
$(OBJS)\advlib_aboutdlgg.obj \\r
$(OBJS)\advlib_bmpcboxg.obj \\r
$(OBJS)\advlib_calctrlg.obj \\r
+ $(OBJS)\advlib_commandlinkbuttong.obj \\r
$(OBJS)\advlib_datavgen.obj \\r
$(OBJS)\advlib_datectlg.obj \\r
$(OBJS)\advlib_editlbox.obj \\r
$(OBJS)\advlib_wizard.obj \\r
$(OBJS)\advlib_taskbarcmn.obj \\r
$(OBJS)\advlib_aboutdlg.obj \\r
+ $(OBJS)\advlib_commandlinkbutton.obj \\r
$(OBJS)\advlib_notifmsg.obj \\r
$(OBJS)\advlib_sound.obj \\r
$(OBJS)\advlib_taskbar.obj \\r
$(OBJS)\advlib_aboutdlgg.obj \\r
$(OBJS)\advlib_bmpcboxg.obj \\r
$(OBJS)\advlib_calctrlg.obj \\r
+ $(OBJS)\advlib_commandlinkbuttong.obj \\r
$(OBJS)\advlib_datavgen.obj \\r
$(OBJS)\advlib_datectlg.obj \\r
$(OBJS)\advlib_editlbox.obj \\r
$(OBJS)\advlib_wizard.obj \\r
$(OBJS)\advlib_taskbarcmn.obj \\r
$(OBJS)\advlib_aboutdlg.obj \\r
+ $(OBJS)\advlib_commandlinkbutton.obj \\r
$(OBJS)\advlib_notifmsg.obj \\r
$(OBJS)\advlib_sound.obj \\r
$(OBJS)\advlib_taskbar.obj \\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp\r
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp\r
\r
+$(OBJS)\advdll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp\r
+\r
$(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp\r
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp\r
\r
$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp\r
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
\r
+$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
+\r
$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
\r
$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp\r
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp\r
\r
+$(OBJS)\advlib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp\r
+\r
$(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp\r
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp\r
\r
$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp\r
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
\r
+$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
+\r
$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
\r
ifeq ($(USE_GUI),1)\r
__wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a\r
endif\r
-ifeq ($(MONOLITHIC),0)
+ifeq ($(MONOLITHIC),0)\r
ifeq ($(SHARED),1)\r
__wxscintilla_usingdll_p = -DWXUSINGDLL\r
endif\r
-endif
+endif\r
ifeq ($(MONOLITHIC),0)\r
EXTRALIBS_FOR_BASE = \r
endif\r
$(OBJS)\monodll_aboutdlgg.o \\r
$(OBJS)\monodll_bmpcboxg.o \\r
$(OBJS)\monodll_calctrlg.o \\r
+ $(OBJS)\monodll_commandlinkbuttong.o \\r
$(OBJS)\monodll_datavgen.o \\r
$(OBJS)\monodll_datectlg.o \\r
$(OBJS)\monodll_editlbox.o \\r
$(OBJS)\monodll_wizard.o \\r
$(OBJS)\monodll_taskbarcmn.o \\r
$(OBJS)\monodll_aboutdlg.o \\r
+ $(OBJS)\monodll_commandlinkbutton.o \\r
$(OBJS)\monodll_notifmsg.o \\r
$(OBJS)\monodll_sound.o \\r
$(OBJS)\monodll_taskbar.o \\r
$(OBJS)\monodll_aboutdlgg.o \\r
$(OBJS)\monodll_bmpcboxg.o \\r
$(OBJS)\monodll_calctrlg.o \\r
+ $(OBJS)\monodll_commandlinkbuttong.o \\r
$(OBJS)\monodll_datavgen.o \\r
$(OBJS)\monodll_datectlg.o \\r
$(OBJS)\monodll_editlbox.o \\r
$(OBJS)\monodll_wizard.o \\r
$(OBJS)\monodll_taskbarcmn.o \\r
$(OBJS)\monodll_aboutdlg.o \\r
+ $(OBJS)\monodll_commandlinkbutton.o \\r
$(OBJS)\monodll_notifmsg.o \\r
$(OBJS)\monodll_sound.o \\r
$(OBJS)\monodll_taskbar.o \\r
$(OBJS)\monolib_aboutdlgg.o \\r
$(OBJS)\monolib_bmpcboxg.o \\r
$(OBJS)\monolib_calctrlg.o \\r
+ $(OBJS)\monolib_commandlinkbuttong.o \\r
$(OBJS)\monolib_datavgen.o \\r
$(OBJS)\monolib_datectlg.o \\r
$(OBJS)\monolib_editlbox.o \\r
$(OBJS)\monolib_wizard.o \\r
$(OBJS)\monolib_taskbarcmn.o \\r
$(OBJS)\monolib_aboutdlg.o \\r
+ $(OBJS)\monolib_commandlinkbutton.o \\r
$(OBJS)\monolib_notifmsg.o \\r
$(OBJS)\monolib_sound.o \\r
$(OBJS)\monolib_taskbar.o \\r
$(OBJS)\monolib_aboutdlgg.o \\r
$(OBJS)\monolib_bmpcboxg.o \\r
$(OBJS)\monolib_calctrlg.o \\r
+ $(OBJS)\monolib_commandlinkbuttong.o \\r
$(OBJS)\monolib_datavgen.o \\r
$(OBJS)\monolib_datectlg.o \\r
$(OBJS)\monolib_editlbox.o \\r
$(OBJS)\monolib_wizard.o \\r
$(OBJS)\monolib_taskbarcmn.o \\r
$(OBJS)\monolib_aboutdlg.o \\r
+ $(OBJS)\monolib_commandlinkbutton.o \\r
$(OBJS)\monolib_notifmsg.o \\r
$(OBJS)\monolib_sound.o \\r
$(OBJS)\monolib_taskbar.o \\r
$(OBJS)\advdll_aboutdlgg.o \\r
$(OBJS)\advdll_bmpcboxg.o \\r
$(OBJS)\advdll_calctrlg.o \\r
+ $(OBJS)\advdll_commandlinkbuttong.o \\r
$(OBJS)\advdll_datavgen.o \\r
$(OBJS)\advdll_datectlg.o \\r
$(OBJS)\advdll_editlbox.o \\r
$(OBJS)\advdll_wizard.o \\r
$(OBJS)\advdll_taskbarcmn.o \\r
$(OBJS)\advdll_aboutdlg.o \\r
+ $(OBJS)\advdll_commandlinkbutton.o \\r
$(OBJS)\advdll_notifmsg.o \\r
$(OBJS)\advdll_sound.o \\r
$(OBJS)\advdll_taskbar.o \\r
$(OBJS)\advdll_aboutdlgg.o \\r
$(OBJS)\advdll_bmpcboxg.o \\r
$(OBJS)\advdll_calctrlg.o \\r
+ $(OBJS)\advdll_commandlinkbuttong.o \\r
$(OBJS)\advdll_datavgen.o \\r
$(OBJS)\advdll_datectlg.o \\r
$(OBJS)\advdll_editlbox.o \\r
$(OBJS)\advdll_wizard.o \\r
$(OBJS)\advdll_taskbarcmn.o \\r
$(OBJS)\advdll_aboutdlg.o \\r
+ $(OBJS)\advdll_commandlinkbutton.o \\r
$(OBJS)\advdll_notifmsg.o \\r
$(OBJS)\advdll_sound.o \\r
$(OBJS)\advdll_taskbar.o \\r
$(OBJS)\advlib_aboutdlgg.o \\r
$(OBJS)\advlib_bmpcboxg.o \\r
$(OBJS)\advlib_calctrlg.o \\r
+ $(OBJS)\advlib_commandlinkbuttong.o \\r
$(OBJS)\advlib_datavgen.o \\r
$(OBJS)\advlib_datectlg.o \\r
$(OBJS)\advlib_editlbox.o \\r
$(OBJS)\advlib_wizard.o \\r
$(OBJS)\advlib_taskbarcmn.o \\r
$(OBJS)\advlib_aboutdlg.o \\r
+ $(OBJS)\advlib_commandlinkbutton.o \\r
$(OBJS)\advlib_notifmsg.o \\r
$(OBJS)\advlib_sound.o \\r
$(OBJS)\advlib_taskbar.o \\r
$(OBJS)\advlib_aboutdlgg.o \\r
$(OBJS)\advlib_bmpcboxg.o \\r
$(OBJS)\advlib_calctrlg.o \\r
+ $(OBJS)\advlib_commandlinkbuttong.o \\r
$(OBJS)\advlib_datavgen.o \\r
$(OBJS)\advlib_datectlg.o \\r
$(OBJS)\advlib_editlbox.o \\r
$(OBJS)\advlib_wizard.o \\r
$(OBJS)\advlib_taskbarcmn.o \\r
$(OBJS)\advlib_aboutdlg.o \\r
+ $(OBJS)\advlib_commandlinkbutton.o \\r
$(OBJS)\advlib_notifmsg.o \\r
$(OBJS)\advlib_sound.o \\r
$(OBJS)\advlib_taskbar.o \\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_commandlinkbuttong.o: ../../src/generic/commandlinkbuttong.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monodll_datavgen.o: ../../src/generic/datavgen.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monodll_notifmsg.o: ../../src/msw/notifmsg.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_commandlinkbuttong.o: ../../src/generic/commandlinkbuttong.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monolib_datavgen.o: ../../src/generic/datavgen.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monolib_notifmsg.o: ../../src/msw/notifmsg.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
$(OBJS)\advdll_calctrlg.o: ../../src/generic/calctrlg.cpp\r
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\advdll_commandlinkbuttong.o: ../../src/generic/commandlinkbuttong.cpp\r
+ $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\advdll_datavgen.o: ../../src/generic/datavgen.cpp\r
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp\r
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\advdll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp\r
+ $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\advdll_notifmsg.o: ../../src/msw/notifmsg.cpp\r
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\advlib_calctrlg.o: ../../src/generic/calctrlg.cpp\r
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\advlib_commandlinkbuttong.o: ../../src/generic/commandlinkbuttong.cpp\r
+ $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\advlib_datavgen.o: ../../src/generic/datavgen.cpp\r
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp\r
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\advlib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp\r
+ $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\advlib_notifmsg.o: ../../src/msw/notifmsg.cpp\r
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
!if "$(RUNTIME_LIBS)" == "static"\r
__RUNTIME_LIBS_100 = $(__THREADSFLAG)\r
!endif\r
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
__wxscintilla_usingdll_p = /DWXUSINGDLL\r
!endif\r
!if "$(MONOLITHIC)" == "0"\r
$(OBJS)\monodll_aboutdlgg.obj \\r
$(OBJS)\monodll_bmpcboxg.obj \\r
$(OBJS)\monodll_calctrlg.obj \\r
+ $(OBJS)\monodll_commandlinkbuttong.obj \\r
$(OBJS)\monodll_datavgen.obj \\r
$(OBJS)\monodll_datectlg.obj \\r
$(OBJS)\monodll_editlbox.obj \\r
$(OBJS)\monodll_wizard.obj \\r
$(OBJS)\monodll_taskbarcmn.obj \\r
$(OBJS)\monodll_aboutdlg.obj \\r
+ $(OBJS)\monodll_commandlinkbutton.obj \\r
$(OBJS)\monodll_notifmsg.obj \\r
$(OBJS)\monodll_sound.obj \\r
$(OBJS)\monodll_taskbar.obj \\r
$(OBJS)\monodll_aboutdlgg.obj \\r
$(OBJS)\monodll_bmpcboxg.obj \\r
$(OBJS)\monodll_calctrlg.obj \\r
+ $(OBJS)\monodll_commandlinkbuttong.obj \\r
$(OBJS)\monodll_datavgen.obj \\r
$(OBJS)\monodll_datectlg.obj \\r
$(OBJS)\monodll_editlbox.obj \\r
$(OBJS)\monodll_wizard.obj \\r
$(OBJS)\monodll_taskbarcmn.obj \\r
$(OBJS)\monodll_aboutdlg.obj \\r
+ $(OBJS)\monodll_commandlinkbutton.obj \\r
$(OBJS)\monodll_notifmsg.obj \\r
$(OBJS)\monodll_sound.obj \\r
$(OBJS)\monodll_taskbar.obj \\r
$(OBJS)\monolib_aboutdlgg.obj \\r
$(OBJS)\monolib_bmpcboxg.obj \\r
$(OBJS)\monolib_calctrlg.obj \\r
+ $(OBJS)\monolib_commandlinkbuttong.obj \\r
$(OBJS)\monolib_datavgen.obj \\r
$(OBJS)\monolib_datectlg.obj \\r
$(OBJS)\monolib_editlbox.obj \\r
$(OBJS)\monolib_wizard.obj \\r
$(OBJS)\monolib_taskbarcmn.obj \\r
$(OBJS)\monolib_aboutdlg.obj \\r
+ $(OBJS)\monolib_commandlinkbutton.obj \\r
$(OBJS)\monolib_notifmsg.obj \\r
$(OBJS)\monolib_sound.obj \\r
$(OBJS)\monolib_taskbar.obj \\r
$(OBJS)\monolib_aboutdlgg.obj \\r
$(OBJS)\monolib_bmpcboxg.obj \\r
$(OBJS)\monolib_calctrlg.obj \\r
+ $(OBJS)\monolib_commandlinkbuttong.obj \\r
$(OBJS)\monolib_datavgen.obj \\r
$(OBJS)\monolib_datectlg.obj \\r
$(OBJS)\monolib_editlbox.obj \\r
$(OBJS)\monolib_wizard.obj \\r
$(OBJS)\monolib_taskbarcmn.obj \\r
$(OBJS)\monolib_aboutdlg.obj \\r
+ $(OBJS)\monolib_commandlinkbutton.obj \\r
$(OBJS)\monolib_notifmsg.obj \\r
$(OBJS)\monolib_sound.obj \\r
$(OBJS)\monolib_taskbar.obj \\r
$(OBJS)\advdll_aboutdlgg.obj \\r
$(OBJS)\advdll_bmpcboxg.obj \\r
$(OBJS)\advdll_calctrlg.obj \\r
+ $(OBJS)\advdll_commandlinkbuttong.obj \\r
$(OBJS)\advdll_datavgen.obj \\r
$(OBJS)\advdll_datectlg.obj \\r
$(OBJS)\advdll_editlbox.obj \\r
$(OBJS)\advdll_wizard.obj \\r
$(OBJS)\advdll_taskbarcmn.obj \\r
$(OBJS)\advdll_aboutdlg.obj \\r
+ $(OBJS)\advdll_commandlinkbutton.obj \\r
$(OBJS)\advdll_notifmsg.obj \\r
$(OBJS)\advdll_sound.obj \\r
$(OBJS)\advdll_taskbar.obj \\r
$(OBJS)\advdll_aboutdlgg.obj \\r
$(OBJS)\advdll_bmpcboxg.obj \\r
$(OBJS)\advdll_calctrlg.obj \\r
+ $(OBJS)\advdll_commandlinkbuttong.obj \\r
$(OBJS)\advdll_datavgen.obj \\r
$(OBJS)\advdll_datectlg.obj \\r
$(OBJS)\advdll_editlbox.obj \\r
$(OBJS)\advdll_wizard.obj \\r
$(OBJS)\advdll_taskbarcmn.obj \\r
$(OBJS)\advdll_aboutdlg.obj \\r
+ $(OBJS)\advdll_commandlinkbutton.obj \\r
$(OBJS)\advdll_notifmsg.obj \\r
$(OBJS)\advdll_sound.obj \\r
$(OBJS)\advdll_taskbar.obj \\r
$(OBJS)\advlib_aboutdlgg.obj \\r
$(OBJS)\advlib_bmpcboxg.obj \\r
$(OBJS)\advlib_calctrlg.obj \\r
+ $(OBJS)\advlib_commandlinkbuttong.obj \\r
$(OBJS)\advlib_datavgen.obj \\r
$(OBJS)\advlib_datectlg.obj \\r
$(OBJS)\advlib_editlbox.obj \\r
$(OBJS)\advlib_wizard.obj \\r
$(OBJS)\advlib_taskbarcmn.obj \\r
$(OBJS)\advlib_aboutdlg.obj \\r
+ $(OBJS)\advlib_commandlinkbutton.obj \\r
$(OBJS)\advlib_notifmsg.obj \\r
$(OBJS)\advlib_sound.obj \\r
$(OBJS)\advlib_taskbar.obj \\r
$(OBJS)\advlib_aboutdlgg.obj \\r
$(OBJS)\advlib_bmpcboxg.obj \\r
$(OBJS)\advlib_calctrlg.obj \\r
+ $(OBJS)\advlib_commandlinkbuttong.obj \\r
$(OBJS)\advlib_datavgen.obj \\r
$(OBJS)\advlib_datectlg.obj \\r
$(OBJS)\advlib_editlbox.obj \\r
$(OBJS)\advlib_wizard.obj \\r
$(OBJS)\advlib_taskbarcmn.obj \\r
$(OBJS)\advlib_aboutdlg.obj \\r
+ $(OBJS)\advlib_commandlinkbutton.obj \\r
$(OBJS)\advlib_notifmsg.obj \\r
$(OBJS)\advlib_sound.obj \\r
$(OBJS)\advlib_taskbar.obj \\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp\r
\r
+$(OBJS)\advdll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp\r
+\r
$(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp\r
\r
$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
\r
+$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
+\r
$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
\r
$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp\r
\r
+$(OBJS)\advlib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp\r
+\r
$(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp\r
\r
$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
\r
+$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
+\r
$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
\r
__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
!endif\r
__wxscintilla_usingdll_p =\r
-!ifeq MONOLITHIC 0
+!ifeq MONOLITHIC 0\r
!ifeq SHARED 1\r
__wxscintilla_usingdll_p = -dWXUSINGDLL\r
!endif\r
-!endif
+!endif\r
EXTRALIBS_FOR_BASE =\r
!ifeq MONOLITHIC 0\r
EXTRALIBS_FOR_BASE = \r
$(OBJS)\monodll_aboutdlgg.obj &\r
$(OBJS)\monodll_bmpcboxg.obj &\r
$(OBJS)\monodll_calctrlg.obj &\r
+ $(OBJS)\monodll_commandlinkbuttong.obj &\r
$(OBJS)\monodll_datavgen.obj &\r
$(OBJS)\monodll_datectlg.obj &\r
$(OBJS)\monodll_editlbox.obj &\r
$(OBJS)\monodll_wizard.obj &\r
$(OBJS)\monodll_taskbarcmn.obj &\r
$(OBJS)\monodll_aboutdlg.obj &\r
+ $(OBJS)\monodll_commandlinkbutton.obj &\r
$(OBJS)\monodll_notifmsg.obj &\r
$(OBJS)\monodll_sound.obj &\r
$(OBJS)\monodll_taskbar.obj &\r
$(OBJS)\monodll_aboutdlgg.obj &\r
$(OBJS)\monodll_bmpcboxg.obj &\r
$(OBJS)\monodll_calctrlg.obj &\r
+ $(OBJS)\monodll_commandlinkbuttong.obj &\r
$(OBJS)\monodll_datavgen.obj &\r
$(OBJS)\monodll_datectlg.obj &\r
$(OBJS)\monodll_editlbox.obj &\r
$(OBJS)\monodll_wizard.obj &\r
$(OBJS)\monodll_taskbarcmn.obj &\r
$(OBJS)\monodll_aboutdlg.obj &\r
+ $(OBJS)\monodll_commandlinkbutton.obj &\r
$(OBJS)\monodll_notifmsg.obj &\r
$(OBJS)\monodll_sound.obj &\r
$(OBJS)\monodll_taskbar.obj &\r
$(OBJS)\monolib_aboutdlgg.obj &\r
$(OBJS)\monolib_bmpcboxg.obj &\r
$(OBJS)\monolib_calctrlg.obj &\r
+ $(OBJS)\monolib_commandlinkbuttong.obj &\r
$(OBJS)\monolib_datavgen.obj &\r
$(OBJS)\monolib_datectlg.obj &\r
$(OBJS)\monolib_editlbox.obj &\r
$(OBJS)\monolib_wizard.obj &\r
$(OBJS)\monolib_taskbarcmn.obj &\r
$(OBJS)\monolib_aboutdlg.obj &\r
+ $(OBJS)\monolib_commandlinkbutton.obj &\r
$(OBJS)\monolib_notifmsg.obj &\r
$(OBJS)\monolib_sound.obj &\r
$(OBJS)\monolib_taskbar.obj &\r
$(OBJS)\monolib_aboutdlgg.obj &\r
$(OBJS)\monolib_bmpcboxg.obj &\r
$(OBJS)\monolib_calctrlg.obj &\r
+ $(OBJS)\monolib_commandlinkbuttong.obj &\r
$(OBJS)\monolib_datavgen.obj &\r
$(OBJS)\monolib_datectlg.obj &\r
$(OBJS)\monolib_editlbox.obj &\r
$(OBJS)\monolib_wizard.obj &\r
$(OBJS)\monolib_taskbarcmn.obj &\r
$(OBJS)\monolib_aboutdlg.obj &\r
+ $(OBJS)\monolib_commandlinkbutton.obj &\r
$(OBJS)\monolib_notifmsg.obj &\r
$(OBJS)\monolib_sound.obj &\r
$(OBJS)\monolib_taskbar.obj &\r
$(OBJS)\advdll_aboutdlgg.obj &\r
$(OBJS)\advdll_bmpcboxg.obj &\r
$(OBJS)\advdll_calctrlg.obj &\r
+ $(OBJS)\advdll_commandlinkbuttong.obj &\r
$(OBJS)\advdll_datavgen.obj &\r
$(OBJS)\advdll_datectlg.obj &\r
$(OBJS)\advdll_editlbox.obj &\r
$(OBJS)\advdll_wizard.obj &\r
$(OBJS)\advdll_taskbarcmn.obj &\r
$(OBJS)\advdll_aboutdlg.obj &\r
+ $(OBJS)\advdll_commandlinkbutton.obj &\r
$(OBJS)\advdll_notifmsg.obj &\r
$(OBJS)\advdll_sound.obj &\r
$(OBJS)\advdll_taskbar.obj &\r
$(OBJS)\advdll_aboutdlgg.obj &\r
$(OBJS)\advdll_bmpcboxg.obj &\r
$(OBJS)\advdll_calctrlg.obj &\r
+ $(OBJS)\advdll_commandlinkbuttong.obj &\r
$(OBJS)\advdll_datavgen.obj &\r
$(OBJS)\advdll_datectlg.obj &\r
$(OBJS)\advdll_editlbox.obj &\r
$(OBJS)\advdll_wizard.obj &\r
$(OBJS)\advdll_taskbarcmn.obj &\r
$(OBJS)\advdll_aboutdlg.obj &\r
+ $(OBJS)\advdll_commandlinkbutton.obj &\r
$(OBJS)\advdll_notifmsg.obj &\r
$(OBJS)\advdll_sound.obj &\r
$(OBJS)\advdll_taskbar.obj &\r
$(OBJS)\advlib_aboutdlgg.obj &\r
$(OBJS)\advlib_bmpcboxg.obj &\r
$(OBJS)\advlib_calctrlg.obj &\r
+ $(OBJS)\advlib_commandlinkbuttong.obj &\r
$(OBJS)\advlib_datavgen.obj &\r
$(OBJS)\advlib_datectlg.obj &\r
$(OBJS)\advlib_editlbox.obj &\r
$(OBJS)\advlib_wizard.obj &\r
$(OBJS)\advlib_taskbarcmn.obj &\r
$(OBJS)\advlib_aboutdlg.obj &\r
+ $(OBJS)\advlib_commandlinkbutton.obj &\r
$(OBJS)\advlib_notifmsg.obj &\r
$(OBJS)\advlib_sound.obj &\r
$(OBJS)\advlib_taskbar.obj &\r
$(OBJS)\advlib_aboutdlgg.obj &\r
$(OBJS)\advlib_bmpcboxg.obj &\r
$(OBJS)\advlib_calctrlg.obj &\r
+ $(OBJS)\advlib_commandlinkbuttong.obj &\r
$(OBJS)\advlib_datavgen.obj &\r
$(OBJS)\advlib_datectlg.obj &\r
$(OBJS)\advlib_editlbox.obj &\r
$(OBJS)\advlib_wizard.obj &\r
$(OBJS)\advlib_taskbarcmn.obj &\r
$(OBJS)\advlib_aboutdlg.obj &\r
+ $(OBJS)\advlib_commandlinkbutton.obj &\r
$(OBJS)\advlib_notifmsg.obj &\r
$(OBJS)\advlib_sound.obj &\r
$(OBJS)\advlib_taskbar.obj &\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_commandlinkbuttong.obj : .AUTODEPEND ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monodll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monodll_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_commandlinkbuttong.obj : .AUTODEPEND ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monolib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monolib_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
$(OBJS)\advdll_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
\r
+$(OBJS)\advdll_commandlinkbuttong.obj : .AUTODEPEND ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
$(OBJS)\advdll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
\r
$(OBJS)\advdll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
\r
+$(OBJS)\advdll_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
$(OBJS)\advdll_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
\r
$(OBJS)\advlib_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
\r
+$(OBJS)\advlib_commandlinkbuttong.obj : .AUTODEPEND ..\..\src\generic\commandlinkbuttong.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
$(OBJS)\advlib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
\r
$(OBJS)\advlib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
\r
+$(OBJS)\advlib_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
$(OBJS)\advlib_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\src\msw\commandlinkbutton.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\src\msw\datecontrols.cpp\r
\r
!IF "$(CFG)" == "adv - Win32 DLL Universal Release"\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\src\generic\commandlinkbuttong.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\src\generic\datavgen.cpp\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\msw\commandlinkbutton.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\msw\datectrl.h\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\commandlinkbutton.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\dataview.h\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\msw\commandlinkbutton.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\msw\control.h\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\commandlinkbutton.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\control.h\r
# End Source File\r
# Begin Source File\r
Name="DLL Universal Release|Win32"\r
ExcludedFromBuild="TRUE"/>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\msw\commandlinkbutton.cpp">\r
+ </File>\r
<File\r
RelativePath="..\..\src\msw\datecontrols.cpp">\r
<FileConfiguration\r
<File\r
RelativePath="..\..\src\generic\calctrlg.cpp">\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\generic\commandlinkbuttong.cpp">\r
+ </File>\r
<File\r
RelativePath="..\..\src\generic\datavgen.cpp">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\msw\calctrl.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\msw\commandlinkbutton.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\msw\datectrl.h">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\calctrl.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\commandlinkbutton.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\dataview.h">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\msw\combobox.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\msw\commandlinkbutton.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\msw\control.h">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\combobox.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\commandlinkbutton.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\control.h">\r
</File>\r
ExcludedFromBuild="true"\r
/>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\msw\commandlinkbutton.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\msw\datecontrols.cpp"\r
>\r
RelativePath="..\..\src\generic\calctrlg.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\generic\commandlinkbuttong.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\generic\datavgen.cpp"\r
>\r
RelativePath="..\..\include\wx\msw\calctrl.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\msw\datectrl.h"\r
>\r
RelativePath="..\..\include\wx\calctrl.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\commandlinkbutton.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\dataview.h"\r
>\r
RelativePath="..\..\include\wx\msw\combobox.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\msw\control.h"\r
>\r
RelativePath="..\..\include\wx\combobox.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\commandlinkbutton.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\control.h"\r
>\r
ExcludedFromBuild="true"\r
/>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\msw\commandlinkbutton.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\msw\datecontrols.cpp"\r
>\r
RelativePath="..\..\src\generic\calctrlg.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\generic\commandlinkbuttong.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\src\generic\datavgen.cpp"\r
>\r
RelativePath="..\..\include\wx\msw\calctrl.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\msw\datectrl.h"\r
>\r
RelativePath="..\..\include\wx\calctrl.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\commandlinkbutton.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\dataview.h"\r
>\r
RelativePath="..\..\include\wx\msw\combobox.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\msw\control.h"\r
>\r
RelativePath="..\..\include\wx\combobox.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\commandlinkbutton.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\control.h"\r
>\r
--enable-colourpicker use wxColourPickerCtrl class
--enable-combobox use wxComboBox class
--enable-comboctrl use wxComboCtrl class
+ --enable-commandlinkbutton use wxCommmandLinkButton class
--enable-dataviewctrl use wxDataViewCtrl class
--enable-datepick use wxDatePickerCtrl class
--enable-detect_sm use code to detect X11 session manager
DEFAULT_wxUSE_COLOURPICKERCTRL=no
DEFAULT_wxUSE_COMBOBOX=no
DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_COMMANDLINKBUTTON=no
DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_DATEPICKCTRL=no
DEFAULT_wxUSE_DETECT_SM=no
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commandlinkbutton" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-commandlinkbutton... $ECHO_C" >&6; }
+ # Check whether --enable-commandlinkbutton was given.
+if test "${enable_commandlinkbutton+set}" = set; then
+ enableval=$enable_commandlinkbutton;
+ if test "$enableval" = yes; then
+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=yes'
+ else
+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=no'
+ fi
+
+else
+
+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=${'DEFAULT_wxUSE_COMMANDLINKBUTTON":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_commandlinkbutton"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_COMMANDLINKBUTTON = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_COMMANDLINKBUTTON
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
USES_CONTROLS=1
fi
+if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_COMMANDLINKBUTTON 1
+_ACEOF
+
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_CHOICE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_CHOICE 1
DEFAULT_wxUSE_COLOURPICKERCTRL=no
DEFAULT_wxUSE_COMBOBOX=no
DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_COMMANDLINKBUTTON=no
DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_DATEPICKCTRL=no
DEFAULT_wxUSE_DETECT_SM=no
WX_ARG_FEATURE(colourpicker,[ --enable-colourpicker use wxColourPickerCtrl class], wxUSE_COLOURPICKERCTRL)
WX_ARG_FEATURE(combobox, [ --enable-combobox use wxComboBox class], wxUSE_COMBOBOX)
WX_ARG_FEATURE(comboctrl, [ --enable-comboctrl use wxComboCtrl class], wxUSE_COMBOCTRL)
+WX_ARG_FEATURE(commandlinkbutton, [ --enable-commandlinkbutton use wxCommmandLinkButton class], wxUSE_COMMANDLINKBUTTON)
WX_ARG_FEATURE(dataviewctrl,[ --enable-dataviewctrl use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
WX_ARG_FEATURE(datepick, [ --enable-datepick use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL)
WX_ARG_FEATURE(detect_sm, [ --enable-detect_sm use code to detect X11 session manager], wxUSE_DETECT_SM)
USES_CONTROLS=1
fi
+if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then
+ AC_DEFINE(wxUSE_COMMANDLINKBUTTON)
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_CHOICE" = "yes"; then
AC_DEFINE(wxUSE_CHOICE)
USES_CONTROLS=1
All (GUI):
+- Added wxCommandLinkButton (Rickard Westerlund, GSoC 2010 project).
- wxAUI: support auto-orientable toolbars (wsu).
- Added wxDataViewCtrl::Set/GetCurrentItem().
- wxHTML: render in RTL order inside RTL window (Richard Bullington-McGuire).
# endif
#endif /* !defined(wxUSE_COMBOBOX) */
+#ifndef wxUSE_COMMANDLINKBUTTON
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_COMMANDLINKBUTTON must be defined, please read comment near the top of this file."
+# else
+# define wxUSE_COMMANDLINKBUTTON 0
+# endif
+#endif /* !defined(wxUSE_COMMANDLINKBUTTON) */
+
#ifndef wxUSE_COMBOCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_COMBOCTRL must be defined, please read comment near the top of this file."
# endif
#endif /* wxUSE_BMPBUTTON */
+#if wxUSE_COMMANDLINKBUTTON
+# if !wxUSE_BUTTON
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_COMMANDLINKBUTTON requires wxUSE_BUTTON"
+# else
+# undef wxUSE_BUTTON
+# define wxUSE_BUTTON 1
+# endif
+# endif
+#endif /* wxUSE_COMMANDLINKBUTTON */
+
/*
wxUSE_BOOKCTRL should be only used if any of the controls deriving from it
are used
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/commandlinkbutton.h
+// Purpose: wxCommandLinkButtonBase and wxGenericCommandLinkButton classes
+// Author: Rickard Westerlund
+// Created: 2010-06-11
+// RCS-ID: $Id$
+// Copyright: (c) 2010 wxWidgets team
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_COMMANDLINKBUTTON_H_
+#define _WX_COMMANDLINKBUTTON_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_COMMANDLINKBUTTON
+
+// ----------------------------------------------------------------------------
+// Command link button common base class
+// ----------------------------------------------------------------------------
+
+// This class has separate "main label" (title-like string) and (possibly
+// multiline) "note" which can be set and queried separately but can also be
+// set both at once by joining them with a new line and setting them as a
+// label and queried by breaking the label into the parts before the first new
+// line and after it.
+
+class WXDLLIMPEXP_ADV wxCommandLinkButtonBase : public wxButton
+{
+public:
+ wxCommandLinkButtonBase() : wxButton() { }
+
+ wxCommandLinkButtonBase(wxWindow *parent,
+ wxWindowID id,
+ const wxString& mainLabel = wxEmptyString,
+ const wxString& note = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator =
+ wxDefaultValidator,
+ const wxString& name = wxButtonNameStr)
+ : wxButton(parent,
+ id,
+ mainLabel + '\n' + note,
+ pos,
+ size,
+ style,
+ validator,
+ name)
+ { }
+
+ virtual void SetMainLabelAndNote(const wxString& mainLabel,
+ const wxString& note) = 0;
+
+ virtual void SetMainLabel(const wxString& mainLabel)
+ {
+ SetMainLabelAndNote(mainLabel, GetNote());
+ }
+
+ virtual void SetNote(const wxString& note)
+ {
+ SetMainLabelAndNote(GetMainLabel(), note);
+ }
+
+ virtual wxString GetMainLabel() const
+ {
+ return GetLabel().BeforeFirst('\n');
+ }
+
+ virtual wxString GetNote() const
+ {
+ return GetLabel().AfterFirst('\n');
+ }
+
+protected:
+ virtual bool HasNativeBitmap() const { return false; }
+
+private:
+ wxDECLARE_NO_COPY_CLASS(wxCommandLinkButtonBase);
+};
+
+// ----------------------------------------------------------------------------
+// Generic command link button
+// ----------------------------------------------------------------------------
+
+// Trivial generic implementation simply using a multiline label to show both
+// the main label and the note.
+
+class WXDLLIMPEXP_ADV wxGenericCommandLinkButton
+ : public wxCommandLinkButtonBase
+{
+public:
+ wxGenericCommandLinkButton() : wxCommandLinkButtonBase() { }
+
+
+ wxGenericCommandLinkButton(wxWindow *parent,
+ wxWindowID id,
+ const wxString& mainLabel = wxEmptyString,
+ const wxString& note = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxButtonNameStr)
+ : wxCommandLinkButtonBase()
+ {
+ Create(parent, id, mainLabel, note, pos, size, style, validator, name);
+ }
+
+ bool Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& mainLabel = wxEmptyString,
+ const wxString& note = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxButtonNameStr);
+
+ virtual void SetMainLabelAndNote(const wxString& mainLabel,
+ const wxString& note)
+ {
+ wxButton::SetLabel(mainLabel + '\n' + note);
+ }
+
+private:
+ void SetDefaultBitmap();
+
+ wxDECLARE_NO_COPY_CLASS(wxGenericCommandLinkButton);
+};
+
+#if defined(__WXMSW__)
+ #include "wx/msw/commandlinkbutton.h"
+#else
+ class WXDLLIMPEXP_ADV wxCommandLinkButton : public wxGenericCommandLinkButton
+ {
+ public:
+ wxCommandLinkButton() : wxGenericCommandLinkButton() { }
+
+ wxCommandLinkButton(wxWindow *parent,
+ wxWindowID id,
+ const wxString& mainLabel = wxEmptyString,
+ const wxString& note = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxButtonNameStr)
+ : wxGenericCommandLinkButton(parent,
+ id,
+ mainLabel,
+ note,
+ pos,
+ size,
+ style,
+ validator,
+ name)
+ { }
+
+ private:
+ wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton);
+ };
+#endif // __WXMSW__/!__WXMSW__
+
+#endif // wxUSE_COMMANDLINKBUTTON
+
+#endif // _WX_COMMANDLINKBUTTON_H_
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
#define wxUSE_COMBOBOX 1 // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
virtual void DoSetBitmapPosition(wxDirection dir);
+ // Increases the passed in size if necessary to account for the
+ // button image, if any
+ void AdjustForBitmapSize(wxSize& size) const;
+
class wxButtonImageData *m_imageData;
// true if the UAC symbol is shown
bool m_authNeeded;
private:
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
+ wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
};
#endif // _WX_BUTTON_H_
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/msw/commandlinkbutton.h
+// Purpose: wxCommandLinkButton class
+// Author: Rickard Westerlund
+// Created: 2010-06-11
+// RCS-ID: $Id$
+// Copyright: (c) 2010 wxWidgets team
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_COMMANDLINKBUTTON_H_
+#define _WX_MSW_COMMANDLINKBUTTON_H_
+
+// ----------------------------------------------------------------------------
+// Command link button for wxMSW
+// ----------------------------------------------------------------------------
+
+// Derive from the generic version to be able to fall back to it during
+// run-time if the command link buttons are not supported by the system we're
+// running under.
+
+class WXDLLIMPEXP_ADV wxCommandLinkButton : public wxGenericCommandLinkButton
+{
+public:
+ wxCommandLinkButton () : wxGenericCommandLinkButton() { }
+
+ wxCommandLinkButton(wxWindow *parent,
+ wxWindowID id,
+ const wxString& mainLabel = wxEmptyString,
+ const wxString& note = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxButtonNameStr)
+ : wxGenericCommandLinkButton()
+ {
+ Create(parent, id, mainLabel, note, pos, size, style, validator, name);
+ }
+
+ bool Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& mainLabel = wxEmptyString,
+ const wxString& note = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxButtonNameStr);
+
+ // overridden base class methods
+ // -----------------------------
+
+ // do the same thing as in the generic case here
+ virtual void SetLabel(const wxString& label)
+ {
+ SetMainLabelAndNote(label.BeforeFirst('\n'), label.AfterFirst('\n'));
+ }
+
+ virtual void SetMainLabelAndNote(const wxString& mainLabel,
+ const wxString& note);
+
+ virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+protected:
+ virtual wxSize DoGetBestSize() const;
+
+ virtual bool HasNativeBitmap() const;
+
+private:
+ wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton);
+};
+
+#endif // _WX_MSW_COMMANDLINKBUTTON_H_
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
#define wxUSE_COMBOBOX 1 // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
#define wxUSE_COMBOBOX 1 // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
#define wxUSE_COMBOBOX 1 // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
#define wxUSE_COMBOBOX 1 // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
#define wxUSE_COMBOBOX 1 // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
#define wxUSE_COMBOBOX 1 // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
#define wxUSE_COLLPANE 1 // wxCollapsiblePane
#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl
#define wxUSE_COMBOBOX 1 // wxComboBox
+#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton
#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/commandlinkbutton.h
+// Purpose: interface of wxCommandLinkButton
+// Author: wxWidgets team
+// RCS-ID: $Id$
+// Licence: wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+ @class wxCommandLinkButton
+
+ Objects of this class are similar in appearance to the normal wxButtons but
+ to the links in a web page in functionality.
+
+ Pressing such button usually results in switching to another window of the
+ program and so they can be used as a replacement for the "Next" button in a
+ multi-page dialog (such as wxWizard), for example.
+
+ Their advantage compared to the ordinary wxButtons is that they emphasize
+ the action of switching the window and also that they allow to give more
+ detailed explanation to the user because, in addition to the short button
+ label, they also show a longer description string.
+
+ The short, title-like, part of the label is called the <em>main label</em>
+ and the longer description is the <em>note</em>. Both of them can be set
+ and queried independently using wxCommandLinkButton-specific methods such
+ as SetMainLabel() or GetNote() or also via SetLabel() and GetLabel()
+ methods inherited from wxButton. When using the latter, the main label and
+ the note are concatenated into a single string using a new line character
+ between them (notice that the note part can have more new lines in it).
+
+ wxCommandLinkButton generates the same event as wxButton but doesn't
+ support any of wxButton-specific styles nor adds any new styles of its own.
+
+ Currently this class uses native implementation under Windows Vista and
+ later versions and a generic implementation for the other platforms and
+ earlier Windows versions.
+
+ @since 2.9.2
+
+ @library{wxadv}
+ @category{ctrl}
+ @appearance{commandlinkbutton.png}
+
+ @see wxButton, wxBitmapButton
+*/
+class wxCommandLinkButton : public wxButton
+{
+public:
+ /**
+ Default constructor.
+
+ Use Create() to really create the control.
+ */
+ wxCommandLinkButton();
+
+ /**
+ Constructor really creating a command Link button.
+
+ The button will be decorated with stock icons under GTK+ 2.
+
+ @param parent
+ Parent window. Must not be @NULL.
+ @param id
+ Button identifier. A value of wxID_ANY indicates a default value.
+ @param mainLabel
+ First line of text on the button, typically the label of an action
+ that will be made when the button is pressed.
+ @param note
+ Second line of text describing the action performed when the button
+ is pressed.
+ @param pos
+ Button position.
+ @param size
+ Button size. If the default size is specified then the button is sized
+ appropriately for the text.
+ @param style
+ Window style. See wxButton class description.
+ @param validator
+ Window validator.
+ @param name
+ Window name.
+
+ @see Create(), wxValidator
+ */
+ wxCommandLinkButton(wxWindow* parent, wxWindowID id,
+ const wxString& mainLabel = wxEmptyString,
+ const wxString& note = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxButtonNameStr);
+
+ /**
+ Button creation function for two-step creation.
+ For more details, see wxCommandLinkButton().
+ */
+ bool Create(wxWindow* parent, wxWindowID id,
+ const wxString& mainLabel = wxEmptyString,
+ const wxString& note = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxButtonNameStr);
+
+ /**
+ Sets a new main label and note for the button.
+
+ Neither of the arguments can be empty, if you need to change just the
+ label or just the note, use SetMainLabel() or SetNote() instead of this
+ function.
+
+ @param mainLabel
+ New main label to use.
+ @param note
+ New note to use.
+ */
+ void SetMainLabelAndNote(const wxString& mainLabel, const wxString& note);
+
+ /**
+ Sets the string label and note for the button.
+
+ @param label
+ The label and note to set, with the two separated
+ by the first newline or none to set a blank note.
+ */
+ virtual void SetLabel(const wxString& label);
+
+ /**
+ Returns the string label for the button.
+
+ @see SetLabel()
+
+ @return
+ A string with the main label and note concatenated
+ together with a newline separating them.
+ */
+ wxString GetLabel() const;
+
+ /**
+ Changes the main label.
+
+ @param mainLabel
+ New main label to use.
+ */
+ void SetMainLabel(const wxString& mainLabel);
+
+ /**
+ Changes the note.
+
+ @param note
+ New note to use.
+ */
+ void SetNote(const wxString& note);
+
+ /**
+ Returns the current main label.
+
+ @return
+ Main label currently displayed.
+ */
+ wxString GetMainLabel() const;
+
+ /**
+ Returns the currently used note.
+
+ @return
+ Note currently displayed.
+ */
+ wxString GetNote() const;
+};
#include "wx/artprov.h"
#include "wx/sizer.h"
#include "wx/dcmemory.h"
+#include "wx/commandlinkbutton.h"
#include "widgets.h"
{
ButtonPage_Reset = wxID_HIGHEST,
ButtonPage_ChangeLabel,
+ ButtonPage_ChangeNote,
ButtonPage_Button
};
void OnButton(wxCommandEvent& event);
void OnButtonReset(wxCommandEvent& event);
void OnButtonChangeLabel(wxCommandEvent& event);
+ void OnButtonChangeNote(wxCommandEvent& event);
// reset the wxButton parameters
void Reset();
*m_chkTextAndBitmap,
*m_chkFit,
*m_chkAuthNeeded,
+ *m_chkCommandLink,
*m_chkDefault;
// more checkboxes for wxBitmapButton only
// the button itself and the sizer it is in
wxButton *m_button;
+
+#if wxUSE_COMMANDLINKBUTTON
+ // same as m_button or NULL if not showing a command link button currently
+ wxCommandLinkButton *m_cmdLnkButton;
+#endif // wxUSE_COMMANDLINKBUTTON
+
wxSizer *m_sizerButton;
// the text entries for command parameters
wxTextCtrl *m_textLabel;
+#if wxUSE_COMMANDLINKBUTTON
+ wxTextCtrl *m_textNote;
+
+ // used to hide or show button for changing note
+ wxSizer *m_sizerNote;
+#endif // wxUSE_COMMANDLINKBUTTON
+
private:
DECLARE_EVENT_TABLE()
DECLARE_WIDGETS_PAGE(ButtonWidgetsPage)
EVT_BUTTON(ButtonPage_Reset, ButtonWidgetsPage::OnButtonReset)
EVT_BUTTON(ButtonPage_ChangeLabel, ButtonWidgetsPage::OnButtonChangeLabel)
+ EVT_BUTTON(ButtonPage_ChangeNote, ButtonWidgetsPage::OnButtonChangeNote)
EVT_CHECKBOX(wxID_ANY, ButtonWidgetsPage::OnCheckOrRadioBox)
EVT_RADIOBOX(wxID_ANY, ButtonWidgetsPage::OnCheckOrRadioBox)
m_chkTextAndBitmap =
m_chkFit =
m_chkAuthNeeded =
+ m_chkCommandLink =
m_chkDefault =
m_chkUsePressed =
m_chkUseFocused =
m_chkTextAndBitmap = CreateCheckBoxAndAddToSizer(sizerLeft, "Text &and bitmap");
m_chkFit = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Fit exactly"));
m_chkAuthNeeded = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Require a&uth"));
+#if wxUSE_COMMANDLINKBUTTON
+ m_chkCommandLink = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Use command &link button"));
+#endif
m_chkDefault = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Default"));
sizerLeft->AddSpacer(5);
wxID_ANY,
&m_textLabel);
m_textLabel->SetValue(wxT("&Press me!"));
-
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+#if wxUSE_COMMANDLINKBUTTON
+ m_sizerNote = CreateSizerWithTextAndButton(ButtonPage_ChangeNote,
+ wxT("Change note"),
+ wxID_ANY,
+ &m_textNote);
+ m_textNote->SetValue(wxT("Writes down button clicks in the log."));
+
+ sizerMiddle->Add(m_sizerNote, 0, wxALL | wxGROW, 5);
+#endif
+
// right pane
m_sizerButton = new wxBoxSizer(wxHORIZONTAL);
m_sizerButton->SetMinSize(150, 0);
m_chkAuthNeeded->SetValue(false);
m_chkTextAndBitmap->SetValue(false);
m_chkDefault->SetValue(false);
+#if wxUSE_COMMANDLINKBUTTON
+ m_chkCommandLink->SetValue(false);
+#endif
m_chkUsePressed->SetValue(true);
m_chkUseFocused->SetValue(true);
wxString label;
if ( m_button )
{
- label = m_button->GetLabel();
+#if wxUSE_COMMANDLINKBUTTON
+ if ( m_cmdLnkButton )
+ label = m_cmdLnkButton->GetMainLabel();
+ else
+#endif
+ label = m_button->GetLabel();
size_t count = m_sizerButton->GetChildren().GetCount();
for ( size_t n = 0; n < count; n++ )
break;
}
+#if wxUSE_COMMANDLINKBUTTON
+ m_sizerNote->Show(m_chkCommandLink->GetValue());
+#endif
+
bool showsBitmap = false;
if ( m_chkBitmapOnly->GetValue() )
{
if ( m_chkUseDisabled->GetValue() )
bbtn->SetBitmapDisabled(CreateBitmap(wxT("disabled")));
m_button = bbtn;
+#if wxUSE_COMMANDLINKBUTTON
+ m_cmdLnkButton = NULL;
+#endif
}
else // normal button
{
- m_button = new wxButton(this, ButtonPage_Button, label,
- wxDefaultPosition, wxDefaultSize,
- flags);
+#if wxUSE_COMMANDLINKBUTTON
+ m_cmdLnkButton = NULL;
+
+ if ( m_chkCommandLink->GetValue() )
+ {
+ m_cmdLnkButton = new wxCommandLinkButton(this, ButtonPage_Button,
+ label,
+ m_textNote->GetValue(),
+ wxDefaultPosition,
+ wxDefaultSize,
+ flags);
+ m_button = m_cmdLnkButton;
+ }
+ else
+#endif // wxUSE_COMMANDLINKBUTTON
+ {
+ m_button = new wxButton(this, ButtonPage_Button, label,
+ wxDefaultPosition, wxDefaultSize,
+ flags);
+ }
}
if ( !showsBitmap && m_chkTextAndBitmap->GetValue() )
void ButtonWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
{
CreateButton();
+ Layout(); // make sure the text field for changing note displays correctly.
}
void ButtonWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event))
{
- m_button->SetLabel(m_textLabel->GetValue());
+#if wxUSE_COMMANDLINKBUTTON
+ if ( m_cmdLnkButton )
+ m_cmdLnkButton->SetMainLabel(m_textLabel->GetValue());
+ else
+#endif // wxUSE_COMMANDLINKBUTTON
+ m_button->SetLabel(m_textLabel->GetValue());
+
+ m_sizerButton->Layout();
+}
+
+void ButtonWidgetsPage::OnButtonChangeNote(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_COMMANDLINKBUTTON
+ m_cmdLnkButton->SetNote(m_textNote->GetValue());
m_sizerButton->Layout();
+#endif // wxUSE_COMMANDLINKBUTTON
}
void ButtonWidgetsPage::OnButton(wxCommandEvent& WXUNUSED(event))
#define wxUSE_COLLPANE 0
#define wxUSE_COLOURPICKERCTRL 0
#define wxUSE_COMBOBOX 0
+#define wxUSE_COMMANDLINKBUTTON 0
#define wxUSE_DATAVIEWCTRL 0
#define wxUSE_DATEPICKCTRL 0
#define wxUSE_DIRPICKERCTRL 0
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/generic/commandlinkbuttong.cpp
+// Purpose: wxGenericCommandLinkButton
+// Author: Rickard Westerlund
+// Created: 2010-06-23
+// RCS-ID: $Id$
+// Copyright: (c) 2010 wxWidgets team
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_COMMANDLINKBUTTON
+
+#include "wx/commandlinkbutton.h"
+#include "wx/artprov.h"
+
+#if wxUSE_EXTENDED_RTTI
+ wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCommandLinkButton, wxButton, "wx/commandlinkbutton.h")
+#else
+ wxIMPLEMENT_DYNAMIC_CLASS(wxCommandLinkButton, wxButton)
+#endif // wxUSE_EXTENDED_RTTI
+
+// ----------------------------------------------------------------------------
+// Generic command link button
+// ----------------------------------------------------------------------------
+
+bool wxGenericCommandLinkButton::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& mainLabel,
+ const wxString& note,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ if ( !wxButton::Create(parent,
+ id,
+ mainLabel + '\n' + note,
+ pos,
+ size,
+ style,
+ validator,
+ name) )
+ return false;
+
+ if ( !HasNativeBitmap() )
+ SetDefaultBitmap();
+
+ return true;
+
+}
+
+void wxGenericCommandLinkButton::SetDefaultBitmap()
+{
+ SetBitmap(wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_BUTTON));
+}
+
+#endif // wxUSE_COMMANDLINKBUTTON
// size management including autosizing
// ----------------------------------------------------------------------------
+void wxButton::AdjustForBitmapSize(wxSize &size) const
+{
+ if ( !m_imageData )
+ return;
+
+ // account for the bitmap size
+ const wxSize sizeBmp = m_imageData->GetBitmap(State_Normal).GetSize();
+ const wxDirection dirBmp = m_imageData->GetBitmapPosition();
+ if ( dirBmp == wxLEFT || dirBmp == wxRIGHT )
+ {
+ size.x += sizeBmp.x;
+ if ( sizeBmp.y > size.y )
+ size.y = sizeBmp.y;
+ }
+ else // bitmap on top/below the text
+ {
+ size.y += sizeBmp.y;
+ if ( sizeBmp.x > size.x )
+ size.x = sizeBmp.x;
+ }
+
+ // account for the user-specified margins
+ size += 2*m_imageData->GetBitmapMargins();
+
+ // and also for the margins we always add internally (unless we have no
+ // border at all in which case the button has exactly the same size as
+ // bitmap and so no margins should be used)
+ if ( !HasFlag(wxBORDER_NONE) )
+ {
+ int marginH = 0,
+ marginV = 0;
+#if wxUSE_UXTHEME
+ if ( wxUxThemeEngine::GetIfActive() )
+ {
+ wxUxThemeHandle theme(const_cast<wxButton *>(this), L"BUTTON");
+
+ MARGINS margins;
+ wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
+ BP_PUSHBUTTON,
+ PBS_NORMAL,
+ TMT_CONTENTMARGINS,
+ NULL,
+ &margins);
+
+ // XP doesn't draw themed buttons correctly when the client
+ // area is smaller than 8x8 - enforce this minimum size for
+ // small bitmaps
+ size.IncTo(wxSize(8, 8));
+
+ marginH = margins.cxLeftWidth + margins.cxRightWidth
+ + 2*XP_BUTTON_EXTRA_MARGIN;
+ marginV = margins.cyTopHeight + margins.cyBottomHeight
+ + 2*XP_BUTTON_EXTRA_MARGIN;
+ }
+ else
+#endif // wxUSE_UXTHEME
+ {
+ marginH =
+ marginV = OD_BUTTON_MARGIN;
+ }
+
+ size.IncBy(marginH, marginV);
+ }
+}
+
wxSize wxButton::DoGetBestSize() const
{
wxSize size;
if ( m_imageData )
{
- // account for the bitmap size
- const wxSize sizeBmp = m_imageData->GetBitmap(State_Normal).GetSize();
- const wxDirection dirBmp = m_imageData->GetBitmapPosition();
- if ( dirBmp == wxLEFT || dirBmp == wxRIGHT )
- {
- size.x += sizeBmp.x;
- if ( sizeBmp.y > size.y )
- size.y = sizeBmp.y;
- }
- else // bitmap on top/below the text
- {
- size.y += sizeBmp.y;
- if ( sizeBmp.x > size.x )
- size.x = sizeBmp.x;
- }
-
- // account for the user-specified margins
- size += 2*m_imageData->GetBitmapMargins();
-
- // and also for the margins we always add internally (unless we have no
- // border at all in which case the button has exactly the same size as
- // bitmap and so no margins should be used)
- if ( !HasFlag(wxBORDER_NONE) )
- {
- int marginH = 0,
- marginV = 0;
-#if wxUSE_UXTHEME
- if ( wxUxThemeEngine::GetIfActive() )
- {
- wxUxThemeHandle theme(const_cast<wxButton *>(this), L"BUTTON");
-
- MARGINS margins;
- wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
- BP_PUSHBUTTON,
- PBS_NORMAL,
- TMT_CONTENTMARGINS,
- NULL,
- &margins);
-
- // XP doesn't draw themed buttons correctly when the client
- // area is smaller than 8x8 - enforce this minimum size for
- // small bitmaps
- size.IncTo(wxSize(8, 8));
-
- marginH = margins.cxLeftWidth + margins.cxRightWidth
- + 2*XP_BUTTON_EXTRA_MARGIN;
- marginV = margins.cyTopHeight + margins.cyBottomHeight
- + 2*XP_BUTTON_EXTRA_MARGIN;
- }
- else
-#endif // wxUSE_UXTHEME
- {
- marginH =
- marginV = OD_BUTTON_MARGIN;
- }
-
- size.IncBy(marginH, marginV);
- }
+ AdjustForBitmapSize(size);
CacheBestSize(size);
}
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/msw/commandlinkbutton.cpp
+// Purpose: wxCommandLinkButton
+// Author: Rickard Westerlund
+// Created: 2010-06-14
+// RCS-ID: $Id$
+// Copyright: (c) 2010 wxWidgets team
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_COMMANDLINKBUTTON
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/dcclient.h"
+#endif
+
+#include "wx/commandlinkbutton.h"
+#include "wx/msw/private.h"
+#include "wx/msw/private/button.h"
+#include "wx/msw/private/dc.h"
+#include "wx/private/window.h"
+
+#ifndef BCM_SETNOTE
+ #define BCM_SETNOTE 0x1609
+#endif
+
+#ifndef BS_COMMANDLINK
+ #define BS_COMMANDLINK 0xE
+#endif
+
+// ----------------------------------------------------------------------------
+// Helper functions
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+inline bool HasNativeCommandLinkButton()
+{
+ return wxGetWinVersion() >= wxWinVersion_6;
+}
+
+} // anonymous namespace
+
+// ----------------------------------------------------------------------------
+// Command link button
+// ----------------------------------------------------------------------------
+
+bool wxCommandLinkButton::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString& mainLabel,
+ const wxString& note,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ if ( ! wxGenericCommandLinkButton::Create(parent,
+ id,
+ mainLabel,
+ note,
+ pos,
+ size,
+ style,
+ validator,
+ name) )
+ return false;
+
+ SetMainLabelAndNote(mainLabel, note);
+ SetInitialSize();
+
+ return true;
+}
+
+void
+wxCommandLinkButton::SetMainLabelAndNote(const wxString& mainLabel,
+ const wxString& note)
+{
+ if ( HasNativeCommandLinkButton() )
+ {
+ wxButton::SetLabel(mainLabel);
+ ::SendMessage(m_hWnd, BCM_SETNOTE, 0, (LPARAM) note.wx_str());
+
+ // Preserve the user-specified label for GetLabel()
+ m_labelOrig = mainLabel;
+ if ( !note.empty() )
+ m_labelOrig << '\n' << note;
+ }
+ else
+ {
+ wxGenericCommandLinkButton::SetMainLabelAndNote(mainLabel, note);
+ }
+}
+
+WXDWORD wxCommandLinkButton::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+ WXDWORD ret = wxButton::MSWGetStyle(style, exstyle);
+ if ( HasNativeCommandLinkButton() )
+ ret |= BS_COMMANDLINK;
+
+ return ret;
+}
+
+bool wxCommandLinkButton::HasNativeBitmap() const
+{
+ return HasNativeCommandLinkButton();
+}
+
+// ----------------------------------------------------------------------------
+// size management including autosizing
+// ----------------------------------------------------------------------------
+
+// Margin measures can be found at
+// http://expression.microsoft.com/en-us/ee662150.aspx
+namespace
+{
+ const int MAINLABEL_TOP_MARGIN = 16; // Includes image top margin.
+ const int MAINLABEL_NOTE_LEFT_MARGIN = 23;
+ const int NOTE_TOP_MARGIN = 21;
+ const int NOTE_BOTTOM_MARGIN = 1;
+ const int MAINLABEL_NOTE_MARGIN = NOTE_TOP_MARGIN - MAINLABEL_TOP_MARGIN;
+};
+
+wxSize wxCommandLinkButton::DoGetBestSize() const
+{
+ wxSize size;
+
+ // account for the text part if we have it or if we don't have any image at
+ // all (buttons initially created with empty label should still have a non
+ // zero size)
+ if ( ShowsLabel() || !m_imageData )
+ {
+ int flags = 0;
+ if ( GetAuthNeeded() )
+ flags |= wxMSWButton::Size_AuthNeeded;
+
+ wxCommandLinkButton *thisButton =
+ const_cast<wxCommandLinkButton *>(this);
+ wxClientDC dc(thisButton);
+
+ wxFont noteFont = dc.GetFont();
+
+ // 4/3 is the relationship between main label and note font sizes.
+ dc.SetFont(noteFont.Scaled(4.0f/3.0f));
+ size = dc.GetMultiLineTextExtent(GetLabelText(GetMainLabel()));
+
+ dc.SetFont(noteFont);
+ wxSize noteSize = dc.GetMultiLineTextExtent(GetLabelText(GetNote()));
+
+ if ( noteSize.x > size.x )
+ size.x = noteSize.x;
+ size.y += noteSize.y;
+
+ size = wxMSWButton::GetFittingSize(thisButton,
+ size,
+ flags);
+
+ // The height of a standard command link button is 25 and 35 DLUs for
+ // single lines and two lines respectively. Width is not accounted for.
+ int heightDef = GetNote().AfterFirst('\n').empty() ? 25 : 35;
+ wxSize sizeDef = thisButton->ConvertDialogToPixels(wxSize(50,
+ heightDef));
+
+ if ( size.y < sizeDef.y )
+ size.y = sizeDef.y;
+ }
+
+ if ( m_imageData )
+ {
+ AdjustForBitmapSize(size);
+ }
+ else
+ {
+ // The default image size is 16x16.
+ size.x += 16;
+ if ( size.y < 16 )
+ size.y = 16;
+ }
+
+ size.x += MAINLABEL_NOTE_LEFT_MARGIN;
+ size.y += MAINLABEL_TOP_MARGIN + NOTE_BOTTOM_MARGIN;
+ if ( !GetNote().empty() )
+ size.y += MAINLABEL_NOTE_MARGIN;
+
+ CacheBestSize(size);
+
+ return size;
+}
+
+#endif // wxUSE_COMMANDLINKBUTTON
projects / wxWidgets.git / commitdiff
