diff --git a/Makefile.in b/Makefile.in index b44193dc8b..e156c7e867 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,8 +76,8 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.9 WX_RELEASE_NODOT = 29 -WX_VERSION = $(WX_RELEASE).2 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION = $(WX_RELEASE).3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ $(CPPFLAGS) $(CFLAGS) @@ -1899,16 +1899,16 @@ RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \ $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) RICHTEXTDLL_OBJECTS = \ $(__richtextdll___win32rc) \ - richtextdll_richtextctrl.o \ richtextdll_richtextbuffer.o \ - richtextdll_richtextstyles.o \ - richtextdll_richtextxml.o \ - richtextdll_richtexthtml.o \ + richtextdll_richtextctrl.o \ richtextdll_richtextformatdlg.o \ - richtextdll_richtextsymboldlg.o \ - richtextdll_richtextstyledlg.o \ + richtextdll_richtexthtml.o \ + richtextdll_richtextimagedlg.o \ richtextdll_richtextprint.o \ - richtextdll_richtextimagedlg.o + richtextdll_richtextstyledlg.o \ + richtextdll_richtextstyles.o \ + richtextdll_richtextsymboldlg.o \ + richtextdll_richtextxml.o RICHTEXTDLL_ODEP = $(_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname) RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1916,16 +1916,16 @@ RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = \ - richtextlib_richtextctrl.o \ richtextlib_richtextbuffer.o \ - richtextlib_richtextstyles.o \ - richtextlib_richtextxml.o \ - richtextlib_richtexthtml.o \ + richtextlib_richtextctrl.o \ richtextlib_richtextformatdlg.o \ - richtextlib_richtextsymboldlg.o \ - richtextlib_richtextstyledlg.o \ + richtextlib_richtexthtml.o \ + richtextlib_richtextimagedlg.o \ richtextlib_richtextprint.o \ - richtextlib_richtextimagedlg.o + richtextlib_richtextstyledlg.o \ + richtextlib_richtextstyles.o \ + richtextlib_richtextsymboldlg.o \ + richtextlib_richtextxml.o RICHTEXTLIB_ODEP = $(_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname) STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -2810,6 +2810,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \ wx/generic/listctrl.h \ wx/generic/statusbr.h \ wx/gtk/accel.h \ + wx/gtk/anybutton.h \ wx/gtk/bmpbuttn.h \ wx/gtk/button.h \ wx/gtk/checkbox.h \ @@ -2933,6 +2934,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/generic/filepickerg.h \ wx/generic/fontpickerg.h \ wx/msw/accel.h \ + wx/msw/anybutton.h \ wx/msw/app.h \ wx/msw/bitmap.h \ wx/msw/bmpbuttn.h \ @@ -3055,6 +3057,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ COND_TOOLKIT_OSX_CARBON_GUI_HDR = \ wx/html/webkit.h \ wx/osx/accel.h \ + wx/osx/anybutton.h \ wx/osx/app.h \ wx/osx/bitmap.h \ wx/osx/bmpbuttn.h \ @@ -3160,6 +3163,7 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR = \ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \ wx/html/webkit.h \ wx/osx/accel.h \ + wx/osx/anybutton.h \ wx/osx/app.h \ wx/osx/bitmap.h \ wx/osx/bmpbuttn.h \ @@ -3269,6 +3273,7 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \ wx/html/webkit.h \ wx/osx/accel.h \ + wx/osx/anybutton.h \ wx/osx/app.h \ wx/osx/bitmap.h \ wx/osx/bmpbuttn.h \ @@ -3458,6 +3463,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/generic/filepickerg.h \ wx/generic/fontpickerg.h \ wx/msw/accel.h \ + wx/msw/anybutton.h \ wx/msw/app.h \ wx/msw/bitmap.h \ wx/msw/bmpbuttn.h \ @@ -3608,13 +3614,9 @@ COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR = \ 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 = \ - wx/msw/hyperlink.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_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_OSX_CARBON_ADVANCED_PLATFORM_HDR = \ wx/generic/animate.h \ wx/osx/dataview.h \ @@ -3643,8 +3645,7 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR = \ @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/hyperlink.h wx/msw/notifmsg.h wx/msw/sound.h \ -@COND_TOOLKIT_WINCE@ wx/msw/taskbar.h +@COND_TOOLKIT_WINCE@ wx/msw/notifmsg.h wx/msw/sound.h wx/msw/taskbar.h @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 = \ @@ -3661,14 +3662,16 @@ COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR = \ wx/msw/bmpcbox.h \ wx/msw/commandlinkbutton.h \ wx/msw/calctrl.h \ - wx/msw/datectrl.h + wx/msw/datectrl.h \ + wx/msw/hyperlink.h @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR) COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR = \ wx/generic/animate.h \ wx/msw/bmpcbox.h \ wx/msw/commandlinkbutton.h \ wx/msw/calctrl.h \ - wx/msw/datectrl.h + wx/msw/datectrl.h \ + wx/msw/hyperlink.h @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR) COND_WXUNIV_0_ADVANCED_HDR = \ wx/aboutdlg.h \ @@ -3835,6 +3838,7 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/affinematrix2dbase.h \ wx/affinematrix2d.h \ + wx/anybutton.h \ wx/bmpbuttn.h \ wx/brush.h \ wx/button.h \ @@ -4166,16 +4170,27 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/ribbon/page.h \ wx/ribbon/panel.h \ wx/ribbon/toolbar.h \ - wx/richtext/richtextctrl.h \ + wx/richtext/richtextbackgroundpage.h \ + wx/richtext/richtextborderspage.h \ wx/richtext/richtextbuffer.h \ - wx/richtext/richtexthtml.h \ - wx/richtext/richtextstyles.h \ - wx/richtext/richtextxml.h \ + wx/richtext/richtextbulletspage.h \ + wx/richtext/richtextctrl.h \ + wx/richtext/richtextdialogpage.h \ + wx/richtext/richtextfontpage.h \ wx/richtext/richtextformatdlg.h \ - wx/richtext/richtextsymboldlg.h \ - wx/richtext/richtextstyledlg.h \ - wx/richtext/richtextprint.h \ + wx/richtext/richtexthtml.h \ wx/richtext/richtextimagedlg.h \ + wx/richtext/richtextindentspage.h \ + wx/richtext/richtextliststylepage.h \ + wx/richtext/richtextmarginspage.h \ + wx/richtext/richtextprint.h \ + wx/richtext/richtextsizepage.h \ + wx/richtext/richtextstyledlg.h \ + wx/richtext/richtextstylepage.h \ + wx/richtext/richtextstyles.h \ + wx/richtext/richtextsymboldlg.h \ + wx/richtext/richtextuicustomization.h \ + wx/richtext/richtextxml.h \ wx/stc/stc.h @COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS) COND_MONOLITHIC_1_SHARED_1___monodll___depname = \ @@ -4463,16 +4478,16 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_page.o \ monodll_ribbon_panel.o \ monodll_ribbon_toolbar.o \ - monodll_richtextctrl.o \ monodll_richtextbuffer.o \ - monodll_richtextstyles.o \ - monodll_richtextxml.o \ - monodll_richtexthtml.o \ + monodll_richtextctrl.o \ monodll_richtextformatdlg.o \ - monodll_richtextsymboldlg.o \ - monodll_richtextstyledlg.o \ - monodll_richtextprint.o \ + monodll_richtexthtml.o \ monodll_richtextimagedlg.o \ + monodll_richtextprint.o \ + monodll_richtextstyledlg.o \ + monodll_richtextstyles.o \ + monodll_richtextsymboldlg.o \ + monodll_richtextxml.o \ monodll_stc.o \ monodll_PlatWX.o \ monodll_ScintillaWX.o @@ -5312,6 +5327,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_prntdlgg.o \ monodll_generic_statusbr.o \ monodll_fontdlgg.o \ + monodll_gtk_anybutton.o \ monodll_artgtk.o \ monodll_gtk_bmpbuttn.o \ monodll_gtk_button.o \ @@ -5436,6 +5452,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_generic_statusbr.o \ monodll_prntdlgg.o \ monodll_msw_accel.o \ + monodll_msw_anybutton.o \ monodll_artmsw.o \ monodll_msw_bmpbuttn.o \ monodll_msw_button.o \ @@ -5490,6 +5507,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS) COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS) \ + monodll_carbon_anybutton.o \ monodll_carbon_bmpbuttn.o \ monodll_carbon_button.o \ monodll_carbon_checkbox.o \ @@ -5526,6 +5544,7 @@ COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS) COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS) \ + monodll_cocoa_anybutton.o \ monodll_osx_cocoa_button.o \ monodll_osx_cocoa_checkbox.o \ monodll_osx_cocoa_choice.o \ @@ -5562,6 +5581,7 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS) \ monodll_regiong.o \ monodll_generic_icon.o \ + monodll_iphone_anybutton.o \ monodll_iphone_button.o \ monodll_iphone_checkbox.o \ monodll_iphone_dialog.o \ @@ -5671,6 +5691,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_generic_statusbr.o \ monodll_prntdlgg.o \ monodll_msw_accel.o \ + monodll_msw_anybutton.o \ monodll_artmsw.o \ monodll_msw_bmpbuttn.o \ monodll_msw_button.o \ @@ -6119,7 +6140,8 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \ monodll_msw_calctrl.o \ monodll_commandlinkbutton.o \ monodll_datecontrols.o \ - monodll_datectrl.o + monodll_datectrl.o \ + monodll_msw_hyperlink.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS) COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \ monodll_animateg.o \ @@ -6127,7 +6149,8 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \ monodll_msw_calctrl.o \ monodll_commandlinkbutton.o \ monodll_datecontrols.o \ - monodll_datectrl.o + monodll_datectrl.o \ + monodll_msw_hyperlink.o @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS) @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_COCOA@ monodll_cocoa_mediactrl.o @@ -6385,16 +6408,16 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_page.o \ monolib_ribbon_panel.o \ monolib_ribbon_toolbar.o \ - monolib_richtextctrl.o \ monolib_richtextbuffer.o \ - monolib_richtextstyles.o \ - monolib_richtextxml.o \ - monolib_richtexthtml.o \ + monolib_richtextctrl.o \ monolib_richtextformatdlg.o \ - monolib_richtextsymboldlg.o \ - monolib_richtextstyledlg.o \ - monolib_richtextprint.o \ + monolib_richtexthtml.o \ monolib_richtextimagedlg.o \ + monolib_richtextprint.o \ + monolib_richtextstyledlg.o \ + monolib_richtextstyles.o \ + monolib_richtextsymboldlg.o \ + monolib_richtextxml.o \ monolib_stc.o \ monolib_PlatWX.o \ monolib_ScintillaWX.o @@ -7234,6 +7257,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_prntdlgg.o \ monolib_generic_statusbr.o \ monolib_fontdlgg.o \ + monolib_gtk_anybutton.o \ monolib_artgtk.o \ monolib_gtk_bmpbuttn.o \ monolib_gtk_button.o \ @@ -7358,6 +7382,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_generic_statusbr.o \ monolib_prntdlgg.o \ monolib_msw_accel.o \ + monolib_msw_anybutton.o \ monolib_artmsw.o \ monolib_msw_bmpbuttn.o \ monolib_msw_button.o \ @@ -7412,6 +7437,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1) COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_12) \ + monolib_carbon_anybutton.o \ monolib_carbon_bmpbuttn.o \ monolib_carbon_button.o \ monolib_carbon_checkbox.o \ @@ -7448,6 +7474,7 @@ COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1) COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_12) \ + monolib_cocoa_anybutton.o \ monolib_osx_cocoa_button.o \ monolib_osx_cocoa_checkbox.o \ monolib_osx_cocoa_choice.o \ @@ -7484,6 +7511,7 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_12) \ monolib_regiong.o \ monolib_generic_icon.o \ + monolib_iphone_anybutton.o \ monolib_iphone_button.o \ monolib_iphone_checkbox.o \ monolib_iphone_dialog.o \ @@ -7593,6 +7621,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_generic_statusbr.o \ monolib_prntdlgg.o \ monolib_msw_accel.o \ + monolib_msw_anybutton.o \ monolib_artmsw.o \ monolib_msw_bmpbuttn.o \ monolib_msw_button.o \ @@ -8041,7 +8070,8 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \ monolib_msw_calctrl.o \ monolib_commandlinkbutton.o \ monolib_datecontrols.o \ - monolib_datectrl.o + monolib_datectrl.o \ + monolib_msw_hyperlink.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1) COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \ monolib_animateg.o \ @@ -8049,7 +8079,8 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \ monolib_msw_calctrl.o \ monolib_commandlinkbutton.o \ monolib_datecontrols.o \ - monolib_datectrl.o + monolib_datectrl.o \ + monolib_msw_hyperlink.o @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1) @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_COCOA@ monolib_cocoa_mediactrl.o @@ -9340,6 +9371,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_prntdlgg.o \ coredll_generic_statusbr.o \ coredll_fontdlgg.o \ + coredll_gtk_anybutton.o \ coredll_artgtk.o \ coredll_gtk_bmpbuttn.o \ coredll_gtk_button.o \ @@ -9464,6 +9496,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_generic_statusbr.o \ coredll_prntdlgg.o \ coredll_msw_accel.o \ + coredll_msw_anybutton.o \ coredll_artmsw.o \ coredll_msw_bmpbuttn.o \ coredll_msw_button.o \ @@ -9518,6 +9551,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2) COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_14) \ + coredll_carbon_anybutton.o \ coredll_carbon_bmpbuttn.o \ coredll_carbon_button.o \ coredll_carbon_checkbox.o \ @@ -9554,6 +9588,7 @@ COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2) COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_14) \ + coredll_cocoa_anybutton.o \ coredll_osx_cocoa_button.o \ coredll_osx_cocoa_checkbox.o \ coredll_osx_cocoa_choice.o \ @@ -9590,6 +9625,7 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_14) \ coredll_regiong.o \ coredll_generic_icon.o \ + coredll_iphone_anybutton.o \ coredll_iphone_button.o \ coredll_iphone_checkbox.o \ coredll_iphone_dialog.o \ @@ -9699,6 +9735,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_generic_statusbr.o \ coredll_prntdlgg.o \ coredll_msw_accel.o \ + coredll_msw_anybutton.o \ coredll_artmsw.o \ coredll_msw_bmpbuttn.o \ coredll_msw_button.o \ @@ -10924,6 +10961,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_prntdlgg.o \ corelib_generic_statusbr.o \ corelib_fontdlgg.o \ + corelib_gtk_anybutton.o \ corelib_artgtk.o \ corelib_gtk_bmpbuttn.o \ corelib_gtk_button.o \ @@ -11048,6 +11086,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_generic_statusbr.o \ corelib_prntdlgg.o \ corelib_msw_accel.o \ + corelib_msw_anybutton.o \ corelib_artmsw.o \ corelib_msw_bmpbuttn.o \ corelib_msw_button.o \ @@ -11102,6 +11141,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3) COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_1_0) \ + corelib_carbon_anybutton.o \ corelib_carbon_bmpbuttn.o \ corelib_carbon_button.o \ corelib_carbon_checkbox.o \ @@ -11138,6 +11178,7 @@ COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3) COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_1_0) \ + corelib_cocoa_anybutton.o \ corelib_osx_cocoa_button.o \ corelib_osx_cocoa_checkbox.o \ corelib_osx_cocoa_choice.o \ @@ -11174,6 +11215,7 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_1_0) \ corelib_regiong.o \ corelib_generic_icon.o \ + corelib_iphone_anybutton.o \ corelib_iphone_button.o \ corelib_iphone_checkbox.o \ corelib_iphone_dialog.o \ @@ -11283,6 +11325,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_generic_statusbr.o \ corelib_prntdlgg.o \ corelib_msw_accel.o \ + corelib_msw_anybutton.o \ corelib_artmsw.o \ corelib_msw_bmpbuttn.o \ corelib_msw_button.o \ @@ -11800,7 +11843,8 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \ advdll_msw_calctrl.o \ advdll_commandlinkbutton.o \ advdll_datecontrols.o \ - advdll_datectrl.o + advdll_datectrl.o \ + advdll_msw_hyperlink.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2) COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \ advdll_animateg.o \ @@ -11808,7 +11852,8 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \ advdll_msw_calctrl.o \ advdll_commandlinkbutton.o \ advdll_datecontrols.o \ - advdll_datectrl.o + advdll_datectrl.o \ + advdll_msw_hyperlink.o @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2) @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \ @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advdll_sound_sdl.o @@ -11902,7 +11947,8 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \ advlib_msw_calctrl.o \ advlib_commandlinkbutton.o \ advlib_datecontrols.o \ - advlib_datectrl.o + advlib_datectrl.o \ + advlib_msw_hyperlink.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3) COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \ advlib_animateg.o \ @@ -11910,7 +11956,8 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \ advlib_msw_calctrl.o \ advlib_commandlinkbutton.o \ advlib_datecontrols.o \ - advlib_datectrl.o + advlib_datectrl.o \ + advlib_msw_hyperlink.o @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3) @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \ @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o @@ -12921,13 +12968,14 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \ @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h -@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).2.r +@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_SHARED_0@____SHARED = @COND_SHARED_1@____SHARED = $(PIC_FLAG) @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS = \ + monodll_anybutton_osx.o \ monodll_bmpbuttn_osx.o \ monodll_button_osx.o \ monodll_checkbox_osx.o \ @@ -13062,7 +13110,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ monodll_msw_aboutdlg.o \ - monodll_msw_hyperlink.o \ monodll_msw_notifmsg.o \ monodll_msw_sound.o \ monodll_msw_taskbar.o \ @@ -13101,7 +13148,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ monodll_msw_aboutdlg.o \ - monodll_msw_hyperlink.o \ monodll_msw_notifmsg.o \ monodll_msw_sound.o \ monodll_msw_taskbar.o @@ -13115,6 +13161,7 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_12 = \ + monolib_anybutton_osx.o \ monolib_bmpbuttn_osx.o \ monolib_button_osx.o \ monolib_checkbox_osx.o \ @@ -13249,7 +13296,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ monolib_taskbarcmn.o \ monolib_msw_aboutdlg.o \ - monolib_msw_hyperlink.o \ monolib_msw_notifmsg.o \ monolib_msw_sound.o \ monolib_msw_taskbar.o \ @@ -13288,7 +13334,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ monolib_taskbarcmn.o \ monolib_msw_aboutdlg.o \ - monolib_msw_hyperlink.o \ monolib_msw_notifmsg.o \ monolib_msw_sound.o \ monolib_msw_taskbar.o @@ -13302,6 +13347,7 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_14 = \ + coredll_anybutton_osx.o \ coredll_bmpbuttn_osx.o \ coredll_button_osx.o \ coredll_checkbox_osx.o \ @@ -13399,6 +13445,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 = \ @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_1_0 = \ + corelib_anybutton_osx.o \ corelib_bmpbuttn_osx.o \ corelib_button_osx.o \ corelib_checkbox_osx.o \ @@ -13533,7 +13580,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ advdll_taskbarcmn.o \ advdll_msw_aboutdlg.o \ - advdll_msw_hyperlink.o \ advdll_msw_notifmsg.o \ advdll_msw_sound.o \ advdll_msw_taskbar.o \ @@ -13572,7 +13618,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ advdll_taskbarcmn.o \ advdll_msw_aboutdlg.o \ - advdll_msw_hyperlink.o \ advdll_msw_notifmsg.o \ advdll_msw_sound.o \ advdll_msw_taskbar.o @@ -13623,7 +13668,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ advlib_taskbarcmn.o \ advlib_msw_aboutdlg.o \ - advlib_msw_hyperlink.o \ advlib_msw_notifmsg.o \ advlib_msw_sound.o \ advlib_msw_taskbar.o \ @@ -13662,7 +13706,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ advlib_taskbarcmn.o \ advlib_msw_aboutdlg.o \ - advlib_msw_hyperlink.o \ advlib_msw_notifmsg.o \ advlib_msw_sound.o \ advlib_msw_taskbar.o @@ -13686,17 +13729,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p_61 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p_61 = --define wxNO_THREADS -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).2 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .2.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).2.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).3.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.0.0.$(SO_SUFFIX) -@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -2.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX) +@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).2 +@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_62 \ @@ -13889,7 +13932,7 @@ clean: $(__clean_wxrc___depname) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) -(cd samples && $(MAKE) clean) - rm -f lib/libwx_$(TOOLCHAIN_NAME).2.rsrc lib/libwx_$(TOOLCHAIN_NAME).2.r + rm -f lib/libwx_$(TOOLCHAIN_NAME).3.rsrc lib/libwx_$(TOOLCHAIN_NAME).3.r distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -14595,7 +14638,7 @@ install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config - (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale @@ -14631,13 +14674,13 @@ locale_msw_uninstall: fi ; \ done -@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).2.r: -@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).2.rsrc -@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).2.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).2.r +@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).3.r: +@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).3.rsrc +@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).3.r @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).2.r $(libdir) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).2.rsrc $(libdir) +@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.r $(libdir) +@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc $(libdir) wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c @@ -15758,6 +15801,9 @@ monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP) monodll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp +monodll_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp + monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -16190,6 +16236,9 @@ monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP) monodll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp +monodll_carbon_anybutton.o: $(srcdir)/src/osx/carbon/anybutton.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/anybutton.cpp + monodll_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp @@ -16289,6 +16338,9 @@ monodll_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONODLL_ODEP) monodll_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp +monodll_cocoa_anybutton.o: $(srcdir)/src/osx/cocoa/anybutton.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/anybutton.mm + monodll_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm @@ -16382,6 +16434,9 @@ monodll_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(MONODLL_ODEP) monodll_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm +monodll_iphone_anybutton.o: $(srcdir)/src/osx/iphone/anybutton.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/anybutton.mm + monodll_iphone_button.o: $(srcdir)/src/osx/iphone/button.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/button.mm @@ -17354,35 +17409,35 @@ monodll_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONODLL_ODEP) monodll_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp -monodll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp - monodll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp -monodll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp - -monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp - -monodll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp +monodll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp monodll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp -monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp +monodll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp -monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp +monodll_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp monodll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp -monodll_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp +monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp + +monodll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp + +monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp + +monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp monodll_stc.o: $(srcdir)/src/stc/stc.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp @@ -18968,6 +19023,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp @@ -19256,6 +19317,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp @@ -20366,12 +20436,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @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_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.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 @@ -20579,6 +20643,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp @@ -21056,6 +21126,9 @@ monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP) monolib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp +monolib_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp + monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -21488,6 +21561,9 @@ monolib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONOLIB_ODEP) monolib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp +monolib_carbon_anybutton.o: $(srcdir)/src/osx/carbon/anybutton.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/anybutton.cpp + monolib_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp @@ -21587,6 +21663,9 @@ monolib_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONOLIB_ODEP) monolib_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp +monolib_cocoa_anybutton.o: $(srcdir)/src/osx/cocoa/anybutton.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/anybutton.mm + monolib_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm @@ -21680,6 +21759,9 @@ monolib_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(MONOLIB_ODEP) monolib_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm +monolib_iphone_anybutton.o: $(srcdir)/src/osx/iphone/anybutton.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/anybutton.mm + monolib_iphone_button.o: $(srcdir)/src/osx/iphone/button.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/button.mm @@ -22652,35 +22734,35 @@ monolib_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONOLIB_ODEP) monolib_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp -monolib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp - monolib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp -monolib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp - -monolib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp - -monolib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp +monolib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp monolib_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp -monolib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp +monolib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp -monolib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp +monolib_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp monolib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp -monolib_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp +monolib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp + +monolib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp + +monolib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp + +monolib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp monolib_stc.o: $(srcdir)/src/stc/stc.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/stc.cpp @@ -24266,6 +24348,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp @@ -24554,6 +24642,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp @@ -25664,12 +25761,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @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_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.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 @@ -25877,6 +25968,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp @@ -27074,6 +27171,9 @@ coredll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(COREDLL_ODEP) coredll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm +coredll_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp + coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -27506,6 +27606,9 @@ coredll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(COREDLL_ODEP) coredll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp +coredll_carbon_anybutton.o: $(srcdir)/src/osx/carbon/anybutton.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/anybutton.cpp + coredll_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp @@ -27605,6 +27708,9 @@ coredll_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(COREDLL_ODEP) coredll_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp +coredll_cocoa_anybutton.o: $(srcdir)/src/osx/cocoa/anybutton.mm $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/anybutton.mm + coredll_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm @@ -27698,6 +27804,9 @@ coredll_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(COREDLL_ODEP) coredll_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm +coredll_iphone_anybutton.o: $(srcdir)/src/osx/iphone/anybutton.mm $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/anybutton.mm + coredll_iphone_button.o: $(srcdir)/src/osx/iphone/button.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/button.mm @@ -29744,6 +29853,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp @@ -30032,6 +30147,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp @@ -31055,6 +31179,9 @@ corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP) corelib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm +corelib_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp + corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -31487,6 +31614,9 @@ corelib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(CORELIB_ODEP) corelib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp +corelib_carbon_anybutton.o: $(srcdir)/src/osx/carbon/anybutton.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/anybutton.cpp + corelib_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp @@ -31586,6 +31716,9 @@ corelib_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(CORELIB_ODEP) corelib_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp +corelib_cocoa_anybutton.o: $(srcdir)/src/osx/cocoa/anybutton.mm $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/anybutton.mm + corelib_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm @@ -31679,6 +31812,9 @@ corelib_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(CORELIB_ODEP) corelib_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm +corelib_iphone_anybutton.o: $(srcdir)/src/osx/iphone/anybutton.mm $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/anybutton.mm + corelib_iphone_button.o: $(srcdir)/src/osx/iphone/button.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/button.mm @@ -33725,6 +33861,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp @@ -34013,6 +34155,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp @@ -35147,12 +35298,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP) @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_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp - -@COND_TOOLKIT_WINCE@advdll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.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 @@ -35360,6 +35505,12 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@advdll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp +@COND_TOOLKIT_MSW_WXUNIV_0@advdll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP) +@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp + +@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP) +@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp + advlib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp @@ -35501,12 +35652,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @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_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp - -@COND_TOOLKIT_WINCE@advlib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.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 @@ -35714,6 +35859,12 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@advlib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp +@COND_TOOLKIT_MSW_WXUNIV_0@advlib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP) +@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp + +@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP) +@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp + mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA @@ -36527,65 +36678,65 @@ propgridlib_props.o: $(srcdir)/src/propgrid/props.cpp $(PROPGRIDLIB_ODEP) richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT -richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp - richtextdll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTDLL_ODEP) $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp -richtextdll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(RICHTEXTDLL_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp - -richtextdll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTDLL_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp - -richtextdll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(RICHTEXTDLL_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp +richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp richtextdll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(RICHTEXTDLL_ODEP) $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp -richtextdll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTDLL_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp - -richtextdll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTDLL_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp - -richtextdll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTDLL_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp +richtextdll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp richtextdll_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(RICHTEXTDLL_ODEP) $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp -richtextlib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTLIB_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp +richtextdll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp + +richtextdll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp + +richtextdll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp + +richtextdll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp + +richtextdll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTDLL_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp richtextlib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTLIB_ODEP) $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp -richtextlib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(RICHTEXTLIB_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp - -richtextlib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTLIB_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp - -richtextlib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(RICHTEXTLIB_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp +richtextlib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTLIB_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp richtextlib_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(RICHTEXTLIB_ODEP) $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp -richtextlib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTLIB_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp +richtextlib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(RICHTEXTLIB_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp -richtextlib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTLIB_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp +richtextlib_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(RICHTEXTLIB_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTLIB_ODEP) $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp -richtextlib_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(RICHTEXTLIB_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp +richtextlib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTLIB_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp + +richtextlib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(RICHTEXTLIB_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp + +richtextlib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTLIB_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp + +richtextlib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTLIB_ODEP) + $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index fa4d8a80f4..2aed8c9f3a 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -812,6 +812,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/affinematrix2dbase.h wx/affinematrix2d.h + wx/anybutton.h wx/bmpbuttn.h wx/brush.h wx/button.h @@ -1146,6 +1147,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/fontdlgg.cpp + src/gtk/anybutton.cpp src/gtk/artgtk.cpp src/gtk/bmpbuttn.cpp src/gtk/button.cpp @@ -1200,6 +1202,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/listctrl.h wx/generic/statusbr.h wx/gtk/accel.h + wx/gtk/anybutton.h wx/gtk/bmpbuttn.h wx/gtk/button.h wx/gtk/checkbox.h @@ -1727,6 +1730,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/statusbr.cpp src/generic/prntdlgg.cpp src/msw/accel.cpp + src/msw/anybutton.cpp src/msw/artmsw.cpp src/msw/bmpbuttn.cpp src/msw/button.cpp @@ -1782,6 +1786,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/filepickerg.h wx/generic/fontpickerg.h wx/msw/accel.h + wx/msw/anybutton.h wx/msw/app.h wx/msw/bitmap.h wx/msw/bmpbuttn.h @@ -2299,6 +2304,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! + src/osx/anybutton_osx.cpp src/osx/bmpbuttn_osx.cpp src/osx/button_osx.cpp src/osx/checkbox_osx.cpp @@ -2382,6 +2388,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/html/webkit.h wx/osx/accel.h + wx/osx/anybutton.h wx/osx/app.h wx/osx/bitmap.h wx/osx/bmpbuttn.h @@ -2483,6 +2490,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(OSX_CARBON_COCOA_SRC) + src/osx/carbon/anybutton.cpp src/osx/carbon/bmpbuttn.cpp src/osx/carbon/button.cpp src/osx/carbon/checkbox.cpp @@ -2540,6 +2548,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(OSX_CARBON_COCOA_SRC) + src/osx/cocoa/anybutton.mm src/osx/cocoa/button.mm src/osx/cocoa/checkbox.mm src/osx/cocoa/choice.mm @@ -2589,6 +2598,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/regiong.cpp src/generic/icon.cpp + src/osx/iphone/anybutton.mm src/osx/iphone/button.mm src/osx/iphone/checkbox.mm src/osx/iphone/dialog.mm @@ -3012,13 +3022,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/taskbarcmn.cpp src/msw/aboutdlg.cpp - src/msw/hyperlink.cpp src/msw/notifmsg.cpp src/msw/sound.cpp src/msw/taskbar.cpp - wx/msw/hyperlink.h wx/msw/notifmsg.h wx/msw/sound.h wx/msw/taskbar.h @@ -3032,6 +3040,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/commandlinkbutton.cpp src/msw/datecontrols.cpp src/msw/datectrl.cpp + src/msw/hyperlink.cpp wx/generic/animate.h @@ -3039,6 +3048,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/commandlinkbutton.h wx/msw/calctrl.h wx/msw/datectrl.h + wx/msw/hyperlink.h @@ -3655,28 +3665,39 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - src/richtext/richtextctrl.cpp src/richtext/richtextbuffer.cpp - src/richtext/richtextstyles.cpp - src/richtext/richtextxml.cpp - src/richtext/richtexthtml.cpp + src/richtext/richtextctrl.cpp src/richtext/richtextformatdlg.cpp - src/richtext/richtextsymboldlg.cpp - src/richtext/richtextstyledlg.cpp - src/richtext/richtextprint.cpp + src/richtext/richtexthtml.cpp src/richtext/richtextimagedlg.cpp + src/richtext/richtextprint.cpp + src/richtext/richtextstyledlg.cpp + src/richtext/richtextstyles.cpp + src/richtext/richtextsymboldlg.cpp + src/richtext/richtextxml.cpp - wx/richtext/richtextctrl.h + wx/richtext/richtextbackgroundpage.h + wx/richtext/richtextborderspage.h wx/richtext/richtextbuffer.h - wx/richtext/richtexthtml.h - wx/richtext/richtextstyles.h - wx/richtext/richtextxml.h + wx/richtext/richtextbulletspage.h + wx/richtext/richtextctrl.h + wx/richtext/richtextdialogpage.h + wx/richtext/richtextfontpage.h wx/richtext/richtextformatdlg.h - wx/richtext/richtextsymboldlg.h - wx/richtext/richtextstyledlg.h - wx/richtext/richtextprint.h + wx/richtext/richtexthtml.h wx/richtext/richtextimagedlg.h + wx/richtext/richtextindentspage.h + wx/richtext/richtextliststylepage.h + wx/richtext/richtextmarginspage.h + wx/richtext/richtextprint.h + wx/richtext/richtextsizepage.h + wx/richtext/richtextstyledlg.h + wx/richtext/richtextstylepage.h + wx/richtext/richtextstyles.h + wx/richtext/richtextsymboldlg.h + wx/richtext/richtextuicustomization.h + wx/richtext/richtextxml.h diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl index 9b40a5fd83..5d7ebadc5d 100644 --- a/build/bakefiles/version.bkl +++ b/build/bakefiles/version.bkl @@ -23,7 +23,7 @@ 3. Else, i.e. if there were no changes at all to API but only internal changes, change C:R:A to C:R+1:A --> - 2 + 3 0 0 diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 94b908a501..5dd84848d0 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -38,7 +38,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = bcc OBJS = \ $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -1397,16 +1397,16 @@ RICHTEXTDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ -H=$(OBJS)\wxprec_richtextdll.csm $(CPPFLAGS) $(CXXFLAGS) RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_dummy.obj \ - $(OBJS)\richtextdll_richtextctrl.obj \ $(OBJS)\richtextdll_richtextbuffer.obj \ - $(OBJS)\richtextdll_richtextstyles.obj \ - $(OBJS)\richtextdll_richtextxml.obj \ - $(OBJS)\richtextdll_richtexthtml.obj \ + $(OBJS)\richtextdll_richtextctrl.obj \ $(OBJS)\richtextdll_richtextformatdlg.obj \ - $(OBJS)\richtextdll_richtextsymboldlg.obj \ - $(OBJS)\richtextdll_richtextstyledlg.obj \ + $(OBJS)\richtextdll_richtexthtml.obj \ + $(OBJS)\richtextdll_richtextimagedlg.obj \ $(OBJS)\richtextdll_richtextprint.obj \ - $(OBJS)\richtextdll_richtextimagedlg.obj + $(OBJS)\richtextdll_richtextstyledlg.obj \ + $(OBJS)\richtextdll_richtextstyles.obj \ + $(OBJS)\richtextdll_richtextsymboldlg.obj \ + $(OBJS)\richtextdll_richtextxml.obj RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1418,16 +1418,16 @@ RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(CXXFLAGS) RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_dummy.obj \ - $(OBJS)\richtextlib_richtextctrl.obj \ $(OBJS)\richtextlib_richtextbuffer.obj \ - $(OBJS)\richtextlib_richtextstyles.obj \ - $(OBJS)\richtextlib_richtextxml.obj \ - $(OBJS)\richtextlib_richtexthtml.obj \ + $(OBJS)\richtextlib_richtextctrl.obj \ $(OBJS)\richtextlib_richtextformatdlg.obj \ - $(OBJS)\richtextlib_richtextsymboldlg.obj \ - $(OBJS)\richtextlib_richtextstyledlg.obj \ + $(OBJS)\richtextlib_richtexthtml.obj \ + $(OBJS)\richtextlib_richtextimagedlg.obj \ $(OBJS)\richtextlib_richtextprint.obj \ - $(OBJS)\richtextlib_richtextimagedlg.obj + $(OBJS)\richtextlib_richtextstyledlg.obj \ + $(OBJS)\richtextlib_richtextstyles.obj \ + $(OBJS)\richtextlib_richtextsymboldlg.obj \ + $(OBJS)\richtextlib_richtextxml.obj STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1664,16 +1664,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_page.obj \ $(OBJS)\monodll_ribbon_panel.obj \ $(OBJS)\monodll_ribbon_toolbar.obj \ - $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextbuffer.obj \ - $(OBJS)\monodll_richtextstyles.obj \ - $(OBJS)\monodll_richtextxml.obj \ - $(OBJS)\monodll_richtexthtml.obj \ + $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextformatdlg.obj \ - $(OBJS)\monodll_richtextsymboldlg.obj \ - $(OBJS)\monodll_richtextstyledlg.obj \ - $(OBJS)\monodll_richtextprint.obj \ + $(OBJS)\monodll_richtexthtml.obj \ $(OBJS)\monodll_richtextimagedlg.obj \ + $(OBJS)\monodll_richtextprint.obj \ + $(OBJS)\monodll_richtextstyledlg.obj \ + $(OBJS)\monodll_richtextstyles.obj \ + $(OBJS)\monodll_richtextsymboldlg.obj \ + $(OBJS)\monodll_richtextxml.obj \ $(OBJS)\monodll_stc.obj \ $(OBJS)\monodll_PlatWX.obj \ $(OBJS)\monodll_ScintillaWX.obj @@ -1737,6 +1737,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_msw_accel.obj \ + $(OBJS)\monodll_anybutton.obj \ $(OBJS)\monodll_artmsw.obj \ $(OBJS)\monodll_msw_bmpbuttn.obj \ $(OBJS)\monodll_msw_button.obj \ @@ -2247,7 +2248,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ - $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_notifmsg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ @@ -2257,7 +2257,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_commandlinkbutton.obj \ $(OBJS)\monodll_datecontrols.obj \ - $(OBJS)\monodll_datectrl.obj + $(OBJS)\monodll_datectrl.obj \ + $(OBJS)\monodll_hyperlink.obj !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ @@ -2291,7 +2292,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ - $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_notifmsg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ @@ -2428,16 +2428,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_page.obj \ $(OBJS)\monolib_ribbon_panel.obj \ $(OBJS)\monolib_ribbon_toolbar.obj \ - $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextbuffer.obj \ - $(OBJS)\monolib_richtextstyles.obj \ - $(OBJS)\monolib_richtextxml.obj \ - $(OBJS)\monolib_richtexthtml.obj \ + $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextformatdlg.obj \ - $(OBJS)\monolib_richtextsymboldlg.obj \ - $(OBJS)\monolib_richtextstyledlg.obj \ - $(OBJS)\monolib_richtextprint.obj \ + $(OBJS)\monolib_richtexthtml.obj \ $(OBJS)\monolib_richtextimagedlg.obj \ + $(OBJS)\monolib_richtextprint.obj \ + $(OBJS)\monolib_richtextstyledlg.obj \ + $(OBJS)\monolib_richtextstyles.obj \ + $(OBJS)\monolib_richtextsymboldlg.obj \ + $(OBJS)\monolib_richtextxml.obj \ $(OBJS)\monolib_stc.obj \ $(OBJS)\monolib_PlatWX.obj \ $(OBJS)\monolib_ScintillaWX.obj @@ -2501,6 +2501,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_msw_accel.obj \ + $(OBJS)\monolib_anybutton.obj \ $(OBJS)\monolib_artmsw.obj \ $(OBJS)\monolib_msw_bmpbuttn.obj \ $(OBJS)\monolib_msw_button.obj \ @@ -3011,7 +3012,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ - $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_notifmsg.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ @@ -3021,7 +3021,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_commandlinkbutton.obj \ $(OBJS)\monolib_datecontrols.obj \ - $(OBJS)\monolib_datectrl.obj + $(OBJS)\monolib_datectrl.obj \ + $(OBJS)\monolib_hyperlink.obj !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ @@ -3055,7 +3056,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ - $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_notifmsg.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ @@ -3153,6 +3153,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_generic_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_msw_accel.obj \ + $(OBJS)\coredll_anybutton.obj \ $(OBJS)\coredll_artmsw.obj \ $(OBJS)\coredll_msw_bmpbuttn.obj \ $(OBJS)\coredll_msw_button.obj \ @@ -3694,6 +3695,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_generic_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_msw_accel.obj \ + $(OBJS)\corelib_anybutton.obj \ $(OBJS)\corelib_artmsw.obj \ $(OBJS)\corelib_msw_bmpbuttn.obj \ $(OBJS)\corelib_msw_button.obj \ @@ -4214,7 +4216,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ - $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_notifmsg.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ @@ -4224,7 +4225,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_commandlinkbutton.obj \ $(OBJS)\advdll_datecontrols.obj \ - $(OBJS)\advdll_datectrl.obj + $(OBJS)\advdll_datectrl.obj \ + $(OBJS)\advdll_hyperlink.obj !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ @@ -4258,7 +4260,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ - $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_notifmsg.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ @@ -4301,7 +4302,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ - $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_notifmsg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ @@ -4311,7 +4311,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_commandlinkbutton.obj \ $(OBJS)\advlib_datecontrols.obj \ - $(OBJS)\advlib_datectrl.obj + $(OBJS)\advlib_datectrl.obj \ + $(OBJS)\advlib_hyperlink.obj !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ @@ -4345,7 +4346,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ - $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_notifmsg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ @@ -5212,7 +5212,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -6281,6 +6281,9 @@ $(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp +$(OBJS)\monodll_anybutton.obj: ..\..\src\msw\anybutton.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp + $(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp @@ -6593,6 +6596,9 @@ $(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp +$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp + $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp @@ -6950,35 +6956,35 @@ $(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp -$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp -$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp $(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp -$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp -$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp $(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp -$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp + +$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp + +$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp + +$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp $(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -8220,11 +8226,6 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp @@ -8631,6 +8632,9 @@ $(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp +$(OBJS)\monolib_anybutton.obj: ..\..\src\msw\anybutton.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp + $(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp @@ -8943,6 +8947,9 @@ $(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp +$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp + $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp @@ -9300,35 +9307,35 @@ $(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp -$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp -$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp $(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp -$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp -$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp $(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp -$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp + +$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp + +$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp + +$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp $(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -10570,11 +10577,6 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp @@ -11392,6 +11394,9 @@ $(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp +$(OBJS)\coredll_anybutton.obj: ..\..\src\msw\anybutton.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp + $(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp @@ -12797,6 +12802,9 @@ $(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp +$(OBJS)\corelib_anybutton.obj: ..\..\src\msw\anybutton.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp + $(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp @@ -14190,6 +14198,9 @@ $(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp +$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp + $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -14280,9 +14291,6 @@ $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp -$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - $(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp @@ -14316,6 +14324,9 @@ $(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp +$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp + $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -14406,9 +14417,6 @@ $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp -$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - $(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp @@ -15228,68 +15236,68 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc -$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - $(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp -$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp $(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp -$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp +$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp $(OBJS)\richtextdll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp + +$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp + +$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp + +$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp + +$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp + $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp -$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - $(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp -$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp $(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp -$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp -$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp $(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp -$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp + +$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp + +$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp + +$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 6b6d3b121a..7b65f91e43 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -31,7 +31,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -1400,16 +1400,16 @@ RICHTEXTDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_dummy.o \ $(OBJS)\richtextdll_version_rc.o \ - $(OBJS)\richtextdll_richtextctrl.o \ $(OBJS)\richtextdll_richtextbuffer.o \ - $(OBJS)\richtextdll_richtextstyles.o \ - $(OBJS)\richtextdll_richtextxml.o \ - $(OBJS)\richtextdll_richtexthtml.o \ + $(OBJS)\richtextdll_richtextctrl.o \ $(OBJS)\richtextdll_richtextformatdlg.o \ - $(OBJS)\richtextdll_richtextsymboldlg.o \ - $(OBJS)\richtextdll_richtextstyledlg.o \ + $(OBJS)\richtextdll_richtexthtml.o \ + $(OBJS)\richtextdll_richtextimagedlg.o \ $(OBJS)\richtextdll_richtextprint.o \ - $(OBJS)\richtextdll_richtextimagedlg.o + $(OBJS)\richtextdll_richtextstyledlg.o \ + $(OBJS)\richtextdll_richtextstyles.o \ + $(OBJS)\richtextdll_richtextsymboldlg.o \ + $(OBJS)\richtextdll_richtextxml.o RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1421,16 +1421,16 @@ RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_dummy.o \ - $(OBJS)\richtextlib_richtextctrl.o \ $(OBJS)\richtextlib_richtextbuffer.o \ - $(OBJS)\richtextlib_richtextstyles.o \ - $(OBJS)\richtextlib_richtextxml.o \ - $(OBJS)\richtextlib_richtexthtml.o \ + $(OBJS)\richtextlib_richtextctrl.o \ $(OBJS)\richtextlib_richtextformatdlg.o \ - $(OBJS)\richtextlib_richtextsymboldlg.o \ - $(OBJS)\richtextlib_richtextstyledlg.o \ + $(OBJS)\richtextlib_richtexthtml.o \ + $(OBJS)\richtextlib_richtextimagedlg.o \ $(OBJS)\richtextlib_richtextprint.o \ - $(OBJS)\richtextlib_richtextimagedlg.o + $(OBJS)\richtextlib_richtextstyledlg.o \ + $(OBJS)\richtextlib_richtextstyles.o \ + $(OBJS)\richtextlib_richtextsymboldlg.o \ + $(OBJS)\richtextlib_richtextxml.o STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -1674,16 +1674,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_page.o \ $(OBJS)\monodll_ribbon_panel.o \ $(OBJS)\monodll_ribbon_toolbar.o \ - $(OBJS)\monodll_richtextctrl.o \ $(OBJS)\monodll_richtextbuffer.o \ - $(OBJS)\monodll_richtextstyles.o \ - $(OBJS)\monodll_richtextxml.o \ - $(OBJS)\monodll_richtexthtml.o \ + $(OBJS)\monodll_richtextctrl.o \ $(OBJS)\monodll_richtextformatdlg.o \ - $(OBJS)\monodll_richtextsymboldlg.o \ - $(OBJS)\monodll_richtextstyledlg.o \ - $(OBJS)\monodll_richtextprint.o \ + $(OBJS)\monodll_richtexthtml.o \ $(OBJS)\monodll_richtextimagedlg.o \ + $(OBJS)\monodll_richtextprint.o \ + $(OBJS)\monodll_richtextstyledlg.o \ + $(OBJS)\monodll_richtextstyles.o \ + $(OBJS)\monodll_richtextsymboldlg.o \ + $(OBJS)\monodll_richtextxml.o \ $(OBJS)\monodll_stc.o \ $(OBJS)\monodll_PlatWX.o \ $(OBJS)\monodll_ScintillaWX.o @@ -1748,6 +1748,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_statusbr.o \ $(OBJS)\monodll_prntdlgg.o \ $(OBJS)\monodll_msw_accel.o \ + $(OBJS)\monodll_anybutton.o \ $(OBJS)\monodll_artmsw.o \ $(OBJS)\monodll_msw_bmpbuttn.o \ $(OBJS)\monodll_msw_button.o \ @@ -2261,7 +2262,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_aboutdlg.o \ - $(OBJS)\monodll_hyperlink.o \ $(OBJS)\monodll_notifmsg.o \ $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_taskbar.o \ @@ -2271,7 +2271,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.o \ $(OBJS)\monodll_commandlinkbutton.o \ $(OBJS)\monodll_datecontrols.o \ - $(OBJS)\monodll_datectrl.o + $(OBJS)\monodll_datectrl.o \ + $(OBJS)\monodll_hyperlink.o endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_OBJECTS = \ @@ -2305,7 +2306,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_aboutdlg.o \ - $(OBJS)\monodll_hyperlink.o \ $(OBJS)\monodll_notifmsg.o \ $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_taskbar.o \ @@ -2444,16 +2444,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_page.o \ $(OBJS)\monolib_ribbon_panel.o \ $(OBJS)\monolib_ribbon_toolbar.o \ - $(OBJS)\monolib_richtextctrl.o \ $(OBJS)\monolib_richtextbuffer.o \ - $(OBJS)\monolib_richtextstyles.o \ - $(OBJS)\monolib_richtextxml.o \ - $(OBJS)\monolib_richtexthtml.o \ + $(OBJS)\monolib_richtextctrl.o \ $(OBJS)\monolib_richtextformatdlg.o \ - $(OBJS)\monolib_richtextsymboldlg.o \ - $(OBJS)\monolib_richtextstyledlg.o \ - $(OBJS)\monolib_richtextprint.o \ + $(OBJS)\monolib_richtexthtml.o \ $(OBJS)\monolib_richtextimagedlg.o \ + $(OBJS)\monolib_richtextprint.o \ + $(OBJS)\monolib_richtextstyledlg.o \ + $(OBJS)\monolib_richtextstyles.o \ + $(OBJS)\monolib_richtextsymboldlg.o \ + $(OBJS)\monolib_richtextxml.o \ $(OBJS)\monolib_stc.o \ $(OBJS)\monolib_PlatWX.o \ $(OBJS)\monolib_ScintillaWX.o @@ -2518,6 +2518,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_statusbr.o \ $(OBJS)\monolib_prntdlgg.o \ $(OBJS)\monolib_msw_accel.o \ + $(OBJS)\monolib_anybutton.o \ $(OBJS)\monolib_artmsw.o \ $(OBJS)\monolib_msw_bmpbuttn.o \ $(OBJS)\monolib_msw_button.o \ @@ -3031,7 +3032,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_aboutdlg.o \ - $(OBJS)\monolib_hyperlink.o \ $(OBJS)\monolib_notifmsg.o \ $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_taskbar.o \ @@ -3041,7 +3041,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.o \ $(OBJS)\monolib_commandlinkbutton.o \ $(OBJS)\monolib_datecontrols.o \ - $(OBJS)\monolib_datectrl.o + $(OBJS)\monolib_datectrl.o \ + $(OBJS)\monolib_hyperlink.o endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ @@ -3075,7 +3076,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_aboutdlg.o \ - $(OBJS)\monolib_hyperlink.o \ $(OBJS)\monolib_notifmsg.o \ $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_taskbar.o \ @@ -3186,6 +3186,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_generic_statusbr.o \ $(OBJS)\coredll_prntdlgg.o \ $(OBJS)\coredll_msw_accel.o \ + $(OBJS)\coredll_anybutton.o \ $(OBJS)\coredll_artmsw.o \ $(OBJS)\coredll_msw_bmpbuttn.o \ $(OBJS)\coredll_msw_button.o \ @@ -3735,6 +3736,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_generic_statusbr.o \ $(OBJS)\corelib_prntdlgg.o \ $(OBJS)\corelib_msw_accel.o \ + $(OBJS)\corelib_anybutton.o \ $(OBJS)\corelib_artmsw.o \ $(OBJS)\corelib_msw_bmpbuttn.o \ $(OBJS)\corelib_msw_button.o \ @@ -4262,7 +4264,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_wizard.o \ $(OBJS)\advdll_taskbarcmn.o \ $(OBJS)\advdll_aboutdlg.o \ - $(OBJS)\advdll_hyperlink.o \ $(OBJS)\advdll_notifmsg.o \ $(OBJS)\advdll_sound.o \ $(OBJS)\advdll_taskbar.o \ @@ -4272,7 +4273,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.o \ $(OBJS)\advdll_commandlinkbutton.o \ $(OBJS)\advdll_datecontrols.o \ - $(OBJS)\advdll_datectrl.o + $(OBJS)\advdll_datectrl.o \ + $(OBJS)\advdll_hyperlink.o endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ @@ -4306,7 +4308,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_wizard.o \ $(OBJS)\advdll_taskbarcmn.o \ $(OBJS)\advdll_aboutdlg.o \ - $(OBJS)\advdll_hyperlink.o \ $(OBJS)\advdll_notifmsg.o \ $(OBJS)\advdll_sound.o \ $(OBJS)\advdll_taskbar.o \ @@ -4353,7 +4354,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_wizard.o \ $(OBJS)\advlib_taskbarcmn.o \ $(OBJS)\advlib_aboutdlg.o \ - $(OBJS)\advlib_hyperlink.o \ $(OBJS)\advlib_notifmsg.o \ $(OBJS)\advlib_sound.o \ $(OBJS)\advlib_taskbar.o \ @@ -4363,7 +4363,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.o \ $(OBJS)\advlib_commandlinkbutton.o \ $(OBJS)\advlib_datecontrols.o \ - $(OBJS)\advlib_datectrl.o + $(OBJS)\advlib_datectrl.o \ + $(OBJS)\advlib_hyperlink.o endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ @@ -4397,7 +4398,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_wizard.o \ $(OBJS)\advlib_taskbarcmn.o \ $(OBJS)\advlib_aboutdlg.o \ - $(OBJS)\advlib_hyperlink.o \ $(OBJS)\advlib_notifmsg.o \ $(OBJS)\advlib_sound.o \ $(OBJS)\advlib_taskbar.o \ @@ -5362,7 +5362,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -6431,6 +6431,9 @@ $(OBJS)\monodll_generic_statusbr.o: ../../src/generic/statusbr.cpp $(OBJS)\monodll_msw_accel.o: ../../src/msw/accel.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_anybutton.o: ../../src/msw/anybutton.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_artmsw.o: ../../src/msw/artmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6743,6 +6746,9 @@ $(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp $(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7100,34 +7106,34 @@ $(OBJS)\monodll_ribbon_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\monodll_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_richtextstyles.o: ../../src/richtext/richtextstyles.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextxml.o: ../../src/richtext/richtextxml.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtexthtml.o: ../../src/richtext/richtexthtml.cpp +$(OBJS)\monodll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp +$(OBJS)\monodll_richtexthtml.o: ../../src/richtext/richtexthtml.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp +$(OBJS)\monodll_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_richtextprint.o: ../../src/richtext/richtextprint.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp +$(OBJS)\monodll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monodll_richtextstyles.o: ../../src/richtext/richtextstyles.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monodll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monodll_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monodll_stc.o: ../../src/stc/stc.cpp @@ -8370,11 +8376,6 @@ $(OBJS)\monodll_aboutdlg.o: ../../src/msw/aboutdlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_notifmsg.o: ../../src/msw/notifmsg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8781,6 +8782,9 @@ $(OBJS)\monolib_generic_statusbr.o: ../../src/generic/statusbr.cpp $(OBJS)\monolib_msw_accel.o: ../../src/msw/accel.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_anybutton.o: ../../src/msw/anybutton.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_artmsw.o: ../../src/msw/artmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9093,6 +9097,9 @@ $(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp $(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9450,34 +9457,34 @@ $(OBJS)\monolib_ribbon_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\monolib_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_richtextctrl.o: ../../src/richtext/richtextctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_richtextstyles.o: ../../src/richtext/richtextstyles.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextxml.o: ../../src/richtext/richtextxml.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtexthtml.o: ../../src/richtext/richtexthtml.cpp +$(OBJS)\monolib_richtextctrl.o: ../../src/richtext/richtextctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp +$(OBJS)\monolib_richtexthtml.o: ../../src/richtext/richtexthtml.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp +$(OBJS)\monolib_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_richtextprint.o: ../../src/richtext/richtextprint.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp +$(OBJS)\monolib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monolib_richtextstyles.o: ../../src/richtext/richtextstyles.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monolib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monolib_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\monolib_stc.o: ../../src/stc/stc.cpp @@ -10720,11 +10727,6 @@ $(OBJS)\monolib_aboutdlg.o: ../../src/msw/aboutdlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_notifmsg.o: ../../src/msw/notifmsg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -11542,6 +11544,9 @@ $(OBJS)\coredll_generic_statusbr.o: ../../src/generic/statusbr.cpp $(OBJS)\coredll_msw_accel.o: ../../src/msw/accel.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\coredll_anybutton.o: ../../src/msw/anybutton.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_artmsw.o: ../../src/msw/artmsw.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12947,6 +12952,9 @@ $(OBJS)\corelib_generic_statusbr.o: ../../src/generic/statusbr.cpp $(OBJS)\corelib_msw_accel.o: ../../src/msw/accel.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\corelib_anybutton.o: ../../src/msw/anybutton.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_artmsw.o: ../../src/msw/artmsw.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -14340,6 +14348,9 @@ $(OBJS)\advdll_datecontrols.o: ../../src/msw/datecontrols.cpp $(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14430,9 +14441,6 @@ $(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\advdll_notifmsg.o: ../../src/msw/notifmsg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14466,6 +14474,9 @@ $(OBJS)\advlib_datecontrols.o: ../../src/msw/datecontrols.cpp $(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14556,9 +14567,6 @@ $(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\advlib_notifmsg.o: ../../src/msw/notifmsg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15378,67 +15386,67 @@ $(OBJS)\richtextdll_dummy.o: ../../src/common/dummy.cpp $(OBJS)\richtextdll_version_rc.o: ../../src/msw/version.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT -$(OBJS)\richtextdll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\richtextdll_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\richtextdll_richtextstyles.o: ../../src/richtext/richtextstyles.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextxml.o: ../../src/richtext/richtextxml.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtexthtml.o: ../../src/richtext/richtexthtml.cpp +$(OBJS)\richtextdll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\richtextdll_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\richtextdll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextprint.o: ../../src/richtext/richtextprint.cpp +$(OBJS)\richtextdll_richtexthtml.o: ../../src/richtext/richtexthtml.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\richtextdll_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\richtextdll_richtextprint.o: ../../src/richtext/richtextprint.cpp + $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\richtextlib_richtextctrl.o: ../../src/richtext/richtextctrl.cpp +$(OBJS)\richtextdll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp + $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\richtextdll_richtextstyles.o: ../../src/richtext/richtextstyles.cpp + $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\richtextdll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp + $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\richtextdll_richtextxml.o: ../../src/richtext/richtextxml.cpp + $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\richtextlib_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\richtextlib_richtextstyles.o: ../../src/richtext/richtextstyles.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextxml.o: ../../src/richtext/richtextxml.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtexthtml.o: ../../src/richtext/richtexthtml.cpp +$(OBJS)\richtextlib_richtextctrl.o: ../../src/richtext/richtextctrl.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\richtextlib_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\richtextlib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp +$(OBJS)\richtextlib_richtexthtml.o: ../../src/richtext/richtexthtml.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\richtextlib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp +$(OBJS)\richtextlib_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\richtextlib_richtextprint.o: ../../src/richtext/richtextprint.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\richtextlib_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp +$(OBJS)\richtextlib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp + $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\richtextlib_richtextstyles.o: ../../src/richtext/richtextstyles.cpp + $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\richtextlib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp + $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\richtextlib_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 79802123e4..fea35eea34 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -29,7 +29,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) @@ -1500,16 +1500,16 @@ RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \ $(CPPFLAGS) $(CXXFLAGS) RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_dummy.obj \ - $(OBJS)\richtextdll_richtextctrl.obj \ $(OBJS)\richtextdll_richtextbuffer.obj \ - $(OBJS)\richtextdll_richtextstyles.obj \ - $(OBJS)\richtextdll_richtextxml.obj \ - $(OBJS)\richtextdll_richtexthtml.obj \ + $(OBJS)\richtextdll_richtextctrl.obj \ $(OBJS)\richtextdll_richtextformatdlg.obj \ - $(OBJS)\richtextdll_richtextsymboldlg.obj \ - $(OBJS)\richtextdll_richtextstyledlg.obj \ + $(OBJS)\richtextdll_richtexthtml.obj \ + $(OBJS)\richtextdll_richtextimagedlg.obj \ $(OBJS)\richtextdll_richtextprint.obj \ - $(OBJS)\richtextdll_richtextimagedlg.obj + $(OBJS)\richtextdll_richtextstyledlg.obj \ + $(OBJS)\richtextdll_richtextstyles.obj \ + $(OBJS)\richtextdll_richtextsymboldlg.obj \ + $(OBJS)\richtextdll_richtextxml.obj RICHTEXTDLL_RESOURCES = \ $(OBJS)\richtextdll_version.res RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \ @@ -1525,16 +1525,16 @@ RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \ /Fp"$(OBJS)\wxprec_richtextlib.pch" $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_dummy.obj \ - $(OBJS)\richtextlib_richtextctrl.obj \ $(OBJS)\richtextlib_richtextbuffer.obj \ - $(OBJS)\richtextlib_richtextstyles.obj \ - $(OBJS)\richtextlib_richtextxml.obj \ - $(OBJS)\richtextlib_richtexthtml.obj \ + $(OBJS)\richtextlib_richtextctrl.obj \ $(OBJS)\richtextlib_richtextformatdlg.obj \ - $(OBJS)\richtextlib_richtextsymboldlg.obj \ - $(OBJS)\richtextlib_richtextstyledlg.obj \ + $(OBJS)\richtextlib_richtexthtml.obj \ + $(OBJS)\richtextlib_richtextimagedlg.obj \ $(OBJS)\richtextlib_richtextprint.obj \ - $(OBJS)\richtextlib_richtextimagedlg.obj + $(OBJS)\richtextlib_richtextstyledlg.obj \ + $(OBJS)\richtextlib_richtextstyles.obj \ + $(OBJS)\richtextlib_richtextsymboldlg.obj \ + $(OBJS)\richtextlib_richtextxml.obj STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \ @@ -1872,16 +1872,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_page.obj \ $(OBJS)\monodll_ribbon_panel.obj \ $(OBJS)\monodll_ribbon_toolbar.obj \ - $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextbuffer.obj \ - $(OBJS)\monodll_richtextstyles.obj \ - $(OBJS)\monodll_richtextxml.obj \ - $(OBJS)\monodll_richtexthtml.obj \ + $(OBJS)\monodll_richtextctrl.obj \ $(OBJS)\monodll_richtextformatdlg.obj \ - $(OBJS)\monodll_richtextsymboldlg.obj \ - $(OBJS)\monodll_richtextstyledlg.obj \ - $(OBJS)\monodll_richtextprint.obj \ + $(OBJS)\monodll_richtexthtml.obj \ $(OBJS)\monodll_richtextimagedlg.obj \ + $(OBJS)\monodll_richtextprint.obj \ + $(OBJS)\monodll_richtextstyledlg.obj \ + $(OBJS)\monodll_richtextstyles.obj \ + $(OBJS)\monodll_richtextsymboldlg.obj \ + $(OBJS)\monodll_richtextxml.obj \ $(OBJS)\monodll_stc.obj \ $(OBJS)\monodll_PlatWX.obj \ $(OBJS)\monodll_ScintillaWX.obj @@ -1945,6 +1945,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_generic_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_msw_accel.obj \ + $(OBJS)\monodll_anybutton.obj \ $(OBJS)\monodll_artmsw.obj \ $(OBJS)\monodll_msw_bmpbuttn.obj \ $(OBJS)\monodll_msw_button.obj \ @@ -2455,7 +2456,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ - $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_notifmsg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ @@ -2465,7 +2465,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_commandlinkbutton.obj \ $(OBJS)\monodll_datecontrols.obj \ - $(OBJS)\monodll_datectrl.obj + $(OBJS)\monodll_datectrl.obj \ + $(OBJS)\monodll_hyperlink.obj !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ @@ -2499,7 +2500,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ - $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_notifmsg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ @@ -2642,16 +2642,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_page.obj \ $(OBJS)\monolib_ribbon_panel.obj \ $(OBJS)\monolib_ribbon_toolbar.obj \ - $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextbuffer.obj \ - $(OBJS)\monolib_richtextstyles.obj \ - $(OBJS)\monolib_richtextxml.obj \ - $(OBJS)\monolib_richtexthtml.obj \ + $(OBJS)\monolib_richtextctrl.obj \ $(OBJS)\monolib_richtextformatdlg.obj \ - $(OBJS)\monolib_richtextsymboldlg.obj \ - $(OBJS)\monolib_richtextstyledlg.obj \ - $(OBJS)\monolib_richtextprint.obj \ + $(OBJS)\monolib_richtexthtml.obj \ $(OBJS)\monolib_richtextimagedlg.obj \ + $(OBJS)\monolib_richtextprint.obj \ + $(OBJS)\monolib_richtextstyledlg.obj \ + $(OBJS)\monolib_richtextstyles.obj \ + $(OBJS)\monolib_richtextsymboldlg.obj \ + $(OBJS)\monolib_richtextxml.obj \ $(OBJS)\monolib_stc.obj \ $(OBJS)\monolib_PlatWX.obj \ $(OBJS)\monolib_ScintillaWX.obj @@ -2715,6 +2715,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_generic_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_msw_accel.obj \ + $(OBJS)\monolib_anybutton.obj \ $(OBJS)\monolib_artmsw.obj \ $(OBJS)\monolib_msw_bmpbuttn.obj \ $(OBJS)\monolib_msw_button.obj \ @@ -3225,7 +3226,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ - $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_notifmsg.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ @@ -3235,7 +3235,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_commandlinkbutton.obj \ $(OBJS)\monolib_datecontrols.obj \ - $(OBJS)\monolib_datectrl.obj + $(OBJS)\monolib_datectrl.obj \ + $(OBJS)\monolib_hyperlink.obj !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ @@ -3269,7 +3270,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ - $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_notifmsg.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ @@ -3433,6 +3433,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_generic_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_msw_accel.obj \ + $(OBJS)\coredll_anybutton.obj \ $(OBJS)\coredll_artmsw.obj \ $(OBJS)\coredll_msw_bmpbuttn.obj \ $(OBJS)\coredll_msw_button.obj \ @@ -3980,6 +3981,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_generic_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_msw_accel.obj \ + $(OBJS)\corelib_anybutton.obj \ $(OBJS)\corelib_artmsw.obj \ $(OBJS)\corelib_msw_bmpbuttn.obj \ $(OBJS)\corelib_msw_button.obj \ @@ -4518,7 +4520,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ - $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_notifmsg.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ @@ -4528,7 +4529,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_commandlinkbutton.obj \ $(OBJS)\advdll_datecontrols.obj \ - $(OBJS)\advdll_datectrl.obj + $(OBJS)\advdll_datectrl.obj \ + $(OBJS)\advdll_hyperlink.obj !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ @@ -4562,7 +4564,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ - $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_notifmsg.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ @@ -4611,7 +4612,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ - $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_notifmsg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ @@ -4621,7 +4621,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_commandlinkbutton.obj \ $(OBJS)\advlib_datecontrols.obj \ - $(OBJS)\advlib_datectrl.obj + $(OBJS)\advlib_datectrl.obj \ + $(OBJS)\advlib_hyperlink.obj !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ @@ -4655,7 +4656,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ - $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_notifmsg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ @@ -5792,7 +5792,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -6861,6 +6861,9 @@ $(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp +$(OBJS)\monodll_anybutton.obj: ..\..\src\msw\anybutton.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp + $(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp @@ -7173,6 +7176,9 @@ $(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp +$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp + $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp @@ -7530,35 +7536,35 @@ $(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp -$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - $(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp -$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp $(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp -$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp -$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp $(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp -$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp + +$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp + +$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp + +$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp $(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -8800,11 +8806,6 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp @@ -9211,6 +9212,9 @@ $(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp +$(OBJS)\monolib_anybutton.obj: ..\..\src\msw\anybutton.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp + $(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp @@ -9523,6 +9527,9 @@ $(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp +$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp + $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp @@ -9880,35 +9887,35 @@ $(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp $(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp -$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - $(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp -$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp $(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp -$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp -$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp $(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp -$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp + +$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp + +$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp + +$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp $(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -11150,11 +11157,6 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp @@ -11972,6 +11974,9 @@ $(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp +$(OBJS)\coredll_anybutton.obj: ..\..\src\msw\anybutton.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp + $(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp @@ -13377,6 +13382,9 @@ $(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp +$(OBJS)\corelib_anybutton.obj: ..\..\src\msw\anybutton.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp + $(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp @@ -14770,6 +14778,9 @@ $(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp +$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp + $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -14860,9 +14871,6 @@ $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp -$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - $(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp @@ -14896,6 +14904,9 @@ $(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp +$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp + $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -14986,9 +14997,6 @@ $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp -$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - $(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp @@ -15808,68 +15816,68 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_63) $(__DEBUG_DEFINE_p_62) $(__NDEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_63) $(__MSLU_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc -$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - $(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp -$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp $(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp -$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp +$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp $(OBJS)\richtextdll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp + +$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp + +$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp + +$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp + +$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp + $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp -$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - $(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp -$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp $(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp -$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp -$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp $(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp -$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp + +$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp + +$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp + +$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 618c7f8c0a..bdaeb130e2 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -224,16 +224,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_page.obj & $(OBJS)\monodll_ribbon_panel.obj & $(OBJS)\monodll_ribbon_toolbar.obj & - $(OBJS)\monodll_richtextctrl.obj & $(OBJS)\monodll_richtextbuffer.obj & - $(OBJS)\monodll_richtextstyles.obj & - $(OBJS)\monodll_richtextxml.obj & - $(OBJS)\monodll_richtexthtml.obj & + $(OBJS)\monodll_richtextctrl.obj & $(OBJS)\monodll_richtextformatdlg.obj & - $(OBJS)\monodll_richtextsymboldlg.obj & - $(OBJS)\monodll_richtextstyledlg.obj & - $(OBJS)\monodll_richtextprint.obj & + $(OBJS)\monodll_richtexthtml.obj & $(OBJS)\monodll_richtextimagedlg.obj & + $(OBJS)\monodll_richtextprint.obj & + $(OBJS)\monodll_richtextstyledlg.obj & + $(OBJS)\monodll_richtextstyles.obj & + $(OBJS)\monodll_richtextsymboldlg.obj & + $(OBJS)\monodll_richtextxml.obj & $(OBJS)\monodll_stc.obj & $(OBJS)\monodll_PlatWX.obj & $(OBJS)\monodll_ScintillaWX.obj @@ -299,6 +299,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_generic_statusbr.obj & $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_msw_accel.obj & + $(OBJS)\monodll_anybutton.obj & $(OBJS)\monodll_artmsw.obj & $(OBJS)\monodll_msw_bmpbuttn.obj & $(OBJS)\monodll_msw_button.obj & @@ -813,7 +814,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_taskbarcmn.obj & $(OBJS)\monodll_aboutdlg.obj & - $(OBJS)\monodll_hyperlink.obj & $(OBJS)\monodll_notifmsg.obj & $(OBJS)\monodll_sound.obj & $(OBJS)\monodll_taskbar.obj & @@ -823,7 +823,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_calctrl.obj & $(OBJS)\monodll_commandlinkbutton.obj & $(OBJS)\monodll_datecontrols.obj & - $(OBJS)\monodll_datectrl.obj + $(OBJS)\monodll_datectrl.obj & + $(OBJS)\monodll_hyperlink.obj !endif !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_OBJECTS = & @@ -857,7 +858,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_taskbarcmn.obj & $(OBJS)\monodll_aboutdlg.obj & - $(OBJS)\monodll_hyperlink.obj & $(OBJS)\monodll_notifmsg.obj & $(OBJS)\monodll_sound.obj & $(OBJS)\monodll_taskbar.obj & @@ -999,16 +999,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_page.obj & $(OBJS)\monolib_ribbon_panel.obj & $(OBJS)\monolib_ribbon_toolbar.obj & - $(OBJS)\monolib_richtextctrl.obj & $(OBJS)\monolib_richtextbuffer.obj & - $(OBJS)\monolib_richtextstyles.obj & - $(OBJS)\monolib_richtextxml.obj & - $(OBJS)\monolib_richtexthtml.obj & + $(OBJS)\monolib_richtextctrl.obj & $(OBJS)\monolib_richtextformatdlg.obj & - $(OBJS)\monolib_richtextsymboldlg.obj & - $(OBJS)\monolib_richtextstyledlg.obj & - $(OBJS)\monolib_richtextprint.obj & + $(OBJS)\monolib_richtexthtml.obj & $(OBJS)\monolib_richtextimagedlg.obj & + $(OBJS)\monolib_richtextprint.obj & + $(OBJS)\monolib_richtextstyledlg.obj & + $(OBJS)\monolib_richtextstyles.obj & + $(OBJS)\monolib_richtextsymboldlg.obj & + $(OBJS)\monolib_richtextxml.obj & $(OBJS)\monolib_stc.obj & $(OBJS)\monolib_PlatWX.obj & $(OBJS)\monolib_ScintillaWX.obj @@ -1074,6 +1074,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_generic_statusbr.obj & $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_msw_accel.obj & + $(OBJS)\monolib_anybutton.obj & $(OBJS)\monolib_artmsw.obj & $(OBJS)\monolib_msw_bmpbuttn.obj & $(OBJS)\monolib_msw_button.obj & @@ -1588,7 +1589,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_taskbarcmn.obj & $(OBJS)\monolib_aboutdlg.obj & - $(OBJS)\monolib_hyperlink.obj & $(OBJS)\monolib_notifmsg.obj & $(OBJS)\monolib_sound.obj & $(OBJS)\monolib_taskbar.obj & @@ -1598,7 +1598,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_calctrl.obj & $(OBJS)\monolib_commandlinkbutton.obj & $(OBJS)\monolib_datecontrols.obj & - $(OBJS)\monolib_datectrl.obj + $(OBJS)\monolib_datectrl.obj & + $(OBJS)\monolib_hyperlink.obj !endif !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & @@ -1632,7 +1633,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_taskbarcmn.obj & $(OBJS)\monolib_aboutdlg.obj & - $(OBJS)\monolib_hyperlink.obj & $(OBJS)\monolib_notifmsg.obj & $(OBJS)\monolib_sound.obj & $(OBJS)\monolib_taskbar.obj & @@ -1753,6 +1753,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_generic_statusbr.obj & $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_msw_accel.obj & + $(OBJS)\coredll_anybutton.obj & $(OBJS)\coredll_artmsw.obj & $(OBJS)\coredll_msw_bmpbuttn.obj & $(OBJS)\coredll_msw_button.obj & @@ -2304,6 +2305,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_generic_statusbr.obj & $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_msw_accel.obj & + $(OBJS)\corelib_anybutton.obj & $(OBJS)\corelib_artmsw.obj & $(OBJS)\corelib_msw_bmpbuttn.obj & $(OBJS)\corelib_msw_button.obj & @@ -2835,7 +2837,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_wizard.obj & $(OBJS)\advdll_taskbarcmn.obj & $(OBJS)\advdll_aboutdlg.obj & - $(OBJS)\advdll_hyperlink.obj & $(OBJS)\advdll_notifmsg.obj & $(OBJS)\advdll_sound.obj & $(OBJS)\advdll_taskbar.obj & @@ -2845,7 +2846,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_calctrl.obj & $(OBJS)\advdll_commandlinkbutton.obj & $(OBJS)\advdll_datecontrols.obj & - $(OBJS)\advdll_datectrl.obj + $(OBJS)\advdll_datectrl.obj & + $(OBJS)\advdll_hyperlink.obj !endif !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & @@ -2879,7 +2881,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_wizard.obj & $(OBJS)\advdll_taskbarcmn.obj & $(OBJS)\advdll_aboutdlg.obj & - $(OBJS)\advdll_hyperlink.obj & $(OBJS)\advdll_notifmsg.obj & $(OBJS)\advdll_sound.obj & $(OBJS)\advdll_taskbar.obj & @@ -2928,7 +2929,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_wizard.obj & $(OBJS)\advlib_taskbarcmn.obj & $(OBJS)\advlib_aboutdlg.obj & - $(OBJS)\advlib_hyperlink.obj & $(OBJS)\advlib_notifmsg.obj & $(OBJS)\advlib_sound.obj & $(OBJS)\advlib_taskbar.obj & @@ -2938,7 +2938,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_calctrl.obj & $(OBJS)\advlib_commandlinkbutton.obj & $(OBJS)\advlib_datecontrols.obj & - $(OBJS)\advlib_datectrl.obj + $(OBJS)\advlib_datectrl.obj & + $(OBJS)\advlib_hyperlink.obj !endif !ifeq WXUNIV 1 ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & @@ -2972,7 +2973,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_wizard.obj & $(OBJS)\advlib_taskbarcmn.obj & $(OBJS)\advlib_aboutdlg.obj & - $(OBJS)\advlib_hyperlink.obj & $(OBJS)\advlib_notifmsg.obj & $(OBJS)\advlib_sound.obj & $(OBJS)\advlib_taskbar.obj & @@ -3471,7 +3471,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = wat OBJS = & $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -4821,16 +4821,16 @@ RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RICHTEXTDLL_OBJECTS = & $(OBJS)\richtextdll_dummy.obj & - $(OBJS)\richtextdll_richtextctrl.obj & $(OBJS)\richtextdll_richtextbuffer.obj & - $(OBJS)\richtextdll_richtextstyles.obj & - $(OBJS)\richtextdll_richtextxml.obj & - $(OBJS)\richtextdll_richtexthtml.obj & + $(OBJS)\richtextdll_richtextctrl.obj & $(OBJS)\richtextdll_richtextformatdlg.obj & - $(OBJS)\richtextdll_richtextsymboldlg.obj & - $(OBJS)\richtextdll_richtextstyledlg.obj & + $(OBJS)\richtextdll_richtexthtml.obj & + $(OBJS)\richtextdll_richtextimagedlg.obj & $(OBJS)\richtextdll_richtextprint.obj & - $(OBJS)\richtextdll_richtextimagedlg.obj + $(OBJS)\richtextdll_richtextstyledlg.obj & + $(OBJS)\richtextdll_richtextstyles.obj & + $(OBJS)\richtextdll_richtextsymboldlg.obj & + $(OBJS)\richtextdll_richtextxml.obj RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & @@ -4842,16 +4842,16 @@ RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = & $(OBJS)\richtextlib_dummy.obj & - $(OBJS)\richtextlib_richtextctrl.obj & $(OBJS)\richtextlib_richtextbuffer.obj & - $(OBJS)\richtextlib_richtextstyles.obj & - $(OBJS)\richtextlib_richtextxml.obj & - $(OBJS)\richtextlib_richtexthtml.obj & + $(OBJS)\richtextlib_richtextctrl.obj & $(OBJS)\richtextlib_richtextformatdlg.obj & - $(OBJS)\richtextlib_richtextsymboldlg.obj & - $(OBJS)\richtextlib_richtextstyledlg.obj & + $(OBJS)\richtextlib_richtexthtml.obj & + $(OBJS)\richtextlib_richtextimagedlg.obj & $(OBJS)\richtextlib_richtextprint.obj & - $(OBJS)\richtextlib_richtextimagedlg.obj + $(OBJS)\richtextlib_richtextstyledlg.obj & + $(OBJS)\richtextlib_richtextstyles.obj & + $(OBJS)\richtextlib_richtextsymboldlg.obj & + $(OBJS)\richtextlib_richtextxml.obj STCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & @@ -5621,7 +5621,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h : $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde build_cfg_file : .SYMBOLIC $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -6690,6 +6690,9 @@ $(OBJS)\monodll_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.c $(OBJS)\monodll_msw_accel.obj : .AUTODEPEND ..\..\src\msw\accel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_anybutton.obj : .AUTODEPEND ..\..\src\msw\anybutton.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7002,6 +7005,9 @@ $(OBJS)\monodll_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp $(OBJS)\monodll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7359,34 +7365,34 @@ $(OBJS)\monodll_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp $(OBJS)\monodll_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\monodll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\monodll_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\monodll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp @@ -8629,11 +8635,6 @@ $(OBJS)\monodll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -9040,6 +9041,9 @@ $(OBJS)\monolib_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.c $(OBJS)\monolib_msw_accel.obj : .AUTODEPEND ..\..\src\msw\accel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_anybutton.obj : .AUTODEPEND ..\..\src\msw\anybutton.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9352,6 +9356,9 @@ $(OBJS)\monolib_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp $(OBJS)\monolib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9709,34 +9716,34 @@ $(OBJS)\monolib_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp $(OBJS)\monolib_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\monolib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\monolib_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\monolib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp @@ -10979,11 +10986,6 @@ $(OBJS)\monolib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -11801,6 +11803,9 @@ $(OBJS)\coredll_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.c $(OBJS)\coredll_msw_accel.obj : .AUTODEPEND ..\..\src\msw\accel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_anybutton.obj : .AUTODEPEND ..\..\src\msw\anybutton.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -13206,6 +13211,9 @@ $(OBJS)\corelib_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.c $(OBJS)\corelib_msw_accel.obj : .AUTODEPEND ..\..\src\msw\accel.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_anybutton.obj : .AUTODEPEND ..\..\src\msw\anybutton.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -14599,6 +14607,9 @@ $(OBJS)\advdll_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp $(OBJS)\advdll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -14689,9 +14700,6 @@ $(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(OBJS)\advdll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - $(OBJS)\advdll_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -14725,6 +14733,9 @@ $(OBJS)\advlib_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp $(OBJS)\advlib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -14815,9 +14826,6 @@ $(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(OBJS)\advlib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - $(OBJS)\advlib_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -15637,67 +15645,67 @@ $(OBJS)\richtextdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(OBJS)\richtextdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $< -$(OBJS)\richtextdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - $(OBJS)\richtextdll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< -$(OBJS)\richtextdll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\richtextdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< $(OBJS)\richtextdll_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< -$(OBJS)\richtextdll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp +$(OBJS)\richtextdll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< $(OBJS)\richtextdll_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< -$(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< +$(OBJS)\richtextdll_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< -$(OBJS)\richtextlib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp +$(OBJS)\richtextdll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< $(OBJS)\richtextlib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< -$(OBJS)\richtextlib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp +$(OBJS)\richtextlib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< $(OBJS)\richtextlib_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< -$(OBJS)\richtextlib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp +$(OBJS)\richtextlib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< -$(OBJS)\richtextlib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp +$(OBJS)\richtextlib_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< $(OBJS)\richtextlib_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< -$(OBJS)\richtextlib_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp +$(OBJS)\richtextlib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< $(OBJS)\stcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index 7cd4f59bc1..142a143e04 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\adv" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb" !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\adv" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb" !ELSEIF "$(CFG)" == "adv - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\adv" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb" !ELSEIF "$(CFG)" == "adv - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\adv" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" !ELSEIF "$(CFG)" == "adv - Win32 Universal Release" @@ -466,6 +466,37 @@ SOURCE=..\..\src\msw\datectrl.cpp # Begin Source File SOURCE=..\..\src\msw\hyperlink.cpp + +!IF "$(CFG)" == "adv - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "adv - Win32 Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 Debug" + + +!ENDIF + # End Source File # Begin Source File diff --git a/build/msw/wx_aui.dsp b/build/msw/wx_aui.dsp index 455c0278e5..2467cb0129 100644 --- a/build/msw/wx_aui.dsp +++ b/build/msw/wx_aui.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\aui" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb" !ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\aui" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb" !ELSEIF "$(CFG)" == "aui - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\aui" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb" !ELSEIF "$(CFG)" == "aui - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\aui" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb" !ELSEIF "$(CFG)" == "aui - Win32 Universal Release" diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index f1d3395920..b2c5cecd85 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\base" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" -# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" +# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_vc_custom.pdb" +# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_vc_custom.pdb" !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\base" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" -# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" +# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" +# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" !ELSEIF "$(CFG)" == "base - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\base" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" -# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" +# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_vc_custom.pdb" +# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_vc_custom.pdb" !ELSEIF "$(CFG)" == "base - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\base" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" -# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" +# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" +# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" !ELSEIF "$(CFG)" == "base - Win32 Universal Release" diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 7d3bbbddbb..5b6ecf620f 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" !ELSEIF "$(CFG)" == "core - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" !ELSEIF "$(CFG)" == "core - Win32 Universal Release" @@ -840,6 +840,41 @@ SOURCE=..\..\src\msw\ole\activex.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\anybutton.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\app.cpp # End Source File # Begin Source File @@ -4886,6 +4921,10 @@ SOURCE=..\..\include\wx\msw\ole\activex.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\anybutton.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\app.h # End Source File # Begin Source File @@ -5917,6 +5956,10 @@ SOURCE=..\..\include\wx\animdecod.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\anybutton.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\ribbon\art.h # End Source File # Begin Source File @@ -6621,14 +6664,34 @@ SOURCE=..\..\include\wx\richmsgdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextbackgroundpage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextborderspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextbuffer.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextbulletspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextdialogpage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextfontpage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextformatdlg.h # End Source File # Begin Source File @@ -6641,14 +6704,34 @@ SOURCE=..\..\include\wx\richtext\richtextimagedlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextindentspage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextliststylepage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextmarginspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextprint.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextsizepage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextstyledlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextstylepage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextstyles.h # End Source File # Begin Source File @@ -6657,6 +6740,10 @@ SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextuicustomization.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextxml.h # End Source File # Begin Source File diff --git a/build/msw/wx_gl.dsp b/build/msw/wx_gl.dsp index 221d676cbe..a719cc555d 100644 --- a/build/msw/wx_gl.dsp +++ b/build/msw/wx_gl.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\gl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb" !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\gl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb" !ELSEIF "$(CFG)" == "gl - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\gl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb" !ELSEIF "$(CFG)" == "gl - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\gl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb" !ELSEIF "$(CFG)" == "gl - Win32 Universal Release" diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp index b1059bb9df..c02f88d2d4 100644 --- a/build/msw/wx_html.dsp +++ b/build/msw/wx_html.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\html" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb" !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\html" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb" !ELSEIF "$(CFG)" == "html - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\html" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_html_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_html_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb" !ELSEIF "$(CFG)" == "html - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\html" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb" !ELSEIF "$(CFG)" == "html - Win32 Universal Release" diff --git a/build/msw/wx_media.dsp b/build/msw/wx_media.dsp index 9b6a12fe07..41b197b779 100644 --- a/build/msw/wx_media.dsp +++ b/build/msw/wx_media.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\media" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb" !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\media" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb" !ELSEIF "$(CFG)" == "media - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\media" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_media_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_media_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb" !ELSEIF "$(CFG)" == "media - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\media" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb" !ELSEIF "$(CFG)" == "media - Win32 Universal Release" diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp index 8c96042ecf..5d704c4d15 100644 --- a/build/msw/wx_net.dsp +++ b/build/msw/wx_net.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\net" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb" -# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb" +# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb" +# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb" !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\net" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" -# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" +# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" +# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" !ELSEIF "$(CFG)" == "net - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\net" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb" -# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb" +# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb" +# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb" !ELSEIF "$(CFG)" == "net - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\net" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" -# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" +# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" +# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" !ELSEIF "$(CFG)" == "net - Win32 Universal Release" diff --git a/build/msw/wx_propgrid.dsp b/build/msw/wx_propgrid.dsp index 10c7dfca47..48546a3812 100644 --- a/build/msw/wx_propgrid.dsp +++ b/build/msw/wx_propgrid.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\propgrid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb" !ELSEIF "$(CFG)" == "propgrid - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\propgrid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb" !ELSEIF "$(CFG)" == "propgrid - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\propgrid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb" !ELSEIF "$(CFG)" == "propgrid - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\propgrid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb" !ELSEIF "$(CFG)" == "propgrid - Win32 Universal Release" diff --git a/build/msw/wx_qa.dsp b/build/msw/wx_qa.dsp index cde37794c4..7e77396d79 100644 --- a/build/msw/wx_qa.dsp +++ b/build/msw/wx_qa.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\qa" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb" !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\qa" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb" !ELSEIF "$(CFG)" == "qa - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\qa" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb" !ELSEIF "$(CFG)" == "qa - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\qa" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb" !ELSEIF "$(CFG)" == "qa - Win32 Universal Release" diff --git a/build/msw/wx_ribbon.dsp b/build/msw/wx_ribbon.dsp index f5d131252e..a214dfca16 100644 --- a/build/msw/wx_ribbon.dsp +++ b/build/msw/wx_ribbon.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\ribbon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb" !ELSEIF "$(CFG)" == "ribbon - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\ribbon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb" !ELSEIF "$(CFG)" == "ribbon - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\ribbon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb" !ELSEIF "$(CFG)" == "ribbon - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\ribbon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb" !ELSEIF "$(CFG)" == "ribbon - Win32 Universal Release" diff --git a/build/msw/wx_richtext.dsp b/build/msw/wx_richtext.dsp index 0edf10859f..7e4d653b8a 100644 --- a/build/msw/wx_richtext.dsp +++ b/build/msw/wx_richtext.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\richtext" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb" !ELSEIF "$(CFG)" == "richtext - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\richtext" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb" !ELSEIF "$(CFG)" == "richtext - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\richtext" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb" !ELSEIF "$(CFG)" == "richtext - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\richtext" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_richtext_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RICHTEXT BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb" !ELSEIF "$(CFG)" == "richtext - Win32 Universal Release" @@ -530,14 +530,34 @@ InputPath=..\..\include\wx\msw\genrcdefs.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextbackgroundpage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextborderspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextbuffer.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextbulletspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextdialogpage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextfontpage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextformatdlg.h # End Source File # Begin Source File @@ -550,14 +570,34 @@ SOURCE=..\..\include\wx\richtext\richtextimagedlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextindentspage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextliststylepage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextmarginspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextprint.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextsizepage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextstyledlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextstylepage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextstyles.h # End Source File # Begin Source File @@ -566,6 +606,10 @@ SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextuicustomization.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextxml.h # End Source File # End Group diff --git a/build/msw/wx_stc.dsp b/build/msw/wx_stc.dsp index fea1180345..50cbbc40c6 100644 --- a/build/msw/wx_stc.dsp +++ b/build/msw/wx_stc.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\stc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb" !ELSEIF "$(CFG)" == "stc - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\stc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb" !ELSEIF "$(CFG)" == "stc - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\stc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb" !ELSEIF "$(CFG)" == "stc - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\stc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb" !ELSEIF "$(CFG)" == "stc - Win32 Universal Release" diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index c5c169dc8e..fd8c6ffbfe 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -273,7 +273,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch" ObjectFile="vc_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -284,13 +284,13 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" TargetMachine="1"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> + + + + diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj index 987f0d64cb..59e196e1f8 100644 --- a/build/msw/wx_vc7_aui.vcproj +++ b/build/msw/wx_vc7_aui.vcproj @@ -273,7 +273,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch" ObjectFile="vc_mswuddll\aui\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -284,13 +284,13 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_aui.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb" TargetMachine="1"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> + + + + + + @@ -4237,6 +4252,9 @@ + + @@ -5024,6 +5042,9 @@ + + @@ -5552,12 +5573,27 @@ + + + + + + + + + + @@ -5567,18 +5603,36 @@ + + + + + + + + + + + + diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj index 5045a6b5ef..8a76742bf6 100644 --- a/build/msw/wx_vc7_gl.vcproj +++ b/build/msw/wx_vc7_gl.vcproj @@ -273,7 +273,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch" ObjectFile="vc_mswuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -284,13 +284,13 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb" TargetMachine="1"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> + + + + + + + + + + @@ -786,18 +801,36 @@ + + + + + + + + + + + + diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj index d73637e6cd..a370d9b22f 100644 --- a/build/msw/wx_vc7_stc.vcproj +++ b/build/msw/wx_vc7_stc.vcproj @@ -273,7 +273,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch" ObjectFile="vc_mswuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -284,13 +284,13 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb" TargetMachine="1"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch" ObjectFile="vc_mswunivuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -950,6 +950,22 @@ + + + + @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_auidll.pch" ObjectFile="vc_mswunivuddll\aui\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj index 71c06f1cd5..1c38044141 100644 --- a/build/msw/wx_vc8_base.vcproj +++ b/build/msw/wx_vc8_base.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch" ObjectFile="vc_mswuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch" ObjectFile="vc_mswunivuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 031fe1d6fe..274e331681 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch" ObjectFile="vc_mswuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch" ObjectFile="vc_mswunivuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -1399,6 +1399,26 @@ RelativePath="..\..\src\msw\ole\activex.cpp" > + + + + + + @@ -5679,6 +5699,10 @@ RelativePath="..\..\include\wx\msw\ole\activex.h" > + + @@ -6719,6 +6743,10 @@ RelativePath="..\..\include\wx\animdecod.h" > + + @@ -7423,14 +7451,34 @@ RelativePath="..\..\include\wx\richmsgdlg.h" > + + + + + + + + + + @@ -7443,14 +7491,34 @@ RelativePath="..\..\include\wx\richtext\richtextimagedlg.h" > + + + + + + + + + + @@ -7459,6 +7527,10 @@ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h" > + + diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj index a013c3b8e8..7b9741c872 100644 --- a/build/msw/wx_vc8_gl.vcproj +++ b/build/msw/wx_vc8_gl.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch" ObjectFile="vc_mswuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch" ObjectFile="vc_mswunivuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index f6657f1338..84db1d1e3b 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch" ObjectFile="vc_mswuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch" ObjectFile="vc_mswunivuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj index c682186ec8..7c661e6fce 100644 --- a/build/msw/wx_vc8_media.vcproj +++ b/build/msw/wx_vc8_media.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch" ObjectFile="vc_mswuddll\media\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_mediadll.pch" ObjectFile="vc_mswunivuddll\media\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj index 2f7ac0083c..04c561d457 100644 --- a/build/msw/wx_vc8_net.vcproj +++ b/build/msw/wx_vc8_net.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch" ObjectFile="vc_mswuddll\net\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_netdll.pch" ObjectFile="vc_mswunivuddll\net\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj index dc79835164..5ffffac3f6 100644 --- a/build/msw/wx_vc8_propgrid.vcproj +++ b/build/msw/wx_vc8_propgrid.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch" ObjectFile="vc_mswuddll\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_propgriddll.pch" ObjectFile="vc_mswunivuddll\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj index 5be9dc0d71..5fe5f4dfa4 100644 --- a/build/msw/wx_vc8_qa.vcproj +++ b/build/msw/wx_vc8_qa.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch" ObjectFile="vc_mswuddll\qa\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_qadll.pch" ObjectFile="vc_mswunivuddll\qa\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj index 62a6c30bda..b22537b049 100644 --- a/build/msw/wx_vc8_ribbon.vcproj +++ b/build/msw/wx_vc8_ribbon.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch" ObjectFile="vc_mswuddll\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch" ObjectFile="vc_mswunivuddll\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj index e62e53f93e..7fac8f2a9d 100644 --- a/build/msw/wx_vc8_richtext.vcproj +++ b/build/msw/wx_vc8_richtext.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch" ObjectFile="vc_mswuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch" ObjectFile="vc_mswunivuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -1050,14 +1050,34 @@ Name="Common Headers" UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}" > + + + + + + + + + + @@ -1070,14 +1090,34 @@ RelativePath="..\..\include\wx\richtext\richtextimagedlg.h" > + + + + + + + + + + @@ -1086,6 +1126,10 @@ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h" > + + diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj index df04c3eb31..02dc390bea 100644 --- a/build/msw/wx_vc8_stc.vcproj +++ b/build/msw/wx_vc8_stc.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch" ObjectFile="vc_mswuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_stcdll.pch" ObjectFile="vc_mswunivuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj index bd8a102a0f..723e5e7a48 100644 --- a/build/msw/wx_vc8_xml.vcproj +++ b/build/msw/wx_vc8_xml.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch" ObjectFile="vc_mswuddll\xml\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xmldll.pch" ObjectFile="vc_mswunivuddll\xml\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj index 596f2dbfae..08681c2d25 100644 --- a/build/msw/wx_vc8_xrc.vcproj +++ b/build/msw/wx_vc8_xrc.vcproj @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch" ObjectFile="vc_mswuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb" TargetMachine="1" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch" ObjectFile="vc_mswunivuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb" TargetMachine="1" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj index 80201ea6ca..174463f822 100644 --- a/build/msw/wx_vc9_adv.vcproj +++ b/build/msw/wx_vc9_adv.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch" ObjectFile="vc_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch" ObjectFile="vc_mswunivuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -946,6 +946,22 @@ + + + + @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_auidll.pch" ObjectFile="vc_mswunivuddll\aui\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj index a532ba21b2..fa87ab04ba 100644 --- a/build/msw/wx_vc9_base.vcproj +++ b/build/msw/wx_vc9_base.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch" ObjectFile="vc_mswuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch" ObjectFile="vc_mswunivuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 8fd9dbb6ba..7dbebad098 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch" ObjectFile="vc_mswuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch" ObjectFile="vc_mswunivuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -1395,6 +1395,26 @@ RelativePath="..\..\src\msw\ole\activex.cpp" > + + + + + + @@ -5675,6 +5695,10 @@ RelativePath="..\..\include\wx\msw\ole\activex.h" > + + @@ -6715,6 +6739,10 @@ RelativePath="..\..\include\wx\animdecod.h" > + + @@ -7419,14 +7447,34 @@ RelativePath="..\..\include\wx\richmsgdlg.h" > + + + + + + + + + + @@ -7439,14 +7487,34 @@ RelativePath="..\..\include\wx\richtext\richtextimagedlg.h" > + + + + + + + + + + @@ -7455,6 +7523,10 @@ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h" > + + diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj index 7ab6be727f..627f75b16d 100644 --- a/build/msw/wx_vc9_gl.vcproj +++ b/build/msw/wx_vc9_gl.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch" ObjectFile="vc_mswuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch" ObjectFile="vc_mswunivuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj index 9bed1a9235..9842902dbf 100644 --- a/build/msw/wx_vc9_html.vcproj +++ b/build/msw/wx_vc9_html.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch" ObjectFile="vc_mswuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch" ObjectFile="vc_mswunivuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj index 832c9cd2a5..fc16ea2326 100644 --- a/build/msw/wx_vc9_media.vcproj +++ b/build/msw/wx_vc9_media.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch" ObjectFile="vc_mswuddll\media\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_mediadll.pch" ObjectFile="vc_mswunivuddll\media\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj index 9ab2858cd1..ab841b940a 100644 --- a/build/msw/wx_vc9_net.vcproj +++ b/build/msw/wx_vc9_net.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch" ObjectFile="vc_mswuddll\net\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_netdll.pch" ObjectFile="vc_mswunivuddll\net\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj index 4cb5993686..92af51a81f 100644 --- a/build/msw/wx_vc9_propgrid.vcproj +++ b/build/msw/wx_vc9_propgrid.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch" ObjectFile="vc_mswuddll\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_propgriddll.pch" ObjectFile="vc_mswunivuddll\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj index ab08312a4b..cfe32f2e7c 100644 --- a/build/msw/wx_vc9_qa.vcproj +++ b/build/msw/wx_vc9_qa.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch" ObjectFile="vc_mswuddll\qa\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_qadll.pch" ObjectFile="vc_mswunivuddll\qa\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj index 1fead60050..19ca87f114 100644 --- a/build/msw/wx_vc9_ribbon.vcproj +++ b/build/msw/wx_vc9_ribbon.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch" ObjectFile="vc_mswuddll\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch" ObjectFile="vc_mswunivuddll\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj index b8125a475e..525cd6635c 100644 --- a/build/msw/wx_vc9_richtext.vcproj +++ b/build/msw/wx_vc9_richtext.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch" ObjectFile="vc_mswuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch" ObjectFile="vc_mswunivuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -1046,14 +1046,34 @@ Name="Common Headers" UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}" > + + + + + + + + + + @@ -1066,14 +1086,34 @@ RelativePath="..\..\include\wx\richtext\richtextimagedlg.h" > + + + + + + + + + + @@ -1082,6 +1122,10 @@ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h" > + + diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj index 7f2baf2cfc..a1d1b0c3c9 100644 --- a/build/msw/wx_vc9_stc.vcproj +++ b/build/msw/wx_vc9_stc.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch" ObjectFile="vc_mswuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_stcdll.pch" ObjectFile="vc_mswunivuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj index 6813732006..5bb5d647ce 100644 --- a/build/msw/wx_vc9_xml.vcproj +++ b/build/msw/wx_vc9_xml.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch" ObjectFile="vc_mswuddll\xml\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xmldll.pch" ObjectFile="vc_mswunivuddll\xml\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxbase292u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj index 8c55e38caa..293c02e231 100644 --- a/build/msw/wx_vc9_xrc.vcproj +++ b/build/msw/wx_vc9_xrc.vcproj @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch" ObjectFile="vc_mswuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> @@ -415,14 +415,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb" TargetMachine="1" /> @@ -506,14 +506,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch" ObjectFile="vc_mswunivuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> @@ -601,14 +601,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb" TargetMachine="1" /> @@ -692,14 +692,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_xml.dsp b/build/msw/wx_xml.dsp index 417fb2d119..0dac4b922f 100644 --- a/build/msw/wx_xml.dsp +++ b/build/msw/wx_xml.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\xml" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb" -# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb" +# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb" +# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb" !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\xml" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" -# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" +# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" +# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" !ELSEIF "$(CFG)" == "xml - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\xml" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb" -# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292u_xml_vc_custom.pdb" +# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb" +# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb" !ELSEIF "$(CFG)" == "xml - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\xml" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase292ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" -# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase292ud_xml_vc_custom.pdb" +# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" +# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb" !ELSEIF "$(CFG)" == "xml - Win32 Universal Release" diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index 4f15d1889c..f231d43d1b 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\xrc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\xrc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\xrc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\xrc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_xrc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb" !ELSEIF "$(CFG)" == "xrc - Win32 Universal Release" diff --git a/build/osx/wx.xcconfig b/build/osx/wx.xcconfig index 5931b52435..128289b3fb 100644 --- a/build/osx/wx.xcconfig +++ b/build/osx/wx.xcconfig @@ -5,15 +5,14 @@ WXPLATFORM = __WXOSX_$(WXTOOLKITUPPER)__ PRODUCT_NAME = wx_osx_$(WXTOOLKIT) -// USER_HEADER_SEARCH_PATHS = ${SYMROOT}/include ../include osx/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src - +OTHER_CFLAGS = -Wall -Wundef -fno-strict-aliasing -fno-common -fvisibility=hidden +OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h GCC_PRECOMPILE_PREFIX_HEADER = YES HEADER_SEARCH_PATHS = $(WXROOT)/src/tiff/libtiff USER_HEADER_SEARCH_PATHS = $(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include $(WXROOT)/src/jpeg $(WXROOT)/src/png $(WXROOT)/src/regex $(WXROOT)/src/expat/lib $(WXROOT)/src/tiff/libtiff $(WXROOT)/src/stc/scintilla/src $(WXROOT)/src/stc/scintilla/include ALWAYS_SEARCH_USER_PATHS = NO -GCC_PREPROCESSOR_DEFINITIONS = $(WXPLATFORM) __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=1 +GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) $(WXPLATFORM) __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=1 GCC_PFE_FILE_C_DIALECTS = c++ objective-c++ -// USE_HEADERMAP = NO -// USE_SEPARATE_HEADERMAPS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 diff --git a/build/osx/wxcarbon.xcconfig b/build/osx/wxcarbon.xcconfig index 68f4e2bb92..34b5d8001a 100644 --- a/build/osx/wxcarbon.xcconfig +++ b/build/osx/wxcarbon.xcconfig @@ -3,5 +3,12 @@ WXTOOLKITUPPER = CARBON #include "wx.xcconfig" +MACOSX_DEPLOYMENT_TARGET = 10.4 + +GCC_VERSION = 4.2 +GCC_VERSION[arch=ppc] = 4.0 + +ARCHS = ppc i386 + OTHER_LDFLAGS = -framework WebKit -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework AGL -framework OpenGL -framework QuickTime -VALID_ARCHS = i386 ppc ppc7400 ppc970 + diff --git a/build/osx/wxcarbon.xcodeproj/project.pbxproj b/build/osx/wxcarbon.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..7772b671ed --- /dev/null +++ b/build/osx/wxcarbon.xcodeproj/project.pbxproj @@ -0,0 +1,5526 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 45; + objects = { + +/* Begin PBXBuildFile section */ + 006841D4ADA6384B9A8886CE /* slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75278C04709D3482A2660DFC /* slider.cpp */; }; + 006841D4ADA6384B9A8886CF /* slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75278C04709D3482A2660DFC /* slider.cpp */; }; + 0095084719983B878378CA28 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 69A6CAF721E53E83B4820DE6 /* pngwrite.c */; }; + 0095084719983B878378CA29 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 69A6CAF721E53E83B4820DE6 /* pngwrite.c */; }; + 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */; }; + 00E2F82590B33BDCA1F6D0C5 /* xh_htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */; }; + 00F1531404F832C6AE0748F2 /* spinbutt_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */; }; + 00F1531404F832C6AE0748F3 /* spinbutt_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */; }; + 014AF0BAB1783A5D9D75A7ED /* zstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9B5BC858CCF3477895D2786 /* zstream.cpp */; }; + 014AF0BAB1783A5D9D75A7EE /* zstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9B5BC858CCF3477895D2786 /* zstream.cpp */; }; + 0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */; }; + 0164A65CDB7A334A8E9AA4C0 /* dynload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */; }; + 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; + 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; + 020BBB417207393F8C60EFB6 /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */; }; + 020BBB417207393F8C60EFB7 /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */; }; + 026F90F7492C316A94128916 /* logg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64705CE9398316D87BAB4DC /* logg.cpp */; }; + 026F90F7492C316A94128917 /* logg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64705CE9398316D87BAB4DC /* logg.cpp */; }; + 028257C52CAE3038AA862C35 /* stdstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE16011AD6323AAC8616F973 /* stdstream.cpp */; }; + 028257C52CAE3038AA862C36 /* stdstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE16011AD6323AAC8616F973 /* stdstream.cpp */; }; + 02BB539E2AD63C078DA776B0 /* uiaction_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */; }; + 02BB539E2AD63C078DA776B1 /* uiaction_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */; }; + 02E8F1195B653D26AAA89462 /* listbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */; }; + 02E8F1195B653D26AAA89463 /* listbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */; }; + 03035C5CE4BC3288A5A18424 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */; }; + 03035C5CE4BC3288A5A18425 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */; }; + 03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */; }; + 03BF1610E2FC3BD5ACB754F1 /* bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */; }; + 05021BAB2C9B3C4CAD0A7C2C /* regfree.c in Sources */ = {isa = PBXBuildFile; fileRef = EEE82083BFA430D5B58F8A04 /* regfree.c */; }; + 05021BAB2C9B3C4CAD0A7C2D /* regfree.c in Sources */ = {isa = PBXBuildFile; fileRef = EEE82083BFA430D5B58F8A04 /* regfree.c */; }; + 052331773CF6362C9A6CF38E /* utils_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EED7C691150139EFA35E8EBD /* utils_osx.cpp */; }; + 052331773CF6362C9A6CF38F /* utils_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EED7C691150139EFA35E8EBD /* utils_osx.cpp */; }; + 056CA84179433AA48D55DA65 /* bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDDE855D9F83E4891362EB4 /* bar.cpp */; }; + 056CA84179433AA48D55DA66 /* bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDDE855D9F83E4891362EB4 /* bar.cpp */; }; + 056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EEAD9C3E180305D8899441E /* strvararg.cpp */; }; + 056E30EA43753A7CB1AF8C9F /* strvararg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EEAD9C3E180305D8899441E /* strvararg.cpp */; }; + 05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; }; + 05814571E7A83F5DBFB6E4C5 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; }; + 064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; }; + 064908348009398C8EA8497D /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; }; + 0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */; }; + 0654BCC3F0763C50A7949505 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */; }; + 069D53F2DFBF370A8CC99630 /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */; }; + 069D53F2DFBF370A8CC99631 /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */; }; + 07158EBC05A637ECA9DC7B4F /* utilscocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */; }; + 07158EBC05A637ECA9DC7B50 /* utilscocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */; }; + 0718E7524134312090541D6E /* LexPascal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */; }; + 0718E7524134312090541D6F /* LexPascal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */; }; + 0723C4E8B52C39FDBC2158B6 /* dataview_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */; }; + 0723C4E8B52C39FDBC2158B7 /* dataview_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */; }; + 0730A107A2B935A9923C8EF2 /* filehistorycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D7B3307E56B332769901E99F /* filehistorycmn.cpp */; }; + 0730A107A2B935A9923C8EF3 /* filehistorycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D7B3307E56B332769901E99F /* filehistorycmn.cpp */; }; + 07412469921A3E488A2F9BA6 /* checklst_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */; }; + 07412469921A3E488A2F9BA7 /* checklst_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */; }; + 0742292656623EC481B34369 /* paper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87D973CA8D673267BD0844D3 /* paper.cpp */; }; + 0742292656623EC481B3436A /* paper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87D973CA8D673267BD0844D3 /* paper.cpp */; }; + 0743AE8613F535A0ABB79315 /* intl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC8BB1AABB3D393EBA527060 /* intl.cpp */; }; + 0743AE8613F535A0ABB79316 /* intl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC8BB1AABB3D393EBA527060 /* intl.cpp */; }; + 07C769F64665317BA3E1AC90 /* tif_jpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */; }; + 07C769F64665317BA3E1AC91 /* tif_jpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */; }; + 07EC76232BB3343FA5CB90B0 /* LexAVE.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */; }; + 07EC76232BB3343FA5CB90B1 /* LexAVE.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */; }; + 0813551C951A3AD1A5EF01B2 /* imagbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F84098A475939BB9EE87E70 /* imagbmp.cpp */; }; + 0813551C951A3AD1A5EF01B3 /* imagbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F84098A475939BB9EE87E70 /* imagbmp.cpp */; }; + 0836590D35FE37988DE70442 /* combobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */; }; + 0836590D35FE37988DE70443 /* combobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */; }; + 087FF6DE223A32509692F39B /* txtstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */; }; + 087FF6DE223A32509692F39C /* txtstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */; }; + 0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D07403FCA530D7A9FD2917 /* jfdctflt.c */; }; + 0948599C4FD53611A09B52AC /* jfdctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D07403FCA530D7A9FD2917 /* jfdctflt.c */; }; + 096BA201623034AD97218368 /* tif_version.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E6F40F4740C3ED29D83E107 /* tif_version.c */; }; + 096BA201623034AD97218369 /* tif_version.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E6F40F4740C3ED29D83E107 /* tif_version.c */; }; + 097BC5E023C33C1DA05606AF /* Selection.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2AF7739C389536F79DAA31E5 /* Selection.cxx */; }; + 097BC5E023C33C1DA05606B0 /* Selection.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2AF7739C389536F79DAA31E5 /* Selection.cxx */; }; + 0A2A4D2DC8F63FE1AC0BFAAF /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2024D29170D3B50A4DFDE11 /* base64.cpp */; }; + 0A2A4D2DC8F63FE1AC0BFAB0 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2024D29170D3B50A4DFDE11 /* base64.cpp */; }; + 0A406D2D1ADA343891E3664C /* powercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */; }; + 0A406D2D1ADA343891E3664D /* powercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */; }; + 0ADC8DBEE80D36B0BB9B058A /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A82C367B86F83981803D55DB /* LexASY.cxx */; }; + 0ADC8DBEE80D36B0BB9B058B /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A82C367B86F83981803D55DB /* LexASY.cxx */; }; + 0AEBA7389E223781A7A257A1 /* webkit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DF2456ED905357B8C1D74D9 /* webkit.mm */; }; + 0AEBA7389E223781A7A257A2 /* webkit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DF2456ED905357B8C1D74D9 /* webkit.mm */; }; + 0B4AF44DC0C439AD83CDC37E /* Indicator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4FDE5A962FA234FA83A605AD /* Indicator.cxx */; }; + 0B4AF44DC0C439AD83CDC37F /* Indicator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4FDE5A962FA234FA83A605AD /* Indicator.cxx */; }; + 0B98B6721DEE37A1ADEA382B /* quantize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B890199A37723EFD86C0ADA5 /* quantize.cpp */; }; + 0B98B6721DEE37A1ADEA382C /* quantize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B890199A37723EFD86C0ADA5 /* quantize.cpp */; }; + 0C3F48DBD05E3566A4CA6D44 /* LexAsm.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A65399C8A6D636139E362119 /* LexAsm.cxx */; }; + 0C3F48DBD05E3566A4CA6D45 /* LexAsm.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A65399C8A6D636139E362119 /* LexAsm.cxx */; }; + 0C485288EA86379D9FD66536 /* cshelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67DCEEB6861731319C30817F /* cshelp.cpp */; }; + 0C485288EA86379D9FD66537 /* cshelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67DCEEB6861731319C30817F /* cshelp.cpp */; }; + 0C7E2D5C22A232368F862A60 /* longlong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72D7AF345E563587941BD868 /* longlong.cpp */; }; + 0C7E2D5C22A232368F862A61 /* longlong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72D7AF345E563587941BD868 /* longlong.cpp */; }; + 0C9A379D97B133FA831175A7 /* printdlg_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */; }; + 0C9A379D97B133FA831175A8 /* printdlg_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */; }; + 0D6596A44A8C37DE85D578F6 /* Document.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 71DB140E670738839EC42C2B /* Document.cxx */; }; + 0D6596A44A8C37DE85D578F7 /* Document.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 71DB140E670738839EC42C2B /* Document.cxx */; }; + 0D79F1B4EF44393AA324213F /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */; }; + 0D79F1B4EF44393AA3242140 /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */; }; + 0E024D145DDD38ACAE68F462 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; }; + 0E024D145DDD38ACAE68F463 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; }; + 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; + 0E60E17BA4B23347A4F20161 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; + 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; + 0E92CEF677AA32C9A8CDA0A8 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; + 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; }; + 0EB6AB38A68D3845AC384A24 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; }; + 0F8C79010EF0316AA1B7392D /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */; }; + 0F8C79010EF0316AA1B7392E /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */; }; + 0FA6E1E47F123FF4A902E4D2 /* xh_odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0080254545B9383ABDF2045C /* xh_odcombo.cpp */; }; + 0FA6E1E47F123FF4A902E4D3 /* xh_odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0080254545B9383ABDF2045C /* xh_odcombo.cpp */; }; + 0FBF7C9EDFB53D8DA0991B55 /* xh_notbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87662D69F0432FC96701280 /* xh_notbk.cpp */; }; + 0FBF7C9EDFB53D8DA0991B56 /* xh_notbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87662D69F0432FC96701280 /* xh_notbk.cpp */; }; + 0FDDE8E193743F3A8CBDC67C /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; }; + 0FDDE8E193743F3A8CBDC67D /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; }; + 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; + 0FFFFA2F762B3160955D1D89 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; + 11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; + 11818B68C5263EB68D708846 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; + 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; }; + 11DD420E32FB3EFB9DA0AB5C /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; }; + 131B879180AE3FB481F81CC7 /* fs_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9A305CEC03B3085B159B617 /* fs_mem.cpp */; }; + 131B879180AE3FB481F81CC8 /* fs_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9A305CEC03B3085B159B617 /* fs_mem.cpp */; }; + 13250B531B1B3F9998C59DA9 /* stdpaths_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */; }; + 13250B531B1B3F9998C59DAA /* stdpaths_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */; }; + 135DFCE48FC03D8294D01A89 /* xmlrsall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */; }; + 135DFCE48FC03D8294D01A8A /* xmlrsall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */; }; + 13854E7822783719A2530792 /* jddctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = A5BBC1E494D33D028CA547FF /* jddctmgr.c */; }; + 13854E7822783719A2530793 /* jddctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = A5BBC1E494D33D028CA547FF /* jddctmgr.c */; }; + 14C024EB327435A2A571DA2C /* LexKix.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B303230368143F37B2409DE6 /* LexKix.cxx */; }; + 14C024EB327435A2A571DA2D /* LexKix.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B303230368143F37B2409DE6 /* LexKix.cxx */; }; + 14EF556997B0350F931EBE8E /* jdinput.c in Sources */ = {isa = PBXBuildFile; fileRef = CCF7564A2B733F759AA8496B /* jdinput.c */; }; + 14EF556997B0350F931EBE8F /* jdinput.c in Sources */ = {isa = PBXBuildFile; fileRef = CCF7564A2B733F759AA8496B /* jdinput.c */; }; + 15048519756B33959B15B161 /* floatpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A881F49ADCF33C299B041584 /* floatpane.cpp */; }; + 15048519756B33959B15B162 /* floatpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A881F49ADCF33C299B041584 /* floatpane.cpp */; }; + 1569BB4728693B6285623A23 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A0650754DC2358CA5933B28 /* pngerror.c */; }; + 1569BB4728693B6285623A24 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A0650754DC2358CA5933B28 /* pngerror.c */; }; + 15735ED6556130F6A14F0BCD /* ScintillaBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */; }; + 15735ED6556130F6A14F0BCE /* ScintillaBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */; }; + 157C8DA2E272399B9380991A /* menuitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44806DDCE6FB305EAED41E92 /* menuitem.cpp */; }; + 157C8DA2E272399B9380991B /* menuitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44806DDCE6FB305EAED41E92 /* menuitem.cpp */; }; + 159E4248CB1333AD841D9F03 /* LexYAML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */; }; + 159E4248CB1333AD841D9F04 /* LexYAML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */; }; + 15D65A523EB23EC385C05E0B /* jquant1.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */; }; + 15D65A523EB23EC385C05E0C /* jquant1.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */; }; + 16021CFD78623B8CBD08FC1F /* LexVHDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */; }; + 16021CFD78623B8CBD08FC20 /* LexVHDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */; }; + 164010B26D363F5FA09785B6 /* listctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */; }; + 164010B26D363F5FA09785B7 /* listctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */; }; + 164CF6AA59B135E68239E8F8 /* notebmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1A75C83424B32E99AC91B2C /* notebmac.cpp */; }; + 164CF6AA59B135E68239E8F9 /* notebmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1A75C83424B32E99AC91B2C /* notebmac.cpp */; }; + 16A382A265DE32FABC318F6F /* fontdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB170BF78EFE39D692E11985 /* fontdlgg.cpp */; }; + 16A382A265DE32FABC318F70 /* fontdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB170BF78EFE39D692E11985 /* fontdlgg.cpp */; }; + 16D334945B1E30AFB80B356C /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D35F1F29F9D33C2B9730D4EE /* window.cpp */; }; + 16D334945B1E30AFB80B356D /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D35F1F29F9D33C2B9730D4EE /* window.cpp */; }; + 1710A4BB0E6339558A187F8D /* xmlres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087B66573CD33DA99DA82B1C /* xmlres.cpp */; }; + 1710A4BB0E6339558A187F8E /* xmlres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087B66573CD33DA99DA82B1C /* xmlres.cpp */; }; + 1749412E53B9311DABA71DDC /* bmpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */; }; + 1749412E53B9311DABA71DDD /* bmpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */; }; + 17F0494F87533196904F5313 /* xh_toolbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */; }; + 17F0494F87533196904F5314 /* xh_toolbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */; }; + 182DFDBB58653FD9863D4176 /* dcprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 238741BDA2C73E56899CCB04 /* dcprint.cpp */; }; + 182DFDBB58653FD9863D4177 /* dcprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 238741BDA2C73E56899CCB04 /* dcprint.cpp */; }; + 187F921A95DA3594B0AD980D /* gridsel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26381308E32A3A179E7A9B40 /* gridsel.cpp */; }; + 187F921A95DA3594B0AD980E /* gridsel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26381308E32A3A179E7A9B40 /* gridsel.cpp */; }; + 18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */; }; + 18A318847EAC37F2B915F082 /* jmemmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */; }; + 1937FBA0A0DD32A8A743CFE1 /* valtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8701E1CF2B352B945C17E5 /* valtext.cpp */; }; + 1937FBA0A0DD32A8A743CFE2 /* valtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8701E1CF2B352B945C17E5 /* valtext.cpp */; }; + 19D823E564D932758EA6F8D1 /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */; }; + 19D823E564D932758EA6F8D2 /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */; }; + 1A4F9F18BBEB3515AC7C7CC6 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; }; + 1A4F9F18BBEB3515AC7C7CC7 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; }; + 1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; }; + 1A7FA35BDE4F35C685AB51A6 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; }; + 1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; }; + 1AB50C98FF473B33A3CA4D3A /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; }; + 1AF2B2346C9639DAA4D15F30 /* numdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */; }; + 1AF2B2346C9639DAA4D15F31 /* numdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */; }; + 1B06622C8D8731FC832199E2 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB82939EDC593F9CA95C3098 /* init.cpp */; }; + 1B06622C8D8731FC832199E3 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB82939EDC593F9CA95C3098 /* init.cpp */; }; + 1BCC944F5E0936F5830F03E8 /* windowid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9B9B85572D0312BBF2878DB /* windowid.cpp */; }; + 1BCC944F5E0936F5830F03E9 /* windowid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9B9B85572D0312BBF2878DB /* windowid.cpp */; }; + 1C52CB9487DF3AB9AF243B47 /* prntbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 242BF97B558634A79322052C /* prntbase.cpp */; }; + 1C52CB9487DF3AB9AF243B48 /* prntbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 242BF97B558634A79322052C /* prntbase.cpp */; }; + 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; + 1CD4F67F48CF3A5FA477D86F /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; + 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; }; + 1D726139C977341A97D0C932 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; }; + 1D7442C82B343F50A83B25B0 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */; }; + 1D7442C82B343F50A83B25B1 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */; }; + 1DBDF75500D73A3098015E7F /* cfstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */; }; + 1DBDF75500D73A3098015E80 /* cfstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */; }; + 1DF3A4F85FCB3BA79A552F3D /* menuitem_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */; }; + 1DF3A4F85FCB3BA79A552F3E /* menuitem_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */; }; + 1E166FC1A7B3371FB038B172 /* fldlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */; }; + 1E166FC1A7B3371FB038B173 /* fldlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */; }; + 1E17F95DD433379E8C18298C /* odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */; }; + 1E17F95DD433379E8C18298D /* odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */; }; + 1E2AB43075973AE59A8D89C1 /* fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */; }; + 1E2AB43075973AE59A8D89C2 /* fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */; }; + 1E4832B42B95308299B767B9 /* jdmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 0890779C662C35889A8C6C2E /* jdmerge.c */; }; + 1E4832B42B95308299B767BA /* jdmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 0890779C662C35889A8C6C2E /* jdmerge.c */; }; + 1EA81A0E8E5A3B38B4D80337 /* srchcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EF103B09F02315282EC8F44 /* srchcmn.cpp */; }; + 1EA81A0E8E5A3B38B4D80338 /* srchcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EF103B09F02315282EC8F44 /* srchcmn.cpp */; }; + 1EDED99760B23A1999E75C12 /* imaglist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */; }; + 1EDED99760B23A1999E75C13 /* imaglist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */; }; + 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */ = {isa = PBXBuildFile; fileRef = F82278F9AF0432529891E6D7 /* tif_close.c */; }; + 1EE845DDFDDE36CA8A218206 /* tif_close.c in Sources */ = {isa = PBXBuildFile; fileRef = F82278F9AF0432529891E6D7 /* tif_close.c */; }; + 1FB1622D59593932B25C55BA /* LexPowerShell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */; }; + 1FB1622D59593932B25C55BB /* LexPowerShell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */; }; + 205520440CD13C0AB9E89159 /* anidecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE959EC7BFDD3A628E856404 /* anidecod.cpp */; }; + 205520440CD13C0AB9E8915A /* anidecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE959EC7BFDD3A628E856404 /* anidecod.cpp */; }; + 20BEEFFA08F3396791596870 /* dlunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA2D9F325F833C408657E7B7 /* dlunix.cpp */; }; + 20BEEFFA08F3396791596871 /* dlunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA2D9F325F833C408657E7B7 /* dlunix.cpp */; }; + 20F10669703137E68318C6FD /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; }; + 20F10669703137E68318C6FE /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; }; + 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; + 2102C23970FB3F22AB46A59B /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; + 221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; }; + 221DC4F6678A3EC5ACDDEA50 /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; }; + 22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; }; + 22AE900003F73134BBEE8BB7 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; }; + 22C76BF2C3E331CD87657E6E /* LexNsis.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1BC0322549563787A21CE8F1 /* LexNsis.cxx */; }; + 22C76BF2C3E331CD87657E6F /* LexNsis.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1BC0322549563787A21CE8F1 /* LexNsis.cxx */; }; + 22EC132AEF863BFBAA6EDEC3 /* LexPowerPro.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */; }; + 22EC132AEF863BFBAA6EDEC4 /* LexPowerPro.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */; }; + 2315C8692C443ED1AE431728 /* tif_extension.c in Sources */ = {isa = PBXBuildFile; fileRef = AF7CE00168AB33C994374ABA /* tif_extension.c */; }; + 2315C8692C443ED1AE431729 /* tif_extension.c in Sources */ = {isa = PBXBuildFile; fileRef = AF7CE00168AB33C994374ABA /* tif_extension.c */; }; + 2386B575BC3931D2AF86CB33 /* fontdlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */; }; + 2386B575BC3931D2AF86CB34 /* fontdlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */; }; + 23965E313EDC3BBE9B2FA1C5 /* imagpng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24396D584D053948A3FF0DCD /* imagpng.cpp */; }; + 23965E313EDC3BBE9B2FA1C6 /* imagpng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24396D584D053948A3FF0DCD /* imagpng.cpp */; }; + 23A7AF68A03E380785EE7C24 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1731D6708BFE3DE7B101CE74 /* object.cpp */; }; + 23A7AF68A03E380785EE7C25 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1731D6708BFE3DE7B101CE74 /* object.cpp */; }; + 241A346E77E131918C6DE9B9 /* colordlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91C415400F0435528B9995B7 /* colordlg.cpp */; }; + 241A346E77E131918C6DE9BA /* colordlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91C415400F0435528B9995B7 /* colordlg.cpp */; }; + 242E1D1A9BF331BA918134EC /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 0964797530CF3FE7B8DB6242 /* pngwtran.c */; }; + 242E1D1A9BF331BA918134ED /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 0964797530CF3FE7B8DB6242 /* pngwtran.c */; }; + 246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */; }; + 246B4FF96BA135258FE45F50 /* encconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */; }; + 2480859662ED399799E120A5 /* pen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA819575B5136B09FA8FEB1 /* pen.cpp */; }; + 2480859662ED399799E120A6 /* pen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA819575B5136B09FA8FEB1 /* pen.cpp */; }; + 249C9177B1A33EFEAB30F93F /* tipwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */; }; + 249C9177B1A33EFEAB30F940 /* tipwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */; }; + 24A5A71C79733E9CB913C5B7 /* LexPB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8744F2C80ECF375999195935 /* LexPB.cxx */; }; + 24A5A71C79733E9CB913C5B8 /* LexPB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8744F2C80ECF375999195935 /* LexPB.cxx */; }; + 2563C775427E3D68BD384F2F /* richtextstyles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D30617843F33310089C1F77A /* richtextstyles.cpp */; }; + 2563C775427E3D68BD384F30 /* richtextstyles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D30617843F33310089C1F77A /* richtextstyles.cpp */; }; + 25656617A56D342AA3D1BFE2 /* ctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */; }; + 25656617A56D342AA3D1BFE3 /* ctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */; }; + 26649553E4763EE6BA268B7D /* xh_gdctl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */; }; + 26649553E4763EE6BA268B7E /* xh_gdctl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */; }; + 268DDC88C99A3A64AB8B2FFA /* LexCaml.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */; }; + 268DDC88C99A3A64AB8B2FFB /* LexCaml.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */; }; + 26BB10834DA1388881BDD1EC /* propgrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B98B72B3A0A73044B85AED60 /* propgrid.cpp */; }; + 26BB10834DA1388881BDD1ED /* propgrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B98B72B3A0A73044B85AED60 /* propgrid.cpp */; }; + 26E4813A97DE323E88119163 /* xh_choicbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */; }; + 26E4813A97DE323E88119164 /* xh_choicbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */; }; + 27759C2FBB0E35FDA847B2B5 /* LexForth.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B181F564935730E89AB00D92 /* LexForth.cxx */; }; + 27759C2FBB0E35FDA847B2B6 /* LexForth.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B181F564935730E89AB00D92 /* LexForth.cxx */; }; + 27E2EABB117334CD89CFD2A4 /* mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B568A7364ECA30288820CCE7 /* mdi.cpp */; }; + 27E2EABB117334CD89CFD2A5 /* mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B568A7364ECA30288820CCE7 /* mdi.cpp */; }; + 27E73CA5C35A30CE89946ECA /* slider_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D215A0D67563350CB4EECB06 /* slider_osx.cpp */; }; + 27E73CA5C35A30CE89946ECB /* slider_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D215A0D67563350CB4EECB06 /* slider_osx.cpp */; }; + 283C3ABE42433244983C27C1 /* stattext_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */; }; + 283C3ABE42433244983C27C2 /* stattext_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */; }; + 287A6D1B6AA030AAB7C057F7 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DF561FCD0C038B79C62B083 /* dialog.cpp */; }; + 287A6D1B6AA030AAB7C057F8 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DF561FCD0C038B79C62B083 /* dialog.cpp */; }; + 28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 72869747E68E37998CB0A07E /* jdhuff.c */; }; + 28ADE8D385A53445A5451F24 /* jdhuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 72869747E68E37998CB0A07E /* jdhuff.c */; }; + 2939CA3680A13E39AB88CB05 /* spinctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */; }; + 2939CA3680A13E39AB88CB06 /* spinctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */; }; + 296692A7A3783E3A83D005C6 /* brush.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 302A13BC64C238A297F4399F /* brush.cpp */; }; + 296692A7A3783E3A83D005C7 /* brush.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 302A13BC64C238A297F4399F /* brush.cpp */; }; + 2989056891153968B372EA14 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 45D7558DF5E03A2EB41883F0 /* pngwutil.c */; }; + 2989056891153968B372EA15 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 45D7558DF5E03A2EB41883F0 /* pngwutil.c */; }; + 2A54BBF33C1E39FE8AF805D6 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB924887605E3CB388F56776 /* utils.cpp */; }; + 2A54BBF33C1E39FE8AF805D7 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB924887605E3CB388F56776 /* utils.cpp */; }; + 2A7640E4210334AC93366900 /* winpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FCA75FE592C3469AE351FBF /* winpars.cpp */; }; + 2A7640E4210334AC93366901 /* winpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FCA75FE592C3469AE351FBF /* winpars.cpp */; }; + 2B13BFC894C63373B7ACFA3D /* xh_hyperlink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */; }; + 2B13BFC894C63373B7ACFA3E /* xh_hyperlink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */; }; + 2C53221A318E37529E6460EB /* tif_fax3sm.c in Sources */ = {isa = PBXBuildFile; fileRef = BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */; }; + 2C53221A318E37529E6460EC /* tif_fax3sm.c in Sources */ = {isa = PBXBuildFile; fileRef = BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */; }; + 2C95DFA8EE463487956B4EB4 /* infobar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */; }; + 2C95DFA8EE463487956B4EB5 /* infobar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */; }; + 2CAD4DF9505F36E4A2EAD53D /* helpdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C466F32CCBD13DBC87285B3D /* helpdata.cpp */; }; + 2CAD4DF9505F36E4A2EAD53E /* helpdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C466F32CCBD13DBC87285B3D /* helpdata.cpp */; }; + 2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */; }; + 2CCC30C0162131DBBE9D8028 /* dobjcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */; }; + 2CD89A08C7ED3D35A0FBD893 /* listctrl_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02A756A2887839B2900F8CAC /* listctrl_mac.cpp */; }; + 2CD89A08C7ED3D35A0FBD894 /* listctrl_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02A756A2887839B2900F8CAC /* listctrl_mac.cpp */; }; + 2D4D105CA9BE3FA6995A5FFF /* tif_dumpmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */; }; + 2D4D105CA9BE3FA6995A6000 /* tif_dumpmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */; }; + 2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1EE17722EA937E88A7F0C01 /* dcbase.cpp */; }; + 2D60F289103837EA8925E3F2 /* dcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1EE17722EA937E88A7F0C01 /* dcbase.cpp */; }; + 2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; }; + 2DF74933A90E34129F1BEF73 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; }; + 2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; }; + 2E4747E0736B30569ACD5423 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; }; + 2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; }; + 2E8440A2BDD53BE7B01547C3 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; }; + 2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */; }; + 2E930206397C3EDCBD8206FD /* gridctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */; }; + 2EECB3C2F9523D0B95847A7F /* accel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C78A1539462370CAA429508 /* accel.cpp */; }; + 2EECB3C2F9523D0B95847A80 /* accel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C78A1539462370CAA429508 /* accel.cpp */; }; + 2F35A207C3993DE08E4FE0B0 /* timerunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */; }; + 2F35A207C3993DE08E4FE0B1 /* timerunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */; }; + 2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 496674699F173A5385EAFF07 /* calctrlg.cpp */; }; + 2F50DBC14FE538A49823925B /* calctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 496674699F173A5385EAFF07 /* calctrlg.cpp */; }; + 2F7F5B9BBCD83D90B237A1A0 /* markupparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA7F7633279936EFA0B9C5CF /* markupparser.cpp */; }; + 2F7F5B9BBCD83D90B237A1A1 /* markupparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA7F7633279936EFA0B9C5CF /* markupparser.cpp */; }; + 2FA1A8FE3644325ABAD273A4 /* fmapbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BBBFE664736D5978420C6 /* fmapbase.cpp */; }; + 2FA1A8FE3644325ABAD273A5 /* fmapbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BBBFE664736D5978420C6 /* fmapbase.cpp */; }; + 2FAE979E6FE23D088C768B7D /* gridcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */; }; + 2FAE979E6FE23D088C768B7E /* gridcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */; }; + 30493B486DFF35AF80D12C49 /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */; }; + 30493B486DFF35AF80D12C4A /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */; }; + 30509A33ED9C35D4ADEF6BBC /* KeyWords.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */; }; + 30509A33ED9C35D4ADEF6BBD /* KeyWords.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */; }; + 309C0A78D45C3AB7B8778B59 /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 5E463A493FD930DE80E58608 /* pngset.c */; }; + 309C0A78D45C3AB7B8778B5A /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 5E463A493FD930DE80E58608 /* pngset.c */; }; + 311840186794346AAAA42091 /* jutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */; }; + 311840186794346AAAA42092 /* jutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */; }; + 31380AD4F5BD38A6B9212FE0 /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7255468B6D5F3D8697994A53 /* LexR.cxx */; }; + 31380AD4F5BD38A6B9212FE1 /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7255468B6D5F3D8697994A53 /* LexR.cxx */; }; + 3141FEDED0943BD6A2EF858F /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA93D41B11683E758D456531 /* log.cpp */; }; + 3141FEDED0943BD6A2EF8590 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA93D41B11683E758D456531 /* log.cpp */; }; + 319EA32592DA3C74B86DDDFF /* wxcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23FC98E2305230E2990471E3 /* wxcrt.cpp */; }; + 319EA32592DA3C74B86DDE00 /* wxcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23FC98E2305230E2990471E3 /* wxcrt.cpp */; }; + 319FB8E64CE731D6A58AD301 /* clntdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C904B4BA8273355869812B2 /* clntdata.cpp */; }; + 319FB8E64CE731D6A58AD302 /* clntdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C904B4BA8273355869812B2 /* clntdata.cpp */; }; + 31DD19A942283FA8810B6382 /* numformatter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */; }; + 31DD19A942283FA8810B6383 /* numformatter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */; }; + 31FEAB56919D372993CAD89C /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = A06AB1974DB93EE2999EC75C /* pngrio.c */; }; + 31FEAB56919D372993CAD89D /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = A06AB1974DB93EE2999EC75C /* pngrio.c */; }; + 32486A808EBC3E088598D51C /* jcprepct.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FE0455EBDC63D82B2D88587 /* jcprepct.c */; }; + 32486A808EBC3E088598D51D /* jcprepct.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FE0455EBDC63D82B2D88587 /* jcprepct.c */; }; + 32FECED7A7633C4D8C1BFBB3 /* toolbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24DF23D67E693D999B875101 /* toolbkg.cpp */; }; + 32FECED7A7633C4D8C1BFBB4 /* toolbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24DF23D67E693D999B875101 /* toolbkg.cpp */; }; + 3357BD0518F538E9A949F886 /* xh_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */; }; + 3357BD0518F538E9A949F887 /* xh_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */; }; + 335DD610974A33D4B6581E2A /* colourdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */; }; + 335DD610974A33D4B6581E2B /* colourdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */; }; + 3399AB7BB1333B5AAF5FAF55 /* wrapsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */; }; + 3399AB7BB1333B5AAF5FAF56 /* wrapsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */; }; + 33B16442F6AF3233BD533108 /* bmpbuttn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA69FCE7B4FA377E98438FE5 /* bmpbuttn.cpp */; }; + 33B16442F6AF3233BD533109 /* bmpbuttn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA69FCE7B4FA377E98438FE5 /* bmpbuttn.cpp */; }; + 33ED014A7FF7398794E6E4CF /* xh_split.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */; }; + 33ED014A7FF7398794E6E4D0 /* xh_split.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */; }; + 346D274E17673A01B0177D5B /* sockunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7661E9E09A397790ED9545 /* sockunix.cpp */; }; + 346D274E17673A01B0177D5C /* sockunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7661E9E09A397790ED9545 /* sockunix.cpp */; }; + 353B584AD0C03919A57A3048 /* affinematrix2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD09A813E10A31C19554B425 /* affinematrix2d.cpp */; }; + 353B584AD0C03919A57A3049 /* affinematrix2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD09A813E10A31C19554B425 /* affinematrix2d.cpp */; }; + 3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */; }; + 3554C88010CE3D2A8970A136 /* sashwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */; }; + 369BCCFF61D13A058D837835 /* LexPerl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */; }; + 369BCCFF61D13A058D837836 /* LexPerl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */; }; + 36B0B923B836358D9DB0AE10 /* xh_panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */; }; + 36B0B923B836358D9DB0AE11 /* xh_panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */; }; + 36DB80FD5B153E9099DB6912 /* imaggif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */; }; + 36DB80FD5B153E9099DB6913 /* imaggif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */; }; + 36EB5D19429D3BD1A01001D5 /* framemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26632A254717372BAA4D514D /* framemanager.cpp */; }; + 36EB5D19429D3BD1A01001D6 /* framemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26632A254717372BAA4D514D /* framemanager.cpp */; }; + 371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36E1DBA275AD325DB759C180 /* fontenum.cpp */; }; + 371809DA4AD1382F8B532879 /* fontenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36E1DBA275AD325DB759C180 /* fontenum.cpp */; }; + 37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */; }; + 37715483D08335B790FFE059 /* filectrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */; }; + 37749AC3468836FC857BD0D5 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; }; + 37749AC3468836FC857BD0D6 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; }; + 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; + 37DD17F479A1371ABF3589BA /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; + 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; + 383A6993E90936D39A5F12BE /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; + 3902517F9ED03648B5A4B96A /* drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39B825E5EAB43D9ABDCEB2CD /* drawer.cpp */; }; + 3902517F9ED03648B5A4B96B /* drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39B825E5EAB43D9ABDCEB2CD /* drawer.cpp */; }; + 39CC380F801F3EE984523275 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; }; + 39CC380F801F3EE984523276 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; }; + 39D6435B10073B85A499AFD8 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */; }; + 39D6435B10073B85A499AFD9 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */; }; + 39FB197CF9EB3D76BE0723CF /* LexBash.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 78D7866F95C73A28BB540606 /* LexBash.cxx */; }; + 39FB197CF9EB3D76BE0723D0 /* LexBash.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 78D7866F95C73A28BB540606 /* LexBash.cxx */; }; + 3ACCC2EB8E973C11835EB597 /* bmpbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */; }; + 3ACCC2EB8E973C11835EB598 /* bmpbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */; }; + 3B7E035ECF3D3FFB9827AC1C /* xh_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06B4A895955B32258DCD62BF /* xh_dlg.cpp */; }; + 3B7E035ECF3D3FFB9827AC1D /* xh_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06B4A895955B32258DCD62BF /* xh_dlg.cpp */; }; + 3B8A54D5E5A53607A6F7979A /* arrstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57CF60203F53459A03951A9 /* arrstr.cpp */; }; + 3B8A54D5E5A53607A6F7979B /* arrstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57CF60203F53459A03951A9 /* arrstr.cpp */; }; + 3C0EB1DDA5243E31B2D92CE2 /* jquant2.c in Sources */ = {isa = PBXBuildFile; fileRef = 02D9332D5C5632E981936E29 /* jquant2.c */; }; + 3C0EB1DDA5243E31B2D92CE3 /* jquant2.c in Sources */ = {isa = PBXBuildFile; fileRef = 02D9332D5C5632E981936E29 /* jquant2.c */; }; + 3C36437B2E933F83984D431E /* imagtiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */; }; + 3C36437B2E933F83984D431F /* imagtiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */; }; + 3C394FBD47B6310C80577E3B /* LexMMIXAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */; }; + 3C394FBD47B6310C80577E3C /* LexMMIXAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */; }; + 3C5E1A45A57B3169A4C073D9 /* LexVerilog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */; }; + 3C5E1A45A57B3169A4C073DA /* LexVerilog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */; }; + 3C92143CC3173F659CE40DC3 /* checkbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19A5AFB993843FF0B8F75E47 /* checkbox.cpp */; }; + 3C92143CC3173F659CE40DC4 /* checkbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19A5AFB993843FF0B8F75E47 /* checkbox.cpp */; }; + 3CDE2B6BF88D326189F069BD /* accelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A436B55DC44E3827A757A6D8 /* accelcmn.cpp */; }; + 3CDE2B6BF88D326189F069BE /* accelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A436B55DC44E3827A757A6D8 /* accelcmn.cpp */; }; + 3D22FC202D903007AEE3D164 /* fdiounix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */; }; + 3D22FC202D903007AEE3D165 /* fdiounix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */; }; + 3D3EA1BAAD1833B1B48E9C86 /* xh_stbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */; }; + 3D3EA1BAAD1833B1B48E9C87 /* xh_stbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */; }; + 3D424F4B33653A00AE9B623A /* m_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 082CA018FB883999839C1DCE /* m_tables.cpp */; }; + 3D424F4B33653A00AE9B623B /* m_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 082CA018FB883999839C1DCE /* m_tables.cpp */; }; + 3D762A0BBF1B39B88A769632 /* helpwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */; }; + 3D762A0BBF1B39B88A769633 /* helpwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */; }; + 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */; }; + 3E6AA08E72A030D39D867D4C /* ScintillaWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */; }; + 3E99016BDE043A08B4D6B3CE /* htmprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 194ADD28300E329E80F7892E /* htmprint.cpp */; }; + 3E99016BDE043A08B4D6B3CF /* htmprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 194ADD28300E329E80F7892E /* htmprint.cpp */; }; + 3EB6B8528A0D3B6CADAE1256 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02D2E8B5C89939CE90B99E2B /* archive.cpp */; }; + 3EB6B8528A0D3B6CADAE1257 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02D2E8B5C89939CE90B99E2B /* archive.cpp */; }; + 3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */; }; + 3ED6F4B64C283232A79423D0 /* dircmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */; }; + 403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7332A03D93D3DABB050615D /* dir.cpp */; }; + 403FBA20CEFE3EAFB4E6B906 /* dir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7332A03D93D3DABB050615D /* dir.cpp */; }; + 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; + 4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; + 41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; + 41943A8F82723027A151A469 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; + 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; + 4269B85FDC5639BEB76A8AEC /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; + 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; + 4279D39CAAF834F6A5B99197 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; + 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; + 427E6AF88CF73D799206E37E /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; + 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; + 42ED9BAFD6E936849F1D36CC /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; + 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; }; + 437519A6002A3A0FB2C9A8FD /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; }; + 438EAEA4B30C325C827F6197 /* xh_fontpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */; }; + 438EAEA4B30C325C827F6198 /* xh_fontpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */; }; + 447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; }; + 447FEC72F3C234378CE28DE8 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; }; + 45AB45C6B24A3983B22E56A5 /* dataobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 271B4B77622B3411A7BF6634 /* dataobj.cpp */; }; + 45AB45C6B24A3983B22E56A6 /* dataobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 271B4B77622B3411A7BF6634 /* dataobj.cpp */; }; + 45D88A74B3EE3837B9F79595 /* LexFlagship.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */; }; + 45D88A74B3EE3837B9F79596 /* LexFlagship.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */; }; + 45FE206BBAD13DDCA1EA41CF /* treebase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BA6ADD758693BD180D3275B /* treebase.cpp */; }; + 45FE206BBAD13DDCA1EA41D0 /* treebase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BA6ADD758693BD180D3275B /* treebase.cpp */; }; + 4657479AF35533AEB7876676 /* helpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBB30516233A39BE809405AA /* helpbase.cpp */; }; + 4657479AF35533AEB7876677 /* helpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBB30516233A39BE809405AA /* helpbase.cpp */; }; + 4657E7382E9E3EDC8DE2401E /* mimetype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C97C1F26B5A38C49543060C /* mimetype.cpp */; }; + 4657E7382E9E3EDC8DE2401F /* mimetype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C97C1F26B5A38C49543060C /* mimetype.cpp */; }; + 4666CDC48BA9301EA283BFFF /* choice_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */; }; + 4666CDC48BA9301EA283C000 /* choice_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */; }; + 46A4CCF128FC3EB092074DC5 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58E1F571B01F34D4AB70CA18 /* property.cpp */; }; + 46A4CCF128FC3EB092074DC6 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58E1F571B01F34D4AB70CA18 /* property.cpp */; }; + 46CE8B53D2663927AAE5DF9D /* xh_treebk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */; }; + 46CE8B53D2663927AAE5DF9E /* xh_treebk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */; }; + 46E331300D8F349DB36AB50A /* imagpnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC12B97F233B3B9494DA217F /* imagpnm.cpp */; }; + 46E331300D8F349DB36AB50B /* imagpnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC12B97F233B3B9494DA217F /* imagpnm.cpp */; }; + 46F341B46F80376B962759F5 /* animateg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 580AFC66F3003582B43043B1 /* animateg.cpp */; }; + 46F341B46F80376B962759F6 /* animateg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 580AFC66F3003582B43043B1 /* animateg.cpp */; }; + 4788F736CD9C324E8A3DFA74 /* LexEScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */; }; + 4788F736CD9C324E8A3DFA75 /* LexEScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */; }; + 47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E24C6F2A04E30EB95598305 /* chm.cpp */; }; + 47EBBB18BDB539C2A948C712 /* chm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E24C6F2A04E30EB95598305 /* chm.cpp */; }; + 47F4FC8717AF3A848812DFCC /* xh_radbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */; }; + 47F4FC8717AF3A848812DFCD /* xh_radbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */; }; + 48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = A0DCC5EF59143640BE13AD73 /* jidctfst.c */; }; + 48A1F28E04603A68A1E70319 /* jidctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = A0DCC5EF59143640BE13AD73 /* jidctfst.c */; }; + 49260580A7F23B569A827D3F /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58421C141C9E31C6A7A3C183 /* filefn.cpp */; }; + 49260580A7F23B569A827D40 /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58421C141C9E31C6A7A3C183 /* filefn.cpp */; }; + 4958BD2E717A3F03AB030188 /* tbarbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F32C01D122301AB00D06A5 /* tbarbase.cpp */; }; + 4958BD2E717A3F03AB030189 /* tbarbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F32C01D122301AB00D06A5 /* tbarbase.cpp */; }; + 49BEDFBC3661339D90EF6935 /* LexTCL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */; }; + 49BEDFBC3661339D90EF6936 /* LexTCL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */; }; + 49C873EE448C3CD9A32012CD /* spinctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */; }; + 49C873EE448C3CD9A32012CE /* spinctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */; }; + 49FE0228D8FD3F7AB64A4432 /* bmpbuttn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */; }; + 49FE0228D8FD3F7AB64A4433 /* bmpbuttn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */; }; + 4AEC67BF65B039D99F421666 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; }; + 4AEC67BF65B039D99F421667 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; }; + 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; + 4B88254FF9963833A276A64D /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; + 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; + 4BAFAE70A6B1313B96D86631 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; + 4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; }; + 4C9BA36123E43589956864C7 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; }; + 4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; }; + 4CB3626391CE34D4B1F71AA1 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; }; + 4CF9BA40653C3153805D88AB /* arcfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C513377E9E303F778BA9D7ED /* arcfind.cpp */; }; + 4CF9BA40653C3153805D88AC /* arcfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C513377E9E303F778BA9D7ED /* arcfind.cpp */; }; + 4CFB7E6E5BD53E2BB39BEF63 /* m_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EB95BCFA255323183A996C9 /* m_style.cpp */; }; + 4CFB7E6E5BD53E2BB39BEF64 /* m_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EB95BCFA255323183A996C9 /* m_style.cpp */; }; + 4D0BA8B9F72C3C31BC170CE2 /* progdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */; }; + 4D0BA8B9F72C3C31BC170CE3 /* progdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */; }; + 4DA209AEF4AD32AAB97F9718 /* htmlcell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E5188DB6003C35A8C7754D /* htmlcell.cpp */; }; + 4DA209AEF4AD32AAB97F9719 /* htmlcell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E5188DB6003C35A8C7754D /* htmlcell.cpp */; }; + 4DD98A9436C83CF3B9425A78 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; }; + 4DD98A9436C83CF3B9425A79 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; }; + 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; + 4E140367282F38C8A904A005 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; + 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; + 4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; + 50D7E093424138C88BB50D27 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; }; + 50D7E093424138C88BB50D28 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; }; + 5116CE330E333724A66982E3 /* rearrangectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */; }; + 5116CE330E333724A66982E4 /* rearrangectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */; }; + 51437DC2AD7B3BEB9A53CE1A /* cmdline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE1C531185131A89EFF7FAF /* cmdline.cpp */; }; + 51437DC2AD7B3BEB9A53CE1B /* cmdline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE1C531185131A89EFF7FAF /* cmdline.cpp */; }; + 51D133EC44F830588FEEAEC0 /* LexHaskell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */; }; + 51D133EC44F830588FEEAEC1 /* LexHaskell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */; }; + 522E6CF2A62F34259BCE2DE2 /* tif_flush.c in Sources */ = {isa = PBXBuildFile; fileRef = 305614D19CF23CB2B14A5B2E /* tif_flush.c */; }; + 522E6CF2A62F34259BCE2DE3 /* tif_flush.c in Sources */ = {isa = PBXBuildFile; fileRef = 305614D19CF23CB2B14A5B2E /* tif_flush.c */; }; + 523FB2A8435A3324A8E1B370 /* PerLine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9389DAF8B91030B7AAB029FF /* PerLine.cxx */; }; + 523FB2A8435A3324A8E1B371 /* PerLine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9389DAF8B91030B7AAB029FF /* PerLine.cxx */; }; + 527054445A0D3A00A5C2EC44 /* tif_thunder.c in Sources */ = {isa = PBXBuildFile; fileRef = 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */; }; + 527054445A0D3A00A5C2EC45 /* tif_thunder.c in Sources */ = {isa = PBXBuildFile; fileRef = 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */; }; + 52C0984A2A4F31BC885519B0 /* xtistrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */; }; + 52C0984A2A4F31BC885519B1 /* xtistrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */; }; + 5388468A6F8F3141B25CD400 /* treebkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7925E38823563BCDB5565DCF /* treebkg.cpp */; }; + 5388468A6F8F3141B25CD401 /* treebkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7925E38823563BCDB5565DCF /* treebkg.cpp */; }; + 539B586AEAD630A79FC12ECF /* sstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F46EC1508C063C8395CE7A95 /* sstream.cpp */; }; + 539B586AEAD630A79FC12ED0 /* sstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F46EC1508C063C8395CE7A95 /* sstream.cpp */; }; + 5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; }; + 5417332FE2DB3CD3A647B15E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; }; + 54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; }; + 54A89D04FF953D55AE8DCCF1 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; }; + 551BF168445E3D7BB54D0174 /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EDB48813110636DBA045BF3A /* LexPS.cxx */; }; + 551BF168445E3D7BB54D0175 /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EDB48813110636DBA045BF3A /* LexPS.cxx */; }; + 552708E6296D33EBB5F6A493 /* tif_swab.c in Sources */ = {isa = PBXBuildFile; fileRef = AAC12B4456E13F57BEA25A5E /* tif_swab.c */; }; + 552708E6296D33EBB5F6A494 /* tif_swab.c in Sources */ = {isa = PBXBuildFile; fileRef = AAC12B4456E13F57BEA25A5E /* tif_swab.c */; }; + 5557AA36FBCC3ED9A5F5751A /* editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D90D14874FD38079835AF0B /* editlbox.cpp */; }; + 5557AA36FBCC3ED9A5F5751B /* editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D90D14874FD38079835AF0B /* editlbox.cpp */; }; + 5568A53DA84E3B498D606506 /* taskbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BACF6FE87AD337729BBB72BD /* taskbar.cpp */; }; + 5568A53DA84E3B498D606507 /* taskbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BACF6FE87AD337729BBB72BD /* taskbar.cpp */; }; + 55D893FDD00633FEA82ABD81 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */; }; + 55D893FDD00633FEA82ABD82 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */; }; + 55E03D705E9C39EFA3EE3E25 /* listbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABA5F3C56C8C37809F696A49 /* listbox.cpp */; }; + 55E03D705E9C39EFA3EE3E26 /* listbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABA5F3C56C8C37809F696A49 /* listbox.cpp */; }; + 55F0D287F60F3EDEA16CCB64 /* stringimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5357E76650035639844D15B /* stringimpl.cpp */; }; + 55F0D287F60F3EDEA16CCB65 /* stringimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5357E76650035639844D15B /* stringimpl.cpp */; }; + 567A32722BA33AEE9FF93D7C /* fs_inet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B7581D7140293BAE88E43DBE /* fs_inet.cpp */; }; + 567A32722BA33AEE9FF93D7D /* fs_inet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B7581D7140293BAE88E43DBE /* fs_inet.cpp */; }; + 570FA90F526E3F25A8E8FCF2 /* tif_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 64B25B87203E3464BCDD277D /* tif_read.c */; }; + 570FA90F526E3F25A8E8FCF3 /* tif_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 64B25B87203E3464BCDD277D /* tif_read.c */; }; + 5792675690843C6AA4125A72 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77F5E7BCD9B2307D8DBCC052 /* font.cpp */; }; + 5792675690843C6AA4125A73 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77F5E7BCD9B2307D8DBCC052 /* font.cpp */; }; + 57AE7FCF768F3965BD39B47A /* m_span.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727F25F832AD32D4B12D8E39 /* m_span.cpp */; }; + 57AE7FCF768F3965BD39B47B /* m_span.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727F25F832AD32D4B12D8E39 /* m_span.cpp */; }; + 57DDBAE7E4413A3C9DCC9EE3 /* srchctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8A72557C5B13F16A59980EF /* srchctrl.cpp */; }; + 57DDBAE7E4413A3C9DCC9EE4 /* srchctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8A72557C5B13F16A59980EF /* srchctrl.cpp */; }; + 595DCB164D55342EB86604EC /* hashmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6636144CDE83E8E85270FAF /* hashmap.cpp */; }; + 595DCB164D55342EB86604ED /* hashmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6636144CDE83E8E85270FAF /* hashmap.cpp */; }; + 59BFB8C8310E37B39AF8B0D4 /* any.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4867546E8B8D3C8683A23ED5 /* any.cpp */; }; + 59BFB8C8310E37B39AF8B0D5 /* any.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4867546E8B8D3C8683A23ED5 /* any.cpp */; }; + 5A8638C234133824BDF93BBF /* gbsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */; }; + 5A8638C234133824BDF93BC0 /* gbsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */; }; + 5AEA6E94FB76371D928D371C /* LexMatlab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC9153A350893820B942D37E /* LexMatlab.cxx */; }; + 5AEA6E94FB76371D928D371D /* LexMatlab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC9153A350893820B942D37E /* LexMatlab.cxx */; }; + 5B5B8DF915D438AA9FCEB39E /* imagall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDFB4D208F37569AC548B0 /* imagall.cpp */; }; + 5B5B8DF915D438AA9FCEB39F /* imagall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDFB4D208F37569AC548B0 /* imagall.cpp */; }; + 5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; }; + 5C3B0ED2EA973DFDBFBCC693 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; }; + 5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; }; + 5C44446AB150378696CD6B3D /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; }; + 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; + 5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; + 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; }; + 5F57C4908E5038D19D68ED7B /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; }; + 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */; }; + 5F6B4F226B473AACB7AC8DF6 /* xh_slidr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */; }; + 5F78DB0417BF3CE1B4E35C7F /* stackwalk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA2520F427493A22A70A5C09 /* stackwalk.cpp */; }; + 5F78DB0417BF3CE1B4E35C80 /* stackwalk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA2520F427493A22A70A5C09 /* stackwalk.cpp */; }; + 5FE969523BDB3353AEF96810 /* xh_filepicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */; }; + 5FE969523BDB3353AEF96811 /* xh_filepicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */; }; + 604ABF86317C3D4F899DBF37 /* richtextsymboldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */; }; + 604ABF86317C3D4F899DBF38 /* richtextsymboldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */; }; + 60706F8836A130A2AF282FE1 /* fontutilcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */; }; + 60706F8836A130A2AF282FE2 /* fontutilcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */; }; + 6138BCBC8E4438FA91E0EF9F /* xh_chckb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */; }; + 6138BCBC8E4438FA91E0EFA0 /* xh_chckb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */; }; + 6167245C417A32179EC37D2D /* textfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0903EE9B3793303285FF96E3 /* textfile.cpp */; }; + 6167245C417A32179EC37D2E /* textfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0903EE9B3793303285FF96E3 /* textfile.cpp */; }; + 61A2B54FD2E33C759CF5A5E8 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 358D0A3AC73F322EA732D020 /* pngrutil.c */; }; + 61A2B54FD2E33C759CF5A5E9 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 358D0A3AC73F322EA732D020 /* pngrutil.c */; }; + 61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E4A10BCD773C84AEC481A1 /* jdmarker.c */; }; + 61C3F7D495FB3E8BA402E4F9 /* jdmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E4A10BCD773C84AEC481A1 /* jdmarker.c */; }; + 61FD5E0E28F732E8AB1729F8 /* xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6AB648BC5173104A96CAE66 /* xml.cpp */; }; + 61FD5E0E28F732E8AB1729F9 /* xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6AB648BC5173104A96CAE66 /* xml.cpp */; }; + 61FEDBF2D47A3B4E861F8296 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACC8667173D3AB09F6214F4 /* sound.cpp */; }; + 61FEDBF2D47A3B4E861F8297 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACC8667173D3AB09F6214F4 /* sound.cpp */; }; + 62757F24C4EE3B84B6AE3F14 /* textdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D529E2668C23D94A7706C8A /* textdlgg.cpp */; }; + 62757F24C4EE3B84B6AE3F15 /* textdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D529E2668C23D94A7706C8A /* textdlgg.cpp */; }; + 62F1DC80D631335B892610A8 /* splitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C125FA3837C631A9BE0ED5E7 /* splitter.cpp */; }; + 62F1DC80D631335B892610A9 /* splitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C125FA3837C631A9BE0ED5E7 /* splitter.cpp */; }; + 633DD2E870263F42A8DBF9BF /* markuptext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */; }; + 633DD2E870263F42A8DBF9C0 /* markuptext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */; }; + 63C8D23DD8AB32FE906B669B /* gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BFAF243431D3CA2AA51ADF2 /* gauge.cpp */; }; + 63C8D23DD8AB32FE906B669C /* gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BFAF243431D3CA2AA51ADF2 /* gauge.cpp */; }; + 63F0C8EEDF4B3641878A8B4D /* dlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9051902662BE38B3912B34EA /* dlgcmn.cpp */; }; + 63F0C8EEDF4B3641878A8B4E /* dlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9051902662BE38B3912B34EA /* dlgcmn.cpp */; }; + 63F2517EC6B2334CA825A6F9 /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEB08798C70E33DDB360E563 /* layout.cpp */; }; + 63F2517EC6B2334CA825A6FA /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEB08798C70E33DDB360E563 /* layout.cpp */; }; + 64DD406C453D39FEBBE66ED1 /* tif_pixarlog.c in Sources */ = {isa = PBXBuildFile; fileRef = 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */; }; + 64DD406C453D39FEBBE66ED2 /* tif_pixarlog.c in Sources */ = {isa = PBXBuildFile; fileRef = 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */; }; + 64F11C549E3035DF85691060 /* tif_ojpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */; }; + 64F11C549E3035DF85691061 /* tif_ojpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */; }; + 652CFDD9A1C1366E99B5D6BC /* socketiohandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */; }; + 652CFDD9A1C1366E99B5D6BD /* socketiohandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */; }; + 65514CD6A9F23ED98436AC02 /* ftp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB4781DF8C432C688F30CDD /* ftp.cpp */; }; + 65514CD6A9F23ED98436AC03 /* ftp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB4781DF8C432C688F30CDD /* ftp.cpp */; }; + 65E8A5F333D7336C816F0D0C /* variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31F4B9B03D52339B8F82C114 /* variant.cpp */; }; + 65E8A5F333D7336C816F0D0D /* variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31F4B9B03D52339B8F82C114 /* variant.cpp */; }; + 65FCDBFFF3F138A3ABBAA650 /* xh_menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */; }; + 65FCDBFFF3F138A3ABBAA651 /* xh_menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */; }; + 664A54F914443110B7BB6928 /* tglbtn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */; }; + 664A54F914443110B7BB6929 /* tglbtn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */; }; + 66584BC871303041BA622DE0 /* m_fonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1F3C70512D93501B0478F3E /* m_fonts.cpp */; }; + 66584BC871303041BA622DE1 /* m_fonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1F3C70512D93501B0478F3E /* m_fonts.cpp */; }; + 66ED6552F94F3770BB934E2F /* statlmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4148D62D50863214B8479E60 /* statlmac.cpp */; }; + 66ED6552F94F3770BB934E30 /* statlmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4148D62D50863214B8479E60 /* statlmac.cpp */; }; + 66FD099CE5A338C18329FC36 /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD72950967F33809931D4968 /* LexAbaqus.cxx */; }; + 66FD099CE5A338C18329FC37 /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD72950967F33809931D4968 /* LexAbaqus.cxx */; }; + 67EBCE5FA5FF36349ADF0916 /* jdapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */; }; + 67EBCE5FA5FF36349ADF0917 /* jdapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */; }; + 682403FBBD4E3D5E88159501 /* CellBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */; }; + 682403FBBD4E3D5E88159502 /* CellBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */; }; + 6832385DDBB33D1B90C73CBA /* renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */; }; + 6832385DDBB33D1B90C73CBB /* renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */; }; + 68AC8860B0943C1FAF76D96B /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552757A901E732CAA8E3F16D /* list.cpp */; }; + 68AC8860B0943C1FAF76D96C /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552757A901E732CAA8E3F16D /* list.cpp */; }; + 692FCCABFB963696AFC1E122 /* gdiobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */; }; + 692FCCABFB963696AFC1E123 /* gdiobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */; }; + 6944AC98F6F83E3D983DABD3 /* tif_getimage.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */; }; + 6944AC98F6F83E3D983DABD4 /* tif_getimage.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */; }; + 6978D7A20DA93A329DDD1383 /* socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CE02524DD4385AB2C3DF95 /* socket.cpp */; }; + 6978D7A20DA93A329DDD1384 /* socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CE02524DD4385AB2C3DF95 /* socket.cpp */; }; + 699D88EE2DAA3594B6606890 /* ViewStyle.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C133B838193A35ABBB803151 /* ViewStyle.cxx */; }; + 699D88EE2DAA3594B6606891 /* ViewStyle.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C133B838193A35ABBB803151 /* ViewStyle.cxx */; }; + 69A19836B4DC39918A74B12C /* spinbutt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A05AEAB07C613BE2A0357BD8 /* spinbutt.cpp */; }; + 69A19836B4DC39918A74B12D /* spinbutt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A05AEAB07C613BE2A0357BD8 /* spinbutt.cpp */; }; + 6A032420671B375D81273714 /* valnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 684D92E552BE313CBE0A88AA /* valnum.cpp */; }; + 6A032420671B375D81273715 /* valnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 684D92E552BE313CBE0A88AA /* valnum.cpp */; }; + 6A081BF19747385CB4C1877F /* radiobut_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */; }; + 6A081BF19747385CB4C18780 /* radiobut_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */; }; + 6A10511265493FA2BB79CE4D /* propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC93D1DE277395592610085 /* propdlg.cpp */; }; + 6A10511265493FA2BB79CE4E /* propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC93D1DE277395592610085 /* propdlg.cpp */; }; + 6AA0EE765330326380989FD1 /* stopwatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */; }; + 6AA0EE765330326380989FD2 /* stopwatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */; }; + 6AC347D2DCC730149A0A83D8 /* button_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF4F4F5211933057824B5621 /* button_osx.cpp */; }; + 6AC347D2DCC730149A0A83D9 /* button_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF4F4F5211933057824B5621 /* button_osx.cpp */; }; + 6B9EEA3CF2E536E3B1ADAC42 /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBED392D081335FA80523244 /* manager.cpp */; }; + 6B9EEA3CF2E536E3B1ADAC43 /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBED392D081335FA80523244 /* manager.cpp */; }; + 6BC8B3EDB3AE3EF4BACFC08A /* ContractionState.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5219A792C6A736F193D4A82F /* ContractionState.cxx */; }; + 6BC8B3EDB3AE3EF4BACFC08B /* ContractionState.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5219A792C6A736F193D4A82F /* ContractionState.cxx */; }; + 6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1197B997B1D139C5AE4D198A /* dseldlg.cpp */; }; + 6BF19C7CA9E93D989C210FE4 /* dseldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1197B997B1D139C5AE4D198A /* dseldlg.cpp */; }; + 6C46AF0370793AA0B74A5A4A /* tabmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */; }; + 6C46AF0370793AA0B74A5A4B /* tabmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */; }; + 6C7C1CC506CB329FB2D086A9 /* LexBasic.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */; }; + 6C7C1CC506CB329FB2D086AA /* LexBasic.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */; }; + 6C822F7F313734DCB51F44B9 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81A30C745CA73E30B788B408 /* image.cpp */; }; + 6C822F7F313734DCB51F44BA /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81A30C745CA73E30B788B408 /* image.cpp */; }; + 6CA1BAEBBDB4336E9E201F95 /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */; }; + 6CA1BAEBBDB4336E9E201F96 /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */; }; + 6D073876E1753549B5EEFDDA /* tif_compress.c in Sources */ = {isa = PBXBuildFile; fileRef = CA0D5D47D62A3148BA51B31B /* tif_compress.c */; }; + 6D073876E1753549B5EEFDDB /* tif_compress.c in Sources */ = {isa = PBXBuildFile; fileRef = CA0D5D47D62A3148BA51B31B /* tif_compress.c */; }; + 6D723C987BFB39B7B887DCB1 /* Editor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DA5E95D498C53A808A8E2EEB /* Editor.cxx */; }; + 6D723C987BFB39B7B887DCB2 /* Editor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DA5E95D498C53A808A8E2EEB /* Editor.cxx */; }; + 6E2C2E8AA1713ADE9C338379 /* tif_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 726C0457DF1232C793918DC1 /* tif_zip.c */; }; + 6E2C2E8AA1713ADE9C33837A /* tif_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 726C0457DF1232C793918DC1 /* tif_zip.c */; }; + 6E68759BC2E63CA59C12FDC0 /* popupcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D922063B2F2536629EEEAAF0 /* popupcmn.cpp */; }; + 6E68759BC2E63CA59C12FDC1 /* popupcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D922063B2F2536629EEEAAF0 /* popupcmn.cpp */; }; + 6EC32E5F03DF3EC9852474DF /* statbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32B2BC8A91983DDA9CC46793 /* statbox.cpp */; }; + 6EC32E5F03DF3EC9852474E0 /* statbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32B2BC8A91983DDA9CC46793 /* statbox.cpp */; }; + 6F0605F3A4E83BF0BF4C8B7E /* cmdproc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */; }; + 6F0605F3A4E83BF0BF4C8B7F /* cmdproc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */; }; + 6F472413FFA03B53B395BB74 /* LexCLW.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7EE2459D69BA35838C274488 /* LexCLW.cxx */; }; + 6F472413FFA03B53B395BB75 /* LexCLW.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7EE2459D69BA35838C274488 /* LexCLW.cxx */; }; + 6F5A0D3C7763334396A3783D /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */; }; + 6F5A0D3C7763334396A3783E /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */; }; + 6F8129E317EE3486A89D8548 /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */; }; + 6F8129E317EE3486A89D8549 /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */; }; + 6FA47EAACE613B039B6EC261 /* containr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3645350F572364BABF50238 /* containr.cpp */; }; + 6FA47EAACE613B039B6EC262 /* containr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3645350F572364BABF50238 /* containr.cpp */; }; + 700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; }; + 700BBDECBE313E108BA99ABE /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; }; + 70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; }; + 70F898F8B129380BBECAC55A /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; }; + 7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F43AF44465B335479752116D /* xh_radbx.cpp */; }; + 7181709A030D3749AB355B75 /* xh_radbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F43AF44465B335479752116D /* xh_radbx.cpp */; }; + 71CCB06E790C3C54BFF1199D /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */; }; + 71CCB06E790C3C54BFF1199E /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */; }; + 729091CC33C73C989B4E0719 /* timerimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0401B7302088357BB6B7F16F /* timerimpl.cpp */; }; + 729091CC33C73C989B4E071A /* timerimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0401B7302088357BB6B7F16F /* timerimpl.cpp */; }; + 72AD4417FF7C3094BB1FF62C /* xh_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B77251C0E0382D9A8E113D /* xh_grid.cpp */; }; + 72AD4417FF7C3094BB1FF62D /* xh_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B77251C0E0382D9A8E113D /* xh_grid.cpp */; }; + 73AA68AB9F1236ED9F1FBB2E /* metafile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2BB2949CC0B387AB6879539 /* metafile.cpp */; }; + 73AA68AB9F1236ED9F1FBB2F /* metafile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2BB2949CC0B387AB6879539 /* metafile.cpp */; }; + 743BB23211B336A6A0F26E57 /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = F83172EE2DAE352FB969D4F2 /* jcapistd.c */; }; + 743BB23211B336A6A0F26E58 /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = F83172EE2DAE352FB969D4F2 /* jcapistd.c */; }; + 745C39E90E8C3C08A887B51C /* msgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */; }; + 745C39E90E8C3C08A887B51D /* msgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */; }; + 7569F0BC3C603EB19168088F /* collpaneg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84758329F2163F00A9C005DF /* collpaneg.cpp */; }; + 7569F0BC3C603EB191680890 /* collpaneg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84758329F2163F00A9C005DF /* collpaneg.cpp */; }; + 758629DA468A3EF7B1C15241 /* gifdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */; }; + 758629DA468A3EF7B1C15242 /* gifdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */; }; + 75DCE6FF00E93C5D93970842 /* arttango.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9988CBB0772A3539970162FA /* arttango.cpp */; }; + 75DCE6FF00E93C5D93970843 /* arttango.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9988CBB0772A3539970162FA /* arttango.cpp */; }; + 760C729E41D93CC1AA2B4E0D /* hyperlinkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */; }; + 760C729E41D93CC1AA2B4E0E /* hyperlinkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */; }; + 7625D908B2CD34C78243BA8F /* settcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */; }; + 7625D908B2CD34C78243BA90 /* settcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */; }; + 768716016CE7310BB1AD7567 /* regexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 1482A34AC32133E4BE207223 /* regexec.c */; }; + 768716016CE7310BB1AD7568 /* regexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 1482A34AC32133E4BE207223 /* regexec.c */; }; + 76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */ = {isa = PBXBuildFile; fileRef = 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */; }; + 76A83A293C9F33BCB7DFDE27 /* jdatadst.c in Sources */ = {isa = PBXBuildFile; fileRef = 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */; }; + 76D1A1A49CC831FFB9EBB1F5 /* LexOpal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */; }; + 76D1A1A49CC831FFB9EBB1F6 /* LexOpal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */; }; + 774A6D1CA57235AD9ECD5D14 /* nonownedwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B1DB08E37B3EB193FEFE0C /* nonownedwnd.cpp */; }; + 774A6D1CA57235AD9ECD5D15 /* nonownedwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B1DB08E37B3EB193FEFE0C /* nonownedwnd.cpp */; }; + 774A89998E09308CBFB03EE0 /* imagxpm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C85865D28DC31649440A921 /* imagxpm.cpp */; }; + 774A89998E09308CBFB03EE1 /* imagxpm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C85865D28DC31649440A921 /* imagxpm.cpp */; }; + 774EB9F3F7E93A379E1F7551 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4762898E5330C28651EE73 /* graphics.cpp */; }; + 774EB9F3F7E93A379E1F7552 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4762898E5330C28651EE73 /* graphics.cpp */; }; + 77764368190938E6A4000AE1 /* stattext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3A28411B852734BDA2C04165 /* stattext.cpp */; }; + 77764368190938E6A4000AE2 /* stattext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3A28411B852734BDA2C04165 /* stattext.cpp */; }; + 779D3480141B3683A6D132BE /* tif_lzw.c in Sources */ = {isa = PBXBuildFile; fileRef = 346C68F0CCD23823B78267F0 /* tif_lzw.c */; }; + 779D3480141B3683A6D132BF /* tif_lzw.c in Sources */ = {isa = PBXBuildFile; fileRef = 346C68F0CCD23823B78267F0 /* tif_lzw.c */; }; + 77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */; }; + 77BC918AF05C30E8A0BD27F9 /* tipdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */; }; + 784F7C50882F320FA76537B5 /* LexAU3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C76222F466E831F896A89269 /* LexAU3.cxx */; }; + 784F7C50882F320FA76537B6 /* LexAU3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C76222F466E831F896A89269 /* LexAU3.cxx */; }; + 78E15D8200F635529F396099 /* LexBullant.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 6718204F4700318E89EAC906 /* LexBullant.cxx */; }; + 78E15D8200F635529F39609A /* LexBullant.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 6718204F4700318E89EAC906 /* LexBullant.cxx */; }; + 793F542F20AB31F6AF736795 /* tif_open.c in Sources */ = {isa = PBXBuildFile; fileRef = 1731A6096BFC3A468AB4755A /* tif_open.c */; }; + 793F542F20AB31F6AF736796 /* tif_open.c in Sources */ = {isa = PBXBuildFile; fileRef = 1731A6096BFC3A468AB4755A /* tif_open.c */; }; + 795613831EC8332A83FF26E7 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7E99B35A98D30818120B002 /* string.cpp */; }; + 795613831EC8332A83FF26E8 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7E99B35A98D30818120B002 /* string.cpp */; }; + 795B9B15279D36F8899C9CA8 /* PropSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */; }; + 795B9B15279D36F8899C9CA9 /* PropSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */; }; + 796311E398FF313C84218824 /* uiactioncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */; }; + 796311E398FF313C84218825 /* uiactioncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */; }; + 7A3976A4AF7836048B31F7DE /* msgdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABCA89FC1E76356797A2AF2B /* msgdlg.cpp */; }; + 7A3976A4AF7836048B31F7DF /* msgdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABCA89FC1E76356797A2AF2B /* msgdlg.cpp */; }; + 7A7439BE66AA3771B4A89048 /* regex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB46BC22F6B23909A938C561 /* regex.cpp */; }; + 7A7439BE66AA3771B4A89049 /* regex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB46BC22F6B23909A938C561 /* regex.cpp */; }; + 7A79D9AC608E3B8287229174 /* tif_warning.c in Sources */ = {isa = PBXBuildFile; fileRef = C83C97A1FCC5345896C9D7DE /* tif_warning.c */; }; + 7A79D9AC608E3B8287229175 /* tif_warning.c in Sources */ = {isa = PBXBuildFile; fileRef = C83C97A1FCC5345896C9D7DE /* tif_warning.c */; }; + 7A84B9471A3238B4B66B1776 /* nbkbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B901252876603DCEA4C66D89 /* nbkbase.cpp */; }; + 7A84B9471A3238B4B66B1777 /* nbkbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B901252876603DCEA4C66D89 /* nbkbase.cpp */; }; + 7B372FEA276438C186F7E340 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */; }; + 7B372FEA276438C186F7E341 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */; }; + 7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */; }; + 7B4DA2F5F25B3E188CBAFE39 /* hyperlnkcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */; }; + 7B642B17F5D23F4F8ED38BB4 /* graphcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB59DD194923D6399087A75 /* graphcmn.cpp */; }; + 7B642B17F5D23F4F8ED38BB5 /* graphcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB59DD194923D6399087A75 /* graphcmn.cpp */; }; + 7C20B79175D33852A2E9DE83 /* LexRuby.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8734C52C7559310784396455 /* LexRuby.cxx */; }; + 7C20B79175D33852A2E9DE84 /* LexRuby.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8734C52C7559310784396455 /* LexRuby.cxx */; }; + 7C52E7CC12463941B0E4D402 /* statbmpcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */; }; + 7C52E7CC12463941B0E4D403 /* statbmpcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */; }; + 7C87CC7641033D91823ED688 /* helpfrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */; }; + 7C87CC7641033D91823ED689 /* helpfrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */; }; + 7C9EAFF4A0223EE597E0E39E /* xh_srchctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */; }; + 7C9EAFF4A0223EE597E0E39F /* xh_srchctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */; }; + 7D0E549020D33ED39751DFC8 /* LexTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */; }; + 7D0E549020D33ED39751DFC9 /* LexTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */; }; + 7D615329368D32709CEF4B58 /* headerctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7273A7E255323EB3B391D997 /* headerctrlg.cpp */; }; + 7D615329368D32709CEF4B59 /* headerctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7273A7E255323EB3B391D997 /* headerctrlg.cpp */; }; + 7DC4A542372437ECA0790F87 /* art_msw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B540E18F9C91381CA175BABB /* art_msw.cpp */; }; + 7DC4A542372437ECA0790F88 /* art_msw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B540E18F9C91381CA175BABB /* art_msw.cpp */; }; + 7E6C627A325F32FFB2EF9B9E /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; }; + 7E6C627A325F32FFB2EF9B9F /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; }; + 7ECC6EE6D5273F75BB6B7B74 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; }; + 7ECC6EE6D5273F75BB6B7B75 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; }; + 7EF89F935314301381802FAB /* filectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2334539088B036BEAB230D1C /* filectrlg.cpp */; }; + 7EF89F935314301381802FAC /* filectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2334539088B036BEAB230D1C /* filectrlg.cpp */; }; + 7F77E347E1243D77A666FB43 /* clipbrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */; }; + 7F77E347E1243D77A666FB44 /* clipbrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */; }; + 7FC3D17B3C853FE58841002D /* timercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7195E665E0F233839B967FC9 /* timercmn.cpp */; }; + 7FC3D17B3C853FE58841002E /* timercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7195E665E0F233839B967FC9 /* timercmn.cpp */; }; + 805CCAE64D023561AD334B53 /* popupwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530DC2E26BF2313E8702AD43 /* popupwin.cpp */; }; + 805CCAE64D023561AD334B54 /* popupwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530DC2E26BF2313E8702AD43 /* popupwin.cpp */; }; + 80665EEAE8613DF8A93A7984 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; }; + 80665EEAE8613DF8A93A7985 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; }; + 80C6D10D9A6F300995396960 /* tooltip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D90D0FA35833140A3CCCD94 /* tooltip.cpp */; }; + 80C6D10D9A6F300995396961 /* tooltip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D90D0FA35833140A3CCCD94 /* tooltip.cpp */; }; + 81B742D64BEB373DB705947A /* m_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4028ABB08C63AB59F5F240B /* m_list.cpp */; }; + 81B742D64BEB373DB705947B /* m_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4028ABB08C63AB59F5F240B /* m_list.cpp */; }; + 825EAD51920B387DB4F8C426 /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A46D50BEBF523B3F88831086 /* LexAsn1.cxx */; }; + 825EAD51920B387DB4F8C427 /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A46D50BEBF523B3F88831086 /* LexAsn1.cxx */; }; + 8292D346BFC33D6E8D3CDDBF /* xh_sttxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */; }; + 8292D346BFC33D6E8D3CDDC0 /* xh_sttxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */; }; + 82FA4AA043213728AC266700 /* wizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */; }; + 82FA4AA043213728AC266701 /* wizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */; }; + 834F2ADD0520313FBAC4F927 /* LexCsound.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */; }; + 834F2ADD0520313FBAC4F928 /* LexCsound.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */; }; + 83616D33080E3F0F9FA5FBB4 /* xh_html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889FFA9573A835F280A21CB4 /* xh_html.cpp */; }; + 83616D33080E3F0F9FA5FBB5 /* xh_html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889FFA9573A835F280A21CB4 /* xh_html.cpp */; }; + 83C492B87F4A3A97930F227A /* ExternalLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */; }; + 83C492B87F4A3A97930F227B /* ExternalLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */; }; + 84382E5DB3203A73AC5EE390 /* xh_combo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F0905A1EBD653F6D82395602 /* xh_combo.cpp */; }; + 84382E5DB3203A73AC5EE391 /* xh_combo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F0905A1EBD653F6D82395602 /* xh_combo.cpp */; }; + 84997126352137E798CD258A /* spinctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59572A234F0636D78BFD9F6B /* spinctlg.cpp */; }; + 84997126352137E798CD258B /* spinctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59572A234F0636D78BFD9F6B /* spinctlg.cpp */; }; + 84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */; }; + 84B3625464F732C3A79E1315 /* xh_bmpbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */; }; + 85F9828B80B03178A274BD17 /* selstore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ED2105A5A033E3384EBC4ED /* selstore.cpp */; }; + 85F9828B80B03178A274BD18 /* selstore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ED2105A5A033E3384EBC4ED /* selstore.cpp */; }; + 86003C8EB906304F9025F788 /* jcinit.c in Sources */ = {isa = PBXBuildFile; fileRef = AA6C6739C3BD3EFA9CF71102 /* jcinit.c */; }; + 86003C8EB906304F9025F789 /* jcinit.c in Sources */ = {isa = PBXBuildFile; fileRef = AA6C6739C3BD3EFA9CF71102 /* jcinit.c */; }; + 867F5D1962383C98A8ADDC3D /* xmladv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1E1A01885B036C28EBDAE27 /* xmladv.cpp */; }; + 867F5D1962383C98A8ADDC3E /* xmladv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1E1A01885B036C28EBDAE27 /* xmladv.cpp */; }; + 86AED49CEAFC3637B1F10537 /* dialog_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */; }; + 86AED49CEAFC3637B1F10538 /* dialog_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */; }; + 86BE5213D3F131D8A6862679 /* hid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 160EB9744CB63A0B81DC651F /* hid.cpp */; }; + 86BE5213D3F131D8A686267A /* hid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 160EB9744CB63A0B81DC651F /* hid.cpp */; }; + 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */; }; + 87092C0C817D343DAB77E23F /* xh_scwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */; }; + 87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5F11A3646F397BA62EB037 /* htmllbox.cpp */; }; + 87AA9C5D887B3C31A2AFB49E /* htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5F11A3646F397BA62EB037 /* htmllbox.cpp */; }; + 87C67583D36C3465ACD64103 /* vlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA90128E29A03CCCA30F4D35 /* vlbox.cpp */; }; + 87C67583D36C3465ACD64104 /* vlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA90128E29A03CCCA30F4D35 /* vlbox.cpp */; }; + 88A43B1C5A7438838DE97B94 /* tif_luv.c in Sources */ = {isa = PBXBuildFile; fileRef = 66FDA882451239EA8DF2E0B5 /* tif_luv.c */; }; + 88A43B1C5A7438838DE97B95 /* tif_luv.c in Sources */ = {isa = PBXBuildFile; fileRef = 66FDA882451239EA8DF2E0B5 /* tif_luv.c */; }; + 88E1AE56FD393C8BA5CF8545 /* stringops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F1E724EA70AB35DDB130F84F /* stringops.cpp */; }; + 88E1AE56FD393C8BA5CF8546 /* stringops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F1E724EA70AB35DDB130F84F /* stringops.cpp */; }; + 89046455F49D3D75A21C9DB8 /* imagfill.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 137E01C362E134449BF966ED /* imagfill.cpp */; }; + 89046455F49D3D75A21C9DB9 /* imagfill.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 137E01C362E134449BF966ED /* imagfill.cpp */; }; + 894D43C8F224394FB3171F26 /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */; }; + 894D43C8F224394FB3171F27 /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */; }; + 8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */; }; + 8966F77CC97B3ED780C8F138 /* xh_bmpcbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */; }; + 8A4046BD38873D9CAC9C2B59 /* filesys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F263022F3FEA3F75895B644D /* filesys.cpp */; }; + 8A4046BD38873D9CAC9C2B5A /* filesys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F263022F3FEA3F75895B644D /* filesys.cpp */; }; + 8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */; }; + 8A662992FFCB32E99D11950D /* commandlinkbuttong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */; }; + 8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8836E29C5A370E80CE070E /* splash.cpp */; }; + 8AA341CCFB8E3F6AB3523596 /* splash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8836E29C5A370E80CE070E /* splash.cpp */; }; + 8AB7191F7CB838FC8337C48D /* xh_statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADE850169F7347F83FE1499 /* xh_statbar.cpp */; }; + 8AB7191F7CB838FC8337C48E /* xh_statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADE850169F7347F83FE1499 /* xh_statbar.cpp */; }; + 8B38C6C416BA3A51B37F60C4 /* statlinecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */; }; + 8B38C6C416BA3A51B37F60C5 /* statlinecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */; }; + 8B60964DA1DF3F3DB40BE123 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; }; + 8B60964DA1DF3F3DB40BE124 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; }; + 8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; }; + 8B9C9FCB954F3596A4CED9A6 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; }; + 8E220BCD39B336A495E775BD /* aboutdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBF01162E86737818F704DBE /* aboutdlg.cpp */; }; + 8E220BCD39B336A495E775BE /* aboutdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBF01162E86737818F704DBE /* aboutdlg.cpp */; }; + 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; + 8E674574343A3C009B1BCD01 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; + 8FB5FBC5730C33F1A3D85D9F /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */; }; + 8FB5FBC5730C33F1A3D85DA0 /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */; }; + 8FC1C07FEE793897A1E96D23 /* statbmpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA2119A7C67D37B290C17989 /* statbmpg.cpp */; }; + 8FC1C07FEE793897A1E96D24 /* statbmpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA2119A7C67D37B290C17989 /* statbmpg.cpp */; }; + 8FDC800D873F30E282691832 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 87799D3168B43EB7B5686826 /* pngrtran.c */; }; + 8FDC800D873F30E282691833 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 87799D3168B43EB7B5686826 /* pngrtran.c */; }; + 901F659891613419B8643952 /* calctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */; }; + 901F659891613419B8643953 /* calctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */; }; + 9058997222493A7A859A4D4C /* richtextxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C69E48C06BD23C178F650E42 /* richtextxml.cpp */; }; + 9058997222493A7A859A4D4D /* richtextxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C69E48C06BD23C178F650E42 /* richtextxml.cpp */; }; + 9065A4BE3D0433B88CF45571 /* richtextbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */; }; + 9065A4BE3D0433B88CF45572 /* richtextbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */; }; + 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47FF6D792CA234C395692118 /* PlatWX.cpp */; }; + 908957F65B7E36F8BF3858DE /* PlatWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47FF6D792CA234C395692118 /* PlatWX.cpp */; }; + 90AB8293DB663C508BAEF655 /* textctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F97C7436BF3B3BBEB423550D /* textctrl.cpp */; }; + 90AB8293DB663C508BAEF656 /* textctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F97C7436BF3B3BBEB423550D /* textctrl.cpp */; }; + 90BC965B1A1F35A3B2C9D1C9 /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BF1C44D726E63B18A98006EC /* Decoration.cxx */; }; + 90BC965B1A1F35A3B2C9D1CA /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BF1C44D726E63B18A98006EC /* Decoration.cxx */; }; + 9110ACFC3CFB3C7994E907B0 /* imagiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4A745D1821A32D591D76650 /* imagiff.cpp */; }; + 9110ACFC3CFB3C7994E907B1 /* imagiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4A745D1821A32D591D76650 /* imagiff.cpp */; }; + 912C69ADB1673ACEB0E6CF08 /* tif_strip.c in Sources */ = {isa = PBXBuildFile; fileRef = B83EDE2D1731311ABDE62F9F /* tif_strip.c */; }; + 912C69ADB1673ACEB0E6CF09 /* tif_strip.c in Sources */ = {isa = PBXBuildFile; fileRef = B83EDE2D1731311ABDE62F9F /* tif_strip.c */; }; + 91BC7802C15337CDA84C3742 /* statline_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */; }; + 91BC7802C15337CDA84C3743 /* statline_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */; }; + 91BDA5B04CF33C9AB7358B8A /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F098E47EBF34368ABAE7ED /* timer.cpp */; }; + 91BDA5B04CF33C9AB7358B8B /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F098E47EBF34368ABAE7ED /* timer.cpp */; }; + 91EA325FCE3A3A6A8D1D21A5 /* srchctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */; }; + 91EA325FCE3A3A6A8D1D21A6 /* srchctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */; }; + 923F4797A73A3BDD87BBD1E1 /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AF3DF03795153E039B8F1F87 /* LineMarker.cxx */; }; + 923F4797A73A3BDD87BBD1E2 /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AF3DF03795153E039B8F1F87 /* LineMarker.cxx */; }; + 939E53CA56F33194B4681117 /* glgrab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */; }; + 939E53CA56F33194B4681118 /* glgrab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */; }; + 93E04642049537EB8A37BA26 /* htmlwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */; }; + 93E04642049537EB8A37BA27 /* htmlwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */; }; + 94389E029E27343EB69C8B79 /* mediactrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D03731D60A063988AF6AE70F /* mediactrl.cpp */; }; + 94389E029E27343EB69C8B7A /* mediactrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D03731D60A063988AF6AE70F /* mediactrl.cpp */; }; + 9455B49669853E71BD4FD965 /* richtextformatdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */; }; + 9455B49669853E71BD4FD966 /* richtextformatdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */; }; + 94B1C88076793400810FAC30 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = AF26BAB1F4733114926F1724 /* png.c */; }; + 94B1C88076793400810FAC31 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = AF26BAB1F4733114926F1724 /* png.c */; }; + 94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */; }; + 94E510619F433AE3AC884756 /* xh_bmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */; }; + 9513691C6A943A41B4184643 /* uma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6DFFB06606F3D2E953CFC96 /* uma.cpp */; }; + 9513691C6A943A41B4184644 /* uma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6DFFB06606F3D2E953CFC96 /* uma.cpp */; }; + 955D2199F1893D37BA2D7478 /* laywin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3784C240C2F330683494926 /* laywin.cpp */; }; + 955D2199F1893D37BA2D7479 /* laywin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3784C240C2F330683494926 /* laywin.cpp */; }; + 9564A6968D66325DAEADEBA3 /* dcgraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */; }; + 9564A6968D66325DAEADEBA4 /* dcgraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */; }; + 95826E8528CC32D8934C36EC /* xh_frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */; }; + 95826E8528CC32D8934C36ED /* xh_frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */; }; + 95AD56D602CF3C5085602AF8 /* geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC0A61629E635FAB4E09505 /* geometry.cpp */; }; + 95AD56D602CF3C5085602AF9 /* geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC0A61629E635FAB4E09505 /* geometry.cpp */; }; + 9678C2B19D293818AA8E9E0D /* LexSpice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4592464D4868329897F3864D /* LexSpice.cxx */; }; + 9678C2B19D293818AA8E9E0E /* LexSpice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4592464D4868329897F3864D /* LexSpice.cxx */; }; + 96927C5A21FD3ACF936CDF6C /* renderg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49CABA38E78D34DFA260AA06 /* renderg.cpp */; }; + 96927C5A21FD3ACF936CDF6D /* renderg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49CABA38E78D34DFA260AA06 /* renderg.cpp */; }; + 96A6458C826732348D2872C5 /* radiobut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59F8B419381C34A184190EA1 /* radiobut.cpp */; }; + 96A6458C826732348D2872C6 /* radiobut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59F8B419381C34A184190EA1 /* radiobut.cpp */; }; + 96B507455762391688B5E500 /* xh_listc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */; }; + 96B507455762391688B5E501 /* xh_listc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */; }; + 9744994E8A813AA6938A7CE2 /* textcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */; }; + 9744994E8A813AA6938A7CE3 /* textcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */; }; + 97BAFEAD53E238B6881178DD /* evtloopcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 640783FBACA43206B782C77B /* evtloopcmn.cpp */; }; + 97BAFEAD53E238B6881178DE /* evtloopcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 640783FBACA43206B782C77B /* evtloopcmn.cpp */; }; + 97C551F8AEF133D680D1FD36 /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */; }; + 97C551F8AEF133D680D1FD37 /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */; }; + 97F60B2A9CE93BC8949A8CCD /* LexCrontab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */; }; + 97F60B2A9CE93BC8949A8CCE /* LexCrontab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */; }; + 9836B3D336963795928FE5A1 /* m_dflist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52FE1599218730CC99A3F801 /* m_dflist.cpp */; }; + 9836B3D336963795928FE5A2 /* m_dflist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52FE1599218730CC99A3F801 /* m_dflist.cpp */; }; + 9881E3FB23ED3283B6CC71A2 /* filepickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */; }; + 9881E3FB23ED3283B6CC71A3 /* filepickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */; }; + 98DF13E96160304EBB905E73 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; }; + 98DF13E96160304EBB905E74 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; }; + 99C3EE31DC1B3ADAAC8E5DA2 /* anybutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */; }; + 99C3EE31DC1B3ADAAC8E5DA3 /* anybutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */; }; + 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; }; + 99E7A46106C03484BA70D29F /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; }; + 99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */; }; + 99F7D7BFBB543A04AB728376 /* m_hline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */; }; + 9A16829C34C9344D9AB010F9 /* DocumentAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */; }; + 9A16829C34C9344D9AB010FA /* DocumentAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */; }; + 9A178ED42D96329D8CBF9B89 /* tif_predict.c in Sources */ = {isa = PBXBuildFile; fileRef = 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */; }; + 9A178ED42D96329D8CBF9B8A /* tif_predict.c in Sources */ = {isa = PBXBuildFile; fileRef = 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */; }; + 9A83D365AD1F37FA9C7030C2 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; + 9A83D365AD1F37FA9C7030C3 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; + 9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */; }; + 9B3F9D04FB533D99B58BD51A /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */; }; + 9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */; }; + 9B6A35E706543CDAA6A5014B /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */; }; + 9B8E5690A6103FC1BDC6C47E /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; }; + 9B8E5690A6103FC1BDC6C47F /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; }; + 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; + 9C1F073349FD393E9220C0D4 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; + 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; + 9CA687845B3F30CCA44A89D1 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; + 9D003890CB7035A298DB7056 /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5145561C78303EEE9F827962 /* LexLua.cxx */; }; + 9D003890CB7035A298DB7057 /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5145561C78303EEE9F827962 /* LexLua.cxx */; }; + 9D4B67A357D23B5283CA8D98 /* clrpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */; }; + 9D4B67A357D23B5283CA8D99 /* clrpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */; }; + 9E0B67E34B683412978BA82D /* filtall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */; }; + 9E0B67E34B683412978BA82E /* filtall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */; }; + 9EC837DA722736119D49868A /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CAA325362C73AC8BE20FAA7 /* pngpread.c */; }; + 9EC837DA722736119D49868B /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CAA325362C73AC8BE20FAA7 /* pngpread.c */; }; + 9F608A33D52D327FAA295624 /* sckfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56653FACC7D13804A70556AD /* sckfile.cpp */; }; + 9F608A33D52D327FAA295625 /* sckfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56653FACC7D13804A70556AD /* sckfile.cpp */; }; + 9F70A89D00B03D4894AF7638 /* validate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01BA6D45FE4C381493EB4372 /* validate.cpp */; }; + 9F70A89D00B03D4894AF7639 /* validate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01BA6D45FE4C381493EB4372 /* validate.cpp */; }; + 9FB1E1763EFA334CA0C07C49 /* tarstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */; }; + 9FB1E1763EFA334CA0C07C4A /* tarstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */; }; + 9FBC642677C63D01AA2511BC /* evtloop_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */; }; + 9FBC642677C63D01AA2511BD /* evtloop_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */; }; + 9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */; }; + 9FD99E06F6613A1A958FAF6C /* jdmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */; }; + A0BA01A85C303C78A3130711 /* art_aui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */; }; + A0BA01A85C303C78A3130712 /* art_aui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */; }; + A0FCE3CF565C3F84B63712AC /* LexCPP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */; }; + A0FCE3CF565C3F84B63712AD /* LexCPP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */; }; + A139B846584436BCBEBAE3BF /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76337016F2CA3C85831702E6 /* grid.cpp */; }; + A139B846584436BCBEBAE3C0 /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76337016F2CA3C85831702E6 /* grid.cpp */; }; + A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; }; + A1AF8FF873D6383996995ED0 /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; }; + A212431902B8343CA6D229D3 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; }; + A212431902B8343CA6D229D4 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; }; + A2473402D8B83628B1F66749 /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; }; + A2473402D8B83628B1F6674A /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; }; + A2769D1659AE3CA3B58C2CAE /* wincmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */; }; + A2769D1659AE3CA3B58C2CAF /* wincmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */; }; + A283187810EB32DAA173BD33 /* artstd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24E82A05E9A9323287CDB15B /* artstd.cpp */; }; + A283187810EB32DAA173BD34 /* artstd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24E82A05E9A9323287CDB15B /* artstd.cpp */; }; + A3321FE2A87D3BD69E0BB009 /* notebook_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5248A45AB113341EAC361910 /* notebook_osx.cpp */; }; + A3321FE2A87D3BD69E0BB00A /* notebook_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5248A45AB113341EAC361910 /* notebook_osx.cpp */; }; + A336FD218BE63B19991CA513 /* ipcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C090A76B6F23E6481A27282 /* ipcbase.cpp */; }; + A336FD218BE63B19991CA514 /* ipcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C090A76B6F23E6481A27282 /* ipcbase.cpp */; }; + A3586433C4B1398FB1C361D6 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; }; + A3586433C4B1398FB1C361D7 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; }; + A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; + A36B5107860E326591940740 /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; + A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; + A3A898DA3114311EB7F02228 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; + A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; }; + A3C4D47A84E8362295867526 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; }; + A423177BBC0F3BE5A436B4B7 /* propgridpagestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */; }; + A423177BBC0F3BE5A436B4B8 /* propgridpagestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */; }; + A465A43B756630F1944B5A56 /* vscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1629FA905F903324AA5BE72C /* vscroll.cpp */; }; + A465A43B756630F1944B5A57 /* vscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1629FA905F903324AA5BE72C /* vscroll.cpp */; }; + A52A7D2FEB1434E29C64582C /* RESearch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E145FC31ED523B4AA5080A61 /* RESearch.cxx */; }; + A52A7D2FEB1434E29C64582D /* RESearch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E145FC31ED523B4AA5080A61 /* RESearch.cxx */; }; + A569A33A2097316D8110C2C1 /* toolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */; }; + A569A33A2097316D8110C2C2 /* toolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */; }; + A5775D87FD713CBB930A783E /* bookctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */; }; + A5775D87FD713CBB930A783F /* bookctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */; }; + A59667064DED3BD48F29686C /* dataview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E4E466CCBA3A78A38A6E79 /* dataview.cpp */; }; + A59667064DED3BD48F29686D /* dataview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E4E466CCBA3A78A38A6E79 /* dataview.cpp */; }; + A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */ = {isa = PBXBuildFile; fileRef = 374E341C8703367686DEDE93 /* jmemnobs.c */; }; + A7692B4D8658347BA16EEB84 /* jmemnobs.c in Sources */ = {isa = PBXBuildFile; fileRef = 374E341C8703367686DEDE93 /* jmemnobs.c */; }; + A80D00249A693F43A9CBE777 /* rgncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63867276260C3F4A980E83D8 /* rgncmn.cpp */; }; + A80D00249A693F43A9CBE778 /* rgncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63867276260C3F4A980E83D8 /* rgncmn.cpp */; }; + A874AF0B203D3DC99C27469A /* LexNimrod.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */; }; + A874AF0B203D3DC99C27469B /* LexNimrod.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */; }; + A92439BAFD3A30A29DD93131 /* apptraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4A23A8BC7373D4BBD72851D /* apptraits.cpp */; }; + A92439BAFD3A30A29DD93132 /* apptraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4A23A8BC7373D4BBD72851D /* apptraits.cpp */; }; + A93D0E6F0871368EA8FC9FF9 /* fswatchercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */; }; + A93D0E6F0871368EA8FC9FFA /* fswatchercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */; }; + A965348C7FA73CEC90C8FA25 /* filedlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */; }; + A965348C7FA73CEC90C8FA26 /* filedlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */; }; + A9864F0104FA344BBE79D3BC /* rendcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96CED508FA3C3B6B9265099E /* rendcmn.cpp */; }; + A9864F0104FA344BBE79D3BD /* rendcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96CED508FA3C3B6B9265099E /* rendcmn.cpp */; }; + A9A5973552EE30838306D15C /* tif_packbits.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CE73979D0933A43830307E4 /* tif_packbits.c */; }; + A9A5973552EE30838306D15D /* tif_packbits.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CE73979D0933A43830307E4 /* tif_packbits.c */; }; + AAAB5DF8E60736D88273DCFE /* strconv_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D5F9383D1CE931499F339D85 /* strconv_cf.cpp */; }; + AAAB5DF8E60736D88273DCFF /* strconv_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D5F9383D1CE931499F339D85 /* strconv_cf.cpp */; }; + AAABEE399008310A8BC9BE43 /* imagtga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA7029BB5751398AA02D8C24 /* imagtga.cpp */; }; + AAABEE399008310A8BC9BE44 /* imagtga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA7029BB5751398AA02D8C24 /* imagtga.cpp */; }; + AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */; }; + AAC2CB4D851230008AE4ABA2 /* dcscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */; }; + AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; }; + AB58406CEBA13BC4A2A83B67 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; }; + ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; + ABCD15C4AB37396EA17B7B29 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; + AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; }; + AC6AC589EFB233C7B65A3225 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; }; + AC91349D7F0E37739B1F5165 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF6B3FB66243812969E5BD1 /* palette.cpp */; }; + AC91349D7F0E37739B1F5166 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF6B3FB66243812969E5BD1 /* palette.cpp */; }; + ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 2F41EDEB298538CC86FF6DC1 /* jcparam.c */; }; + ACD644CFA85A3B70A3E3B119 /* jcparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 2F41EDEB298538CC86FF6DC1 /* jcparam.c */; }; + AD07124BBA613B47829F0692 /* sockosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4969528429903F15882F5391 /* sockosx.cpp */; }; + AD07124BBA613B47829F0693 /* sockosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4969528429903F15882F5391 /* sockosx.cpp */; }; + AD4A533C4E1633598A6D5C6F /* textentrycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */; }; + AD4A533C4E1633598A6D5C70 /* textentrycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */; }; + AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D272910EC35531E5B4D6E05B /* dynlib.cpp */; }; + AD7EEB418C7930CB828EAF88 /* dynlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D272910EC35531E5B4D6E05B /* dynlib.cpp */; }; + AE5286C71D1130EAA368A1C4 /* radiobtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 724927B0045F3CC0884878BB /* radiobtncmn.cpp */; }; + AE5286C71D1130EAA368A1C5 /* radiobtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 724927B0045F3CC0884878BB /* radiobtncmn.cpp */; }; + AE84BC9A1CCA3ADA9C483950 /* xmlrole.c in Sources */ = {isa = PBXBuildFile; fileRef = 59C6B9849FF6325E890942EF /* xmlrole.c */; }; + AE84BC9A1CCA3ADA9C483951 /* xmlrole.c in Sources */ = {isa = PBXBuildFile; fileRef = 59C6B9849FF6325E890942EF /* xmlrole.c */; }; + AEB9099819B33F4A8AAB9F54 /* radiocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */; }; + AEB9099819B33F4A8AAB9F55 /* radiocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */; }; + AEEE6BC41B6531898A61CB16 /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D87406BCF3E833369E12D89A /* LexHTML.cxx */; }; + AEEE6BC41B6531898A61CB17 /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D87406BCF3E833369E12D89A /* LexHTML.cxx */; }; + AF1E3338E892336E924AF631 /* pickerbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */; }; + AF1E3338E892336E924AF632 /* pickerbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */; }; + B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C131F7BF8A83960ACB26242 /* jidctflt.c */; }; + B01C4EF49CF9390DA93A3503 /* jidctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C131F7BF8A83960ACB26242 /* jidctflt.c */; }; + B026621DE50A3921B6598EF6 /* regerror.c in Sources */ = {isa = PBXBuildFile; fileRef = A70C82ADB45A3FB99C420D03 /* regerror.c */; }; + B026621DE50A3921B6598EF7 /* regerror.c in Sources */ = {isa = PBXBuildFile; fileRef = A70C82ADB45A3FB99C420D03 /* regerror.c */; }; + B0E94A59C83637C09FAAE71C /* app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 757B31FCCA1F381C95B30DF8 /* app.cpp */; }; + B0E94A59C83637C09FAAE71D /* app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 757B31FCCA1F381C95B30DF8 /* app.cpp */; }; + B1775EF7C72233408044034B /* radiobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 773D91F8280434519BD167EA /* radiobox_osx.cpp */; }; + B1775EF7C72233408044034C /* radiobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 773D91F8280434519BD167EA /* radiobox_osx.cpp */; }; + B181806CC34839E791E54BF0 /* xh_tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */; }; + B181806CC34839E791E54BF1 /* xh_tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */; }; + B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */; }; + B189DB62AE9F30A1B613756C /* bmpcboxg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */; }; + B198DA8239E9358A9D56B988 /* menu_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66C21CA37BF63893887FD91B /* menu_osx.cpp */; }; + B198DA8239E9358A9D56B989 /* menu_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66C21CA37BF63893887FD91B /* menu_osx.cpp */; }; + B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB634FD597793A74B3B3AA7F /* docview.cpp */; }; + B1E30CF6CFA932F5A3DBA950 /* docview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB634FD597793A74B3B3AA7F /* docview.cpp */; }; + B37802B0A90133C68EF93DDA /* LexInno.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */; }; + B37802B0A90133C68EF93DDB /* LexInno.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */; }; + B387FAE95A9535B194A42BA4 /* WindowAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */; }; + B387FAE95A9535B194A42BA5 /* WindowAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */; }; + B4425B59CC27389CA9FF81D1 /* datectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE856D950B8C369EB0FE13BA /* datectlg.cpp */; }; + B4425B59CC27389CA9FF81D2 /* datectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE856D950B8C369EB0FE13BA /* datectlg.cpp */; }; + B4CE55324C62369CBB823B68 /* dnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E27194D6828C3BB297B2CBAA /* dnd.cpp */; }; + B4CE55324C62369CBB823B69 /* dnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E27194D6828C3BB297B2CBAA /* dnd.cpp */; }; + B5470121BB4B35DE9C4836DA /* jdcoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = F1A6F3936A0D31CBB58082BA /* jdcoefct.c */; }; + B5470121BB4B35DE9C4836DB /* jdcoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = F1A6F3936A0D31CBB58082BA /* jdcoefct.c */; }; + B5587C93D4D3333FA81D08A2 /* printdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5477A7352353CDE8D96D582 /* printdlg.cpp */; }; + B5587C93D4D3333FA81D08A3 /* printdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5477A7352353CDE8D96D582 /* printdlg.cpp */; }; + B559E894684A38238CAAA115 /* dirctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E110907DDC13305E88B90086 /* dirctrlcmn.cpp */; }; + B559E894684A38238CAAA116 /* dirctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E110907DDC13305E88B90086 /* dirctrlcmn.cpp */; }; + B59FC7345C383D9099391AC3 /* mimecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */; }; + B59FC7345C383D9099391AC4 /* mimecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */; }; + B5C7FD8C27F43F3289A77FC9 /* utilsunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */; }; + B5C7FD8C27F43F3289A77FCA /* utilsunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */; }; + B640A8A74D973A8FBEF63916 /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 04082EC1C91334379425802D /* LexConf.cxx */; }; + B640A8A74D973A8FBEF63917 /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 04082EC1C91334379425802D /* LexConf.cxx */; }; + B6891F848CA0325EAB6D1373 /* textentry_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777385D10CCC350C90F02824 /* textentry_osx.cpp */; }; + B6891F848CA0325EAB6D1374 /* textentry_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777385D10CCC350C90F02824 /* textentry_osx.cpp */; }; + B6C364CB4AE33708A862B4B4 /* srchctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D46A36564C78312CAC538E93 /* srchctlg.cpp */; }; + B6C364CB4AE33708A862B4B5 /* srchctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D46A36564C78312CAC538E93 /* srchctlg.cpp */; }; + B791BD05072B3B909A7093C2 /* dcsvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */; }; + B791BD05072B3B909A7093C3 /* dcsvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */; }; + B839235BED6F3609BDB732B8 /* dndcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */; }; + B839235BED6F3609BDB732B9 /* dndcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */; }; + B84642DA949638A189032CE6 /* http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F84F0DB790A23D92A193D2B4 /* http.cpp */; }; + B84642DA949638A189032CE7 /* http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F84F0DB790A23D92A193D2B4 /* http.cpp */; }; + B8FEEC2C94183AB69C963177 /* headercolcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */; }; + B8FEEC2C94183AB69C963178 /* headercolcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */; }; + BA7B12396B873FDA8F3A2748 /* xlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 418AD9241B673308BE31DC06 /* xlocale.cpp */; }; + BA7B12396B873FDA8F3A2749 /* xlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 418AD9241B673308BE31DC06 /* xlocale.cpp */; }; + BA9F0BBD57F63FD29E484FD3 /* LexScriptol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */; }; + BA9F0BBD57F63FD29E484FD4 /* LexScriptol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */; }; + BAA75384DA82370298672333 /* helpctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42E433D1700631A8907B8227 /* helpctrl.cpp */; }; + BAA75384DA82370298672334 /* helpctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42E433D1700631A8907B8227 /* helpctrl.cpp */; }; + BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */; }; + BAAB6B1D80A33843A8436B11 /* appunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */; }; + BAFF04F1680F32DA988EB03D /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; + BAFF04F1680F32DA988EB03E /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; + BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; + BB31D65BA1253A1CB64CE9D3 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; + BB6FE851028C3DE7A070C213 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; + BB6FE851028C3DE7A070C214 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; + BBAABF3C693E37D3B0FF2502 /* colrdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */; }; + BBAABF3C693E37D3B0FF2503 /* colrdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */; }; + BCD81FD3D1EC305F801E1C1B /* sckipc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */; }; + BCD81FD3D1EC305F801E1C1C /* sckipc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */; }; + BCDAE378D03E37F5994FB9C5 /* XPM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C25521AF59B9324EB2809C73 /* XPM.cxx */; }; + BCDAE378D03E37F5994FB9C6 /* XPM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C25521AF59B9324EB2809C73 /* XPM.cxx */; }; + BD2B17EB72E73A6EB6E0B26F /* dcmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 343D4FDD5CC030618EF24729 /* dcmemory.cpp */; }; + BD2B17EB72E73A6EB6E0B270 /* dcmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 343D4FDD5CC030618EF24729 /* dcmemory.cpp */; }; + BD49EC50CB363642BDBF25C8 /* mousemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D037EA567C253DEEA17E822B /* mousemanager.cpp */; }; + BD49EC50CB363642BDBF25C9 /* mousemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D037EA567C253DEEA17E822B /* mousemanager.cpp */; }; + BD53E095EC1136EF853A47D8 /* m_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5EE0B8985443BDCB36F781F /* m_layout.cpp */; }; + BD53E095EC1136EF853A47D9 /* m_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5EE0B8985443BDCB36F781F /* m_layout.cpp */; }; + BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3019BA65DD73F30A865365F /* frame.cpp */; }; + BDAB44F5D017395D9D3A1F24 /* frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3019BA65DD73F30A865365F /* frame.cpp */; }; + BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; }; + BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; }; + BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; + BDB8EF0E0DA03693BFB77EF8 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; + BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; + BE99A85EE76236CC8C719A65 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; + BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; }; + BEA90F2C6BB93143958F899B /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; }; + BEAC2449AFA7304989BA301E /* fontpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */; }; + BEAC2449AFA7304989BA301F /* fontpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */; }; + BEFC179F8A0E337F9D627D84 /* LexOthers.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C356B5738AB13E829E66729E /* LexOthers.cxx */; }; + BEFC179F8A0E337F9D627D85 /* LexOthers.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C356B5738AB13E829E66729E /* LexOthers.cxx */; }; + BF068F3C06473D8CBC55D507 /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BCD873D873A53BBF955D8A4E /* PositionCache.cxx */; }; + BF068F3C06473D8CBC55D508 /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BCD873D873A53BBF955D8A4E /* PositionCache.cxx */; }; + BF1760458996391E8EB42949 /* ctrlsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */; }; + BF1760458996391E8EB4294A /* ctrlsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */; }; + BF2585CFA6853023975F1E78 /* iconbndl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */; }; + BF2585CFA6853023975F1E79 /* iconbndl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */; }; + BF3D600A93403C589B65C5BF /* xh_stlin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F555177554E398286DBC6FB /* xh_stlin.cpp */; }; + BF3D600A93403C589B65C5C0 /* xh_stlin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F555177554E398286DBC6FB /* xh_stlin.cpp */; }; + BF8C33B7CB3A3ECE814A95FB /* tokenzr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */; }; + BF8C33B7CB3A3ECE814A95FC /* tokenzr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */; }; + BF9B151DC0543E37878F8B9A /* stattextg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE635F30F3935099AF1486C /* stattextg.cpp */; }; + BF9B151DC0543E37878F8B9B /* stattextg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE635F30F3935099AF1486C /* stattextg.cpp */; }; + BFA6983551B4310DA7C8A404 /* jcdctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 6DBF3053414F3C448312165A /* jcdctmgr.c */; }; + BFA6983551B4310DA7C8A405 /* jcdctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 6DBF3053414F3C448312165A /* jcdctmgr.c */; }; + BFD3BFBDC8DA3B1EAD141F96 /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A1276C0E5D48337489DEE8DF /* LexErlang.cxx */; }; + BFD3BFBDC8DA3B1EAD141F97 /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A1276C0E5D48337489DEE8DF /* LexErlang.cxx */; }; + BFD4B8871B3934048B631419 /* languageinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67D76B026121359F9B22F8B0 /* languageinfo.cpp */; }; + BFD4B8871B3934048B63141A /* languageinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67D76B026121359F9B22F8B0 /* languageinfo.cpp */; }; + C005C2D547E735E9B081658E /* prntdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */; }; + C005C2D547E735E9B081658F /* prntdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */; }; + C05BDB0B5F5A33A9A57FF012 /* m_links.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 080597FC0436378E96EDA94B /* m_links.cpp */; }; + C05BDB0B5F5A33A9A57FF013 /* m_links.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 080597FC0436378E96EDA94B /* m_links.cpp */; }; + C0CDA289E9EC3E20BE70B2E6 /* choiccmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24930711031D35288D28B04B /* choiccmn.cpp */; }; + C0CDA289E9EC3E20BE70B2E7 /* choiccmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24930711031D35288D28B04B /* choiccmn.cpp */; }; + C170B941F01334F982315E4A /* tif_print.c in Sources */ = {isa = PBXBuildFile; fileRef = C6EB77ED688E3EE294167EF1 /* tif_print.c */; }; + C170B941F01334F982315E4B /* tif_print.c in Sources */ = {isa = PBXBuildFile; fileRef = C6EB77ED688E3EE294167EF1 /* tif_print.c */; }; + C1CDD035AA393ACC9E202C03 /* minifram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 693F731B7D1730A79485F9EC /* minifram.cpp */; }; + C1CDD035AA393ACC9E202C04 /* minifram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 693F731B7D1730A79485F9EC /* minifram.cpp */; }; + C1DCF69200593986A8C606A6 /* hidjoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */; }; + C1DCF69200593986A8C606A7 /* hidjoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */; }; + C1E5799141603A75A26BEEA7 /* xpmdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C562D5885AFF3E15837325CE /* xpmdecod.cpp */; }; + C1E5799141603A75A26BEEA8 /* xpmdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C562D5885AFF3E15837325CE /* xpmdecod.cpp */; }; + C259D01CC62533D296EF023A /* scrolbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */; }; + C259D01CC62533D296EF023B /* scrolbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */; }; + C2B07E2ECDDC3833BDC9B28C /* arcall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75D0C937F2A03ADA8581A2BB /* arcall.cpp */; }; + C2B07E2ECDDC3833BDC9B28D /* arcall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75D0C937F2A03ADA8581A2BB /* arcall.cpp */; }; + C2CF6B59914A3183ADE84028 /* tif_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F1439BF6C3361296F05A33 /* tif_error.c */; }; + C2CF6B59914A3183ADE84029 /* tif_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F1439BF6C3361296F05A33 /* tif_error.c */; }; + C2D45B334BE03F6C941CA041 /* utilsexc_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */; }; + C2D45B334BE03F6C941CA042 /* utilsexc_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */; }; + C2DEE063B5E032C1BD2B5026 /* xmlparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A92B6033D8233DB1821F193B /* xmlparse.c */; }; + C2DEE063B5E032C1BD2B5027 /* xmlparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A92B6033D8233DB1821F193B /* xmlparse.c */; }; + C2E37E798F743A4199C8658E /* fddlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */; }; + C2E37E798F743A4199C8658F /* fddlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */; }; + C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 950D51915EF83B57B5E8306F /* xh_spin.cpp */; }; + C32EF2EC1A103BC3A6254322 /* xh_spin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 950D51915EF83B57B5E8306F /* xh_spin.cpp */; }; + C34B8675439F39B4845FFC50 /* xh_listb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */; }; + C34B8675439F39B4845FFC51 /* xh_listb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */; }; + C3A63D7091913CD39094AE0B /* btncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A7A3B499503ECABC6A838F /* btncmn.cpp */; }; + C3A63D7091913CD39094AE0C /* btncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A7A3B499503ECABC6A838F /* btncmn.cpp */; }; + C3AC94EA13C1352790BF5FF7 /* listctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9016355F66D3125919E017D /* listctrl.cpp */; }; + C3AC94EA13C1352790BF5FF8 /* listctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9016355F66D3125919E017D /* listctrl.cpp */; }; + C425A172B0AB3EBD9AC9A590 /* ustring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EBEE1A04537E7887E9FD0 /* ustring.cpp */; }; + C425A172B0AB3EBD9AC9A591 /* ustring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EBEE1A04537E7887E9FD0 /* ustring.cpp */; }; + C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */; }; + C43A9650A9DC3372AB8F5F79 /* jidctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */; }; + C5419BC04D6234B5A8307B81 /* xti.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25C86D3D4839343BA1D8BDEE /* xti.cpp */; }; + C5419BC04D6234B5A8307B82 /* xti.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25C86D3D4839343BA1D8BDEE /* xti.cpp */; }; + C5A8DF376BB13A2A8290C2E5 /* xh_unkwn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */; }; + C5A8DF376BB13A2A8290C2E6 /* xh_unkwn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */; }; + C5E5AB869065307F83E27DD1 /* htmlpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */; }; + C5E5AB869065307F83E27DD2 /* htmlpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */; }; + C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E3043D7BE9C33B59E900CCE /* jcmaster.c */; }; + C6DF6F29407B34F29ED1B66E /* jcmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E3043D7BE9C33B59E900CCE /* jcmaster.c */; }; + C7B6240E0E213836996A178B /* dockart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD709DEB71623974B9836D69 /* dockart.cpp */; }; + C7B6240E0E213836996A178C /* dockart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD709DEB71623974B9836D69 /* dockart.cpp */; }; + C8C68927DB243AEAB51E11F2 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = AF9EE701DD653E2299293E5F /* pngwio.c */; }; + C8C68927DB243AEAB51E11F3 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = AF9EE701DD653E2299293E5F /* pngwio.c */; }; + C8F1FB8C029031A5909DBC56 /* KeyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */; }; + C8F1FB8C029031A5909DBC57 /* KeyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */; }; + CA155860CE9A3A8189C3A4C2 /* zipstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */; }; + CA155860CE9A3A8189C3A4C3 /* zipstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */; }; + CA4DCD57060B38CC8B2283D7 /* filtfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */; }; + CA4DCD57060B38CC8B2283D8 /* filtfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */; }; + CA5BD8ABDBA13641BBE7CD66 /* jccoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = E89AC104BF4F33A083F8B382 /* jccoefct.c */; }; + CA5BD8ABDBA13641BBE7CD67 /* jccoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = E89AC104BF4F33A083F8B382 /* jccoefct.c */; }; + CA85901B9E2538CFB7E44216 /* process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B35DA585CFDD32468868E892 /* process.cpp */; }; + CA85901B9E2538CFB7E44217 /* process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B35DA585CFDD32468868E892 /* process.cpp */; }; + CAF5C5BB129431B596C4C6C1 /* LexTAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38891BF8F51E398F9082903F /* LexTAL.cxx */; }; + CAF5C5BB129431B596C4C6C2 /* LexTAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38891BF8F51E398F9082903F /* LexTAL.cxx */; }; + CB078622E90F33BE9D131131 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28824 /* buttonbar.cpp */; }; + CB078622E90F33BE9D131132 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28824 /* buttonbar.cpp */; }; + CB078622E90F33BE9D131133 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28825 /* buttonbar.cpp */; }; + CB078622E90F33BE9D131134 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28825 /* buttonbar.cpp */; }; + CB1F37993ECB3B73A51B42FD /* LexMySQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */; }; + CB1F37993ECB3B73A51B42FE /* LexMySQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */; }; + CB2E99E8FB7D3269A333A55E /* window_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D7C4995D7A35A1854B533F /* window_osx.cpp */; }; + CB2E99E8FB7D3269A333A55F /* window_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D7C4995D7A35A1854B533F /* window_osx.cpp */; }; + CBBD7B32DB7B3E24AE745D78 /* epolldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */; }; + CBBD7B32DB7B3E24AE745D79 /* epolldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */; }; + CBD152BCD11634B7BBB8AA8C /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926AEAA989793A2F82185627 /* button.cpp */; }; + CBD152BCD11634B7BBB8AA8D /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926AEAA989793A2F82185627 /* button.cpp */; }; + CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 725574EF98C4301989181CBF /* jctrans.c */; }; + CCE4ECA9CE883B008065C6FC /* jctrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 725574EF98C4301989181CBF /* jctrans.c */; }; + CCFD3144A22C3A87B67D88AB /* LexRebol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */; }; + CCFD3144A22C3A87B67D88AC /* LexRebol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */; }; + CD241361D4693785A0B8939D /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; }; + CD241361D4693785A0B8939E /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; }; + CD2A9111B8A83AFA8B5B97E5 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2128AD8BD12E3F33AD57478E /* overlay.cpp */; }; + CD2A9111B8A83AFA8B5B97E6 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2128AD8BD12E3F33AD57478E /* overlay.cpp */; }; + CD35A576FD363FD49C3AC4B3 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 375E7A99FF4C38FA9E223772 /* LexAda.cxx */; }; + CD35A576FD363FD49C3AC4B4 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 375E7A99FF4C38FA9E223772 /* LexAda.cxx */; }; + CDC0FF253B503BA19693D68D /* xh_propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */; }; + CDC0FF253B503BA19693D68E /* xh_propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */; }; + CE17002B5B7E375582747639 /* xh_choic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */; }; + CE17002B5B7E37558274763A /* xh_choic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */; }; + CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9B2316B32653DA0939A372D /* sound_osx.cpp */; }; + CE2C937117FE3AB599DD30BA /* sound_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9B2316B32653DA0939A372D /* sound_osx.cpp */; }; + CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = ED19EF377E653F71B1876259 /* jdmaster.c */; }; + CEBAAB0C77983358A601BFFF /* jdmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = ED19EF377E653F71B1876259 /* jdmaster.c */; }; + CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */; }; + CEC6430AEB6E3200BFA75D08 /* jfdctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */; }; + CEE0D7A7D5D8323B9957A780 /* notifmsgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */; }; + CEE0D7A7D5D8323B9957A781 /* notifmsgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */; }; + CF172B12EEA53811BE649521 /* choice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC5B7709F4C3875A3A316C3 /* choice.cpp */; }; + CF172B12EEA53811BE649522 /* choice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC5B7709F4C3875A3A316C3 /* choice.cpp */; }; + CF3082BA1ED232F4B904BD14 /* stdpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */; }; + CF3082BA1ED232F4B904BD15 /* stdpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */; }; + CFA91122523B31B9A07A3826 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */; }; + CFA91122523B31B9A07A3827 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */; }; + CFDBB80A4C9A3BA092273936 /* animatecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */; }; + CFDBB80A4C9A3BA092273937 /* animatecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */; }; + CFF73578F04D357E83D1D830 /* lboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */; }; + CFF73578F04D357E83D1D831 /* lboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */; }; + D00AF125FCB63A7A8F9B87DE /* taskbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4692909E4B823F71822B13F8 /* taskbarcmn.cpp */; }; + D00AF125FCB63A7A8F9B87DF /* taskbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4692909E4B823F71822B13F8 /* taskbarcmn.cpp */; }; + D070C3BE95483FE38BABA1BE /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00DA3D3EEF5E305CA73A1871 /* region.cpp */; }; + D070C3BE95483FE38BABA1BF /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00DA3D3EEF5E305CA73A1871 /* region.cpp */; }; + D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; }; + D088E7DDE38C31DC9C9B3418 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; }; + D0DA11B814AF30A18585122F /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; }; + D0DA11B814AF30A185851230 /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; }; + D13596A4E3CD31DE810061A1 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; }; + D13596A4E3CD31DE810061A2 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; }; + D13AE659C3AC37B68D39B2C9 /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B14D6E7E15FD3C869E341198 /* LexLout.cxx */; }; + D13AE659C3AC37B68D39B2CA /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B14D6E7E15FD3C869E341198 /* LexLout.cxx */; }; + D17E3053DA0D3F7EA4D0951B /* helpdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81821049E39B32C6ABCF6820 /* helpdlg.cpp */; }; + D17E3053DA0D3F7EA4D0951C /* helpdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81821049E39B32C6ABCF6820 /* helpdlg.cpp */; }; + D18E2985C48733B2B7B3D442 /* evtloopunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */; }; + D18E2985C48733B2B7B3D443 /* evtloopunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */; }; + D1D7B594A0DB3781951C7682 /* evtloop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D92E3EEACA2132609CA3D28F /* evtloop.cpp */; }; + D1D7B594A0DB3781951C7683 /* evtloop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D92E3EEACA2132609CA3D28F /* evtloop.cpp */; }; + D2BCC29BB1353C6ABC7D4DDE /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC8157AB87CE3E47A98A6190 /* menu.cpp */; }; + D2BCC29BB1353C6ABC7D4DDF /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC8157AB87CE3E47A98A6190 /* menu.cpp */; }; + D36E76A4CAF5352D9397E1FF /* fdiodispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */; }; + D36E76A4CAF5352D9397E200 /* fdiodispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */; }; + D3FB75C8E3A73AE38EE8A6F6 /* selectdispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */; }; + D3FB75C8E3A73AE38EE8A6F7 /* selectdispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */; }; + D4C87E227A28391891D89088 /* filename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */; }; + D4C87E227A28391891D89089 /* filename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */; }; + D4EC9DB5F8DF319EA0FD26A4 /* LexVB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8F633793051F371F94C27530 /* LexVB.cxx */; }; + D4EC9DB5F8DF319EA0FD26A5 /* LexVB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8F633793051F371F94C27530 /* LexVB.cxx */; }; + D50FA9ECB16933C39A520D88 /* dirdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59255501B8053FEE8F258873 /* dirdlg.cpp */; }; + D50FA9ECB16933C39A520D89 /* dirdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59255501B8053FEE8F258873 /* dirdlg.cpp */; }; + D51B3389209E370489078891 /* tif_dirread.c in Sources */ = {isa = PBXBuildFile; fileRef = F6EA240B3DB93D398A990FAD /* tif_dirread.c */; }; + D51B3389209E370489078892 /* tif_dirread.c in Sources */ = {isa = PBXBuildFile; fileRef = F6EA240B3DB93D398A990FAD /* tif_dirread.c */; }; + D542C7819D593112AE5F7C3D /* combocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */; }; + D542C7819D593112AE5F7C3E /* combocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */; }; + D54A162E557834A48F4646A9 /* advprops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 326723AEB79A305F90D6B41D /* advprops.cpp */; }; + D54A162E557834A48F4646AA /* advprops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 326723AEB79A305F90D6B41D /* advprops.cpp */; }; + D54D3CA9E73336A08DB20705 /* LexBaan.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */; }; + D54D3CA9E73336A08DB20706 /* LexBaan.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */; }; + D594C725CA08333B83C214C2 /* scrolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9D43F0F1CCA3BED871F7A6C /* scrolbar.cpp */; }; + D594C725CA08333B83C214C3 /* scrolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9D43F0F1CCA3BED871F7A6C /* scrolbar.cpp */; }; + D5A25AC579F436509805335A /* appbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95A156A823B536DE8476E4F9 /* appbase.cpp */; }; + D5A25AC579F436509805335B /* appbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95A156A823B536DE8476E4F9 /* appbase.cpp */; }; + D5AABE973F3A351EB1C1A5A6 /* fontmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0817D6A1AF83608B050EBC3 /* fontmap.cpp */; }; + D5AABE973F3A351EB1C1A5A7 /* fontmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0817D6A1AF83608B050EBC3 /* fontmap.cpp */; }; + D5C304182151365FA9FF8A3D /* xh_bttn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */; }; + D5C304182151365FA9FF8A3E /* xh_bttn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */; }; + D5C5DD83882B3227A1CCFE0E /* LexSorcus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */; }; + D5C5DD83882B3227A1CCFE0F /* LexSorcus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */; }; + D66F5D4D204B3B789C7F76B9 /* fontdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18044326B5B13A98A49732DD /* fontdlg.cpp */; }; + D66F5D4D204B3B789C7F76BA /* fontdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18044326B5B13A98A49732DD /* fontdlg.cpp */; }; + D6B2A64A78AF3F2983B441A8 /* ownerdrwcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */; }; + D6B2A64A78AF3F2983B441A9 /* ownerdrwcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */; }; + D6B73239BF0E32288161679C /* platinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97FFB03FF6793506B246BAC6 /* platinfo.cpp */; }; + D6B73239BF0E32288161679D /* platinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97FFB03FF6793506B246BAC6 /* platinfo.cpp */; }; + D6C3421AD2A537AAA2F0AB80 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168DB301ACC736FF96D7F581 /* file.cpp */; }; + D6C3421AD2A537AAA2F0AB81 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168DB301ACC736FF96D7F581 /* file.cpp */; }; + D72D99FC424337CF9EDC2042 /* props.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C20E46A504113C899B9DD9B7 /* props.cpp */; }; + D72D99FC424337CF9EDC2043 /* props.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C20E46A504113C899B9DD9B7 /* props.cpp */; }; + D83B32B788EC310D919E0DF7 /* imagpcx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */; }; + D83B32B788EC310D919E0DF8 /* imagpcx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */; }; + D8ADDD24BEAC3D94B3388D3E /* LexCOBOL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */; }; + D8ADDD24BEAC3D94B3388D3F /* LexCOBOL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */; }; + D9496139621533328AE727B6 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 91300EB871CC39ECBC430D48 /* pngget.c */; }; + D9496139621533328AE727B7 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 91300EB871CC39ECBC430D48 /* pngget.c */; }; + D95C5F467D37339AB8DF2354 /* tif_color.c in Sources */ = {isa = PBXBuildFile; fileRef = 149D299A0EDB3D998118EC93 /* tif_color.c */; }; + D95C5F467D37339AB8DF2355 /* tif_color.c in Sources */ = {isa = PBXBuildFile; fileRef = 149D299A0EDB3D998118EC93 /* tif_color.c */; }; + D997FFC948B73FDA892DB531 /* jdsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCF47A161B3E08B19BFE14 /* jdsample.c */; }; + D997FFC948B73FDA892DB532 /* jdsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCF47A161B3E08B19BFE14 /* jdsample.c */; }; + D9DCBE799DB634C2A73FD6BD /* statboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D73954EB5397301F87881646 /* statboxcmn.cpp */; }; + D9DCBE799DB634C2A73FD6BE /* statboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D73954EB5397301F87881646 /* statboxcmn.cpp */; }; + D9EE059D3C3C3C13AE4419F1 /* stattextcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */; }; + D9EE059D3C3C3C13AE4419F2 /* stattextcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */; }; + D9F02AFDA07D3857A905527C /* jdcolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 68B81FBDA49D3C1991B6356A /* jdcolor.c */; }; + D9F02AFDA07D3857A905527D /* jdcolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 68B81FBDA49D3C1991B6356A /* jdcolor.c */; }; + DA0FA502405A37B2A5698D20 /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FE0B33481283D3493613B0F /* config.cpp */; }; + DA0FA502405A37B2A5698D21 /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FE0B33481283D3493613B0F /* config.cpp */; }; + DAAFBED07FF8365B96D20B99 /* unichar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */; }; + DAAFBED07FF8365B96D20B9A /* unichar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */; }; + DB3C3AA956A03FB492480266 /* treectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */; }; + DB3C3AA956A03FB492480267 /* treectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */; }; + DB73248401573A5996D8E68D /* jcmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 664736BDE465350C9C4750E9 /* jcmarker.c */; }; + DB73248401573A5996D8E68E /* jcmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 664736BDE465350C9C4750E9 /* jcmarker.c */; }; + DB9565CC4EAE3BCB9F490620 /* xmltok.c in Sources */ = {isa = PBXBuildFile; fileRef = 8685B8ED68F23DB0B770FD74 /* xmltok.c */; }; + DB9565CC4EAE3BCB9F490621 /* xmltok.c in Sources */ = {isa = PBXBuildFile; fileRef = 8685B8ED68F23DB0B770FD74 /* xmltok.c */; }; + DC6B669C9A78398F914AEE53 /* fontutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FF661188B563D27A11F5716 /* fontutil.cpp */; }; + DC6B669C9A78398F914AEE54 /* fontutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FF661188B563D27A11F5716 /* fontutil.cpp */; }; + DC978B60F6DF3176B5B114C3 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5466CC2D6579360E9C665EE5 /* memory.cpp */; }; + DC978B60F6DF3176B5B114C4 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5466CC2D6579360E9C665EE5 /* memory.cpp */; }; + DDC71B80D562303690FDBE4C /* appcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F01DDE448E4C3983ACCE67FD /* appcmn.cpp */; }; + DDC71B80D562303690FDBE4D /* appcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F01DDE448E4C3983ACCE67FD /* appcmn.cpp */; }; + DE26572475EE336B8EEA5D92 /* jerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 108517BCD39230E7A89BC943 /* jerror.c */; }; + DE26572475EE336B8EEA5D93 /* jerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 108517BCD39230E7A89BC943 /* jerror.c */; }; + DE43350F6C9D3148A64F0AF9 /* art_internal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4649974D8B3A109D1BF145 /* art_internal.cpp */; }; + DE43350F6C9D3148A64F0AFA /* art_internal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4649974D8B3A109D1BF145 /* art_internal.cpp */; }; + DEB35F871F8E3B90AD207AEE /* printps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF76670146413EEFA005206A /* printps.cpp */; }; + DEB35F871F8E3B90AD207AEF /* printps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF76670146413EEFA005206A /* printps.cpp */; }; + DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */; }; + DEC5F4B34BC037169D3E5F2B /* mediactrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */; }; + DF8124E5E17D386A84CEEA27 /* LexLisp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40586C8986443431A64EB066 /* LexLisp.cxx */; }; + DF8124E5E17D386A84CEEA28 /* LexLisp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40586C8986443431A64EB066 /* LexLisp.cxx */; }; + DF8CE011EAC23F73BDA1C44D /* scrolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */; }; + DF8CE011EAC23F73BDA1C44E /* scrolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */; }; + DFEB8DA3D42734949CB1E1AA /* clipcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */; }; + DFEB8DA3D42734949CB1E1AB /* clipcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */; }; + E05B06A7FEEE32D5AD87EA4F /* xh_editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05310A868F0B35999C568681 /* xh_editlbox.cpp */; }; + E05B06A7FEEE32D5AD87EA50 /* xh_editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05310A868F0B35999C568681 /* xh_editlbox.cpp */; }; + E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; }; + E0E40333B61C33B58787078F /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; }; + E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; }; + E104017EE1A4357DAF84E1E7 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; }; + E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */; }; + E1A20811148F31D289AF98B0 /* xh_sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */; }; + E1F7C51F411B3AF39476E488 /* fdrepdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */; }; + E1F7C51F411B3AF39476E489 /* fdrepdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */; }; + E2A73751CECF32A68FFAEE82 /* panelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70E9B2C076673C87B4218A01 /* panelcmn.cpp */; }; + E2A73751CECF32A68FFAEE83 /* panelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70E9B2C076673C87B4218A01 /* panelcmn.cpp */; }; + E3136EF5DD843ACE886E2868 /* tif_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = E79B2D1F630036129B9677A7 /* tif_dir.c */; }; + E3136EF5DD843ACE886E2869 /* tif_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = E79B2D1F630036129B9677A7 /* tif_dir.c */; }; + E39021D3CDCD33BAA646B006 /* sckaddr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8238DA30FF3FB984511250 /* sckaddr.cpp */; }; + E39021D3CDCD33BAA646B007 /* sckaddr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8238DA30FF3FB984511250 /* sckaddr.cpp */; }; + E3A4615870B139D29FE727C1 /* menucmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F175D6E8E5723FC797701275 /* menucmn.cpp */; }; + E3A4615870B139D29FE727C2 /* menucmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F175D6E8E5723FC797701275 /* menucmn.cpp */; }; + E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B9C41A4D12345AAA764CAD /* stc.cpp */; }; + E3B3E4F75D503DB89B5C622E /* stc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B9C41A4D12345AAA764CAD /* stc.cpp */; }; + E4131E3B445C36E6A7FC802F /* regcomp.c in Sources */ = {isa = PBXBuildFile; fileRef = E433B890264339BA8DB97B1D /* regcomp.c */; }; + E4131E3B445C36E6A7FC8030 /* regcomp.c in Sources */ = {isa = PBXBuildFile; fileRef = E433B890264339BA8DB97B1D /* regcomp.c */; }; + E475B8377D7A352C90342299 /* glcanvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B6FCA050C26323893012BD6 /* glcanvas.cpp */; }; + E475B8377D7A352C9034229A /* glcanvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B6FCA050C26323893012BD6 /* glcanvas.cpp */; }; + E49F0D43B5A63EF1A57A7112 /* fswatcherg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */; }; + E49F0D43B5A63EF1A57A7113 /* fswatcherg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */; }; + E4B826CE70283D999CB591F3 /* listbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B99CA41708513A599AE275A2 /* listbox_osx.cpp */; }; + E4B826CE70283D999CB591F4 /* listbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B99CA41708513A599AE275A2 /* listbox_osx.cpp */; }; + E515EAE375AE390688CBF8D3 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B32A13D5B3336098B1B9765 /* pngtrans.c */; }; + E515EAE375AE390688CBF8D4 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B32A13D5B3336098B1B9765 /* pngtrans.c */; }; + E53AFF04877D34C386D77380 /* wfstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C37866F41B0C31E295AA7FA6 /* wfstream.cpp */; }; + E53AFF04877D34C386D77381 /* wfstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C37866F41B0C31E295AA7FA6 /* wfstream.cpp */; }; + E5D698D2606A304DA743AF92 /* grideditors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66426B63AA3E3A279936C034 /* grideditors.cpp */; }; + E5D698D2606A304DA743AF93 /* grideditors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66426B63AA3E3A279936C034 /* grideditors.cpp */; }; + E62F8E49FD5035D8BC71BB49 /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */; }; + E62F8E49FD5035D8BC71BB4A /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */; }; + E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81B3DFBB73573FFDBD320334 /* datstrm.cpp */; }; + E63364B7E727383BA8E2B7ED /* datstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81B3DFBB73573FFDBD320334 /* datstrm.cpp */; }; + E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6F23140777B733679D2FAAFC /* odcombocmn.cpp */; }; + E6D18B2EDE353F67883085A0 /* odcombocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6F23140777B733679D2FAAFC /* odcombocmn.cpp */; }; + E7140F3AB94D3FDFA86D8C06 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49612306912038DDBCABB4DE /* url.cpp */; }; + E7140F3AB94D3FDFA86D8C07 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49612306912038DDBCABB4DE /* url.cpp */; }; + E741CDA71895344C974D8F50 /* AutoComplete.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */; }; + E741CDA71895344C974D8F51 /* AutoComplete.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */; }; + E7921B0472B63E4091F4F517 /* xh_collpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */; }; + E7921B0472B63E4091F4F518 /* xh_collpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */; }; + E7AF3BF2B3473AD9BE66D1A1 /* xh_clrpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */; }; + E7AF3BF2B3473AD9BE66D1A2 /* xh_clrpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */; }; + E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */ = {isa = PBXBuildFile; fileRef = 375FF97B202F3C359402D13E /* jdpostct.c */; }; + E7D02E64384F37BC8939A2C5 /* jdpostct.c in Sources */ = {isa = PBXBuildFile; fileRef = 375FF97B202F3C359402D13E /* jdpostct.c */; }; + E7F35B834A163C67B65176C6 /* tif_dirwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */; }; + E7F35B834A163C67B65176C7 /* tif_dirwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */; }; + E80BEED62EBF34F09B3F401F /* LexMagik.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 45860601270D318D93BEE1F3 /* LexMagik.cxx */; }; + E80BEED62EBF34F09B3F4020 /* LexMagik.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 45860601270D318D93BEE1F3 /* LexMagik.cxx */; }; + E82CB89681FF3747B6A94427 /* anybutton_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */; }; + E82CB89681FF3747B6A94428 /* anybutton_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */; }; + E882402BEE0330A080A6516F /* strconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FEB8204E530329FA085E5B8 /* strconv.cpp */; }; + E882402BEE0330A080A65170 /* strconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FEB8204E530329FA085E5B8 /* strconv.cpp */; }; + E8BBC08597EF383597DA0308 /* LexEiffel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 55EBB18CB4773C788510B14B /* LexEiffel.cxx */; }; + E8BBC08597EF383597DA0309 /* LexEiffel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 55EBB18CB4773C788510B14B /* LexEiffel.cxx */; }; + E8EE34F0A78C31B489B19FEE /* LexMSSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */; }; + E8EE34F0A78C31B489B19FEF /* LexMSSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */; }; + E8F0C87119C63E8E81423A7C /* stdpaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */; }; + E8F0C87119C63E8E81423A7D /* stdpaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */; }; + E92EB502F79638B0BE569EF4 /* CallTip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */; }; + E92EB502F79638B0BE569EF5 /* CallTip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */; }; + E9EDB5C92D5D3B529E8D73B0 /* valgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7440859617F3B47AF4D3817 /* valgen.cpp */; }; + E9EDB5C92D5D3B529E8D73B1 /* valgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7440859617F3B47AF4D3817 /* valgen.cpp */; }; + EA02FA6D3B003F8F8A2963C6 /* toolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */; }; + EA02FA6D3B003F8F8A2963C7 /* toolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */; }; + EA02FA6D3B003F8F8A2963C8 /* toolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B0CE56BA23002A5C8AF00 /* toolbar.cpp */; }; + EA02FA6D3B003F8F8A2963C9 /* toolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B0CE56BA23002A5C8AF00 /* toolbar.cpp */; }; + EAA469E1A0CC33E4A21A3F7A /* gaugecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */; }; + EAA469E1A0CC33E4A21A3F7B /* gaugecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */; }; + EAE02BA934B43EEE92C496C7 /* dcpsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA0945B20913754A54D0FD9 /* dcpsg.cpp */; }; + EAE02BA934B43EEE92C496C8 /* dcpsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA0945B20913754A54D0FD9 /* dcpsg.cpp */; }; + EB52C6A915943813932944FE /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04A /* control.cpp */; }; + EB52C6A915943813932944FF /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04A /* control.cpp */; }; + EB52C6A91594381393294500 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04B /* control.cpp */; }; + EB52C6A91594381393294501 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04B /* control.cpp */; }; + EBA0986930DA3B59B2FB4F1E /* htmltag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FCCFF49F92B4323D9181CEDA /* htmltag.cpp */; }; + EBA0986930DA3B59B2FB4F1F /* htmltag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FCCFF49F92B4323D9181CEDA /* htmltag.cpp */; }; + EBF2D44758003221A22202BC /* colourcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D61240ABD70328BA5789663 /* colourcmn.cpp */; }; + EBF2D44758003221A22202BD /* colourcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D61240ABD70328BA5789663 /* colourcmn.cpp */; }; + EC3A1C620D323B5590AABF02 /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DB43FAB1E563B02ACEFF647 /* module.cpp */; }; + EC3A1C620D323B5590AABF03 /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DB43FAB1E563B02ACEFF647 /* module.cpp */; }; + EC43AFB3670A3D459D9B388D /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FE3B47058A723243A285594D /* LexMPT.cxx */; }; + EC43AFB3670A3D459D9B388E /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FE3B47058A723243A285594D /* LexMPT.cxx */; }; + ED8D23D79FF33ED380FE09EB /* scrlwing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */; }; + ED8D23D79FF33ED380FE09EC /* scrlwing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */; }; + EDCA35F1555F3509895CCA69 /* textctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */; }; + EDCA35F1555F3509895CCA6A /* textctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */; }; + EDD5725CF41336EFA7FB3009 /* framecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A54B80C17F823CB5900AD2E8 /* framecmn.cpp */; }; + EDD5725CF41336EFA7FB300A /* framecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A54B80C17F823CB5900AD2E8 /* framecmn.cpp */; }; + EDD92822EBD93E86AE5A2ED0 /* slidercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8072CA67D19346ABF4D465F /* slidercmn.cpp */; }; + EDD92822EBD93E86AE5A2ED1 /* slidercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8072CA67D19346ABF4D465F /* slidercmn.cpp */; }; + EE0EA850822E35F596B5EBBA /* artprov.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29387393C07C39DB8FF1663B /* artprov.cpp */; }; + EE0EA850822E35F596B5EBBB /* artprov.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29387393C07C39DB8FF1663B /* artprov.cpp */; }; + EE9194D6C4C138BF9DAB8633 /* panelg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */; }; + EE9194D6C4C138BF9DAB8634 /* panelg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */; }; + EEB0B28903693C7E9D07192F /* glcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E08A51FA8D8A361681B07295 /* glcmn.cpp */; }; + EEB0B28903693C7E9D071930 /* glcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E08A51FA8D8A361681B07295 /* glcmn.cpp */; }; + F016C51053373E658ED4C9A9 /* helpext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF376BC55EA73F5FB7328142 /* helpext.cpp */; }; + F016C51053373E658ED4C9AA /* helpext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF376BC55EA73F5FB7328142 /* helpext.cpp */; }; + F0290CF0258A30478FED38A2 /* tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71F35835D4DE34D59F924E36 /* tglbtn.cpp */; }; + F0290CF0258A30478FED38A3 /* tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71F35835D4DE34D59F924E36 /* tglbtn.cpp */; }; + F04F796823753478BCC9EB6F /* statbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B7E02F461A33397B00E9004 /* statbmp.cpp */; }; + F04F796823753478BCC9EB70 /* statbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B7E02F461A33397B00E9004 /* statbmp.cpp */; }; + F07D84D124F23E7FA11CF148 /* extended.c in Sources */ = {isa = PBXBuildFile; fileRef = 033B94A9AC8A3370A794503F /* extended.c */; }; + F07D84D124F23E7FA11CF149 /* extended.c in Sources */ = {isa = PBXBuildFile; fileRef = 033B94A9AC8A3370A794503F /* extended.c */; }; + F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */; }; + F0B3F484C38C3BA0B9927CDA /* docmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */; }; + F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00969CBE3B8F32C78C195619 /* panel.cpp */; }; + F0D892C2618130FEAD46BB87 /* panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00969CBE3B8F32C78C195619 /* panel.cpp */; }; + F1E4D7CA634E33808AE3B522 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 373242CD08F330208A7CF438 /* fontenumcmn.cpp */; }; + F1E4D7CA634E33808AE3B523 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 373242CD08F330208A7CF438 /* fontenumcmn.cpp */; }; + F1E8E4D6D8453F7382E6497F /* filedlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D47A353B2C63204ABDD42DE /* filedlg.cpp */; }; + F1E8E4D6D8453F7382E64980 /* filedlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D47A353B2C63204ABDD42DE /* filedlg.cpp */; }; + F1F484DD591337399FCD0463 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5617D10CB7136EC9A4194EF /* display.cpp */; }; + F1F484DD591337399FCD0464 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5617D10CB7136EC9A4194EF /* display.cpp */; }; + F22C401903993639AE05A295 /* xh_stbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 147800BBCB80346798B35D75 /* xh_stbox.cpp */; }; + F22C401903993639AE05A296 /* xh_stbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 147800BBCB80346798B35D75 /* xh_stbox.cpp */; }; + F24F637D59F637CA9A7E23C9 /* xh_filectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */; }; + F24F637D59F637CA9A7E23CA /* xh_filectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */; }; + F2813BF297C73A3ABD02EC98 /* glcanvas_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */; }; + F2813BF297C73A3ABD02EC99 /* glcanvas_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */; }; + F2F2963D8ECC32D39FDBF101 /* tif_write.c in Sources */ = {isa = PBXBuildFile; fileRef = E9B992CB6C28339FB0CA5E27 /* tif_write.c */; }; + F2F2963D8ECC32D39FDBF102 /* tif_write.c in Sources */ = {isa = PBXBuildFile; fileRef = E9B992CB6C28339FB0CA5E27 /* tif_write.c */; }; + F34D240EB4513FE996179182 /* xh_mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */; }; + F34D240EB4513FE996179183 /* xh_mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */; }; + F38202271C6131908C358DEC /* mstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC3D1E222FD93A69B1D1366E /* mstream.cpp */; }; + F38202271C6131908C358DED /* mstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC3D1E222FD93A69B1D1366E /* mstream.cpp */; }; + F3AC352D6DAE3A12A5664768 /* styleparams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */; }; + F3AC352D6DAE3A12A5664769 /* styleparams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */; }; + F3CB42BB6D983675862C01F3 /* xh_toolb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */; }; + F3CB42BB6D983675862C01F4 /* xh_toolb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */; }; + F43DAE2E829A3A7493531381 /* richtextimagedlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */; }; + F43DAE2E829A3A7493531382 /* richtextimagedlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */; }; + F46777ABE0743B04A1E1F0A4 /* spinbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */; }; + F46777ABE0743B04A1E1F0A5 /* spinbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */; }; + F4C0CEADEDC23610BF6983D6 /* artmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0665A40F3FC3F218074C63C /* artmac.cpp */; }; + F4C0CEADEDC23610BF6983D7 /* artmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0665A40F3FC3F218074C63C /* artmac.cpp */; }; + F501AB044AAC39DCB8C0B3E1 /* editors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C7F740A55E39FD890B3C7F /* editors.cpp */; }; + F501AB044AAC39DCB8C0B3E2 /* editors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C7F740A55E39FD890B3C7F /* editors.cpp */; }; + F55F3887CDE633D7877C607B /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */; }; + F55F3887CDE633D7877C607C /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */; }; + F569D7A3F0E038E9B4CC2A76 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; }; + F569D7A3F0E038E9B4CC2A77 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; }; + F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; + F5806029B1BA3924A8FDDBC2 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; + F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; + F5D0BCF1A6C839E5829199E3 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; + F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; }; + F5D2146C94E733FAAB6D286B /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; }; + F5DF7AF0FA9E371BB71EF798 /* xh_listbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */; }; + F5DF7AF0FA9E371BB71EF799 /* xh_listbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */; }; + F5FF98C231B33E3EB7902C64 /* colordlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = DAAED71A534135A9A61612A6 /* colordlgosx.mm */; }; + F5FF98C231B33E3EB7902C65 /* colordlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = DAAED71A534135A9A61612A6 /* colordlgosx.mm */; }; + F6A1AC5CF84E32C19F91A614 /* statbrma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */; }; + F6A1AC5CF84E32C19F91A615 /* statbrma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */; }; + F6B85CD918E93923BE631B95 /* fs_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */; }; + F6B85CD918E93923BE631B96 /* fs_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */; }; + F70156C3E68B38FCB72FE253 /* dirdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */; }; + F70156C3E68B38FCB72FE254 /* dirdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */; }; + F72020415D713C1BA41C17CF /* richmsgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */; }; + F72020415D713C1BA41C17D0 /* richmsgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */; }; + F747991E5C973F9B8C9D800A /* fontcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */; }; + F747991E5C973F9B8C9D800B /* fontcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */; }; + F7D10B6E0CBA32EFAF79C77C /* xh_dirpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */; }; + F7D10B6E0CBA32EFAF79C77D /* xh_dirpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */; }; + F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */; }; + F80C2290D67B345F9CF60086 /* dpycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */; }; + F85D632964383F29BC3B30B6 /* tif_next.c in Sources */ = {isa = PBXBuildFile; fileRef = DFDC805DD3063C389F93642D /* tif_next.c */; }; + F85D632964383F29BC3B30B7 /* tif_next.c in Sources */ = {isa = PBXBuildFile; fileRef = DFDC805DD3063C389F93642D /* tif_next.c */; }; + F89405757B063F80B111F469 /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E0EBCDDF248638B58B01D9CC /* datetime.cpp */; }; + F89405757B063F80B111F46A /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E0EBCDDF248638B58B01D9CC /* datetime.cpp */; }; + F910C74E48823E0BA7F7885D /* graphicc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BACAA6CE4A0934459F26B27C /* graphicc.cpp */; }; + F910C74E48823E0BA7F7885E /* graphicc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BACAA6CE4A0934459F26B27C /* graphicc.cpp */; }; + FADD46CB89B135D1AF1D5F8A /* richtextstyledlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */; }; + FADD46CB89B135D1AF1D5F8B /* richtextstyledlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */; }; + FB09720D13673A7B81BCB645 /* xh_datectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C63C964DAFAD311694367C94 /* xh_datectrl.cpp */; }; + FB09720D13673A7B81BCB646 /* xh_datectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C63C964DAFAD311694367C94 /* xh_datectrl.cpp */; }; + FB8B6E4789A3311A98C5B0A8 /* clrpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */; }; + FB8B6E4789A3311A98C5B0A9 /* clrpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */; }; + FBA19C939E1E33EDB05043FE /* cairo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */; }; + FBA19C939E1E33EDB05043FF /* cairo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */; }; + FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */; }; + FBE4DB30865D3177B3A9993C /* xh_animatctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */; }; + FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EB76F786D7F3FF286948D22 /* jcomapi.c */; }; + FCE5B139CBE73FCB804EF7DE /* jcomapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EB76F786D7F3FF286948D22 /* jcomapi.c */; }; + FD1F6CD8286D3D428FD52A28 /* filepickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B580FD04D0D83601826FD5EE /* filepickerg.cpp */; }; + FD1F6CD8286D3D428FD52A29 /* filepickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B580FD04D0D83601826FD5EE /* filepickerg.cpp */; }; + FD38B04026F930CC80BC9480 /* m_pre.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61658C3EABB4341AA38C691E /* m_pre.cpp */; }; + FD38B04026F930CC80BC9481 /* m_pre.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61658C3EABB4341AA38C691E /* m_pre.cpp */; }; + FD3CC5F0AA41384B9388A1E0 /* htmlfilt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C6C4F5468743265A02D656C /* htmlfilt.cpp */; }; + FD3CC5F0AA41384B9388A1E1 /* htmlfilt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C6C4F5468743265A02D656C /* htmlfilt.cpp */; }; + FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66411D54BAD338498AC59401 /* xh_scrol.cpp */; }; + FDE14459359334DE9FB03ED6 /* xh_scrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66411D54BAD338498AC59401 /* xh_scrol.cpp */; }; + FE2DBCCC1D0B36A3BE4493C0 /* fs_arc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88F2BA2F0598342186A484B5 /* fs_arc.cpp */; }; + FE2DBCCC1D0B36A3BE4493C1 /* fs_arc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88F2BA2F0598342186A484B5 /* fs_arc.cpp */; }; + FE5285579C7F39C48FC66B10 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 888BD97139C936679691FF34 /* hash.cpp */; }; + FE5285579C7F39C48FC66B11 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 888BD97139C936679691FF34 /* hash.cpp */; }; + FE5B7C7A84B83C17A38E8403 /* LexSML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */; }; + FE5B7C7A84B83C17A38E8404 /* LexSML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */; }; + FE9A662A1F9B34D099C45C1D /* xh_cald.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093B5233861B3F9B8C85762B /* xh_cald.cpp */; }; + FE9A662A1F9B34D099C45C1E /* xh_cald.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093B5233861B3F9B8C85762B /* xh_cald.cpp */; }; + FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */; }; + FEA741A9B6663A4C929893C3 /* aboutdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */; }; + FEB073547F3F3AC19D31F698 /* tif_tile.c in Sources */ = {isa = PBXBuildFile; fileRef = BD88495AF72531A28D2201D0 /* tif_tile.c */; }; + FEB073547F3F3AC19D31F699 /* tif_tile.c in Sources */ = {isa = PBXBuildFile; fileRef = BD88495AF72531A28D2201D0 /* tif_tile.c */; }; + FECC98B53C0F3106AB04E69E /* tif_fax3.c in Sources */ = {isa = PBXBuildFile; fileRef = 30FD1048328234E59D319863 /* tif_fax3.c */; }; + FECC98B53C0F3106AB04E69F /* tif_fax3.c in Sources */ = {isa = PBXBuildFile; fileRef = 30FD1048328234E59D319863 /* tif_fax3.c */; }; + FEF99FF6C38D3B488396B142 /* ffile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */; }; + FEF99FF6C38D3B488396B143 /* ffile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */; }; + FF50EC0EC5F23DF890C6E95F /* colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9D1F14339D1C331087650931 /* colour.cpp */; }; + FF50EC0EC5F23DF890C6E960 /* colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9D1F14339D1C331087650931 /* colour.cpp */; }; + FF7DB2884F6E3C5DB4BDF61D /* fswatcher_kqueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */; }; + FF7DB2884F6E3C5DB4BDF61E /* fswatcher_kqueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */; }; + FFF5BFBE600E35FAB7EA522C /* fileback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC12D557950A3B0D89D9F2F3 /* fileback.cpp */; }; + FFF5BFBE600E35FAB7EA522D /* fileback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC12D557950A3B0D89D9F2F3 /* fileback.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 0080254545B9383ABDF2045C /* xh_odcombo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_odcombo.cpp; path = ../../src/xrc/xh_odcombo.cpp; sourceTree = ""; }; + 00969CBE3B8F32C78C195619 /* panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panel.cpp; path = ../../src/ribbon/panel.cpp; sourceTree = ""; }; + 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bookctrl.cpp; path = ../../src/common/bookctrl.cpp; sourceTree = ""; }; + 00DA3D3EEF5E305CA73A1871 /* region.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = region.cpp; path = ../../src/osx/carbon/region.cpp; sourceTree = ""; }; + 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dndcmn.cpp; path = ../../src/common/dndcmn.cpp; sourceTree = ""; }; + 018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hidjoystick.cpp; path = ../../src/osx/core/hidjoystick.cpp; sourceTree = ""; }; + 01BA6D45FE4C381493EB4372 /* validate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = validate.cpp; path = ../../src/common/validate.cpp; sourceTree = ""; }; + 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imaglist.cpp; path = ../../src/osx/imaglist.cpp; sourceTree = ""; }; + 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctfst.c; path = ../../src/jpeg/jfdctfst.c; sourceTree = ""; }; + 02A756A2887839B2900F8CAC /* listctrl_mac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrl_mac.cpp; path = ../../src/osx/carbon/listctrl_mac.cpp; sourceTree = ""; }; + 02D2E8B5C89939CE90B99E2B /* archive.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = archive.cpp; path = ../../src/common/archive.cpp; sourceTree = ""; }; + 02D9332D5C5632E981936E29 /* jquant2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant2.c; path = ../../src/jpeg/jquant2.c; sourceTree = ""; }; + 032A38738B58394E8617617B /* tif_dirinfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirinfo.c; path = ../../src/tiff/libtiff/tif_dirinfo.c; sourceTree = ""; }; + 033B94A9AC8A3370A794503F /* extended.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = extended.c; path = ../../src/common/extended.c; sourceTree = ""; }; + 0401B7302088357BB6B7F16F /* timerimpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timerimpl.cpp; path = ../../src/common/timerimpl.cpp; sourceTree = ""; }; + 04082EC1C91334379425802D /* LexConf.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexConf.cxx; path = ../../src/stc/scintilla/src/LexConf.cxx; sourceTree = ""; }; + 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmndata.cpp; path = ../../src/common/cmndata.cpp; sourceTree = ""; }; + 05310A868F0B35999C568681 /* xh_editlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_editlbox.cpp; path = ../../src/xrc/xh_editlbox.cpp; sourceTree = ""; }; + 05A4437E9697300390FDE14E /* auibar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = auibar.cpp; path = ../../src/aui/auibar.cpp; sourceTree = ""; }; + 06B4A895955B32258DCD62BF /* xh_dlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_dlg.cpp; path = ../../src/xrc/xh_dlg.cpp; sourceTree = ""; }; + 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combocmn.cpp; path = ../../src/common/combocmn.cpp; sourceTree = ""; }; + 071FEABEA61E3B559A47A7DB /* statusbr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statusbr.cpp; path = ../../src/generic/statusbr.cpp; sourceTree = ""; }; + 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bttn.cpp; path = ../../src/xrc/xh_bttn.cpp; sourceTree = ""; }; + 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmp.cpp; path = ../../src/xrc/xh_bmp.cpp; sourceTree = ""; }; + 080597FC0436378E96EDA94B /* m_links.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_links.cpp; path = ../../src/html/m_links.cpp; sourceTree = ""; }; + 082CA018FB883999839C1DCE /* m_tables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_tables.cpp; path = ../../src/html/m_tables.cpp; sourceTree = ""; }; + 087B66573CD33DA99DA82B1C /* xmlres.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlres.cpp; path = ../../src/xrc/xmlres.cpp; sourceTree = ""; }; + 0890779C662C35889A8C6C2E /* jdmerge.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmerge.c; path = ../../src/jpeg/jdmerge.c; sourceTree = ""; }; + 0903EE9B3793303285FF96E3 /* textfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textfile.cpp; path = ../../src/common/textfile.cpp; sourceTree = ""; }; + 093B5233861B3F9B8C85762B /* xh_cald.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cald.cpp; path = ../../src/xrc/xh_cald.cpp; sourceTree = ""; }; + 0964797530CF3FE7B8DB6242 /* pngwtran.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwtran.c; path = ../../src/png/pngwtran.c; sourceTree = ""; }; + 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choicbkg.cpp; path = ../../src/generic/choicbkg.cpp; sourceTree = ""; }; + 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCsound.cxx; path = ../../src/stc/scintilla/src/LexCsound.cxx; sourceTree = ""; }; + 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cursor.cpp; path = ../../src/osx/carbon/cursor.cpp; sourceTree = ""; }; + 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timerunx.cpp; path = ../../src/unix/timerunx.cpp; sourceTree = ""; }; + 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = ""; }; + 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/src/LexRebol.cxx; sourceTree = ""; }; + 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = ""; }; + 0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = ""; }; + 108517BCD39230E7A89BC943 /* jerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jerror.c; path = ../../src/jpeg/jerror.c; sourceTree = ""; }; + 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dumpmode.c; path = ../../src/tiff/libtiff/tif_dumpmode.c; sourceTree = ""; }; + 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVHDL.cxx; path = ../../src/stc/scintilla/src/LexVHDL.cxx; sourceTree = ""; }; + 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexHaskell.cxx; path = ../../src/stc/scintilla/src/LexHaskell.cxx; sourceTree = ""; }; + 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpcx.cpp; path = ../../src/common/imagpcx.cpp; sourceTree = ""; }; + 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = txtstrm.cpp; path = ../../src/common/txtstrm.cpp; sourceTree = ""; }; + 1197B997B1D139C5AE4D198A /* dseldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dseldlg.cpp; path = ../../src/common/dseldlg.cpp; sourceTree = ""; }; + 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmpbt.cpp; path = ../../src/xrc/xh_bmpbt.cpp; sourceTree = ""; }; + 12363D1F50FE301DAEE7F04A /* control.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = control.cpp; path = ../../src/osx/carbon/control.cpp; sourceTree = ""; }; + 12363D1F50FE301DAEE7F04B /* control.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = control.cpp; path = ../../src/ribbon/control.cpp; sourceTree = ""; }; + 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clipbrd.cpp; path = ../../src/osx/carbon/clipbrd.cpp; sourceTree = ""; }; + 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbmpcmn.cpp; path = ../../src/common/statbmpcmn.cpp; sourceTree = ""; }; + 137E01C362E134449BF966ED /* imagfill.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagfill.cpp; path = ../../src/common/imagfill.cpp; sourceTree = ""; }; + 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpcboxg.cpp; path = ../../src/generic/bmpcboxg.cpp; sourceTree = ""; }; + 147800BBCB80346798B35D75 /* xh_stbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stbox.cpp; path = ../../src/xrc/xh_stbox.cpp; sourceTree = ""; }; + 1482A34AC32133E4BE207223 /* regexec.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regexec.c; path = ../../src/regex/regexec.c; sourceTree = ""; }; + 149D299A0EDB3D998118EC93 /* tif_color.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_color.c; path = ../../src/tiff/libtiff/tif_color.c; sourceTree = ""; }; + 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jmemmgr.c; path = ../../src/jpeg/jmemmgr.c; sourceTree = ""; }; + 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ownerdrwcmn.cpp; path = ../../src/common/ownerdrwcmn.cpp; sourceTree = ""; }; + 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexInno.cxx; path = ../../src/stc/scintilla/src/LexInno.cxx; sourceTree = ""; }; + 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_unkwn.cpp; path = ../../src/xrc/xh_unkwn.cpp; sourceTree = ""; }; + 160EB9744CB63A0B81DC651F /* hid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hid.cpp; path = ../../src/osx/core/hid.cpp; sourceTree = ""; }; + 1629FA905F903324AA5BE72C /* vscroll.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vscroll.cpp; path = ../../src/generic/vscroll.cpp; sourceTree = ""; }; + 168DB301ACC736FF96D7F581 /* file.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file.cpp; path = ../../src/common/file.cpp; sourceTree = ""; }; + 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCrontab.cxx; path = ../../src/stc/scintilla/src/LexCrontab.cxx; sourceTree = ""; }; + 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gifdecod.cpp; path = ../../src/common/gifdecod.cpp; sourceTree = ""; }; + 1731A6096BFC3A468AB4755A /* tif_open.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_open.c; path = ../../src/tiff/libtiff/tif_open.c; sourceTree = ""; }; + 1731D6708BFE3DE7B101CE74 /* object.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = object.cpp; path = ../../src/common/object.cpp; sourceTree = ""; }; + 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlpars.cpp; path = ../../src/html/htmlpars.cpp; sourceTree = ""; }; + 18044326B5B13A98A49732DD /* fontdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdlg.cpp; path = ../../src/osx/carbon/fontdlg.cpp; sourceTree = ""; }; + 194ADD28300E329E80F7892E /* htmprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmprint.cpp; path = ../../src/html/htmprint.cpp; sourceTree = ""; }; + 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nonownedwnd_osx.cpp; path = ../../src/osx/nonownedwnd_osx.cpp; sourceTree = ""; }; + 19A5AFB993843FF0B8F75E47 /* checkbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checkbox.cpp; path = ../../src/osx/carbon/checkbox.cpp; sourceTree = ""; }; + 1A0650754DC2358CA5933B28 /* pngerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngerror.c; path = ../../src/png/pngerror.c; sourceTree = ""; }; + 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlsub.cpp; path = ../../src/common/ctrlsub.cpp; sourceTree = ""; }; + 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tglbtn_osx.cpp; path = ../../src/osx/tglbtn_osx.cpp; sourceTree = ""; }; + 1B7E02F461A33397B00E9004 /* statbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbmp.cpp; path = ../../src/osx/carbon/statbmp.cpp; sourceTree = ""; }; + 1BB59DD194923D6399087A75 /* graphcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphcmn.cpp; path = ../../src/common/graphcmn.cpp; sourceTree = ""; }; + 1BC0322549563787A21CE8F1 /* LexNsis.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexNsis.cxx; path = ../../src/stc/scintilla/src/LexNsis.cxx; sourceTree = ""; }; + 1BFAF243431D3CA2AA51ADF2 /* gauge.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gauge.cpp; path = ../../src/osx/carbon/gauge.cpp; sourceTree = ""; }; + 1C4762898E5330C28651EE73 /* graphics.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphics.cpp; path = ../../src/osx/carbon/graphics.cpp; sourceTree = ""; }; + 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UniConversion.cxx; path = ../../src/stc/scintilla/src/UniConversion.cxx; sourceTree = ""; }; + 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMSSQL.cxx; path = ../../src/stc/scintilla/src/LexMSSQL.cxx; sourceTree = ""; }; + 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextimagedlg.cpp; path = ../../src/richtext/richtextimagedlg.cpp; sourceTree = ""; }; + 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = ""; }; + 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = ""; }; + 1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = ""; }; + 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = ""; }; + 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = ""; }; + 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pickerbase.cpp; path = ../../src/common/pickerbase.cpp; sourceTree = ""; }; + 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_ojpeg.c; path = ../../src/tiff/libtiff/tif_ojpeg.c; sourceTree = ""; }; + 20B922D61CDB3CCEB59A5194 /* convauto.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = convauto.cpp; path = ../../src/common/convauto.cpp; sourceTree = ""; }; + 20E4A10BCD773C84AEC481A1 /* jdmarker.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmarker.c; path = ../../src/jpeg/jdmarker.c; sourceTree = ""; }; + 2128AD8BD12E3F33AD57478E /* overlay.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = overlay.cpp; path = ../../src/osx/carbon/overlay.cpp; sourceTree = ""; }; + 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_tree.cpp; path = ../../src/xrc/xh_tree.cpp; sourceTree = ""; }; + 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcscreen.cpp; path = ../../src/osx/carbon/dcscreen.cpp; sourceTree = ""; }; + 22D9626646773CED82449D5D /* persist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = persist.cpp; path = ../../src/common/persist.cpp; sourceTree = ""; }; + 2334539088B036BEAB230D1C /* filectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filectrlg.cpp; path = ../../src/generic/filectrlg.cpp; sourceTree = ""; }; + 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextstyledlg.cpp; path = ../../src/richtext/richtextstyledlg.cpp; sourceTree = ""; }; + 238741BDA2C73E56899CCB04 /* dcprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcprint.cpp; path = ../../src/osx/carbon/dcprint.cpp; sourceTree = ""; }; + 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clipcmn.cpp; path = ../../src/common/clipcmn.cpp; sourceTree = ""; }; + 23FC98E2305230E2990471E3 /* wxcrt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wxcrt.cpp; path = ../../src/common/wxcrt.cpp; sourceTree = ""; }; + 242BF97B558634A79322052C /* prntbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prntbase.cpp; path = ../../src/common/prntbase.cpp; sourceTree = ""; }; + 24396D584D053948A3FF0DCD /* imagpng.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpng.cpp; path = ../../src/common/imagpng.cpp; sourceTree = ""; }; + 24930711031D35288D28B04B /* choiccmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choiccmn.cpp; path = ../../src/common/choiccmn.cpp; sourceTree = ""; }; + 24DF23D67E693D999B875101 /* toolbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbkg.cpp; path = ../../src/generic/toolbkg.cpp; sourceTree = ""; }; + 24E82A05E9A9323287CDB15B /* artstd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artstd.cpp; path = ../../src/common/artstd.cpp; sourceTree = ""; }; + 25C86D3D4839343BA1D8BDEE /* xti.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xti.cpp; path = ../../src/common/xti.cpp; sourceTree = ""; }; + 26381308E32A3A179E7A9B40 /* gridsel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridsel.cpp; path = ../../src/generic/gridsel.cpp; sourceTree = ""; }; + 26632A254717372BAA4D514D /* framemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = framemanager.cpp; path = ../../src/aui/framemanager.cpp; sourceTree = ""; }; + 26D7C4995D7A35A1854B533F /* window_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = window_osx.cpp; path = ../../src/osx/window_osx.cpp; sourceTree = ""; }; + 271B4B77622B3411A7BF6634 /* dataobj.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dataobj.cpp; path = ../../src/osx/carbon/dataobj.cpp; sourceTree = ""; }; + 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statlinecmn.cpp; path = ../../src/common/statlinecmn.cpp; sourceTree = ""; }; + 29387393C07C39DB8FF1663B /* artprov.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artprov.cpp; path = ../../src/common/artprov.cpp; sourceTree = ""; }; + 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlrsall.cpp; path = ../../src/xrc/xmlrsall.cpp; sourceTree = ""; }; + 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg.c; path = ../../src/tiff/libtiff/tif_jpeg.c; sourceTree = ""; }; + 29D6506AEA5A323B8735F126 /* pngread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngread.c; path = ../../src/png/pngread.c; sourceTree = ""; }; + 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridctrl.cpp; path = ../../src/generic/gridctrl.cpp; sourceTree = ""; }; + 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerPro.cxx; path = ../../src/stc/scintilla/src/LexPowerPro.cxx; sourceTree = ""; }; + 2A67053D16D63C588E555C84 /* dragimgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dragimgg.cpp; path = ../../src/generic/dragimgg.cpp; sourceTree = ""; }; + 2ACC8667173D3AB09F6214F4 /* sound.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound.cpp; path = ../../src/osx/carbon/sound.cpp; sourceTree = ""; }; + 2AF7739C389536F79DAA31E5 /* Selection.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Selection.cxx; path = ../../src/stc/scintilla/src/Selection.cxx; sourceTree = ""; }; + 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = utilscocoa.mm; path = ../../src/osx/carbon/utilscocoa.mm; sourceTree = ""; }; + 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSQL.cxx; path = ../../src/stc/scintilla/src/LexSQL.cxx; sourceTree = ""; }; + 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clrpickerg.cpp; path = ../../src/generic/clrpickerg.cpp; sourceTree = ""; }; + 2C090A76B6F23E6481A27282 /* ipcbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ipcbase.cpp; path = ../../src/common/ipcbase.cpp; sourceTree = ""; }; + 2C6C4F5468743265A02D656C /* htmlfilt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlfilt.cpp; path = ../../src/html/htmlfilt.cpp; sourceTree = ""; }; + 2C904B4BA8273355869812B2 /* clntdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clntdata.cpp; path = ../../src/common/clntdata.cpp; sourceTree = ""; }; + 2D61240ABD70328BA5789663 /* colourcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourcmn.cpp; path = ../../src/common/colourcmn.cpp; sourceTree = ""; }; + 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpwnd.cpp; path = ../../src/html/helpwnd.cpp; sourceTree = ""; }; + 2DF2456ED905357B8C1D74D9 /* webkit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = webkit.mm; path = ../../src/html/htmlctrl/webkit/webkit.mm; sourceTree = ""; }; + 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontutilcmn.cpp; path = ../../src/common/fontutilcmn.cpp; sourceTree = ""; }; + 2E24C6F2A04E30EB95598305 /* chm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = chm.cpp; path = ../../src/html/chm.cpp; sourceTree = ""; }; + 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = epolldispatcher.cpp; path = ../../src/unix/epolldispatcher.cpp; sourceTree = ""; }; + 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexScriptol.cxx; path = ../../src/stc/scintilla/src/LexScriptol.cxx; sourceTree = ""; }; + 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mimecmn.cpp; path = ../../src/common/mimecmn.cpp; sourceTree = ""; }; + 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMySQL.cxx; path = ../../src/stc/scintilla/src/LexMySQL.cxx; sourceTree = ""; }; + 2F41EDEB298538CC86FF6DC1 /* jcparam.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcparam.c; path = ../../src/jpeg/jcparam.c; sourceTree = ""; }; + 2F94CF171F4532B89FECF475 /* busyinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = busyinfo.cpp; path = ../../src/generic/busyinfo.cpp; sourceTree = ""; }; + 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_predict.c; path = ../../src/tiff/libtiff/tif_predict.c; sourceTree = ""; }; + 302A13BC64C238A297F4399F /* brush.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brush.cpp; path = ../../src/osx/brush.cpp; sourceTree = ""; }; + 303ACF199BE431BD891C9301 /* overlaycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = overlaycmn.cpp; path = ../../src/common/overlaycmn.cpp; sourceTree = ""; }; + 305614D19CF23CB2B14A5B2E /* tif_flush.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_flush.c; path = ../../src/tiff/libtiff/tif_flush.c; sourceTree = ""; }; + 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../src/stc/scintilla/src/LexGAP.cxx; sourceTree = ""; }; + 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontcmn.cpp; path = ../../src/common/fontcmn.cpp; sourceTree = ""; }; + 30FD1048328234E59D319863 /* tif_fax3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3.c; path = ../../src/tiff/libtiff/tif_fax3.c; sourceTree = ""; }; + 31F4B9B03D52339B8F82C114 /* variant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = variant.cpp; path = ../../src/common/variant.cpp; sourceTree = ""; }; + 326723AEB79A305F90D6B41D /* advprops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = advprops.cpp; path = ../../src/propgrid/advprops.cpp; sourceTree = ""; }; + 32B2BC8A91983DDA9CC46793 /* statbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbox.cpp; path = ../../src/osx/carbon/statbox.cpp; sourceTree = ""; }; + 343D4FDD5CC030618EF24729 /* dcmemory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcmemory.cpp; path = ../../src/osx/core/dcmemory.cpp; sourceTree = ""; }; + 346C68F0CCD23823B78267F0 /* tif_lzw.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_lzw.c; path = ../../src/tiff/libtiff/tif_lzw.c; sourceTree = ""; }; + 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../src/stc/scintilla/src/LexSmalltalk.cxx; sourceTree = ""; }; + 358D0A3AC73F322EA732D020 /* pngrutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../../src/png/pngrutil.c; sourceTree = ""; }; + 36E1DBA275AD325DB759C180 /* fontenum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenum.cpp; path = ../../src/osx/core/fontenum.cpp; sourceTree = ""; }; + 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../src/stc/scintilla/src/LexPowerShell.cxx; sourceTree = ""; }; + 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tokenzr.cpp; path = ../../src/common/tokenzr.cpp; sourceTree = ""; }; + 373242CD08F330208A7CF438 /* fontenumcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenumcmn.cpp; path = ../../src/common/fontenumcmn.cpp; sourceTree = ""; }; + 374E341C8703367686DEDE93 /* jmemnobs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jmemnobs.c; path = ../../src/jpeg/jmemnobs.c; sourceTree = ""; }; + 375E7A99FF4C38FA9E223772 /* LexAda.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAda.cxx; path = ../../src/stc/scintilla/src/LexAda.cxx; sourceTree = ""; }; + 375FF97B202F3C359402D13E /* jdpostct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdpostct.c; path = ../../src/jpeg/jdpostct.c; sourceTree = ""; }; + 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gdiobj.cpp; path = ../../src/osx/carbon/gdiobj.cpp; sourceTree = ""; }; + 38891BF8F51E398F9082903F /* LexTAL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTAL.cxx; path = ../../src/stc/scintilla/src/LexTAL.cxx; sourceTree = ""; }; + 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DocumentAccessor.cxx; path = ../../src/stc/scintilla/src/DocumentAccessor.cxx; sourceTree = ""; }; + 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = fontdlgosx.mm; path = ../../src/osx/carbon/fontdlgosx.mm; sourceTree = ""; }; + 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_slidr.cpp; path = ../../src/xrc/xh_slidr.cpp; sourceTree = ""; }; + 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbuttn_osx.cpp; path = ../../src/osx/bmpbuttn_osx.cpp; sourceTree = ""; }; + 39B825E5EAB43D9ABDCEB2CD /* drawer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = drawer.cpp; path = ../../src/osx/carbon/drawer.cpp; sourceTree = ""; }; + 3A28411B852734BDA2C04165 /* stattext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattext.cpp; path = ../../src/osx/carbon/stattext.cpp; sourceTree = ""; }; + 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = styleparams.cpp; path = ../../src/html/styleparams.cpp; sourceTree = ""; }; + 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdiounix.cpp; path = ../../src/unix/fdiounix.cpp; sourceTree = ""; }; + 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolb.cpp; path = ../../src/xrc/xh_toolb.cpp; sourceTree = ""; }; + 3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = ""; }; + 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = ""; }; + 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = ""; }; + 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = ""; }; + 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = ""; }; + 3E3043D7BE9C33B59E900CCE /* jcmaster.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmaster.c; path = ../../src/jpeg/jcmaster.c; sourceTree = ""; }; + 3E6F40F4740C3ED29D83E107 /* tif_version.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_version.c; path = ../../src/tiff/libtiff/tif_version.c; sourceTree = ""; }; + 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dobjcmn.cpp; path = ../../src/common/dobjcmn.cpp; sourceTree = ""; }; + 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gallery.cpp; path = ../../src/ribbon/gallery.cpp; sourceTree = ""; }; + 3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = ""; }; + 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = ""; }; + 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = ""; }; + 4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = ""; }; + 40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/src/LexLisp.cxx; sourceTree = ""; }; + 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = ""; }; + 40CE02524DD4385AB2C3DF95 /* socket.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = socket.cpp; path = ../../src/common/socket.cpp; sourceTree = ""; }; + 4148D62D50863214B8479E60 /* statlmac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statlmac.cpp; path = ../../src/osx/carbon/statlmac.cpp; sourceTree = ""; }; + 4188821BBA833CCAA678B234 /* utilscmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilscmn.cpp; path = ../../src/common/utilscmn.cpp; sourceTree = ""; }; + 418AD9241B673308BE31DC06 /* xlocale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xlocale.cpp; path = ../../src/common/xlocale.cpp; sourceTree = ""; }; + 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = renderer.cpp; path = ../../src/osx/carbon/renderer.cpp; sourceTree = ""; }; + 42E433D1700631A8907B8227 /* helpctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpctrl.cpp; path = ../../src/html/helpctrl.cpp; sourceTree = ""; }; + 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filtall.cpp; path = ../../src/common/filtall.cpp; sourceTree = ""; }; + 44806DDCE6FB305EAED41E92 /* menuitem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem.cpp; path = ../../src/osx/carbon/menuitem.cpp; sourceTree = ""; }; + 4549845C0751356A907C23E0 /* jdtrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdtrans.c; path = ../../src/jpeg/jdtrans.c; sourceTree = ""; }; + 45860601270D318D93BEE1F3 /* LexMagik.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMagik.cxx; path = ../../src/stc/scintilla/src/LexMagik.cxx; sourceTree = ""; }; + 4592464D4868329897F3864D /* LexSpice.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpice.cxx; path = ../../src/stc/scintilla/src/LexSpice.cxx; sourceTree = ""; }; + 45D7558DF5E03A2EB41883F0 /* pngwutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = ../../src/png/pngwutil.c; sourceTree = ""; }; + 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fldlgcmn.cpp; path = ../../src/common/fldlgcmn.cpp; sourceTree = ""; }; + 4692909E4B823F71822B13F8 /* taskbarcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = taskbarcmn.cpp; path = ../../src/common/taskbarcmn.cpp; sourceTree = ""; }; + 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatcherg.cpp; path = ../../src/generic/fswatcherg.cpp; sourceTree = ""; }; + 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextbuffer.cpp; path = ../../src/richtext/richtextbuffer.cpp; sourceTree = ""; }; + 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdiodispatcher.cpp; path = ../../src/common/fdiodispatcher.cpp; sourceTree = ""; }; + 47FF6D792CA234C395692118 /* PlatWX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlatWX.cpp; path = ../../src/stc/PlatWX.cpp; sourceTree = ""; }; + 4867546E8B8D3C8683A23ED5 /* any.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = any.cpp; path = ../../src/common/any.cpp; sourceTree = ""; }; + 48D72D20DB1D3E1CA5ED112A /* effects.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effects.cpp; path = ../../src/common/effects.cpp; sourceTree = ""; }; + 48F1439BF6C3361296F05A33 /* tif_error.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_error.c; path = ../../src/tiff/libtiff/tif_error.c; sourceTree = ""; }; + 49612306912038DDBCABB4DE /* url.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = url.cpp; path = ../../src/common/url.cpp; sourceTree = ""; }; + 496674699F173A5385EAFF07 /* calctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = calctrlg.cpp; path = ../../src/generic/calctrlg.cpp; sourceTree = ""; }; + 4969528429903F15882F5391 /* sockosx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockosx.cpp; path = ../../src/osx/core/sockosx.cpp; sourceTree = ""; }; + 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAPDL.cxx; path = ../../src/stc/scintilla/src/LexAPDL.cxx; sourceTree = ""; }; + 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_propdlg.cpp; path = ../../src/xrc/xh_propdlg.cpp; sourceTree = ""; }; + 49CABA38E78D34DFA260AA06 /* renderg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = renderg.cpp; path = ../../src/generic/renderg.cpp; sourceTree = ""; }; + 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmdproc.cpp; path = ../../src/common/cmdproc.cpp; sourceTree = ""; }; + 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBaan.cxx; path = ../../src/stc/scintilla/src/LexBaan.cxx; sourceTree = ""; }; + 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCaml.cxx; path = ../../src/stc/scintilla/src/LexCaml.cxx; sourceTree = ""; }; + 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = ""; }; + 4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = ""; }; + 4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = ""; }; + 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/src/LexCSS.cxx; sourceTree = ""; }; + 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = ""; }; + 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexProgress.cxx; path = ../../src/stc/scintilla/src/LexProgress.cxx; sourceTree = ""; }; + 4FC2F076657431458896115A /* checkboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checkboxcmn.cpp; path = ../../src/common/checkboxcmn.cpp; sourceTree = ""; }; + 4FDE5A962FA234FA83A605AD /* Indicator.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Indicator.cxx; path = ../../src/stc/scintilla/src/Indicator.cxx; sourceTree = ""; }; + 4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = ""; }; + 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/src/LexSpecman.cxx; sourceTree = ""; }; + 5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/src/LexLua.cxx; sourceTree = ""; }; + 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = ""; }; + 5219A792C6A736F193D4A82F /* ContractionState.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../src/stc/scintilla/src/ContractionState.cxx; sourceTree = ""; }; + 5248A45AB113341EAC361910 /* notebook_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notebook_osx.cpp; path = ../../src/osx/notebook_osx.cpp; sourceTree = ""; }; + 52FE1599218730CC99A3F801 /* m_dflist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_dflist.cpp; path = ../../src/html/m_dflist.cpp; sourceTree = ""; }; + 530DC2E26BF2313E8702AD43 /* popupwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = popupwin.cpp; path = ../../src/osx/carbon/popupwin.cpp; sourceTree = ""; }; + 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiocmn.cpp; path = ../../src/common/radiocmn.cpp; sourceTree = ""; }; + 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_text.cpp; path = ../../src/xrc/xh_text.cpp; sourceTree = ""; }; + 53D06E47477B3E32BB6B915E /* jcsample.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcsample.c; path = ../../src/jpeg/jcsample.c; sourceTree = ""; }; + 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox_osx.cpp; path = ../../src/osx/combobox_osx.cpp; sourceTree = ""; }; + 5466CC2D6579360E9C665EE5 /* memory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = memory.cpp; path = ../../src/common/memory.cpp; sourceTree = ""; }; + 548906E4E72935E48CE4AF87 /* m_image.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_image.cpp; path = ../../src/html/m_image.cpp; sourceTree = ""; }; + 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattextcmn.cpp; path = ../../src/common/stattextcmn.cpp; sourceTree = ""; }; + 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = zipstrm.cpp; path = ../../src/common/zipstrm.cpp; sourceTree = ""; }; + 552757A901E732CAA8E3F16D /* list.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = list.cpp; path = ../../src/common/list.cpp; sourceTree = ""; }; + 55EBB18CB4773C788510B14B /* LexEiffel.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexEiffel.cxx; path = ../../src/stc/scintilla/src/LexEiffel.cxx; sourceTree = ""; }; + 5612DBC4125B379DA2B28824 /* buttonbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = buttonbar.cpp; path = ../../src/generic/buttonbar.cpp; sourceTree = ""; }; + 5612DBC4125B379DA2B28825 /* buttonbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = buttonbar.cpp; path = ../../src/ribbon/buttonbar.cpp; sourceTree = ""; }; + 56653FACC7D13804A70556AD /* sckfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckfile.cpp; path = ../../src/common/sckfile.cpp; sourceTree = ""; }; + 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gaugecmn.cpp; path = ../../src/common/gaugecmn.cpp; sourceTree = ""; }; + 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listbk.cpp; path = ../../src/xrc/xh_listbk.cpp; sourceTree = ""; }; + 580AFC66F3003582B43043B1 /* animateg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animateg.cpp; path = ../../src/generic/animateg.cpp; sourceTree = ""; }; + 58421C141C9E31C6A7A3C183 /* filefn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filefn.cpp; path = ../../src/common/filefn.cpp; sourceTree = ""; }; + 58E1F571B01F34D4AB70CA18 /* property.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = property.cpp; path = ../../src/propgrid/property.cpp; sourceTree = ""; }; + 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexEScript.cxx; path = ../../src/stc/scintilla/src/LexEScript.cxx; sourceTree = ""; }; + 59255501B8053FEE8F258873 /* dirdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirdlg.cpp; path = ../../src/osx/carbon/dirdlg.cpp; sourceTree = ""; }; + 59572A234F0636D78BFD9F6B /* spinctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctlg.cpp; path = ../../src/generic/spinctlg.cpp; sourceTree = ""; }; + 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdatadst.c; path = ../../src/jpeg/jdatadst.c; sourceTree = ""; }; + 59C6B9849FF6325E890942EF /* xmlrole.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmlrole.c; path = ../../src/expat/lib/xmlrole.c; sourceTree = ""; }; + 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choice_osx.cpp; path = ../../src/osx/choice_osx.cpp; sourceTree = ""; }; + 59ED0C057D8F388A89DC7177 /* page.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = page.cpp; path = ../../src/ribbon/page.cpp; sourceTree = ""; }; + 59F8B419381C34A184190EA1 /* radiobut.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobut.cpp; path = ../../src/osx/carbon/radiobut.cpp; sourceTree = ""; }; + 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filectrlcmn.cpp; path = ../../src/common/filectrlcmn.cpp; sourceTree = ""; }; + 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_radbt.cpp; path = ../../src/xrc/xh_radbt.cpp; sourceTree = ""; }; + 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CharClassify.cxx; path = ../../src/stc/scintilla/src/CharClassify.cxx; sourceTree = ""; }; + 5B32A13D5B3336098B1B9765 /* pngtrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../../src/png/pngtrans.c; sourceTree = ""; }; + 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloop_cf.cpp; path = ../../src/osx/core/evtloop_cf.cpp; sourceTree = ""; }; + 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jutils.c; path = ../../src/jpeg/jutils.c; sourceTree = ""; }; + 5C85865D28DC31649440A921 /* imagxpm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagxpm.cpp; path = ../../src/common/imagxpm.cpp; sourceTree = ""; }; + 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_filepicker.cpp; path = ../../src/xrc/xh_filepicker.cpp; sourceTree = ""; }; + 5CB4781DF8C432C688F30CDD /* ftp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ftp.cpp; path = ../../src/common/ftp.cpp; sourceTree = ""; }; + 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printmac.cpp; path = ../../src/osx/core/printmac.cpp; sourceTree = ""; }; + 5D2F8259CC99380CB8217DEF /* tif_unix.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_unix.c; path = ../../src/tiff/libtiff/tif_unix.c; sourceTree = ""; }; + 5D90D0FA35833140A3CCCD94 /* tooltip.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tooltip.cpp; path = ../../src/osx/carbon/tooltip.cpp; sourceTree = ""; }; + 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cairo.cpp; path = ../../src/common/cairo.cpp; sourceTree = ""; }; + 5DE635F30F3935099AF1486C /* stattextg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattextg.cpp; path = ../../src/generic/stattextg.cpp; sourceTree = ""; }; + 5DF561FCD0C038B79C62B083 /* dialog.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dialog.cpp; path = ../../src/osx/carbon/dialog.cpp; sourceTree = ""; }; + 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinbutt_osx.cpp; path = ../../src/osx/spinbutt_osx.cpp; sourceTree = ""; }; + 5E463A493FD930DE80E58608 /* pngset.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngset.c; path = ../../src/png/pngset.c; sourceTree = ""; }; + 5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dataview_osx.cpp; path = ../../src/osx/dataview_osx.cpp; sourceTree = ""; }; + 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listbkg.cpp; path = ../../src/generic/listbkg.cpp; sourceTree = ""; }; + 5ED2105A5A033E3384EBC4ED /* selstore.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = selstore.cpp; path = ../../src/generic/selstore.cpp; sourceTree = ""; }; + 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdrepdlg.cpp; path = ../../src/generic/fdrepdlg.cpp; sourceTree = ""; }; + 5F3D473DC5123EDAB767045C /* datavgen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavgen.cpp; path = ../../src/generic/datavgen.cpp; sourceTree = ""; }; + 5F555177554E398286DBC6FB /* xh_stlin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stlin.cpp; path = ../../src/xrc/xh_stlin.cpp; sourceTree = ""; }; + 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listc.cpp; path = ../../src/xrc/xh_listc.cpp; sourceTree = ""; }; + 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textentrycmn.cpp; path = ../../src/common/textentrycmn.cpp; sourceTree = ""; }; + 5F84098A475939BB9EE87E70 /* imagbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagbmp.cpp; path = ../../src/common/imagbmp.cpp; sourceTree = ""; }; + 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_comboctrl.cpp; path = ../../src/xrc/xh_comboctrl.cpp; sourceTree = ""; }; + 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexOpal.cxx; path = ../../src/stc/scintilla/src/LexOpal.cxx; sourceTree = ""; }; + 5FF661188B563D27A11F5716 /* fontutil.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontutil.cpp; path = ../../src/osx/fontutil.cpp; sourceTree = ""; }; + 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobut_osx.cpp; path = ../../src/osx/radiobut_osx.cpp; sourceTree = ""; }; + 5FFCF47A161B3E08B19BFE14 /* jdsample.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdsample.c; path = ../../src/jpeg/jdsample.c; sourceTree = ""; }; + 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbar_osx.cpp; path = ../../src/osx/scrolbar_osx.cpp; sourceTree = ""; }; + 607EF0043E723B7B9BE101EA /* wxprintf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wxprintf.cpp; path = ../../src/common/wxprintf.cpp; sourceTree = ""; }; + 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_filectrl.cpp; path = ../../src/xrc/xh_filectrl.cpp; sourceTree = ""; }; + 61658C3EABB4341AA38C691E /* m_pre.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_pre.cpp; path = ../../src/html/m_pre.cpp; sourceTree = ""; }; + 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fileconf.cpp; path = ../../src/common/fileconf.cpp; sourceTree = ""; }; + 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPLM.cxx; path = ../../src/stc/scintilla/src/LexPLM.cxx; sourceTree = ""; }; + 63867276260C3F4A980E83D8 /* rgncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rgncmn.cpp; path = ../../src/common/rgncmn.cpp; sourceTree = ""; }; + 640783FBACA43206B782C77B /* evtloopcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloopcmn.cpp; path = ../../src/common/evtloopcmn.cpp; sourceTree = ""; }; + 646743F6FDFE3ACFA1A79B40 /* jidctred.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctred.c; path = ../../src/jpeg/jidctred.c; sourceTree = ""; }; + 64B25B87203E3464BCDD277D /* tif_read.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_read.c; path = ../../src/tiff/libtiff/tif_read.c; sourceTree = ""; }; + 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prntdlgg.cpp; path = ../../src/generic/prntdlgg.cpp; sourceTree = ""; }; + 66411D54BAD338498AC59401 /* xh_scrol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_scrol.cpp; path = ../../src/xrc/xh_scrol.cpp; sourceTree = ""; }; + 66426B63AA3E3A279936C034 /* grideditors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = grideditors.cpp; path = ../../src/generic/grideditors.cpp; sourceTree = ""; }; + 664736BDE465350C9C4750E9 /* jcmarker.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmarker.c; path = ../../src/jpeg/jcmarker.c; sourceTree = ""; }; + 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colrdlgg.cpp; path = ../../src/generic/colrdlgg.cpp; sourceTree = ""; }; + 66C21CA37BF63893887FD91B /* menu_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menu_osx.cpp; path = ../../src/osx/menu_osx.cpp; sourceTree = ""; }; + 66FDA882451239EA8DF2E0B5 /* tif_luv.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_luv.c; path = ../../src/tiff/libtiff/tif_luv.c; sourceTree = ""; }; + 6718204F4700318E89EAC906 /* LexBullant.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBullant.cxx; path = ../../src/stc/scintilla/src/LexBullant.cxx; sourceTree = ""; }; + 67D76B026121359F9B22F8B0 /* languageinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = languageinfo.cpp; path = ../../src/common/languageinfo.cpp; sourceTree = ""; }; + 67DCEEB6861731319C30817F /* cshelp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cshelp.cpp; path = ../../src/common/cshelp.cpp; sourceTree = ""; }; + 684D92E552BE313CBE0A88AA /* valnum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valnum.cpp; path = ../../src/common/valnum.cpp; sourceTree = ""; }; + 6876262846EA3569B36D92E9 /* imagjpeg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagjpeg.cpp; path = ../../src/common/imagjpeg.cpp; sourceTree = ""; }; + 68B81FBDA49D3C1991B6356A /* jdcolor.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdcolor.c; path = ../../src/jpeg/jdcolor.c; sourceTree = ""; }; + 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_thunder.c; path = ../../src/tiff/libtiff/tif_thunder.c; sourceTree = ""; }; + 68E5188DB6003C35A8C7754D /* htmlcell.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlcell.cpp; path = ../../src/html/htmlcell.cpp; sourceTree = ""; }; + 693F731B7D1730A79485F9EC /* minifram.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = minifram.cpp; path = ../../src/osx/minifram.cpp; sourceTree = ""; }; + 69A6CAF721E53E83B4820DE6 /* pngwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = ../../src/png/pngwrite.c; sourceTree = ""; }; + 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = numdlgg.cpp; path = ../../src/generic/numdlgg.cpp; sourceTree = ""; }; + 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgridiface.cpp; path = ../../src/propgrid/propgridiface.cpp; sourceTree = ""; }; + 69F098E47EBF34368ABAE7ED /* timer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timer.cpp; path = ../../src/osx/core/timer.cpp; sourceTree = ""; }; + 6A82EDCFFBAC30098B238957 /* caret.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = caret.cpp; path = ../../src/generic/caret.cpp; sourceTree = ""; }; + 6AC666417602346EA583709E /* translation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = translation.cpp; path = ../../src/common/translation.cpp; sourceTree = ""; }; + 6BC0A61629E635FAB4E09505 /* geometry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = geometry.cpp; path = ../../src/common/geometry.cpp; sourceTree = ""; }; + 6BC93D1DE277395592610085 /* propdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propdlg.cpp; path = ../../src/generic/propdlg.cpp; sourceTree = ""; }; + 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = numformatter.cpp; path = ../../src/common/numformatter.cpp; sourceTree = ""; }; + 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textctrl_osx.cpp; path = ../../src/osx/textctrl_osx.cpp; sourceTree = ""; }; + 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbar_osx.cpp; path = ../../src/osx/toolbar_osx.cpp; sourceTree = ""; }; + 6DBF3053414F3C448312165A /* jcdctmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcdctmgr.c; path = ../../src/jpeg/jcdctmgr.c; sourceTree = ""; }; + 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_sizer.cpp; path = ../../src/xrc/xh_sizer.cpp; sourceTree = ""; }; + 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = ""; }; + 6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = ""; }; + 701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = ""; }; + 70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = ""; }; + 7195E665E0F233839B967FC9 /* timercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timercmn.cpp; path = ../../src/common/timercmn.cpp; sourceTree = ""; }; + 71DB140E670738839EC42C2B /* Document.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Document.cxx; path = ../../src/stc/scintilla/src/Document.cxx; sourceTree = ""; }; + 71F35835D4DE34D59F924E36 /* tglbtn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tglbtn.cpp; path = ../../src/osx/carbon/tglbtn.cpp; sourceTree = ""; }; + 724927B0045F3CC0884878BB /* radiobtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobtncmn.cpp; path = ../../src/common/radiobtncmn.cpp; sourceTree = ""; }; + 7255468B6D5F3D8697994A53 /* LexR.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexR.cxx; path = ../../src/stc/scintilla/src/LexR.cxx; sourceTree = ""; }; + 725574EF98C4301989181CBF /* jctrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jctrans.c; path = ../../src/jpeg/jctrans.c; sourceTree = ""; }; + 726C0457DF1232C793918DC1 /* tif_zip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_zip.c; path = ../../src/tiff/libtiff/tif_zip.c; sourceTree = ""; }; + 7273A7E255323EB3B391D997 /* headerctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headerctrlg.cpp; path = ../../src/generic/headerctrlg.cpp; sourceTree = ""; }; + 727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = ""; }; + 72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = ""; }; + 72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = ""; }; + 75278C04709D3482A2660DFC /* slider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slider.cpp; path = ../../src/osx/carbon/slider.cpp; sourceTree = ""; }; + 757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = ""; }; + 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpbase.cpp; path = ../../src/common/stdpbase.cpp; sourceTree = ""; }; + 75D0C937F2A03ADA8581A2BB /* arcall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arcall.cpp; path = ../../src/common/arcall.cpp; sourceTree = ""; }; + 76337016F2CA3C85831702E6 /* grid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = grid.cpp; path = ../../src/generic/grid.cpp; sourceTree = ""; }; + 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbtncmn.cpp; path = ../../src/common/bmpbtncmn.cpp; sourceTree = ""; }; + 773D91F8280434519BD167EA /* radiobox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobox_osx.cpp; path = ../../src/osx/radiobox_osx.cpp; sourceTree = ""; }; + 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcgraph.cpp; path = ../../src/common/dcgraph.cpp; sourceTree = ""; }; + 777385D10CCC350C90F02824 /* textentry_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textentry_osx.cpp; path = ../../src/osx/textentry_osx.cpp; sourceTree = ""; }; + 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = aboutdlgg.cpp; path = ../../src/generic/aboutdlgg.cpp; sourceTree = ""; }; + 77F5E7BCD9B2307D8DBCC052 /* font.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = font.cpp; path = ../../src/osx/carbon/font.cpp; sourceTree = ""; }; + 78D7866F95C73A28BB540606 /* LexBash.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBash.cxx; path = ../../src/stc/scintilla/src/LexBash.cxx; sourceTree = ""; }; + 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombo.cpp; path = ../../src/generic/odcombo.cpp; sourceTree = ""; }; + 7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = ""; }; + 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = ""; }; + 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = ""; }; + 7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = ""; }; + 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/src/LexCmake.cxx; sourceTree = ""; }; + 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glgrab.cpp; path = ../../src/osx/core/glgrab.cpp; sourceTree = ""; }; + 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths_cf.cpp; path = ../../src/osx/core/stdpaths_cf.cpp; sourceTree = ""; }; + 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = protocol.cpp; path = ../../src/common/protocol.cpp; sourceTree = ""; }; + 7BA6ADD758693BD180D3275B /* treebase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebase.cpp; path = ../../src/common/treebase.cpp; sourceTree = ""; }; + 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctrl_osx.cpp; path = ../../src/osx/srchctrl_osx.cpp; sourceTree = ""; }; + 7C97C1F26B5A38C49543060C /* mimetype.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mimetype.cpp; path = ../../src/osx/core/mimetype.cpp; sourceTree = ""; }; + 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattext_osx.cpp; path = ../../src/osx/stattext_osx.cpp; sourceTree = ""; }; + 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatchercmn.cpp; path = ../../src/common/fswatchercmn.cpp; sourceTree = ""; }; + 7D47A353B2C63204ABDD42DE /* filedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filedlg.cpp; path = ../../src/osx/carbon/filedlg.cpp; sourceTree = ""; }; + 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSorcus.cxx; path = ../../src/stc/scintilla/src/LexSorcus.cxx; sourceTree = ""; }; + 7D90D14874FD38079835AF0B /* editlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = editlbox.cpp; path = ../../src/generic/editlbox.cpp; sourceTree = ""; }; + 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RunStyles.cxx; path = ../../src/stc/scintilla/src/RunStyles.cxx; sourceTree = ""; }; + 7EB95BCFA255323183A996C9 /* m_style.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_style.cpp; path = ../../src/html/m_style.cpp; sourceTree = ""; }; + 7EE2459D69BA35838C274488 /* LexCLW.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCLW.cxx; path = ../../src/stc/scintilla/src/LexCLW.cxx; sourceTree = ""; }; + 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treectlg.cpp; path = ../../src/generic/treectlg.cpp; sourceTree = ""; }; + 7FCA75FE592C3469AE351FBF /* winpars.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = winpars.cpp; path = ../../src/html/winpars.cpp; sourceTree = ""; }; + 7FE0455EBDC63D82B2D88587 /* jcprepct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcprepct.c; path = ../../src/jpeg/jcprepct.c; sourceTree = ""; }; + 810EB7316DF3344197C78EC0 /* jcmainct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmainct.c; path = ../../src/jpeg/jcmainct.c; sourceTree = ""; }; + 81390F96937631078EFCD891 /* utilsexc_base.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_base.cpp; path = ../../src/osx/core/utilsexc_base.cpp; sourceTree = ""; }; + 81821049E39B32C6ABCF6820 /* helpdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpdlg.cpp; path = ../../src/html/helpdlg.cpp; sourceTree = ""; }; + 81A30C745CA73E30B788B408 /* image.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = image.cpp; path = ../../src/common/image.cpp; sourceTree = ""; }; + 81B3DFBB73573FFDBD320334 /* datstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datstrm.cpp; path = ../../src/common/datstrm.cpp; sourceTree = ""; }; + 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpfrm.cpp; path = ../../src/html/helpfrm.cpp; sourceTree = ""; }; + 832BBBFE664736D5978420C6 /* fmapbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fmapbase.cpp; path = ../../src/common/fmapbase.cpp; sourceTree = ""; }; + 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stbmp.cpp; path = ../../src/xrc/xh_stbmp.cpp; sourceTree = ""; }; + 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklstcmn.cpp; path = ../../src/common/checklstcmn.cpp; sourceTree = ""; }; + 84758329F2163F00A9C005DF /* collpaneg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = collpaneg.cpp; path = ../../src/generic/collpaneg.cpp; sourceTree = ""; }; + 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_gdctl.cpp; path = ../../src/xrc/xh_gdctl.cpp; sourceTree = ""; }; + 84A7A3B499503ECABC6A838F /* btncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = btncmn.cpp; path = ../../src/common/btncmn.cpp; sourceTree = ""; }; + 8555204EBA8930809B732842 /* accesscmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accesscmn.cpp; path = ../../src/common/accesscmn.cpp; sourceTree = ""; }; + 861438BD294335D4B859EA71 /* toplvcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toplvcmn.cpp; path = ../../src/common/toplvcmn.cpp; sourceTree = ""; }; + 864438709B363773B8C3382D /* datetimefmt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datetimefmt.cpp; path = ../../src/common/datetimefmt.cpp; sourceTree = ""; }; + 8685B8ED68F23DB0B770FD74 /* xmltok.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmltok.c; path = ../../src/expat/lib/xmltok.c; sourceTree = ""; }; + 86884BC843F6337EABF744BB /* jdapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapimin.c; path = ../../src/jpeg/jdapimin.c; sourceTree = ""; }; + 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexFortran.cxx; path = ../../src/stc/scintilla/src/LexFortran.cxx; sourceTree = ""; }; + 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPascal.cxx; path = ../../src/stc/scintilla/src/LexPascal.cxx; sourceTree = ""; }; + 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxdebug.xcconfig; sourceTree = ""; }; + 8734C52C7559310784396455 /* LexRuby.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRuby.cxx; path = ../../src/stc/scintilla/src/LexRuby.cxx; sourceTree = ""; }; + 8744F2C80ECF375999195935 /* LexPB.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPB.cxx; path = ../../src/stc/scintilla/src/LexPB.cxx; sourceTree = ""; }; + 87799D3168B43EB7B5686826 /* pngrtran.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../../src/png/pngrtran.c; sourceTree = ""; }; + 87D973CA8D673267BD0844D3 /* paper.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = paper.cpp; path = ../../src/common/paper.cpp; sourceTree = ""; }; + 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_fontpicker.cpp; path = ../../src/xrc/xh_fontpicker.cpp; sourceTree = ""; }; + 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmpcbox.cpp; path = ../../src/xrc/xh_bmpcbox.cpp; sourceTree = ""; }; + 888BD97139C936679691FF34 /* hash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hash.cpp; path = ../../src/common/hash.cpp; sourceTree = ""; }; + 889FFA9573A835F280A21CB4 /* xh_html.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_html.cpp; path = ../../src/xrc/xh_html.cpp; sourceTree = ""; }; + 88F2BA2F0598342186A484B5 /* fs_arc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_arc.cpp; path = ../../src/common/fs_arc.cpp; sourceTree = ""; }; + 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_codec.c; path = ../../src/tiff/libtiff/tif_codec.c; sourceTree = ""; }; + 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_choic.cpp; path = ../../src/xrc/xh_choic.cpp; sourceTree = ""; }; + 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlnkcmn.cpp; path = ../../src/common/hyperlnkcmn.cpp; sourceTree = ""; }; + 8B6FCA050C26323893012BD6 /* glcanvas.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcanvas.cpp; path = ../../src/osx/carbon/glcanvas.cpp; sourceTree = ""; }; + 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_animatctrl.cpp; path = ../../src/xrc/xh_animatctrl.cpp; sourceTree = ""; }; + 8C78A1539462370CAA429508 /* accel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accel.cpp; path = ../../src/osx/accel.cpp; sourceTree = ""; }; + 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpcboxcmn.cpp; path = ../../src/common/bmpcboxcmn.cpp; sourceTree = ""; }; + 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = calctrlcmn.cpp; path = ../../src/common/calctrlcmn.cpp; sourceTree = ""; }; + 8D529E2668C23D94A7706C8A /* textdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textdlgg.cpp; path = ../../src/generic/textdlgg.cpp; sourceTree = ""; }; + 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaWX.cpp; path = ../../src/stc/ScintillaWX.cpp; sourceTree = ""; }; + 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_htmllbox.cpp; path = ../../src/xrc/xh_htmllbox.cpp; sourceTree = ""; }; + 8EB76F786D7F3FF286948D22 /* jcomapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcomapi.c; path = ../../src/jpeg/jcomapi.c; sourceTree = ""; }; + 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPOV.cxx; path = ../../src/stc/scintilla/src/LexPOV.cxx; sourceTree = ""; }; + 8EFF4707641D3F20AB602ED6 /* jccolor.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccolor.c; path = ../../src/jpeg/jccolor.c; sourceTree = ""; }; + 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wizard.cpp; path = ../../src/generic/wizard.cpp; sourceTree = ""; }; + 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stopwatch.cpp; path = ../../src/common/stopwatch.cpp; sourceTree = ""; }; + 8F633793051F371F94C27530 /* LexVB.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVB.cxx; path = ../../src/stc/scintilla/src/LexVB.cxx; sourceTree = ""; }; + 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctrlcmn.cpp; path = ../../src/common/spinctrlcmn.cpp; sourceTree = ""; }; + 8FFDFB4D208F37569AC548B0 /* imagall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagall.cpp; path = ../../src/common/imagall.cpp; sourceTree = ""; }; + 9051902662BE38B3912B34EA /* dlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dlgcmn.cpp; path = ../../src/common/dlgcmn.cpp; sourceTree = ""; }; + 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctint.c; path = ../../src/jpeg/jfdctint.c; sourceTree = ""; }; + 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirctrlg.cpp; path = ../../src/generic/dirctrlg.cpp; sourceTree = ""; }; + 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSML.cxx; path = ../../src/stc/scintilla/src/LexSML.cxx; sourceTree = ""; }; + 91300EB871CC39ECBC430D48 /* pngget.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = ../../src/png/pngget.c; sourceTree = ""; }; + 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sashwin.cpp; path = ../../src/generic/sashwin.cpp; sourceTree = ""; }; + 91C415400F0435528B9995B7 /* colordlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colordlg.cpp; path = ../../src/osx/carbon/colordlg.cpp; sourceTree = ""; }; + 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notifmsgg.cpp; path = ../../src/generic/notifmsgg.cpp; sourceTree = ""; }; + 926AEAA989793A2F82185627 /* button.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button.cpp; path = ../../src/osx/carbon/button.cpp; sourceTree = ""; }; + 9389DAF8B91030B7AAB029FF /* PerLine.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PerLine.cxx; path = ../../src/stc/scintilla/src/PerLine.cxx; sourceTree = ""; }; + 93B77251C0E0382D9A8E113D /* xh_grid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_grid.cpp; path = ../../src/xrc/xh_grid.cpp; sourceTree = ""; }; + 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynload.cpp; path = ../../src/common/dynload.cpp; sourceTree = ""; }; + 93D07403FCA530D7A9FD2917 /* jfdctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctflt.c; path = ../../src/jpeg/jfdctflt.c; sourceTree = ""; }; + 950D51915EF83B57B5E8306F /* xh_spin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_spin.cpp; path = ../../src/xrc/xh_spin.cpp; sourceTree = ""; }; + 95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = ""; }; + 95B1DB08E37B3EB193FEFE0C /* nonownedwnd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nonownedwnd.cpp; path = ../../src/osx/carbon/nonownedwnd.cpp; sourceTree = ""; }; + 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = ""; }; + 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = ""; }; + 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = ""; }; + 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WindowAccessor.cxx; path = ../../src/stc/scintilla/src/WindowAccessor.cxx; sourceTree = ""; }; + 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgridpagestate.cpp; path = ../../src/propgrid/propgridpagestate.cpp; sourceTree = ""; }; + 96CED508FA3C3B6B9265099E /* rendcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rendcmn.cpp; path = ../../src/common/rendcmn.cpp; sourceTree = ""; }; + 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StyleContext.cxx; path = ../../src/stc/scintilla/src/StyleContext.cxx; sourceTree = ""; }; + 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = ""; }; + 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctrl_osx.cpp; path = ../../src/osx/spinctrl_osx.cpp; sourceTree = ""; }; + 97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = ""; }; + 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = ""; }; + 9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anybutton.cpp; path = ../../src/osx/carbon/anybutton.cpp; sourceTree = ""; }; + 9988CBB0772A3539970162FA /* arttango.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arttango.cpp; path = ../../src/common/arttango.cpp; sourceTree = ""; }; + 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checkbox_osx.cpp; path = ../../src/osx/checkbox_osx.cpp; sourceTree = ""; }; + 998D611109EC33A9A6A11C5A /* gdicmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gdicmn.cpp; path = ../../src/common/gdicmn.cpp; sourceTree = ""; }; + 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = powercmn.cpp; path = ../../src/common/powercmn.cpp; sourceTree = ""; }; + 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_gauge.cpp; path = ../../src/xrc/xh_gauge.cpp; sourceTree = ""; }; + 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_mdi.cpp; path = ../../src/xrc/xh_mdi.cpp; sourceTree = ""; }; + 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaBase.cxx; path = ../../src/stc/scintilla/src/ScintillaBase.cxx; sourceTree = ""; }; + 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelg.cpp; path = ../../src/generic/panelg.cpp; sourceTree = ""; }; + 9C87B071E3593A889704F512 /* statbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbar.cpp; path = ../../src/common/statbar.cpp; sourceTree = ""; }; + 9CAA325362C73AC8BE20FAA7 /* pngpread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../../src/png/pngpread.c; sourceTree = ""; }; + 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/src/LexYAML.cxx; sourceTree = ""; }; + 9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = ""; }; + 9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = ""; }; + 9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = ""; }; + 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = ""; }; + 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = ""; }; + 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toplevel_osx.cpp; path = ../../src/osx/toplevel_osx.cpp; sourceTree = ""; }; + 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTACL.cxx; path = ../../src/stc/scintilla/src/LexTACL.cxx; sourceTree = ""; }; + 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tipwin.cpp; path = ../../src/generic/tipwin.cpp; sourceTree = ""; }; + 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloopunix.cpp; path = ../../src/unix/evtloopunix.cpp; sourceTree = ""; }; + 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCPP.cxx; path = ../../src/stc/scintilla/src/LexCPP.cxx; sourceTree = ""; }; + 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbox_osx.cpp; path = ../../src/osx/statbox_osx.cpp; sourceTree = ""; }; + 9FBCD305199836939824BF97 /* libwx_osx_carbon.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwx_osx_carbon.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 9FDDE855D9F83E4891362EB4 /* bar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bar.cpp; path = ../../src/ribbon/bar.cpp; sourceTree = ""; }; + 9FEB8204E530329FA085E5B8 /* strconv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strconv.cpp; path = ../../src/common/strconv.cpp; sourceTree = ""; }; + A05AEAB07C613BE2A0357BD8 /* spinbutt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinbutt.cpp; path = ../../src/osx/carbon/spinbutt.cpp; sourceTree = ""; }; + A06AB1974DB93EE2999EC75C /* pngrio.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrio.c; path = ../../src/png/pngrio.c; sourceTree = ""; }; + A0DCC5EF59143640BE13AD73 /* jidctfst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctfst.c; path = ../../src/jpeg/jidctfst.c; sourceTree = ""; }; + A1276C0E5D48337489DEE8DF /* LexErlang.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexErlang.cxx; path = ../../src/stc/scintilla/src/LexErlang.cxx; sourceTree = ""; }; + A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap.cpp; path = ../../src/osx/core/bitmap.cpp; sourceTree = ""; }; + A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = msgdlgg.cpp; path = ../../src/generic/msgdlgg.cpp; sourceTree = ""; }; + A1E1A01885B036C28EBDAE27 /* xmladv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmladv.cpp; path = ../../src/xrc/xmladv.cpp; sourceTree = ""; }; + A284E855892F3A9E9E19E854 /* LexTADS3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTADS3.cxx; path = ../../src/stc/scintilla/src/LexTADS3.cxx; sourceTree = ""; }; + A298576700C33F018616E7BD /* auibook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = auibook.cpp; path = ../../src/aui/auibook.cpp; sourceTree = ""; }; + A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dpycmn.cpp; path = ../../src/common/dpycmn.cpp; sourceTree = ""; }; + A436B55DC44E3827A757A6D8 /* accelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accelcmn.cpp; path = ../../src/common/accelcmn.cpp; sourceTree = ""; }; + A46D50BEBF523B3F88831086 /* LexAsn1.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsn1.cxx; path = ../../src/stc/scintilla/src/LexAsn1.cxx; sourceTree = ""; }; + A4A745D1821A32D591D76650 /* imagiff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagiff.cpp; path = ../../src/common/imagiff.cpp; sourceTree = ""; }; + A54B80C17F823CB5900AD2E8 /* framecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = framecmn.cpp; path = ../../src/common/framecmn.cpp; sourceTree = ""; }; + A5617D10CB7136EC9A4194EF /* display.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = display.cpp; path = ../../src/osx/core/display.cpp; sourceTree = ""; }; + A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headerctrlcmn.cpp; path = ../../src/common/headerctrlcmn.cpp; sourceTree = ""; }; + A57CF60203F53459A03951A9 /* arrstr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arrstr.cpp; path = ../../src/common/arrstr.cpp; sourceTree = ""; }; + A5BBC1E494D33D028CA547FF /* jddctmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jddctmgr.c; path = ../../src/jpeg/jddctmgr.c; sourceTree = ""; }; + A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = selectdispatcher.cpp; path = ../../src/common/selectdispatcher.cpp; sourceTree = ""; }; + A5E4E466CCBA3A78A38A6E79 /* dataview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dataview.cpp; path = ../../src/osx/carbon/dataview.cpp; sourceTree = ""; }; + A5EE0B8985443BDCB36F781F /* m_layout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_layout.cpp; path = ../../src/html/m_layout.cpp; sourceTree = ""; }; + A65399C8A6D636139E362119 /* LexAsm.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsm.cxx; path = ../../src/stc/scintilla/src/LexAsm.cxx; sourceTree = ""; }; + A6636144CDE83E8E85270FAF /* hashmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hashmap.cpp; path = ../../src/common/hashmap.cpp; sourceTree = ""; }; + A70C82ADB45A3FB99C420D03 /* regerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regerror.c; path = ../../src/regex/regerror.c; sourceTree = ""; }; + A82C367B86F83981803D55DB /* LexASY.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexASY.cxx; path = ../../src/stc/scintilla/src/LexASY.cxx; sourceTree = ""; }; + A87662D69F0432FC96701280 /* xh_notbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_notbk.cpp; path = ../../src/xrc/xh_notbk.cpp; sourceTree = ""; }; + A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiactioncmn.cpp; path = ../../src/common/uiactioncmn.cpp; sourceTree = ""; }; + A881F49ADCF33C299B041584 /* floatpane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = floatpane.cpp; path = ../../src/aui/floatpane.cpp; sourceTree = ""; }; + A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animatecmn.cpp; path = ../../src/common/animatecmn.cpp; sourceTree = ""; }; + A92B6033D8233DB1821F193B /* xmlparse.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmlparse.c; path = ../../src/expat/lib/xmlparse.c; sourceTree = ""; }; + A9B2316B32653DA0939A372D /* sound_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound_osx.cpp; path = ../../src/osx/sound_osx.cpp; sourceTree = ""; }; + A9C7F740A55E39FD890B3C7F /* editors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = editors.cpp; path = ../../src/propgrid/editors.cpp; sourceTree = ""; }; + A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontpickercmn.cpp; path = ../../src/common/fontpickercmn.cpp; sourceTree = ""; }; + A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbarcmn.cpp; path = ../../src/common/scrolbarcmn.cpp; sourceTree = ""; }; + AA69FCE7B4FA377E98438FE5 /* bmpbuttn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbuttn.cpp; path = ../../src/osx/carbon/bmpbuttn.cpp; sourceTree = ""; }; + AA6C6739C3BD3EFA9CF71102 /* jcinit.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcinit.c; path = ../../src/jpeg/jcinit.c; sourceTree = ""; }; + AA90128E29A03CCCA30F4D35 /* vlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vlbox.cpp; path = ../../src/generic/vlbox.cpp; sourceTree = ""; }; + AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_filter.cpp; path = ../../src/common/fs_filter.cpp; sourceTree = ""; }; + AAC12B4456E13F57BEA25A5E /* tif_swab.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_swab.c; path = ../../src/tiff/libtiff/tif_swab.c; sourceTree = ""; }; + AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_clrpicker.cpp; path = ../../src/xrc/xh_clrpicker.cpp; sourceTree = ""; }; + AB466912FDA23F8B87A00A3C /* threadpsx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = threadpsx.cpp; path = ../../src/unix/threadpsx.cpp; sourceTree = ""; }; + AB634FD597793A74B3B3AA7F /* docview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docview.cpp; path = ../../src/common/docview.cpp; sourceTree = ""; }; + AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clrpickercmn.cpp; path = ../../src/common/clrpickercmn.cpp; sourceTree = ""; }; + ABA5F3C56C8C37809F696A49 /* listbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listbox.cpp; path = ../../src/osx/carbon/listbox.cpp; sourceTree = ""; }; + ABCA89FC1E76356797A2AF2B /* msgdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = msgdlg.cpp; path = ../../src/osx/carbon/msgdlg.cpp; sourceTree = ""; }; + ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = settcmn.cpp; path = ../../src/common/settcmn.cpp; sourceTree = ""; }; + AC12D557950A3B0D89D9F2F3 /* fileback.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fileback.cpp; path = ../../src/common/fileback.cpp; sourceTree = ""; }; + AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wincmn.cpp; path = ../../src/common/wincmn.cpp; sourceTree = ""; }; + AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiaction_osx.cpp; path = ../../src/osx/uiaction_osx.cpp; sourceTree = ""; }; + AC8BB1AABB3D393EBA527060 /* intl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intl.cpp; path = ../../src/common/intl.cpp; sourceTree = ""; }; + ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynarray.cpp; path = ../../src/common/dynarray.cpp; sourceTree = ""; }; + ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ffile.cpp; path = ../../src/common/ffile.cpp; sourceTree = ""; }; + AE856D950B8C369EB0FE13BA /* datectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectlg.cpp; path = ../../src/generic/datectlg.cpp; sourceTree = ""; }; + AF26BAB1F4733114926F1724 /* png.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../../src/png/png.c; sourceTree = ""; }; + AF3DF03795153E039B8F1F87 /* LineMarker.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LineMarker.cxx; path = ../../src/stc/scintilla/src/LineMarker.cxx; sourceTree = ""; }; + AF76670146413EEFA005206A /* printps.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printps.cpp; path = ../../src/generic/printps.cpp; sourceTree = ""; }; + AF7CE00168AB33C994374ABA /* tif_extension.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_extension.c; path = ../../src/tiff/libtiff/tif_extension.c; sourceTree = ""; }; + AF9EE701DD653E2299293E5F /* pngwio.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwio.c; path = ../../src/png/pngwio.c; sourceTree = ""; }; + AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagtiff.cpp; path = ../../src/common/imagtiff.cpp; sourceTree = ""; }; + B0665A40F3FC3F218074C63C /* artmac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artmac.cpp; path = ../../src/osx/artmac.cpp; sourceTree = ""; }; + B14D6E7E15FD3C869E341198 /* LexLout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLout.cxx; path = ../../src/stc/scintilla/src/LexLout.cxx; sourceTree = ""; }; + B17772732159304AA7312D72 /* dcclient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcclient.cpp; path = ../../src/osx/carbon/dcclient.cpp; sourceTree = ""; }; + B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolbk.cpp; path = ../../src/xrc/xh_toolbk.cpp; sourceTree = ""; }; + B180290089B139F18B0C7BBA /* stockitem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stockitem.cpp; path = ../../src/common/stockitem.cpp; sourceTree = ""; }; + B181F564935730E89AB00D92 /* LexForth.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexForth.cxx; path = ../../src/stc/scintilla/src/LexForth.cxx; sourceTree = ""; }; + B1F3C70512D93501B0478F3E /* m_fonts.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_fonts.cpp; path = ../../src/html/m_fonts.cpp; sourceTree = ""; }; + B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmainct.c; path = ../../src/jpeg/jdmainct.c; sourceTree = ""; }; + B303230368143F37B2409DE6 /* LexKix.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexKix.cxx; path = ../../src/stc/scintilla/src/LexKix.cxx; sourceTree = ""; }; + B35DA585CFDD32468868E892 /* process.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = process.cpp; path = ../../src/common/process.cpp; sourceTree = ""; }; + B3645350F572364BABF50238 /* containr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = containr.cpp; path = ../../src/common/containr.cpp; sourceTree = ""; }; + B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCOBOL.cxx; path = ../../src/stc/scintilla/src/LexCOBOL.cxx; sourceTree = ""; }; + B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_sttxt.cpp; path = ../../src/xrc/xh_sttxt.cpp; sourceTree = ""; }; + B4028ABB08C63AB59F5F240B /* m_list.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_list.cpp; path = ../../src/html/m_list.cpp; sourceTree = ""; }; + B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appunix.cpp; path = ../../src/unix/appunix.cpp; sourceTree = ""; }; + B44B32437825326C84607AD8 /* wxcarbon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxcarbon.xcconfig; sourceTree = ""; }; + B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = ""; }; + B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = ""; }; + B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = ""; }; + B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = ""; }; + B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = ""; }; + B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tipdlg.cpp; path = ../../src/generic/tipdlg.cpp; sourceTree = ""; }; + B580FD04D0D83601826FD5EE /* filepickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filepickerg.cpp; path = ../../src/generic/filepickerg.cpp; sourceTree = ""; }; + B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wrapsizer.cpp; path = ../../src/common/wrapsizer.cpp; sourceTree = ""; }; + B63EBEE1A04537E7887E9FD0 /* ustring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ustring.cpp; path = ../../src/common/ustring.cpp; sourceTree = ""; }; + B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBasic.cxx; path = ../../src/stc/scintilla/src/LexBasic.cxx; sourceTree = ""; }; + B7581D7140293BAE88E43DBE /* fs_inet.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_inet.cpp; path = ../../src/common/fs_inet.cpp; sourceTree = ""; }; + B83EDE2D1731311ABDE62F9F /* tif_strip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_strip.c; path = ../../src/tiff/libtiff/tif_strip.c; sourceTree = ""; }; + B890199A37723EFD86C0ADA5 /* quantize.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = quantize.cpp; path = ../../src/common/quantize.cpp; sourceTree = ""; }; + B901252876603DCEA4C66D89 /* nbkbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nbkbase.cpp; path = ../../src/common/nbkbase.cpp; sourceTree = ""; }; + B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_treebk.cpp; path = ../../src/xrc/xh_treebk.cpp; sourceTree = ""; }; + B98B72B3A0A73044B85AED60 /* propgrid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgrid.cpp; path = ../../src/propgrid/propgrid.cpp; sourceTree = ""; }; + B99CA41708513A599AE275A2 /* listbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listbox_osx.cpp; path = ../../src/osx/listbox_osx.cpp; sourceTree = ""; }; + B9B5BC858CCF3477895D2786 /* zstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = zstream.cpp; path = ../../src/common/zstream.cpp; sourceTree = ""; }; + B9D43F0F1CCA3BED871F7A6C /* scrolbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbar.cpp; path = ../../src/osx/carbon/scrolbar.cpp; sourceTree = ""; }; + B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../src/stc/scintilla/src/LexD.cxx; sourceTree = ""; }; + B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = ""; }; + BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = ""; }; + BACF6FE87AD337729BBB72BD /* taskbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = taskbar.cpp; path = ../../src/osx/carbon/taskbar.cpp; sourceTree = ""; }; + BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = ""; }; + BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = ""; }; + BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = ""; }; + BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_chckb.cpp; path = ../../src/xrc/xh_chckb.cpp; sourceTree = ""; }; + BB924887605E3CB388F56776 /* utils.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utils.cpp; path = ../../src/osx/carbon/utils.cpp; sourceTree = ""; }; + BBB30516233A39BE809405AA /* helpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpbase.cpp; path = ../../src/common/helpbase.cpp; sourceTree = ""; }; + BBF01162E86737818F704DBE /* aboutdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = aboutdlg.cpp; path = ../../src/osx/carbon/aboutdlg.cpp; sourceTree = ""; }; + BC12B97F233B3B9494DA217F /* imagpnm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpnm.cpp; path = ../../src/common/imagpnm.cpp; sourceTree = ""; }; + BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexNimrod.cxx; path = ../../src/stc/scintilla/src/LexNimrod.cxx; sourceTree = ""; }; + BCC5B7709F4C3875A3A316C3 /* choice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choice.cpp; path = ../../src/osx/carbon/choice.cpp; sourceTree = ""; }; + BCD873D873A53BBF955D8A4E /* PositionCache.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PositionCache.cxx; path = ../../src/stc/scintilla/src/PositionCache.cxx; sourceTree = ""; }; + BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_dirpicker.cpp; path = ../../src/xrc/xh_dirpicker.cpp; sourceTree = ""; }; + BD709DEB71623974B9836D69 /* dockart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dockart.cpp; path = ../../src/aui/dockart.cpp; sourceTree = ""; }; + BD88495AF72531A28D2201D0 /* tif_tile.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_tile.c; path = ../../src/tiff/libtiff/tif_tile.c; sourceTree = ""; }; + BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dialog_osx.cpp; path = ../../src/osx/dialog_osx.cpp; sourceTree = ""; }; + BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbar.cpp; path = ../../src/osx/carbon/toolbar.cpp; sourceTree = ""; }; + BE4B0CE56BA23002A5C8AF00 /* toolbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbar.cpp; path = ../../src/ribbon/toolbar.cpp; sourceTree = ""; }; + BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = progdlgg.cpp; path = ../../src/generic/progdlgg.cpp; sourceTree = ""; }; + BEB08798C70E33DDB360E563 /* layout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = layout.cpp; path = ../../src/common/layout.cpp; sourceTree = ""; }; + BEF6B3FB66243812969E5BD1 /* palette.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = palette.cpp; path = ../../src/osx/palette.cpp; sourceTree = ""; }; + BF1C44D726E63B18A98006EC /* Decoration.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Decoration.cxx; path = ../../src/stc/scintilla/src/Decoration.cxx; sourceTree = ""; }; + BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filepickercmn.cpp; path = ../../src/common/filepickercmn.cpp; sourceTree = ""; }; + BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVE.cxx; path = ../../src/stc/scintilla/src/LexAVE.cxx; sourceTree = ""; }; + BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3sm.c; path = ../../src/tiff/libtiff/tif_fax3sm.c; sourceTree = ""; }; + C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabmdi.cpp; path = ../../src/aui/tabmdi.cpp; sourceTree = ""; }; + C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatcher_kqueue.cpp; path = ../../src/unix/fswatcher_kqueue.cpp; sourceTree = ""; }; + C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdata.cpp; path = ../../src/common/fontdata.cpp; sourceTree = ""; }; + C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCL.cxx; path = ../../src/stc/scintilla/src/LexTCL.cxx; sourceTree = ""; }; + C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tarstrm.cpp; path = ../../src/common/tarstrm.cpp; sourceTree = ""; }; + C125FA3837C631A9BE0ED5E7 /* splitter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splitter.cpp; path = ../../src/generic/splitter.cpp; sourceTree = ""; }; + C133B838193A35ABBB803151 /* ViewStyle.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ViewStyle.cxx; path = ../../src/stc/scintilla/src/ViewStyle.cxx; sourceTree = ""; }; + C20E46A504113C899B9DD9B7 /* props.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = props.cpp; path = ../../src/propgrid/props.cpp; sourceTree = ""; }; + C25521AF59B9324EB2809C73 /* XPM.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XPM.cxx; path = ../../src/stc/scintilla/src/XPM.cxx; sourceTree = ""; }; + C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = encconv.cpp; path = ../../src/common/encconv.cpp; sourceTree = ""; }; + C28429A964C337A192D76CC8 /* Style.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Style.cxx; path = ../../src/stc/scintilla/src/Style.cxx; sourceTree = ""; }; + C2BB2949CC0B387AB6879539 /* metafile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = metafile.cpp; path = ../../src/osx/carbon/metafile.cpp; sourceTree = ""; }; + C3019BA65DD73F30A865365F /* frame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = frame.cpp; path = ../../src/osx/carbon/frame.cpp; sourceTree = ""; }; + C356B5738AB13E829E66729E /* LexOthers.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexOthers.cxx; path = ../../src/stc/scintilla/src/LexOthers.cxx; sourceTree = ""; }; + C3784C240C2F330683494926 /* laywin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = laywin.cpp; path = ../../src/generic/laywin.cpp; sourceTree = ""; }; + C37866F41B0C31E295AA7FA6 /* wfstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wfstream.cpp; path = ../../src/common/wfstream.cpp; sourceTree = ""; }; + C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngmem.c; path = ../../src/png/pngmem.c; sourceTree = ""; }; + C466F32CCBD13DBC87285B3D /* helpdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpdata.cpp; path = ../../src/html/helpdata.cpp; sourceTree = ""; }; + C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextprint.cpp; path = ../../src/richtext/richtextprint.cpp; sourceTree = ""; }; + C513377E9E303F778BA9D7ED /* arcfind.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arcfind.cpp; path = ../../src/common/arcfind.cpp; sourceTree = ""; }; + C562D5885AFF3E15837325CE /* xpmdecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xpmdecod.cpp; path = ../../src/common/xpmdecod.cpp; sourceTree = ""; }; + C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anybutton_osx.cpp; path = ../../src/osx/anybutton_osx.cpp; sourceTree = ""; }; + C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AutoComplete.cxx; path = ../../src/stc/scintilla/src/AutoComplete.cxx; sourceTree = ""; }; + C63C964DAFAD311694367C94 /* xh_datectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_datectrl.cpp; path = ../../src/xrc/xh_datectrl.cpp; sourceTree = ""; }; + C64705CE9398316D87BAB4DC /* logg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = logg.cpp; path = ../../src/generic/logg.cpp; sourceTree = ""; }; + C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinbtncmn.cpp; path = ../../src/common/spinbtncmn.cpp; sourceTree = ""; }; + C69E48C06BD23C178F650E42 /* richtextxml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextxml.cpp; path = ../../src/richtext/richtextxml.cpp; sourceTree = ""; }; + C6EB77ED688E3EE294167EF1 /* tif_print.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_print.c; path = ../../src/tiff/libtiff/tif_print.c; sourceTree = ""; }; + C76222F466E831F896A89269 /* LexAU3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAU3.cxx; path = ../../src/stc/scintilla/src/LexAU3.cxx; sourceTree = ""; }; + C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mediactrlcmn.cpp; path = ../../src/common/mediactrlcmn.cpp; sourceTree = ""; }; + C83C97A1FCC5345896C9D7DE /* tif_warning.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_warning.c; path = ../../src/tiff/libtiff/tif_warning.c; sourceTree = ""; }; + C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextformatdlg.cpp; path = ../../src/richtext/richtextformatdlg.cpp; sourceTree = ""; }; + C9A305CEC03B3085B159B617 /* fs_mem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_mem.cpp; path = ../../src/common/fs_mem.cpp; sourceTree = ""; }; + CA0D5D47D62A3148BA51B31B /* tif_compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_compress.c; path = ../../src/tiff/libtiff/tif_compress.c; sourceTree = ""; }; + CA2D9F325F833C408657E7B7 /* dlunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dlunix.cpp; path = ../../src/unix/dlunix.cpp; sourceTree = ""; }; + CA72410F615B3A78A6340532 /* dnd_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dnd_osx.cpp; path = ../../src/osx/dnd_osx.cpp; sourceTree = ""; }; + CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlinkg.cpp; path = ../../src/generic/hyperlinkg.cpp; sourceTree = ""; }; + CBD7B44E33373BCCB60FC11F /* combog.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combog.cpp; path = ../../src/generic/combog.cpp; sourceTree = ""; }; + CC2713393AB132AA8E337AE1 /* LexPython.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPython.cxx; path = ../../src/stc/scintilla/src/LexPython.cxx; sourceTree = ""; }; + CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_choicbk.cpp; path = ../../src/xrc/xh_choicbk.cpp; sourceTree = ""; }; + CCF7564A2B733F759AA8496B /* jdinput.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdinput.c; path = ../../src/jpeg/jdinput.c; sourceTree = ""; }; + CD72950967F33809931D4968 /* LexAbaqus.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAbaqus.cxx; path = ../../src/stc/scintilla/src/LexAbaqus.cxx; sourceTree = ""; }; + CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_tglbtn.cpp; path = ../../src/xrc/xh_tglbtn.cpp; sourceTree = ""; }; + CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imaggif.cpp; path = ../../src/common/imaggif.cpp; sourceTree = ""; }; + CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choicdgg.cpp; path = ../../src/generic/choicdgg.cpp; sourceTree = ""; }; + CF4F4F5211933057824B5621 /* button_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button_osx.cpp; path = ../../src/osx/button_osx.cpp; sourceTree = ""; }; + CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem_osx.cpp; path = ../../src/osx/menuitem_osx.cpp; sourceTree = ""; }; + D03731D60A063988AF6AE70F /* mediactrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mediactrl.cpp; path = ../../src/osx/carbon/mediactrl.cpp; sourceTree = ""; }; + D037EA567C253DEEA17E822B /* mousemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mousemanager.cpp; path = ../../src/common/mousemanager.cpp; sourceTree = ""; }; + D0817D6A1AF83608B050EBC3 /* fontmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontmap.cpp; path = ../../src/common/fontmap.cpp; sourceTree = ""; }; + D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cmdlinkbn.cpp; path = ../../src/xrc/xh_cmdlinkbn.cpp; sourceTree = ""; }; + D0B9C41A4D12345AAA764CAD /* stc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stc.cpp; path = ../../src/stc/stc.cpp; sourceTree = ""; }; + D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPerl.cxx; path = ../../src/stc/scintilla/src/LexPerl.cxx; sourceTree = ""; }; + D0CDADAF2D893E32A38351E4 /* tif_aux.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_aux.c; path = ../../src/tiff/libtiff/tif_aux.c; sourceTree = ""; }; + D1EE17722EA937E88A7F0C01 /* dcbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcbase.cpp; path = ../../src/common/dcbase.cpp; sourceTree = ""; }; + D215A0D67563350CB4EECB06 /* slider_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slider_osx.cpp; path = ../../src/osx/slider_osx.cpp; sourceTree = ""; }; + D272910EC35531E5B4D6E05B /* dynlib.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynlib.cpp; path = ../../src/common/dynlib.cpp; sourceTree = ""; }; + D30617843F33310089C1F77A /* richtextstyles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextstyles.cpp; path = ../../src/richtext/richtextstyles.cpp; sourceTree = ""; }; + D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_menu.cpp; path = ../../src/xrc/xh_menu.cpp; sourceTree = ""; }; + D35F1F29F9D33C2B9730D4EE /* window.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = window.cpp; path = ../../src/osx/carbon/window.cpp; sourceTree = ""; }; + D3F32C01D122301AB00D06A5 /* tbarbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbarbase.cpp; path = ../../src/common/tbarbase.cpp; sourceTree = ""; }; + D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = ""; }; + D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = ""; }; + D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = ""; }; + D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = ""; }; + D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; + D5F9383D1CE931499F339D85 /* strconv_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strconv_cf.cpp; path = ../../src/osx/core/strconv_cf.cpp; sourceTree = ""; }; + D6DFFB06606F3D2E953CFC96 /* uma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uma.cpp; path = ../../src/osx/carbon/uma.cpp; sourceTree = ""; }; + D73954EB5397301F87881646 /* statboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statboxcmn.cpp; path = ../../src/common/statboxcmn.cpp; sourceTree = ""; }; + D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVerilog.cxx; path = ../../src/stc/scintilla/src/LexVerilog.cxx; sourceTree = ""; }; + D784A32C094730FEAA391A9B /* sckstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckstrm.cpp; path = ../../src/common/sckstrm.cpp; sourceTree = ""; }; + D7B3307E56B332769901E99F /* filehistorycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filehistorycmn.cpp; path = ../../src/common/filehistorycmn.cpp; sourceTree = ""; }; + D87406BCF3E833369E12D89A /* LexHTML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexHTML.cxx; path = ../../src/stc/scintilla/src/LexHTML.cxx; sourceTree = ""; }; + D9016355F66D3125919E017D /* listctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrl.cpp; path = ../../src/generic/listctrl.cpp; sourceTree = ""; }; + D922063B2F2536629EEEAAF0 /* popupcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = popupcmn.cpp; path = ../../src/common/popupcmn.cpp; sourceTree = ""; }; + D92E3EEACA2132609CA3D28F /* evtloop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloop.cpp; path = ../../src/osx/carbon/evtloop.cpp; sourceTree = ""; }; + DA2119A7C67D37B290C17989 /* statbmpg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbmpg.cpp; path = ../../src/generic/statbmpg.cpp; sourceTree = ""; }; + DA5E95D498C53A808A8E2EEB /* Editor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Editor.cxx; path = ../../src/stc/scintilla/src/Editor.cxx; sourceTree = ""; }; + DA7F7633279936EFA0B9C5CF /* markupparser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markupparser.cpp; path = ../../src/common/markupparser.cpp; sourceTree = ""; }; + DAAED71A534135A9A61612A6 /* colordlgosx.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = colordlgosx.mm; path = ../../src/osx/carbon/colordlgosx.mm; sourceTree = ""; }; + DB170BF78EFE39D692E11985 /* fontdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdlgg.cpp; path = ../../src/generic/fontdlgg.cpp; sourceTree = ""; }; + DB82939EDC593F9CA95C3098 /* init.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = init.cpp; path = ../../src/common/init.cpp; sourceTree = ""; }; + DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = unichar.cpp; path = ../../src/common/unichar.cpp; sourceTree = ""; }; + DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = iconbndl.cpp; path = ../../src/common/iconbndl.cpp; sourceTree = ""; }; + DC0FFDC7A6163F2DA73B84EB /* jchuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jchuff.c; path = ../../src/jpeg/jchuff.c; sourceTree = ""; }; + DC3D1E222FD93A69B1D1366E /* mstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mstream.cpp; path = ../../src/common/mstream.cpp; sourceTree = ""; }; + DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsunx.cpp; path = ../../src/unix/utilsunx.cpp; sourceTree = ""; }; + DC9153A350893820B942D37E /* LexMatlab.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMatlab.cxx; path = ../../src/stc/scintilla/src/LexMatlab.cxx; sourceTree = ""; }; + DD09A813E10A31C19554B425 /* affinematrix2d.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = affinematrix2d.cpp; path = ../../src/common/affinematrix2d.cpp; sourceTree = ""; }; + DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_aui.cpp; path = ../../src/ribbon/art_aui.cpp; sourceTree = ""; }; + DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = socketiohandler.cpp; path = ../../src/common/socketiohandler.cpp; sourceTree = ""; }; + DE16011AD6323AAC8616F973 /* stdstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdstream.cpp; path = ../../src/common/stdstream.cpp; sourceTree = ""; }; + DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statline_osx.cpp; path = ../../src/osx/statline_osx.cpp; sourceTree = ""; }; + DE8238DA30FF3FB984511250 /* sckaddr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckaddr.cpp; path = ../../src/common/sckaddr.cpp; sourceTree = ""; }; + DE8701E1CF2B352B945C17E5 /* valtext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valtext.cpp; path = ../../src/common/valtext.cpp; sourceTree = ""; }; + DE95737968723BE98DD68918 /* libwx_osx_carbon_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_carbon_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; + DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcsvg.cpp; path = ../../src/common/dcsvg.cpp; sourceTree = ""; }; + DECAF5DD80383A2CA76EB383 /* jdatasrc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdatasrc.c; path = ../../src/jpeg/jdatasrc.c; sourceTree = ""; }; + DF376BC55EA73F5FB7328142 /* helpext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpext.cpp; path = ../../src/generic/helpext.cpp; sourceTree = ""; }; + DFDC805DD3063C389F93642D /* tif_next.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_next.c; path = ../../src/tiff/libtiff/tif_next.c; sourceTree = ""; }; + E08A51FA8D8A361681B07295 /* glcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcmn.cpp; path = ../../src/common/glcmn.cpp; sourceTree = ""; }; + E0EBCDDF248638B58B01D9CC /* datetime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datetime.cpp; path = ../../src/common/datetime.cpp; sourceTree = ""; }; + E110907DDC13305E88B90086 /* dirctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirctrlcmn.cpp; path = ../../src/common/dirctrlcmn.cpp; sourceTree = ""; }; + E145FC31ED523B4AA5080A61 /* RESearch.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RESearch.cxx; path = ../../src/stc/scintilla/src/RESearch.cxx; sourceTree = ""; }; + E1A75C83424B32E99AC91B2C /* notebmac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notebmac.cpp; path = ../../src/osx/carbon/notebmac.cpp; sourceTree = ""; }; + E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrlcmn.cpp; path = ../../src/common/listctrlcmn.cpp; sourceTree = ""; }; + E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbrma.cpp; path = ../../src/osx/carbon/statbrma.cpp; sourceTree = ""; }; + E27194D6828C3BB297B2CBAA /* dnd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dnd.cpp; path = ../../src/osx/carbon/dnd.cpp; sourceTree = ""; }; + E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PropSet.cxx; path = ../../src/stc/scintilla/src/PropSet.cxx; sourceTree = ""; }; + E38569D873B6394F9E5B821C /* jcphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcphuff.c; path = ../../src/jpeg/jcphuff.c; sourceTree = ""; }; + E433B890264339BA8DB97B1D /* regcomp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regcomp.c; path = ../../src/regex/regcomp.c; sourceTree = ""; }; + E5357E76650035639844D15B /* stringimpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringimpl.cpp; path = ../../src/common/stringimpl.cpp; sourceTree = ""; }; + E5477A7352353CDE8D96D582 /* printdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg.cpp; path = ../../src/osx/carbon/printdlg.cpp; sourceTree = ""; }; + E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_frame.cpp; path = ../../src/xrc/xh_frame.cpp; sourceTree = ""; }; + E6AB648BC5173104A96CAE66 /* xml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xml.cpp; path = ../../src/xml/xml.cpp; sourceTree = ""; }; + E6CC2B05353C3284B37B2DD7 /* settings.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = settings.cpp; path = ../../src/osx/carbon/settings.cpp; sourceTree = ""; }; + E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = KeyMap.cxx; path = ../../src/stc/scintilla/src/KeyMap.cxx; sourceTree = ""; }; + E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMarkdown.cxx; path = ../../src/stc/scintilla/src/LexMarkdown.cxx; sourceTree = ""; }; + E79B2D1F630036129B9677A7 /* tif_dir.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dir.c; path = ../../src/tiff/libtiff/tif_dir.c; sourceTree = ""; }; + E8072CA67D19346ABF4D465F /* slidercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slidercmn.cpp; path = ../../src/common/slidercmn.cpp; sourceTree = ""; }; + E85E680C62B63D4EBAB2E784 /* jdphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdphuff.c; path = ../../src/jpeg/jdphuff.c; sourceTree = ""; }; + E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CellBuffer.cxx; path = ../../src/stc/scintilla/src/CellBuffer.cxx; sourceTree = ""; }; + E89AC104BF4F33A083F8B382 /* jccoefct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccoefct.c; path = ../../src/jpeg/jccoefct.c; sourceTree = ""; }; + E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = commandlinkbuttong.cpp; path = ../../src/generic/commandlinkbuttong.cpp; sourceTree = ""; }; + E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbase.cpp; path = ../../src/common/bmpbase.cpp; sourceTree = ""; }; + E968913A9A593B258BD8EACB /* msgout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = msgout.cpp; path = ../../src/common/msgout.cpp; sourceTree = ""; }; + E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_scwin.cpp; path = ../../src/xrc/xh_scwin.cpp; sourceTree = ""; }; + E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richmsgdlgg.cpp; path = ../../src/generic/richmsgdlgg.cpp; sourceTree = ""; }; + E9B992CB6C28339FB0CA5E27 /* tif_write.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_write.c; path = ../../src/tiff/libtiff/tif_write.c; sourceTree = ""; }; + E9B9B85572D0312BBF2878DB /* windowid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = windowid.cpp; path = ../../src/common/windowid.cpp; sourceTree = ""; }; + E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirdlgg.cpp; path = ../../src/generic/dirdlgg.cpp; sourceTree = ""; }; + EA2520F427493A22A70A5C09 /* stackwalk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stackwalk.cpp; path = ../../src/unix/stackwalk.cpp; sourceTree = ""; }; + EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = KeyWords.cxx; path = ../../src/stc/scintilla/src/KeyWords.cxx; sourceTree = ""; }; + EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_chckl.cpp; path = ../../src/xrc/xh_chckl.cpp; sourceTree = ""; }; + EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filtfind.cpp; path = ../../src/common/filtfind.cpp; sourceTree = ""; }; + EA93D41B11683E758D456531 /* log.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = log.cpp; path = ../../src/common/log.cpp; sourceTree = ""; }; + EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_wizrd.cpp; path = ../../src/xrc/xh_wizrd.cpp; sourceTree = ""; }; + EBED392D081335FA80523244 /* manager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = manager.cpp; path = ../../src/propgrid/manager.cpp; sourceTree = ""; }; + EC28591B403B32B7AFCC079D /* gauge_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gauge_osx.cpp; path = ../../src/osx/gauge_osx.cpp; sourceTree = ""; }; + EC8157AB87CE3E47A98A6190 /* menu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menu.cpp; path = ../../src/osx/carbon/menu.cpp; sourceTree = ""; }; + EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dircmn.cpp; path = ../../src/common/dircmn.cpp; sourceTree = ""; }; + ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_hline.cpp; path = ../../src/html/m_hline.cpp; sourceTree = ""; }; + ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docmdi.cpp; path = ../../src/common/docmdi.cpp; sourceTree = ""; }; + ED19EF377E653F71B1876259 /* jdmaster.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmaster.c; path = ../../src/jpeg/jdmaster.c; sourceTree = ""; }; + EDB48813110636DBA045BF3A /* LexPS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPS.cxx; path = ../../src/stc/scintilla/src/LexPS.cxx; sourceTree = ""; }; + EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fddlgcmn.cpp; path = ../../src/common/fddlgcmn.cpp; sourceTree = ""; }; + EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filedlgg.cpp; path = ../../src/generic/filedlgg.cpp; sourceTree = ""; }; + EE959EC7BFDD3A628E856404 /* anidecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anidecod.cpp; path = ../../src/common/anidecod.cpp; sourceTree = ""; }; + EEA0945B20913754A54D0FD9 /* dcpsg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcpsg.cpp; path = ../../src/generic/dcpsg.cpp; sourceTree = ""; }; + EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_split.cpp; path = ../../src/xrc/xh_split.cpp; sourceTree = ""; }; + EED7C691150139EFA35E8EBD /* utils_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utils_osx.cpp; path = ../../src/osx/utils_osx.cpp; sourceTree = ""; }; + EEE82083BFA430D5B58F8A04 /* regfree.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regfree.c; path = ../../src/regex/regfree.c; sourceTree = ""; }; + EF330EAACFA53877BE289896 /* matrix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = matrix.cpp; path = ../../src/common/matrix.cpp; sourceTree = ""; }; + F01DDE448E4C3983ACCE67FD /* appcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appcmn.cpp; path = ../../src/common/appcmn.cpp; sourceTree = ""; }; + F0905A1EBD653F6D82395602 /* xh_combo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_combo.cpp; path = ../../src/xrc/xh_combo.cpp; sourceTree = ""; }; + F175D6E8E5723FC797701275 /* menucmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menucmn.cpp; path = ../../src/common/menucmn.cpp; sourceTree = ""; }; + F1A6F3936A0D31CBB58082BA /* jdcoefct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdcoefct.c; path = ../../src/jpeg/jdcoefct.c; sourceTree = ""; }; + F1E724EA70AB35DDB130F84F /* stringops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringops.cpp; path = ../../src/common/stringops.cpp; sourceTree = ""; }; + F2024D29170D3B50A4DFDE11 /* base64.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = ../../src/common/base64.cpp; sourceTree = ""; }; + F263022F3FEA3F75895B644D /* filesys.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filesys.cpp; path = ../../src/common/filesys.cpp; sourceTree = ""; }; + F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexFlagship.cxx; path = ../../src/stc/scintilla/src/LexFlagship.cxx; sourceTree = ""; }; + F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sysopt.cpp; path = ../../src/common/sysopt.cpp; sourceTree = ""; }; + F43AF44465B335479752116D /* xh_radbx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_radbx.cpp; path = ../../src/xrc/xh_radbx.cpp; sourceTree = ""; }; + F46EC1508C063C8395CE7A95 /* sstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sstream.cpp; path = ../../src/common/sstream.cpp; sourceTree = ""; }; + F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_panel.cpp; path = ../../src/xrc/xh_panel.cpp; sourceTree = ""; }; + F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../src/stc/scintilla/src/LexMetapost.cxx; sourceTree = ""; }; + F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/osx/carbon/icon.cpp; sourceTree = ""; }; + F6EA240B3DB93D398A990FAD /* tif_dirread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirread.c; path = ../../src/tiff/libtiff/tif_dirread.c; sourceTree = ""; }; + F7332A03D93D3DABB050615D /* dir.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dir.cpp; path = ../../src/unix/dir.cpp; sourceTree = ""; }; + F7440859617F3B47AF4D3817 /* valgen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valgen.cpp; path = ../../src/common/valgen.cpp; sourceTree = ""; }; + F7E99B35A98D30818120B002 /* string.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = string.cpp; path = ../../src/common/string.cpp; sourceTree = ""; }; + F82278F9AF0432529891E6D7 /* tif_close.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_close.c; path = ../../src/tiff/libtiff/tif_close.c; sourceTree = ""; }; + F83172EE2DAE352FB969D4F2 /* jcapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapistd.c; path = ../../src/jpeg/jcapistd.c; sourceTree = ""; }; + F84F0DB790A23D92A193D2B4 /* http.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = http.cpp; path = ../../src/common/http.cpp; sourceTree = ""; }; + F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_collpane.cpp; path = ../../src/xrc/xh_collpane.cpp; sourceTree = ""; }; + F8A72557C5B13F16A59980EF /* srchctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctrl.cpp; path = ../../src/osx/carbon/srchctrl.cpp; sourceTree = ""; }; + F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths.cpp; path = ../../src/unix/stdpaths.cpp; sourceTree = ""; }; + F97C7436BF3B3BBEB423550D /* textctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textctrl.cpp; path = ../../src/osx/carbon/textctrl.cpp; sourceTree = ""; }; + FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcanvas_osx.cpp; path = ../../src/osx/glcanvas_osx.cpp; sourceTree = ""; }; + FA7029BB5751398AA02D8C24 /* imagtga.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagtga.cpp; path = ../../src/common/imagtga.cpp; sourceTree = ""; }; + FADE850169F7347F83FE1499 /* xh_statbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_statbar.cpp; path = ../../src/xrc/xh_statbar.cpp; sourceTree = ""; }; + FB46BC22F6B23909A938C561 /* regex.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regex.cpp; path = ../../src/common/regex.cpp; sourceTree = ""; }; + FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcbufcmn.cpp; path = ../../src/common/dcbufcmn.cpp; sourceTree = ""; }; + FBE1C531185131A89EFF7FAF /* cmdline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmdline.cpp; path = ../../src/common/cmdline.cpp; sourceTree = ""; }; + FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontpickerg.cpp; path = ../../src/generic/fontpickerg.cpp; sourceTree = ""; }; + FCCFF49F92B4323D9181CEDA /* htmltag.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmltag.cpp; path = ../../src/html/htmltag.cpp; sourceTree = ""; }; + FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTeX.cxx; path = ../../src/stc/scintilla/src/LexTeX.cxx; sourceTree = ""; }; + FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_srchctrl.cpp; path = ../../src/xrc/xh_srchctrl.cpp; sourceTree = ""; }; + FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = ""; }; + FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = ""; }; + FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = ""; }; + FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = ""; }; + FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = ""; }; + FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/src/LexMPT.cxx; sourceTree = ""; }; + FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMMIXAL.cxx; path = ../../src/stc/scintilla/src/LexMMIXAL.cxx; sourceTree = ""; }; + FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGui4Cli.cxx; path = ../../src/stc/scintilla/src/LexGui4Cli.cxx; sourceTree = ""; }; + FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stream.cpp; path = ../../src/common/stream.cpp; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 82F403E7B8653CBD908BC257 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 82F403E7B8653CBD908BC258 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 04311EAB76193D5593D43DBB /* aui */ = { + isa = PBXGroup; + children = ( + 98C15055598A3586BDB4FD0F /* src/aui */, + ); + name = aui; + sourceTree = ""; + }; + 1246F69B93FC33FFA06EF788 /* src/osx/carbon */ = { + isa = PBXGroup; + children = ( + BB924887605E3CB388F56776 /* utils.cpp */, + D6DFFB06606F3D2E953CFC96 /* uma.cpp */, + ); + name = src/osx/carbon; + sourceTree = ""; + }; + 1246F69B93FC33FFA06EF789 /* src/osx/carbon */ = { + isa = PBXGroup; + children = ( + DAAED71A534135A9A61612A6 /* colordlgosx.mm */, + 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */, + 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */, + 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */, + 18044326B5B13A98A49732DD /* fontdlg.cpp */, + 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */, + F5DAF1F49F0F3F41A427A21D /* icon.cpp */, + 757B31FCCA1F381C95B30DF8 /* app.cpp */, + 7A3F26F539473705AA82411D /* combobox.cpp */, + 12363D1F50FE301DAEE7F04A /* control.cpp */, + 271B4B77622B3411A7BF6634 /* dataobj.cpp */, + B17772732159304AA7312D72 /* dcclient.cpp */, + 238741BDA2C73E56899CCB04 /* dcprint.cpp */, + 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */, + 1C4762898E5330C28651EE73 /* graphics.cpp */, + 77F5E7BCD9B2307D8DBCC052 /* font.cpp */, + C3019BA65DD73F30A865365F /* frame.cpp */, + B568A7364ECA30288820CCE7 /* mdi.cpp */, + C2BB2949CC0B387AB6879539 /* metafile.cpp */, + 2128AD8BD12E3F33AD57478E /* overlay.cpp */, + 530DC2E26BF2313E8702AD43 /* popupwin.cpp */, + 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */, + E6CC2B05353C3284B37B2DD7 /* settings.cpp */, + E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */, + 00DA3D3EEF5E305CA73A1871 /* region.cpp */, + 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */, + 9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */, + AA69FCE7B4FA377E98438FE5 /* bmpbuttn.cpp */, + 926AEAA989793A2F82185627 /* button.cpp */, + 19A5AFB993843FF0B8F75E47 /* checkbox.cpp */, + BCC5B7709F4C3875A3A316C3 /* choice.cpp */, + 91C415400F0435528B9995B7 /* colordlg.cpp */, + 5DF561FCD0C038B79C62B083 /* dialog.cpp */, + 59255501B8053FEE8F258873 /* dirdlg.cpp */, + E27194D6828C3BB297B2CBAA /* dnd.cpp */, + D92E3EEACA2132609CA3D28F /* evtloop.cpp */, + 7D47A353B2C63204ABDD42DE /* filedlg.cpp */, + 1BFAF243431D3CA2AA51ADF2 /* gauge.cpp */, + ABA5F3C56C8C37809F696A49 /* listbox.cpp */, + 02A756A2887839B2900F8CAC /* listctrl_mac.cpp */, + EC8157AB87CE3E47A98A6190 /* menu.cpp */, + 44806DDCE6FB305EAED41E92 /* menuitem.cpp */, + ABCA89FC1E76356797A2AF2B /* msgdlg.cpp */, + 95B1DB08E37B3EB193FEFE0C /* nonownedwnd.cpp */, + E1A75C83424B32E99AC91B2C /* notebmac.cpp */, + E5477A7352353CDE8D96D582 /* printdlg.cpp */, + 59F8B419381C34A184190EA1 /* radiobut.cpp */, + B9D43F0F1CCA3BED871F7A6C /* scrolbar.cpp */, + 75278C04709D3482A2660DFC /* slider.cpp */, + A05AEAB07C613BE2A0357BD8 /* spinbutt.cpp */, + F8A72557C5B13F16A59980EF /* srchctrl.cpp */, + 1B7E02F461A33397B00E9004 /* statbmp.cpp */, + 32B2BC8A91983DDA9CC46793 /* statbox.cpp */, + 4148D62D50863214B8479E60 /* statlmac.cpp */, + 3A28411B852734BDA2C04165 /* stattext.cpp */, + F97C7436BF3B3BBEB423550D /* textctrl.cpp */, + 71F35835D4DE34D59F924E36 /* tglbtn.cpp */, + BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */, + 5D90D0FA35833140A3CCCD94 /* tooltip.cpp */, + D35F1F29F9D33C2B9730D4EE /* window.cpp */, + ); + name = src/osx/carbon; + sourceTree = ""; + }; + 1246F69B93FC33FFA06EF78A /* src/osx/carbon */ = { + isa = PBXGroup; + children = ( + BBF01162E86737818F704DBE /* aboutdlg.cpp */, + 39B825E5EAB43D9ABDCEB2CD /* drawer.cpp */, + A5E4E466CCBA3A78A38A6E79 /* dataview.cpp */, + 2ACC8667173D3AB09F6214F4 /* sound.cpp */, + BACF6FE87AD337729BBB72BD /* taskbar.cpp */, + ); + name = src/osx/carbon; + sourceTree = ""; + }; + 1246F69B93FC33FFA06EF78B /* src/osx/carbon */ = { + isa = PBXGroup; + children = ( + D03731D60A063988AF6AE70F /* mediactrl.cpp */, + ); + name = src/osx/carbon; + sourceTree = ""; + }; + 1246F69B93FC33FFA06EF78C /* src/osx/carbon */ = { + isa = PBXGroup; + children = ( + 8B6FCA050C26323893012BD6 /* glcanvas.cpp */, + ); + name = src/osx/carbon; + sourceTree = ""; + }; + 1D56230B75893DBA8A923441 /* wxcocoa */ = { + isa = PBXGroup; + children = ( + B44B32437825326C84607AD8 /* wxcarbon.xcconfig */, + 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */, + D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */, + C2FC1A9BBB8C3046994369BF /* Products */, + 83F62FA47C9636169F1E18E8 /* base */, + 2E7B4F88F81E37B4A9FF6C0F /* core */, + 374BD863E6AD33189B7E4040 /* net */, + 2FF0B5E0505D3AEA9A4ACF11 /* adv */, + 5C5CD199E7573C73AE6F392D /* media */, + 60E51BFF5CD2327483201F14 /* html */, + 60328E6EA3793DA990E18FC1 /* xrc */, + 4D98B791E17232D39944F04F /* xml */, + 816DD323A67F3B299C8F3481 /* opengl */, + 04311EAB76193D5593D43DBB /* aui */, + FE1C78F1707A30878CBB2B4B /* ribbon */, + B8F95052522B37AB86DA8917 /* propgrid */, + 64B126D857113F24BA8C4758 /* richtext */, + E96566B813153B4295AD767B /* stc */, + EB288BE7E74B3328B762A461 /* libtiff */, + 7650A73F7FC9305EA62DAE86 /* libjpeg */, + 6E2C8858F68E3FB0BEFFFCE5 /* libpng */, + B1EF68113C6338CFBBED0FBE /* libregex */, + 2BE6C101F29D318895158F98 /* libscintilla */, + 42F504C4994C38D7A8F062F4 /* libexpat */, + ); + name = wxcocoa; + sourceTree = ""; + }; + 2ABA71836A2C3590B1615B26 /* src/expat/lib */ = { + isa = PBXGroup; + children = ( + A92B6033D8233DB1821F193B /* xmlparse.c */, + 59C6B9849FF6325E890942EF /* xmlrole.c */, + 8685B8ED68F23DB0B770FD74 /* xmltok.c */, + ); + name = src/expat/lib; + sourceTree = ""; + }; + 2BE6C101F29D318895158F98 /* libscintilla */ = { + isa = PBXGroup; + children = ( + 88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */, + ); + name = libscintilla; + sourceTree = ""; + }; + 2E7B4F88F81E37B4A9FF6C0F /* core */ = { + isa = PBXGroup; + children = ( + F494694AB1FD30DEA2087AFB /* src/osx */, + AC04244D4E183DF480908047 /* src/osx/core */, + CBC07D2BC2363BB4B61D1121 /* src/unix */, + 944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */, + 1246F69B93FC33FFA06EF789 /* src/osx/carbon */, + 84E0164052A73DE5996EA691 /* src/generic */, + D957B1B354FC327288FDF9D7 /* src/common */, + ); + name = core; + sourceTree = ""; + }; + 2FF0B5E0505D3AEA9A4ACF11 /* adv */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D9 /* src/common */, + 84E0164052A73DE5996EA692 /* src/generic */, + 1246F69B93FC33FFA06EF78A /* src/osx/carbon */, + F494694AB1FD30DEA2087AFC /* src/osx */, + AC04244D4E183DF480908049 /* src/osx/core */, + ); + name = adv; + sourceTree = ""; + }; + 318BFB22ACCA37E19A1BD431 /* src/propgrid */ = { + isa = PBXGroup; + children = ( + 326723AEB79A305F90D6B41D /* advprops.cpp */, + A9C7F740A55E39FD890B3C7F /* editors.cpp */, + EBED392D081335FA80523244 /* manager.cpp */, + 58E1F571B01F34D4AB70CA18 /* property.cpp */, + B98B72B3A0A73044B85AED60 /* propgrid.cpp */, + 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */, + 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */, + C20E46A504113C899B9DD9B7 /* props.cpp */, + ); + name = src/propgrid; + sourceTree = ""; + }; + 348F9A77CB8B315FBC81D212 /* src/xrc */ = { + isa = PBXGroup; + children = ( + 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */, + 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */, + 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */, + 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */, + 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */, + 093B5233861B3F9B8C85762B /* xh_cald.cpp */, + BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */, + EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */, + 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */, + CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */, + AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */, + D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */, + F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */, + F0905A1EBD653F6D82395602 /* xh_combo.cpp */, + 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */, + C63C964DAFAD311694367C94 /* xh_datectrl.cpp */, + BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */, + 06B4A895955B32258DCD62BF /* xh_dlg.cpp */, + 05310A868F0B35999C568681 /* xh_editlbox.cpp */, + 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */, + 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */, + 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */, + E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */, + 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */, + 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */, + 93B77251C0E0382D9A8E113D /* xh_grid.cpp */, + 889FFA9573A835F280A21CB4 /* xh_html.cpp */, + B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */, + B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */, + 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */, + 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */, + 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */, + D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */, + A87662D69F0432FC96701280 /* xh_notbk.cpp */, + 0080254545B9383ABDF2045C /* xh_odcombo.cpp */, + F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */, + 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */, + 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */, + F43AF44465B335479752116D /* xh_radbx.cpp */, + 66411D54BAD338498AC59401 /* xh_scrol.cpp */, + E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */, + 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */, + 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */, + 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */, + 950D51915EF83B57B5E8306F /* xh_spin.cpp */, + EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */, + FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */, + FADE850169F7347F83FE1499 /* xh_statbar.cpp */, + 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */, + 147800BBCB80346798B35D75 /* xh_stbox.cpp */, + 5F555177554E398286DBC6FB /* xh_stlin.cpp */, + B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */, + 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */, + CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */, + 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */, + B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */, + 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */, + B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */, + 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */, + EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */, + 087B66573CD33DA99DA82B1C /* xmlres.cpp */, + A1E1A01885B036C28EBDAE27 /* xmladv.cpp */, + 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */, + ); + name = src/xrc; + sourceTree = ""; + }; + 374BD863E6AD33189B7E4040 /* net */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D8 /* src/common */, + CBC07D2BC2363BB4B61D1122 /* src/unix */, + AC04244D4E183DF480908048 /* src/osx/core */, + ); + name = net; + sourceTree = ""; + }; + 42F504C4994C38D7A8F062F4 /* libexpat */ = { + isa = PBXGroup; + children = ( + 2ABA71836A2C3590B1615B26 /* src/expat/lib */, + ); + name = libexpat; + sourceTree = ""; + }; + 4B7A97D6D29E3627B312E104 /* src/regex */ = { + isa = PBXGroup; + children = ( + E433B890264339BA8DB97B1D /* regcomp.c */, + 1482A34AC32133E4BE207223 /* regexec.c */, + A70C82ADB45A3FB99C420D03 /* regerror.c */, + EEE82083BFA430D5B58F8A04 /* regfree.c */, + ); + name = src/regex; + sourceTree = ""; + }; + 4D98B791E17232D39944F04F /* xml */ = { + isa = PBXGroup; + children = ( + C23A03BC68833F7E8BA62CF1 /* src/xml */, + D957B1B354FC327288FDF9DB /* src/common */, + ); + name = xml; + sourceTree = ""; + }; + 4E6B7B286B7938A3BD44A8E1 /* src/richtext */ = { + isa = PBXGroup; + children = ( + 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */, + FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */, + C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */, + 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */, + 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */, + C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */, + 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */, + D30617843F33310089C1F77A /* richtextstyles.cpp */, + BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */, + C69E48C06BD23C178F650E42 /* richtextxml.cpp */, + ); + name = src/richtext; + sourceTree = ""; + }; + 5C5CD199E7573C73AE6F392D /* media */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9DA /* src/common */, + 1246F69B93FC33FFA06EF78B /* src/osx/carbon */, + ); + name = media; + sourceTree = ""; + }; + 60328E6EA3793DA990E18FC1 /* xrc */ = { + isa = PBXGroup; + children = ( + 348F9A77CB8B315FBC81D212 /* src/xrc */, + ); + name = xrc; + sourceTree = ""; + }; + 60E51BFF5CD2327483201F14 /* html */ = { + isa = PBXGroup; + children = ( + B8FCB2D33F3B3E30A75D7ABD /* src/html */, + 84E0164052A73DE5996EA693 /* src/generic */, + ); + name = html; + sourceTree = ""; + }; + 64B126D857113F24BA8C4758 /* richtext */ = { + isa = PBXGroup; + children = ( + 4E6B7B286B7938A3BD44A8E1 /* src/richtext */, + ); + name = richtext; + sourceTree = ""; + }; + 6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = { + isa = PBXGroup; + children = ( + C1D1DDEBCD103A95BE0B52D4 /* src/png */, + ); + name = libpng; + sourceTree = ""; + }; + 7650A73F7FC9305EA62DAE86 /* libjpeg */ = { + isa = PBXGroup; + children = ( + D85137B3D94F34B6B3686909 /* src/jpeg */, + ); + name = libjpeg; + sourceTree = ""; + }; + 816DD323A67F3B299C8F3481 /* opengl */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9DC /* src/common */, + 1246F69B93FC33FFA06EF78C /* src/osx/carbon */, + F494694AB1FD30DEA2087AFD /* src/osx */, + ); + name = opengl; + sourceTree = ""; + }; + 83F62FA47C9636169F1E18E8 /* base */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D6 /* src/common */, + 84E0164052A73DE5996EA690 /* src/generic */, + AC04244D4E183DF480908046 /* src/osx/core */, + CBC07D2BC2363BB4B61D1120 /* src/unix */, + 1246F69B93FC33FFA06EF788 /* src/osx/carbon */, + ); + name = base; + sourceTree = ""; + }; + 84E0164052A73DE5996EA690 /* src/generic */ = { + isa = PBXGroup; + children = ( + 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA691 /* src/generic */ = { + isa = PBXGroup; + children = ( + 6A82EDCFFBAC30098B238957 /* caret.cpp */, + 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */, + 84758329F2163F00A9C005DF /* collpaneg.cpp */, + 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */, + E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */, + 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */, + EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */, + B580FD04D0D83601826FD5EE /* filepickerg.cpp */, + DB170BF78EFE39D692E11985 /* fontdlgg.cpp */, + FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */, + D9016355F66D3125919E017D /* listctrl.cpp */, + 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */, + 071FEABEA61E3B559A47A7DB /* statusbr.cpp */, + BACAA6CE4A0934459F26B27C /* graphicc.cpp */, + 2F94CF171F4532B89FECF475 /* busyinfo.cpp */, + 5612DBC4125B379DA2B28824 /* buttonbar.cpp */, + CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */, + 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */, + CBD7B44E33373BCCB60FC11F /* combog.cpp */, + EEA0945B20913754A54D0FD9 /* dcpsg.cpp */, + 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */, + 2A67053D16D63C588E555C84 /* dragimgg.cpp */, + 2334539088B036BEAB230D1C /* filectrlg.cpp */, + 7273A7E255323EB3B391D997 /* headerctrlg.cpp */, + 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */, + 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */, + C64705CE9398316D87BAB4DC /* logg.cpp */, + D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */, + A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */, + 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */, + 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */, + BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */, + AF76670146413EEFA005206A /* printps.cpp */, + 49CABA38E78D34DFA260AA06 /* renderg.cpp */, + E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */, + 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */, + 5ED2105A5A033E3384EBC4ED /* selstore.cpp */, + 59572A234F0636D78BFD9F6B /* spinctlg.cpp */, + C125FA3837C631A9BE0ED5E7 /* splitter.cpp */, + D46A36564C78312CAC538E93 /* srchctlg.cpp */, + DA2119A7C67D37B290C17989 /* statbmpg.cpp */, + 5DE635F30F3935099AF1486C /* stattextg.cpp */, + 8D529E2668C23D94A7706C8A /* textdlgg.cpp */, + 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */, + 24DF23D67E693D999B875101 /* toolbkg.cpp */, + 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */, + 7925E38823563BCDB5565DCF /* treebkg.cpp */, + AA90128E29A03CCCA30F4D35 /* vlbox.cpp */, + 1629FA905F903324AA5BE72C /* vscroll.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA692 /* src/generic */ = { + isa = PBXGroup; + children = ( + 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */, + 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */, + 496674699F173A5385EAFF07 /* calctrlg.cpp */, + E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */, + 5F3D473DC5123EDAB767045C /* datavgen.cpp */, + AE856D950B8C369EB0FE13BA /* datectlg.cpp */, + 7D90D14874FD38079835AF0B /* editlbox.cpp */, + 76337016F2CA3C85831702E6 /* grid.cpp */, + 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */, + 66426B63AA3E3A279936C034 /* grideditors.cpp */, + 26381308E32A3A179E7A9B40 /* gridsel.cpp */, + DF376BC55EA73F5FB7328142 /* helpext.cpp */, + CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */, + C3784C240C2F330683494926 /* laywin.cpp */, + 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */, + 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */, + 6BC93D1DE277395592610085 /* propdlg.cpp */, + 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */, + 3F8836E29C5A370E80CE070E /* splash.cpp */, + B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */, + 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */, + 580AFC66F3003582B43043B1 /* animateg.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA693 /* src/generic */ = { + isa = PBXGroup; + children = ( + FD5F11A3646F397BA62EB037 /* htmllbox.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */ = { + isa = PBXGroup; + children = ( + C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */, + 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */, + E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */, + 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */, + 5219A792C6A736F193D4A82F /* ContractionState.cxx */, + BF1C44D726E63B18A98006EC /* Decoration.cxx */, + 71DB140E670738839EC42C2B /* Document.cxx */, + 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */, + DA5E95D498C53A808A8E2EEB /* Editor.cxx */, + FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */, + 4FDE5A962FA234FA83A605AD /* Indicator.cxx */, + E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */, + EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */, + 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */, + A82C367B86F83981803D55DB /* LexASY.cxx */, + C76222F466E831F896A89269 /* LexAU3.cxx */, + BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */, + CD72950967F33809931D4968 /* LexAbaqus.cxx */, + 375E7A99FF4C38FA9E223772 /* LexAda.cxx */, + A65399C8A6D636139E362119 /* LexAsm.cxx */, + A46D50BEBF523B3F88831086 /* LexAsn1.cxx */, + 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */, + 78D7866F95C73A28BB540606 /* LexBash.cxx */, + B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */, + 6718204F4700318E89EAC906 /* LexBullant.cxx */, + 7EE2459D69BA35838C274488 /* LexCLW.cxx */, + B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */, + 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */, + 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */, + 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */, + 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */, + 04082EC1C91334379425802D /* LexConf.cxx */, + 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */, + 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */, + B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */, + 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */, + 55EBB18CB4773C788510B14B /* LexEiffel.cxx */, + A1276C0E5D48337489DEE8DF /* LexErlang.cxx */, + F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */, + B181F564935730E89AB00D92 /* LexForth.cxx */, + 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */, + 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */, + FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */, + D87406BCF3E833369E12D89A /* LexHTML.cxx */, + 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */, + 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */, + B303230368143F37B2409DE6 /* LexKix.cxx */, + 40586C8986443431A64EB066 /* LexLisp.cxx */, + B14D6E7E15FD3C869E341198 /* LexLout.cxx */, + 5145561C78303EEE9F827962 /* LexLua.cxx */, + FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */, + FE3B47058A723243A285594D /* LexMPT.cxx */, + 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */, + 45860601270D318D93BEE1F3 /* LexMagik.cxx */, + E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */, + DC9153A350893820B942D37E /* LexMatlab.cxx */, + F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */, + 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */, + BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */, + 1BC0322549563787A21CE8F1 /* LexNsis.cxx */, + 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */, + C356B5738AB13E829E66729E /* LexOthers.cxx */, + 8744F2C80ECF375999195935 /* LexPB.cxx */, + 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */, + 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */, + EDB48813110636DBA045BF3A /* LexPS.cxx */, + 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */, + D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */, + 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */, + 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */, + 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */, + CC2713393AB132AA8E337AE1 /* LexPython.cxx */, + 7255468B6D5F3D8697994A53 /* LexR.cxx */, + 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */, + 8734C52C7559310784396455 /* LexRuby.cxx */, + 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */, + 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */, + 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */, + 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */, + 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */, + 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */, + 4592464D4868329897F3864D /* LexSpice.cxx */, + 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */, + A284E855892F3A9E9E19E854 /* LexTADS3.cxx */, + 38891BF8F51E398F9082903F /* LexTAL.cxx */, + C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */, + FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */, + 8F633793051F371F94C27530 /* LexVB.cxx */, + 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */, + D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */, + 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */, + AF3DF03795153E039B8F1F87 /* LineMarker.cxx */, + 9389DAF8B91030B7AAB029FF /* PerLine.cxx */, + BCD873D873A53BBF955D8A4E /* PositionCache.cxx */, + E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */, + E145FC31ED523B4AA5080A61 /* RESearch.cxx */, + 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */, + 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */, + 2AF7739C389536F79DAA31E5 /* Selection.cxx */, + C28429A964C337A192D76CC8 /* Style.cxx */, + 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */, + 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */, + C133B838193A35ABBB803151 /* ViewStyle.cxx */, + 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */, + C25521AF59B9324EB2809C73 /* XPM.cxx */, + ); + name = src/stc/scintilla/src; + sourceTree = ""; + }; + 944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */ = { + isa = PBXGroup; + children = ( + 2DF2456ED905357B8C1D74D9 /* webkit.mm */, + ); + name = src/html/htmlctrl/webkit; + sourceTree = ""; + }; + 98C15055598A3586BDB4FD0F /* src/aui */ = { + isa = PBXGroup; + children = ( + 26632A254717372BAA4D514D /* framemanager.cpp */, + BD709DEB71623974B9836D69 /* dockart.cpp */, + A881F49ADCF33C299B041584 /* floatpane.cpp */, + A298576700C33F018616E7BD /* auibook.cpp */, + 05A4437E9697300390FDE14E /* auibar.cpp */, + C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */, + ); + name = src/aui; + sourceTree = ""; + }; + 9A6B5D3E90513D0396CFE0EF /* src/stc */ = { + isa = PBXGroup; + children = ( + D0B9C41A4D12345AAA764CAD /* stc.cpp */, + 47FF6D792CA234C395692118 /* PlatWX.cpp */, + 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */, + ); + name = src/stc; + sourceTree = ""; + }; + A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */ = { + isa = PBXGroup; + children = ( + 5D2F8259CC99380CB8217DEF /* tif_unix.c */, + D0CDADAF2D893E32A38351E4 /* tif_aux.c */, + F82278F9AF0432529891E6D7 /* tif_close.c */, + 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */, + 149D299A0EDB3D998118EC93 /* tif_color.c */, + CA0D5D47D62A3148BA51B31B /* tif_compress.c */, + E79B2D1F630036129B9677A7 /* tif_dir.c */, + 032A38738B58394E8617617B /* tif_dirinfo.c */, + F6EA240B3DB93D398A990FAD /* tif_dirread.c */, + B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */, + 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */, + 48F1439BF6C3361296F05A33 /* tif_error.c */, + AF7CE00168AB33C994374ABA /* tif_extension.c */, + 30FD1048328234E59D319863 /* tif_fax3.c */, + BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */, + 305614D19CF23CB2B14A5B2E /* tif_flush.c */, + 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */, + 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */, + 66FDA882451239EA8DF2E0B5 /* tif_luv.c */, + 346C68F0CCD23823B78267F0 /* tif_lzw.c */, + DFDC805DD3063C389F93642D /* tif_next.c */, + 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */, + 1731A6096BFC3A468AB4755A /* tif_open.c */, + 9CE73979D0933A43830307E4 /* tif_packbits.c */, + 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */, + 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */, + C6EB77ED688E3EE294167EF1 /* tif_print.c */, + 64B25B87203E3464BCDD277D /* tif_read.c */, + B83EDE2D1731311ABDE62F9F /* tif_strip.c */, + AAC12B4456E13F57BEA25A5E /* tif_swab.c */, + 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */, + BD88495AF72531A28D2201D0 /* tif_tile.c */, + 3E6F40F4740C3ED29D83E107 /* tif_version.c */, + C83C97A1FCC5345896C9D7DE /* tif_warning.c */, + E9B992CB6C28339FB0CA5E27 /* tif_write.c */, + 726C0457DF1232C793918DC1 /* tif_zip.c */, + ); + name = src/tiff/libtiff; + sourceTree = ""; + }; + AC04244D4E183DF480908046 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 7C97C1F26B5A38C49543060C /* mimetype.cpp */, + 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */, + 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */, + 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */, + D5F9383D1CE931499F339D85 /* strconv_cf.cpp */, + 81390F96937631078EFCD891 /* utilsexc_base.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908047 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */, + 9D1F14339D1C331087650931 /* colour.cpp */, + 343D4FDD5CC030618EF24729 /* dcmemory.cpp */, + A5617D10CB7136EC9A4194EF /* display.cpp */, + 36E1DBA275AD325DB759C180 /* fontenum.cpp */, + 160EB9744CB63A0B81DC651F /* hid.cpp */, + 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */, + 69F098E47EBF34368ABAE7ED /* timer.cpp */, + 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */, + 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908048 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 4969528429903F15882F5391 /* sockosx.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908049 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + B1EF68113C6338CFBBED0FBE /* libregex */ = { + isa = PBXGroup; + children = ( + 4B7A97D6D29E3627B312E104 /* src/regex */, + ); + name = libregex; + sourceTree = ""; + }; + B402B38DB4CF3883AF4743C0 /* src/ribbon */ = { + isa = PBXGroup; + children = ( + 4C4649974D8B3A109D1BF145 /* art_internal.cpp */, + B540E18F9C91381CA175BABB /* art_msw.cpp */, + DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */, + 9FDDE855D9F83E4891362EB4 /* bar.cpp */, + 5612DBC4125B379DA2B28825 /* buttonbar.cpp */, + 12363D1F50FE301DAEE7F04B /* control.cpp */, + 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */, + 59ED0C057D8F388A89DC7177 /* page.cpp */, + 00969CBE3B8F32C78C195619 /* panel.cpp */, + BE4B0CE56BA23002A5C8AF00 /* toolbar.cpp */, + ); + name = src/ribbon; + sourceTree = ""; + }; + B8F95052522B37AB86DA8917 /* propgrid */ = { + isa = PBXGroup; + children = ( + 318BFB22ACCA37E19A1BD431 /* src/propgrid */, + ); + name = propgrid; + sourceTree = ""; + }; + B8FCB2D33F3B3E30A75D7ABD /* src/html */ = { + isa = PBXGroup; + children = ( + 2E24C6F2A04E30EB95598305 /* chm.cpp */, + 42E433D1700631A8907B8227 /* helpctrl.cpp */, + C466F32CCBD13DBC87285B3D /* helpdata.cpp */, + 81821049E39B32C6ABCF6820 /* helpdlg.cpp */, + 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */, + 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */, + 68E5188DB6003C35A8C7754D /* htmlcell.cpp */, + 2C6C4F5468743265A02D656C /* htmlfilt.cpp */, + 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */, + FCCFF49F92B4323D9181CEDA /* htmltag.cpp */, + 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */, + 194ADD28300E329E80F7892E /* htmprint.cpp */, + 52FE1599218730CC99A3F801 /* m_dflist.cpp */, + B1F3C70512D93501B0478F3E /* m_fonts.cpp */, + ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */, + 548906E4E72935E48CE4AF87 /* m_image.cpp */, + A5EE0B8985443BDCB36F781F /* m_layout.cpp */, + 080597FC0436378E96EDA94B /* m_links.cpp */, + B4028ABB08C63AB59F5F240B /* m_list.cpp */, + 61658C3EABB4341AA38C691E /* m_pre.cpp */, + 727F25F832AD32D4B12D8E39 /* m_span.cpp */, + 7EB95BCFA255323183A996C9 /* m_style.cpp */, + 082CA018FB883999839C1DCE /* m_tables.cpp */, + 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */, + 7FCA75FE592C3469AE351FBF /* winpars.cpp */, + ); + name = src/html; + sourceTree = ""; + }; + C1D1DDEBCD103A95BE0B52D4 /* src/png */ = { + isa = PBXGroup; + children = ( + AF26BAB1F4733114926F1724 /* png.c */, + 1A0650754DC2358CA5933B28 /* pngerror.c */, + 91300EB871CC39ECBC430D48 /* pngget.c */, + C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */, + 9CAA325362C73AC8BE20FAA7 /* pngpread.c */, + 29D6506AEA5A323B8735F126 /* pngread.c */, + A06AB1974DB93EE2999EC75C /* pngrio.c */, + 87799D3168B43EB7B5686826 /* pngrtran.c */, + 358D0A3AC73F322EA732D020 /* pngrutil.c */, + 5E463A493FD930DE80E58608 /* pngset.c */, + 5B32A13D5B3336098B1B9765 /* pngtrans.c */, + AF9EE701DD653E2299293E5F /* pngwio.c */, + 69A6CAF721E53E83B4820DE6 /* pngwrite.c */, + 0964797530CF3FE7B8DB6242 /* pngwtran.c */, + 45D7558DF5E03A2EB41883F0 /* pngwutil.c */, + ); + name = src/png; + sourceTree = ""; + }; + C23A03BC68833F7E8BA62CF1 /* src/xml */ = { + isa = PBXGroup; + children = ( + E6AB648BC5173104A96CAE66 /* xml.cpp */, + ); + name = src/xml; + sourceTree = ""; + }; + C2FC1A9BBB8C3046994369BF /* Products */ = { + isa = PBXGroup; + children = ( + 9FBCD305199836939824BF97 /* libwx_osx_carbon.dylib */, + DE95737968723BE98DD68918 /* libwx_osx_carbon_static.a */, + ); + name = Products; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1120 /* src/unix */ = { + isa = PBXGroup; + children = ( + B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */, + F7332A03D93D3DABB050615D /* dir.cpp */, + CA2D9F325F833C408657E7B7 /* dlunix.cpp */, + 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */, + 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */, + 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */, + 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */, + EA2520F427493A22A70A5C09 /* stackwalk.cpp */, + F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */, + 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */, + AB466912FDA23F8B87A00A3C /* threadpsx.cpp */, + DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */, + C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1121 /* src/unix */ = { + isa = PBXGroup; + children = ( + D4A23A8BC7373D4BBD72851D /* apptraits.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1122 /* src/unix */ = { + isa = PBXGroup; + children = ( + BB7661E9E09A397790ED9545 /* sockunix.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + D85137B3D94F34B6B3686909 /* src/jpeg */ = { + isa = PBXGroup; + children = ( + 8EB76F786D7F3FF286948D22 /* jcomapi.c */, + 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */, + 108517BCD39230E7A89BC943 /* jerror.c */, + 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */, + 374E341C8703367686DEDE93 /* jmemnobs.c */, + 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */, + F83172EE2DAE352FB969D4F2 /* jcapistd.c */, + 725574EF98C4301989181CBF /* jctrans.c */, + 2F41EDEB298538CC86FF6DC1 /* jcparam.c */, + 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */, + AA6C6739C3BD3EFA9CF71102 /* jcinit.c */, + 3E3043D7BE9C33B59E900CCE /* jcmaster.c */, + 664736BDE465350C9C4750E9 /* jcmarker.c */, + 810EB7316DF3344197C78EC0 /* jcmainct.c */, + 7FE0455EBDC63D82B2D88587 /* jcprepct.c */, + E89AC104BF4F33A083F8B382 /* jccoefct.c */, + 8EFF4707641D3F20AB602ED6 /* jccolor.c */, + 53D06E47477B3E32BB6B915E /* jcsample.c */, + DC0FFDC7A6163F2DA73B84EB /* jchuff.c */, + E38569D873B6394F9E5B821C /* jcphuff.c */, + 6DBF3053414F3C448312165A /* jcdctmgr.c */, + 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */, + 93D07403FCA530D7A9FD2917 /* jfdctflt.c */, + 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */, + 86884BC843F6337EABF744BB /* jdapimin.c */, + 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */, + 4549845C0751356A907C23E0 /* jdtrans.c */, + DECAF5DD80383A2CA76EB383 /* jdatasrc.c */, + ED19EF377E653F71B1876259 /* jdmaster.c */, + CCF7564A2B733F759AA8496B /* jdinput.c */, + 20E4A10BCD773C84AEC481A1 /* jdmarker.c */, + 72869747E68E37998CB0A07E /* jdhuff.c */, + E85E680C62B63D4EBAB2E784 /* jdphuff.c */, + B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */, + F1A6F3936A0D31CBB58082BA /* jdcoefct.c */, + 375FF97B202F3C359402D13E /* jdpostct.c */, + A5BBC1E494D33D028CA547FF /* jddctmgr.c */, + A0DCC5EF59143640BE13AD73 /* jidctfst.c */, + 3C131F7BF8A83960ACB26242 /* jidctflt.c */, + 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */, + 646743F6FDFE3ACFA1A79B40 /* jidctred.c */, + 5FFCF47A161B3E08B19BFE14 /* jdsample.c */, + 68B81FBDA49D3C1991B6356A /* jdcolor.c */, + 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */, + 02D9332D5C5632E981936E29 /* jquant2.c */, + 0890779C662C35889A8C6C2E /* jdmerge.c */, + ); + name = src/jpeg; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D6 /* src/common */ = { + isa = PBXGroup; + children = ( + 4867546E8B8D3C8683A23ED5 /* any.cpp */, + 95A156A823B536DE8476E4F9 /* appbase.cpp */, + 75D0C937F2A03ADA8581A2BB /* arcall.cpp */, + C513377E9E303F778BA9D7ED /* arcfind.cpp */, + 02D2E8B5C89939CE90B99E2B /* archive.cpp */, + A57CF60203F53459A03951A9 /* arrstr.cpp */, + F2024D29170D3B50A4DFDE11 /* base64.cpp */, + 2C904B4BA8273355869812B2 /* clntdata.cpp */, + FBE1C531185131A89EFF7FAF /* cmdline.cpp */, + 4FE0B33481283D3493613B0F /* config.cpp */, + 20B922D61CDB3CCEB59A5194 /* convauto.cpp */, + E0EBCDDF248638B58B01D9CC /* datetime.cpp */, + 864438709B363773B8C3382D /* datetimefmt.cpp */, + 81B3DFBB73573FFDBD320334 /* datstrm.cpp */, + EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */, + ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */, + D272910EC35531E5B4D6E05B /* dynlib.cpp */, + 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */, + C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */, + 640783FBACA43206B782C77B /* evtloopcmn.cpp */, + 033B94A9AC8A3370A794503F /* extended.c */, + ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */, + 168DB301ACC736FF96D7F581 /* file.cpp */, + AC12D557950A3B0D89D9F2F3 /* fileback.cpp */, + 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */, + 58421C141C9E31C6A7A3C183 /* filefn.cpp */, + BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */, + F263022F3FEA3F75895B644D /* filesys.cpp */, + 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */, + EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */, + 832BBBFE664736D5978420C6 /* fmapbase.cpp */, + 88F2BA2F0598342186A484B5 /* fs_arc.cpp */, + AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */, + 888BD97139C936679691FF34 /* hash.cpp */, + A6636144CDE83E8E85270FAF /* hashmap.cpp */, + DB82939EDC593F9CA95C3098 /* init.cpp */, + AC8BB1AABB3D393EBA527060 /* intl.cpp */, + 2C090A76B6F23E6481A27282 /* ipcbase.cpp */, + 67D76B026121359F9B22F8B0 /* languageinfo.cpp */, + 552757A901E732CAA8E3F16D /* list.cpp */, + EA93D41B11683E758D456531 /* log.cpp */, + 72D7AF345E563587941BD868 /* longlong.cpp */, + 5466CC2D6579360E9C665EE5 /* memory.cpp */, + 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */, + 9DB43FAB1E563B02ACEFF647 /* module.cpp */, + DC3D1E222FD93A69B1D1366E /* mstream.cpp */, + 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */, + 1731D6708BFE3DE7B101CE74 /* object.cpp */, + 97FFB03FF6793506B246BAC6 /* platinfo.cpp */, + 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */, + B35DA585CFDD32468868E892 /* process.cpp */, + FB46BC22F6B23909A938C561 /* regex.cpp */, + 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */, + F46EC1508C063C8395CE7A95 /* sstream.cpp */, + DE16011AD6323AAC8616F973 /* stdstream.cpp */, + 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */, + 9FEB8204E530329FA085E5B8 /* strconv.cpp */, + FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */, + F7E99B35A98D30818120B002 /* string.cpp */, + E5357E76650035639844D15B /* stringimpl.cpp */, + F1E724EA70AB35DDB130F84F /* stringops.cpp */, + 0EEAD9C3E180305D8899441E /* strvararg.cpp */, + F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */, + C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */, + 701B84EE7C043B539FF5195A /* textbuf.cpp */, + 0903EE9B3793303285FF96E3 /* textfile.cpp */, + 7195E665E0F233839B967FC9 /* timercmn.cpp */, + 0401B7302088357BB6B7F16F /* timerimpl.cpp */, + 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */, + 6AC666417602346EA583709E /* translation.cpp */, + 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */, + DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */, + D4E1DC1869C6327C80D2F5F4 /* uri.cpp */, + B63EBEE1A04537E7887E9FD0 /* ustring.cpp */, + 31F4B9B03D52339B8F82C114 /* variant.cpp */, + C37866F41B0C31E295AA7FA6 /* wfstream.cpp */, + 23FC98E2305230E2990471E3 /* wxcrt.cpp */, + 607EF0043E723B7B9BE101EA /* wxprintf.cpp */, + 418AD9241B673308BE31DC06 /* xlocale.cpp */, + 25C86D3D4839343BA1D8BDEE /* xti.cpp */, + FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */, + 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */, + B9B5BC858CCF3477895D2786 /* zstream.cpp */, + 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */, + 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */, + A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */, + 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */, + C9A305CEC03B3085B159B617 /* fs_mem.cpp */, + E968913A9A593B258BD8EACB /* msgout.cpp */, + 4188821BBA833CCAA678B234 /* utilscmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D7 /* src/common */ = { + isa = PBXGroup; + children = ( + A436B55DC44E3827A757A6D8 /* accelcmn.cpp */, + 8555204EBA8930809B732842 /* accesscmn.cpp */, + EE959EC7BFDD3A628E856404 /* anidecod.cpp */, + DD09A813E10A31C19554B425 /* affinematrix2d.cpp */, + F01DDE448E4C3983ACCE67FD /* appcmn.cpp */, + 29387393C07C39DB8FF1663B /* artprov.cpp */, + 24E82A05E9A9323287CDB15B /* artstd.cpp */, + 9988CBB0772A3539970162FA /* arttango.cpp */, + E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */, + 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */, + 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */, + 84A7A3B499503ECABC6A838F /* btncmn.cpp */, + 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */, + 4FC2F076657431458896115A /* checkboxcmn.cpp */, + 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */, + 24930711031D35288D28B04B /* choiccmn.cpp */, + 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */, + AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */, + 2D61240ABD70328BA5789663 /* colourcmn.cpp */, + 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */, + 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */, + 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */, + 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */, + B3645350F572364BABF50238 /* containr.cpp */, + 67DCEEB6861731319C30817F /* cshelp.cpp */, + 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */, + 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */, + D1EE17722EA937E88A7F0C01 /* dcbase.cpp */, + FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */, + 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */, + DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */, + E110907DDC13305E88B90086 /* dirctrlcmn.cpp */, + 9051902662BE38B3912B34EA /* dlgcmn.cpp */, + 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */, + 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */, + ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */, + AB634FD597793A74B3B3AA7F /* docview.cpp */, + A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */, + 1197B997B1D139C5AE4D198A /* dseldlg.cpp */, + 48D72D20DB1D3E1CA5ED112A /* effects.cpp */, + EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */, + 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */, + D7B3307E56B332769901E99F /* filehistorycmn.cpp */, + BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */, + A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */, + 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */, + 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */, + C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */, + 373242CD08F330208A7CF438 /* fontenumcmn.cpp */, + D0817D6A1AF83608B050EBC3 /* fontmap.cpp */, + 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */, + A54B80C17F823CB5900AD2E8 /* framecmn.cpp */, + 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */, + 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */, + 998D611109EC33A9A6A11C5A /* gdicmn.cpp */, + 6BC0A61629E635FAB4E09505 /* geometry.cpp */, + 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */, + 1BB59DD194923D6399087A75 /* graphcmn.cpp */, + B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */, + A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */, + BBB30516233A39BE809405AA /* helpbase.cpp */, + DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */, + 8FFDFB4D208F37569AC548B0 /* imagall.cpp */, + 5F84098A475939BB9EE87E70 /* imagbmp.cpp */, + 81A30C745CA73E30B788B408 /* image.cpp */, + 137E01C362E134449BF966ED /* imagfill.cpp */, + CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */, + A4A745D1821A32D591D76650 /* imagiff.cpp */, + 6876262846EA3569B36D92E9 /* imagjpeg.cpp */, + 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */, + 24396D584D053948A3FF0DCD /* imagpng.cpp */, + BC12B97F233B3B9494DA217F /* imagpnm.cpp */, + FA7029BB5751398AA02D8C24 /* imagtga.cpp */, + AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */, + 5C85865D28DC31649440A921 /* imagxpm.cpp */, + BEB08798C70E33DDB360E563 /* layout.cpp */, + 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */, + E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */, + DA7F7633279936EFA0B9C5CF /* markupparser.cpp */, + EF330EAACFA53877BE289896 /* matrix.cpp */, + F175D6E8E5723FC797701275 /* menucmn.cpp */, + D037EA567C253DEEA17E822B /* mousemanager.cpp */, + B901252876603DCEA4C66D89 /* nbkbase.cpp */, + 303ACF199BE431BD891C9301 /* overlaycmn.cpp */, + 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */, + 87D973CA8D673267BD0844D3 /* paper.cpp */, + 70E9B2C076673C87B4218A01 /* panelcmn.cpp */, + 22D9626646773CED82449D5D /* persist.cpp */, + 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */, + D922063B2F2536629EEEAAF0 /* popupcmn.cpp */, + 242BF97B558634A79322052C /* prntbase.cpp */, + B890199A37723EFD86C0ADA5 /* quantize.cpp */, + 724927B0045F3CC0884878BB /* radiobtncmn.cpp */, + 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */, + 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */, + 96CED508FA3C3B6B9265099E /* rendcmn.cpp */, + 63867276260C3F4A980E83D8 /* rgncmn.cpp */, + A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */, + ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */, + 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */, + E8072CA67D19346ABF4D465F /* slidercmn.cpp */, + C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */, + 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */, + 1EF103B09F02315282EC8F44 /* srchcmn.cpp */, + 9C87B071E3593A889704F512 /* statbar.cpp */, + 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */, + D73954EB5397301F87881646 /* statboxcmn.cpp */, + 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */, + 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */, + B180290089B139F18B0C7BBA /* stockitem.cpp */, + D3F32C01D122301AB00D06A5 /* tbarbase.cpp */, + 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */, + 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */, + 861438BD294335D4B859EA71 /* toplvcmn.cpp */, + 7BA6ADD758693BD180D3275B /* treebase.cpp */, + A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */, + F7440859617F3B47AF4D3817 /* valgen.cpp */, + 01BA6D45FE4C381493EB4372 /* validate.cpp */, + DE8701E1CF2B352B945C17E5 /* valtext.cpp */, + 684D92E552BE313CBE0A88AA /* valnum.cpp */, + AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */, + E9B9B85572D0312BBF2878DB /* windowid.cpp */, + B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */, + C562D5885AFF3E15837325CE /* xpmdecod.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D8 /* src/common */ = { + isa = PBXGroup; + children = ( + B7581D7140293BAE88E43DBE /* fs_inet.cpp */, + 5CB4781DF8C432C688F30CDD /* ftp.cpp */, + F84F0DB790A23D92A193D2B4 /* http.cpp */, + 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */, + DE8238DA30FF3FB984511250 /* sckaddr.cpp */, + 56653FACC7D13804A70556AD /* sckfile.cpp */, + 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */, + D784A32C094730FEAA391A9B /* sckstrm.cpp */, + 40CE02524DD4385AB2C3DF95 /* socket.cpp */, + 49612306912038DDBCABB4DE /* url.cpp */, + DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D9 /* src/common */ = { + isa = PBXGroup; + children = ( + A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */, + 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */, + 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */, + 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */, + FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */, + 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */, + 6F23140777B733679D2FAAFC /* odcombocmn.cpp */, + 4692909E4B823F71822B13F8 /* taskbarcmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DA /* src/common */ = { + isa = PBXGroup; + children = ( + C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DB /* src/common */ = { + isa = PBXGroup; + children = ( + 4048A3523EC03409BD899BEF /* xtixml.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DC /* src/common */ = { + isa = PBXGroup; + children = ( + E08A51FA8D8A361681B07295 /* glcmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + E96566B813153B4295AD767B /* stc */ = { + isa = PBXGroup; + children = ( + 9A6B5D3E90513D0396CFE0EF /* src/stc */, + ); + name = stc; + sourceTree = ""; + }; + EB288BE7E74B3328B762A461 /* libtiff */ = { + isa = PBXGroup; + children = ( + A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */, + ); + name = libtiff; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFB /* src/osx */ = { + isa = PBXGroup; + children = ( + B0665A40F3FC3F218074C63C /* artmac.cpp */, + 302A13BC64C238A297F4399F /* brush.cpp */, + BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */, + 5FF661188B563D27A11F5716 /* fontutil.cpp */, + 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */, + 693F731B7D1730A79485F9EC /* minifram.cpp */, + 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */, + BEF6B3FB66243812969E5BD1 /* palette.cpp */, + 4BA819575B5136B09FA8FEB1 /* pen.cpp */, + 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */, + AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */, + EED7C691150139EFA35E8EBD /* utils_osx.cpp */, + 26D7C4995D7A35A1854B533F /* window_osx.cpp */, + C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */, + 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */, + CF4F4F5211933057824B5621 /* button_osx.cpp */, + 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */, + 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */, + 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */, + 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */, + CA72410F615B3A78A6340532 /* dnd_osx.cpp */, + EC28591B403B32B7AFCC079D /* gauge_osx.cpp */, + B99CA41708513A599AE275A2 /* listbox_osx.cpp */, + 66C21CA37BF63893887FD91B /* menu_osx.cpp */, + CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */, + 5248A45AB113341EAC361910 /* notebook_osx.cpp */, + 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */, + 773D91F8280434519BD167EA /* radiobox_osx.cpp */, + 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */, + 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */, + D215A0D67563350CB4EECB06 /* slider_osx.cpp */, + 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */, + 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */, + 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */, + 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */, + DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */, + 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */, + 777385D10CCC350C90F02824 /* textentry_osx.cpp */, + 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */, + 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */, + 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */, + 8C78A1539462370CAA429508 /* accel.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFC /* src/osx */ = { + isa = PBXGroup; + children = ( + 5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */, + A9B2316B32653DA0939A372D /* sound_osx.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFD /* src/osx */ = { + isa = PBXGroup; + children = ( + FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + FE1C78F1707A30878CBB2B4B /* ribbon */ = { + isa = PBXGroup; + children = ( + B402B38DB4CF3883AF4743C0 /* src/ribbon */, + ); + name = ribbon; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + B688C600AA163F61B2B151DE /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B688C600AA163F61B2B151DF /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 363401F972C53D8EBD3D4BD9 /* dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = F515C6D7EB103C50924F790B /* Build configuration list for PBXNativeTarget "dynamic" */; + buildPhases = ( + 94E713C89B403F568A694F9A /* ShellScript */, + B688C600AA163F61B2B151DF /* Headers */, + 8BD3A3B4622D37B8B5DB242E /* Sources */, + 82F403E7B8653CBD908BC258 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = dynamic; + productName = wxcocoa; + productReference = 9FBCD305199836939824BF97 /* libwx_osx_carbon.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; + BAB02EC06578349A9171CCAC /* static */ = { + isa = PBXNativeTarget; + buildConfigurationList = 336FCCBABBEF3C4AA92AD394 /* Build configuration list for PBXNativeTarget "static" */; + buildPhases = ( + 94E713C89B403F568A694F9B /* ShellScript */, + B688C600AA163F61B2B151DE /* Headers */, + 8BD3A3B4622D37B8B5DB242D /* Sources */, + 82F403E7B8653CBD908BC257 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = static; + productName = static; + productReference = DE95737968723BE98DD68918 /* libwx_osx_carbon_static.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 19367367C9323490BB936F06 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = FE4F954C29353DAB832F4608 /* Build configuration list for PBXProject "wxcarbon" */; + compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 1D56230B75893DBA8A923441 /* wxcocoa */; + productRefGroup = C2FC1A9BBB8C3046994369BF /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 363401F972C53D8EBD3D4BD9 /* dynamic */, + BAB02EC06578349A9171CCAC /* static */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXShellScriptBuildPhase section */ + 94E713C89B403F568A694F9A /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${WXROOT}/distrib/mac/pbsetup-sh\" \"${WXROOT}/src\" \"${WXROOT}/build/osx/setup/${WXTOOLKIT}\""; + }; + 94E713C89B403F568A694F9B /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${WXROOT}/distrib/mac/pbsetup-sh\" \"${WXROOT}/src\" \"${WXROOT}/build/osx/setup/${WXTOOLKIT}\""; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8BD3A3B4622D37B8B5DB242D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 59BFB8C8310E37B39AF8B0D5 /* any.cpp in Sources */, + D5A25AC579F436509805335B /* appbase.cpp in Sources */, + C2B07E2ECDDC3833BDC9B28D /* arcall.cpp in Sources */, + 4CF9BA40653C3153805D88AC /* arcfind.cpp in Sources */, + 3EB6B8528A0D3B6CADAE1257 /* archive.cpp in Sources */, + 3B8A54D5E5A53607A6F7979B /* arrstr.cpp in Sources */, + 0A2A4D2DC8F63FE1AC0BFAB0 /* base64.cpp in Sources */, + 319FB8E64CE731D6A58AD302 /* clntdata.cpp in Sources */, + 51437DC2AD7B3BEB9A53CE1B /* cmdline.cpp in Sources */, + DA0FA502405A37B2A5698D21 /* config.cpp in Sources */, + BB6FE851028C3DE7A070C214 /* convauto.cpp in Sources */, + F89405757B063F80B111F46A /* datetime.cpp in Sources */, + 1D726139C977341A97D0C932 /* datetimefmt.cpp in Sources */, + E63364B7E727383BA8E2B7ED /* datstrm.cpp in Sources */, + 3ED6F4B64C283232A79423D0 /* dircmn.cpp in Sources */, + 54A89D04FF953D55AE8DCCF1 /* dynarray.cpp in Sources */, + AD7EEB418C7930CB828EAF88 /* dynlib.cpp in Sources */, + 0164A65CDB7A334A8E9AA4C0 /* dynload.cpp in Sources */, + 246B4FF96BA135258FE45F50 /* encconv.cpp in Sources */, + 97BAFEAD53E238B6881178DE /* evtloopcmn.cpp in Sources */, + F07D84D124F23E7FA11CF149 /* extended.c in Sources */, + FEF99FF6C38D3B488396B143 /* ffile.cpp in Sources */, + D6C3421AD2A537AAA2F0AB81 /* file.cpp in Sources */, + FFF5BFBE600E35FAB7EA522D /* fileback.cpp in Sources */, + 41943A8F82723027A151A469 /* fileconf.cpp in Sources */, + 49260580A7F23B569A827D40 /* filefn.cpp in Sources */, + D4C87E227A28391891D89089 /* filename.cpp in Sources */, + 8A4046BD38873D9CAC9C2B5A /* filesys.cpp in Sources */, + 9E0B67E34B683412978BA82E /* filtall.cpp in Sources */, + CA4DCD57060B38CC8B2283D8 /* filtfind.cpp in Sources */, + 2FA1A8FE3644325ABAD273A5 /* fmapbase.cpp in Sources */, + FE2DBCCC1D0B36A3BE4493C1 /* fs_arc.cpp in Sources */, + F6B85CD918E93923BE631B96 /* fs_filter.cpp in Sources */, + FE5285579C7F39C48FC66B11 /* hash.cpp in Sources */, + 595DCB164D55342EB86604ED /* hashmap.cpp in Sources */, + 1B06622C8D8731FC832199E3 /* init.cpp in Sources */, + 0743AE8613F535A0ABB79316 /* intl.cpp in Sources */, + A336FD218BE63B19991CA514 /* ipcbase.cpp in Sources */, + BFD4B8871B3934048B63141A /* languageinfo.cpp in Sources */, + 68AC8860B0943C1FAF76D96C /* list.cpp in Sources */, + 3141FEDED0943BD6A2EF8590 /* log.cpp in Sources */, + 0C7E2D5C22A232368F862A61 /* longlong.cpp in Sources */, + DC978B60F6DF3176B5B114C4 /* memory.cpp in Sources */, + B59FC7345C383D9099391AC4 /* mimecmn.cpp in Sources */, + EC3A1C620D323B5590AABF03 /* module.cpp in Sources */, + F38202271C6131908C358DED /* mstream.cpp in Sources */, + 31DD19A942283FA8810B6383 /* numformatter.cpp in Sources */, + 23A7AF68A03E380785EE7C25 /* object.cpp in Sources */, + D6B73239BF0E32288161679D /* platinfo.cpp in Sources */, + 0A406D2D1ADA343891E3664D /* powercmn.cpp in Sources */, + CA85901B9E2538CFB7E44217 /* process.cpp in Sources */, + 7A7439BE66AA3771B4A89049 /* regex.cpp in Sources */, + CF3082BA1ED232F4B904BD15 /* stdpbase.cpp in Sources */, + 539B586AEAD630A79FC12ED0 /* sstream.cpp in Sources */, + 028257C52CAE3038AA862C36 /* stdstream.cpp in Sources */, + 6AA0EE765330326380989FD2 /* stopwatch.cpp in Sources */, + E882402BEE0330A080A65170 /* strconv.cpp in Sources */, + 30493B486DFF35AF80D12C4A /* stream.cpp in Sources */, + 795613831EC8332A83FF26E8 /* string.cpp in Sources */, + 55F0D287F60F3EDEA16CCB65 /* stringimpl.cpp in Sources */, + 88E1AE56FD393C8BA5CF8546 /* stringops.cpp in Sources */, + 056E30EA43753A7CB1AF8C9F /* strvararg.cpp in Sources */, + 4DD98A9436C83CF3B9425A79 /* sysopt.cpp in Sources */, + 9FB1E1763EFA334CA0C07C4A /* tarstrm.cpp in Sources */, + 2E4747E0736B30569ACD5423 /* textbuf.cpp in Sources */, + 6167245C417A32179EC37D2E /* textfile.cpp in Sources */, + 7FC3D17B3C853FE58841002E /* timercmn.cpp in Sources */, + 729091CC33C73C989B4E071A /* timerimpl.cpp in Sources */, + BF8C33B7CB3A3ECE814A95FC /* tokenzr.cpp in Sources */, + ABCD15C4AB37396EA17B7B29 /* translation.cpp in Sources */, + 087FF6DE223A32509692F39C /* txtstrm.cpp in Sources */, + DAAFBED07FF8365B96D20B9A /* unichar.cpp in Sources */, + 2E8440A2BDD53BE7B01547C3 /* uri.cpp in Sources */, + C425A172B0AB3EBD9AC9A591 /* ustring.cpp in Sources */, + 65E8A5F333D7336C816F0D0D /* variant.cpp in Sources */, + E53AFF04877D34C386D77381 /* wfstream.cpp in Sources */, + 319EA32592DA3C74B86DDE00 /* wxcrt.cpp in Sources */, + A2473402D8B83628B1F6674A /* wxprintf.cpp in Sources */, + BA7B12396B873FDA8F3A2749 /* xlocale.cpp in Sources */, + C5419BC04D6234B5A8307B82 /* xti.cpp in Sources */, + 52C0984A2A4F31BC885519B1 /* xtistrm.cpp in Sources */, + CA155860CE9A3A8189C3A4C3 /* zipstrm.cpp in Sources */, + 014AF0BAB1783A5D9D75A7EE /* zstream.cpp in Sources */, + A93D0E6F0871368EA8FC9FFA /* fswatchercmn.cpp in Sources */, + E49F0D43B5A63EF1A57A7113 /* fswatcherg.cpp in Sources */, + 4657E7382E9E3EDC8DE2401F /* mimetype.cpp in Sources */, + 1DBDF75500D73A3098015E80 /* cfstring.cpp in Sources */, + 9FBC642677C63D01AA2511BD /* evtloop_cf.cpp in Sources */, + 13250B531B1B3F9998C59DAA /* stdpaths_cf.cpp in Sources */, + AAAB5DF8E60736D88273DCFF /* strconv_cf.cpp in Sources */, + 4E140367282F38C8A904A005 /* utilsexc_base.cpp in Sources */, + D36E76A4CAF5352D9397E200 /* fdiodispatcher.cpp in Sources */, + D3FB75C8E3A73AE38EE8A6F7 /* selectdispatcher.cpp in Sources */, + BAAB6B1D80A33843A8436B11 /* appunix.cpp in Sources */, + 403FBA20CEFE3EAFB4E6B906 /* dir.cpp in Sources */, + 20BEEFFA08F3396791596871 /* dlunix.cpp in Sources */, + CBBD7B32DB7B3E24AE745D79 /* epolldispatcher.cpp in Sources */, + D18E2985C48733B2B7B3D443 /* evtloopunix.cpp in Sources */, + 3D22FC202D903007AEE3D165 /* fdiounix.cpp in Sources */, + 4B88254FF9963833A276A64D /* snglinst.cpp in Sources */, + 5F78DB0417BF3CE1B4E35C80 /* stackwalk.cpp in Sources */, + E8F0C87119C63E8E81423A7D /* stdpaths.cpp in Sources */, + 2F35A207C3993DE08E4FE0B1 /* timerunx.cpp in Sources */, + F5D2146C94E733FAAB6D286B /* threadpsx.cpp in Sources */, + B5C7FD8C27F43F3289A77FCA /* utilsunx.cpp in Sources */, + FF7DB2884F6E3C5DB4BDF61E /* fswatcher_kqueue.cpp in Sources */, + 55D893FDD00633FEA82ABD82 /* event.cpp in Sources */, + 131B879180AE3FB481F81CC8 /* fs_mem.cpp in Sources */, + 05814571E7A83F5DBFB6E4C5 /* msgout.cpp in Sources */, + 80665EEAE8613DF8A93A7985 /* utilscmn.cpp in Sources */, + 2A54BBF33C1E39FE8AF805D7 /* utils.cpp in Sources */, + 9513691C6A943A41B4184644 /* uma.cpp in Sources */, + F4C0CEADEDC23610BF6983D7 /* artmac.cpp in Sources */, + 296692A7A3783E3A83D005C7 /* brush.cpp in Sources */, + 86AED49CEAFC3637B1F10538 /* dialog_osx.cpp in Sources */, + DC6B669C9A78398F914AEE54 /* fontutil.cpp in Sources */, + 1EDED99760B23A1999E75C13 /* imaglist.cpp in Sources */, + C1CDD035AA393ACC9E202C04 /* minifram.cpp in Sources */, + 4269B85FDC5639BEB76A8AEC /* nonownedwnd_osx.cpp in Sources */, + AC91349D7F0E37739B1F5166 /* palette.cpp in Sources */, + 2480859662ED399799E120A6 /* pen.cpp in Sources */, + 0E024D145DDD38ACAE68F463 /* toplevel_osx.cpp in Sources */, + 02BB539E2AD63C078DA776B1 /* uiaction_osx.cpp in Sources */, + 052331773CF6362C9A6CF38F /* utils_osx.cpp in Sources */, + CB2E99E8FB7D3269A333A55F /* window_osx.cpp in Sources */, + 03BF1610E2FC3BD5ACB754F1 /* bitmap.cpp in Sources */, + FF50EC0EC5F23DF890C6E960 /* colour.cpp in Sources */, + BD2B17EB72E73A6EB6E0B270 /* dcmemory.cpp in Sources */, + F1F484DD591337399FCD0464 /* display.cpp in Sources */, + 371809DA4AD1382F8B532879 /* fontenum.cpp in Sources */, + 86BE5213D3F131D8A686267A /* hid.cpp in Sources */, + AB58406CEBA13BC4A2A83B67 /* printmac.cpp in Sources */, + 91BDA5B04CF33C9AB7358B8B /* timer.cpp in Sources */, + C2D45B334BE03F6C941CA042 /* utilsexc_cf.cpp in Sources */, + A92439BAFD3A30A29DD93132 /* apptraits.cpp in Sources */, + E82CB89681FF3747B6A94428 /* anybutton_osx.cpp in Sources */, + 49FE0228D8FD3F7AB64A4433 /* bmpbuttn_osx.cpp in Sources */, + 6AC347D2DCC730149A0A83D9 /* button_osx.cpp in Sources */, + 0E92CEF677AA32C9A8CDA0A8 /* checkbox_osx.cpp in Sources */, + 07412469921A3E488A2F9BA7 /* checklst_osx.cpp in Sources */, + 4666CDC48BA9301EA283C000 /* choice_osx.cpp in Sources */, + 0836590D35FE37988DE70443 /* combobox_osx.cpp in Sources */, + 2DF74933A90E34129F1BEF73 /* dnd_osx.cpp in Sources */, + 0FFFFA2F762B3160955D1D89 /* gauge_osx.cpp in Sources */, + E4B826CE70283D999CB591F4 /* listbox_osx.cpp in Sources */, + B198DA8239E9358A9D56B989 /* menu_osx.cpp in Sources */, + 1DF3A4F85FCB3BA79A552F3E /* menuitem_osx.cpp in Sources */, + A3321FE2A87D3BD69E0BB00A /* notebook_osx.cpp in Sources */, + 0C9A379D97B133FA831175A8 /* printdlg_osx.cpp in Sources */, + B1775EF7C72233408044034C /* radiobox_osx.cpp in Sources */, + 6A081BF19747385CB4C18780 /* radiobut_osx.cpp in Sources */, + DF8CE011EAC23F73BDA1C44E /* scrolbar_osx.cpp in Sources */, + 27E73CA5C35A30CE89946ECB /* slider_osx.cpp in Sources */, + 00F1531404F832C6AE0748F3 /* spinbutt_osx.cpp in Sources */, + 2939CA3680A13E39AB88CB06 /* spinctrl_osx.cpp in Sources */, + 91EA325FCE3A3A6A8D1D21A6 /* srchctrl_osx.cpp in Sources */, + 221DC4F6678A3EC5ACDDEA50 /* statbox_osx.cpp in Sources */, + 91BC7802C15337CDA84C3743 /* statline_osx.cpp in Sources */, + 283C3ABE42433244983C27C2 /* stattext_osx.cpp in Sources */, + B6891F848CA0325EAB6D1374 /* textentry_osx.cpp in Sources */, + EDCA35F1555F3509895CCA6A /* textctrl_osx.cpp in Sources */, + 664A54F914443110B7BB6929 /* tglbtn_osx.cpp in Sources */, + A569A33A2097316D8110C2C2 /* toolbar_osx.cpp in Sources */, + 0AEBA7389E223781A7A257A2 /* webkit.mm in Sources */, + F5FF98C231B33E3EB7902C65 /* colordlgosx.mm in Sources */, + 2386B575BC3931D2AF86CB34 /* fontdlgosx.mm in Sources */, + 2EECB3C2F9523D0B95847A80 /* accel.cpp in Sources */, + 7F77E347E1243D77A666FB44 /* clipbrd.cpp in Sources */, + 5417332FE2DB3CD3A647B15E /* cursor.cpp in Sources */, + D66F5D4D204B3B789C7F76BA /* fontdlg.cpp in Sources */, + 692FCCABFB963696AFC1E123 /* gdiobj.cpp in Sources */, + 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */, + B0E94A59C83637C09FAAE71D /* app.cpp in Sources */, + BB31D65BA1253A1CB64CE9D3 /* combobox.cpp in Sources */, + EB52C6A915943813932944FF /* control.cpp in Sources */, + 45AB45C6B24A3983B22E56A6 /* dataobj.cpp in Sources */, + D088E7DDE38C31DC9C9B3418 /* dcclient.cpp in Sources */, + 182DFDBB58653FD9863D4177 /* dcprint.cpp in Sources */, + AAC2CB4D851230008AE4ABA2 /* dcscreen.cpp in Sources */, + 939E53CA56F33194B4681118 /* glgrab.cpp in Sources */, + 774EB9F3F7E93A379E1F7552 /* graphics.cpp in Sources */, + 5792675690843C6AA4125A73 /* font.cpp in Sources */, + BDAB44F5D017395D9D3A1F24 /* frame.cpp in Sources */, + 27E2EABB117334CD89CFD2A5 /* mdi.cpp in Sources */, + 73AA68AB9F1236ED9F1FBB2F /* metafile.cpp in Sources */, + CD2A9111B8A83AFA8B5B97E6 /* overlay.cpp in Sources */, + 805CCAE64D023561AD334B54 /* popupwin.cpp in Sources */, + 6832385DDBB33D1B90C73CBB /* renderer.cpp in Sources */, + 437519A6002A3A0FB2C9A8FD /* settings.cpp in Sources */, + F6A1AC5CF84E32C19F91A615 /* statbrma.cpp in Sources */, + D070C3BE95483FE38BABA1BF /* region.cpp in Sources */, + 07158EBC05A637ECA9DC7B50 /* utilscocoa.mm in Sources */, + 7E6C627A325F32FFB2EF9B9F /* caret.cpp in Sources */, + FB8B6E4789A3311A98C5B0A9 /* clrpickerg.cpp in Sources */, + 7569F0BC3C603EB191680890 /* collpaneg.cpp in Sources */, + BBAABF3C693E37D3B0FF2503 /* colrdlgg.cpp in Sources */, + F70156C3E68B38FCB72FE254 /* dirdlgg.cpp in Sources */, + E1F7C51F411B3AF39476E489 /* fdrepdlg.cpp in Sources */, + A965348C7FA73CEC90C8FA26 /* filedlgg.cpp in Sources */, + FD1F6CD8286D3D428FD52A29 /* filepickerg.cpp in Sources */, + 16A382A265DE32FABC318F70 /* fontdlgg.cpp in Sources */, + BEAC2449AFA7304989BA301F /* fontpickerg.cpp in Sources */, + C3AC94EA13C1352790BF5FF8 /* listctrl.cpp in Sources */, + C005C2D547E735E9B081658F /* prntdlgg.cpp in Sources */, + A1AF8FF873D6383996995ED0 /* statusbr.cpp in Sources */, + 99C3EE31DC1B3ADAAC8E5DA3 /* anybutton.cpp in Sources */, + 33B16442F6AF3233BD533109 /* bmpbuttn.cpp in Sources */, + CBD152BCD11634B7BBB8AA8D /* button.cpp in Sources */, + 3C92143CC3173F659CE40DC4 /* checkbox.cpp in Sources */, + CF172B12EEA53811BE649522 /* choice.cpp in Sources */, + 241A346E77E131918C6DE9BA /* colordlg.cpp in Sources */, + 287A6D1B6AA030AAB7C057F8 /* dialog.cpp in Sources */, + D50FA9ECB16933C39A520D89 /* dirdlg.cpp in Sources */, + B4CE55324C62369CBB823B69 /* dnd.cpp in Sources */, + D1D7B594A0DB3781951C7683 /* evtloop.cpp in Sources */, + F1E8E4D6D8453F7382E64980 /* filedlg.cpp in Sources */, + 63C8D23DD8AB32FE906B669C /* gauge.cpp in Sources */, + 55E03D705E9C39EFA3EE3E26 /* listbox.cpp in Sources */, + 2CD89A08C7ED3D35A0FBD894 /* listctrl_mac.cpp in Sources */, + D2BCC29BB1353C6ABC7D4DDF /* menu.cpp in Sources */, + 157C8DA2E272399B9380991B /* menuitem.cpp in Sources */, + 7A3976A4AF7836048B31F7DF /* msgdlg.cpp in Sources */, + 774A6D1CA57235AD9ECD5D15 /* nonownedwnd.cpp in Sources */, + 164CF6AA59B135E68239E8F9 /* notebmac.cpp in Sources */, + B5587C93D4D3333FA81D08A3 /* printdlg.cpp in Sources */, + 96A6458C826732348D2872C6 /* radiobut.cpp in Sources */, + D594C725CA08333B83C214C3 /* scrolbar.cpp in Sources */, + 006841D4ADA6384B9A8886CF /* slider.cpp in Sources */, + 69A19836B4DC39918A74B12D /* spinbutt.cpp in Sources */, + 57DDBAE7E4413A3C9DCC9EE4 /* srchctrl.cpp in Sources */, + F04F796823753478BCC9EB70 /* statbmp.cpp in Sources */, + 6EC32E5F03DF3EC9852474E0 /* statbox.cpp in Sources */, + 66ED6552F94F3770BB934E30 /* statlmac.cpp in Sources */, + 77764368190938E6A4000AE2 /* stattext.cpp in Sources */, + 90AB8293DB663C508BAEF656 /* textctrl.cpp in Sources */, + F0290CF0258A30478FED38A3 /* tglbtn.cpp in Sources */, + EA02FA6D3B003F8F8A2963C7 /* toolbar.cpp in Sources */, + 80C6D10D9A6F300995396961 /* tooltip.cpp in Sources */, + 16D334945B1E30AFB80B356D /* window.cpp in Sources */, + 3CDE2B6BF88D326189F069BE /* accelcmn.cpp in Sources */, + BDB8EF0E0DA03693BFB77EF8 /* accesscmn.cpp in Sources */, + 205520440CD13C0AB9E8915A /* anidecod.cpp in Sources */, + 353B584AD0C03919A57A3049 /* affinematrix2d.cpp in Sources */, + DDC71B80D562303690FDBE4D /* appcmn.cpp in Sources */, + EE0EA850822E35F596B5EBBB /* artprov.cpp in Sources */, + A283187810EB32DAA173BD34 /* artstd.cpp in Sources */, + 75DCE6FF00E93C5D93970843 /* arttango.cpp in Sources */, + 1749412E53B9311DABA71DDD /* bmpbase.cpp in Sources */, + 3ACCC2EB8E973C11835EB598 /* bmpbtncmn.cpp in Sources */, + A5775D87FD713CBB930A783F /* bookctrl.cpp in Sources */, + C3A63D7091913CD39094AE0C /* btncmn.cpp in Sources */, + FBA19C939E1E33EDB05043FF /* cairo.cpp in Sources */, + 427E6AF88CF73D799206E37E /* checkboxcmn.cpp in Sources */, + 37749AC3468836FC857BD0D6 /* checklstcmn.cpp in Sources */, + C0CDA289E9EC3E20BE70B2E7 /* choiccmn.cpp in Sources */, + DFEB8DA3D42734949CB1E1AB /* clipcmn.cpp in Sources */, + 9D4B67A357D23B5283CA8D99 /* clrpickercmn.cpp in Sources */, + EBF2D44758003221A22202BD /* colourcmn.cpp in Sources */, + 335DD610974A33D4B6581E2B /* colourdata.cpp in Sources */, + D542C7819D593112AE5F7C3E /* combocmn.cpp in Sources */, + 6F0605F3A4E83BF0BF4C8B7F /* cmdproc.cpp in Sources */, + 20F10669703137E68318C6FE /* cmndata.cpp in Sources */, + 6FA47EAACE613B039B6EC262 /* containr.cpp in Sources */, + 0C485288EA86379D9FD66537 /* cshelp.cpp in Sources */, + 25656617A56D342AA3D1BFE3 /* ctrlcmn.cpp in Sources */, + BF1760458996391E8EB4294A /* ctrlsub.cpp in Sources */, + 2D60F289103837EA8925E3F2 /* dcbase.cpp in Sources */, + 39D6435B10073B85A499AFD9 /* dcbufcmn.cpp in Sources */, + 9564A6968D66325DAEADEBA4 /* dcgraph.cpp in Sources */, + B791BD05072B3B909A7093C3 /* dcsvg.cpp in Sources */, + B559E894684A38238CAAA116 /* dirctrlcmn.cpp in Sources */, + 63F0C8EEDF4B3641878A8B4E /* dlgcmn.cpp in Sources */, + B839235BED6F3609BDB732B9 /* dndcmn.cpp in Sources */, + 2CCC30C0162131DBBE9D8028 /* dobjcmn.cpp in Sources */, + F0B3F484C38C3BA0B9927CDA /* docmdi.cpp in Sources */, + B1E30CF6CFA932F5A3DBA950 /* docview.cpp in Sources */, + F80C2290D67B345F9CF60086 /* dpycmn.cpp in Sources */, + 6BF19C7CA9E93D989C210FE4 /* dseldlg.cpp in Sources */, + 447FEC72F3C234378CE28DE8 /* effects.cpp in Sources */, + C2E37E798F743A4199C8658F /* fddlgcmn.cpp in Sources */, + 37715483D08335B790FFE059 /* filectrlcmn.cpp in Sources */, + 0730A107A2B935A9923C8EF3 /* filehistorycmn.cpp in Sources */, + 9881E3FB23ED3283B6CC71A3 /* filepickercmn.cpp in Sources */, + 064908348009398C8EA8497D /* fontpickercmn.cpp in Sources */, + 1E166FC1A7B3371FB038B173 /* fldlgcmn.cpp in Sources */, + F747991E5C973F9B8C9D800B /* fontcmn.cpp in Sources */, + 1E2AB43075973AE59A8D89C2 /* fontdata.cpp in Sources */, + F910C74E48823E0BA7F7885E /* graphicc.cpp in Sources */, + F1E4D7CA634E33808AE3B523 /* fontenumcmn.cpp in Sources */, + D5AABE973F3A351EB1C1A5A7 /* fontmap.cpp in Sources */, + 60706F8836A130A2AF282FE2 /* fontutilcmn.cpp in Sources */, + EDD5725CF41336EFA7FB300A /* framecmn.cpp in Sources */, + EAA469E1A0CC33E4A21A3F7B /* gaugecmn.cpp in Sources */, + 5A8638C234133824BDF93BC0 /* gbsizer.cpp in Sources */, + 0E60E17BA4B23347A4F20161 /* gdicmn.cpp in Sources */, + 95AD56D602CF3C5085602AF9 /* geometry.cpp in Sources */, + 758629DA468A3EF7B1C15242 /* gifdecod.cpp in Sources */, + 7B642B17F5D23F4F8ED38BB5 /* graphcmn.cpp in Sources */, + B8FEEC2C94183AB69C963178 /* headercolcmn.cpp in Sources */, + 383A6993E90936D39A5F12BE /* headerctrlcmn.cpp in Sources */, + 4657479AF35533AEB7876677 /* helpbase.cpp in Sources */, + BF2585CFA6853023975F1E79 /* iconbndl.cpp in Sources */, + 5B5B8DF915D438AA9FCEB39F /* imagall.cpp in Sources */, + 0813551C951A3AD1A5EF01B3 /* imagbmp.cpp in Sources */, + 6C822F7F313734DCB51F44BA /* image.cpp in Sources */, + 89046455F49D3D75A21C9DB9 /* imagfill.cpp in Sources */, + 36DB80FD5B153E9099DB6913 /* imaggif.cpp in Sources */, + 9110ACFC3CFB3C7994E907B1 /* imagiff.cpp in Sources */, + D13596A4E3CD31DE810061A2 /* imagjpeg.cpp in Sources */, + D83B32B788EC310D919E0DF8 /* imagpcx.cpp in Sources */, + 23965E313EDC3BBE9B2FA1C6 /* imagpng.cpp in Sources */, + 46E331300D8F349DB36AB50B /* imagpnm.cpp in Sources */, + AAABEE399008310A8BC9BE44 /* imagtga.cpp in Sources */, + 3C36437B2E933F83984D431F /* imagtiff.cpp in Sources */, + 774A89998E09308CBFB03EE1 /* imagxpm.cpp in Sources */, + 63F2517EC6B2334CA825A6FA /* layout.cpp in Sources */, + CFF73578F04D357E83D1D831 /* lboxcmn.cpp in Sources */, + 164010B26D363F5FA09785B7 /* listctrlcmn.cpp in Sources */, + 2F7F5B9BBCD83D90B237A1A1 /* markupparser.cpp in Sources */, + 9A83D365AD1F37FA9C7030C3 /* matrix.cpp in Sources */, + E3A4615870B139D29FE727C2 /* menucmn.cpp in Sources */, + BD49EC50CB363642BDBF25C9 /* mousemanager.cpp in Sources */, + 7A84B9471A3238B4B66B1777 /* nbkbase.cpp in Sources */, + AC6AC589EFB233C7B65A3225 /* overlaycmn.cpp in Sources */, + D6B2A64A78AF3F2983B441A9 /* ownerdrwcmn.cpp in Sources */, + 0742292656623EC481B3436A /* paper.cpp in Sources */, + E2A73751CECF32A68FFAEE83 /* panelcmn.cpp in Sources */, + 4279D39CAAF834F6A5B99197 /* persist.cpp in Sources */, + AF1E3338E892336E924AF632 /* pickerbase.cpp in Sources */, + 6E68759BC2E63CA59C12FDC1 /* popupcmn.cpp in Sources */, + 1C52CB9487DF3AB9AF243B48 /* prntbase.cpp in Sources */, + 0B98B6721DEE37A1ADEA382C /* quantize.cpp in Sources */, + AE5286C71D1130EAA368A1C5 /* radiobtncmn.cpp in Sources */, + AEB9099819B33F4A8AAB9F55 /* radiocmn.cpp in Sources */, + 5116CE330E333724A66982E4 /* rearrangectrl.cpp in Sources */, + A9864F0104FA344BBE79D3BD /* rendcmn.cpp in Sources */, + A80D00249A693F43A9CBE778 /* rgncmn.cpp in Sources */, + C259D01CC62533D296EF023B /* scrolbarcmn.cpp in Sources */, + 7625D908B2CD34C78243BA90 /* settcmn.cpp in Sources */, + F5D0BCF1A6C839E5829199E3 /* sizer.cpp in Sources */, + EDD92822EBD93E86AE5A2ED1 /* slidercmn.cpp in Sources */, + F46777ABE0743B04A1E1F0A5 /* spinbtncmn.cpp in Sources */, + 49C873EE448C3CD9A32012CE /* spinctrlcmn.cpp in Sources */, + 1EA81A0E8E5A3B38B4D80338 /* srchcmn.cpp in Sources */, + 4AEC67BF65B039D99F421667 /* statbar.cpp in Sources */, + 7C52E7CC12463941B0E4D403 /* statbmpcmn.cpp in Sources */, + D9DCBE799DB634C2A73FD6BE /* statboxcmn.cpp in Sources */, + 8B38C6C416BA3A51B37F60C5 /* statlinecmn.cpp in Sources */, + D9EE059D3C3C3C13AE4419F2 /* stattextcmn.cpp in Sources */, + BAFF04F1680F32DA988EB03E /* stockitem.cpp in Sources */, + 4958BD2E717A3F03AB030189 /* tbarbase.cpp in Sources */, + 9744994E8A813AA6938A7CE3 /* textcmn.cpp in Sources */, + AD4A533C4E1633598A6D5C70 /* textentrycmn.cpp in Sources */, + 700BBDECBE313E108BA99ABE /* toplvcmn.cpp in Sources */, + 45FE206BBAD13DDCA1EA41D0 /* treebase.cpp in Sources */, + 796311E398FF313C84218825 /* uiactioncmn.cpp in Sources */, + E9EDB5C92D5D3B529E8D73B1 /* valgen.cpp in Sources */, + 9F70A89D00B03D4894AF7639 /* validate.cpp in Sources */, + 1937FBA0A0DD32A8A743CFE2 /* valtext.cpp in Sources */, + 6A032420671B375D81273715 /* valnum.cpp in Sources */, + A2769D1659AE3CA3B58C2CAF /* wincmn.cpp in Sources */, + 1BCC944F5E0936F5830F03E9 /* windowid.cpp in Sources */, + 3399AB7BB1333B5AAF5FAF56 /* wrapsizer.cpp in Sources */, + C1E5799141603A75A26BEEA8 /* xpmdecod.cpp in Sources */, + F5806029B1BA3924A8FDDBC2 /* busyinfo.cpp in Sources */, + CB078622E90F33BE9D131132 /* buttonbar.cpp in Sources */, + 03035C5CE4BC3288A5A18425 /* choicdgg.cpp in Sources */, + 9CA687845B3F30CCA44A89D1 /* choicbkg.cpp in Sources */, + 9C1F073349FD393E9220C0D4 /* combog.cpp in Sources */, + EAE02BA934B43EEE92C496C8 /* dcpsg.cpp in Sources */, + 22AE900003F73134BBEE8BB7 /* dirctrlg.cpp in Sources */, + 4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */, + 7EF89F935314301381802FAC /* filectrlg.cpp in Sources */, + 7D615329368D32709CEF4B59 /* headerctrlg.cpp in Sources */, + 2C95DFA8EE463487956B4EB5 /* infobar.cpp in Sources */, + 02E8F1195B653D26AAA89463 /* listbkg.cpp in Sources */, + 026F90F7492C316A94128917 /* logg.cpp in Sources */, + 633DD2E870263F42A8DBF9C0 /* markuptext.cpp in Sources */, + 745C39E90E8C3C08A887B51D /* msgdlgg.cpp in Sources */, + 1AF2B2346C9639DAA4D15F31 /* numdlgg.cpp in Sources */, + EE9194D6C4C138BF9DAB8634 /* panelg.cpp in Sources */, + 4D0BA8B9F72C3C31BC170CE3 /* progdlgg.cpp in Sources */, + DEB35F871F8E3B90AD207AEF /* printps.cpp in Sources */, + 96927C5A21FD3ACF936CDF6D /* renderg.cpp in Sources */, + F72020415D713C1BA41C17D0 /* richmsgdlgg.cpp in Sources */, + ED8D23D79FF33ED380FE09EC /* scrlwing.cpp in Sources */, + 85F9828B80B03178A274BD18 /* selstore.cpp in Sources */, + 84997126352137E798CD258B /* spinctlg.cpp in Sources */, + 62F1DC80D631335B892610A9 /* splitter.cpp in Sources */, + B6C364CB4AE33708A862B4B5 /* srchctlg.cpp in Sources */, + 8FC1C07FEE793897A1E96D24 /* statbmpg.cpp in Sources */, + BF9B151DC0543E37878F8B9B /* stattextg.cpp in Sources */, + 62757F24C4EE3B84B6AE3F15 /* textdlgg.cpp in Sources */, + 249C9177B1A33EFEAB30F940 /* tipwin.cpp in Sources */, + 32FECED7A7633C4D8C1BFBB4 /* toolbkg.cpp in Sources */, + DB3C3AA956A03FB492480267 /* treectlg.cpp in Sources */, + 5388468A6F8F3141B25CD401 /* treebkg.cpp in Sources */, + 87C67583D36C3465ACD64104 /* vlbox.cpp in Sources */, + A465A43B756630F1944B5A57 /* vscroll.cpp in Sources */, + 567A32722BA33AEE9FF93D7D /* fs_inet.cpp in Sources */, + 65514CD6A9F23ED98436AC03 /* ftp.cpp in Sources */, + B84642DA949638A189032CE7 /* http.cpp in Sources */, + 6CA1BAEBBDB4336E9E201F96 /* protocol.cpp in Sources */, + E39021D3CDCD33BAA646B007 /* sckaddr.cpp in Sources */, + 9F608A33D52D327FAA295625 /* sckfile.cpp in Sources */, + BCD81FD3D1EC305F801E1C1C /* sckipc.cpp in Sources */, + A3A898DA3114311EB7F02228 /* sckstrm.cpp in Sources */, + 6978D7A20DA93A329DDD1384 /* socket.cpp in Sources */, + E7140F3AB94D3FDFA86D8C07 /* url.cpp in Sources */, + 652CFDD9A1C1366E99B5D6BD /* socketiohandler.cpp in Sources */, + 346D274E17673A01B0177D5C /* sockunix.cpp in Sources */, + AD07124BBA613B47829F0693 /* sockosx.cpp in Sources */, + CFDBB80A4C9A3BA092273937 /* animatecmn.cpp in Sources */, + 5C44446AB150378696CD6B3D /* bmpcboxcmn.cpp in Sources */, + 901F659891613419B8643953 /* calctrlcmn.cpp in Sources */, + 1CD4F67F48CF3A5FA477D86F /* datavcmn.cpp in Sources */, + 2FAE979E6FE23D088C768B7E /* gridcmn.cpp in Sources */, + 7B4DA2F5F25B3E188CBAFE39 /* hyperlnkcmn.cpp in Sources */, + E6D18B2EDE353F67883085A0 /* odcombocmn.cpp in Sources */, + FEA741A9B6663A4C929893C3 /* aboutdlgg.cpp in Sources */, + B189DB62AE9F30A1B613756C /* bmpcboxg.cpp in Sources */, + 2F50DBC14FE538A49823925B /* calctrlg.cpp in Sources */, + 8A662992FFCB32E99D11950D /* commandlinkbuttong.cpp in Sources */, + 8B60964DA1DF3F3DB40BE124 /* datavgen.cpp in Sources */, + B4425B59CC27389CA9FF81D2 /* datectlg.cpp in Sources */, + 5557AA36FBCC3ED9A5F5751B /* editlbox.cpp in Sources */, + A139B846584436BCBEBAE3C0 /* grid.cpp in Sources */, + 2E930206397C3EDCBD8206FD /* gridctrl.cpp in Sources */, + E5D698D2606A304DA743AF93 /* grideditors.cpp in Sources */, + 187F921A95DA3594B0AD980E /* gridsel.cpp in Sources */, + F016C51053373E658ED4C9AA /* helpext.cpp in Sources */, + 760C729E41D93CC1AA2B4E0E /* hyperlinkg.cpp in Sources */, + 955D2199F1893D37BA2D7479 /* laywin.cpp in Sources */, + CEE0D7A7D5D8323B9957A781 /* notifmsgg.cpp in Sources */, + 1E17F95DD433379E8C18298D /* odcombo.cpp in Sources */, + 6A10511265493FA2BB79CE4E /* propdlg.cpp in Sources */, + 3554C88010CE3D2A8970A136 /* sashwin.cpp in Sources */, + 8AA341CCFB8E3F6AB3523596 /* splash.cpp in Sources */, + 77BC918AF05C30E8A0BD27F9 /* tipdlg.cpp in Sources */, + 82FA4AA043213728AC266701 /* wizard.cpp in Sources */, + D00AF125FCB63A7A8F9B87DF /* taskbarcmn.cpp in Sources */, + 46F341B46F80376B962759F6 /* animateg.cpp in Sources */, + 8E220BCD39B336A495E775BE /* aboutdlg.cpp in Sources */, + 3902517F9ED03648B5A4B96B /* drawer.cpp in Sources */, + 0723C4E8B52C39FDBC2158B7 /* dataview_osx.cpp in Sources */, + A59667064DED3BD48F29686D /* dataview.cpp in Sources */, + CE2C937117FE3AB599DD30BA /* sound_osx.cpp in Sources */, + 61FEDBF2D47A3B4E861F8297 /* sound.cpp in Sources */, + 5568A53DA84E3B498D606507 /* taskbar.cpp in Sources */, + C1DCF69200593986A8C606A7 /* hidjoystick.cpp in Sources */, + DEC5F4B34BC037169D3E5F2B /* mediactrlcmn.cpp in Sources */, + 94389E029E27343EB69C8B7A /* mediactrl.cpp in Sources */, + 47EBBB18BDB539C2A948C712 /* chm.cpp in Sources */, + BAA75384DA82370298672334 /* helpctrl.cpp in Sources */, + 2CAD4DF9505F36E4A2EAD53E /* helpdata.cpp in Sources */, + D17E3053DA0D3F7EA4D0951C /* helpdlg.cpp in Sources */, + 7C87CC7641033D91823ED689 /* helpfrm.cpp in Sources */, + 3D762A0BBF1B39B88A769633 /* helpwnd.cpp in Sources */, + 4DA209AEF4AD32AAB97F9719 /* htmlcell.cpp in Sources */, + FD3CC5F0AA41384B9388A1E1 /* htmlfilt.cpp in Sources */, + C5E5AB869065307F83E27DD2 /* htmlpars.cpp in Sources */, + EBA0986930DA3B59B2FB4F1F /* htmltag.cpp in Sources */, + 93E04642049537EB8A37BA27 /* htmlwin.cpp in Sources */, + 3E99016BDE043A08B4D6B3CF /* htmprint.cpp in Sources */, + 9836B3D336963795928FE5A2 /* m_dflist.cpp in Sources */, + 66584BC871303041BA622DE1 /* m_fonts.cpp in Sources */, + 99F7D7BFBB543A04AB728376 /* m_hline.cpp in Sources */, + A3586433C4B1398FB1C361D7 /* m_image.cpp in Sources */, + BD53E095EC1136EF853A47D9 /* m_layout.cpp in Sources */, + C05BDB0B5F5A33A9A57FF013 /* m_links.cpp in Sources */, + 81B742D64BEB373DB705947B /* m_list.cpp in Sources */, + FD38B04026F930CC80BC9481 /* m_pre.cpp in Sources */, + 57AE7FCF768F3965BD39B47B /* m_span.cpp in Sources */, + 4CFB7E6E5BD53E2BB39BEF64 /* m_style.cpp in Sources */, + 3D424F4B33653A00AE9B623B /* m_tables.cpp in Sources */, + F3AC352D6DAE3A12A5664769 /* styleparams.cpp in Sources */, + 2A7640E4210334AC93366901 /* winpars.cpp in Sources */, + 87AA9C5D887B3C31A2AFB49E /* htmllbox.cpp in Sources */, + FBE4DB30865D3177B3A9993C /* xh_animatctrl.cpp in Sources */, + 94E510619F433AE3AC884756 /* xh_bmp.cpp in Sources */, + 8966F77CC97B3ED780C8F138 /* xh_bmpcbox.cpp in Sources */, + 84B3625464F732C3A79E1315 /* xh_bmpbt.cpp in Sources */, + D5C304182151365FA9FF8A3E /* xh_bttn.cpp in Sources */, + FE9A662A1F9B34D099C45C1E /* xh_cald.cpp in Sources */, + 6138BCBC8E4438FA91E0EFA0 /* xh_chckb.cpp in Sources */, + 5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */, + CE17002B5B7E37558274763A /* xh_choic.cpp in Sources */, + 26E4813A97DE323E88119164 /* xh_choicbk.cpp in Sources */, + E7AF3BF2B3473AD9BE66D1A2 /* xh_clrpicker.cpp in Sources */, + 1AB50C98FF473B33A3CA4D3A /* xh_cmdlinkbn.cpp in Sources */, + E7921B0472B63E4091F4F518 /* xh_collpane.cpp in Sources */, + 84382E5DB3203A73AC5EE391 /* xh_combo.cpp in Sources */, + F569D7A3F0E038E9B4CC2A77 /* xh_comboctrl.cpp in Sources */, + FB09720D13673A7B81BCB646 /* xh_datectrl.cpp in Sources */, + F7D10B6E0CBA32EFAF79C77D /* xh_dirpicker.cpp in Sources */, + 3B7E035ECF3D3FFB9827AC1D /* xh_dlg.cpp in Sources */, + E05B06A7FEEE32D5AD87EA50 /* xh_editlbox.cpp in Sources */, + F24F637D59F637CA9A7E23CA /* xh_filectrl.cpp in Sources */, + 5FE969523BDB3353AEF96811 /* xh_filepicker.cpp in Sources */, + 438EAEA4B30C325C827F6198 /* xh_fontpicker.cpp in Sources */, + 95826E8528CC32D8934C36ED /* xh_frame.cpp in Sources */, + BE99A85EE76236CC8C719A65 /* xh_gauge.cpp in Sources */, + 26649553E4763EE6BA268B7E /* xh_gdctl.cpp in Sources */, + 72AD4417FF7C3094BB1FF62D /* xh_grid.cpp in Sources */, + 83616D33080E3F0F9FA5FBB5 /* xh_html.cpp in Sources */, + 2B13BFC894C63373B7ACFA3E /* xh_hyperlink.cpp in Sources */, + C34B8675439F39B4845FFC51 /* xh_listb.cpp in Sources */, + F5DF7AF0FA9E371BB71EF799 /* xh_listbk.cpp in Sources */, + 96B507455762391688B5E501 /* xh_listc.cpp in Sources */, + F34D240EB4513FE996179183 /* xh_mdi.cpp in Sources */, + 65FCDBFFF3F138A3ABBAA651 /* xh_menu.cpp in Sources */, + 0FBF7C9EDFB53D8DA0991B56 /* xh_notbk.cpp in Sources */, + 0FA6E1E47F123FF4A902E4D3 /* xh_odcombo.cpp in Sources */, + 36B0B923B836358D9DB0AE11 /* xh_panel.cpp in Sources */, + CDC0FF253B503BA19693D68E /* xh_propdlg.cpp in Sources */, + 47F4FC8717AF3A848812DFCD /* xh_radbt.cpp in Sources */, + 7181709A030D3749AB355B75 /* xh_radbx.cpp in Sources */, + FDE14459359334DE9FB03ED6 /* xh_scrol.cpp in Sources */, + 87092C0C817D343DAB77E23F /* xh_scwin.cpp in Sources */, + 00E2F82590B33BDCA1F6D0C5 /* xh_htmllbox.cpp in Sources */, + E1A20811148F31D289AF98B0 /* xh_sizer.cpp in Sources */, + 5F6B4F226B473AACB7AC8DF6 /* xh_slidr.cpp in Sources */, + C32EF2EC1A103BC3A6254322 /* xh_spin.cpp in Sources */, + 33ED014A7FF7398794E6E4D0 /* xh_split.cpp in Sources */, + 7C9EAFF4A0223EE597E0E39F /* xh_srchctrl.cpp in Sources */, + 8AB7191F7CB838FC8337C48E /* xh_statbar.cpp in Sources */, + 3D3EA1BAAD1833B1B48E9C87 /* xh_stbmp.cpp in Sources */, + F22C401903993639AE05A296 /* xh_stbox.cpp in Sources */, + BF3D600A93403C589B65C5C0 /* xh_stlin.cpp in Sources */, + 8292D346BFC33D6E8D3CDDC0 /* xh_sttxt.cpp in Sources */, + 0EB6AB38A68D3845AC384A24 /* xh_text.cpp in Sources */, + B181806CC34839E791E54BF1 /* xh_tglbtn.cpp in Sources */, + F3CB42BB6D983675862C01F4 /* xh_toolb.cpp in Sources */, + 17F0494F87533196904F5314 /* xh_toolbk.cpp in Sources */, + 3357BD0518F538E9A949F887 /* xh_tree.cpp in Sources */, + 46CE8B53D2663927AAE5DF9E /* xh_treebk.cpp in Sources */, + C5A8DF376BB13A2A8290C2E6 /* xh_unkwn.cpp in Sources */, + 37DD17F479A1371ABF3589BA /* xh_wizrd.cpp in Sources */, + 1710A4BB0E6339558A187F8E /* xmlres.cpp in Sources */, + 867F5D1962383C98A8ADDC3E /* xmladv.cpp in Sources */, + 135DFCE48FC03D8294D01A8A /* xmlrsall.cpp in Sources */, + 61FD5E0E28F732E8AB1729F9 /* xml.cpp in Sources */, + 42ED9BAFD6E936849F1D36CC /* xtixml.cpp in Sources */, + EEB0B28903693C7E9D071930 /* glcmn.cpp in Sources */, + E475B8377D7A352C9034229A /* glcanvas.cpp in Sources */, + F2813BF297C73A3ABD02EC99 /* glcanvas_osx.cpp in Sources */, + 36EB5D19429D3BD1A01001D6 /* framemanager.cpp in Sources */, + C7B6240E0E213836996A178C /* dockart.cpp in Sources */, + 15048519756B33959B15B162 /* floatpane.cpp in Sources */, + E104017EE1A4357DAF84E1E7 /* auibook.cpp in Sources */, + 39CC380F801F3EE984523276 /* auibar.cpp in Sources */, + 6C46AF0370793AA0B74A5A4B /* tabmdi.cpp in Sources */, + DE43350F6C9D3148A64F0AFA /* art_internal.cpp in Sources */, + 7DC4A542372437ECA0790F88 /* art_msw.cpp in Sources */, + A0BA01A85C303C78A3130712 /* art_aui.cpp in Sources */, + 056CA84179433AA48D55DA66 /* bar.cpp in Sources */, + CB078622E90F33BE9D131134 /* buttonbar.cpp in Sources */, + EB52C6A91594381393294501 /* control.cpp in Sources */, + 5F57C4908E5038D19D68ED7B /* gallery.cpp in Sources */, + 4BAFAE70A6B1313B96D86631 /* page.cpp in Sources */, + F0D892C2618130FEAD46BB87 /* panel.cpp in Sources */, + EA02FA6D3B003F8F8A2963C9 /* toolbar.cpp in Sources */, + D54A162E557834A48F4646AA /* advprops.cpp in Sources */, + F501AB044AAC39DCB8C0B3E2 /* editors.cpp in Sources */, + 6B9EEA3CF2E536E3B1ADAC43 /* manager.cpp in Sources */, + 46A4CCF128FC3EB092074DC6 /* property.cpp in Sources */, + 26BB10834DA1388881BDD1ED /* propgrid.cpp in Sources */, + BEA90F2C6BB93143958F899B /* propgridiface.cpp in Sources */, + A423177BBC0F3BE5A436B4B8 /* propgridpagestate.cpp in Sources */, + D72D99FC424337CF9EDC2043 /* props.cpp in Sources */, + 9065A4BE3D0433B88CF45572 /* richtextbuffer.cpp in Sources */, + 5C3B0ED2EA973DFDBFBCC693 /* richtextctrl.cpp in Sources */, + 9455B49669853E71BD4FD966 /* richtextformatdlg.cpp in Sources */, + 70F898F8B129380BBECAC55A /* richtexthtml.cpp in Sources */, + F43DAE2E829A3A7493531382 /* richtextimagedlg.cpp in Sources */, + 0FDDE8E193743F3A8CBDC67D /* richtextprint.cpp in Sources */, + FADD46CB89B135D1AF1D5F8B /* richtextstyledlg.cpp in Sources */, + 2563C775427E3D68BD384F30 /* richtextstyles.cpp in Sources */, + 604ABF86317C3D4F899DBF38 /* richtextsymboldlg.cpp in Sources */, + 9058997222493A7A859A4D4D /* richtextxml.cpp in Sources */, + E3B3E4F75D503DB89B5C622E /* stc.cpp in Sources */, + 908957F65B7E36F8BF3858DE /* PlatWX.cpp in Sources */, + 3E6AA08E72A030D39D867D4C /* ScintillaWX.cpp in Sources */, + 99E7A46106C03484BA70D29F /* tif_unix.c in Sources */, + 4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */, + 1EE845DDFDDE36CA8A218206 /* tif_close.c in Sources */, + 8E674574343A3C009B1BCD01 /* tif_codec.c in Sources */, + D95C5F467D37339AB8DF2355 /* tif_color.c in Sources */, + 6D073876E1753549B5EEFDDB /* tif_compress.c in Sources */, + E3136EF5DD843ACE886E2869 /* tif_dir.c in Sources */, + 7ECC6EE6D5273F75BB6B7B75 /* tif_dirinfo.c in Sources */, + D51B3389209E370489078892 /* tif_dirread.c in Sources */, + E7F35B834A163C67B65176C7 /* tif_dirwrite.c in Sources */, + 2D4D105CA9BE3FA6995A6000 /* tif_dumpmode.c in Sources */, + C2CF6B59914A3183ADE84029 /* tif_error.c in Sources */, + 2315C8692C443ED1AE431729 /* tif_extension.c in Sources */, + FECC98B53C0F3106AB04E69F /* tif_fax3.c in Sources */, + 2C53221A318E37529E6460EC /* tif_fax3sm.c in Sources */, + 522E6CF2A62F34259BCE2DE3 /* tif_flush.c in Sources */, + 6944AC98F6F83E3D983DABD4 /* tif_getimage.c in Sources */, + 07C769F64665317BA3E1AC91 /* tif_jpeg.c in Sources */, + 88A43B1C5A7438838DE97B95 /* tif_luv.c in Sources */, + 779D3480141B3683A6D132BF /* tif_lzw.c in Sources */, + F85D632964383F29BC3B30B7 /* tif_next.c in Sources */, + 64F11C549E3035DF85691061 /* tif_ojpeg.c in Sources */, + 793F542F20AB31F6AF736796 /* tif_open.c in Sources */, + A9A5973552EE30838306D15D /* tif_packbits.c in Sources */, + 64DD406C453D39FEBBE66ED2 /* tif_pixarlog.c in Sources */, + 9A178ED42D96329D8CBF9B8A /* tif_predict.c in Sources */, + C170B941F01334F982315E4B /* tif_print.c in Sources */, + 570FA90F526E3F25A8E8FCF3 /* tif_read.c in Sources */, + 912C69ADB1673ACEB0E6CF09 /* tif_strip.c in Sources */, + 552708E6296D33EBB5F6A494 /* tif_swab.c in Sources */, + 527054445A0D3A00A5C2EC45 /* tif_thunder.c in Sources */, + FEB073547F3F3AC19D31F699 /* tif_tile.c in Sources */, + 096BA201623034AD97218369 /* tif_version.c in Sources */, + 7A79D9AC608E3B8287229175 /* tif_warning.c in Sources */, + F2F2963D8ECC32D39FDBF102 /* tif_write.c in Sources */, + 6E2C2E8AA1713ADE9C33837A /* tif_zip.c in Sources */, + FCE5B139CBE73FCB804EF7DE /* jcomapi.c in Sources */, + 311840186794346AAAA42092 /* jutils.c in Sources */, + DE26572475EE336B8EEA5D93 /* jerror.c in Sources */, + 18A318847EAC37F2B915F082 /* jmemmgr.c in Sources */, + A7692B4D8658347BA16EEB84 /* jmemnobs.c in Sources */, + 894D43C8F224394FB3171F27 /* jcapimin.c in Sources */, + 743BB23211B336A6A0F26E58 /* jcapistd.c in Sources */, + CCE4ECA9CE883B008065C6FC /* jctrans.c in Sources */, + ACD644CFA85A3B70A3E3B119 /* jcparam.c in Sources */, + 76A83A293C9F33BCB7DFDE27 /* jdatadst.c in Sources */, + 86003C8EB906304F9025F789 /* jcinit.c in Sources */, + C6DF6F29407B34F29ED1B66E /* jcmaster.c in Sources */, + DB73248401573A5996D8E68E /* jcmarker.c in Sources */, + 98DF13E96160304EBB905E74 /* jcmainct.c in Sources */, + 32486A808EBC3E088598D51D /* jcprepct.c in Sources */, + CA5BD8ABDBA13641BBE7CD67 /* jccoefct.c in Sources */, + 11DD420E32FB3EFB9DA0AB5C /* jccolor.c in Sources */, + 50D7E093424138C88BB50D28 /* jcsample.c in Sources */, + BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */, + A212431902B8343CA6D229D4 /* jcphuff.c in Sources */, + BFA6983551B4310DA7C8A405 /* jcdctmgr.c in Sources */, + 9B3F9D04FB533D99B58BD51A /* jfdctfst.c in Sources */, + 0948599C4FD53611A09B52AC /* jfdctflt.c in Sources */, + CEC6430AEB6E3200BFA75D08 /* jfdctint.c in Sources */, + 8B9C9FCB954F3596A4CED9A6 /* jdapimin.c in Sources */, + 67EBCE5FA5FF36349ADF0917 /* jdapistd.c in Sources */, + 11818B68C5263EB68D708846 /* jdtrans.c in Sources */, + 4CB3626391CE34D4B1F71AA1 /* jdatasrc.c in Sources */, + CEBAAB0C77983358A601BFFF /* jdmaster.c in Sources */, + 14EF556997B0350F931EBE8F /* jdinput.c in Sources */, + 61C3F7D495FB3E8BA402E4F9 /* jdmarker.c in Sources */, + 28ADE8D385A53445A5451F24 /* jdhuff.c in Sources */, + D0DA11B814AF30A185851230 /* jdphuff.c in Sources */, + 9FD99E06F6613A1A958FAF6C /* jdmainct.c in Sources */, + B5470121BB4B35DE9C4836DB /* jdcoefct.c in Sources */, + E7D02E64384F37BC8939A2C5 /* jdpostct.c in Sources */, + 13854E7822783719A2530793 /* jddctmgr.c in Sources */, + 48A1F28E04603A68A1E70319 /* jidctfst.c in Sources */, + B01C4EF49CF9390DA93A3503 /* jidctflt.c in Sources */, + C43A9650A9DC3372AB8F5F79 /* jidctint.c in Sources */, + 1A7FA35BDE4F35C685AB51A6 /* jidctred.c in Sources */, + D997FFC948B73FDA892DB532 /* jdsample.c in Sources */, + D9F02AFDA07D3857A905527D /* jdcolor.c in Sources */, + 15D65A523EB23EC385C05E0C /* jquant1.c in Sources */, + 3C0EB1DDA5243E31B2D92CE3 /* jquant2.c in Sources */, + 1E4832B42B95308299B767BA /* jdmerge.c in Sources */, + 94B1C88076793400810FAC31 /* png.c in Sources */, + 1569BB4728693B6285623A24 /* pngerror.c in Sources */, + D9496139621533328AE727B7 /* pngget.c in Sources */, + CFA91122523B31B9A07A3827 /* pngmem.c in Sources */, + 9EC837DA722736119D49868B /* pngpread.c in Sources */, + 9B8E5690A6103FC1BDC6C47F /* pngread.c in Sources */, + 31FEAB56919D372993CAD89D /* pngrio.c in Sources */, + 8FDC800D873F30E282691833 /* pngrtran.c in Sources */, + 61A2B54FD2E33C759CF5A5E9 /* pngrutil.c in Sources */, + 309C0A78D45C3AB7B8778B5A /* pngset.c in Sources */, + E515EAE375AE390688CBF8D4 /* pngtrans.c in Sources */, + C8C68927DB243AEAB51E11F3 /* pngwio.c in Sources */, + 0095084719983B878378CA29 /* pngwrite.c in Sources */, + 242E1D1A9BF331BA918134ED /* pngwtran.c in Sources */, + 2989056891153968B372EA15 /* pngwutil.c in Sources */, + E4131E3B445C36E6A7FC8030 /* regcomp.c in Sources */, + 768716016CE7310BB1AD7568 /* regexec.c in Sources */, + B026621DE50A3921B6598EF7 /* regerror.c in Sources */, + 05021BAB2C9B3C4CAD0A7C2D /* regfree.c in Sources */, + E741CDA71895344C974D8F51 /* AutoComplete.cxx in Sources */, + E92EB502F79638B0BE569EF5 /* CallTip.cxx in Sources */, + 682403FBBD4E3D5E88159502 /* CellBuffer.cxx in Sources */, + 1D7442C82B343F50A83B25B1 /* CharClassify.cxx in Sources */, + 6BC8B3EDB3AE3EF4BACFC08B /* ContractionState.cxx in Sources */, + 90BC965B1A1F35A3B2C9D1CA /* Decoration.cxx in Sources */, + 0D6596A44A8C37DE85D578F7 /* Document.cxx in Sources */, + 9A16829C34C9344D9AB010FA /* DocumentAccessor.cxx in Sources */, + 6D723C987BFB39B7B887DCB2 /* Editor.cxx in Sources */, + 83C492B87F4A3A97930F227B /* ExternalLexer.cxx in Sources */, + 0B4AF44DC0C439AD83CDC37F /* Indicator.cxx in Sources */, + C8F1FB8C029031A5909DBC57 /* KeyMap.cxx in Sources */, + 30509A33ED9C35D4ADEF6BBD /* KeyWords.cxx in Sources */, + 0654BCC3F0763C50A7949505 /* LexAPDL.cxx in Sources */, + 0ADC8DBEE80D36B0BB9B058B /* LexASY.cxx in Sources */, + 784F7C50882F320FA76537B6 /* LexAU3.cxx in Sources */, + 07EC76232BB3343FA5CB90B1 /* LexAVE.cxx in Sources */, + 66FD099CE5A338C18329FC37 /* LexAbaqus.cxx in Sources */, + CD35A576FD363FD49C3AC4B4 /* LexAda.cxx in Sources */, + 0C3F48DBD05E3566A4CA6D45 /* LexAsm.cxx in Sources */, + 825EAD51920B387DB4F8C427 /* LexAsn1.cxx in Sources */, + D54D3CA9E73336A08DB20706 /* LexBaan.cxx in Sources */, + 39FB197CF9EB3D76BE0723D0 /* LexBash.cxx in Sources */, + 6C7C1CC506CB329FB2D086AA /* LexBasic.cxx in Sources */, + 78E15D8200F635529F39609A /* LexBullant.cxx in Sources */, + 6F472413FFA03B53B395BB75 /* LexCLW.cxx in Sources */, + D8ADDD24BEAC3D94B3388D3F /* LexCOBOL.cxx in Sources */, + A0FCE3CF565C3F84B63712AD /* LexCPP.cxx in Sources */, + 069D53F2DFBF370A8CC99631 /* LexCSS.cxx in Sources */, + 268DDC88C99A3A64AB8B2FFB /* LexCaml.cxx in Sources */, + 6F5A0D3C7763334396A3783E /* LexCmake.cxx in Sources */, + B640A8A74D973A8FBEF63917 /* LexConf.cxx in Sources */, + 97F60B2A9CE93BC8949A8CCE /* LexCrontab.cxx in Sources */, + 834F2ADD0520313FBAC4F928 /* LexCsound.cxx in Sources */, + 8FB5FBC5730C33F1A3D85DA0 /* LexD.cxx in Sources */, + 4788F736CD9C324E8A3DFA75 /* LexEScript.cxx in Sources */, + E8BBC08597EF383597DA0309 /* LexEiffel.cxx in Sources */, + BFD3BFBDC8DA3B1EAD141F97 /* LexErlang.cxx in Sources */, + 45D88A74B3EE3837B9F79596 /* LexFlagship.cxx in Sources */, + 27759C2FBB0E35FDA847B2B6 /* LexForth.cxx in Sources */, + 020BBB417207393F8C60EFB7 /* LexFortran.cxx in Sources */, + E62F8E49FD5035D8BC71BB4A /* LexGAP.cxx in Sources */, + 9B6A35E706543CDAA6A5014B /* LexGui4Cli.cxx in Sources */, + AEEE6BC41B6531898A61CB17 /* LexHTML.cxx in Sources */, + 51D133EC44F830588FEEAEC1 /* LexHaskell.cxx in Sources */, + B37802B0A90133C68EF93DDB /* LexInno.cxx in Sources */, + 14C024EB327435A2A571DA2D /* LexKix.cxx in Sources */, + DF8124E5E17D386A84CEEA28 /* LexLisp.cxx in Sources */, + D13AE659C3AC37B68D39B2CA /* LexLout.cxx in Sources */, + 9D003890CB7035A298DB7057 /* LexLua.cxx in Sources */, + 3C394FBD47B6310C80577E3C /* LexMMIXAL.cxx in Sources */, + EC43AFB3670A3D459D9B388E /* LexMPT.cxx in Sources */, + E8EE34F0A78C31B489B19FEF /* LexMSSQL.cxx in Sources */, + E80BEED62EBF34F09B3F4020 /* LexMagik.cxx in Sources */, + E0E40333B61C33B58787078F /* LexMarkdown.cxx in Sources */, + 5AEA6E94FB76371D928D371D /* LexMatlab.cxx in Sources */, + 1A4F9F18BBEB3515AC7C7CC7 /* LexMetapost.cxx in Sources */, + CB1F37993ECB3B73A51B42FE /* LexMySQL.cxx in Sources */, + A874AF0B203D3DC99C27469B /* LexNimrod.cxx in Sources */, + 22C76BF2C3E331CD87657E6F /* LexNsis.cxx in Sources */, + 76D1A1A49CC831FFB9EBB1F6 /* LexOpal.cxx in Sources */, + BEFC179F8A0E337F9D627D85 /* LexOthers.cxx in Sources */, + 24A5A71C79733E9CB913C5B8 /* LexPB.cxx in Sources */, + 0D79F1B4EF44393AA3242140 /* LexPLM.cxx in Sources */, + A3C4D47A84E8362295867526 /* LexPOV.cxx in Sources */, + 551BF168445E3D7BB54D0175 /* LexPS.cxx in Sources */, + 0718E7524134312090541D6F /* LexPascal.cxx in Sources */, + 369BCCFF61D13A058D837836 /* LexPerl.cxx in Sources */, + 22EC132AEF863BFBAA6EDEC4 /* LexPowerPro.cxx in Sources */, + 1FB1622D59593932B25C55BB /* LexPowerShell.cxx in Sources */, + 97C551F8AEF133D680D1FD37 /* LexProgress.cxx in Sources */, + A36B5107860E326591940740 /* LexPython.cxx in Sources */, + 31380AD4F5BD38A6B9212FE1 /* LexR.cxx in Sources */, + CCFD3144A22C3A87B67D88AC /* LexRebol.cxx in Sources */, + 7C20B79175D33852A2E9DE84 /* LexRuby.cxx in Sources */, + FE5B7C7A84B83C17A38E8404 /* LexSML.cxx in Sources */, + 71CCB06E790C3C54BFF1199E /* LexSQL.cxx in Sources */, + BA9F0BBD57F63FD29E484FD4 /* LexScriptol.cxx in Sources */, + F55F3887CDE633D7877C607C /* LexSmalltalk.cxx in Sources */, + D5C5DD83882B3227A1CCFE0F /* LexSorcus.cxx in Sources */, + 6F8129E317EE3486A89D8549 /* LexSpecman.cxx in Sources */, + 9678C2B19D293818AA8E9E0E /* LexSpice.cxx in Sources */, + 0F8C79010EF0316AA1B7392E /* LexTACL.cxx in Sources */, + 2102C23970FB3F22AB46A59B /* LexTADS3.cxx in Sources */, + CAF5C5BB129431B596C4C6C2 /* LexTAL.cxx in Sources */, + 49BEDFBC3661339D90EF6936 /* LexTCL.cxx in Sources */, + 7D0E549020D33ED39751DFC9 /* LexTeX.cxx in Sources */, + D4EC9DB5F8DF319EA0FD26A5 /* LexVB.cxx in Sources */, + 16021CFD78623B8CBD08FC20 /* LexVHDL.cxx in Sources */, + 3C5E1A45A57B3169A4C073DA /* LexVerilog.cxx in Sources */, + 159E4248CB1333AD841D9F04 /* LexYAML.cxx in Sources */, + 923F4797A73A3BDD87BBD1E2 /* LineMarker.cxx in Sources */, + 523FB2A8435A3324A8E1B371 /* PerLine.cxx in Sources */, + BF068F3C06473D8CBC55D508 /* PositionCache.cxx in Sources */, + 795B9B15279D36F8899C9CA9 /* PropSet.cxx in Sources */, + A52A7D2FEB1434E29C64582D /* RESearch.cxx in Sources */, + 7B372FEA276438C186F7E341 /* RunStyles.cxx in Sources */, + 15735ED6556130F6A14F0BCE /* ScintillaBase.cxx in Sources */, + 097BC5E023C33C1DA05606B0 /* Selection.cxx in Sources */, + 4C9BA36123E43589956864C7 /* Style.cxx in Sources */, + CD241361D4693785A0B8939E /* StyleContext.cxx in Sources */, + 19D823E564D932758EA6F8D2 /* UniConversion.cxx in Sources */, + 699D88EE2DAA3594B6606891 /* ViewStyle.cxx in Sources */, + B387FAE95A9535B194A42BA5 /* WindowAccessor.cxx in Sources */, + BCDAE378D03E37F5994FB9C6 /* XPM.cxx in Sources */, + C2DEE063B5E032C1BD2B5027 /* xmlparse.c in Sources */, + AE84BC9A1CCA3ADA9C483951 /* xmlrole.c in Sources */, + DB9565CC4EAE3BCB9F490621 /* xmltok.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8BD3A3B4622D37B8B5DB242E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 59BFB8C8310E37B39AF8B0D4 /* any.cpp in Sources */, + D5A25AC579F436509805335A /* appbase.cpp in Sources */, + C2B07E2ECDDC3833BDC9B28C /* arcall.cpp in Sources */, + 4CF9BA40653C3153805D88AB /* arcfind.cpp in Sources */, + 3EB6B8528A0D3B6CADAE1256 /* archive.cpp in Sources */, + 3B8A54D5E5A53607A6F7979A /* arrstr.cpp in Sources */, + 0A2A4D2DC8F63FE1AC0BFAAF /* base64.cpp in Sources */, + 319FB8E64CE731D6A58AD301 /* clntdata.cpp in Sources */, + 51437DC2AD7B3BEB9A53CE1A /* cmdline.cpp in Sources */, + DA0FA502405A37B2A5698D20 /* config.cpp in Sources */, + BB6FE851028C3DE7A070C213 /* convauto.cpp in Sources */, + F89405757B063F80B111F469 /* datetime.cpp in Sources */, + 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */, + E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */, + 3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */, + 54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */, + AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */, + 0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */, + 246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */, + 97BAFEAD53E238B6881178DD /* evtloopcmn.cpp in Sources */, + F07D84D124F23E7FA11CF148 /* extended.c in Sources */, + FEF99FF6C38D3B488396B142 /* ffile.cpp in Sources */, + D6C3421AD2A537AAA2F0AB80 /* file.cpp in Sources */, + FFF5BFBE600E35FAB7EA522C /* fileback.cpp in Sources */, + 41943A8F82723027A151A468 /* fileconf.cpp in Sources */, + 49260580A7F23B569A827D3F /* filefn.cpp in Sources */, + D4C87E227A28391891D89088 /* filename.cpp in Sources */, + 8A4046BD38873D9CAC9C2B59 /* filesys.cpp in Sources */, + 9E0B67E34B683412978BA82D /* filtall.cpp in Sources */, + CA4DCD57060B38CC8B2283D7 /* filtfind.cpp in Sources */, + 2FA1A8FE3644325ABAD273A4 /* fmapbase.cpp in Sources */, + FE2DBCCC1D0B36A3BE4493C0 /* fs_arc.cpp in Sources */, + F6B85CD918E93923BE631B95 /* fs_filter.cpp in Sources */, + FE5285579C7F39C48FC66B10 /* hash.cpp in Sources */, + 595DCB164D55342EB86604EC /* hashmap.cpp in Sources */, + 1B06622C8D8731FC832199E2 /* init.cpp in Sources */, + 0743AE8613F535A0ABB79315 /* intl.cpp in Sources */, + A336FD218BE63B19991CA513 /* ipcbase.cpp in Sources */, + BFD4B8871B3934048B631419 /* languageinfo.cpp in Sources */, + 68AC8860B0943C1FAF76D96B /* list.cpp in Sources */, + 3141FEDED0943BD6A2EF858F /* log.cpp in Sources */, + 0C7E2D5C22A232368F862A60 /* longlong.cpp in Sources */, + DC978B60F6DF3176B5B114C3 /* memory.cpp in Sources */, + B59FC7345C383D9099391AC3 /* mimecmn.cpp in Sources */, + EC3A1C620D323B5590AABF02 /* module.cpp in Sources */, + F38202271C6131908C358DEC /* mstream.cpp in Sources */, + 31DD19A942283FA8810B6382 /* numformatter.cpp in Sources */, + 23A7AF68A03E380785EE7C24 /* object.cpp in Sources */, + D6B73239BF0E32288161679C /* platinfo.cpp in Sources */, + 0A406D2D1ADA343891E3664C /* powercmn.cpp in Sources */, + CA85901B9E2538CFB7E44216 /* process.cpp in Sources */, + 7A7439BE66AA3771B4A89048 /* regex.cpp in Sources */, + CF3082BA1ED232F4B904BD14 /* stdpbase.cpp in Sources */, + 539B586AEAD630A79FC12ECF /* sstream.cpp in Sources */, + 028257C52CAE3038AA862C35 /* stdstream.cpp in Sources */, + 6AA0EE765330326380989FD1 /* stopwatch.cpp in Sources */, + E882402BEE0330A080A6516F /* strconv.cpp in Sources */, + 30493B486DFF35AF80D12C49 /* stream.cpp in Sources */, + 795613831EC8332A83FF26E7 /* string.cpp in Sources */, + 55F0D287F60F3EDEA16CCB64 /* stringimpl.cpp in Sources */, + 88E1AE56FD393C8BA5CF8545 /* stringops.cpp in Sources */, + 056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */, + 4DD98A9436C83CF3B9425A78 /* sysopt.cpp in Sources */, + 9FB1E1763EFA334CA0C07C49 /* tarstrm.cpp in Sources */, + 2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */, + 6167245C417A32179EC37D2D /* textfile.cpp in Sources */, + 7FC3D17B3C853FE58841002D /* timercmn.cpp in Sources */, + 729091CC33C73C989B4E0719 /* timerimpl.cpp in Sources */, + BF8C33B7CB3A3ECE814A95FB /* tokenzr.cpp in Sources */, + ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */, + 087FF6DE223A32509692F39B /* txtstrm.cpp in Sources */, + DAAFBED07FF8365B96D20B99 /* unichar.cpp in Sources */, + 2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */, + C425A172B0AB3EBD9AC9A590 /* ustring.cpp in Sources */, + 65E8A5F333D7336C816F0D0C /* variant.cpp in Sources */, + E53AFF04877D34C386D77380 /* wfstream.cpp in Sources */, + 319EA32592DA3C74B86DDDFF /* wxcrt.cpp in Sources */, + A2473402D8B83628B1F66749 /* wxprintf.cpp in Sources */, + BA7B12396B873FDA8F3A2748 /* xlocale.cpp in Sources */, + C5419BC04D6234B5A8307B81 /* xti.cpp in Sources */, + 52C0984A2A4F31BC885519B0 /* xtistrm.cpp in Sources */, + CA155860CE9A3A8189C3A4C2 /* zipstrm.cpp in Sources */, + 014AF0BAB1783A5D9D75A7ED /* zstream.cpp in Sources */, + A93D0E6F0871368EA8FC9FF9 /* fswatchercmn.cpp in Sources */, + E49F0D43B5A63EF1A57A7112 /* fswatcherg.cpp in Sources */, + 4657E7382E9E3EDC8DE2401E /* mimetype.cpp in Sources */, + 1DBDF75500D73A3098015E7F /* cfstring.cpp in Sources */, + 9FBC642677C63D01AA2511BC /* evtloop_cf.cpp in Sources */, + 13250B531B1B3F9998C59DA9 /* stdpaths_cf.cpp in Sources */, + AAAB5DF8E60736D88273DCFE /* strconv_cf.cpp in Sources */, + 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */, + D36E76A4CAF5352D9397E1FF /* fdiodispatcher.cpp in Sources */, + D3FB75C8E3A73AE38EE8A6F6 /* selectdispatcher.cpp in Sources */, + BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */, + 403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */, + 20BEEFFA08F3396791596870 /* dlunix.cpp in Sources */, + CBBD7B32DB7B3E24AE745D78 /* epolldispatcher.cpp in Sources */, + D18E2985C48733B2B7B3D442 /* evtloopunix.cpp in Sources */, + 3D22FC202D903007AEE3D164 /* fdiounix.cpp in Sources */, + 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */, + 5F78DB0417BF3CE1B4E35C7F /* stackwalk.cpp in Sources */, + E8F0C87119C63E8E81423A7C /* stdpaths.cpp in Sources */, + 2F35A207C3993DE08E4FE0B0 /* timerunx.cpp in Sources */, + F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */, + B5C7FD8C27F43F3289A77FC9 /* utilsunx.cpp in Sources */, + FF7DB2884F6E3C5DB4BDF61D /* fswatcher_kqueue.cpp in Sources */, + 55D893FDD00633FEA82ABD81 /* event.cpp in Sources */, + 131B879180AE3FB481F81CC7 /* fs_mem.cpp in Sources */, + 05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */, + 80665EEAE8613DF8A93A7984 /* utilscmn.cpp in Sources */, + 2A54BBF33C1E39FE8AF805D6 /* utils.cpp in Sources */, + 9513691C6A943A41B4184643 /* uma.cpp in Sources */, + F4C0CEADEDC23610BF6983D6 /* artmac.cpp in Sources */, + 296692A7A3783E3A83D005C6 /* brush.cpp in Sources */, + 86AED49CEAFC3637B1F10537 /* dialog_osx.cpp in Sources */, + DC6B669C9A78398F914AEE53 /* fontutil.cpp in Sources */, + 1EDED99760B23A1999E75C12 /* imaglist.cpp in Sources */, + C1CDD035AA393ACC9E202C03 /* minifram.cpp in Sources */, + 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */, + AC91349D7F0E37739B1F5165 /* palette.cpp in Sources */, + 2480859662ED399799E120A5 /* pen.cpp in Sources */, + 0E024D145DDD38ACAE68F462 /* toplevel_osx.cpp in Sources */, + 02BB539E2AD63C078DA776B0 /* uiaction_osx.cpp in Sources */, + 052331773CF6362C9A6CF38E /* utils_osx.cpp in Sources */, + CB2E99E8FB7D3269A333A55E /* window_osx.cpp in Sources */, + 03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */, + FF50EC0EC5F23DF890C6E95F /* colour.cpp in Sources */, + BD2B17EB72E73A6EB6E0B26F /* dcmemory.cpp in Sources */, + F1F484DD591337399FCD0463 /* display.cpp in Sources */, + 371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */, + 86BE5213D3F131D8A6862679 /* hid.cpp in Sources */, + AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */, + 91BDA5B04CF33C9AB7358B8A /* timer.cpp in Sources */, + C2D45B334BE03F6C941CA041 /* utilsexc_cf.cpp in Sources */, + A92439BAFD3A30A29DD93131 /* apptraits.cpp in Sources */, + E82CB89681FF3747B6A94427 /* anybutton_osx.cpp in Sources */, + 49FE0228D8FD3F7AB64A4432 /* bmpbuttn_osx.cpp in Sources */, + 6AC347D2DCC730149A0A83D8 /* button_osx.cpp in Sources */, + 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */, + 07412469921A3E488A2F9BA6 /* checklst_osx.cpp in Sources */, + 4666CDC48BA9301EA283BFFF /* choice_osx.cpp in Sources */, + 0836590D35FE37988DE70442 /* combobox_osx.cpp in Sources */, + 2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */, + 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */, + E4B826CE70283D999CB591F3 /* listbox_osx.cpp in Sources */, + B198DA8239E9358A9D56B988 /* menu_osx.cpp in Sources */, + 1DF3A4F85FCB3BA79A552F3D /* menuitem_osx.cpp in Sources */, + A3321FE2A87D3BD69E0BB009 /* notebook_osx.cpp in Sources */, + 0C9A379D97B133FA831175A7 /* printdlg_osx.cpp in Sources */, + B1775EF7C72233408044034B /* radiobox_osx.cpp in Sources */, + 6A081BF19747385CB4C1877F /* radiobut_osx.cpp in Sources */, + DF8CE011EAC23F73BDA1C44D /* scrolbar_osx.cpp in Sources */, + 27E73CA5C35A30CE89946ECA /* slider_osx.cpp in Sources */, + 00F1531404F832C6AE0748F2 /* spinbutt_osx.cpp in Sources */, + 2939CA3680A13E39AB88CB05 /* spinctrl_osx.cpp in Sources */, + 91EA325FCE3A3A6A8D1D21A5 /* srchctrl_osx.cpp in Sources */, + 221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */, + 91BC7802C15337CDA84C3742 /* statline_osx.cpp in Sources */, + 283C3ABE42433244983C27C1 /* stattext_osx.cpp in Sources */, + B6891F848CA0325EAB6D1373 /* textentry_osx.cpp in Sources */, + EDCA35F1555F3509895CCA69 /* textctrl_osx.cpp in Sources */, + 664A54F914443110B7BB6928 /* tglbtn_osx.cpp in Sources */, + A569A33A2097316D8110C2C1 /* toolbar_osx.cpp in Sources */, + 0AEBA7389E223781A7A257A1 /* webkit.mm in Sources */, + F5FF98C231B33E3EB7902C64 /* colordlgosx.mm in Sources */, + 2386B575BC3931D2AF86CB33 /* fontdlgosx.mm in Sources */, + 2EECB3C2F9523D0B95847A7F /* accel.cpp in Sources */, + 7F77E347E1243D77A666FB43 /* clipbrd.cpp in Sources */, + 5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */, + D66F5D4D204B3B789C7F76B9 /* fontdlg.cpp in Sources */, + 692FCCABFB963696AFC1E122 /* gdiobj.cpp in Sources */, + 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */, + B0E94A59C83637C09FAAE71C /* app.cpp in Sources */, + BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */, + EB52C6A915943813932944FE /* control.cpp in Sources */, + 45AB45C6B24A3983B22E56A5 /* dataobj.cpp in Sources */, + D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */, + 182DFDBB58653FD9863D4176 /* dcprint.cpp in Sources */, + AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */, + 939E53CA56F33194B4681117 /* glgrab.cpp in Sources */, + 774EB9F3F7E93A379E1F7551 /* graphics.cpp in Sources */, + 5792675690843C6AA4125A72 /* font.cpp in Sources */, + BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */, + 27E2EABB117334CD89CFD2A4 /* mdi.cpp in Sources */, + 73AA68AB9F1236ED9F1FBB2E /* metafile.cpp in Sources */, + CD2A9111B8A83AFA8B5B97E5 /* overlay.cpp in Sources */, + 805CCAE64D023561AD334B53 /* popupwin.cpp in Sources */, + 6832385DDBB33D1B90C73CBA /* renderer.cpp in Sources */, + 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */, + F6A1AC5CF84E32C19F91A614 /* statbrma.cpp in Sources */, + D070C3BE95483FE38BABA1BE /* region.cpp in Sources */, + 07158EBC05A637ECA9DC7B4F /* utilscocoa.mm in Sources */, + 7E6C627A325F32FFB2EF9B9E /* caret.cpp in Sources */, + FB8B6E4789A3311A98C5B0A8 /* clrpickerg.cpp in Sources */, + 7569F0BC3C603EB19168088F /* collpaneg.cpp in Sources */, + BBAABF3C693E37D3B0FF2502 /* colrdlgg.cpp in Sources */, + F70156C3E68B38FCB72FE253 /* dirdlgg.cpp in Sources */, + E1F7C51F411B3AF39476E488 /* fdrepdlg.cpp in Sources */, + A965348C7FA73CEC90C8FA25 /* filedlgg.cpp in Sources */, + FD1F6CD8286D3D428FD52A28 /* filepickerg.cpp in Sources */, + 16A382A265DE32FABC318F6F /* fontdlgg.cpp in Sources */, + BEAC2449AFA7304989BA301E /* fontpickerg.cpp in Sources */, + C3AC94EA13C1352790BF5FF7 /* listctrl.cpp in Sources */, + C005C2D547E735E9B081658E /* prntdlgg.cpp in Sources */, + A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */, + 99C3EE31DC1B3ADAAC8E5DA2 /* anybutton.cpp in Sources */, + 33B16442F6AF3233BD533108 /* bmpbuttn.cpp in Sources */, + CBD152BCD11634B7BBB8AA8C /* button.cpp in Sources */, + 3C92143CC3173F659CE40DC3 /* checkbox.cpp in Sources */, + CF172B12EEA53811BE649521 /* choice.cpp in Sources */, + 241A346E77E131918C6DE9B9 /* colordlg.cpp in Sources */, + 287A6D1B6AA030AAB7C057F7 /* dialog.cpp in Sources */, + D50FA9ECB16933C39A520D88 /* dirdlg.cpp in Sources */, + B4CE55324C62369CBB823B68 /* dnd.cpp in Sources */, + D1D7B594A0DB3781951C7682 /* evtloop.cpp in Sources */, + F1E8E4D6D8453F7382E6497F /* filedlg.cpp in Sources */, + 63C8D23DD8AB32FE906B669B /* gauge.cpp in Sources */, + 55E03D705E9C39EFA3EE3E25 /* listbox.cpp in Sources */, + 2CD89A08C7ED3D35A0FBD893 /* listctrl_mac.cpp in Sources */, + D2BCC29BB1353C6ABC7D4DDE /* menu.cpp in Sources */, + 157C8DA2E272399B9380991A /* menuitem.cpp in Sources */, + 7A3976A4AF7836048B31F7DE /* msgdlg.cpp in Sources */, + 774A6D1CA57235AD9ECD5D14 /* nonownedwnd.cpp in Sources */, + 164CF6AA59B135E68239E8F8 /* notebmac.cpp in Sources */, + B5587C93D4D3333FA81D08A2 /* printdlg.cpp in Sources */, + 96A6458C826732348D2872C5 /* radiobut.cpp in Sources */, + D594C725CA08333B83C214C2 /* scrolbar.cpp in Sources */, + 006841D4ADA6384B9A8886CE /* slider.cpp in Sources */, + 69A19836B4DC39918A74B12C /* spinbutt.cpp in Sources */, + 57DDBAE7E4413A3C9DCC9EE3 /* srchctrl.cpp in Sources */, + F04F796823753478BCC9EB6F /* statbmp.cpp in Sources */, + 6EC32E5F03DF3EC9852474DF /* statbox.cpp in Sources */, + 66ED6552F94F3770BB934E2F /* statlmac.cpp in Sources */, + 77764368190938E6A4000AE1 /* stattext.cpp in Sources */, + 90AB8293DB663C508BAEF655 /* textctrl.cpp in Sources */, + F0290CF0258A30478FED38A2 /* tglbtn.cpp in Sources */, + EA02FA6D3B003F8F8A2963C6 /* toolbar.cpp in Sources */, + 80C6D10D9A6F300995396960 /* tooltip.cpp in Sources */, + 16D334945B1E30AFB80B356C /* window.cpp in Sources */, + 3CDE2B6BF88D326189F069BD /* accelcmn.cpp in Sources */, + BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */, + 205520440CD13C0AB9E89159 /* anidecod.cpp in Sources */, + 353B584AD0C03919A57A3048 /* affinematrix2d.cpp in Sources */, + DDC71B80D562303690FDBE4C /* appcmn.cpp in Sources */, + EE0EA850822E35F596B5EBBA /* artprov.cpp in Sources */, + A283187810EB32DAA173BD33 /* artstd.cpp in Sources */, + 75DCE6FF00E93C5D93970842 /* arttango.cpp in Sources */, + 1749412E53B9311DABA71DDC /* bmpbase.cpp in Sources */, + 3ACCC2EB8E973C11835EB597 /* bmpbtncmn.cpp in Sources */, + A5775D87FD713CBB930A783E /* bookctrl.cpp in Sources */, + C3A63D7091913CD39094AE0B /* btncmn.cpp in Sources */, + FBA19C939E1E33EDB05043FE /* cairo.cpp in Sources */, + 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */, + 37749AC3468836FC857BD0D5 /* checklstcmn.cpp in Sources */, + C0CDA289E9EC3E20BE70B2E6 /* choiccmn.cpp in Sources */, + DFEB8DA3D42734949CB1E1AA /* clipcmn.cpp in Sources */, + 9D4B67A357D23B5283CA8D98 /* clrpickercmn.cpp in Sources */, + EBF2D44758003221A22202BC /* colourcmn.cpp in Sources */, + 335DD610974A33D4B6581E2A /* colourdata.cpp in Sources */, + D542C7819D593112AE5F7C3D /* combocmn.cpp in Sources */, + 6F0605F3A4E83BF0BF4C8B7E /* cmdproc.cpp in Sources */, + 20F10669703137E68318C6FD /* cmndata.cpp in Sources */, + 6FA47EAACE613B039B6EC261 /* containr.cpp in Sources */, + 0C485288EA86379D9FD66536 /* cshelp.cpp in Sources */, + 25656617A56D342AA3D1BFE2 /* ctrlcmn.cpp in Sources */, + BF1760458996391E8EB42949 /* ctrlsub.cpp in Sources */, + 2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */, + 39D6435B10073B85A499AFD8 /* dcbufcmn.cpp in Sources */, + 9564A6968D66325DAEADEBA3 /* dcgraph.cpp in Sources */, + B791BD05072B3B909A7093C2 /* dcsvg.cpp in Sources */, + B559E894684A38238CAAA115 /* dirctrlcmn.cpp in Sources */, + 63F0C8EEDF4B3641878A8B4D /* dlgcmn.cpp in Sources */, + B839235BED6F3609BDB732B8 /* dndcmn.cpp in Sources */, + 2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */, + F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */, + B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */, + F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */, + 6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */, + 447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */, + C2E37E798F743A4199C8658E /* fddlgcmn.cpp in Sources */, + 37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */, + 0730A107A2B935A9923C8EF2 /* filehistorycmn.cpp in Sources */, + 9881E3FB23ED3283B6CC71A2 /* filepickercmn.cpp in Sources */, + 064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */, + 1E166FC1A7B3371FB038B172 /* fldlgcmn.cpp in Sources */, + F747991E5C973F9B8C9D800A /* fontcmn.cpp in Sources */, + 1E2AB43075973AE59A8D89C1 /* fontdata.cpp in Sources */, + F910C74E48823E0BA7F7885D /* graphicc.cpp in Sources */, + F1E4D7CA634E33808AE3B522 /* fontenumcmn.cpp in Sources */, + D5AABE973F3A351EB1C1A5A6 /* fontmap.cpp in Sources */, + 60706F8836A130A2AF282FE1 /* fontutilcmn.cpp in Sources */, + EDD5725CF41336EFA7FB3009 /* framecmn.cpp in Sources */, + EAA469E1A0CC33E4A21A3F7A /* gaugecmn.cpp in Sources */, + 5A8638C234133824BDF93BBF /* gbsizer.cpp in Sources */, + 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */, + 95AD56D602CF3C5085602AF8 /* geometry.cpp in Sources */, + 758629DA468A3EF7B1C15241 /* gifdecod.cpp in Sources */, + 7B642B17F5D23F4F8ED38BB4 /* graphcmn.cpp in Sources */, + B8FEEC2C94183AB69C963177 /* headercolcmn.cpp in Sources */, + 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */, + 4657479AF35533AEB7876676 /* helpbase.cpp in Sources */, + BF2585CFA6853023975F1E78 /* iconbndl.cpp in Sources */, + 5B5B8DF915D438AA9FCEB39E /* imagall.cpp in Sources */, + 0813551C951A3AD1A5EF01B2 /* imagbmp.cpp in Sources */, + 6C822F7F313734DCB51F44B9 /* image.cpp in Sources */, + 89046455F49D3D75A21C9DB8 /* imagfill.cpp in Sources */, + 36DB80FD5B153E9099DB6912 /* imaggif.cpp in Sources */, + 9110ACFC3CFB3C7994E907B0 /* imagiff.cpp in Sources */, + D13596A4E3CD31DE810061A1 /* imagjpeg.cpp in Sources */, + D83B32B788EC310D919E0DF7 /* imagpcx.cpp in Sources */, + 23965E313EDC3BBE9B2FA1C5 /* imagpng.cpp in Sources */, + 46E331300D8F349DB36AB50A /* imagpnm.cpp in Sources */, + AAABEE399008310A8BC9BE43 /* imagtga.cpp in Sources */, + 3C36437B2E933F83984D431E /* imagtiff.cpp in Sources */, + 774A89998E09308CBFB03EE0 /* imagxpm.cpp in Sources */, + 63F2517EC6B2334CA825A6F9 /* layout.cpp in Sources */, + CFF73578F04D357E83D1D830 /* lboxcmn.cpp in Sources */, + 164010B26D363F5FA09785B6 /* listctrlcmn.cpp in Sources */, + 2F7F5B9BBCD83D90B237A1A0 /* markupparser.cpp in Sources */, + 9A83D365AD1F37FA9C7030C2 /* matrix.cpp in Sources */, + E3A4615870B139D29FE727C1 /* menucmn.cpp in Sources */, + BD49EC50CB363642BDBF25C8 /* mousemanager.cpp in Sources */, + 7A84B9471A3238B4B66B1776 /* nbkbase.cpp in Sources */, + AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */, + D6B2A64A78AF3F2983B441A8 /* ownerdrwcmn.cpp in Sources */, + 0742292656623EC481B34369 /* paper.cpp in Sources */, + E2A73751CECF32A68FFAEE82 /* panelcmn.cpp in Sources */, + 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */, + AF1E3338E892336E924AF631 /* pickerbase.cpp in Sources */, + 6E68759BC2E63CA59C12FDC0 /* popupcmn.cpp in Sources */, + 1C52CB9487DF3AB9AF243B47 /* prntbase.cpp in Sources */, + 0B98B6721DEE37A1ADEA382B /* quantize.cpp in Sources */, + AE5286C71D1130EAA368A1C4 /* radiobtncmn.cpp in Sources */, + AEB9099819B33F4A8AAB9F54 /* radiocmn.cpp in Sources */, + 5116CE330E333724A66982E3 /* rearrangectrl.cpp in Sources */, + A9864F0104FA344BBE79D3BC /* rendcmn.cpp in Sources */, + A80D00249A693F43A9CBE777 /* rgncmn.cpp in Sources */, + C259D01CC62533D296EF023A /* scrolbarcmn.cpp in Sources */, + 7625D908B2CD34C78243BA8F /* settcmn.cpp in Sources */, + F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */, + EDD92822EBD93E86AE5A2ED0 /* slidercmn.cpp in Sources */, + F46777ABE0743B04A1E1F0A4 /* spinbtncmn.cpp in Sources */, + 49C873EE448C3CD9A32012CD /* spinctrlcmn.cpp in Sources */, + 1EA81A0E8E5A3B38B4D80337 /* srchcmn.cpp in Sources */, + 4AEC67BF65B039D99F421666 /* statbar.cpp in Sources */, + 7C52E7CC12463941B0E4D402 /* statbmpcmn.cpp in Sources */, + D9DCBE799DB634C2A73FD6BD /* statboxcmn.cpp in Sources */, + 8B38C6C416BA3A51B37F60C4 /* statlinecmn.cpp in Sources */, + D9EE059D3C3C3C13AE4419F1 /* stattextcmn.cpp in Sources */, + BAFF04F1680F32DA988EB03D /* stockitem.cpp in Sources */, + 4958BD2E717A3F03AB030188 /* tbarbase.cpp in Sources */, + 9744994E8A813AA6938A7CE2 /* textcmn.cpp in Sources */, + AD4A533C4E1633598A6D5C6F /* textentrycmn.cpp in Sources */, + 700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */, + 45FE206BBAD13DDCA1EA41CF /* treebase.cpp in Sources */, + 796311E398FF313C84218824 /* uiactioncmn.cpp in Sources */, + E9EDB5C92D5D3B529E8D73B0 /* valgen.cpp in Sources */, + 9F70A89D00B03D4894AF7638 /* validate.cpp in Sources */, + 1937FBA0A0DD32A8A743CFE1 /* valtext.cpp in Sources */, + 6A032420671B375D81273714 /* valnum.cpp in Sources */, + A2769D1659AE3CA3B58C2CAE /* wincmn.cpp in Sources */, + 1BCC944F5E0936F5830F03E8 /* windowid.cpp in Sources */, + 3399AB7BB1333B5AAF5FAF55 /* wrapsizer.cpp in Sources */, + C1E5799141603A75A26BEEA7 /* xpmdecod.cpp in Sources */, + F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */, + CB078622E90F33BE9D131131 /* buttonbar.cpp in Sources */, + 03035C5CE4BC3288A5A18424 /* choicdgg.cpp in Sources */, + 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */, + 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */, + EAE02BA934B43EEE92C496C7 /* dcpsg.cpp in Sources */, + 22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */, + 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */, + 7EF89F935314301381802FAB /* filectrlg.cpp in Sources */, + 7D615329368D32709CEF4B58 /* headerctrlg.cpp in Sources */, + 2C95DFA8EE463487956B4EB4 /* infobar.cpp in Sources */, + 02E8F1195B653D26AAA89462 /* listbkg.cpp in Sources */, + 026F90F7492C316A94128916 /* logg.cpp in Sources */, + 633DD2E870263F42A8DBF9BF /* markuptext.cpp in Sources */, + 745C39E90E8C3C08A887B51C /* msgdlgg.cpp in Sources */, + 1AF2B2346C9639DAA4D15F30 /* numdlgg.cpp in Sources */, + EE9194D6C4C138BF9DAB8633 /* panelg.cpp in Sources */, + 4D0BA8B9F72C3C31BC170CE2 /* progdlgg.cpp in Sources */, + DEB35F871F8E3B90AD207AEE /* printps.cpp in Sources */, + 96927C5A21FD3ACF936CDF6C /* renderg.cpp in Sources */, + F72020415D713C1BA41C17CF /* richmsgdlgg.cpp in Sources */, + ED8D23D79FF33ED380FE09EB /* scrlwing.cpp in Sources */, + 85F9828B80B03178A274BD17 /* selstore.cpp in Sources */, + 84997126352137E798CD258A /* spinctlg.cpp in Sources */, + 62F1DC80D631335B892610A8 /* splitter.cpp in Sources */, + B6C364CB4AE33708A862B4B4 /* srchctlg.cpp in Sources */, + 8FC1C07FEE793897A1E96D23 /* statbmpg.cpp in Sources */, + BF9B151DC0543E37878F8B9A /* stattextg.cpp in Sources */, + 62757F24C4EE3B84B6AE3F14 /* textdlgg.cpp in Sources */, + 249C9177B1A33EFEAB30F93F /* tipwin.cpp in Sources */, + 32FECED7A7633C4D8C1BFBB3 /* toolbkg.cpp in Sources */, + DB3C3AA956A03FB492480266 /* treectlg.cpp in Sources */, + 5388468A6F8F3141B25CD400 /* treebkg.cpp in Sources */, + 87C67583D36C3465ACD64103 /* vlbox.cpp in Sources */, + A465A43B756630F1944B5A56 /* vscroll.cpp in Sources */, + 567A32722BA33AEE9FF93D7C /* fs_inet.cpp in Sources */, + 65514CD6A9F23ED98436AC02 /* ftp.cpp in Sources */, + B84642DA949638A189032CE6 /* http.cpp in Sources */, + 6CA1BAEBBDB4336E9E201F95 /* protocol.cpp in Sources */, + E39021D3CDCD33BAA646B006 /* sckaddr.cpp in Sources */, + 9F608A33D52D327FAA295624 /* sckfile.cpp in Sources */, + BCD81FD3D1EC305F801E1C1B /* sckipc.cpp in Sources */, + A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */, + 6978D7A20DA93A329DDD1383 /* socket.cpp in Sources */, + E7140F3AB94D3FDFA86D8C06 /* url.cpp in Sources */, + 652CFDD9A1C1366E99B5D6BC /* socketiohandler.cpp in Sources */, + 346D274E17673A01B0177D5B /* sockunix.cpp in Sources */, + AD07124BBA613B47829F0692 /* sockosx.cpp in Sources */, + CFDBB80A4C9A3BA092273936 /* animatecmn.cpp in Sources */, + 5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */, + 901F659891613419B8643952 /* calctrlcmn.cpp in Sources */, + 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */, + 2FAE979E6FE23D088C768B7D /* gridcmn.cpp in Sources */, + 7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */, + E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */, + FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */, + B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */, + 2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */, + 8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */, + 8B60964DA1DF3F3DB40BE123 /* datavgen.cpp in Sources */, + B4425B59CC27389CA9FF81D1 /* datectlg.cpp in Sources */, + 5557AA36FBCC3ED9A5F5751A /* editlbox.cpp in Sources */, + A139B846584436BCBEBAE3BF /* grid.cpp in Sources */, + 2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */, + E5D698D2606A304DA743AF92 /* grideditors.cpp in Sources */, + 187F921A95DA3594B0AD980D /* gridsel.cpp in Sources */, + F016C51053373E658ED4C9A9 /* helpext.cpp in Sources */, + 760C729E41D93CC1AA2B4E0D /* hyperlinkg.cpp in Sources */, + 955D2199F1893D37BA2D7478 /* laywin.cpp in Sources */, + CEE0D7A7D5D8323B9957A780 /* notifmsgg.cpp in Sources */, + 1E17F95DD433379E8C18298C /* odcombo.cpp in Sources */, + 6A10511265493FA2BB79CE4D /* propdlg.cpp in Sources */, + 3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */, + 8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */, + 77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */, + 82FA4AA043213728AC266700 /* wizard.cpp in Sources */, + D00AF125FCB63A7A8F9B87DE /* taskbarcmn.cpp in Sources */, + 46F341B46F80376B962759F5 /* animateg.cpp in Sources */, + 8E220BCD39B336A495E775BD /* aboutdlg.cpp in Sources */, + 3902517F9ED03648B5A4B96A /* drawer.cpp in Sources */, + 0723C4E8B52C39FDBC2158B6 /* dataview_osx.cpp in Sources */, + A59667064DED3BD48F29686C /* dataview.cpp in Sources */, + CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */, + 61FEDBF2D47A3B4E861F8296 /* sound.cpp in Sources */, + 5568A53DA84E3B498D606506 /* taskbar.cpp in Sources */, + C1DCF69200593986A8C606A6 /* hidjoystick.cpp in Sources */, + DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */, + 94389E029E27343EB69C8B79 /* mediactrl.cpp in Sources */, + 47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */, + BAA75384DA82370298672333 /* helpctrl.cpp in Sources */, + 2CAD4DF9505F36E4A2EAD53D /* helpdata.cpp in Sources */, + D17E3053DA0D3F7EA4D0951B /* helpdlg.cpp in Sources */, + 7C87CC7641033D91823ED688 /* helpfrm.cpp in Sources */, + 3D762A0BBF1B39B88A769632 /* helpwnd.cpp in Sources */, + 4DA209AEF4AD32AAB97F9718 /* htmlcell.cpp in Sources */, + FD3CC5F0AA41384B9388A1E0 /* htmlfilt.cpp in Sources */, + C5E5AB869065307F83E27DD1 /* htmlpars.cpp in Sources */, + EBA0986930DA3B59B2FB4F1E /* htmltag.cpp in Sources */, + 93E04642049537EB8A37BA26 /* htmlwin.cpp in Sources */, + 3E99016BDE043A08B4D6B3CE /* htmprint.cpp in Sources */, + 9836B3D336963795928FE5A1 /* m_dflist.cpp in Sources */, + 66584BC871303041BA622DE0 /* m_fonts.cpp in Sources */, + 99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */, + A3586433C4B1398FB1C361D6 /* m_image.cpp in Sources */, + BD53E095EC1136EF853A47D8 /* m_layout.cpp in Sources */, + C05BDB0B5F5A33A9A57FF012 /* m_links.cpp in Sources */, + 81B742D64BEB373DB705947A /* m_list.cpp in Sources */, + FD38B04026F930CC80BC9480 /* m_pre.cpp in Sources */, + 57AE7FCF768F3965BD39B47A /* m_span.cpp in Sources */, + 4CFB7E6E5BD53E2BB39BEF63 /* m_style.cpp in Sources */, + 3D424F4B33653A00AE9B623A /* m_tables.cpp in Sources */, + F3AC352D6DAE3A12A5664768 /* styleparams.cpp in Sources */, + 2A7640E4210334AC93366900 /* winpars.cpp in Sources */, + 87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */, + FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */, + 94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */, + 8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */, + 84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */, + D5C304182151365FA9FF8A3D /* xh_bttn.cpp in Sources */, + FE9A662A1F9B34D099C45C1D /* xh_cald.cpp in Sources */, + 6138BCBC8E4438FA91E0EF9F /* xh_chckb.cpp in Sources */, + 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */, + CE17002B5B7E375582747639 /* xh_choic.cpp in Sources */, + 26E4813A97DE323E88119163 /* xh_choicbk.cpp in Sources */, + E7AF3BF2B3473AD9BE66D1A1 /* xh_clrpicker.cpp in Sources */, + 1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */, + E7921B0472B63E4091F4F517 /* xh_collpane.cpp in Sources */, + 84382E5DB3203A73AC5EE390 /* xh_combo.cpp in Sources */, + F569D7A3F0E038E9B4CC2A76 /* xh_comboctrl.cpp in Sources */, + FB09720D13673A7B81BCB645 /* xh_datectrl.cpp in Sources */, + F7D10B6E0CBA32EFAF79C77C /* xh_dirpicker.cpp in Sources */, + 3B7E035ECF3D3FFB9827AC1C /* xh_dlg.cpp in Sources */, + E05B06A7FEEE32D5AD87EA4F /* xh_editlbox.cpp in Sources */, + F24F637D59F637CA9A7E23C9 /* xh_filectrl.cpp in Sources */, + 5FE969523BDB3353AEF96810 /* xh_filepicker.cpp in Sources */, + 438EAEA4B30C325C827F6197 /* xh_fontpicker.cpp in Sources */, + 95826E8528CC32D8934C36EC /* xh_frame.cpp in Sources */, + BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */, + 26649553E4763EE6BA268B7D /* xh_gdctl.cpp in Sources */, + 72AD4417FF7C3094BB1FF62C /* xh_grid.cpp in Sources */, + 83616D33080E3F0F9FA5FBB4 /* xh_html.cpp in Sources */, + 2B13BFC894C63373B7ACFA3D /* xh_hyperlink.cpp in Sources */, + C34B8675439F39B4845FFC50 /* xh_listb.cpp in Sources */, + F5DF7AF0FA9E371BB71EF798 /* xh_listbk.cpp in Sources */, + 96B507455762391688B5E500 /* xh_listc.cpp in Sources */, + F34D240EB4513FE996179182 /* xh_mdi.cpp in Sources */, + 65FCDBFFF3F138A3ABBAA650 /* xh_menu.cpp in Sources */, + 0FBF7C9EDFB53D8DA0991B55 /* xh_notbk.cpp in Sources */, + 0FA6E1E47F123FF4A902E4D2 /* xh_odcombo.cpp in Sources */, + 36B0B923B836358D9DB0AE10 /* xh_panel.cpp in Sources */, + CDC0FF253B503BA19693D68D /* xh_propdlg.cpp in Sources */, + 47F4FC8717AF3A848812DFCC /* xh_radbt.cpp in Sources */, + 7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */, + FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */, + 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */, + 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */, + E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */, + 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */, + C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */, + 33ED014A7FF7398794E6E4CF /* xh_split.cpp in Sources */, + 7C9EAFF4A0223EE597E0E39E /* xh_srchctrl.cpp in Sources */, + 8AB7191F7CB838FC8337C48D /* xh_statbar.cpp in Sources */, + 3D3EA1BAAD1833B1B48E9C86 /* xh_stbmp.cpp in Sources */, + F22C401903993639AE05A295 /* xh_stbox.cpp in Sources */, + BF3D600A93403C589B65C5BF /* xh_stlin.cpp in Sources */, + 8292D346BFC33D6E8D3CDDBF /* xh_sttxt.cpp in Sources */, + 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */, + B181806CC34839E791E54BF0 /* xh_tglbtn.cpp in Sources */, + F3CB42BB6D983675862C01F3 /* xh_toolb.cpp in Sources */, + 17F0494F87533196904F5313 /* xh_toolbk.cpp in Sources */, + 3357BD0518F538E9A949F886 /* xh_tree.cpp in Sources */, + 46CE8B53D2663927AAE5DF9D /* xh_treebk.cpp in Sources */, + C5A8DF376BB13A2A8290C2E5 /* xh_unkwn.cpp in Sources */, + 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */, + 1710A4BB0E6339558A187F8D /* xmlres.cpp in Sources */, + 867F5D1962383C98A8ADDC3D /* xmladv.cpp in Sources */, + 135DFCE48FC03D8294D01A89 /* xmlrsall.cpp in Sources */, + 61FD5E0E28F732E8AB1729F8 /* xml.cpp in Sources */, + 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */, + EEB0B28903693C7E9D07192F /* glcmn.cpp in Sources */, + E475B8377D7A352C90342299 /* glcanvas.cpp in Sources */, + F2813BF297C73A3ABD02EC98 /* glcanvas_osx.cpp in Sources */, + 36EB5D19429D3BD1A01001D5 /* framemanager.cpp in Sources */, + C7B6240E0E213836996A178B /* dockart.cpp in Sources */, + 15048519756B33959B15B161 /* floatpane.cpp in Sources */, + E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */, + 39CC380F801F3EE984523275 /* auibar.cpp in Sources */, + 6C46AF0370793AA0B74A5A4A /* tabmdi.cpp in Sources */, + DE43350F6C9D3148A64F0AF9 /* art_internal.cpp in Sources */, + 7DC4A542372437ECA0790F87 /* art_msw.cpp in Sources */, + A0BA01A85C303C78A3130711 /* art_aui.cpp in Sources */, + 056CA84179433AA48D55DA65 /* bar.cpp in Sources */, + CB078622E90F33BE9D131133 /* buttonbar.cpp in Sources */, + EB52C6A91594381393294500 /* control.cpp in Sources */, + 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */, + 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */, + F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */, + EA02FA6D3B003F8F8A2963C8 /* toolbar.cpp in Sources */, + D54A162E557834A48F4646A9 /* advprops.cpp in Sources */, + F501AB044AAC39DCB8C0B3E1 /* editors.cpp in Sources */, + 6B9EEA3CF2E536E3B1ADAC42 /* manager.cpp in Sources */, + 46A4CCF128FC3EB092074DC5 /* property.cpp in Sources */, + 26BB10834DA1388881BDD1EC /* propgrid.cpp in Sources */, + BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */, + A423177BBC0F3BE5A436B4B7 /* propgridpagestate.cpp in Sources */, + D72D99FC424337CF9EDC2042 /* props.cpp in Sources */, + 9065A4BE3D0433B88CF45571 /* richtextbuffer.cpp in Sources */, + 5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */, + 9455B49669853E71BD4FD965 /* richtextformatdlg.cpp in Sources */, + 70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */, + F43DAE2E829A3A7493531381 /* richtextimagedlg.cpp in Sources */, + 0FDDE8E193743F3A8CBDC67C /* richtextprint.cpp in Sources */, + FADD46CB89B135D1AF1D5F8A /* richtextstyledlg.cpp in Sources */, + 2563C775427E3D68BD384F2F /* richtextstyles.cpp in Sources */, + 604ABF86317C3D4F899DBF37 /* richtextsymboldlg.cpp in Sources */, + 9058997222493A7A859A4D4C /* richtextxml.cpp in Sources */, + E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */, + 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */, + 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */, + 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */, + 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */, + 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */, + 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */, + D95C5F467D37339AB8DF2354 /* tif_color.c in Sources */, + 6D073876E1753549B5EEFDDA /* tif_compress.c in Sources */, + E3136EF5DD843ACE886E2868 /* tif_dir.c in Sources */, + 7ECC6EE6D5273F75BB6B7B74 /* tif_dirinfo.c in Sources */, + D51B3389209E370489078891 /* tif_dirread.c in Sources */, + E7F35B834A163C67B65176C6 /* tif_dirwrite.c in Sources */, + 2D4D105CA9BE3FA6995A5FFF /* tif_dumpmode.c in Sources */, + C2CF6B59914A3183ADE84028 /* tif_error.c in Sources */, + 2315C8692C443ED1AE431728 /* tif_extension.c in Sources */, + FECC98B53C0F3106AB04E69E /* tif_fax3.c in Sources */, + 2C53221A318E37529E6460EB /* tif_fax3sm.c in Sources */, + 522E6CF2A62F34259BCE2DE2 /* tif_flush.c in Sources */, + 6944AC98F6F83E3D983DABD3 /* tif_getimage.c in Sources */, + 07C769F64665317BA3E1AC90 /* tif_jpeg.c in Sources */, + 88A43B1C5A7438838DE97B94 /* tif_luv.c in Sources */, + 779D3480141B3683A6D132BE /* tif_lzw.c in Sources */, + F85D632964383F29BC3B30B6 /* tif_next.c in Sources */, + 64F11C549E3035DF85691060 /* tif_ojpeg.c in Sources */, + 793F542F20AB31F6AF736795 /* tif_open.c in Sources */, + A9A5973552EE30838306D15C /* tif_packbits.c in Sources */, + 64DD406C453D39FEBBE66ED1 /* tif_pixarlog.c in Sources */, + 9A178ED42D96329D8CBF9B89 /* tif_predict.c in Sources */, + C170B941F01334F982315E4A /* tif_print.c in Sources */, + 570FA90F526E3F25A8E8FCF2 /* tif_read.c in Sources */, + 912C69ADB1673ACEB0E6CF08 /* tif_strip.c in Sources */, + 552708E6296D33EBB5F6A493 /* tif_swab.c in Sources */, + 527054445A0D3A00A5C2EC44 /* tif_thunder.c in Sources */, + FEB073547F3F3AC19D31F698 /* tif_tile.c in Sources */, + 096BA201623034AD97218368 /* tif_version.c in Sources */, + 7A79D9AC608E3B8287229174 /* tif_warning.c in Sources */, + F2F2963D8ECC32D39FDBF101 /* tif_write.c in Sources */, + 6E2C2E8AA1713ADE9C338379 /* tif_zip.c in Sources */, + FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */, + 311840186794346AAAA42091 /* jutils.c in Sources */, + DE26572475EE336B8EEA5D92 /* jerror.c in Sources */, + 18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */, + A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */, + 894D43C8F224394FB3171F26 /* jcapimin.c in Sources */, + 743BB23211B336A6A0F26E57 /* jcapistd.c in Sources */, + CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */, + ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */, + 76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */, + 86003C8EB906304F9025F788 /* jcinit.c in Sources */, + C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */, + DB73248401573A5996D8E68D /* jcmarker.c in Sources */, + 98DF13E96160304EBB905E73 /* jcmainct.c in Sources */, + 32486A808EBC3E088598D51C /* jcprepct.c in Sources */, + CA5BD8ABDBA13641BBE7CD66 /* jccoefct.c in Sources */, + 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */, + 50D7E093424138C88BB50D27 /* jcsample.c in Sources */, + BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */, + A212431902B8343CA6D229D3 /* jcphuff.c in Sources */, + BFA6983551B4310DA7C8A404 /* jcdctmgr.c in Sources */, + 9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */, + 0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */, + CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */, + 8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */, + 67EBCE5FA5FF36349ADF0916 /* jdapistd.c in Sources */, + 11818B68C5263EB68D708845 /* jdtrans.c in Sources */, + 4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */, + CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */, + 14EF556997B0350F931EBE8E /* jdinput.c in Sources */, + 61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */, + 28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */, + D0DA11B814AF30A18585122F /* jdphuff.c in Sources */, + 9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */, + B5470121BB4B35DE9C4836DA /* jdcoefct.c in Sources */, + E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */, + 13854E7822783719A2530792 /* jddctmgr.c in Sources */, + 48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */, + B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */, + C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */, + 1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */, + D997FFC948B73FDA892DB531 /* jdsample.c in Sources */, + D9F02AFDA07D3857A905527C /* jdcolor.c in Sources */, + 15D65A523EB23EC385C05E0B /* jquant1.c in Sources */, + 3C0EB1DDA5243E31B2D92CE2 /* jquant2.c in Sources */, + 1E4832B42B95308299B767B9 /* jdmerge.c in Sources */, + 94B1C88076793400810FAC30 /* png.c in Sources */, + 1569BB4728693B6285623A23 /* pngerror.c in Sources */, + D9496139621533328AE727B6 /* pngget.c in Sources */, + CFA91122523B31B9A07A3826 /* pngmem.c in Sources */, + 9EC837DA722736119D49868A /* pngpread.c in Sources */, + 9B8E5690A6103FC1BDC6C47E /* pngread.c in Sources */, + 31FEAB56919D372993CAD89C /* pngrio.c in Sources */, + 8FDC800D873F30E282691832 /* pngrtran.c in Sources */, + 61A2B54FD2E33C759CF5A5E8 /* pngrutil.c in Sources */, + 309C0A78D45C3AB7B8778B59 /* pngset.c in Sources */, + E515EAE375AE390688CBF8D3 /* pngtrans.c in Sources */, + C8C68927DB243AEAB51E11F2 /* pngwio.c in Sources */, + 0095084719983B878378CA28 /* pngwrite.c in Sources */, + 242E1D1A9BF331BA918134EC /* pngwtran.c in Sources */, + 2989056891153968B372EA14 /* pngwutil.c in Sources */, + E4131E3B445C36E6A7FC802F /* regcomp.c in Sources */, + 768716016CE7310BB1AD7567 /* regexec.c in Sources */, + B026621DE50A3921B6598EF6 /* regerror.c in Sources */, + 05021BAB2C9B3C4CAD0A7C2C /* regfree.c in Sources */, + E741CDA71895344C974D8F50 /* AutoComplete.cxx in Sources */, + E92EB502F79638B0BE569EF4 /* CallTip.cxx in Sources */, + 682403FBBD4E3D5E88159501 /* CellBuffer.cxx in Sources */, + 1D7442C82B343F50A83B25B0 /* CharClassify.cxx in Sources */, + 6BC8B3EDB3AE3EF4BACFC08A /* ContractionState.cxx in Sources */, + 90BC965B1A1F35A3B2C9D1C9 /* Decoration.cxx in Sources */, + 0D6596A44A8C37DE85D578F6 /* Document.cxx in Sources */, + 9A16829C34C9344D9AB010F9 /* DocumentAccessor.cxx in Sources */, + 6D723C987BFB39B7B887DCB1 /* Editor.cxx in Sources */, + 83C492B87F4A3A97930F227A /* ExternalLexer.cxx in Sources */, + 0B4AF44DC0C439AD83CDC37E /* Indicator.cxx in Sources */, + C8F1FB8C029031A5909DBC56 /* KeyMap.cxx in Sources */, + 30509A33ED9C35D4ADEF6BBC /* KeyWords.cxx in Sources */, + 0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */, + 0ADC8DBEE80D36B0BB9B058A /* LexASY.cxx in Sources */, + 784F7C50882F320FA76537B5 /* LexAU3.cxx in Sources */, + 07EC76232BB3343FA5CB90B0 /* LexAVE.cxx in Sources */, + 66FD099CE5A338C18329FC36 /* LexAbaqus.cxx in Sources */, + CD35A576FD363FD49C3AC4B3 /* LexAda.cxx in Sources */, + 0C3F48DBD05E3566A4CA6D44 /* LexAsm.cxx in Sources */, + 825EAD51920B387DB4F8C426 /* LexAsn1.cxx in Sources */, + D54D3CA9E73336A08DB20705 /* LexBaan.cxx in Sources */, + 39FB197CF9EB3D76BE0723CF /* LexBash.cxx in Sources */, + 6C7C1CC506CB329FB2D086A9 /* LexBasic.cxx in Sources */, + 78E15D8200F635529F396099 /* LexBullant.cxx in Sources */, + 6F472413FFA03B53B395BB74 /* LexCLW.cxx in Sources */, + D8ADDD24BEAC3D94B3388D3E /* LexCOBOL.cxx in Sources */, + A0FCE3CF565C3F84B63712AC /* LexCPP.cxx in Sources */, + 069D53F2DFBF370A8CC99630 /* LexCSS.cxx in Sources */, + 268DDC88C99A3A64AB8B2FFA /* LexCaml.cxx in Sources */, + 6F5A0D3C7763334396A3783D /* LexCmake.cxx in Sources */, + B640A8A74D973A8FBEF63916 /* LexConf.cxx in Sources */, + 97F60B2A9CE93BC8949A8CCD /* LexCrontab.cxx in Sources */, + 834F2ADD0520313FBAC4F927 /* LexCsound.cxx in Sources */, + 8FB5FBC5730C33F1A3D85D9F /* LexD.cxx in Sources */, + 4788F736CD9C324E8A3DFA74 /* LexEScript.cxx in Sources */, + E8BBC08597EF383597DA0308 /* LexEiffel.cxx in Sources */, + BFD3BFBDC8DA3B1EAD141F96 /* LexErlang.cxx in Sources */, + 45D88A74B3EE3837B9F79595 /* LexFlagship.cxx in Sources */, + 27759C2FBB0E35FDA847B2B5 /* LexForth.cxx in Sources */, + 020BBB417207393F8C60EFB6 /* LexFortran.cxx in Sources */, + E62F8E49FD5035D8BC71BB49 /* LexGAP.cxx in Sources */, + 9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */, + AEEE6BC41B6531898A61CB16 /* LexHTML.cxx in Sources */, + 51D133EC44F830588FEEAEC0 /* LexHaskell.cxx in Sources */, + B37802B0A90133C68EF93DDA /* LexInno.cxx in Sources */, + 14C024EB327435A2A571DA2C /* LexKix.cxx in Sources */, + DF8124E5E17D386A84CEEA27 /* LexLisp.cxx in Sources */, + D13AE659C3AC37B68D39B2C9 /* LexLout.cxx in Sources */, + 9D003890CB7035A298DB7056 /* LexLua.cxx in Sources */, + 3C394FBD47B6310C80577E3B /* LexMMIXAL.cxx in Sources */, + EC43AFB3670A3D459D9B388D /* LexMPT.cxx in Sources */, + E8EE34F0A78C31B489B19FEE /* LexMSSQL.cxx in Sources */, + E80BEED62EBF34F09B3F401F /* LexMagik.cxx in Sources */, + E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */, + 5AEA6E94FB76371D928D371C /* LexMatlab.cxx in Sources */, + 1A4F9F18BBEB3515AC7C7CC6 /* LexMetapost.cxx in Sources */, + CB1F37993ECB3B73A51B42FD /* LexMySQL.cxx in Sources */, + A874AF0B203D3DC99C27469A /* LexNimrod.cxx in Sources */, + 22C76BF2C3E331CD87657E6E /* LexNsis.cxx in Sources */, + 76D1A1A49CC831FFB9EBB1F5 /* LexOpal.cxx in Sources */, + BEFC179F8A0E337F9D627D84 /* LexOthers.cxx in Sources */, + 24A5A71C79733E9CB913C5B7 /* LexPB.cxx in Sources */, + 0D79F1B4EF44393AA324213F /* LexPLM.cxx in Sources */, + A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */, + 551BF168445E3D7BB54D0174 /* LexPS.cxx in Sources */, + 0718E7524134312090541D6E /* LexPascal.cxx in Sources */, + 369BCCFF61D13A058D837835 /* LexPerl.cxx in Sources */, + 22EC132AEF863BFBAA6EDEC3 /* LexPowerPro.cxx in Sources */, + 1FB1622D59593932B25C55BA /* LexPowerShell.cxx in Sources */, + 97C551F8AEF133D680D1FD36 /* LexProgress.cxx in Sources */, + A36B5107860E32659194073F /* LexPython.cxx in Sources */, + 31380AD4F5BD38A6B9212FE0 /* LexR.cxx in Sources */, + CCFD3144A22C3A87B67D88AB /* LexRebol.cxx in Sources */, + 7C20B79175D33852A2E9DE83 /* LexRuby.cxx in Sources */, + FE5B7C7A84B83C17A38E8403 /* LexSML.cxx in Sources */, + 71CCB06E790C3C54BFF1199D /* LexSQL.cxx in Sources */, + BA9F0BBD57F63FD29E484FD3 /* LexScriptol.cxx in Sources */, + F55F3887CDE633D7877C607B /* LexSmalltalk.cxx in Sources */, + D5C5DD83882B3227A1CCFE0E /* LexSorcus.cxx in Sources */, + 6F8129E317EE3486A89D8548 /* LexSpecman.cxx in Sources */, + 9678C2B19D293818AA8E9E0D /* LexSpice.cxx in Sources */, + 0F8C79010EF0316AA1B7392D /* LexTACL.cxx in Sources */, + 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */, + CAF5C5BB129431B596C4C6C1 /* LexTAL.cxx in Sources */, + 49BEDFBC3661339D90EF6935 /* LexTCL.cxx in Sources */, + 7D0E549020D33ED39751DFC8 /* LexTeX.cxx in Sources */, + D4EC9DB5F8DF319EA0FD26A4 /* LexVB.cxx in Sources */, + 16021CFD78623B8CBD08FC1F /* LexVHDL.cxx in Sources */, + 3C5E1A45A57B3169A4C073D9 /* LexVerilog.cxx in Sources */, + 159E4248CB1333AD841D9F03 /* LexYAML.cxx in Sources */, + 923F4797A73A3BDD87BBD1E1 /* LineMarker.cxx in Sources */, + 523FB2A8435A3324A8E1B370 /* PerLine.cxx in Sources */, + BF068F3C06473D8CBC55D507 /* PositionCache.cxx in Sources */, + 795B9B15279D36F8899C9CA8 /* PropSet.cxx in Sources */, + A52A7D2FEB1434E29C64582C /* RESearch.cxx in Sources */, + 7B372FEA276438C186F7E340 /* RunStyles.cxx in Sources */, + 15735ED6556130F6A14F0BCD /* ScintillaBase.cxx in Sources */, + 097BC5E023C33C1DA05606AF /* Selection.cxx in Sources */, + 4C9BA36123E43589956864C6 /* Style.cxx in Sources */, + CD241361D4693785A0B8939D /* StyleContext.cxx in Sources */, + 19D823E564D932758EA6F8D1 /* UniConversion.cxx in Sources */, + 699D88EE2DAA3594B6606890 /* ViewStyle.cxx in Sources */, + B387FAE95A9535B194A42BA4 /* WindowAccessor.cxx in Sources */, + BCDAE378D03E37F5994FB9C5 /* XPM.cxx in Sources */, + C2DEE063B5E032C1BD2B5026 /* xmlparse.c in Sources */, + AE84BC9A1CCA3ADA9C483950 /* xmlrole.c in Sources */, + DB9565CC4EAE3BCB9F490620 /* xmltok.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 55C93151F6053EBCBDD70DF8 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B44B32437825326C84607AD8 /* wxcarbon.xcconfig */; + buildSettings = { + EXECUTABLE_PREFIX = lib; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + WXUSINGDLL, + ); + INSTALL_PATH = "@executable_path/../Frameworks/"; + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lz", + ); + }; + name = Debug; + }; + 55C93151F6053EBCBDD70DF9 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */; + buildSettings = { + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Debug; + }; + 55C93151F6053EBCBDD70DFA /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B44B32437825326C84607AD8 /* wxcarbon.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(PRODUCT_NAME)_static"; + }; + name = Debug; + }; + 99B665C6D0D137B38CEA938E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B44B32437825326C84607AD8 /* wxcarbon.xcconfig */; + buildSettings = { + EXECUTABLE_PREFIX = lib; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + WXUSINGDLL, + ); + INSTALL_PATH = "@executable_path/../Frameworks/"; + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lz", + ); + }; + name = Release; + }; + 99B665C6D0D137B38CEA938F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */; + buildSettings = { + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Release; + }; + 99B665C6D0D137B38CEA9390 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B44B32437825326C84607AD8 /* wxcarbon.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(PRODUCT_NAME)_static"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 336FCCBABBEF3C4AA92AD394 /* Build configuration list for PBXNativeTarget "static" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 55C93151F6053EBCBDD70DFA /* Debug */, + 99B665C6D0D137B38CEA9390 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F515C6D7EB103C50924F790B /* Build configuration list for PBXNativeTarget "dynamic" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 55C93151F6053EBCBDD70DF8 /* Debug */, + 99B665C6D0D137B38CEA938E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + FE4F954C29353DAB832F4608 /* Build configuration list for PBXProject "wxcarbon" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 55C93151F6053EBCBDD70DF9 /* Debug */, + 99B665C6D0D137B38CEA938F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 19367367C9323490BB936F06 /* Project object */; +} diff --git a/build/osx/wxcarbon_in.xcodeproj/project.pbxproj b/build/osx/wxcarbon_in.xcodeproj/project.pbxproj index 8d4e73d379..8a8811c93d 100644 --- a/build/osx/wxcarbon_in.xcodeproj/project.pbxproj +++ b/build/osx/wxcarbon_in.xcodeproj/project.pbxproj @@ -8,6 +8,8 @@ /* Begin PBXFileReference section */ 404BEE6110EC83280080E2B8 /* libwx_osx_carbon_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_carbon_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 409C323613B27E1D0009CB3C /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxdebug.xcconfig; sourceTree = ""; }; + 409C323713B27E1D0009CB3C /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxcarbon.xcconfig; sourceTree = ""; }; D2AAC0C705546C1D00DB518D /* libwx_osx_carbon.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwx_osx_carbon.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -43,6 +45,8 @@ isa = PBXGroup; children = ( 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */, + 409C323613B27E1D0009CB3C /* wxdebug.xcconfig */, + 409C323713B27E1D0009CB3C /* wxrelease.xcconfig */, 034768DFFF38A50411DB9C8B /* Products */, ); name = wxcocoa; @@ -111,7 +115,14 @@ isa = PBXProject; buildConfigurationList = 1DEB918108733D990010E9CD /* Build configuration list for PBXProject "wxcarbon_in" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 0867D691FE84028FC02AAC07 /* wxcocoa */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; @@ -174,16 +185,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; EXECUTABLE_PREFIX = lib; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - "__WXDEBUG__=1", - ); INSTALL_PATH = "@executable_path/../Frameworks/"; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", @@ -196,9 +198,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */; buildSettings = { - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; EXECUTABLE_PREFIX = lib; - GCC_MODEL_TUNING = G5; INSTALL_PATH = "@executable_path/../Frameworks/"; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", @@ -209,26 +209,16 @@ }; 1DEB918208733D990010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 409C323613B27E1D0009CB3C /* wxdebug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; WXROOT = "$(PROJECT_DIR)/../.."; }; name = Debug; }; 1DEB918308733D990010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 409C323713B27E1D0009CB3C /* wxrelease.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; WXROOT = "$(PROJECT_DIR)/../.."; }; name = Release; @@ -237,18 +227,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - "__WXDEBUG__=1", - ); - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; PRODUCT_NAME = "$(PRODUCT_NAME)_static"; }; name = Debug; @@ -257,14 +235,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; PRODUCT_NAME = "$(PRODUCT_NAME)_static"; - ZERO_LINK = NO; }; name = Release; }; diff --git a/build/osx/wxcocoa.xcconfig b/build/osx/wxcocoa.xcconfig index e6fc8c4d35..e5a73a7cd1 100644 --- a/build/osx/wxcocoa.xcconfig +++ b/build/osx/wxcocoa.xcconfig @@ -3,4 +3,12 @@ WXTOOLKITUPPER = COCOA #include "wx.xcconfig" +MACOSX_DEPLOYMENT_TARGET = 10.4 +MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5 + +GCC_VERSION = 4.2 +GCC_VERSION[arch=ppc] = 4.0 + +ARCHS = ppc i386 x86_64 + OTHER_LDFLAGS = -framework WebKit -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework OpenGL -framework QuickTime diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..a42485518a --- /dev/null +++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj @@ -0,0 +1,5510 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 45; + objects = { + +/* Begin PBXBuildFile section */ + 0095084719983B878378CA28 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 69A6CAF721E53E83B4820DE6 /* pngwrite.c */; }; + 0095084719983B878378CA29 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 69A6CAF721E53E83B4820DE6 /* pngwrite.c */; }; + 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */; }; + 00E2F82590B33BDCA1F6D0C5 /* xh_htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */; }; + 00F1531404F832C6AE0748F2 /* spinbutt_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */; }; + 00F1531404F832C6AE0748F3 /* spinbutt_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */; }; + 014AF0BAB1783A5D9D75A7ED /* zstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9B5BC858CCF3477895D2786 /* zstream.cpp */; }; + 014AF0BAB1783A5D9D75A7EE /* zstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9B5BC858CCF3477895D2786 /* zstream.cpp */; }; + 0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */; }; + 0164A65CDB7A334A8E9AA4C0 /* dynload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */; }; + 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; + 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; + 020BBB417207393F8C60EFB6 /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */; }; + 020BBB417207393F8C60EFB7 /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */; }; + 026F90F7492C316A94128916 /* logg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64705CE9398316D87BAB4DC /* logg.cpp */; }; + 026F90F7492C316A94128917 /* logg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64705CE9398316D87BAB4DC /* logg.cpp */; }; + 028257C52CAE3038AA862C35 /* stdstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE16011AD6323AAC8616F973 /* stdstream.cpp */; }; + 028257C52CAE3038AA862C36 /* stdstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE16011AD6323AAC8616F973 /* stdstream.cpp */; }; + 02BB539E2AD63C078DA776B0 /* uiaction_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */; }; + 02BB539E2AD63C078DA776B1 /* uiaction_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */; }; + 02E8F1195B653D26AAA89462 /* listbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */; }; + 02E8F1195B653D26AAA89463 /* listbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */; }; + 03035C5CE4BC3288A5A18424 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */; }; + 03035C5CE4BC3288A5A18425 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */; }; + 03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */; }; + 03BF1610E2FC3BD5ACB754F1 /* bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */; }; + 049052C49B0B3810BE0179C9 /* dataview.mm in Sources */ = {isa = PBXBuildFile; fileRef = DB6963739198360DB3DBCC6C /* dataview.mm */; }; + 049052C49B0B3810BE0179CA /* dataview.mm in Sources */ = {isa = PBXBuildFile; fileRef = DB6963739198360DB3DBCC6C /* dataview.mm */; }; + 05021BAB2C9B3C4CAD0A7C2C /* regfree.c in Sources */ = {isa = PBXBuildFile; fileRef = EEE82083BFA430D5B58F8A04 /* regfree.c */; }; + 05021BAB2C9B3C4CAD0A7C2D /* regfree.c in Sources */ = {isa = PBXBuildFile; fileRef = EEE82083BFA430D5B58F8A04 /* regfree.c */; }; + 052331773CF6362C9A6CF38E /* utils_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EED7C691150139EFA35E8EBD /* utils_osx.cpp */; }; + 052331773CF6362C9A6CF38F /* utils_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EED7C691150139EFA35E8EBD /* utils_osx.cpp */; }; + 056CA84179433AA48D55DA65 /* bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDDE855D9F83E4891362EB4 /* bar.cpp */; }; + 056CA84179433AA48D55DA66 /* bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDDE855D9F83E4891362EB4 /* bar.cpp */; }; + 056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EEAD9C3E180305D8899441E /* strvararg.cpp */; }; + 056E30EA43753A7CB1AF8C9F /* strvararg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EEAD9C3E180305D8899441E /* strvararg.cpp */; }; + 05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; }; + 05814571E7A83F5DBFB6E4C5 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; }; + 064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; }; + 064908348009398C8EA8497D /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; }; + 0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */; }; + 0654BCC3F0763C50A7949505 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */; }; + 069D53F2DFBF370A8CC99630 /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */; }; + 069D53F2DFBF370A8CC99631 /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */; }; + 07158EBC05A637ECA9DC7B4F /* utilscocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */; }; + 07158EBC05A637ECA9DC7B50 /* utilscocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */; }; + 0718E7524134312090541D6E /* LexPascal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */; }; + 0718E7524134312090541D6F /* LexPascal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */; }; + 0723C4E8B52C39FDBC2158B6 /* dataview_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */; }; + 0723C4E8B52C39FDBC2158B7 /* dataview_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */; }; + 0730A107A2B935A9923C8EF2 /* filehistorycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D7B3307E56B332769901E99F /* filehistorycmn.cpp */; }; + 0730A107A2B935A9923C8EF3 /* filehistorycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D7B3307E56B332769901E99F /* filehistorycmn.cpp */; }; + 07412469921A3E488A2F9BA6 /* checklst_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */; }; + 07412469921A3E488A2F9BA7 /* checklst_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */; }; + 0742292656623EC481B34369 /* paper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87D973CA8D673267BD0844D3 /* paper.cpp */; }; + 0742292656623EC481B3436A /* paper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87D973CA8D673267BD0844D3 /* paper.cpp */; }; + 0743AE8613F535A0ABB79315 /* intl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC8BB1AABB3D393EBA527060 /* intl.cpp */; }; + 0743AE8613F535A0ABB79316 /* intl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC8BB1AABB3D393EBA527060 /* intl.cpp */; }; + 07C769F64665317BA3E1AC90 /* tif_jpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */; }; + 07C769F64665317BA3E1AC91 /* tif_jpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */; }; + 07EC76232BB3343FA5CB90B0 /* LexAVE.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */; }; + 07EC76232BB3343FA5CB90B1 /* LexAVE.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */; }; + 0813551C951A3AD1A5EF01B2 /* imagbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F84098A475939BB9EE87E70 /* imagbmp.cpp */; }; + 0813551C951A3AD1A5EF01B3 /* imagbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F84098A475939BB9EE87E70 /* imagbmp.cpp */; }; + 0836590D35FE37988DE70442 /* combobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */; }; + 0836590D35FE37988DE70443 /* combobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */; }; + 087FF6DE223A32509692F39B /* txtstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */; }; + 087FF6DE223A32509692F39C /* txtstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */; }; + 0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D07403FCA530D7A9FD2917 /* jfdctflt.c */; }; + 0948599C4FD53611A09B52AC /* jfdctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D07403FCA530D7A9FD2917 /* jfdctflt.c */; }; + 096BA201623034AD97218368 /* tif_version.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E6F40F4740C3ED29D83E107 /* tif_version.c */; }; + 096BA201623034AD97218369 /* tif_version.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E6F40F4740C3ED29D83E107 /* tif_version.c */; }; + 097BC5E023C33C1DA05606AF /* Selection.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2AF7739C389536F79DAA31E5 /* Selection.cxx */; }; + 097BC5E023C33C1DA05606B0 /* Selection.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2AF7739C389536F79DAA31E5 /* Selection.cxx */; }; + 0A2A4D2DC8F63FE1AC0BFAAF /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2024D29170D3B50A4DFDE11 /* base64.cpp */; }; + 0A2A4D2DC8F63FE1AC0BFAB0 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2024D29170D3B50A4DFDE11 /* base64.cpp */; }; + 0A406D2D1ADA343891E3664C /* powercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */; }; + 0A406D2D1ADA343891E3664D /* powercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */; }; + 0ADC8DBEE80D36B0BB9B058A /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A82C367B86F83981803D55DB /* LexASY.cxx */; }; + 0ADC8DBEE80D36B0BB9B058B /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A82C367B86F83981803D55DB /* LexASY.cxx */; }; + 0AEBA7389E223781A7A257A1 /* webkit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DF2456ED905357B8C1D74D9 /* webkit.mm */; }; + 0AEBA7389E223781A7A257A2 /* webkit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DF2456ED905357B8C1D74D9 /* webkit.mm */; }; + 0B4AF44DC0C439AD83CDC37E /* Indicator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4FDE5A962FA234FA83A605AD /* Indicator.cxx */; }; + 0B4AF44DC0C439AD83CDC37F /* Indicator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4FDE5A962FA234FA83A605AD /* Indicator.cxx */; }; + 0B98B6721DEE37A1ADEA382B /* quantize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B890199A37723EFD86C0ADA5 /* quantize.cpp */; }; + 0B98B6721DEE37A1ADEA382C /* quantize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B890199A37723EFD86C0ADA5 /* quantize.cpp */; }; + 0C3F48DBD05E3566A4CA6D44 /* LexAsm.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A65399C8A6D636139E362119 /* LexAsm.cxx */; }; + 0C3F48DBD05E3566A4CA6D45 /* LexAsm.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A65399C8A6D636139E362119 /* LexAsm.cxx */; }; + 0C485288EA86379D9FD66536 /* cshelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67DCEEB6861731319C30817F /* cshelp.cpp */; }; + 0C485288EA86379D9FD66537 /* cshelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67DCEEB6861731319C30817F /* cshelp.cpp */; }; + 0C7E2D5C22A232368F862A60 /* longlong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72D7AF345E563587941BD868 /* longlong.cpp */; }; + 0C7E2D5C22A232368F862A61 /* longlong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72D7AF345E563587941BD868 /* longlong.cpp */; }; + 0C9A379D97B133FA831175A7 /* printdlg_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */; }; + 0C9A379D97B133FA831175A8 /* printdlg_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */; }; + 0D6596A44A8C37DE85D578F6 /* Document.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 71DB140E670738839EC42C2B /* Document.cxx */; }; + 0D6596A44A8C37DE85D578F7 /* Document.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 71DB140E670738839EC42C2B /* Document.cxx */; }; + 0D79F1B4EF44393AA324213F /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */; }; + 0D79F1B4EF44393AA3242140 /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */; }; + 0E024D145DDD38ACAE68F462 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; }; + 0E024D145DDD38ACAE68F463 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; }; + 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; + 0E60E17BA4B23347A4F20161 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; + 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; + 0E92CEF677AA32C9A8CDA0A8 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; + 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; }; + 0EB6AB38A68D3845AC384A24 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; }; + 0F8C79010EF0316AA1B7392D /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */; }; + 0F8C79010EF0316AA1B7392E /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */; }; + 0FA6E1E47F123FF4A902E4D2 /* xh_odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0080254545B9383ABDF2045C /* xh_odcombo.cpp */; }; + 0FA6E1E47F123FF4A902E4D3 /* xh_odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0080254545B9383ABDF2045C /* xh_odcombo.cpp */; }; + 0FBF7C9EDFB53D8DA0991B55 /* xh_notbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87662D69F0432FC96701280 /* xh_notbk.cpp */; }; + 0FBF7C9EDFB53D8DA0991B56 /* xh_notbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87662D69F0432FC96701280 /* xh_notbk.cpp */; }; + 0FDDE8E193743F3A8CBDC67C /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; }; + 0FDDE8E193743F3A8CBDC67D /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; }; + 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; + 0FFFFA2F762B3160955D1D89 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; + 11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; + 11818B68C5263EB68D708846 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; + 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; }; + 11DD420E32FB3EFB9DA0AB5C /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; }; + 127E255EE601383A9E0EF7EA /* menuitem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 61548D0FE1353D7C846DD721 /* menuitem.mm */; }; + 127E255EE601383A9E0EF7EB /* menuitem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 61548D0FE1353D7C846DD721 /* menuitem.mm */; }; + 131B879180AE3FB481F81CC7 /* fs_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9A305CEC03B3085B159B617 /* fs_mem.cpp */; }; + 131B879180AE3FB481F81CC8 /* fs_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9A305CEC03B3085B159B617 /* fs_mem.cpp */; }; + 13250B531B1B3F9998C59DA9 /* stdpaths_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */; }; + 13250B531B1B3F9998C59DAA /* stdpaths_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */; }; + 135DFCE48FC03D8294D01A89 /* xmlrsall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */; }; + 135DFCE48FC03D8294D01A8A /* xmlrsall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */; }; + 13854E7822783719A2530792 /* jddctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = A5BBC1E494D33D028CA547FF /* jddctmgr.c */; }; + 13854E7822783719A2530793 /* jddctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = A5BBC1E494D33D028CA547FF /* jddctmgr.c */; }; + 14C024EB327435A2A571DA2C /* LexKix.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B303230368143F37B2409DE6 /* LexKix.cxx */; }; + 14C024EB327435A2A571DA2D /* LexKix.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B303230368143F37B2409DE6 /* LexKix.cxx */; }; + 14D6D5F8F5ED3C71936DD2AF /* button.mm in Sources */ = {isa = PBXBuildFile; fileRef = C06FED83BF933DF98C2466AE /* button.mm */; }; + 14D6D5F8F5ED3C71936DD2B0 /* button.mm in Sources */ = {isa = PBXBuildFile; fileRef = C06FED83BF933DF98C2466AE /* button.mm */; }; + 14DEBD7C01FC358B917FDAF2 /* aboutdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 207F0F88390138B6B41183EB /* aboutdlg.mm */; }; + 14DEBD7C01FC358B917FDAF3 /* aboutdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 207F0F88390138B6B41183EB /* aboutdlg.mm */; }; + 14EF556997B0350F931EBE8E /* jdinput.c in Sources */ = {isa = PBXBuildFile; fileRef = CCF7564A2B733F759AA8496B /* jdinput.c */; }; + 14EF556997B0350F931EBE8F /* jdinput.c in Sources */ = {isa = PBXBuildFile; fileRef = CCF7564A2B733F759AA8496B /* jdinput.c */; }; + 15048519756B33959B15B161 /* floatpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A881F49ADCF33C299B041584 /* floatpane.cpp */; }; + 15048519756B33959B15B162 /* floatpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A881F49ADCF33C299B041584 /* floatpane.cpp */; }; + 1569BB4728693B6285623A23 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A0650754DC2358CA5933B28 /* pngerror.c */; }; + 1569BB4728693B6285623A24 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A0650754DC2358CA5933B28 /* pngerror.c */; }; + 15735ED6556130F6A14F0BCD /* ScintillaBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */; }; + 15735ED6556130F6A14F0BCE /* ScintillaBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */; }; + 159E4248CB1333AD841D9F03 /* LexYAML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */; }; + 159E4248CB1333AD841D9F04 /* LexYAML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */; }; + 15D65A523EB23EC385C05E0B /* jquant1.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */; }; + 15D65A523EB23EC385C05E0C /* jquant1.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */; }; + 16021CFD78623B8CBD08FC1F /* LexVHDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */; }; + 16021CFD78623B8CBD08FC20 /* LexVHDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */; }; + 164010B26D363F5FA09785B6 /* listctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */; }; + 164010B26D363F5FA09785B7 /* listctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */; }; + 16A382A265DE32FABC318F6F /* fontdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB170BF78EFE39D692E11985 /* fontdlgg.cpp */; }; + 16A382A265DE32FABC318F70 /* fontdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB170BF78EFE39D692E11985 /* fontdlgg.cpp */; }; + 1710A4BB0E6339558A187F8D /* xmlres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087B66573CD33DA99DA82B1C /* xmlres.cpp */; }; + 1710A4BB0E6339558A187F8E /* xmlres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087B66573CD33DA99DA82B1C /* xmlres.cpp */; }; + 1749412E53B9311DABA71DDC /* bmpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */; }; + 1749412E53B9311DABA71DDD /* bmpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */; }; + 17F0494F87533196904F5313 /* xh_toolbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */; }; + 17F0494F87533196904F5314 /* xh_toolbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */; }; + 182DFDBB58653FD9863D4176 /* dcprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 238741BDA2C73E56899CCB04 /* dcprint.cpp */; }; + 182DFDBB58653FD9863D4177 /* dcprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 238741BDA2C73E56899CCB04 /* dcprint.cpp */; }; + 187F921A95DA3594B0AD980D /* gridsel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26381308E32A3A179E7A9B40 /* gridsel.cpp */; }; + 187F921A95DA3594B0AD980E /* gridsel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26381308E32A3A179E7A9B40 /* gridsel.cpp */; }; + 18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */; }; + 18A318847EAC37F2B915F082 /* jmemmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */; }; + 1937FBA0A0DD32A8A743CFE1 /* valtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8701E1CF2B352B945C17E5 /* valtext.cpp */; }; + 1937FBA0A0DD32A8A743CFE2 /* valtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8701E1CF2B352B945C17E5 /* valtext.cpp */; }; + 19D823E564D932758EA6F8D1 /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */; }; + 19D823E564D932758EA6F8D2 /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */; }; + 1A4F9F18BBEB3515AC7C7CC6 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; }; + 1A4F9F18BBEB3515AC7C7CC7 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; }; + 1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; }; + 1A7FA35BDE4F35C685AB51A6 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; }; + 1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; }; + 1AB50C98FF473B33A3CA4D3A /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; }; + 1AF2B2346C9639DAA4D15F30 /* numdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */; }; + 1AF2B2346C9639DAA4D15F31 /* numdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */; }; + 1B06622C8D8731FC832199E2 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB82939EDC593F9CA95C3098 /* init.cpp */; }; + 1B06622C8D8731FC832199E3 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB82939EDC593F9CA95C3098 /* init.cpp */; }; + 1BCC944F5E0936F5830F03E8 /* windowid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9B9B85572D0312BBF2878DB /* windowid.cpp */; }; + 1BCC944F5E0936F5830F03E9 /* windowid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9B9B85572D0312BBF2878DB /* windowid.cpp */; }; + 1C52CB9487DF3AB9AF243B47 /* prntbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 242BF97B558634A79322052C /* prntbase.cpp */; }; + 1C52CB9487DF3AB9AF243B48 /* prntbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 242BF97B558634A79322052C /* prntbase.cpp */; }; + 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; + 1CD4F67F48CF3A5FA477D86F /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; + 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; }; + 1D726139C977341A97D0C932 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; }; + 1D7442C82B343F50A83B25B0 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */; }; + 1D7442C82B343F50A83B25B1 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */; }; + 1DBDF75500D73A3098015E7F /* cfstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */; }; + 1DBDF75500D73A3098015E80 /* cfstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */; }; + 1DE75213D296323B815A02BE /* statline.mm in Sources */ = {isa = PBXBuildFile; fileRef = 743EF8DB16CE371DA5C66623 /* statline.mm */; }; + 1DE75213D296323B815A02BF /* statline.mm in Sources */ = {isa = PBXBuildFile; fileRef = 743EF8DB16CE371DA5C66623 /* statline.mm */; }; + 1DF3A4F85FCB3BA79A552F3D /* menuitem_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */; }; + 1DF3A4F85FCB3BA79A552F3E /* menuitem_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */; }; + 1E166FC1A7B3371FB038B172 /* fldlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */; }; + 1E166FC1A7B3371FB038B173 /* fldlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */; }; + 1E17F95DD433379E8C18298C /* odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */; }; + 1E17F95DD433379E8C18298D /* odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */; }; + 1E2AB43075973AE59A8D89C1 /* fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */; }; + 1E2AB43075973AE59A8D89C2 /* fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */; }; + 1E4832B42B95308299B767B9 /* jdmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 0890779C662C35889A8C6C2E /* jdmerge.c */; }; + 1E4832B42B95308299B767BA /* jdmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 0890779C662C35889A8C6C2E /* jdmerge.c */; }; + 1EA81A0E8E5A3B38B4D80337 /* srchcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EF103B09F02315282EC8F44 /* srchcmn.cpp */; }; + 1EA81A0E8E5A3B38B4D80338 /* srchcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EF103B09F02315282EC8F44 /* srchcmn.cpp */; }; + 1EDED99760B23A1999E75C12 /* imaglist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */; }; + 1EDED99760B23A1999E75C13 /* imaglist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */; }; + 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */ = {isa = PBXBuildFile; fileRef = F82278F9AF0432529891E6D7 /* tif_close.c */; }; + 1EE845DDFDDE36CA8A218206 /* tif_close.c in Sources */ = {isa = PBXBuildFile; fileRef = F82278F9AF0432529891E6D7 /* tif_close.c */; }; + 1FB1622D59593932B25C55BA /* LexPowerShell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */; }; + 1FB1622D59593932B25C55BB /* LexPowerShell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */; }; + 205520440CD13C0AB9E89159 /* anidecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE959EC7BFDD3A628E856404 /* anidecod.cpp */; }; + 205520440CD13C0AB9E8915A /* anidecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE959EC7BFDD3A628E856404 /* anidecod.cpp */; }; + 20BEEFFA08F3396791596870 /* dlunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA2D9F325F833C408657E7B7 /* dlunix.cpp */; }; + 20BEEFFA08F3396791596871 /* dlunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA2D9F325F833C408657E7B7 /* dlunix.cpp */; }; + 20F10669703137E68318C6FD /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; }; + 20F10669703137E68318C6FE /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; }; + 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; + 2102C23970FB3F22AB46A59B /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; + 21F74D4D4D84375AB155FD5B /* stattext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95186FEF3DEF39D8B1157BD5 /* stattext.mm */; }; + 21F74D4D4D84375AB155FD5C /* stattext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95186FEF3DEF39D8B1157BD5 /* stattext.mm */; }; + 221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; }; + 221DC4F6678A3EC5ACDDEA50 /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; }; + 22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; }; + 22AE900003F73134BBEE8BB7 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; }; + 22C76BF2C3E331CD87657E6E /* LexNsis.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1BC0322549563787A21CE8F1 /* LexNsis.cxx */; }; + 22C76BF2C3E331CD87657E6F /* LexNsis.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1BC0322549563787A21CE8F1 /* LexNsis.cxx */; }; + 22E90F33B5C9308EBF37A700 /* printdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9E32802E8ED3E729FF34CFC /* printdlg.mm */; }; + 22E90F33B5C9308EBF37A701 /* printdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9E32802E8ED3E729FF34CFC /* printdlg.mm */; }; + 22EC132AEF863BFBAA6EDEC3 /* LexPowerPro.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */; }; + 22EC132AEF863BFBAA6EDEC4 /* LexPowerPro.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */; }; + 2315C8692C443ED1AE431728 /* tif_extension.c in Sources */ = {isa = PBXBuildFile; fileRef = AF7CE00168AB33C994374ABA /* tif_extension.c */; }; + 2315C8692C443ED1AE431729 /* tif_extension.c in Sources */ = {isa = PBXBuildFile; fileRef = AF7CE00168AB33C994374ABA /* tif_extension.c */; }; + 2386B575BC3931D2AF86CB33 /* fontdlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */; }; + 2386B575BC3931D2AF86CB34 /* fontdlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */; }; + 23965E313EDC3BBE9B2FA1C5 /* imagpng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24396D584D053948A3FF0DCD /* imagpng.cpp */; }; + 23965E313EDC3BBE9B2FA1C6 /* imagpng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24396D584D053948A3FF0DCD /* imagpng.cpp */; }; + 23A7AF68A03E380785EE7C24 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1731D6708BFE3DE7B101CE74 /* object.cpp */; }; + 23A7AF68A03E380785EE7C25 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1731D6708BFE3DE7B101CE74 /* object.cpp */; }; + 23E9AF567E873B948EFEA180 /* gauge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 98A7F0605AAC3D28A8C9F253 /* gauge.mm */; }; + 23E9AF567E873B948EFEA181 /* gauge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 98A7F0605AAC3D28A8C9F253 /* gauge.mm */; }; + 242E1D1A9BF331BA918134EC /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 0964797530CF3FE7B8DB6242 /* pngwtran.c */; }; + 242E1D1A9BF331BA918134ED /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 0964797530CF3FE7B8DB6242 /* pngwtran.c */; }; + 246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */; }; + 246B4FF96BA135258FE45F50 /* encconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */; }; + 2480859662ED399799E120A5 /* pen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA819575B5136B09FA8FEB1 /* pen.cpp */; }; + 2480859662ED399799E120A6 /* pen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA819575B5136B09FA8FEB1 /* pen.cpp */; }; + 249C9177B1A33EFEAB30F93F /* tipwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */; }; + 249C9177B1A33EFEAB30F940 /* tipwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */; }; + 24A5A71C79733E9CB913C5B7 /* LexPB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8744F2C80ECF375999195935 /* LexPB.cxx */; }; + 24A5A71C79733E9CB913C5B8 /* LexPB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8744F2C80ECF375999195935 /* LexPB.cxx */; }; + 2563C775427E3D68BD384F2F /* richtextstyles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D30617843F33310089C1F77A /* richtextstyles.cpp */; }; + 2563C775427E3D68BD384F30 /* richtextstyles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D30617843F33310089C1F77A /* richtextstyles.cpp */; }; + 25656617A56D342AA3D1BFE2 /* ctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */; }; + 25656617A56D342AA3D1BFE3 /* ctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */; }; + 25C5C1713C0B39AC8EB6A38E /* taskbar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2A4D36DE66EC3EB09E883D6B /* taskbar.mm */; }; + 25C5C1713C0B39AC8EB6A38F /* taskbar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2A4D36DE66EC3EB09E883D6B /* taskbar.mm */; }; + 26649553E4763EE6BA268B7D /* xh_gdctl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */; }; + 26649553E4763EE6BA268B7E /* xh_gdctl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */; }; + 268DDC88C99A3A64AB8B2FFA /* LexCaml.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */; }; + 268DDC88C99A3A64AB8B2FFB /* LexCaml.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */; }; + 26BB10834DA1388881BDD1EC /* propgrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B98B72B3A0A73044B85AED60 /* propgrid.cpp */; }; + 26BB10834DA1388881BDD1ED /* propgrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B98B72B3A0A73044B85AED60 /* propgrid.cpp */; }; + 26E4813A97DE323E88119163 /* xh_choicbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */; }; + 26E4813A97DE323E88119164 /* xh_choicbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */; }; + 27759C2FBB0E35FDA847B2B5 /* LexForth.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B181F564935730E89AB00D92 /* LexForth.cxx */; }; + 27759C2FBB0E35FDA847B2B6 /* LexForth.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B181F564935730E89AB00D92 /* LexForth.cxx */; }; + 27E2EABB117334CD89CFD2A4 /* mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B568A7364ECA30288820CCE7 /* mdi.cpp */; }; + 27E2EABB117334CD89CFD2A5 /* mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B568A7364ECA30288820CCE7 /* mdi.cpp */; }; + 27E73CA5C35A30CE89946ECA /* slider_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D215A0D67563350CB4EECB06 /* slider_osx.cpp */; }; + 27E73CA5C35A30CE89946ECB /* slider_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D215A0D67563350CB4EECB06 /* slider_osx.cpp */; }; + 283C3ABE42433244983C27C1 /* stattext_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */; }; + 283C3ABE42433244983C27C2 /* stattext_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */; }; + 28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 72869747E68E37998CB0A07E /* jdhuff.c */; }; + 28ADE8D385A53445A5451F24 /* jdhuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 72869747E68E37998CB0A07E /* jdhuff.c */; }; + 2939CA3680A13E39AB88CB05 /* spinctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */; }; + 2939CA3680A13E39AB88CB06 /* spinctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */; }; + 296692A7A3783E3A83D005C6 /* brush.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 302A13BC64C238A297F4399F /* brush.cpp */; }; + 296692A7A3783E3A83D005C7 /* brush.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 302A13BC64C238A297F4399F /* brush.cpp */; }; + 2989056891153968B372EA14 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 45D7558DF5E03A2EB41883F0 /* pngwutil.c */; }; + 2989056891153968B372EA15 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 45D7558DF5E03A2EB41883F0 /* pngwutil.c */; }; + 2A7640E4210334AC93366900 /* winpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FCA75FE592C3469AE351FBF /* winpars.cpp */; }; + 2A7640E4210334AC93366901 /* winpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FCA75FE592C3469AE351FBF /* winpars.cpp */; }; + 2A79B68D20FE3C9B98A15534 /* menu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D799486AD7F336BB1F33DDC /* menu.mm */; }; + 2A79B68D20FE3C9B98A15535 /* menu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D799486AD7F336BB1F33DDC /* menu.mm */; }; + 2B13BFC894C63373B7ACFA3D /* xh_hyperlink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */; }; + 2B13BFC894C63373B7ACFA3E /* xh_hyperlink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */; }; + 2B4507BC09563DB5B0F16596 /* tooltip.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31EFBD7D10003A5187348B35 /* tooltip.mm */; }; + 2B4507BC09563DB5B0F16597 /* tooltip.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31EFBD7D10003A5187348B35 /* tooltip.mm */; }; + 2C53221A318E37529E6460EB /* tif_fax3sm.c in Sources */ = {isa = PBXBuildFile; fileRef = BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */; }; + 2C53221A318E37529E6460EC /* tif_fax3sm.c in Sources */ = {isa = PBXBuildFile; fileRef = BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */; }; + 2C95DFA8EE463487956B4EB4 /* infobar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */; }; + 2C95DFA8EE463487956B4EB5 /* infobar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */; }; + 2CAD4DF9505F36E4A2EAD53D /* helpdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C466F32CCBD13DBC87285B3D /* helpdata.cpp */; }; + 2CAD4DF9505F36E4A2EAD53E /* helpdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C466F32CCBD13DBC87285B3D /* helpdata.cpp */; }; + 2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */; }; + 2CCC30C0162131DBBE9D8028 /* dobjcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */; }; + 2D4D105CA9BE3FA6995A5FFF /* tif_dumpmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */; }; + 2D4D105CA9BE3FA6995A6000 /* tif_dumpmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */; }; + 2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1EE17722EA937E88A7F0C01 /* dcbase.cpp */; }; + 2D60F289103837EA8925E3F2 /* dcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1EE17722EA937E88A7F0C01 /* dcbase.cpp */; }; + 2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; }; + 2DF74933A90E34129F1BEF73 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; }; + 2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; }; + 2E4747E0736B30569ACD5423 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; }; + 2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; }; + 2E8440A2BDD53BE7B01547C3 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; }; + 2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */; }; + 2E930206397C3EDCBD8206FD /* gridctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */; }; + 2EECB3C2F9523D0B95847A7F /* accel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C78A1539462370CAA429508 /* accel.cpp */; }; + 2EECB3C2F9523D0B95847A80 /* accel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C78A1539462370CAA429508 /* accel.cpp */; }; + 2F35A207C3993DE08E4FE0B0 /* timerunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */; }; + 2F35A207C3993DE08E4FE0B1 /* timerunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */; }; + 2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 496674699F173A5385EAFF07 /* calctrlg.cpp */; }; + 2F50DBC14FE538A49823925B /* calctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 496674699F173A5385EAFF07 /* calctrlg.cpp */; }; + 2F7F5B9BBCD83D90B237A1A0 /* markupparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA7F7633279936EFA0B9C5CF /* markupparser.cpp */; }; + 2F7F5B9BBCD83D90B237A1A1 /* markupparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA7F7633279936EFA0B9C5CF /* markupparser.cpp */; }; + 2FA1A8FE3644325ABAD273A4 /* fmapbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BBBFE664736D5978420C6 /* fmapbase.cpp */; }; + 2FA1A8FE3644325ABAD273A5 /* fmapbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BBBFE664736D5978420C6 /* fmapbase.cpp */; }; + 2FAE979E6FE23D088C768B7D /* gridcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */; }; + 2FAE979E6FE23D088C768B7E /* gridcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */; }; + 30493B486DFF35AF80D12C49 /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */; }; + 30493B486DFF35AF80D12C4A /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */; }; + 30509A33ED9C35D4ADEF6BBC /* KeyWords.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */; }; + 30509A33ED9C35D4ADEF6BBD /* KeyWords.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */; }; + 309C0A78D45C3AB7B8778B59 /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 5E463A493FD930DE80E58608 /* pngset.c */; }; + 309C0A78D45C3AB7B8778B5A /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 5E463A493FD930DE80E58608 /* pngset.c */; }; + 30AEDF41EC5C374DBF96EFFB /* slider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9B862D1027C4367BBF44420F /* slider.mm */; }; + 30AEDF41EC5C374DBF96EFFC /* slider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9B862D1027C4367BBF44420F /* slider.mm */; }; + 311840186794346AAAA42091 /* jutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */; }; + 311840186794346AAAA42092 /* jutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */; }; + 31380AD4F5BD38A6B9212FE0 /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7255468B6D5F3D8697994A53 /* LexR.cxx */; }; + 31380AD4F5BD38A6B9212FE1 /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7255468B6D5F3D8697994A53 /* LexR.cxx */; }; + 3141FEDED0943BD6A2EF858F /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA93D41B11683E758D456531 /* log.cpp */; }; + 3141FEDED0943BD6A2EF8590 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA93D41B11683E758D456531 /* log.cpp */; }; + 319EA32592DA3C74B86DDDFF /* wxcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23FC98E2305230E2990471E3 /* wxcrt.cpp */; }; + 319EA32592DA3C74B86DDE00 /* wxcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23FC98E2305230E2990471E3 /* wxcrt.cpp */; }; + 319FB8E64CE731D6A58AD301 /* clntdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C904B4BA8273355869812B2 /* clntdata.cpp */; }; + 319FB8E64CE731D6A58AD302 /* clntdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C904B4BA8273355869812B2 /* clntdata.cpp */; }; + 31DD19A942283FA8810B6382 /* numformatter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */; }; + 31DD19A942283FA8810B6383 /* numformatter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */; }; + 31FEAB56919D372993CAD89C /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = A06AB1974DB93EE2999EC75C /* pngrio.c */; }; + 31FEAB56919D372993CAD89D /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = A06AB1974DB93EE2999EC75C /* pngrio.c */; }; + 32486A808EBC3E088598D51C /* jcprepct.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FE0455EBDC63D82B2D88587 /* jcprepct.c */; }; + 32486A808EBC3E088598D51D /* jcprepct.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FE0455EBDC63D82B2D88587 /* jcprepct.c */; }; + 32FECED7A7633C4D8C1BFBB3 /* toolbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24DF23D67E693D999B875101 /* toolbkg.cpp */; }; + 32FECED7A7633C4D8C1BFBB4 /* toolbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24DF23D67E693D999B875101 /* toolbkg.cpp */; }; + 3357BD0518F538E9A949F886 /* xh_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */; }; + 3357BD0518F538E9A949F887 /* xh_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */; }; + 335DD610974A33D4B6581E2A /* colourdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */; }; + 335DD610974A33D4B6581E2B /* colourdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */; }; + 3399AB7BB1333B5AAF5FAF55 /* wrapsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */; }; + 3399AB7BB1333B5AAF5FAF56 /* wrapsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */; }; + 33BA7D6B9DC3378B820DEB87 /* notebook.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0E8036758CEC3296B555E4DF /* notebook.mm */; }; + 33BA7D6B9DC3378B820DEB88 /* notebook.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0E8036758CEC3296B555E4DF /* notebook.mm */; }; + 33ED014A7FF7398794E6E4CF /* xh_split.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */; }; + 33ED014A7FF7398794E6E4D0 /* xh_split.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */; }; + 346D274E17673A01B0177D5B /* sockunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7661E9E09A397790ED9545 /* sockunix.cpp */; }; + 346D274E17673A01B0177D5C /* sockunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7661E9E09A397790ED9545 /* sockunix.cpp */; }; + 353B584AD0C03919A57A3048 /* affinematrix2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD09A813E10A31C19554B425 /* affinematrix2d.cpp */; }; + 353B584AD0C03919A57A3049 /* affinematrix2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD09A813E10A31C19554B425 /* affinematrix2d.cpp */; }; + 3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */; }; + 3554C88010CE3D2A8970A136 /* sashwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */; }; + 369BCCFF61D13A058D837835 /* LexPerl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */; }; + 369BCCFF61D13A058D837836 /* LexPerl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */; }; + 36B0B923B836358D9DB0AE10 /* xh_panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */; }; + 36B0B923B836358D9DB0AE11 /* xh_panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */; }; + 36DB80FD5B153E9099DB6912 /* imaggif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */; }; + 36DB80FD5B153E9099DB6913 /* imaggif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */; }; + 36EB5D19429D3BD1A01001D5 /* framemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26632A254717372BAA4D514D /* framemanager.cpp */; }; + 36EB5D19429D3BD1A01001D6 /* framemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26632A254717372BAA4D514D /* framemanager.cpp */; }; + 371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36E1DBA275AD325DB759C180 /* fontenum.cpp */; }; + 371809DA4AD1382F8B532879 /* fontenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36E1DBA275AD325DB759C180 /* fontenum.cpp */; }; + 37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */; }; + 37715483D08335B790FFE059 /* filectrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */; }; + 37749AC3468836FC857BD0D5 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; }; + 37749AC3468836FC857BD0D6 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; }; + 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; + 37DD17F479A1371ABF3589BA /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; + 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; + 383A6993E90936D39A5F12BE /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; + 39CC380F801F3EE984523275 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; }; + 39CC380F801F3EE984523276 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; }; + 39D6435B10073B85A499AFD8 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */; }; + 39D6435B10073B85A499AFD9 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */; }; + 39FB197CF9EB3D76BE0723CF /* LexBash.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 78D7866F95C73A28BB540606 /* LexBash.cxx */; }; + 39FB197CF9EB3D76BE0723D0 /* LexBash.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 78D7866F95C73A28BB540606 /* LexBash.cxx */; }; + 3ACCC2EB8E973C11835EB597 /* bmpbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */; }; + 3ACCC2EB8E973C11835EB598 /* bmpbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */; }; + 3B7E035ECF3D3FFB9827AC1C /* xh_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06B4A895955B32258DCD62BF /* xh_dlg.cpp */; }; + 3B7E035ECF3D3FFB9827AC1D /* xh_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06B4A895955B32258DCD62BF /* xh_dlg.cpp */; }; + 3B8A54D5E5A53607A6F7979A /* arrstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57CF60203F53459A03951A9 /* arrstr.cpp */; }; + 3B8A54D5E5A53607A6F7979B /* arrstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57CF60203F53459A03951A9 /* arrstr.cpp */; }; + 3C0EB1DDA5243E31B2D92CE2 /* jquant2.c in Sources */ = {isa = PBXBuildFile; fileRef = 02D9332D5C5632E981936E29 /* jquant2.c */; }; + 3C0EB1DDA5243E31B2D92CE3 /* jquant2.c in Sources */ = {isa = PBXBuildFile; fileRef = 02D9332D5C5632E981936E29 /* jquant2.c */; }; + 3C36437B2E933F83984D431E /* imagtiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */; }; + 3C36437B2E933F83984D431F /* imagtiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */; }; + 3C394FBD47B6310C80577E3B /* LexMMIXAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */; }; + 3C394FBD47B6310C80577E3C /* LexMMIXAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */; }; + 3C5E1A45A57B3169A4C073D9 /* LexVerilog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */; }; + 3C5E1A45A57B3169A4C073DA /* LexVerilog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */; }; + 3CDE2B6BF88D326189F069BD /* accelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A436B55DC44E3827A757A6D8 /* accelcmn.cpp */; }; + 3CDE2B6BF88D326189F069BE /* accelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A436B55DC44E3827A757A6D8 /* accelcmn.cpp */; }; + 3D22FC202D903007AEE3D164 /* fdiounix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */; }; + 3D22FC202D903007AEE3D165 /* fdiounix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */; }; + 3D3EA1BAAD1833B1B48E9C86 /* xh_stbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */; }; + 3D3EA1BAAD1833B1B48E9C87 /* xh_stbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */; }; + 3D424F4B33653A00AE9B623A /* m_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 082CA018FB883999839C1DCE /* m_tables.cpp */; }; + 3D424F4B33653A00AE9B623B /* m_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 082CA018FB883999839C1DCE /* m_tables.cpp */; }; + 3D762A0BBF1B39B88A769632 /* helpwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */; }; + 3D762A0BBF1B39B88A769633 /* helpwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */; }; + 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */; }; + 3E6AA08E72A030D39D867D4C /* ScintillaWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */; }; + 3E99016BDE043A08B4D6B3CE /* htmprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 194ADD28300E329E80F7892E /* htmprint.cpp */; }; + 3E99016BDE043A08B4D6B3CF /* htmprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 194ADD28300E329E80F7892E /* htmprint.cpp */; }; + 3EB6B8528A0D3B6CADAE1256 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02D2E8B5C89939CE90B99E2B /* archive.cpp */; }; + 3EB6B8528A0D3B6CADAE1257 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02D2E8B5C89939CE90B99E2B /* archive.cpp */; }; + 3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */; }; + 3ED6F4B64C283232A79423D0 /* dircmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */; }; + 403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7332A03D93D3DABB050615D /* dir.cpp */; }; + 403FBA20CEFE3EAFB4E6B906 /* dir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7332A03D93D3DABB050615D /* dir.cpp */; }; + 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; + 4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; + 41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; + 41943A8F82723027A151A469 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; + 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; + 4269B85FDC5639BEB76A8AEC /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; + 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; + 4279D39CAAF834F6A5B99197 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; + 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; + 427E6AF88CF73D799206E37E /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; + 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; + 42ED9BAFD6E936849F1D36CC /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; + 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; }; + 437519A6002A3A0FB2C9A8FD /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; }; + 438EAEA4B30C325C827F6197 /* xh_fontpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */; }; + 438EAEA4B30C325C827F6198 /* xh_fontpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */; }; + 447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; }; + 447FEC72F3C234378CE28DE8 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; }; + 45AB45C6B24A3983B22E56A5 /* dataobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 271B4B77622B3411A7BF6634 /* dataobj.cpp */; }; + 45AB45C6B24A3983B22E56A6 /* dataobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 271B4B77622B3411A7BF6634 /* dataobj.cpp */; }; + 45D88A74B3EE3837B9F79595 /* LexFlagship.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */; }; + 45D88A74B3EE3837B9F79596 /* LexFlagship.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */; }; + 45FE206BBAD13DDCA1EA41CF /* treebase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BA6ADD758693BD180D3275B /* treebase.cpp */; }; + 45FE206BBAD13DDCA1EA41D0 /* treebase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BA6ADD758693BD180D3275B /* treebase.cpp */; }; + 4657479AF35533AEB7876676 /* helpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBB30516233A39BE809405AA /* helpbase.cpp */; }; + 4657479AF35533AEB7876677 /* helpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBB30516233A39BE809405AA /* helpbase.cpp */; }; + 4657E7382E9E3EDC8DE2401E /* mimetype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C97C1F26B5A38C49543060C /* mimetype.cpp */; }; + 4657E7382E9E3EDC8DE2401F /* mimetype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C97C1F26B5A38C49543060C /* mimetype.cpp */; }; + 4666CDC48BA9301EA283BFFF /* choice_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */; }; + 4666CDC48BA9301EA283C000 /* choice_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */; }; + 46A4CCF128FC3EB092074DC5 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58E1F571B01F34D4AB70CA18 /* property.cpp */; }; + 46A4CCF128FC3EB092074DC6 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58E1F571B01F34D4AB70CA18 /* property.cpp */; }; + 46CE8B53D2663927AAE5DF9D /* xh_treebk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */; }; + 46CE8B53D2663927AAE5DF9E /* xh_treebk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */; }; + 46E331300D8F349DB36AB50A /* imagpnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC12B97F233B3B9494DA217F /* imagpnm.cpp */; }; + 46E331300D8F349DB36AB50B /* imagpnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC12B97F233B3B9494DA217F /* imagpnm.cpp */; }; + 46F341B46F80376B962759F5 /* animateg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 580AFC66F3003582B43043B1 /* animateg.cpp */; }; + 46F341B46F80376B962759F6 /* animateg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 580AFC66F3003582B43043B1 /* animateg.cpp */; }; + 4788F736CD9C324E8A3DFA74 /* LexEScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */; }; + 4788F736CD9C324E8A3DFA75 /* LexEScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */; }; + 47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E24C6F2A04E30EB95598305 /* chm.cpp */; }; + 47EBBB18BDB539C2A948C712 /* chm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E24C6F2A04E30EB95598305 /* chm.cpp */; }; + 47F4FC8717AF3A848812DFCC /* xh_radbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */; }; + 47F4FC8717AF3A848812DFCD /* xh_radbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */; }; + 48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = A0DCC5EF59143640BE13AD73 /* jidctfst.c */; }; + 48A1F28E04603A68A1E70319 /* jidctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = A0DCC5EF59143640BE13AD73 /* jidctfst.c */; }; + 49260580A7F23B569A827D3F /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58421C141C9E31C6A7A3C183 /* filefn.cpp */; }; + 49260580A7F23B569A827D40 /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58421C141C9E31C6A7A3C183 /* filefn.cpp */; }; + 4958BD2E717A3F03AB030188 /* tbarbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F32C01D122301AB00D06A5 /* tbarbase.cpp */; }; + 4958BD2E717A3F03AB030189 /* tbarbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F32C01D122301AB00D06A5 /* tbarbase.cpp */; }; + 49BEDFBC3661339D90EF6935 /* LexTCL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */; }; + 49BEDFBC3661339D90EF6936 /* LexTCL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */; }; + 49C873EE448C3CD9A32012CD /* spinctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */; }; + 49C873EE448C3CD9A32012CE /* spinctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */; }; + 49FE0228D8FD3F7AB64A4432 /* bmpbuttn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */; }; + 49FE0228D8FD3F7AB64A4433 /* bmpbuttn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */; }; + 4AEC67BF65B039D99F421666 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; }; + 4AEC67BF65B039D99F421667 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; }; + 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; + 4B88254FF9963833A276A64D /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; + 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; + 4BAFAE70A6B1313B96D86631 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; + 4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; }; + 4C9BA36123E43589956864C7 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; }; + 4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; }; + 4CB3626391CE34D4B1F71AA1 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; }; + 4CF9BA40653C3153805D88AB /* arcfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C513377E9E303F778BA9D7ED /* arcfind.cpp */; }; + 4CF9BA40653C3153805D88AC /* arcfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C513377E9E303F778BA9D7ED /* arcfind.cpp */; }; + 4CFB7E6E5BD53E2BB39BEF63 /* m_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EB95BCFA255323183A996C9 /* m_style.cpp */; }; + 4CFB7E6E5BD53E2BB39BEF64 /* m_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EB95BCFA255323183A996C9 /* m_style.cpp */; }; + 4D0BA8B9F72C3C31BC170CE2 /* progdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */; }; + 4D0BA8B9F72C3C31BC170CE3 /* progdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */; }; + 4DA209AEF4AD32AAB97F9718 /* htmlcell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E5188DB6003C35A8C7754D /* htmlcell.cpp */; }; + 4DA209AEF4AD32AAB97F9719 /* htmlcell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E5188DB6003C35A8C7754D /* htmlcell.cpp */; }; + 4DD98A9436C83CF3B9425A78 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; }; + 4DD98A9436C83CF3B9425A79 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; }; + 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; + 4E140367282F38C8A904A005 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; + 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; + 4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; + 50D7E093424138C88BB50D27 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; }; + 50D7E093424138C88BB50D28 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; }; + 5116CE330E333724A66982E3 /* rearrangectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */; }; + 5116CE330E333724A66982E4 /* rearrangectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */; }; + 51437DC2AD7B3BEB9A53CE1A /* cmdline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE1C531185131A89EFF7FAF /* cmdline.cpp */; }; + 51437DC2AD7B3BEB9A53CE1B /* cmdline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE1C531185131A89EFF7FAF /* cmdline.cpp */; }; + 51D133EC44F830588FEEAEC0 /* LexHaskell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */; }; + 51D133EC44F830588FEEAEC1 /* LexHaskell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */; }; + 522E6CF2A62F34259BCE2DE2 /* tif_flush.c in Sources */ = {isa = PBXBuildFile; fileRef = 305614D19CF23CB2B14A5B2E /* tif_flush.c */; }; + 522E6CF2A62F34259BCE2DE3 /* tif_flush.c in Sources */ = {isa = PBXBuildFile; fileRef = 305614D19CF23CB2B14A5B2E /* tif_flush.c */; }; + 523FB2A8435A3324A8E1B370 /* PerLine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9389DAF8B91030B7AAB029FF /* PerLine.cxx */; }; + 523FB2A8435A3324A8E1B371 /* PerLine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9389DAF8B91030B7AAB029FF /* PerLine.cxx */; }; + 527054445A0D3A00A5C2EC44 /* tif_thunder.c in Sources */ = {isa = PBXBuildFile; fileRef = 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */; }; + 527054445A0D3A00A5C2EC45 /* tif_thunder.c in Sources */ = {isa = PBXBuildFile; fileRef = 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */; }; + 52C0984A2A4F31BC885519B0 /* xtistrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */; }; + 52C0984A2A4F31BC885519B1 /* xtistrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */; }; + 5303FA25D0773FAEB963D8E3 /* scrolbar.mm in Sources */ = {isa = PBXBuildFile; fileRef = CC2E24773D853A77B9FEFA4C /* scrolbar.mm */; }; + 5303FA25D0773FAEB963D8E4 /* scrolbar.mm in Sources */ = {isa = PBXBuildFile; fileRef = CC2E24773D853A77B9FEFA4C /* scrolbar.mm */; }; + 5388468A6F8F3141B25CD400 /* treebkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7925E38823563BCDB5565DCF /* treebkg.cpp */; }; + 5388468A6F8F3141B25CD401 /* treebkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7925E38823563BCDB5565DCF /* treebkg.cpp */; }; + 539B586AEAD630A79FC12ECF /* sstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F46EC1508C063C8395CE7A95 /* sstream.cpp */; }; + 539B586AEAD630A79FC12ED0 /* sstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F46EC1508C063C8395CE7A95 /* sstream.cpp */; }; + 5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; }; + 5417332FE2DB3CD3A647B15E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; }; + 54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; }; + 54A89D04FF953D55AE8DCCF1 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; }; + 551BF168445E3D7BB54D0174 /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EDB48813110636DBA045BF3A /* LexPS.cxx */; }; + 551BF168445E3D7BB54D0175 /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EDB48813110636DBA045BF3A /* LexPS.cxx */; }; + 552708E6296D33EBB5F6A493 /* tif_swab.c in Sources */ = {isa = PBXBuildFile; fileRef = AAC12B4456E13F57BEA25A5E /* tif_swab.c */; }; + 552708E6296D33EBB5F6A494 /* tif_swab.c in Sources */ = {isa = PBXBuildFile; fileRef = AAC12B4456E13F57BEA25A5E /* tif_swab.c */; }; + 5557AA36FBCC3ED9A5F5751A /* editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D90D14874FD38079835AF0B /* editlbox.cpp */; }; + 5557AA36FBCC3ED9A5F5751B /* editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D90D14874FD38079835AF0B /* editlbox.cpp */; }; + 55D893FDD00633FEA82ABD81 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */; }; + 55D893FDD00633FEA82ABD82 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */; }; + 55F01295F1D23805BCA12F15 /* srchctrl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 14EF4B028AD63B4A885D29A1 /* srchctrl.mm */; }; + 55F01295F1D23805BCA12F16 /* srchctrl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 14EF4B028AD63B4A885D29A1 /* srchctrl.mm */; }; + 55F0D287F60F3EDEA16CCB64 /* stringimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5357E76650035639844D15B /* stringimpl.cpp */; }; + 55F0D287F60F3EDEA16CCB65 /* stringimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5357E76650035639844D15B /* stringimpl.cpp */; }; + 567A32722BA33AEE9FF93D7C /* fs_inet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B7581D7140293BAE88E43DBE /* fs_inet.cpp */; }; + 567A32722BA33AEE9FF93D7D /* fs_inet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B7581D7140293BAE88E43DBE /* fs_inet.cpp */; }; + 5700B7F9166A37FDAA72E9DB /* dnd.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E53493CB84A30AE8C1CD721 /* dnd.mm */; }; + 5700B7F9166A37FDAA72E9DC /* dnd.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E53493CB84A30AE8C1CD721 /* dnd.mm */; }; + 570FA90F526E3F25A8E8FCF2 /* tif_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 64B25B87203E3464BCDD277D /* tif_read.c */; }; + 570FA90F526E3F25A8E8FCF3 /* tif_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 64B25B87203E3464BCDD277D /* tif_read.c */; }; + 5792675690843C6AA4125A72 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77F5E7BCD9B2307D8DBCC052 /* font.cpp */; }; + 5792675690843C6AA4125A73 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77F5E7BCD9B2307D8DBCC052 /* font.cpp */; }; + 57AE7FCF768F3965BD39B47A /* m_span.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727F25F832AD32D4B12D8E39 /* m_span.cpp */; }; + 57AE7FCF768F3965BD39B47B /* m_span.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727F25F832AD32D4B12D8E39 /* m_span.cpp */; }; + 58AABAD40AA236438347DDDE /* evtloop.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8D2549709E0133C9A267E3A5 /* evtloop.mm */; }; + 58AABAD40AA236438347DDDF /* evtloop.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8D2549709E0133C9A267E3A5 /* evtloop.mm */; }; + 595DCB164D55342EB86604EC /* hashmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6636144CDE83E8E85270FAF /* hashmap.cpp */; }; + 595DCB164D55342EB86604ED /* hashmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6636144CDE83E8E85270FAF /* hashmap.cpp */; }; + 59BFB8C8310E37B39AF8B0D4 /* any.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4867546E8B8D3C8683A23ED5 /* any.cpp */; }; + 59BFB8C8310E37B39AF8B0D5 /* any.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4867546E8B8D3C8683A23ED5 /* any.cpp */; }; + 59F995B6E6EE3CA5A4487844 /* glcanvas.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35007225BB683683AA7C5E48 /* glcanvas.mm */; }; + 59F995B6E6EE3CA5A4487845 /* glcanvas.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35007225BB683683AA7C5E48 /* glcanvas.mm */; }; + 5A8638C234133824BDF93BBF /* gbsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */; }; + 5A8638C234133824BDF93BC0 /* gbsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */; }; + 5AEA6E94FB76371D928D371C /* LexMatlab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC9153A350893820B942D37E /* LexMatlab.cxx */; }; + 5AEA6E94FB76371D928D371D /* LexMatlab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC9153A350893820B942D37E /* LexMatlab.cxx */; }; + 5B5B8DF915D438AA9FCEB39E /* imagall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDFB4D208F37569AC548B0 /* imagall.cpp */; }; + 5B5B8DF915D438AA9FCEB39F /* imagall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDFB4D208F37569AC548B0 /* imagall.cpp */; }; + 5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; }; + 5C3B0ED2EA973DFDBFBCC693 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; }; + 5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; }; + 5C44446AB150378696CD6B3D /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; }; + 5DA146A9F7653F53BF5299E8 /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; }; + 5DA146A9F7653F53BF5299E9 /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; }; + 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; + 5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; + 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; }; + 5F57C4908E5038D19D68ED7B /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; }; + 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */; }; + 5F6B4F226B473AACB7AC8DF6 /* xh_slidr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */; }; + 5F78DB0417BF3CE1B4E35C7F /* stackwalk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA2520F427493A22A70A5C09 /* stackwalk.cpp */; }; + 5F78DB0417BF3CE1B4E35C80 /* stackwalk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA2520F427493A22A70A5C09 /* stackwalk.cpp */; }; + 5FE969523BDB3353AEF96810 /* xh_filepicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */; }; + 5FE969523BDB3353AEF96811 /* xh_filepicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */; }; + 603DF49D176737D383CE4F01 /* choice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F838F853CB03CF7932C08C3 /* choice.mm */; }; + 603DF49D176737D383CE4F02 /* choice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F838F853CB03CF7932C08C3 /* choice.mm */; }; + 604ABF86317C3D4F899DBF37 /* richtextsymboldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */; }; + 604ABF86317C3D4F899DBF38 /* richtextsymboldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */; }; + 60706F8836A130A2AF282FE1 /* fontutilcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */; }; + 60706F8836A130A2AF282FE2 /* fontutilcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */; }; + 6138BCBC8E4438FA91E0EF9F /* xh_chckb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */; }; + 6138BCBC8E4438FA91E0EFA0 /* xh_chckb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */; }; + 6167245C417A32179EC37D2D /* textfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0903EE9B3793303285FF96E3 /* textfile.cpp */; }; + 6167245C417A32179EC37D2E /* textfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0903EE9B3793303285FF96E3 /* textfile.cpp */; }; + 61A2B54FD2E33C759CF5A5E8 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 358D0A3AC73F322EA732D020 /* pngrutil.c */; }; + 61A2B54FD2E33C759CF5A5E9 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 358D0A3AC73F322EA732D020 /* pngrutil.c */; }; + 61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E4A10BCD773C84AEC481A1 /* jdmarker.c */; }; + 61C3F7D495FB3E8BA402E4F9 /* jdmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E4A10BCD773C84AEC481A1 /* jdmarker.c */; }; + 61FD5E0E28F732E8AB1729F8 /* xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6AB648BC5173104A96CAE66 /* xml.cpp */; }; + 61FD5E0E28F732E8AB1729F9 /* xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6AB648BC5173104A96CAE66 /* xml.cpp */; }; + 61FEDBF2D47A3B4E861F8296 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACC8667173D3AB09F6214F4 /* sound.cpp */; }; + 61FEDBF2D47A3B4E861F8297 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACC8667173D3AB09F6214F4 /* sound.cpp */; }; + 61FEDBF2D47A3B4E861F8298 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACC8667173D3AB09F6214F5 /* sound.cpp */; }; + 61FEDBF2D47A3B4E861F8299 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACC8667173D3AB09F6214F5 /* sound.cpp */; }; + 62757F24C4EE3B84B6AE3F14 /* textdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D529E2668C23D94A7706C8A /* textdlgg.cpp */; }; + 62757F24C4EE3B84B6AE3F15 /* textdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D529E2668C23D94A7706C8A /* textdlgg.cpp */; }; + 62F1DC80D631335B892610A8 /* splitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C125FA3837C631A9BE0ED5E7 /* splitter.cpp */; }; + 62F1DC80D631335B892610A9 /* splitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C125FA3837C631A9BE0ED5E7 /* splitter.cpp */; }; + 633DD2E870263F42A8DBF9BF /* markuptext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */; }; + 633DD2E870263F42A8DBF9C0 /* markuptext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */; }; + 63F0C8EEDF4B3641878A8B4D /* dlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9051902662BE38B3912B34EA /* dlgcmn.cpp */; }; + 63F0C8EEDF4B3641878A8B4E /* dlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9051902662BE38B3912B34EA /* dlgcmn.cpp */; }; + 63F2517EC6B2334CA825A6F9 /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEB08798C70E33DDB360E563 /* layout.cpp */; }; + 63F2517EC6B2334CA825A6FA /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEB08798C70E33DDB360E563 /* layout.cpp */; }; + 64DD406C453D39FEBBE66ED1 /* tif_pixarlog.c in Sources */ = {isa = PBXBuildFile; fileRef = 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */; }; + 64DD406C453D39FEBBE66ED2 /* tif_pixarlog.c in Sources */ = {isa = PBXBuildFile; fileRef = 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */; }; + 64F11C549E3035DF85691060 /* tif_ojpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */; }; + 64F11C549E3035DF85691061 /* tif_ojpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */; }; + 652CFDD9A1C1366E99B5D6BC /* socketiohandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */; }; + 652CFDD9A1C1366E99B5D6BD /* socketiohandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */; }; + 65514CD6A9F23ED98436AC02 /* ftp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB4781DF8C432C688F30CDD /* ftp.cpp */; }; + 65514CD6A9F23ED98436AC03 /* ftp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB4781DF8C432C688F30CDD /* ftp.cpp */; }; + 65AD3B31319C35F1AC9EC625 /* anybutton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4020D790AE7363CB29F1C2F /* anybutton.mm */; }; + 65AD3B31319C35F1AC9EC626 /* anybutton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4020D790AE7363CB29F1C2F /* anybutton.mm */; }; + 65E8A5F333D7336C816F0D0C /* variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31F4B9B03D52339B8F82C114 /* variant.cpp */; }; + 65E8A5F333D7336C816F0D0D /* variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31F4B9B03D52339B8F82C114 /* variant.cpp */; }; + 65FCDBFFF3F138A3ABBAA650 /* xh_menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */; }; + 65FCDBFFF3F138A3ABBAA651 /* xh_menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */; }; + 664A54F914443110B7BB6928 /* tglbtn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */; }; + 664A54F914443110B7BB6929 /* tglbtn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */; }; + 66584BC871303041BA622DE0 /* m_fonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1F3C70512D93501B0478F3E /* m_fonts.cpp */; }; + 66584BC871303041BA622DE1 /* m_fonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1F3C70512D93501B0478F3E /* m_fonts.cpp */; }; + 66FD099CE5A338C18329FC36 /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD72950967F33809931D4968 /* LexAbaqus.cxx */; }; + 66FD099CE5A338C18329FC37 /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD72950967F33809931D4968 /* LexAbaqus.cxx */; }; + 675B4E6CBA8632E89B4AC26D /* textctrl.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E16323A43E36DC8024EDF1 /* textctrl.mm */; }; + 675B4E6CBA8632E89B4AC26E /* textctrl.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E16323A43E36DC8024EDF1 /* textctrl.mm */; }; + 67A0583ADD8C35B8B9BA3D12 /* checkbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 81708CFA21A03013ACB8DDD7 /* checkbox.mm */; }; + 67A0583ADD8C35B8B9BA3D13 /* checkbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 81708CFA21A03013ACB8DDD7 /* checkbox.mm */; }; + 67EBCE5FA5FF36349ADF0916 /* jdapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */; }; + 67EBCE5FA5FF36349ADF0917 /* jdapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */; }; + 682403FBBD4E3D5E88159501 /* CellBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */; }; + 682403FBBD4E3D5E88159502 /* CellBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */; }; + 6832385DDBB33D1B90C73CBA /* renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */; }; + 6832385DDBB33D1B90C73CBB /* renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */; }; + 68AC8860B0943C1FAF76D96B /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552757A901E732CAA8E3F16D /* list.cpp */; }; + 68AC8860B0943C1FAF76D96C /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552757A901E732CAA8E3F16D /* list.cpp */; }; + 692FCCABFB963696AFC1E122 /* gdiobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */; }; + 692FCCABFB963696AFC1E123 /* gdiobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */; }; + 6944AC98F6F83E3D983DABD3 /* tif_getimage.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */; }; + 6944AC98F6F83E3D983DABD4 /* tif_getimage.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */; }; + 6978D7A20DA93A329DDD1383 /* socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CE02524DD4385AB2C3DF95 /* socket.cpp */; }; + 6978D7A20DA93A329DDD1384 /* socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CE02524DD4385AB2C3DF95 /* socket.cpp */; }; + 699D88EE2DAA3594B6606890 /* ViewStyle.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C133B838193A35ABBB803151 /* ViewStyle.cxx */; }; + 699D88EE2DAA3594B6606891 /* ViewStyle.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C133B838193A35ABBB803151 /* ViewStyle.cxx */; }; + 6A032420671B375D81273714 /* valnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 684D92E552BE313CBE0A88AA /* valnum.cpp */; }; + 6A032420671B375D81273715 /* valnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 684D92E552BE313CBE0A88AA /* valnum.cpp */; }; + 6A081BF19747385CB4C1877F /* radiobut_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */; }; + 6A081BF19747385CB4C18780 /* radiobut_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */; }; + 6A10511265493FA2BB79CE4D /* propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC93D1DE277395592610085 /* propdlg.cpp */; }; + 6A10511265493FA2BB79CE4E /* propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC93D1DE277395592610085 /* propdlg.cpp */; }; + 6AA0EE765330326380989FD1 /* stopwatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */; }; + 6AA0EE765330326380989FD2 /* stopwatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */; }; + 6AC347D2DCC730149A0A83D8 /* button_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF4F4F5211933057824B5621 /* button_osx.cpp */; }; + 6AC347D2DCC730149A0A83D9 /* button_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF4F4F5211933057824B5621 /* button_osx.cpp */; }; + 6B9EEA3CF2E536E3B1ADAC42 /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBED392D081335FA80523244 /* manager.cpp */; }; + 6B9EEA3CF2E536E3B1ADAC43 /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBED392D081335FA80523244 /* manager.cpp */; }; + 6BC8B3EDB3AE3EF4BACFC08A /* ContractionState.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5219A792C6A736F193D4A82F /* ContractionState.cxx */; }; + 6BC8B3EDB3AE3EF4BACFC08B /* ContractionState.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5219A792C6A736F193D4A82F /* ContractionState.cxx */; }; + 6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1197B997B1D139C5AE4D198A /* dseldlg.cpp */; }; + 6BF19C7CA9E93D989C210FE4 /* dseldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1197B997B1D139C5AE4D198A /* dseldlg.cpp */; }; + 6C3A459236F736B8A14A13AC /* dialog.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83B878A16ABC396E8C03A15E /* dialog.mm */; }; + 6C3A459236F736B8A14A13AD /* dialog.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83B878A16ABC396E8C03A15E /* dialog.mm */; }; + 6C46AF0370793AA0B74A5A4A /* tabmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */; }; + 6C46AF0370793AA0B74A5A4B /* tabmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */; }; + 6C7C1CC506CB329FB2D086A9 /* LexBasic.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */; }; + 6C7C1CC506CB329FB2D086AA /* LexBasic.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */; }; + 6C822F7F313734DCB51F44B9 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81A30C745CA73E30B788B408 /* image.cpp */; }; + 6C822F7F313734DCB51F44BA /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81A30C745CA73E30B788B408 /* image.cpp */; }; + 6CA1BAEBBDB4336E9E201F95 /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */; }; + 6CA1BAEBBDB4336E9E201F96 /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */; }; + 6D073876E1753549B5EEFDDA /* tif_compress.c in Sources */ = {isa = PBXBuildFile; fileRef = CA0D5D47D62A3148BA51B31B /* tif_compress.c */; }; + 6D073876E1753549B5EEFDDB /* tif_compress.c in Sources */ = {isa = PBXBuildFile; fileRef = CA0D5D47D62A3148BA51B31B /* tif_compress.c */; }; + 6D723C987BFB39B7B887DCB1 /* Editor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DA5E95D498C53A808A8E2EEB /* Editor.cxx */; }; + 6D723C987BFB39B7B887DCB2 /* Editor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DA5E95D498C53A808A8E2EEB /* Editor.cxx */; }; + 6E1FD7D3DEF03748AEE3A29D /* listbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = D324650313003AAD96E12962 /* listbox.mm */; }; + 6E1FD7D3DEF03748AEE3A29E /* listbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = D324650313003AAD96E12962 /* listbox.mm */; }; + 6E2C2E8AA1713ADE9C338379 /* tif_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 726C0457DF1232C793918DC1 /* tif_zip.c */; }; + 6E2C2E8AA1713ADE9C33837A /* tif_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 726C0457DF1232C793918DC1 /* tif_zip.c */; }; + 6E68759BC2E63CA59C12FDC0 /* popupcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D922063B2F2536629EEEAAF0 /* popupcmn.cpp */; }; + 6E68759BC2E63CA59C12FDC1 /* popupcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D922063B2F2536629EEEAAF0 /* popupcmn.cpp */; }; + 6F0605F3A4E83BF0BF4C8B7E /* cmdproc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */; }; + 6F0605F3A4E83BF0BF4C8B7F /* cmdproc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */; }; + 6F472413FFA03B53B395BB74 /* LexCLW.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7EE2459D69BA35838C274488 /* LexCLW.cxx */; }; + 6F472413FFA03B53B395BB75 /* LexCLW.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7EE2459D69BA35838C274488 /* LexCLW.cxx */; }; + 6F5A0D3C7763334396A3783D /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */; }; + 6F5A0D3C7763334396A3783E /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */; }; + 6F8129E317EE3486A89D8548 /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */; }; + 6F8129E317EE3486A89D8549 /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */; }; + 6FA47EAACE613B039B6EC261 /* containr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3645350F572364BABF50238 /* containr.cpp */; }; + 6FA47EAACE613B039B6EC262 /* containr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3645350F572364BABF50238 /* containr.cpp */; }; + 700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; }; + 700BBDECBE313E108BA99ABE /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; }; + 70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; }; + 70F898F8B129380BBECAC55A /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; }; + 7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F43AF44465B335479752116D /* xh_radbx.cpp */; }; + 7181709A030D3749AB355B75 /* xh_radbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F43AF44465B335479752116D /* xh_radbx.cpp */; }; + 71CCB06E790C3C54BFF1199D /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */; }; + 71CCB06E790C3C54BFF1199E /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */; }; + 729091CC33C73C989B4E0719 /* timerimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0401B7302088357BB6B7F16F /* timerimpl.cpp */; }; + 729091CC33C73C989B4E071A /* timerimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0401B7302088357BB6B7F16F /* timerimpl.cpp */; }; + 72AD4417FF7C3094BB1FF62C /* xh_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B77251C0E0382D9A8E113D /* xh_grid.cpp */; }; + 72AD4417FF7C3094BB1FF62D /* xh_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B77251C0E0382D9A8E113D /* xh_grid.cpp */; }; + 73AA68AB9F1236ED9F1FBB2E /* metafile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2BB2949CC0B387AB6879539 /* metafile.cpp */; }; + 73AA68AB9F1236ED9F1FBB2F /* metafile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2BB2949CC0B387AB6879539 /* metafile.cpp */; }; + 743BB23211B336A6A0F26E57 /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = F83172EE2DAE352FB969D4F2 /* jcapistd.c */; }; + 743BB23211B336A6A0F26E58 /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = F83172EE2DAE352FB969D4F2 /* jcapistd.c */; }; + 745C39E90E8C3C08A887B51C /* msgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */; }; + 745C39E90E8C3C08A887B51D /* msgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */; }; + 7569F0BC3C603EB19168088F /* collpaneg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84758329F2163F00A9C005DF /* collpaneg.cpp */; }; + 7569F0BC3C603EB191680890 /* collpaneg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84758329F2163F00A9C005DF /* collpaneg.cpp */; }; + 758629DA468A3EF7B1C15241 /* gifdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */; }; + 758629DA468A3EF7B1C15242 /* gifdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */; }; + 75DCE6FF00E93C5D93970842 /* arttango.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9988CBB0772A3539970162FA /* arttango.cpp */; }; + 75DCE6FF00E93C5D93970843 /* arttango.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9988CBB0772A3539970162FA /* arttango.cpp */; }; + 760C729E41D93CC1AA2B4E0D /* hyperlinkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */; }; + 760C729E41D93CC1AA2B4E0E /* hyperlinkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */; }; + 7625D908B2CD34C78243BA8F /* settcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */; }; + 7625D908B2CD34C78243BA90 /* settcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */; }; + 768716016CE7310BB1AD7567 /* regexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 1482A34AC32133E4BE207223 /* regexec.c */; }; + 768716016CE7310BB1AD7568 /* regexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 1482A34AC32133E4BE207223 /* regexec.c */; }; + 76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */ = {isa = PBXBuildFile; fileRef = 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */; }; + 76A83A293C9F33BCB7DFDE27 /* jdatadst.c in Sources */ = {isa = PBXBuildFile; fileRef = 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */; }; + 76D1A1A49CC831FFB9EBB1F5 /* LexOpal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */; }; + 76D1A1A49CC831FFB9EBB1F6 /* LexOpal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */; }; + 774A89998E09308CBFB03EE0 /* imagxpm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C85865D28DC31649440A921 /* imagxpm.cpp */; }; + 774A89998E09308CBFB03EE1 /* imagxpm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C85865D28DC31649440A921 /* imagxpm.cpp */; }; + 774EB9F3F7E93A379E1F7551 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4762898E5330C28651EE73 /* graphics.cpp */; }; + 774EB9F3F7E93A379E1F7552 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4762898E5330C28651EE73 /* graphics.cpp */; }; + 779D3480141B3683A6D132BE /* tif_lzw.c in Sources */ = {isa = PBXBuildFile; fileRef = 346C68F0CCD23823B78267F0 /* tif_lzw.c */; }; + 779D3480141B3683A6D132BF /* tif_lzw.c in Sources */ = {isa = PBXBuildFile; fileRef = 346C68F0CCD23823B78267F0 /* tif_lzw.c */; }; + 77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */; }; + 77BC918AF05C30E8A0BD27F9 /* tipdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */; }; + 784F7C50882F320FA76537B5 /* LexAU3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C76222F466E831F896A89269 /* LexAU3.cxx */; }; + 784F7C50882F320FA76537B6 /* LexAU3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C76222F466E831F896A89269 /* LexAU3.cxx */; }; + 78E15D8200F635529F396099 /* LexBullant.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 6718204F4700318E89EAC906 /* LexBullant.cxx */; }; + 78E15D8200F635529F39609A /* LexBullant.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 6718204F4700318E89EAC906 /* LexBullant.cxx */; }; + 793F542F20AB31F6AF736795 /* tif_open.c in Sources */ = {isa = PBXBuildFile; fileRef = 1731A6096BFC3A468AB4755A /* tif_open.c */; }; + 793F542F20AB31F6AF736796 /* tif_open.c in Sources */ = {isa = PBXBuildFile; fileRef = 1731A6096BFC3A468AB4755A /* tif_open.c */; }; + 795613831EC8332A83FF26E7 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7E99B35A98D30818120B002 /* string.cpp */; }; + 795613831EC8332A83FF26E8 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7E99B35A98D30818120B002 /* string.cpp */; }; + 795B9B15279D36F8899C9CA8 /* PropSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */; }; + 795B9B15279D36F8899C9CA9 /* PropSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */; }; + 796311E398FF313C84218824 /* uiactioncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */; }; + 796311E398FF313C84218825 /* uiactioncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */; }; + 7A7439BE66AA3771B4A89048 /* regex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB46BC22F6B23909A938C561 /* regex.cpp */; }; + 7A7439BE66AA3771B4A89049 /* regex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB46BC22F6B23909A938C561 /* regex.cpp */; }; + 7A79D9AC608E3B8287229174 /* tif_warning.c in Sources */ = {isa = PBXBuildFile; fileRef = C83C97A1FCC5345896C9D7DE /* tif_warning.c */; }; + 7A79D9AC608E3B8287229175 /* tif_warning.c in Sources */ = {isa = PBXBuildFile; fileRef = C83C97A1FCC5345896C9D7DE /* tif_warning.c */; }; + 7A84B9471A3238B4B66B1776 /* nbkbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B901252876603DCEA4C66D89 /* nbkbase.cpp */; }; + 7A84B9471A3238B4B66B1777 /* nbkbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B901252876603DCEA4C66D89 /* nbkbase.cpp */; }; + 7B372FEA276438C186F7E340 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */; }; + 7B372FEA276438C186F7E341 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */; }; + 7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */; }; + 7B4DA2F5F25B3E188CBAFE39 /* hyperlnkcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */; }; + 7B642B17F5D23F4F8ED38BB4 /* graphcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB59DD194923D6399087A75 /* graphcmn.cpp */; }; + 7B642B17F5D23F4F8ED38BB5 /* graphcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB59DD194923D6399087A75 /* graphcmn.cpp */; }; + 7C20B79175D33852A2E9DE83 /* LexRuby.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8734C52C7559310784396455 /* LexRuby.cxx */; }; + 7C20B79175D33852A2E9DE84 /* LexRuby.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8734C52C7559310784396455 /* LexRuby.cxx */; }; + 7C52E7CC12463941B0E4D402 /* statbmpcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */; }; + 7C52E7CC12463941B0E4D403 /* statbmpcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */; }; + 7C87CC7641033D91823ED688 /* helpfrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */; }; + 7C87CC7641033D91823ED689 /* helpfrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */; }; + 7C9EAFF4A0223EE597E0E39E /* xh_srchctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */; }; + 7C9EAFF4A0223EE597E0E39F /* xh_srchctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */; }; + 7D0E549020D33ED39751DFC8 /* LexTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */; }; + 7D0E549020D33ED39751DFC9 /* LexTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */; }; + 7D615329368D32709CEF4B58 /* headerctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7273A7E255323EB3B391D997 /* headerctrlg.cpp */; }; + 7D615329368D32709CEF4B59 /* headerctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7273A7E255323EB3B391D997 /* headerctrlg.cpp */; }; + 7DC4A542372437ECA0790F87 /* art_msw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B540E18F9C91381CA175BABB /* art_msw.cpp */; }; + 7DC4A542372437ECA0790F88 /* art_msw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B540E18F9C91381CA175BABB /* art_msw.cpp */; }; + 7E6C627A325F32FFB2EF9B9E /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; }; + 7E6C627A325F32FFB2EF9B9F /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; }; + 7ECC6EE6D5273F75BB6B7B74 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; }; + 7ECC6EE6D5273F75BB6B7B75 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; }; + 7EF89F935314301381802FAB /* filectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2334539088B036BEAB230D1C /* filectrlg.cpp */; }; + 7EF89F935314301381802FAC /* filectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2334539088B036BEAB230D1C /* filectrlg.cpp */; }; + 7F77E347E1243D77A666FB43 /* clipbrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */; }; + 7F77E347E1243D77A666FB44 /* clipbrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */; }; + 7FC3D17B3C853FE58841002D /* timercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7195E665E0F233839B967FC9 /* timercmn.cpp */; }; + 7FC3D17B3C853FE58841002E /* timercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7195E665E0F233839B967FC9 /* timercmn.cpp */; }; + 805CCAE64D023561AD334B53 /* popupwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530DC2E26BF2313E8702AD43 /* popupwin.cpp */; }; + 805CCAE64D023561AD334B54 /* popupwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530DC2E26BF2313E8702AD43 /* popupwin.cpp */; }; + 80665EEAE8613DF8A93A7984 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; }; + 80665EEAE8613DF8A93A7985 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; }; + 815AE3FED68330F4933AA16F /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = C94DC3402FAE3C4FA776DEEA /* window.mm */; }; + 815AE3FED68330F4933AA170 /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = C94DC3402FAE3C4FA776DEEA /* window.mm */; }; + 81B742D64BEB373DB705947A /* m_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4028ABB08C63AB59F5F240B /* m_list.cpp */; }; + 81B742D64BEB373DB705947B /* m_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4028ABB08C63AB59F5F240B /* m_list.cpp */; }; + 825EAD51920B387DB4F8C426 /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A46D50BEBF523B3F88831086 /* LexAsn1.cxx */; }; + 825EAD51920B387DB4F8C427 /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A46D50BEBF523B3F88831086 /* LexAsn1.cxx */; }; + 8292D346BFC33D6E8D3CDDBF /* xh_sttxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */; }; + 8292D346BFC33D6E8D3CDDC0 /* xh_sttxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */; }; + 82FA4AA043213728AC266700 /* wizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */; }; + 82FA4AA043213728AC266701 /* wizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */; }; + 834F2ADD0520313FBAC4F927 /* LexCsound.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */; }; + 834F2ADD0520313FBAC4F928 /* LexCsound.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */; }; + 83616D33080E3F0F9FA5FBB4 /* xh_html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889FFA9573A835F280A21CB4 /* xh_html.cpp */; }; + 83616D33080E3F0F9FA5FBB5 /* xh_html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889FFA9573A835F280A21CB4 /* xh_html.cpp */; }; + 83C492B87F4A3A97930F227A /* ExternalLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */; }; + 83C492B87F4A3A97930F227B /* ExternalLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */; }; + 84382E5DB3203A73AC5EE390 /* xh_combo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F0905A1EBD653F6D82395602 /* xh_combo.cpp */; }; + 84382E5DB3203A73AC5EE391 /* xh_combo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F0905A1EBD653F6D82395602 /* xh_combo.cpp */; }; + 84997126352137E798CD258A /* spinctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59572A234F0636D78BFD9F6B /* spinctlg.cpp */; }; + 84997126352137E798CD258B /* spinctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59572A234F0636D78BFD9F6B /* spinctlg.cpp */; }; + 84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */; }; + 84B3625464F732C3A79E1315 /* xh_bmpbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */; }; + 85F9828B80B03178A274BD17 /* selstore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ED2105A5A033E3384EBC4ED /* selstore.cpp */; }; + 85F9828B80B03178A274BD18 /* selstore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ED2105A5A033E3384EBC4ED /* selstore.cpp */; }; + 86003C8EB906304F9025F788 /* jcinit.c in Sources */ = {isa = PBXBuildFile; fileRef = AA6C6739C3BD3EFA9CF71102 /* jcinit.c */; }; + 86003C8EB906304F9025F789 /* jcinit.c in Sources */ = {isa = PBXBuildFile; fileRef = AA6C6739C3BD3EFA9CF71102 /* jcinit.c */; }; + 867F5D1962383C98A8ADDC3D /* xmladv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1E1A01885B036C28EBDAE27 /* xmladv.cpp */; }; + 867F5D1962383C98A8ADDC3E /* xmladv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1E1A01885B036C28EBDAE27 /* xmladv.cpp */; }; + 86AED49CEAFC3637B1F10537 /* dialog_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */; }; + 86AED49CEAFC3637B1F10538 /* dialog_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */; }; + 86BE5213D3F131D8A6862679 /* hid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 160EB9744CB63A0B81DC651F /* hid.cpp */; }; + 86BE5213D3F131D8A686267A /* hid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 160EB9744CB63A0B81DC651F /* hid.cpp */; }; + 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */; }; + 87092C0C817D343DAB77E23F /* xh_scwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */; }; + 87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5F11A3646F397BA62EB037 /* htmllbox.cpp */; }; + 87AA9C5D887B3C31A2AFB49E /* htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5F11A3646F397BA62EB037 /* htmllbox.cpp */; }; + 87C67583D36C3465ACD64103 /* vlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA90128E29A03CCCA30F4D35 /* vlbox.cpp */; }; + 87C67583D36C3465ACD64104 /* vlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA90128E29A03CCCA30F4D35 /* vlbox.cpp */; }; + 88A43B1C5A7438838DE97B94 /* tif_luv.c in Sources */ = {isa = PBXBuildFile; fileRef = 66FDA882451239EA8DF2E0B5 /* tif_luv.c */; }; + 88A43B1C5A7438838DE97B95 /* tif_luv.c in Sources */ = {isa = PBXBuildFile; fileRef = 66FDA882451239EA8DF2E0B5 /* tif_luv.c */; }; + 88E1AE56FD393C8BA5CF8545 /* stringops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F1E724EA70AB35DDB130F84F /* stringops.cpp */; }; + 88E1AE56FD393C8BA5CF8546 /* stringops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F1E724EA70AB35DDB130F84F /* stringops.cpp */; }; + 89046455F49D3D75A21C9DB8 /* imagfill.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 137E01C362E134449BF966ED /* imagfill.cpp */; }; + 89046455F49D3D75A21C9DB9 /* imagfill.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 137E01C362E134449BF966ED /* imagfill.cpp */; }; + 893BDA491EDE3A0E91FADE40 /* nonownedwnd.mm in Sources */ = {isa = PBXBuildFile; fileRef = AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */; }; + 893BDA491EDE3A0E91FADE41 /* nonownedwnd.mm in Sources */ = {isa = PBXBuildFile; fileRef = AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */; }; + 894D43C8F224394FB3171F26 /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */; }; + 894D43C8F224394FB3171F27 /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */; }; + 8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */; }; + 8966F77CC97B3ED780C8F138 /* xh_bmpcbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */; }; + 8A4046BD38873D9CAC9C2B59 /* filesys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F263022F3FEA3F75895B644D /* filesys.cpp */; }; + 8A4046BD38873D9CAC9C2B5A /* filesys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F263022F3FEA3F75895B644D /* filesys.cpp */; }; + 8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */; }; + 8A662992FFCB32E99D11950D /* commandlinkbuttong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */; }; + 8A9C3C04D00334418C3446F9 /* dirdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0B0DC125AFFC322E8E496262 /* dirdlg.mm */; }; + 8A9C3C04D00334418C3446FA /* dirdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0B0DC125AFFC322E8E496262 /* dirdlg.mm */; }; + 8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8836E29C5A370E80CE070E /* splash.cpp */; }; + 8AA341CCFB8E3F6AB3523596 /* splash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8836E29C5A370E80CE070E /* splash.cpp */; }; + 8AB7191F7CB838FC8337C48D /* xh_statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADE850169F7347F83FE1499 /* xh_statbar.cpp */; }; + 8AB7191F7CB838FC8337C48E /* xh_statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADE850169F7347F83FE1499 /* xh_statbar.cpp */; }; + 8B38C6C416BA3A51B37F60C4 /* statlinecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */; }; + 8B38C6C416BA3A51B37F60C5 /* statlinecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */; }; + 8B60964DA1DF3F3DB40BE123 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; }; + 8B60964DA1DF3F3DB40BE124 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; }; + 8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; }; + 8B9C9FCB954F3596A4CED9A6 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; }; + 8C2B50E3FC7A37C58CC9DC0A /* colour.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CC8B73BB8C0391E9EC1B2D1 /* colour.mm */; }; + 8C2B50E3FC7A37C58CC9DC0B /* colour.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CC8B73BB8C0391E9EC1B2D1 /* colour.mm */; }; + 8C52B1985BAA371FA22CCEBB /* combobox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57C06D5DB5F733A4A235B206 /* combobox.mm */; }; + 8C52B1985BAA371FA22CCEBC /* combobox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57C06D5DB5F733A4A235B206 /* combobox.mm */; }; + 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; + 8E674574343A3C009B1BCD01 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; + 8FB5FBC5730C33F1A3D85D9F /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */; }; + 8FB5FBC5730C33F1A3D85DA0 /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */; }; + 8FC1C07FEE793897A1E96D23 /* statbmpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA2119A7C67D37B290C17989 /* statbmpg.cpp */; }; + 8FC1C07FEE793897A1E96D24 /* statbmpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA2119A7C67D37B290C17989 /* statbmpg.cpp */; }; + 8FDC800D873F30E282691832 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 87799D3168B43EB7B5686826 /* pngrtran.c */; }; + 8FDC800D873F30E282691833 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 87799D3168B43EB7B5686826 /* pngrtran.c */; }; + 901F659891613419B8643952 /* calctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */; }; + 901F659891613419B8643953 /* calctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */; }; + 9058997222493A7A859A4D4C /* richtextxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C69E48C06BD23C178F650E42 /* richtextxml.cpp */; }; + 9058997222493A7A859A4D4D /* richtextxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C69E48C06BD23C178F650E42 /* richtextxml.cpp */; }; + 9065A4BE3D0433B88CF45571 /* richtextbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */; }; + 9065A4BE3D0433B88CF45572 /* richtextbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */; }; + 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47FF6D792CA234C395692118 /* PlatWX.cpp */; }; + 908957F65B7E36F8BF3858DE /* PlatWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47FF6D792CA234C395692118 /* PlatWX.cpp */; }; + 90BC965B1A1F35A3B2C9D1C9 /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BF1C44D726E63B18A98006EC /* Decoration.cxx */; }; + 90BC965B1A1F35A3B2C9D1CA /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BF1C44D726E63B18A98006EC /* Decoration.cxx */; }; + 9110ACFC3CFB3C7994E907B0 /* imagiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4A745D1821A32D591D76650 /* imagiff.cpp */; }; + 9110ACFC3CFB3C7994E907B1 /* imagiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4A745D1821A32D591D76650 /* imagiff.cpp */; }; + 912C69ADB1673ACEB0E6CF08 /* tif_strip.c in Sources */ = {isa = PBXBuildFile; fileRef = B83EDE2D1731311ABDE62F9F /* tif_strip.c */; }; + 912C69ADB1673ACEB0E6CF09 /* tif_strip.c in Sources */ = {isa = PBXBuildFile; fileRef = B83EDE2D1731311ABDE62F9F /* tif_strip.c */; }; + 91BC7802C15337CDA84C3742 /* statline_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */; }; + 91BC7802C15337CDA84C3743 /* statline_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */; }; + 91BDA5B04CF33C9AB7358B8A /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F098E47EBF34368ABAE7ED /* timer.cpp */; }; + 91BDA5B04CF33C9AB7358B8B /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F098E47EBF34368ABAE7ED /* timer.cpp */; }; + 91EA325FCE3A3A6A8D1D21A5 /* srchctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */; }; + 91EA325FCE3A3A6A8D1D21A6 /* srchctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */; }; + 923F4797A73A3BDD87BBD1E1 /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AF3DF03795153E039B8F1F87 /* LineMarker.cxx */; }; + 923F4797A73A3BDD87BBD1E2 /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AF3DF03795153E039B8F1F87 /* LineMarker.cxx */; }; + 9241AAE354C53190BF3D5BA3 /* radiobut.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99E5B6DD00273D978C241BCA /* radiobut.mm */; }; + 9241AAE354C53190BF3D5BA4 /* radiobut.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99E5B6DD00273D978C241BCA /* radiobut.mm */; }; + 939E53CA56F33194B4681117 /* glgrab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */; }; + 939E53CA56F33194B4681118 /* glgrab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */; }; + 93E04642049537EB8A37BA26 /* htmlwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */; }; + 93E04642049537EB8A37BA27 /* htmlwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */; }; + 9455B49669853E71BD4FD965 /* richtextformatdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */; }; + 9455B49669853E71BD4FD966 /* richtextformatdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */; }; + 94B1C88076793400810FAC30 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = AF26BAB1F4733114926F1724 /* png.c */; }; + 94B1C88076793400810FAC31 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = AF26BAB1F4733114926F1724 /* png.c */; }; + 94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */; }; + 94E510619F433AE3AC884756 /* xh_bmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */; }; + 955D2199F1893D37BA2D7478 /* laywin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3784C240C2F330683494926 /* laywin.cpp */; }; + 955D2199F1893D37BA2D7479 /* laywin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3784C240C2F330683494926 /* laywin.cpp */; }; + 9564A6968D66325DAEADEBA3 /* dcgraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */; }; + 9564A6968D66325DAEADEBA4 /* dcgraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */; }; + 95826E8528CC32D8934C36EC /* xh_frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */; }; + 95826E8528CC32D8934C36ED /* xh_frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */; }; + 95AD56D602CF3C5085602AF8 /* geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC0A61629E635FAB4E09505 /* geometry.cpp */; }; + 95AD56D602CF3C5085602AF9 /* geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC0A61629E635FAB4E09505 /* geometry.cpp */; }; + 9678C2B19D293818AA8E9E0D /* LexSpice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4592464D4868329897F3864D /* LexSpice.cxx */; }; + 9678C2B19D293818AA8E9E0E /* LexSpice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4592464D4868329897F3864D /* LexSpice.cxx */; }; + 96927C5A21FD3ACF936CDF6C /* renderg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49CABA38E78D34DFA260AA06 /* renderg.cpp */; }; + 96927C5A21FD3ACF936CDF6D /* renderg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49CABA38E78D34DFA260AA06 /* renderg.cpp */; }; + 96B507455762391688B5E500 /* xh_listc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */; }; + 96B507455762391688B5E501 /* xh_listc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */; }; + 9744994E8A813AA6938A7CE2 /* textcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */; }; + 9744994E8A813AA6938A7CE3 /* textcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */; }; + 97BAFEAD53E238B6881178DD /* evtloopcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 640783FBACA43206B782C77B /* evtloopcmn.cpp */; }; + 97BAFEAD53E238B6881178DE /* evtloopcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 640783FBACA43206B782C77B /* evtloopcmn.cpp */; }; + 97C551F8AEF133D680D1FD36 /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */; }; + 97C551F8AEF133D680D1FD37 /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */; }; + 97F60B2A9CE93BC8949A8CCD /* LexCrontab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */; }; + 97F60B2A9CE93BC8949A8CCE /* LexCrontab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */; }; + 9836B3D336963795928FE5A1 /* m_dflist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52FE1599218730CC99A3F801 /* m_dflist.cpp */; }; + 9836B3D336963795928FE5A2 /* m_dflist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52FE1599218730CC99A3F801 /* m_dflist.cpp */; }; + 9881E3FB23ED3283B6CC71A2 /* filepickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */; }; + 9881E3FB23ED3283B6CC71A3 /* filepickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */; }; + 98DF13E96160304EBB905E73 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; }; + 98DF13E96160304EBB905E74 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; }; + 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; }; + 99E7A46106C03484BA70D29F /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; }; + 99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */; }; + 99F7D7BFBB543A04AB728376 /* m_hline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */; }; + 9A16829C34C9344D9AB010F9 /* DocumentAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */; }; + 9A16829C34C9344D9AB010FA /* DocumentAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */; }; + 9A178ED42D96329D8CBF9B89 /* tif_predict.c in Sources */ = {isa = PBXBuildFile; fileRef = 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */; }; + 9A178ED42D96329D8CBF9B8A /* tif_predict.c in Sources */ = {isa = PBXBuildFile; fileRef = 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */; }; + 9A83D365AD1F37FA9C7030C2 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; + 9A83D365AD1F37FA9C7030C3 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; + 9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */; }; + 9B3F9D04FB533D99B58BD51A /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */; }; + 9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */; }; + 9B6A35E706543CDAA6A5014B /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */; }; + 9B8E5690A6103FC1BDC6C47E /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; }; + 9B8E5690A6103FC1BDC6C47F /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; }; + 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; + 9C1F073349FD393E9220C0D4 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; + 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; + 9CA687845B3F30CCA44A89D1 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; + 9D003890CB7035A298DB7056 /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5145561C78303EEE9F827962 /* LexLua.cxx */; }; + 9D003890CB7035A298DB7057 /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5145561C78303EEE9F827962 /* LexLua.cxx */; }; + 9D4B67A357D23B5283CA8D98 /* clrpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */; }; + 9D4B67A357D23B5283CA8D99 /* clrpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */; }; + 9E0B67E34B683412978BA82D /* filtall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */; }; + 9E0B67E34B683412978BA82E /* filtall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */; }; + 9EC837DA722736119D49868A /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CAA325362C73AC8BE20FAA7 /* pngpread.c */; }; + 9EC837DA722736119D49868B /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CAA325362C73AC8BE20FAA7 /* pngpread.c */; }; + 9F608A33D52D327FAA295624 /* sckfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56653FACC7D13804A70556AD /* sckfile.cpp */; }; + 9F608A33D52D327FAA295625 /* sckfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56653FACC7D13804A70556AD /* sckfile.cpp */; }; + 9F70A89D00B03D4894AF7638 /* validate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01BA6D45FE4C381493EB4372 /* validate.cpp */; }; + 9F70A89D00B03D4894AF7639 /* validate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01BA6D45FE4C381493EB4372 /* validate.cpp */; }; + 9FB1E1763EFA334CA0C07C49 /* tarstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */; }; + 9FB1E1763EFA334CA0C07C4A /* tarstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */; }; + 9FBC642677C63D01AA2511BC /* evtloop_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */; }; + 9FBC642677C63D01AA2511BD /* evtloop_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */; }; + 9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */; }; + 9FD99E06F6613A1A958FAF6C /* jdmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */; }; + A0BA01A85C303C78A3130711 /* art_aui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */; }; + A0BA01A85C303C78A3130712 /* art_aui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */; }; + A0FCE3CF565C3F84B63712AC /* LexCPP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */; }; + A0FCE3CF565C3F84B63712AD /* LexCPP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */; }; + A139B846584436BCBEBAE3BF /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76337016F2CA3C85831702E6 /* grid.cpp */; }; + A139B846584436BCBEBAE3C0 /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76337016F2CA3C85831702E6 /* grid.cpp */; }; + A1A7D793B034398B8696EF33 /* utils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 789F45D14FF23E248FCFB5FA /* utils.mm */; }; + A1A7D793B034398B8696EF34 /* utils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 789F45D14FF23E248FCFB5FA /* utils.mm */; }; + A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; }; + A1AF8FF873D6383996995ED0 /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; }; + A212431902B8343CA6D229D3 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; }; + A212431902B8343CA6D229D4 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; }; + A2473402D8B83628B1F66749 /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; }; + A2473402D8B83628B1F6674A /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; }; + A2769D1659AE3CA3B58C2CAE /* wincmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */; }; + A2769D1659AE3CA3B58C2CAF /* wincmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */; }; + A283187810EB32DAA173BD33 /* artstd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24E82A05E9A9323287CDB15B /* artstd.cpp */; }; + A283187810EB32DAA173BD34 /* artstd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24E82A05E9A9323287CDB15B /* artstd.cpp */; }; + A3321FE2A87D3BD69E0BB009 /* notebook_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5248A45AB113341EAC361910 /* notebook_osx.cpp */; }; + A3321FE2A87D3BD69E0BB00A /* notebook_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5248A45AB113341EAC361910 /* notebook_osx.cpp */; }; + A336FD218BE63B19991CA513 /* ipcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C090A76B6F23E6481A27282 /* ipcbase.cpp */; }; + A336FD218BE63B19991CA514 /* ipcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C090A76B6F23E6481A27282 /* ipcbase.cpp */; }; + A3586433C4B1398FB1C361D6 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; }; + A3586433C4B1398FB1C361D7 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; }; + A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; + A36B5107860E326591940740 /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; + A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; + A3A898DA3114311EB7F02228 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; + A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; }; + A3C4D47A84E8362295867526 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; }; + A423177BBC0F3BE5A436B4B7 /* propgridpagestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */; }; + A423177BBC0F3BE5A436B4B8 /* propgridpagestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */; }; + A465A43B756630F1944B5A56 /* vscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1629FA905F903324AA5BE72C /* vscroll.cpp */; }; + A465A43B756630F1944B5A57 /* vscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1629FA905F903324AA5BE72C /* vscroll.cpp */; }; + A52A7D2FEB1434E29C64582C /* RESearch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E145FC31ED523B4AA5080A61 /* RESearch.cxx */; }; + A52A7D2FEB1434E29C64582D /* RESearch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E145FC31ED523B4AA5080A61 /* RESearch.cxx */; }; + A53B8C3ED0D33A1D9AA8219A /* toolbar.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3BF8C9FF2D5314591329D0D /* toolbar.mm */; }; + A53B8C3ED0D33A1D9AA8219B /* toolbar.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3BF8C9FF2D5314591329D0D /* toolbar.mm */; }; + A569A33A2097316D8110C2C1 /* toolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */; }; + A569A33A2097316D8110C2C2 /* toolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */; }; + A5775D87FD713CBB930A783E /* bookctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */; }; + A5775D87FD713CBB930A783F /* bookctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */; }; + A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */ = {isa = PBXBuildFile; fileRef = 374E341C8703367686DEDE93 /* jmemnobs.c */; }; + A7692B4D8658347BA16EEB84 /* jmemnobs.c in Sources */ = {isa = PBXBuildFile; fileRef = 374E341C8703367686DEDE93 /* jmemnobs.c */; }; + A80D00249A693F43A9CBE777 /* rgncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63867276260C3F4A980E83D8 /* rgncmn.cpp */; }; + A80D00249A693F43A9CBE778 /* rgncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63867276260C3F4A980E83D8 /* rgncmn.cpp */; }; + A874AF0B203D3DC99C27469A /* LexNimrod.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */; }; + A874AF0B203D3DC99C27469B /* LexNimrod.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */; }; + A92439BAFD3A30A29DD93131 /* apptraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4A23A8BC7373D4BBD72851D /* apptraits.cpp */; }; + A92439BAFD3A30A29DD93132 /* apptraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4A23A8BC7373D4BBD72851D /* apptraits.cpp */; }; + A93D0E6F0871368EA8FC9FF9 /* fswatchercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */; }; + A93D0E6F0871368EA8FC9FFA /* fswatchercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */; }; + A965348C7FA73CEC90C8FA25 /* filedlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */; }; + A965348C7FA73CEC90C8FA26 /* filedlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */; }; + A9864F0104FA344BBE79D3BC /* rendcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96CED508FA3C3B6B9265099E /* rendcmn.cpp */; }; + A9864F0104FA344BBE79D3BD /* rendcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96CED508FA3C3B6B9265099E /* rendcmn.cpp */; }; + A9A5973552EE30838306D15C /* tif_packbits.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CE73979D0933A43830307E4 /* tif_packbits.c */; }; + A9A5973552EE30838306D15D /* tif_packbits.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CE73979D0933A43830307E4 /* tif_packbits.c */; }; + AAAB5DF8E60736D88273DCFE /* strconv_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D5F9383D1CE931499F339D85 /* strconv_cf.cpp */; }; + AAAB5DF8E60736D88273DCFF /* strconv_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D5F9383D1CE931499F339D85 /* strconv_cf.cpp */; }; + AAABEE399008310A8BC9BE43 /* imagtga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA7029BB5751398AA02D8C24 /* imagtga.cpp */; }; + AAABEE399008310A8BC9BE44 /* imagtga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA7029BB5751398AA02D8C24 /* imagtga.cpp */; }; + AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */; }; + AAC2CB4D851230008AE4ABA2 /* dcscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */; }; + AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; }; + AB58406CEBA13BC4A2A83B67 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; }; + ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; + ABCD15C4AB37396EA17B7B29 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; + AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; }; + AC6AC589EFB233C7B65A3225 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; }; + AC91349D7F0E37739B1F5165 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF6B3FB66243812969E5BD1 /* palette.cpp */; }; + AC91349D7F0E37739B1F5166 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF6B3FB66243812969E5BD1 /* palette.cpp */; }; + ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 2F41EDEB298538CC86FF6DC1 /* jcparam.c */; }; + ACD644CFA85A3B70A3E3B119 /* jcparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 2F41EDEB298538CC86FF6DC1 /* jcparam.c */; }; + AD07124BBA613B47829F0692 /* sockosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4969528429903F15882F5391 /* sockosx.cpp */; }; + AD07124BBA613B47829F0693 /* sockosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4969528429903F15882F5391 /* sockosx.cpp */; }; + AD4A533C4E1633598A6D5C6F /* textentrycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */; }; + AD4A533C4E1633598A6D5C70 /* textentrycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */; }; + AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D272910EC35531E5B4D6E05B /* dynlib.cpp */; }; + AD7EEB418C7930CB828EAF88 /* dynlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D272910EC35531E5B4D6E05B /* dynlib.cpp */; }; + AE5286C71D1130EAA368A1C4 /* radiobtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 724927B0045F3CC0884878BB /* radiobtncmn.cpp */; }; + AE5286C71D1130EAA368A1C5 /* radiobtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 724927B0045F3CC0884878BB /* radiobtncmn.cpp */; }; + AE84BC9A1CCA3ADA9C483950 /* xmlrole.c in Sources */ = {isa = PBXBuildFile; fileRef = 59C6B9849FF6325E890942EF /* xmlrole.c */; }; + AE84BC9A1CCA3ADA9C483951 /* xmlrole.c in Sources */ = {isa = PBXBuildFile; fileRef = 59C6B9849FF6325E890942EF /* xmlrole.c */; }; + AEB9099819B33F4A8AAB9F54 /* radiocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */; }; + AEB9099819B33F4A8AAB9F55 /* radiocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */; }; + AEEE6BC41B6531898A61CB16 /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D87406BCF3E833369E12D89A /* LexHTML.cxx */; }; + AEEE6BC41B6531898A61CB17 /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D87406BCF3E833369E12D89A /* LexHTML.cxx */; }; + AF1E3338E892336E924AF631 /* pickerbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */; }; + AF1E3338E892336E924AF632 /* pickerbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */; }; + B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C131F7BF8A83960ACB26242 /* jidctflt.c */; }; + B01C4EF49CF9390DA93A3503 /* jidctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C131F7BF8A83960ACB26242 /* jidctflt.c */; }; + B026621DE50A3921B6598EF6 /* regerror.c in Sources */ = {isa = PBXBuildFile; fileRef = A70C82ADB45A3FB99C420D03 /* regerror.c */; }; + B026621DE50A3921B6598EF7 /* regerror.c in Sources */ = {isa = PBXBuildFile; fileRef = A70C82ADB45A3FB99C420D03 /* regerror.c */; }; + B0E94A59C83637C09FAAE71C /* app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 757B31FCCA1F381C95B30DF8 /* app.cpp */; }; + B0E94A59C83637C09FAAE71D /* app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 757B31FCCA1F381C95B30DF8 /* app.cpp */; }; + B1775EF7C72233408044034B /* radiobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 773D91F8280434519BD167EA /* radiobox_osx.cpp */; }; + B1775EF7C72233408044034C /* radiobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 773D91F8280434519BD167EA /* radiobox_osx.cpp */; }; + B181806CC34839E791E54BF0 /* xh_tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */; }; + B181806CC34839E791E54BF1 /* xh_tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */; }; + B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */; }; + B189DB62AE9F30A1B613756C /* bmpcboxg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */; }; + B198DA8239E9358A9D56B988 /* menu_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66C21CA37BF63893887FD91B /* menu_osx.cpp */; }; + B198DA8239E9358A9D56B989 /* menu_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66C21CA37BF63893887FD91B /* menu_osx.cpp */; }; + B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB634FD597793A74B3B3AA7F /* docview.cpp */; }; + B1E30CF6CFA932F5A3DBA950 /* docview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB634FD597793A74B3B3AA7F /* docview.cpp */; }; + B30D10F6257631B0A1926F89 /* statbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 926BDF9C386C3A9A8C24D453 /* statbox.mm */; }; + B30D10F6257631B0A1926F8A /* statbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 926BDF9C386C3A9A8C24D453 /* statbox.mm */; }; + B37802B0A90133C68EF93DDA /* LexInno.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */; }; + B37802B0A90133C68EF93DDB /* LexInno.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */; }; + B387FAE95A9535B194A42BA4 /* WindowAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */; }; + B387FAE95A9535B194A42BA5 /* WindowAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */; }; + B4425B59CC27389CA9FF81D1 /* datectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE856D950B8C369EB0FE13BA /* datectlg.cpp */; }; + B4425B59CC27389CA9FF81D2 /* datectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE856D950B8C369EB0FE13BA /* datectlg.cpp */; }; + B5470121BB4B35DE9C4836DA /* jdcoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = F1A6F3936A0D31CBB58082BA /* jdcoefct.c */; }; + B5470121BB4B35DE9C4836DB /* jdcoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = F1A6F3936A0D31CBB58082BA /* jdcoefct.c */; }; + B559E894684A38238CAAA115 /* dirctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E110907DDC13305E88B90086 /* dirctrlcmn.cpp */; }; + B559E894684A38238CAAA116 /* dirctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E110907DDC13305E88B90086 /* dirctrlcmn.cpp */; }; + B59FC7345C383D9099391AC3 /* mimecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */; }; + B59FC7345C383D9099391AC4 /* mimecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */; }; + B5C7FD8C27F43F3289A77FC9 /* utilsunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */; }; + B5C7FD8C27F43F3289A77FCA /* utilsunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */; }; + B640A8A74D973A8FBEF63916 /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 04082EC1C91334379425802D /* LexConf.cxx */; }; + B640A8A74D973A8FBEF63917 /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 04082EC1C91334379425802D /* LexConf.cxx */; }; + B6891F848CA0325EAB6D1373 /* textentry_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777385D10CCC350C90F02824 /* textentry_osx.cpp */; }; + B6891F848CA0325EAB6D1374 /* textentry_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777385D10CCC350C90F02824 /* textentry_osx.cpp */; }; + B6C364CB4AE33708A862B4B4 /* srchctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D46A36564C78312CAC538E93 /* srchctlg.cpp */; }; + B6C364CB4AE33708A862B4B5 /* srchctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D46A36564C78312CAC538E93 /* srchctlg.cpp */; }; + B791BD05072B3B909A7093C2 /* dcsvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */; }; + B791BD05072B3B909A7093C3 /* dcsvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */; }; + B839235BED6F3609BDB732B8 /* dndcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */; }; + B839235BED6F3609BDB732B9 /* dndcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */; }; + B84642DA949638A189032CE6 /* http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F84F0DB790A23D92A193D2B4 /* http.cpp */; }; + B84642DA949638A189032CE7 /* http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F84F0DB790A23D92A193D2B4 /* http.cpp */; }; + B8FEEC2C94183AB69C963177 /* headercolcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */; }; + B8FEEC2C94183AB69C963178 /* headercolcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */; }; + BA7B12396B873FDA8F3A2748 /* xlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 418AD9241B673308BE31DC06 /* xlocale.cpp */; }; + BA7B12396B873FDA8F3A2749 /* xlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 418AD9241B673308BE31DC06 /* xlocale.cpp */; }; + BA9F0BBD57F63FD29E484FD3 /* LexScriptol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */; }; + BA9F0BBD57F63FD29E484FD4 /* LexScriptol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */; }; + BAA75384DA82370298672333 /* helpctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42E433D1700631A8907B8227 /* helpctrl.cpp */; }; + BAA75384DA82370298672334 /* helpctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42E433D1700631A8907B8227 /* helpctrl.cpp */; }; + BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */; }; + BAAB6B1D80A33843A8436B11 /* appunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */; }; + BAFF04F1680F32DA988EB03D /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; + BAFF04F1680F32DA988EB03E /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; + BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; + BB31D65BA1253A1CB64CE9D3 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; + BB6FE851028C3DE7A070C213 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; + BB6FE851028C3DE7A070C214 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; + BBAABF3C693E37D3B0FF2502 /* colrdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */; }; + BBAABF3C693E37D3B0FF2503 /* colrdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */; }; + BCD81FD3D1EC305F801E1C1B /* sckipc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */; }; + BCD81FD3D1EC305F801E1C1C /* sckipc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */; }; + BCDAE378D03E37F5994FB9C5 /* XPM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C25521AF59B9324EB2809C73 /* XPM.cxx */; }; + BCDAE378D03E37F5994FB9C6 /* XPM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C25521AF59B9324EB2809C73 /* XPM.cxx */; }; + BD2B17EB72E73A6EB6E0B26F /* dcmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 343D4FDD5CC030618EF24729 /* dcmemory.cpp */; }; + BD2B17EB72E73A6EB6E0B270 /* dcmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 343D4FDD5CC030618EF24729 /* dcmemory.cpp */; }; + BD49EC50CB363642BDBF25C8 /* mousemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D037EA567C253DEEA17E822B /* mousemanager.cpp */; }; + BD49EC50CB363642BDBF25C9 /* mousemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D037EA567C253DEEA17E822B /* mousemanager.cpp */; }; + BD53E095EC1136EF853A47D8 /* m_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5EE0B8985443BDCB36F781F /* m_layout.cpp */; }; + BD53E095EC1136EF853A47D9 /* m_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5EE0B8985443BDCB36F781F /* m_layout.cpp */; }; + BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3019BA65DD73F30A865365F /* frame.cpp */; }; + BDAB44F5D017395D9D3A1F24 /* frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3019BA65DD73F30A865365F /* frame.cpp */; }; + BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; }; + BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; }; + BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; + BDB8EF0E0DA03693BFB77EF8 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; + BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; + BE99A85EE76236CC8C719A65 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; + BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; }; + BEA90F2C6BB93143958F899B /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; }; + BEAC2449AFA7304989BA301E /* fontpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */; }; + BEAC2449AFA7304989BA301F /* fontpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */; }; + BEFC179F8A0E337F9D627D84 /* LexOthers.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C356B5738AB13E829E66729E /* LexOthers.cxx */; }; + BEFC179F8A0E337F9D627D85 /* LexOthers.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C356B5738AB13E829E66729E /* LexOthers.cxx */; }; + BF068F3C06473D8CBC55D507 /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BCD873D873A53BBF955D8A4E /* PositionCache.cxx */; }; + BF068F3C06473D8CBC55D508 /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BCD873D873A53BBF955D8A4E /* PositionCache.cxx */; }; + BF1760458996391E8EB42949 /* ctrlsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */; }; + BF1760458996391E8EB4294A /* ctrlsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */; }; + BF2585CFA6853023975F1E78 /* iconbndl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */; }; + BF2585CFA6853023975F1E79 /* iconbndl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */; }; + BF3D600A93403C589B65C5BF /* xh_stlin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F555177554E398286DBC6FB /* xh_stlin.cpp */; }; + BF3D600A93403C589B65C5C0 /* xh_stlin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F555177554E398286DBC6FB /* xh_stlin.cpp */; }; + BF8C33B7CB3A3ECE814A95FB /* tokenzr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */; }; + BF8C33B7CB3A3ECE814A95FC /* tokenzr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */; }; + BF9B151DC0543E37878F8B9A /* stattextg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE635F30F3935099AF1486C /* stattextg.cpp */; }; + BF9B151DC0543E37878F8B9B /* stattextg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE635F30F3935099AF1486C /* stattextg.cpp */; }; + BFA6983551B4310DA7C8A404 /* jcdctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 6DBF3053414F3C448312165A /* jcdctmgr.c */; }; + BFA6983551B4310DA7C8A405 /* jcdctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 6DBF3053414F3C448312165A /* jcdctmgr.c */; }; + BFD3BFBDC8DA3B1EAD141F96 /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A1276C0E5D48337489DEE8DF /* LexErlang.cxx */; }; + BFD3BFBDC8DA3B1EAD141F97 /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A1276C0E5D48337489DEE8DF /* LexErlang.cxx */; }; + BFD4B8871B3934048B631419 /* languageinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67D76B026121359F9B22F8B0 /* languageinfo.cpp */; }; + BFD4B8871B3934048B63141A /* languageinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67D76B026121359F9B22F8B0 /* languageinfo.cpp */; }; + C005C2D547E735E9B081658E /* prntdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */; }; + C005C2D547E735E9B081658F /* prntdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */; }; + C05BDB0B5F5A33A9A57FF012 /* m_links.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 080597FC0436378E96EDA94B /* m_links.cpp */; }; + C05BDB0B5F5A33A9A57FF013 /* m_links.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 080597FC0436378E96EDA94B /* m_links.cpp */; }; + C0CDA289E9EC3E20BE70B2E6 /* choiccmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24930711031D35288D28B04B /* choiccmn.cpp */; }; + C0CDA289E9EC3E20BE70B2E7 /* choiccmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24930711031D35288D28B04B /* choiccmn.cpp */; }; + C170B941F01334F982315E4A /* tif_print.c in Sources */ = {isa = PBXBuildFile; fileRef = C6EB77ED688E3EE294167EF1 /* tif_print.c */; }; + C170B941F01334F982315E4B /* tif_print.c in Sources */ = {isa = PBXBuildFile; fileRef = C6EB77ED688E3EE294167EF1 /* tif_print.c */; }; + C1CDD035AA393ACC9E202C03 /* minifram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 693F731B7D1730A79485F9EC /* minifram.cpp */; }; + C1CDD035AA393ACC9E202C04 /* minifram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 693F731B7D1730A79485F9EC /* minifram.cpp */; }; + C1DCF69200593986A8C606A6 /* hidjoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */; }; + C1DCF69200593986A8C606A7 /* hidjoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */; }; + C1E5799141603A75A26BEEA7 /* xpmdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C562D5885AFF3E15837325CE /* xpmdecod.cpp */; }; + C1E5799141603A75A26BEEA8 /* xpmdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C562D5885AFF3E15837325CE /* xpmdecod.cpp */; }; + C259D01CC62533D296EF023A /* scrolbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */; }; + C259D01CC62533D296EF023B /* scrolbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */; }; + C2B07E2ECDDC3833BDC9B28C /* arcall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75D0C937F2A03ADA8581A2BB /* arcall.cpp */; }; + C2B07E2ECDDC3833BDC9B28D /* arcall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75D0C937F2A03ADA8581A2BB /* arcall.cpp */; }; + C2CF6B59914A3183ADE84028 /* tif_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F1439BF6C3361296F05A33 /* tif_error.c */; }; + C2CF6B59914A3183ADE84029 /* tif_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F1439BF6C3361296F05A33 /* tif_error.c */; }; + C2D45B334BE03F6C941CA041 /* utilsexc_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */; }; + C2D45B334BE03F6C941CA042 /* utilsexc_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */; }; + C2DEE063B5E032C1BD2B5026 /* xmlparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A92B6033D8233DB1821F193B /* xmlparse.c */; }; + C2DEE063B5E032C1BD2B5027 /* xmlparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A92B6033D8233DB1821F193B /* xmlparse.c */; }; + C2E37E798F743A4199C8658E /* fddlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */; }; + C2E37E798F743A4199C8658F /* fddlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */; }; + C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 950D51915EF83B57B5E8306F /* xh_spin.cpp */; }; + C32EF2EC1A103BC3A6254322 /* xh_spin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 950D51915EF83B57B5E8306F /* xh_spin.cpp */; }; + C34B8675439F39B4845FFC50 /* xh_listb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */; }; + C34B8675439F39B4845FFC51 /* xh_listb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */; }; + C3A63D7091913CD39094AE0B /* btncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A7A3B499503ECABC6A838F /* btncmn.cpp */; }; + C3A63D7091913CD39094AE0C /* btncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A7A3B499503ECABC6A838F /* btncmn.cpp */; }; + C3AC94EA13C1352790BF5FF7 /* listctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9016355F66D3125919E017D /* listctrl.cpp */; }; + C3AC94EA13C1352790BF5FF8 /* listctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9016355F66D3125919E017D /* listctrl.cpp */; }; + C40AA245D5773351979A2850 /* filedlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = DC8A52CA69053B27B09F1037 /* filedlg.mm */; }; + C40AA245D5773351979A2851 /* filedlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = DC8A52CA69053B27B09F1037 /* filedlg.mm */; }; + C425A172B0AB3EBD9AC9A590 /* ustring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EBEE1A04537E7887E9FD0 /* ustring.cpp */; }; + C425A172B0AB3EBD9AC9A591 /* ustring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EBEE1A04537E7887E9FD0 /* ustring.cpp */; }; + C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */; }; + C43A9650A9DC3372AB8F5F79 /* jidctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */; }; + C5419BC04D6234B5A8307B81 /* xti.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25C86D3D4839343BA1D8BDEE /* xti.cpp */; }; + C5419BC04D6234B5A8307B82 /* xti.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25C86D3D4839343BA1D8BDEE /* xti.cpp */; }; + C5A8DF376BB13A2A8290C2E5 /* xh_unkwn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */; }; + C5A8DF376BB13A2A8290C2E6 /* xh_unkwn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */; }; + C5E5AB869065307F83E27DD1 /* htmlpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */; }; + C5E5AB869065307F83E27DD2 /* htmlpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */; }; + C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E3043D7BE9C33B59E900CCE /* jcmaster.c */; }; + C6DF6F29407B34F29ED1B66E /* jcmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E3043D7BE9C33B59E900CCE /* jcmaster.c */; }; + C7B6240E0E213836996A178B /* dockart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD709DEB71623974B9836D69 /* dockart.cpp */; }; + C7B6240E0E213836996A178C /* dockart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD709DEB71623974B9836D69 /* dockart.cpp */; }; + C8C68927DB243AEAB51E11F2 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = AF9EE701DD653E2299293E5F /* pngwio.c */; }; + C8C68927DB243AEAB51E11F3 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = AF9EE701DD653E2299293E5F /* pngwio.c */; }; + C8F1FB8C029031A5909DBC56 /* KeyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */; }; + C8F1FB8C029031A5909DBC57 /* KeyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */; }; + CA155860CE9A3A8189C3A4C2 /* zipstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */; }; + CA155860CE9A3A8189C3A4C3 /* zipstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */; }; + CA4DCD57060B38CC8B2283D7 /* filtfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */; }; + CA4DCD57060B38CC8B2283D8 /* filtfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */; }; + CA5BD8ABDBA13641BBE7CD66 /* jccoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = E89AC104BF4F33A083F8B382 /* jccoefct.c */; }; + CA5BD8ABDBA13641BBE7CD67 /* jccoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = E89AC104BF4F33A083F8B382 /* jccoefct.c */; }; + CA85901B9E2538CFB7E44216 /* process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B35DA585CFDD32468868E892 /* process.cpp */; }; + CA85901B9E2538CFB7E44217 /* process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B35DA585CFDD32468868E892 /* process.cpp */; }; + CAF5C5BB129431B596C4C6C1 /* LexTAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38891BF8F51E398F9082903F /* LexTAL.cxx */; }; + CAF5C5BB129431B596C4C6C2 /* LexTAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38891BF8F51E398F9082903F /* LexTAL.cxx */; }; + CB078622E90F33BE9D131131 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28824 /* buttonbar.cpp */; }; + CB078622E90F33BE9D131132 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28824 /* buttonbar.cpp */; }; + CB078622E90F33BE9D131133 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28825 /* buttonbar.cpp */; }; + CB078622E90F33BE9D131134 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28825 /* buttonbar.cpp */; }; + CB1F37993ECB3B73A51B42FD /* LexMySQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */; }; + CB1F37993ECB3B73A51B42FE /* LexMySQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */; }; + CB2E99E8FB7D3269A333A55E /* window_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D7C4995D7A35A1854B533F /* window_osx.cpp */; }; + CB2E99E8FB7D3269A333A55F /* window_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D7C4995D7A35A1854B533F /* window_osx.cpp */; }; + CBBD7B32DB7B3E24AE745D78 /* epolldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */; }; + CBBD7B32DB7B3E24AE745D79 /* epolldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */; }; + CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 725574EF98C4301989181CBF /* jctrans.c */; }; + CCE4ECA9CE883B008065C6FC /* jctrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 725574EF98C4301989181CBF /* jctrans.c */; }; + CCFD3144A22C3A87B67D88AB /* LexRebol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */; }; + CCFD3144A22C3A87B67D88AC /* LexRebol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */; }; + CD241361D4693785A0B8939D /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; }; + CD241361D4693785A0B8939E /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; }; + CD2A9111B8A83AFA8B5B97E5 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2128AD8BD12E3F33AD57478E /* overlay.cpp */; }; + CD2A9111B8A83AFA8B5B97E6 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2128AD8BD12E3F33AD57478E /* overlay.cpp */; }; + CD35A576FD363FD49C3AC4B3 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 375E7A99FF4C38FA9E223772 /* LexAda.cxx */; }; + CD35A576FD363FD49C3AC4B4 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 375E7A99FF4C38FA9E223772 /* LexAda.cxx */; }; + CDC0FF253B503BA19693D68D /* xh_propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */; }; + CDC0FF253B503BA19693D68E /* xh_propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */; }; + CE17002B5B7E375582747639 /* xh_choic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */; }; + CE17002B5B7E37558274763A /* xh_choic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */; }; + CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9B2316B32653DA0939A372D /* sound_osx.cpp */; }; + CE2C937117FE3AB599DD30BA /* sound_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9B2316B32653DA0939A372D /* sound_osx.cpp */; }; + CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = ED19EF377E653F71B1876259 /* jdmaster.c */; }; + CEBAAB0C77983358A601BFFF /* jdmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = ED19EF377E653F71B1876259 /* jdmaster.c */; }; + CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */; }; + CEC6430AEB6E3200BFA75D08 /* jfdctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */; }; + CEE0D7A7D5D8323B9957A780 /* notifmsgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */; }; + CEE0D7A7D5D8323B9957A781 /* notifmsgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */; }; + CF3082BA1ED232F4B904BD14 /* stdpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */; }; + CF3082BA1ED232F4B904BD15 /* stdpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */; }; + CFA91122523B31B9A07A3826 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */; }; + CFA91122523B31B9A07A3827 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */; }; + CFDBB80A4C9A3BA092273936 /* animatecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */; }; + CFDBB80A4C9A3BA092273937 /* animatecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */; }; + CFF73578F04D357E83D1D830 /* lboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */; }; + CFF73578F04D357E83D1D831 /* lboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */; }; + D00AF125FCB63A7A8F9B87DE /* taskbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4692909E4B823F71822B13F8 /* taskbarcmn.cpp */; }; + D00AF125FCB63A7A8F9B87DF /* taskbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4692909E4B823F71822B13F8 /* taskbarcmn.cpp */; }; + D070C3BE95483FE38BABA1BE /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00DA3D3EEF5E305CA73A1871 /* region.cpp */; }; + D070C3BE95483FE38BABA1BF /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00DA3D3EEF5E305CA73A1871 /* region.cpp */; }; + D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; }; + D088E7DDE38C31DC9C9B3418 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; }; + D0DA11B814AF30A18585122F /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; }; + D0DA11B814AF30A185851230 /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; }; + D13596A4E3CD31DE810061A1 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; }; + D13596A4E3CD31DE810061A2 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; }; + D13AE659C3AC37B68D39B2C9 /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B14D6E7E15FD3C869E341198 /* LexLout.cxx */; }; + D13AE659C3AC37B68D39B2CA /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B14D6E7E15FD3C869E341198 /* LexLout.cxx */; }; + D17E3053DA0D3F7EA4D0951B /* helpdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81821049E39B32C6ABCF6820 /* helpdlg.cpp */; }; + D17E3053DA0D3F7EA4D0951C /* helpdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81821049E39B32C6ABCF6820 /* helpdlg.cpp */; }; + D18E2985C48733B2B7B3D442 /* evtloopunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */; }; + D18E2985C48733B2B7B3D443 /* evtloopunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */; }; + D36E76A4CAF5352D9397E1FF /* fdiodispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */; }; + D36E76A4CAF5352D9397E200 /* fdiodispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */; }; + D3FB75C8E3A73AE38EE8A6F6 /* selectdispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */; }; + D3FB75C8E3A73AE38EE8A6F7 /* selectdispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */; }; + D4C87E227A28391891D89088 /* filename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */; }; + D4C87E227A28391891D89089 /* filename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */; }; + D4EC9DB5F8DF319EA0FD26A4 /* LexVB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8F633793051F371F94C27530 /* LexVB.cxx */; }; + D4EC9DB5F8DF319EA0FD26A5 /* LexVB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8F633793051F371F94C27530 /* LexVB.cxx */; }; + D51B3389209E370489078891 /* tif_dirread.c in Sources */ = {isa = PBXBuildFile; fileRef = F6EA240B3DB93D398A990FAD /* tif_dirread.c */; }; + D51B3389209E370489078892 /* tif_dirread.c in Sources */ = {isa = PBXBuildFile; fileRef = F6EA240B3DB93D398A990FAD /* tif_dirread.c */; }; + D542C7819D593112AE5F7C3D /* combocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */; }; + D542C7819D593112AE5F7C3E /* combocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */; }; + D54A162E557834A48F4646A9 /* advprops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 326723AEB79A305F90D6B41D /* advprops.cpp */; }; + D54A162E557834A48F4646AA /* advprops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 326723AEB79A305F90D6B41D /* advprops.cpp */; }; + D54D3CA9E73336A08DB20705 /* LexBaan.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */; }; + D54D3CA9E73336A08DB20706 /* LexBaan.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */; }; + D5A25AC579F436509805335A /* appbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95A156A823B536DE8476E4F9 /* appbase.cpp */; }; + D5A25AC579F436509805335B /* appbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95A156A823B536DE8476E4F9 /* appbase.cpp */; }; + D5AABE973F3A351EB1C1A5A6 /* fontmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0817D6A1AF83608B050EBC3 /* fontmap.cpp */; }; + D5AABE973F3A351EB1C1A5A7 /* fontmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0817D6A1AF83608B050EBC3 /* fontmap.cpp */; }; + D5C304182151365FA9FF8A3D /* xh_bttn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */; }; + D5C304182151365FA9FF8A3E /* xh_bttn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */; }; + D5C5DD83882B3227A1CCFE0E /* LexSorcus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */; }; + D5C5DD83882B3227A1CCFE0F /* LexSorcus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */; }; + D66F5D4D204B3B789C7F76B9 /* fontdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18044326B5B13A98A49732DD /* fontdlg.cpp */; }; + D66F5D4D204B3B789C7F76BA /* fontdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18044326B5B13A98A49732DD /* fontdlg.cpp */; }; + D6B2A64A78AF3F2983B441A8 /* ownerdrwcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */; }; + D6B2A64A78AF3F2983B441A9 /* ownerdrwcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */; }; + D6B73239BF0E32288161679C /* platinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97FFB03FF6793506B246BAC6 /* platinfo.cpp */; }; + D6B73239BF0E32288161679D /* platinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97FFB03FF6793506B246BAC6 /* platinfo.cpp */; }; + D6C3421AD2A537AAA2F0AB80 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168DB301ACC736FF96D7F581 /* file.cpp */; }; + D6C3421AD2A537AAA2F0AB81 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168DB301ACC736FF96D7F581 /* file.cpp */; }; + D72D99FC424337CF9EDC2042 /* props.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C20E46A504113C899B9DD9B7 /* props.cpp */; }; + D72D99FC424337CF9EDC2043 /* props.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C20E46A504113C899B9DD9B7 /* props.cpp */; }; + D83B32B788EC310D919E0DF7 /* imagpcx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */; }; + D83B32B788EC310D919E0DF8 /* imagpcx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */; }; + D8ADDD24BEAC3D94B3388D3E /* LexCOBOL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */; }; + D8ADDD24BEAC3D94B3388D3F /* LexCOBOL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */; }; + D9496139621533328AE727B6 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 91300EB871CC39ECBC430D48 /* pngget.c */; }; + D9496139621533328AE727B7 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 91300EB871CC39ECBC430D48 /* pngget.c */; }; + D95C5F467D37339AB8DF2354 /* tif_color.c in Sources */ = {isa = PBXBuildFile; fileRef = 149D299A0EDB3D998118EC93 /* tif_color.c */; }; + D95C5F467D37339AB8DF2355 /* tif_color.c in Sources */ = {isa = PBXBuildFile; fileRef = 149D299A0EDB3D998118EC93 /* tif_color.c */; }; + D997FFC948B73FDA892DB531 /* jdsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCF47A161B3E08B19BFE14 /* jdsample.c */; }; + D997FFC948B73FDA892DB532 /* jdsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCF47A161B3E08B19BFE14 /* jdsample.c */; }; + D9DCBE799DB634C2A73FD6BD /* statboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D73954EB5397301F87881646 /* statboxcmn.cpp */; }; + D9DCBE799DB634C2A73FD6BE /* statboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D73954EB5397301F87881646 /* statboxcmn.cpp */; }; + D9EE059D3C3C3C13AE4419F1 /* stattextcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */; }; + D9EE059D3C3C3C13AE4419F2 /* stattextcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */; }; + D9F02AFDA07D3857A905527C /* jdcolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 68B81FBDA49D3C1991B6356A /* jdcolor.c */; }; + D9F02AFDA07D3857A905527D /* jdcolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 68B81FBDA49D3C1991B6356A /* jdcolor.c */; }; + DA0FA502405A37B2A5698D20 /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FE0B33481283D3493613B0F /* config.cpp */; }; + DA0FA502405A37B2A5698D21 /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FE0B33481283D3493613B0F /* config.cpp */; }; + DAAFBED07FF8365B96D20B99 /* unichar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */; }; + DAAFBED07FF8365B96D20B9A /* unichar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */; }; + DB3C3AA956A03FB492480266 /* treectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */; }; + DB3C3AA956A03FB492480267 /* treectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */; }; + DB73248401573A5996D8E68D /* jcmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 664736BDE465350C9C4750E9 /* jcmarker.c */; }; + DB73248401573A5996D8E68E /* jcmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 664736BDE465350C9C4750E9 /* jcmarker.c */; }; + DB9565CC4EAE3BCB9F490620 /* xmltok.c in Sources */ = {isa = PBXBuildFile; fileRef = 8685B8ED68F23DB0B770FD74 /* xmltok.c */; }; + DB9565CC4EAE3BCB9F490621 /* xmltok.c in Sources */ = {isa = PBXBuildFile; fileRef = 8685B8ED68F23DB0B770FD74 /* xmltok.c */; }; + DC6B669C9A78398F914AEE53 /* fontutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FF661188B563D27A11F5716 /* fontutil.cpp */; }; + DC6B669C9A78398F914AEE54 /* fontutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FF661188B563D27A11F5716 /* fontutil.cpp */; }; + DC978B60F6DF3176B5B114C3 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5466CC2D6579360E9C665EE5 /* memory.cpp */; }; + DC978B60F6DF3176B5B114C4 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5466CC2D6579360E9C665EE5 /* memory.cpp */; }; + DDC71B80D562303690FDBE4C /* appcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F01DDE448E4C3983ACCE67FD /* appcmn.cpp */; }; + DDC71B80D562303690FDBE4D /* appcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F01DDE448E4C3983ACCE67FD /* appcmn.cpp */; }; + DE26572475EE336B8EEA5D92 /* jerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 108517BCD39230E7A89BC943 /* jerror.c */; }; + DE26572475EE336B8EEA5D93 /* jerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 108517BCD39230E7A89BC943 /* jerror.c */; }; + DE43350F6C9D3148A64F0AF9 /* art_internal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4649974D8B3A109D1BF145 /* art_internal.cpp */; }; + DE43350F6C9D3148A64F0AFA /* art_internal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4649974D8B3A109D1BF145 /* art_internal.cpp */; }; + DEB35F871F8E3B90AD207AEE /* printps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF76670146413EEFA005206A /* printps.cpp */; }; + DEB35F871F8E3B90AD207AEF /* printps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF76670146413EEFA005206A /* printps.cpp */; }; + DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */; }; + DEC5F4B34BC037169D3E5F2B /* mediactrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */; }; + DF8124E5E17D386A84CEEA27 /* LexLisp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40586C8986443431A64EB066 /* LexLisp.cxx */; }; + DF8124E5E17D386A84CEEA28 /* LexLisp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40586C8986443431A64EB066 /* LexLisp.cxx */; }; + DF8CE011EAC23F73BDA1C44D /* scrolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */; }; + DF8CE011EAC23F73BDA1C44E /* scrolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */; }; + DFEB8DA3D42734949CB1E1AA /* clipcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */; }; + DFEB8DA3D42734949CB1E1AB /* clipcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */; }; + E05B06A7FEEE32D5AD87EA4F /* xh_editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05310A868F0B35999C568681 /* xh_editlbox.cpp */; }; + E05B06A7FEEE32D5AD87EA50 /* xh_editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05310A868F0B35999C568681 /* xh_editlbox.cpp */; }; + E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; }; + E0E40333B61C33B58787078F /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; }; + E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; }; + E104017EE1A4357DAF84E1E7 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; }; + E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */; }; + E1A20811148F31D289AF98B0 /* xh_sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */; }; + E1F7C51F411B3AF39476E488 /* fdrepdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */; }; + E1F7C51F411B3AF39476E489 /* fdrepdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */; }; + E2A73751CECF32A68FFAEE82 /* panelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70E9B2C076673C87B4218A01 /* panelcmn.cpp */; }; + E2A73751CECF32A68FFAEE83 /* panelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70E9B2C076673C87B4218A01 /* panelcmn.cpp */; }; + E3136EF5DD843ACE886E2868 /* tif_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = E79B2D1F630036129B9677A7 /* tif_dir.c */; }; + E3136EF5DD843ACE886E2869 /* tif_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = E79B2D1F630036129B9677A7 /* tif_dir.c */; }; + E39021D3CDCD33BAA646B006 /* sckaddr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8238DA30FF3FB984511250 /* sckaddr.cpp */; }; + E39021D3CDCD33BAA646B007 /* sckaddr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8238DA30FF3FB984511250 /* sckaddr.cpp */; }; + E3A4615870B139D29FE727C1 /* menucmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F175D6E8E5723FC797701275 /* menucmn.cpp */; }; + E3A4615870B139D29FE727C2 /* menucmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F175D6E8E5723FC797701275 /* menucmn.cpp */; }; + E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B9C41A4D12345AAA764CAD /* stc.cpp */; }; + E3B3E4F75D503DB89B5C622E /* stc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B9C41A4D12345AAA764CAD /* stc.cpp */; }; + E4131E3B445C36E6A7FC802F /* regcomp.c in Sources */ = {isa = PBXBuildFile; fileRef = E433B890264339BA8DB97B1D /* regcomp.c */; }; + E4131E3B445C36E6A7FC8030 /* regcomp.c in Sources */ = {isa = PBXBuildFile; fileRef = E433B890264339BA8DB97B1D /* regcomp.c */; }; + E49F0D43B5A63EF1A57A7112 /* fswatcherg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */; }; + E49F0D43B5A63EF1A57A7113 /* fswatcherg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */; }; + E4B826CE70283D999CB591F3 /* listbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B99CA41708513A599AE275A2 /* listbox_osx.cpp */; }; + E4B826CE70283D999CB591F4 /* listbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B99CA41708513A599AE275A2 /* listbox_osx.cpp */; }; + E515EAE375AE390688CBF8D3 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B32A13D5B3336098B1B9765 /* pngtrans.c */; }; + E515EAE375AE390688CBF8D4 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B32A13D5B3336098B1B9765 /* pngtrans.c */; }; + E53AFF04877D34C386D77380 /* wfstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C37866F41B0C31E295AA7FA6 /* wfstream.cpp */; }; + E53AFF04877D34C386D77381 /* wfstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C37866F41B0C31E295AA7FA6 /* wfstream.cpp */; }; + E5D698D2606A304DA743AF92 /* grideditors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66426B63AA3E3A279936C034 /* grideditors.cpp */; }; + E5D698D2606A304DA743AF93 /* grideditors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66426B63AA3E3A279936C034 /* grideditors.cpp */; }; + E62F8E49FD5035D8BC71BB49 /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */; }; + E62F8E49FD5035D8BC71BB4A /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */; }; + E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81B3DFBB73573FFDBD320334 /* datstrm.cpp */; }; + E63364B7E727383BA8E2B7ED /* datstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81B3DFBB73573FFDBD320334 /* datstrm.cpp */; }; + E6CA1EB5550F3930BFE286CD /* tglbtn.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFC6875EF4732E88E029065 /* tglbtn.mm */; }; + E6CA1EB5550F3930BFE286CE /* tglbtn.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFC6875EF4732E88E029065 /* tglbtn.mm */; }; + E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6F23140777B733679D2FAAFC /* odcombocmn.cpp */; }; + E6D18B2EDE353F67883085A0 /* odcombocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6F23140777B733679D2FAAFC /* odcombocmn.cpp */; }; + E7140F3AB94D3FDFA86D8C06 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49612306912038DDBCABB4DE /* url.cpp */; }; + E7140F3AB94D3FDFA86D8C07 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49612306912038DDBCABB4DE /* url.cpp */; }; + E741CDA71895344C974D8F50 /* AutoComplete.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */; }; + E741CDA71895344C974D8F51 /* AutoComplete.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */; }; + E7921B0472B63E4091F4F517 /* xh_collpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */; }; + E7921B0472B63E4091F4F518 /* xh_collpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */; }; + E7AF3BF2B3473AD9BE66D1A1 /* xh_clrpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */; }; + E7AF3BF2B3473AD9BE66D1A2 /* xh_clrpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */; }; + E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */ = {isa = PBXBuildFile; fileRef = 375FF97B202F3C359402D13E /* jdpostct.c */; }; + E7D02E64384F37BC8939A2C5 /* jdpostct.c in Sources */ = {isa = PBXBuildFile; fileRef = 375FF97B202F3C359402D13E /* jdpostct.c */; }; + E7F35B834A163C67B65176C6 /* tif_dirwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */; }; + E7F35B834A163C67B65176C7 /* tif_dirwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */; }; + E80BEED62EBF34F09B3F401F /* LexMagik.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 45860601270D318D93BEE1F3 /* LexMagik.cxx */; }; + E80BEED62EBF34F09B3F4020 /* LexMagik.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 45860601270D318D93BEE1F3 /* LexMagik.cxx */; }; + E82CB89681FF3747B6A94427 /* anybutton_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */; }; + E82CB89681FF3747B6A94428 /* anybutton_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */; }; + E882402BEE0330A080A6516F /* strconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FEB8204E530329FA085E5B8 /* strconv.cpp */; }; + E882402BEE0330A080A65170 /* strconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FEB8204E530329FA085E5B8 /* strconv.cpp */; }; + E8BBC08597EF383597DA0308 /* LexEiffel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 55EBB18CB4773C788510B14B /* LexEiffel.cxx */; }; + E8BBC08597EF383597DA0309 /* LexEiffel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 55EBB18CB4773C788510B14B /* LexEiffel.cxx */; }; + E8EE34F0A78C31B489B19FEE /* LexMSSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */; }; + E8EE34F0A78C31B489B19FEF /* LexMSSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */; }; + E8F0C87119C63E8E81423A7C /* stdpaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */; }; + E8F0C87119C63E8E81423A7D /* stdpaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */; }; + E92EB502F79638B0BE569EF4 /* CallTip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */; }; + E92EB502F79638B0BE569EF5 /* CallTip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */; }; + E9EDB5C92D5D3B529E8D73B0 /* valgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7440859617F3B47AF4D3817 /* valgen.cpp */; }; + E9EDB5C92D5D3B529E8D73B1 /* valgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7440859617F3B47AF4D3817 /* valgen.cpp */; }; + EA02FA6D3B003F8F8A2963C6 /* toolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */; }; + EA02FA6D3B003F8F8A2963C7 /* toolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */; }; + EAA469E1A0CC33E4A21A3F7A /* gaugecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */; }; + EAA469E1A0CC33E4A21A3F7B /* gaugecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */; }; + EAE02BA934B43EEE92C496C7 /* dcpsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA0945B20913754A54D0FD9 /* dcpsg.cpp */; }; + EAE02BA934B43EEE92C496C8 /* dcpsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA0945B20913754A54D0FD9 /* dcpsg.cpp */; }; + EB52C6A915943813932944FE /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04A /* control.cpp */; }; + EB52C6A915943813932944FF /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04A /* control.cpp */; }; + EB52C6A91594381393294500 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04B /* control.cpp */; }; + EB52C6A91594381393294501 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04B /* control.cpp */; }; + EBA0986930DA3B59B2FB4F1E /* htmltag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FCCFF49F92B4323D9181CEDA /* htmltag.cpp */; }; + EBA0986930DA3B59B2FB4F1F /* htmltag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FCCFF49F92B4323D9181CEDA /* htmltag.cpp */; }; + EBF2D44758003221A22202BC /* colourcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D61240ABD70328BA5789663 /* colourcmn.cpp */; }; + EBF2D44758003221A22202BD /* colourcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D61240ABD70328BA5789663 /* colourcmn.cpp */; }; + EC3A1C620D323B5590AABF02 /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DB43FAB1E563B02ACEFF647 /* module.cpp */; }; + EC3A1C620D323B5590AABF03 /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DB43FAB1E563B02ACEFF647 /* module.cpp */; }; + EC43AFB3670A3D459D9B388D /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FE3B47058A723243A285594D /* LexMPT.cxx */; }; + EC43AFB3670A3D459D9B388E /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FE3B47058A723243A285594D /* LexMPT.cxx */; }; + ED8D23D79FF33ED380FE09EB /* scrlwing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */; }; + ED8D23D79FF33ED380FE09EC /* scrlwing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */; }; + EDCA35F1555F3509895CCA69 /* textctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */; }; + EDCA35F1555F3509895CCA6A /* textctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */; }; + EDD5725CF41336EFA7FB3009 /* framecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A54B80C17F823CB5900AD2E8 /* framecmn.cpp */; }; + EDD5725CF41336EFA7FB300A /* framecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A54B80C17F823CB5900AD2E8 /* framecmn.cpp */; }; + EDD92822EBD93E86AE5A2ED0 /* slidercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8072CA67D19346ABF4D465F /* slidercmn.cpp */; }; + EDD92822EBD93E86AE5A2ED1 /* slidercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8072CA67D19346ABF4D465F /* slidercmn.cpp */; }; + EE0EA850822E35F596B5EBBA /* artprov.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29387393C07C39DB8FF1663B /* artprov.cpp */; }; + EE0EA850822E35F596B5EBBB /* artprov.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29387393C07C39DB8FF1663B /* artprov.cpp */; }; + EE9194D6C4C138BF9DAB8633 /* panelg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */; }; + EE9194D6C4C138BF9DAB8634 /* panelg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */; }; + EEB0B28903693C7E9D07192F /* glcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E08A51FA8D8A361681B07295 /* glcmn.cpp */; }; + EEB0B28903693C7E9D071930 /* glcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E08A51FA8D8A361681B07295 /* glcmn.cpp */; }; + F016C51053373E658ED4C9A9 /* helpext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF376BC55EA73F5FB7328142 /* helpext.cpp */; }; + F016C51053373E658ED4C9AA /* helpext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF376BC55EA73F5FB7328142 /* helpext.cpp */; }; + F07D84D124F23E7FA11CF148 /* extended.c in Sources */ = {isa = PBXBuildFile; fileRef = 033B94A9AC8A3370A794503F /* extended.c */; }; + F07D84D124F23E7FA11CF149 /* extended.c in Sources */ = {isa = PBXBuildFile; fileRef = 033B94A9AC8A3370A794503F /* extended.c */; }; + F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */; }; + F0B3F484C38C3BA0B9927CDA /* docmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */; }; + F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00969CBE3B8F32C78C195619 /* panel.cpp */; }; + F0D892C2618130FEAD46BB87 /* panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00969CBE3B8F32C78C195619 /* panel.cpp */; }; + F1E4D7CA634E33808AE3B522 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 373242CD08F330208A7CF438 /* fontenumcmn.cpp */; }; + F1E4D7CA634E33808AE3B523 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 373242CD08F330208A7CF438 /* fontenumcmn.cpp */; }; + F1F484DD591337399FCD0463 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5617D10CB7136EC9A4194EF /* display.cpp */; }; + F1F484DD591337399FCD0464 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5617D10CB7136EC9A4194EF /* display.cpp */; }; + F22C401903993639AE05A295 /* xh_stbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 147800BBCB80346798B35D75 /* xh_stbox.cpp */; }; + F22C401903993639AE05A296 /* xh_stbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 147800BBCB80346798B35D75 /* xh_stbox.cpp */; }; + F24F637D59F637CA9A7E23C9 /* xh_filectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */; }; + F24F637D59F637CA9A7E23CA /* xh_filectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */; }; + F2813BF297C73A3ABD02EC98 /* glcanvas_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */; }; + F2813BF297C73A3ABD02EC99 /* glcanvas_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */; }; + F2F2963D8ECC32D39FDBF101 /* tif_write.c in Sources */ = {isa = PBXBuildFile; fileRef = E9B992CB6C28339FB0CA5E27 /* tif_write.c */; }; + F2F2963D8ECC32D39FDBF102 /* tif_write.c in Sources */ = {isa = PBXBuildFile; fileRef = E9B992CB6C28339FB0CA5E27 /* tif_write.c */; }; + F34D240EB4513FE996179182 /* xh_mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */; }; + F34D240EB4513FE996179183 /* xh_mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */; }; + F38202271C6131908C358DEC /* mstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC3D1E222FD93A69B1D1366E /* mstream.cpp */; }; + F38202271C6131908C358DED /* mstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC3D1E222FD93A69B1D1366E /* mstream.cpp */; }; + F3AC352D6DAE3A12A5664768 /* styleparams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */; }; + F3AC352D6DAE3A12A5664769 /* styleparams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */; }; + F3CB42BB6D983675862C01F3 /* xh_toolb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */; }; + F3CB42BB6D983675862C01F4 /* xh_toolb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */; }; + F43DAE2E829A3A7493531381 /* richtextimagedlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */; }; + F43DAE2E829A3A7493531382 /* richtextimagedlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */; }; + F46777ABE0743B04A1E1F0A4 /* spinbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */; }; + F46777ABE0743B04A1E1F0A5 /* spinbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */; }; + F4C0CEADEDC23610BF6983D6 /* artmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0665A40F3FC3F218074C63C /* artmac.cpp */; }; + F4C0CEADEDC23610BF6983D7 /* artmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0665A40F3FC3F218074C63C /* artmac.cpp */; }; + F501AB044AAC39DCB8C0B3E1 /* editors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C7F740A55E39FD890B3C7F /* editors.cpp */; }; + F501AB044AAC39DCB8C0B3E2 /* editors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C7F740A55E39FD890B3C7F /* editors.cpp */; }; + F55F3887CDE633D7877C607B /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */; }; + F55F3887CDE633D7877C607C /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */; }; + F569D7A3F0E038E9B4CC2A76 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; }; + F569D7A3F0E038E9B4CC2A77 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; }; + F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; + F5806029B1BA3924A8FDDBC2 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; + F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; + F5D0BCF1A6C839E5829199E3 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; + F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; }; + F5D2146C94E733FAAB6D286B /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; }; + F5DF7AF0FA9E371BB71EF798 /* xh_listbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */; }; + F5DF7AF0FA9E371BB71EF799 /* xh_listbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */; }; + F5FF98C231B33E3EB7902C64 /* colordlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = DAAED71A534135A9A61612A6 /* colordlgosx.mm */; }; + F5FF98C231B33E3EB7902C65 /* colordlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = DAAED71A534135A9A61612A6 /* colordlgosx.mm */; }; + F6A1AC5CF84E32C19F91A614 /* statbrma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */; }; + F6A1AC5CF84E32C19F91A615 /* statbrma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */; }; + F6B85CD918E93923BE631B95 /* fs_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */; }; + F6B85CD918E93923BE631B96 /* fs_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */; }; + F70156C3E68B38FCB72FE253 /* dirdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */; }; + F70156C3E68B38FCB72FE254 /* dirdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */; }; + F72020415D713C1BA41C17CF /* richmsgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */; }; + F72020415D713C1BA41C17D0 /* richmsgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */; }; + F747991E5C973F9B8C9D800A /* fontcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */; }; + F747991E5C973F9B8C9D800B /* fontcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */; }; + F7D10B6E0CBA32EFAF79C77C /* xh_dirpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */; }; + F7D10B6E0CBA32EFAF79C77D /* xh_dirpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */; }; + F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */; }; + F80C2290D67B345F9CF60086 /* dpycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */; }; + F84D59648206349A9768157C /* msgdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33CFE51FD6F0362092DF1A85 /* msgdlg.mm */; }; + F84D59648206349A9768157D /* msgdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33CFE51FD6F0362092DF1A85 /* msgdlg.mm */; }; + F85D632964383F29BC3B30B6 /* tif_next.c in Sources */ = {isa = PBXBuildFile; fileRef = DFDC805DD3063C389F93642D /* tif_next.c */; }; + F85D632964383F29BC3B30B7 /* tif_next.c in Sources */ = {isa = PBXBuildFile; fileRef = DFDC805DD3063C389F93642D /* tif_next.c */; }; + F89405757B063F80B111F469 /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E0EBCDDF248638B58B01D9CC /* datetime.cpp */; }; + F89405757B063F80B111F46A /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E0EBCDDF248638B58B01D9CC /* datetime.cpp */; }; + F910C74E48823E0BA7F7885D /* graphicc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BACAA6CE4A0934459F26B27C /* graphicc.cpp */; }; + F910C74E48823E0BA7F7885E /* graphicc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BACAA6CE4A0934459F26B27C /* graphicc.cpp */; }; + FADD46CB89B135D1AF1D5F8A /* richtextstyledlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */; }; + FADD46CB89B135D1AF1D5F8B /* richtextstyledlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */; }; + FB09720D13673A7B81BCB645 /* xh_datectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C63C964DAFAD311694367C94 /* xh_datectrl.cpp */; }; + FB09720D13673A7B81BCB646 /* xh_datectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C63C964DAFAD311694367C94 /* xh_datectrl.cpp */; }; + FB8B6E4789A3311A98C5B0A8 /* clrpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */; }; + FB8B6E4789A3311A98C5B0A9 /* clrpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */; }; + FBA19C939E1E33EDB05043FE /* cairo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */; }; + FBA19C939E1E33EDB05043FF /* cairo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */; }; + FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */; }; + FBE4DB30865D3177B3A9993C /* xh_animatctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */; }; + FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EB76F786D7F3FF286948D22 /* jcomapi.c */; }; + FCE5B139CBE73FCB804EF7DE /* jcomapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EB76F786D7F3FF286948D22 /* jcomapi.c */; }; + FD1F6CD8286D3D428FD52A28 /* filepickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B580FD04D0D83601826FD5EE /* filepickerg.cpp */; }; + FD1F6CD8286D3D428FD52A29 /* filepickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B580FD04D0D83601826FD5EE /* filepickerg.cpp */; }; + FD38B04026F930CC80BC9480 /* m_pre.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61658C3EABB4341AA38C691E /* m_pre.cpp */; }; + FD38B04026F930CC80BC9481 /* m_pre.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61658C3EABB4341AA38C691E /* m_pre.cpp */; }; + FD3CC5F0AA41384B9388A1E0 /* htmlfilt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C6C4F5468743265A02D656C /* htmlfilt.cpp */; }; + FD3CC5F0AA41384B9388A1E1 /* htmlfilt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C6C4F5468743265A02D656C /* htmlfilt.cpp */; }; + FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66411D54BAD338498AC59401 /* xh_scrol.cpp */; }; + FDE14459359334DE9FB03ED6 /* xh_scrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66411D54BAD338498AC59401 /* xh_scrol.cpp */; }; + FE2DBCCC1D0B36A3BE4493C0 /* fs_arc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88F2BA2F0598342186A484B5 /* fs_arc.cpp */; }; + FE2DBCCC1D0B36A3BE4493C1 /* fs_arc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88F2BA2F0598342186A484B5 /* fs_arc.cpp */; }; + FE5285579C7F39C48FC66B10 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 888BD97139C936679691FF34 /* hash.cpp */; }; + FE5285579C7F39C48FC66B11 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 888BD97139C936679691FF34 /* hash.cpp */; }; + FE5B7C7A84B83C17A38E8403 /* LexSML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */; }; + FE5B7C7A84B83C17A38E8404 /* LexSML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */; }; + FE9A662A1F9B34D099C45C1D /* xh_cald.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093B5233861B3F9B8C85762B /* xh_cald.cpp */; }; + FE9A662A1F9B34D099C45C1E /* xh_cald.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093B5233861B3F9B8C85762B /* xh_cald.cpp */; }; + FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */; }; + FEA741A9B6663A4C929893C3 /* aboutdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */; }; + FEB073547F3F3AC19D31F698 /* tif_tile.c in Sources */ = {isa = PBXBuildFile; fileRef = BD88495AF72531A28D2201D0 /* tif_tile.c */; }; + FEB073547F3F3AC19D31F699 /* tif_tile.c in Sources */ = {isa = PBXBuildFile; fileRef = BD88495AF72531A28D2201D0 /* tif_tile.c */; }; + FECC98B53C0F3106AB04E69E /* tif_fax3.c in Sources */ = {isa = PBXBuildFile; fileRef = 30FD1048328234E59D319863 /* tif_fax3.c */; }; + FECC98B53C0F3106AB04E69F /* tif_fax3.c in Sources */ = {isa = PBXBuildFile; fileRef = 30FD1048328234E59D319863 /* tif_fax3.c */; }; + FEF99FF6C38D3B488396B142 /* ffile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */; }; + FEF99FF6C38D3B488396B143 /* ffile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */; }; + FF50EC0EC5F23DF890C6E95F /* colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9D1F14339D1C331087650931 /* colour.cpp */; }; + FF50EC0EC5F23DF890C6E960 /* colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9D1F14339D1C331087650931 /* colour.cpp */; }; + FF7DB2884F6E3C5DB4BDF61D /* fswatcher_kqueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */; }; + FF7DB2884F6E3C5DB4BDF61E /* fswatcher_kqueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */; }; + FFF5BFBE600E35FAB7EA522C /* fileback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC12D557950A3B0D89D9F2F3 /* fileback.cpp */; }; + FFF5BFBE600E35FAB7EA522D /* fileback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC12D557950A3B0D89D9F2F3 /* fileback.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 0080254545B9383ABDF2045C /* xh_odcombo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_odcombo.cpp; path = ../../src/xrc/xh_odcombo.cpp; sourceTree = ""; }; + 00969CBE3B8F32C78C195619 /* panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panel.cpp; path = ../../src/ribbon/panel.cpp; sourceTree = ""; }; + 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bookctrl.cpp; path = ../../src/common/bookctrl.cpp; sourceTree = ""; }; + 00DA3D3EEF5E305CA73A1871 /* region.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = region.cpp; path = ../../src/osx/carbon/region.cpp; sourceTree = ""; }; + 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dndcmn.cpp; path = ../../src/common/dndcmn.cpp; sourceTree = ""; }; + 018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hidjoystick.cpp; path = ../../src/osx/core/hidjoystick.cpp; sourceTree = ""; }; + 01BA6D45FE4C381493EB4372 /* validate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = validate.cpp; path = ../../src/common/validate.cpp; sourceTree = ""; }; + 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imaglist.cpp; path = ../../src/osx/imaglist.cpp; sourceTree = ""; }; + 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctfst.c; path = ../../src/jpeg/jfdctfst.c; sourceTree = ""; }; + 02D2E8B5C89939CE90B99E2B /* archive.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = archive.cpp; path = ../../src/common/archive.cpp; sourceTree = ""; }; + 02D9332D5C5632E981936E29 /* jquant2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant2.c; path = ../../src/jpeg/jquant2.c; sourceTree = ""; }; + 032A38738B58394E8617617B /* tif_dirinfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirinfo.c; path = ../../src/tiff/libtiff/tif_dirinfo.c; sourceTree = ""; }; + 033B94A9AC8A3370A794503F /* extended.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = extended.c; path = ../../src/common/extended.c; sourceTree = ""; }; + 0401B7302088357BB6B7F16F /* timerimpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timerimpl.cpp; path = ../../src/common/timerimpl.cpp; sourceTree = ""; }; + 04082EC1C91334379425802D /* LexConf.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexConf.cxx; path = ../../src/stc/scintilla/src/LexConf.cxx; sourceTree = ""; }; + 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmndata.cpp; path = ../../src/common/cmndata.cpp; sourceTree = ""; }; + 05310A868F0B35999C568681 /* xh_editlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_editlbox.cpp; path = ../../src/xrc/xh_editlbox.cpp; sourceTree = ""; }; + 05A4437E9697300390FDE14E /* auibar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = auibar.cpp; path = ../../src/aui/auibar.cpp; sourceTree = ""; }; + 06B4A895955B32258DCD62BF /* xh_dlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_dlg.cpp; path = ../../src/xrc/xh_dlg.cpp; sourceTree = ""; }; + 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combocmn.cpp; path = ../../src/common/combocmn.cpp; sourceTree = ""; }; + 071FEABEA61E3B559A47A7DB /* statusbr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statusbr.cpp; path = ../../src/generic/statusbr.cpp; sourceTree = ""; }; + 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bttn.cpp; path = ../../src/xrc/xh_bttn.cpp; sourceTree = ""; }; + 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmp.cpp; path = ../../src/xrc/xh_bmp.cpp; sourceTree = ""; }; + 080597FC0436378E96EDA94B /* m_links.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_links.cpp; path = ../../src/html/m_links.cpp; sourceTree = ""; }; + 082CA018FB883999839C1DCE /* m_tables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_tables.cpp; path = ../../src/html/m_tables.cpp; sourceTree = ""; }; + 087B66573CD33DA99DA82B1C /* xmlres.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlres.cpp; path = ../../src/xrc/xmlres.cpp; sourceTree = ""; }; + 0890779C662C35889A8C6C2E /* jdmerge.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmerge.c; path = ../../src/jpeg/jdmerge.c; sourceTree = ""; }; + 0903EE9B3793303285FF96E3 /* textfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textfile.cpp; path = ../../src/common/textfile.cpp; sourceTree = ""; }; + 093B5233861B3F9B8C85762B /* xh_cald.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cald.cpp; path = ../../src/xrc/xh_cald.cpp; sourceTree = ""; }; + 0964797530CF3FE7B8DB6242 /* pngwtran.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwtran.c; path = ../../src/png/pngwtran.c; sourceTree = ""; }; + 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choicbkg.cpp; path = ../../src/generic/choicbkg.cpp; sourceTree = ""; }; + 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCsound.cxx; path = ../../src/stc/scintilla/src/LexCsound.cxx; sourceTree = ""; }; + 0B0DC125AFFC322E8E496262 /* dirdlg.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = dirdlg.mm; path = ../../src/osx/cocoa/dirdlg.mm; sourceTree = ""; }; + 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cursor.cpp; path = ../../src/osx/carbon/cursor.cpp; sourceTree = ""; }; + 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timerunx.cpp; path = ../../src/unix/timerunx.cpp; sourceTree = ""; }; + 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = ""; }; + 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/src/LexRebol.cxx; sourceTree = ""; }; + 0E8036758CEC3296B555E4DF /* notebook.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = notebook.mm; path = ../../src/osx/cocoa/notebook.mm; sourceTree = ""; }; + 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = ""; }; + 0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = ""; }; + 108517BCD39230E7A89BC943 /* jerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jerror.c; path = ../../src/jpeg/jerror.c; sourceTree = ""; }; + 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dumpmode.c; path = ../../src/tiff/libtiff/tif_dumpmode.c; sourceTree = ""; }; + 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVHDL.cxx; path = ../../src/stc/scintilla/src/LexVHDL.cxx; sourceTree = ""; }; + 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexHaskell.cxx; path = ../../src/stc/scintilla/src/LexHaskell.cxx; sourceTree = ""; }; + 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpcx.cpp; path = ../../src/common/imagpcx.cpp; sourceTree = ""; }; + 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = txtstrm.cpp; path = ../../src/common/txtstrm.cpp; sourceTree = ""; }; + 1197B997B1D139C5AE4D198A /* dseldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dseldlg.cpp; path = ../../src/common/dseldlg.cpp; sourceTree = ""; }; + 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmpbt.cpp; path = ../../src/xrc/xh_bmpbt.cpp; sourceTree = ""; }; + 12363D1F50FE301DAEE7F04A /* control.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = control.cpp; path = ../../src/osx/carbon/control.cpp; sourceTree = ""; }; + 12363D1F50FE301DAEE7F04B /* control.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = control.cpp; path = ../../src/ribbon/control.cpp; sourceTree = ""; }; + 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clipbrd.cpp; path = ../../src/osx/carbon/clipbrd.cpp; sourceTree = ""; }; + 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbmpcmn.cpp; path = ../../src/common/statbmpcmn.cpp; sourceTree = ""; }; + 137E01C362E134449BF966ED /* imagfill.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagfill.cpp; path = ../../src/common/imagfill.cpp; sourceTree = ""; }; + 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpcboxg.cpp; path = ../../src/generic/bmpcboxg.cpp; sourceTree = ""; }; + 147800BBCB80346798B35D75 /* xh_stbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stbox.cpp; path = ../../src/xrc/xh_stbox.cpp; sourceTree = ""; }; + 1482A34AC32133E4BE207223 /* regexec.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regexec.c; path = ../../src/regex/regexec.c; sourceTree = ""; }; + 149D299A0EDB3D998118EC93 /* tif_color.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_color.c; path = ../../src/tiff/libtiff/tif_color.c; sourceTree = ""; }; + 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jmemmgr.c; path = ../../src/jpeg/jmemmgr.c; sourceTree = ""; }; + 14EF4B028AD63B4A885D29A1 /* srchctrl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = srchctrl.mm; path = ../../src/osx/cocoa/srchctrl.mm; sourceTree = ""; }; + 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ownerdrwcmn.cpp; path = ../../src/common/ownerdrwcmn.cpp; sourceTree = ""; }; + 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexInno.cxx; path = ../../src/stc/scintilla/src/LexInno.cxx; sourceTree = ""; }; + 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_unkwn.cpp; path = ../../src/xrc/xh_unkwn.cpp; sourceTree = ""; }; + 160EB9744CB63A0B81DC651F /* hid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hid.cpp; path = ../../src/osx/core/hid.cpp; sourceTree = ""; }; + 1629FA905F903324AA5BE72C /* vscroll.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vscroll.cpp; path = ../../src/generic/vscroll.cpp; sourceTree = ""; }; + 168DB301ACC736FF96D7F581 /* file.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file.cpp; path = ../../src/common/file.cpp; sourceTree = ""; }; + 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCrontab.cxx; path = ../../src/stc/scintilla/src/LexCrontab.cxx; sourceTree = ""; }; + 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gifdecod.cpp; path = ../../src/common/gifdecod.cpp; sourceTree = ""; }; + 1731A6096BFC3A468AB4755A /* tif_open.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_open.c; path = ../../src/tiff/libtiff/tif_open.c; sourceTree = ""; }; + 1731D6708BFE3DE7B101CE74 /* object.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = object.cpp; path = ../../src/common/object.cpp; sourceTree = ""; }; + 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlpars.cpp; path = ../../src/html/htmlpars.cpp; sourceTree = ""; }; + 18044326B5B13A98A49732DD /* fontdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdlg.cpp; path = ../../src/osx/carbon/fontdlg.cpp; sourceTree = ""; }; + 194ADD28300E329E80F7892E /* htmprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmprint.cpp; path = ../../src/html/htmprint.cpp; sourceTree = ""; }; + 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nonownedwnd_osx.cpp; path = ../../src/osx/nonownedwnd_osx.cpp; sourceTree = ""; }; + 1A0650754DC2358CA5933B28 /* pngerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngerror.c; path = ../../src/png/pngerror.c; sourceTree = ""; }; + 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlsub.cpp; path = ../../src/common/ctrlsub.cpp; sourceTree = ""; }; + 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tglbtn_osx.cpp; path = ../../src/osx/tglbtn_osx.cpp; sourceTree = ""; }; + 1BB59DD194923D6399087A75 /* graphcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphcmn.cpp; path = ../../src/common/graphcmn.cpp; sourceTree = ""; }; + 1BC0322549563787A21CE8F1 /* LexNsis.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexNsis.cxx; path = ../../src/stc/scintilla/src/LexNsis.cxx; sourceTree = ""; }; + 1C4762898E5330C28651EE73 /* graphics.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphics.cpp; path = ../../src/osx/carbon/graphics.cpp; sourceTree = ""; }; + 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UniConversion.cxx; path = ../../src/stc/scintilla/src/UniConversion.cxx; sourceTree = ""; }; + 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMSSQL.cxx; path = ../../src/stc/scintilla/src/LexMSSQL.cxx; sourceTree = ""; }; + 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextimagedlg.cpp; path = ../../src/richtext/richtextimagedlg.cpp; sourceTree = ""; }; + 1D025E39C79E3E119D19686C /* libwx_osx_cocoa_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_cocoa_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D799486AD7F336BB1F33DDC /* menu.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = menu.mm; path = ../../src/osx/cocoa/menu.mm; sourceTree = ""; }; + 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = ""; }; + 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = ""; }; + 1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = ""; }; + 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = ""; }; + 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = ""; }; + 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pickerbase.cpp; path = ../../src/common/pickerbase.cpp; sourceTree = ""; }; + 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_ojpeg.c; path = ../../src/tiff/libtiff/tif_ojpeg.c; sourceTree = ""; }; + 207F0F88390138B6B41183EB /* aboutdlg.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = aboutdlg.mm; path = ../../src/osx/cocoa/aboutdlg.mm; sourceTree = ""; }; + 20B922D61CDB3CCEB59A5194 /* convauto.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = convauto.cpp; path = ../../src/common/convauto.cpp; sourceTree = ""; }; + 20E4A10BCD773C84AEC481A1 /* jdmarker.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmarker.c; path = ../../src/jpeg/jdmarker.c; sourceTree = ""; }; + 2128AD8BD12E3F33AD57478E /* overlay.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = overlay.cpp; path = ../../src/osx/carbon/overlay.cpp; sourceTree = ""; }; + 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_tree.cpp; path = ../../src/xrc/xh_tree.cpp; sourceTree = ""; }; + 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcscreen.cpp; path = ../../src/osx/carbon/dcscreen.cpp; sourceTree = ""; }; + 22D9626646773CED82449D5D /* persist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = persist.cpp; path = ../../src/common/persist.cpp; sourceTree = ""; }; + 2334539088B036BEAB230D1C /* filectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filectrlg.cpp; path = ../../src/generic/filectrlg.cpp; sourceTree = ""; }; + 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextstyledlg.cpp; path = ../../src/richtext/richtextstyledlg.cpp; sourceTree = ""; }; + 238741BDA2C73E56899CCB04 /* dcprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcprint.cpp; path = ../../src/osx/carbon/dcprint.cpp; sourceTree = ""; }; + 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clipcmn.cpp; path = ../../src/common/clipcmn.cpp; sourceTree = ""; }; + 23FC98E2305230E2990471E3 /* wxcrt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wxcrt.cpp; path = ../../src/common/wxcrt.cpp; sourceTree = ""; }; + 242BF97B558634A79322052C /* prntbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prntbase.cpp; path = ../../src/common/prntbase.cpp; sourceTree = ""; }; + 24396D584D053948A3FF0DCD /* imagpng.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpng.cpp; path = ../../src/common/imagpng.cpp; sourceTree = ""; }; + 24930711031D35288D28B04B /* choiccmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choiccmn.cpp; path = ../../src/common/choiccmn.cpp; sourceTree = ""; }; + 24DF23D67E693D999B875101 /* toolbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbkg.cpp; path = ../../src/generic/toolbkg.cpp; sourceTree = ""; }; + 24E82A05E9A9323287CDB15B /* artstd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artstd.cpp; path = ../../src/common/artstd.cpp; sourceTree = ""; }; + 25C86D3D4839343BA1D8BDEE /* xti.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xti.cpp; path = ../../src/common/xti.cpp; sourceTree = ""; }; + 26381308E32A3A179E7A9B40 /* gridsel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridsel.cpp; path = ../../src/generic/gridsel.cpp; sourceTree = ""; }; + 26632A254717372BAA4D514D /* framemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = framemanager.cpp; path = ../../src/aui/framemanager.cpp; sourceTree = ""; }; + 26D7C4995D7A35A1854B533F /* window_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = window_osx.cpp; path = ../../src/osx/window_osx.cpp; sourceTree = ""; }; + 271B4B77622B3411A7BF6634 /* dataobj.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dataobj.cpp; path = ../../src/osx/carbon/dataobj.cpp; sourceTree = ""; }; + 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statlinecmn.cpp; path = ../../src/common/statlinecmn.cpp; sourceTree = ""; }; + 29387393C07C39DB8FF1663B /* artprov.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artprov.cpp; path = ../../src/common/artprov.cpp; sourceTree = ""; }; + 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlrsall.cpp; path = ../../src/xrc/xmlrsall.cpp; sourceTree = ""; }; + 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg.c; path = ../../src/tiff/libtiff/tif_jpeg.c; sourceTree = ""; }; + 29D6506AEA5A323B8735F126 /* pngread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngread.c; path = ../../src/png/pngread.c; sourceTree = ""; }; + 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridctrl.cpp; path = ../../src/generic/gridctrl.cpp; sourceTree = ""; }; + 2A4D36DE66EC3EB09E883D6B /* taskbar.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = taskbar.mm; path = ../../src/osx/cocoa/taskbar.mm; sourceTree = ""; }; + 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerPro.cxx; path = ../../src/stc/scintilla/src/LexPowerPro.cxx; sourceTree = ""; }; + 2A67053D16D63C588E555C84 /* dragimgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dragimgg.cpp; path = ../../src/generic/dragimgg.cpp; sourceTree = ""; }; + 2ACC8667173D3AB09F6214F4 /* sound.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound.cpp; path = ../../src/osx/carbon/sound.cpp; sourceTree = ""; }; + 2ACC8667173D3AB09F6214F5 /* sound.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound.cpp; path = ../../src/osx/core/sound.cpp; sourceTree = ""; }; + 2AF7739C389536F79DAA31E5 /* Selection.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Selection.cxx; path = ../../src/stc/scintilla/src/Selection.cxx; sourceTree = ""; }; + 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = utilscocoa.mm; path = ../../src/osx/carbon/utilscocoa.mm; sourceTree = ""; }; + 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSQL.cxx; path = ../../src/stc/scintilla/src/LexSQL.cxx; sourceTree = ""; }; + 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clrpickerg.cpp; path = ../../src/generic/clrpickerg.cpp; sourceTree = ""; }; + 2C090A76B6F23E6481A27282 /* ipcbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ipcbase.cpp; path = ../../src/common/ipcbase.cpp; sourceTree = ""; }; + 2C6C4F5468743265A02D656C /* htmlfilt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlfilt.cpp; path = ../../src/html/htmlfilt.cpp; sourceTree = ""; }; + 2C904B4BA8273355869812B2 /* clntdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clntdata.cpp; path = ../../src/common/clntdata.cpp; sourceTree = ""; }; + 2D61240ABD70328BA5789663 /* colourcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourcmn.cpp; path = ../../src/common/colourcmn.cpp; sourceTree = ""; }; + 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpwnd.cpp; path = ../../src/html/helpwnd.cpp; sourceTree = ""; }; + 2DF2456ED905357B8C1D74D9 /* webkit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = webkit.mm; path = ../../src/html/htmlctrl/webkit/webkit.mm; sourceTree = ""; }; + 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontutilcmn.cpp; path = ../../src/common/fontutilcmn.cpp; sourceTree = ""; }; + 2E24C6F2A04E30EB95598305 /* chm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = chm.cpp; path = ../../src/html/chm.cpp; sourceTree = ""; }; + 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = epolldispatcher.cpp; path = ../../src/unix/epolldispatcher.cpp; sourceTree = ""; }; + 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexScriptol.cxx; path = ../../src/stc/scintilla/src/LexScriptol.cxx; sourceTree = ""; }; + 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mimecmn.cpp; path = ../../src/common/mimecmn.cpp; sourceTree = ""; }; + 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMySQL.cxx; path = ../../src/stc/scintilla/src/LexMySQL.cxx; sourceTree = ""; }; + 2F41EDEB298538CC86FF6DC1 /* jcparam.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcparam.c; path = ../../src/jpeg/jcparam.c; sourceTree = ""; }; + 2F94CF171F4532B89FECF475 /* busyinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = busyinfo.cpp; path = ../../src/generic/busyinfo.cpp; sourceTree = ""; }; + 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_predict.c; path = ../../src/tiff/libtiff/tif_predict.c; sourceTree = ""; }; + 302A13BC64C238A297F4399F /* brush.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brush.cpp; path = ../../src/osx/brush.cpp; sourceTree = ""; }; + 303ACF199BE431BD891C9301 /* overlaycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = overlaycmn.cpp; path = ../../src/common/overlaycmn.cpp; sourceTree = ""; }; + 305614D19CF23CB2B14A5B2E /* tif_flush.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_flush.c; path = ../../src/tiff/libtiff/tif_flush.c; sourceTree = ""; }; + 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../src/stc/scintilla/src/LexGAP.cxx; sourceTree = ""; }; + 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontcmn.cpp; path = ../../src/common/fontcmn.cpp; sourceTree = ""; }; + 30FD1048328234E59D319863 /* tif_fax3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3.c; path = ../../src/tiff/libtiff/tif_fax3.c; sourceTree = ""; }; + 31EFBD7D10003A5187348B35 /* tooltip.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = tooltip.mm; path = ../../src/osx/cocoa/tooltip.mm; sourceTree = ""; }; + 31F4B9B03D52339B8F82C114 /* variant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = variant.cpp; path = ../../src/common/variant.cpp; sourceTree = ""; }; + 326723AEB79A305F90D6B41D /* advprops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = advprops.cpp; path = ../../src/propgrid/advprops.cpp; sourceTree = ""; }; + 33CFE51FD6F0362092DF1A85 /* msgdlg.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = msgdlg.mm; path = ../../src/osx/cocoa/msgdlg.mm; sourceTree = ""; }; + 343D4FDD5CC030618EF24729 /* dcmemory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcmemory.cpp; path = ../../src/osx/core/dcmemory.cpp; sourceTree = ""; }; + 346C68F0CCD23823B78267F0 /* tif_lzw.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_lzw.c; path = ../../src/tiff/libtiff/tif_lzw.c; sourceTree = ""; }; + 35007225BB683683AA7C5E48 /* glcanvas.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = glcanvas.mm; path = ../../src/osx/cocoa/glcanvas.mm; sourceTree = ""; }; + 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../src/stc/scintilla/src/LexSmalltalk.cxx; sourceTree = ""; }; + 358D0A3AC73F322EA732D020 /* pngrutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../../src/png/pngrutil.c; sourceTree = ""; }; + 36E1DBA275AD325DB759C180 /* fontenum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenum.cpp; path = ../../src/osx/core/fontenum.cpp; sourceTree = ""; }; + 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../src/stc/scintilla/src/LexPowerShell.cxx; sourceTree = ""; }; + 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tokenzr.cpp; path = ../../src/common/tokenzr.cpp; sourceTree = ""; }; + 373242CD08F330208A7CF438 /* fontenumcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenumcmn.cpp; path = ../../src/common/fontenumcmn.cpp; sourceTree = ""; }; + 374E341C8703367686DEDE93 /* jmemnobs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jmemnobs.c; path = ../../src/jpeg/jmemnobs.c; sourceTree = ""; }; + 375E7A99FF4C38FA9E223772 /* LexAda.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAda.cxx; path = ../../src/stc/scintilla/src/LexAda.cxx; sourceTree = ""; }; + 375FF97B202F3C359402D13E /* jdpostct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdpostct.c; path = ../../src/jpeg/jdpostct.c; sourceTree = ""; }; + 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gdiobj.cpp; path = ../../src/osx/carbon/gdiobj.cpp; sourceTree = ""; }; + 38891BF8F51E398F9082903F /* LexTAL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTAL.cxx; path = ../../src/stc/scintilla/src/LexTAL.cxx; sourceTree = ""; }; + 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DocumentAccessor.cxx; path = ../../src/stc/scintilla/src/DocumentAccessor.cxx; sourceTree = ""; }; + 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = fontdlgosx.mm; path = ../../src/osx/carbon/fontdlgosx.mm; sourceTree = ""; }; + 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_slidr.cpp; path = ../../src/xrc/xh_slidr.cpp; sourceTree = ""; }; + 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbuttn_osx.cpp; path = ../../src/osx/bmpbuttn_osx.cpp; sourceTree = ""; }; + 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = styleparams.cpp; path = ../../src/html/styleparams.cpp; sourceTree = ""; }; + 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdiounix.cpp; path = ../../src/unix/fdiounix.cpp; sourceTree = ""; }; + 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolb.cpp; path = ../../src/xrc/xh_toolb.cpp; sourceTree = ""; }; + 3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = ""; }; + 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = spinbutt.mm; path = ../../src/osx/cocoa/spinbutt.mm; sourceTree = ""; }; + 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = ""; }; + 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = ""; }; + 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = ""; }; + 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = ""; }; + 3E3043D7BE9C33B59E900CCE /* jcmaster.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmaster.c; path = ../../src/jpeg/jcmaster.c; sourceTree = ""; }; + 3E6F40F4740C3ED29D83E107 /* tif_version.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_version.c; path = ../../src/tiff/libtiff/tif_version.c; sourceTree = ""; }; + 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dobjcmn.cpp; path = ../../src/common/dobjcmn.cpp; sourceTree = ""; }; + 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gallery.cpp; path = ../../src/ribbon/gallery.cpp; sourceTree = ""; }; + 3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = ""; }; + 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = ""; }; + 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = ""; }; + 4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = ""; }; + 40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/src/LexLisp.cxx; sourceTree = ""; }; + 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = ""; }; + 40CE02524DD4385AB2C3DF95 /* socket.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = socket.cpp; path = ../../src/common/socket.cpp; sourceTree = ""; }; + 4188821BBA833CCAA678B234 /* utilscmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilscmn.cpp; path = ../../src/common/utilscmn.cpp; sourceTree = ""; }; + 418AD9241B673308BE31DC06 /* xlocale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xlocale.cpp; path = ../../src/common/xlocale.cpp; sourceTree = ""; }; + 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = renderer.cpp; path = ../../src/osx/carbon/renderer.cpp; sourceTree = ""; }; + 42E433D1700631A8907B8227 /* helpctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpctrl.cpp; path = ../../src/html/helpctrl.cpp; sourceTree = ""; }; + 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filtall.cpp; path = ../../src/common/filtall.cpp; sourceTree = ""; }; + 4549845C0751356A907C23E0 /* jdtrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdtrans.c; path = ../../src/jpeg/jdtrans.c; sourceTree = ""; }; + 45860601270D318D93BEE1F3 /* LexMagik.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMagik.cxx; path = ../../src/stc/scintilla/src/LexMagik.cxx; sourceTree = ""; }; + 4592464D4868329897F3864D /* LexSpice.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpice.cxx; path = ../../src/stc/scintilla/src/LexSpice.cxx; sourceTree = ""; }; + 45D7558DF5E03A2EB41883F0 /* pngwutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = ../../src/png/pngwutil.c; sourceTree = ""; }; + 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fldlgcmn.cpp; path = ../../src/common/fldlgcmn.cpp; sourceTree = ""; }; + 4692909E4B823F71822B13F8 /* taskbarcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = taskbarcmn.cpp; path = ../../src/common/taskbarcmn.cpp; sourceTree = ""; }; + 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatcherg.cpp; path = ../../src/generic/fswatcherg.cpp; sourceTree = ""; }; + 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextbuffer.cpp; path = ../../src/richtext/richtextbuffer.cpp; sourceTree = ""; }; + 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdiodispatcher.cpp; path = ../../src/common/fdiodispatcher.cpp; sourceTree = ""; }; + 47FF6D792CA234C395692118 /* PlatWX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlatWX.cpp; path = ../../src/stc/PlatWX.cpp; sourceTree = ""; }; + 4867546E8B8D3C8683A23ED5 /* any.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = any.cpp; path = ../../src/common/any.cpp; sourceTree = ""; }; + 48D72D20DB1D3E1CA5ED112A /* effects.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effects.cpp; path = ../../src/common/effects.cpp; sourceTree = ""; }; + 48F1439BF6C3361296F05A33 /* tif_error.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_error.c; path = ../../src/tiff/libtiff/tif_error.c; sourceTree = ""; }; + 49612306912038DDBCABB4DE /* url.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = url.cpp; path = ../../src/common/url.cpp; sourceTree = ""; }; + 496674699F173A5385EAFF07 /* calctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = calctrlg.cpp; path = ../../src/generic/calctrlg.cpp; sourceTree = ""; }; + 4969528429903F15882F5391 /* sockosx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockosx.cpp; path = ../../src/osx/core/sockosx.cpp; sourceTree = ""; }; + 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAPDL.cxx; path = ../../src/stc/scintilla/src/LexAPDL.cxx; sourceTree = ""; }; + 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_propdlg.cpp; path = ../../src/xrc/xh_propdlg.cpp; sourceTree = ""; }; + 49CABA38E78D34DFA260AA06 /* renderg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = renderg.cpp; path = ../../src/generic/renderg.cpp; sourceTree = ""; }; + 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmdproc.cpp; path = ../../src/common/cmdproc.cpp; sourceTree = ""; }; + 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBaan.cxx; path = ../../src/stc/scintilla/src/LexBaan.cxx; sourceTree = ""; }; + 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCaml.cxx; path = ../../src/stc/scintilla/src/LexCaml.cxx; sourceTree = ""; }; + 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = ""; }; + 4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = ""; }; + 4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = ""; }; + 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/src/LexCSS.cxx; sourceTree = ""; }; + 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = ""; }; + 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexProgress.cxx; path = ../../src/stc/scintilla/src/LexProgress.cxx; sourceTree = ""; }; + 4FC2F076657431458896115A /* checkboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checkboxcmn.cpp; path = ../../src/common/checkboxcmn.cpp; sourceTree = ""; }; + 4FDE5A962FA234FA83A605AD /* Indicator.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Indicator.cxx; path = ../../src/stc/scintilla/src/Indicator.cxx; sourceTree = ""; }; + 4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = ""; }; + 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/src/LexSpecman.cxx; sourceTree = ""; }; + 5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/src/LexLua.cxx; sourceTree = ""; }; + 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = ""; }; + 5219A792C6A736F193D4A82F /* ContractionState.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../src/stc/scintilla/src/ContractionState.cxx; sourceTree = ""; }; + 5248A45AB113341EAC361910 /* notebook_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notebook_osx.cpp; path = ../../src/osx/notebook_osx.cpp; sourceTree = ""; }; + 52FE1599218730CC99A3F801 /* m_dflist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_dflist.cpp; path = ../../src/html/m_dflist.cpp; sourceTree = ""; }; + 530DC2E26BF2313E8702AD43 /* popupwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = popupwin.cpp; path = ../../src/osx/carbon/popupwin.cpp; sourceTree = ""; }; + 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiocmn.cpp; path = ../../src/common/radiocmn.cpp; sourceTree = ""; }; + 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_text.cpp; path = ../../src/xrc/xh_text.cpp; sourceTree = ""; }; + 53D06E47477B3E32BB6B915E /* jcsample.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcsample.c; path = ../../src/jpeg/jcsample.c; sourceTree = ""; }; + 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox_osx.cpp; path = ../../src/osx/combobox_osx.cpp; sourceTree = ""; }; + 5466CC2D6579360E9C665EE5 /* memory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = memory.cpp; path = ../../src/common/memory.cpp; sourceTree = ""; }; + 548906E4E72935E48CE4AF87 /* m_image.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_image.cpp; path = ../../src/html/m_image.cpp; sourceTree = ""; }; + 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattextcmn.cpp; path = ../../src/common/stattextcmn.cpp; sourceTree = ""; }; + 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = zipstrm.cpp; path = ../../src/common/zipstrm.cpp; sourceTree = ""; }; + 552757A901E732CAA8E3F16D /* list.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = list.cpp; path = ../../src/common/list.cpp; sourceTree = ""; }; + 55EBB18CB4773C788510B14B /* LexEiffel.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexEiffel.cxx; path = ../../src/stc/scintilla/src/LexEiffel.cxx; sourceTree = ""; }; + 5612DBC4125B379DA2B28824 /* buttonbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = buttonbar.cpp; path = ../../src/generic/buttonbar.cpp; sourceTree = ""; }; + 5612DBC4125B379DA2B28825 /* buttonbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = buttonbar.cpp; path = ../../src/ribbon/buttonbar.cpp; sourceTree = ""; }; + 56653FACC7D13804A70556AD /* sckfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckfile.cpp; path = ../../src/common/sckfile.cpp; sourceTree = ""; }; + 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gaugecmn.cpp; path = ../../src/common/gaugecmn.cpp; sourceTree = ""; }; + 57C06D5DB5F733A4A235B206 /* combobox.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = combobox.mm; path = ../../src/osx/cocoa/combobox.mm; sourceTree = ""; }; + 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listbk.cpp; path = ../../src/xrc/xh_listbk.cpp; sourceTree = ""; }; + 580AFC66F3003582B43043B1 /* animateg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animateg.cpp; path = ../../src/generic/animateg.cpp; sourceTree = ""; }; + 58421C141C9E31C6A7A3C183 /* filefn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filefn.cpp; path = ../../src/common/filefn.cpp; sourceTree = ""; }; + 58E1F571B01F34D4AB70CA18 /* property.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = property.cpp; path = ../../src/propgrid/property.cpp; sourceTree = ""; }; + 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexEScript.cxx; path = ../../src/stc/scintilla/src/LexEScript.cxx; sourceTree = ""; }; + 59572A234F0636D78BFD9F6B /* spinctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctlg.cpp; path = ../../src/generic/spinctlg.cpp; sourceTree = ""; }; + 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdatadst.c; path = ../../src/jpeg/jdatadst.c; sourceTree = ""; }; + 59C6B9849FF6325E890942EF /* xmlrole.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmlrole.c; path = ../../src/expat/lib/xmlrole.c; sourceTree = ""; }; + 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choice_osx.cpp; path = ../../src/osx/choice_osx.cpp; sourceTree = ""; }; + 59ED0C057D8F388A89DC7177 /* page.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = page.cpp; path = ../../src/ribbon/page.cpp; sourceTree = ""; }; + 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filectrlcmn.cpp; path = ../../src/common/filectrlcmn.cpp; sourceTree = ""; }; + 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_radbt.cpp; path = ../../src/xrc/xh_radbt.cpp; sourceTree = ""; }; + 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CharClassify.cxx; path = ../../src/stc/scintilla/src/CharClassify.cxx; sourceTree = ""; }; + 5B32A13D5B3336098B1B9765 /* pngtrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../../src/png/pngtrans.c; sourceTree = ""; }; + 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloop_cf.cpp; path = ../../src/osx/core/evtloop_cf.cpp; sourceTree = ""; }; + 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jutils.c; path = ../../src/jpeg/jutils.c; sourceTree = ""; }; + 5C85865D28DC31649440A921 /* imagxpm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagxpm.cpp; path = ../../src/common/imagxpm.cpp; sourceTree = ""; }; + 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_filepicker.cpp; path = ../../src/xrc/xh_filepicker.cpp; sourceTree = ""; }; + 5CB4781DF8C432C688F30CDD /* ftp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ftp.cpp; path = ../../src/common/ftp.cpp; sourceTree = ""; }; + 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printmac.cpp; path = ../../src/osx/core/printmac.cpp; sourceTree = ""; }; + 5CFC6875EF4732E88E029065 /* tglbtn.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = tglbtn.mm; path = ../../src/osx/cocoa/tglbtn.mm; sourceTree = ""; }; + 5D2F8259CC99380CB8217DEF /* tif_unix.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_unix.c; path = ../../src/tiff/libtiff/tif_unix.c; sourceTree = ""; }; + 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cairo.cpp; path = ../../src/common/cairo.cpp; sourceTree = ""; }; + 5DE635F30F3935099AF1486C /* stattextg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattextg.cpp; path = ../../src/generic/stattextg.cpp; sourceTree = ""; }; + 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinbutt_osx.cpp; path = ../../src/osx/spinbutt_osx.cpp; sourceTree = ""; }; + 5E463A493FD930DE80E58608 /* pngset.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngset.c; path = ../../src/png/pngset.c; sourceTree = ""; }; + 5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dataview_osx.cpp; path = ../../src/osx/dataview_osx.cpp; sourceTree = ""; }; + 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listbkg.cpp; path = ../../src/generic/listbkg.cpp; sourceTree = ""; }; + 5ED2105A5A033E3384EBC4ED /* selstore.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = selstore.cpp; path = ../../src/generic/selstore.cpp; sourceTree = ""; }; + 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdrepdlg.cpp; path = ../../src/generic/fdrepdlg.cpp; sourceTree = ""; }; + 5F3D473DC5123EDAB767045C /* datavgen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavgen.cpp; path = ../../src/generic/datavgen.cpp; sourceTree = ""; }; + 5F555177554E398286DBC6FB /* xh_stlin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stlin.cpp; path = ../../src/xrc/xh_stlin.cpp; sourceTree = ""; }; + 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listc.cpp; path = ../../src/xrc/xh_listc.cpp; sourceTree = ""; }; + 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textentrycmn.cpp; path = ../../src/common/textentrycmn.cpp; sourceTree = ""; }; + 5F84098A475939BB9EE87E70 /* imagbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagbmp.cpp; path = ../../src/common/imagbmp.cpp; sourceTree = ""; }; + 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_comboctrl.cpp; path = ../../src/xrc/xh_comboctrl.cpp; sourceTree = ""; }; + 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexOpal.cxx; path = ../../src/stc/scintilla/src/LexOpal.cxx; sourceTree = ""; }; + 5FF661188B563D27A11F5716 /* fontutil.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontutil.cpp; path = ../../src/osx/fontutil.cpp; sourceTree = ""; }; + 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobut_osx.cpp; path = ../../src/osx/radiobut_osx.cpp; sourceTree = ""; }; + 5FFCF47A161B3E08B19BFE14 /* jdsample.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdsample.c; path = ../../src/jpeg/jdsample.c; sourceTree = ""; }; + 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbar_osx.cpp; path = ../../src/osx/scrolbar_osx.cpp; sourceTree = ""; }; + 607EF0043E723B7B9BE101EA /* wxprintf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wxprintf.cpp; path = ../../src/common/wxprintf.cpp; sourceTree = ""; }; + 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_filectrl.cpp; path = ../../src/xrc/xh_filectrl.cpp; sourceTree = ""; }; + 61548D0FE1353D7C846DD721 /* menuitem.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = menuitem.mm; path = ../../src/osx/cocoa/menuitem.mm; sourceTree = ""; }; + 61658C3EABB4341AA38C691E /* m_pre.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_pre.cpp; path = ../../src/html/m_pre.cpp; sourceTree = ""; }; + 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fileconf.cpp; path = ../../src/common/fileconf.cpp; sourceTree = ""; }; + 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPLM.cxx; path = ../../src/stc/scintilla/src/LexPLM.cxx; sourceTree = ""; }; + 63867276260C3F4A980E83D8 /* rgncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rgncmn.cpp; path = ../../src/common/rgncmn.cpp; sourceTree = ""; }; + 640783FBACA43206B782C77B /* evtloopcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloopcmn.cpp; path = ../../src/common/evtloopcmn.cpp; sourceTree = ""; }; + 646743F6FDFE3ACFA1A79B40 /* jidctred.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctred.c; path = ../../src/jpeg/jidctred.c; sourceTree = ""; }; + 64B25B87203E3464BCDD277D /* tif_read.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_read.c; path = ../../src/tiff/libtiff/tif_read.c; sourceTree = ""; }; + 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prntdlgg.cpp; path = ../../src/generic/prntdlgg.cpp; sourceTree = ""; }; + 65C47DFD6E243724A83603F3 /* libwx_osx_cocoa.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwx_osx_cocoa.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 66411D54BAD338498AC59401 /* xh_scrol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_scrol.cpp; path = ../../src/xrc/xh_scrol.cpp; sourceTree = ""; }; + 66426B63AA3E3A279936C034 /* grideditors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = grideditors.cpp; path = ../../src/generic/grideditors.cpp; sourceTree = ""; }; + 664736BDE465350C9C4750E9 /* jcmarker.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmarker.c; path = ../../src/jpeg/jcmarker.c; sourceTree = ""; }; + 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colrdlgg.cpp; path = ../../src/generic/colrdlgg.cpp; sourceTree = ""; }; + 66C21CA37BF63893887FD91B /* menu_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menu_osx.cpp; path = ../../src/osx/menu_osx.cpp; sourceTree = ""; }; + 66FDA882451239EA8DF2E0B5 /* tif_luv.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_luv.c; path = ../../src/tiff/libtiff/tif_luv.c; sourceTree = ""; }; + 6718204F4700318E89EAC906 /* LexBullant.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBullant.cxx; path = ../../src/stc/scintilla/src/LexBullant.cxx; sourceTree = ""; }; + 67D76B026121359F9B22F8B0 /* languageinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = languageinfo.cpp; path = ../../src/common/languageinfo.cpp; sourceTree = ""; }; + 67DCEEB6861731319C30817F /* cshelp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cshelp.cpp; path = ../../src/common/cshelp.cpp; sourceTree = ""; }; + 684D92E552BE313CBE0A88AA /* valnum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valnum.cpp; path = ../../src/common/valnum.cpp; sourceTree = ""; }; + 6876262846EA3569B36D92E9 /* imagjpeg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagjpeg.cpp; path = ../../src/common/imagjpeg.cpp; sourceTree = ""; }; + 68B81FBDA49D3C1991B6356A /* jdcolor.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdcolor.c; path = ../../src/jpeg/jdcolor.c; sourceTree = ""; }; + 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_thunder.c; path = ../../src/tiff/libtiff/tif_thunder.c; sourceTree = ""; }; + 68E5188DB6003C35A8C7754D /* htmlcell.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlcell.cpp; path = ../../src/html/htmlcell.cpp; sourceTree = ""; }; + 693F731B7D1730A79485F9EC /* minifram.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = minifram.cpp; path = ../../src/osx/minifram.cpp; sourceTree = ""; }; + 69A6CAF721E53E83B4820DE6 /* pngwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = ../../src/png/pngwrite.c; sourceTree = ""; }; + 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = numdlgg.cpp; path = ../../src/generic/numdlgg.cpp; sourceTree = ""; }; + 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgridiface.cpp; path = ../../src/propgrid/propgridiface.cpp; sourceTree = ""; }; + 69F098E47EBF34368ABAE7ED /* timer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timer.cpp; path = ../../src/osx/core/timer.cpp; sourceTree = ""; }; + 6A82EDCFFBAC30098B238957 /* caret.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = caret.cpp; path = ../../src/generic/caret.cpp; sourceTree = ""; }; + 6AC666417602346EA583709E /* translation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = translation.cpp; path = ../../src/common/translation.cpp; sourceTree = ""; }; + 6BC0A61629E635FAB4E09505 /* geometry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = geometry.cpp; path = ../../src/common/geometry.cpp; sourceTree = ""; }; + 6BC93D1DE277395592610085 /* propdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propdlg.cpp; path = ../../src/generic/propdlg.cpp; sourceTree = ""; }; + 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = numformatter.cpp; path = ../../src/common/numformatter.cpp; sourceTree = ""; }; + 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textctrl_osx.cpp; path = ../../src/osx/textctrl_osx.cpp; sourceTree = ""; }; + 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbar_osx.cpp; path = ../../src/osx/toolbar_osx.cpp; sourceTree = ""; }; + 6DBF3053414F3C448312165A /* jcdctmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcdctmgr.c; path = ../../src/jpeg/jcdctmgr.c; sourceTree = ""; }; + 6E53493CB84A30AE8C1CD721 /* dnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = dnd.mm; path = ../../src/osx/cocoa/dnd.mm; sourceTree = ""; }; + 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_sizer.cpp; path = ../../src/xrc/xh_sizer.cpp; sourceTree = ""; }; + 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = ""; }; + 6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = ""; }; + 701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = ""; }; + 70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = ""; }; + 7195E665E0F233839B967FC9 /* timercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timercmn.cpp; path = ../../src/common/timercmn.cpp; sourceTree = ""; }; + 71DB140E670738839EC42C2B /* Document.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Document.cxx; path = ../../src/stc/scintilla/src/Document.cxx; sourceTree = ""; }; + 724927B0045F3CC0884878BB /* radiobtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobtncmn.cpp; path = ../../src/common/radiobtncmn.cpp; sourceTree = ""; }; + 7255468B6D5F3D8697994A53 /* LexR.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexR.cxx; path = ../../src/stc/scintilla/src/LexR.cxx; sourceTree = ""; }; + 725574EF98C4301989181CBF /* jctrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jctrans.c; path = ../../src/jpeg/jctrans.c; sourceTree = ""; }; + 726C0457DF1232C793918DC1 /* tif_zip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_zip.c; path = ../../src/tiff/libtiff/tif_zip.c; sourceTree = ""; }; + 7273A7E255323EB3B391D997 /* headerctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headerctrlg.cpp; path = ../../src/generic/headerctrlg.cpp; sourceTree = ""; }; + 727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = ""; }; + 72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = ""; }; + 72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = ""; }; + 743EF8DB16CE371DA5C66623 /* statline.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = statline.mm; path = ../../src/osx/cocoa/statline.mm; sourceTree = ""; }; + 757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = ""; }; + 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpbase.cpp; path = ../../src/common/stdpbase.cpp; sourceTree = ""; }; + 75D0C937F2A03ADA8581A2BB /* arcall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arcall.cpp; path = ../../src/common/arcall.cpp; sourceTree = ""; }; + 76337016F2CA3C85831702E6 /* grid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = grid.cpp; path = ../../src/generic/grid.cpp; sourceTree = ""; }; + 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbtncmn.cpp; path = ../../src/common/bmpbtncmn.cpp; sourceTree = ""; }; + 773D91F8280434519BD167EA /* radiobox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobox_osx.cpp; path = ../../src/osx/radiobox_osx.cpp; sourceTree = ""; }; + 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcgraph.cpp; path = ../../src/common/dcgraph.cpp; sourceTree = ""; }; + 777385D10CCC350C90F02824 /* textentry_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textentry_osx.cpp; path = ../../src/osx/textentry_osx.cpp; sourceTree = ""; }; + 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = aboutdlgg.cpp; path = ../../src/generic/aboutdlgg.cpp; sourceTree = ""; }; + 77F5E7BCD9B2307D8DBCC052 /* font.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = font.cpp; path = ../../src/osx/carbon/font.cpp; sourceTree = ""; }; + 789F45D14FF23E248FCFB5FA /* utils.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = utils.mm; path = ../../src/osx/cocoa/utils.mm; sourceTree = ""; }; + 78D7866F95C73A28BB540606 /* LexBash.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBash.cxx; path = ../../src/stc/scintilla/src/LexBash.cxx; sourceTree = ""; }; + 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombo.cpp; path = ../../src/generic/odcombo.cpp; sourceTree = ""; }; + 7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = ""; }; + 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = ""; }; + 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = ""; }; + 7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = ""; }; + 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/src/LexCmake.cxx; sourceTree = ""; }; + 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glgrab.cpp; path = ../../src/osx/core/glgrab.cpp; sourceTree = ""; }; + 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths_cf.cpp; path = ../../src/osx/core/stdpaths_cf.cpp; sourceTree = ""; }; + 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = protocol.cpp; path = ../../src/common/protocol.cpp; sourceTree = ""; }; + 7BA6ADD758693BD180D3275B /* treebase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebase.cpp; path = ../../src/common/treebase.cpp; sourceTree = ""; }; + 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctrl_osx.cpp; path = ../../src/osx/srchctrl_osx.cpp; sourceTree = ""; }; + 7C97C1F26B5A38C49543060C /* mimetype.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mimetype.cpp; path = ../../src/osx/core/mimetype.cpp; sourceTree = ""; }; + 7CC8B73BB8C0391E9EC1B2D1 /* colour.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = colour.mm; path = ../../src/osx/cocoa/colour.mm; sourceTree = ""; }; + 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattext_osx.cpp; path = ../../src/osx/stattext_osx.cpp; sourceTree = ""; }; + 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatchercmn.cpp; path = ../../src/common/fswatchercmn.cpp; sourceTree = ""; }; + 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSorcus.cxx; path = ../../src/stc/scintilla/src/LexSorcus.cxx; sourceTree = ""; }; + 7D90D14874FD38079835AF0B /* editlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = editlbox.cpp; path = ../../src/generic/editlbox.cpp; sourceTree = ""; }; + 7DEBE1EB2B94305E8E8D6EA5 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxcocoa.xcconfig; sourceTree = ""; }; + 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RunStyles.cxx; path = ../../src/stc/scintilla/src/RunStyles.cxx; sourceTree = ""; }; + 7EB95BCFA255323183A996C9 /* m_style.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_style.cpp; path = ../../src/html/m_style.cpp; sourceTree = ""; }; + 7EE2459D69BA35838C274488 /* LexCLW.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCLW.cxx; path = ../../src/stc/scintilla/src/LexCLW.cxx; sourceTree = ""; }; + 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treectlg.cpp; path = ../../src/generic/treectlg.cpp; sourceTree = ""; }; + 7FCA75FE592C3469AE351FBF /* winpars.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = winpars.cpp; path = ../../src/html/winpars.cpp; sourceTree = ""; }; + 7FE0455EBDC63D82B2D88587 /* jcprepct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcprepct.c; path = ../../src/jpeg/jcprepct.c; sourceTree = ""; }; + 810EB7316DF3344197C78EC0 /* jcmainct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmainct.c; path = ../../src/jpeg/jcmainct.c; sourceTree = ""; }; + 81390F96937631078EFCD891 /* utilsexc_base.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_base.cpp; path = ../../src/osx/core/utilsexc_base.cpp; sourceTree = ""; }; + 81708CFA21A03013ACB8DDD7 /* checkbox.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = checkbox.mm; path = ../../src/osx/cocoa/checkbox.mm; sourceTree = ""; }; + 81821049E39B32C6ABCF6820 /* helpdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpdlg.cpp; path = ../../src/html/helpdlg.cpp; sourceTree = ""; }; + 81A30C745CA73E30B788B408 /* image.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = image.cpp; path = ../../src/common/image.cpp; sourceTree = ""; }; + 81B3DFBB73573FFDBD320334 /* datstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datstrm.cpp; path = ../../src/common/datstrm.cpp; sourceTree = ""; }; + 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpfrm.cpp; path = ../../src/html/helpfrm.cpp; sourceTree = ""; }; + 832BBBFE664736D5978420C6 /* fmapbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fmapbase.cpp; path = ../../src/common/fmapbase.cpp; sourceTree = ""; }; + 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stbmp.cpp; path = ../../src/xrc/xh_stbmp.cpp; sourceTree = ""; }; + 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklstcmn.cpp; path = ../../src/common/checklstcmn.cpp; sourceTree = ""; }; + 83B878A16ABC396E8C03A15E /* dialog.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = dialog.mm; path = ../../src/osx/cocoa/dialog.mm; sourceTree = ""; }; + 84758329F2163F00A9C005DF /* collpaneg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = collpaneg.cpp; path = ../../src/generic/collpaneg.cpp; sourceTree = ""; }; + 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_gdctl.cpp; path = ../../src/xrc/xh_gdctl.cpp; sourceTree = ""; }; + 84A7A3B499503ECABC6A838F /* btncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = btncmn.cpp; path = ../../src/common/btncmn.cpp; sourceTree = ""; }; + 8555204EBA8930809B732842 /* accesscmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accesscmn.cpp; path = ../../src/common/accesscmn.cpp; sourceTree = ""; }; + 861438BD294335D4B859EA71 /* toplvcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toplvcmn.cpp; path = ../../src/common/toplvcmn.cpp; sourceTree = ""; }; + 864438709B363773B8C3382D /* datetimefmt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datetimefmt.cpp; path = ../../src/common/datetimefmt.cpp; sourceTree = ""; }; + 8685B8ED68F23DB0B770FD74 /* xmltok.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmltok.c; path = ../../src/expat/lib/xmltok.c; sourceTree = ""; }; + 86884BC843F6337EABF744BB /* jdapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapimin.c; path = ../../src/jpeg/jdapimin.c; sourceTree = ""; }; + 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexFortran.cxx; path = ../../src/stc/scintilla/src/LexFortran.cxx; sourceTree = ""; }; + 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPascal.cxx; path = ../../src/stc/scintilla/src/LexPascal.cxx; sourceTree = ""; }; + 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxdebug.xcconfig; sourceTree = ""; }; + 8734C52C7559310784396455 /* LexRuby.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRuby.cxx; path = ../../src/stc/scintilla/src/LexRuby.cxx; sourceTree = ""; }; + 8744F2C80ECF375999195935 /* LexPB.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPB.cxx; path = ../../src/stc/scintilla/src/LexPB.cxx; sourceTree = ""; }; + 87799D3168B43EB7B5686826 /* pngrtran.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../../src/png/pngrtran.c; sourceTree = ""; }; + 87D973CA8D673267BD0844D3 /* paper.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = paper.cpp; path = ../../src/common/paper.cpp; sourceTree = ""; }; + 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_fontpicker.cpp; path = ../../src/xrc/xh_fontpicker.cpp; sourceTree = ""; }; + 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmpcbox.cpp; path = ../../src/xrc/xh_bmpcbox.cpp; sourceTree = ""; }; + 888BD97139C936679691FF34 /* hash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hash.cpp; path = ../../src/common/hash.cpp; sourceTree = ""; }; + 889FFA9573A835F280A21CB4 /* xh_html.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_html.cpp; path = ../../src/xrc/xh_html.cpp; sourceTree = ""; }; + 88F2BA2F0598342186A484B5 /* fs_arc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_arc.cpp; path = ../../src/common/fs_arc.cpp; sourceTree = ""; }; + 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_codec.c; path = ../../src/tiff/libtiff/tif_codec.c; sourceTree = ""; }; + 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_choic.cpp; path = ../../src/xrc/xh_choic.cpp; sourceTree = ""; }; + 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlnkcmn.cpp; path = ../../src/common/hyperlnkcmn.cpp; sourceTree = ""; }; + 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_animatctrl.cpp; path = ../../src/xrc/xh_animatctrl.cpp; sourceTree = ""; }; + 8C78A1539462370CAA429508 /* accel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accel.cpp; path = ../../src/osx/accel.cpp; sourceTree = ""; }; + 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpcboxcmn.cpp; path = ../../src/common/bmpcboxcmn.cpp; sourceTree = ""; }; + 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = calctrlcmn.cpp; path = ../../src/common/calctrlcmn.cpp; sourceTree = ""; }; + 8D2549709E0133C9A267E3A5 /* evtloop.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = evtloop.mm; path = ../../src/osx/cocoa/evtloop.mm; sourceTree = ""; }; + 8D529E2668C23D94A7706C8A /* textdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textdlgg.cpp; path = ../../src/generic/textdlgg.cpp; sourceTree = ""; }; + 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaWX.cpp; path = ../../src/stc/ScintillaWX.cpp; sourceTree = ""; }; + 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_htmllbox.cpp; path = ../../src/xrc/xh_htmllbox.cpp; sourceTree = ""; }; + 8EB76F786D7F3FF286948D22 /* jcomapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcomapi.c; path = ../../src/jpeg/jcomapi.c; sourceTree = ""; }; + 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPOV.cxx; path = ../../src/stc/scintilla/src/LexPOV.cxx; sourceTree = ""; }; + 8EFF4707641D3F20AB602ED6 /* jccolor.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccolor.c; path = ../../src/jpeg/jccolor.c; sourceTree = ""; }; + 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wizard.cpp; path = ../../src/generic/wizard.cpp; sourceTree = ""; }; + 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stopwatch.cpp; path = ../../src/common/stopwatch.cpp; sourceTree = ""; }; + 8F633793051F371F94C27530 /* LexVB.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVB.cxx; path = ../../src/stc/scintilla/src/LexVB.cxx; sourceTree = ""; }; + 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctrlcmn.cpp; path = ../../src/common/spinctrlcmn.cpp; sourceTree = ""; }; + 8FFDFB4D208F37569AC548B0 /* imagall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagall.cpp; path = ../../src/common/imagall.cpp; sourceTree = ""; }; + 9051902662BE38B3912B34EA /* dlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dlgcmn.cpp; path = ../../src/common/dlgcmn.cpp; sourceTree = ""; }; + 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctint.c; path = ../../src/jpeg/jfdctint.c; sourceTree = ""; }; + 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirctrlg.cpp; path = ../../src/generic/dirctrlg.cpp; sourceTree = ""; }; + 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSML.cxx; path = ../../src/stc/scintilla/src/LexSML.cxx; sourceTree = ""; }; + 91300EB871CC39ECBC430D48 /* pngget.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = ../../src/png/pngget.c; sourceTree = ""; }; + 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sashwin.cpp; path = ../../src/generic/sashwin.cpp; sourceTree = ""; }; + 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notifmsgg.cpp; path = ../../src/generic/notifmsgg.cpp; sourceTree = ""; }; + 926BDF9C386C3A9A8C24D453 /* statbox.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = statbox.mm; path = ../../src/osx/cocoa/statbox.mm; sourceTree = ""; }; + 9389DAF8B91030B7AAB029FF /* PerLine.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PerLine.cxx; path = ../../src/stc/scintilla/src/PerLine.cxx; sourceTree = ""; }; + 93B77251C0E0382D9A8E113D /* xh_grid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_grid.cpp; path = ../../src/xrc/xh_grid.cpp; sourceTree = ""; }; + 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynload.cpp; path = ../../src/common/dynload.cpp; sourceTree = ""; }; + 93D07403FCA530D7A9FD2917 /* jfdctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctflt.c; path = ../../src/jpeg/jfdctflt.c; sourceTree = ""; }; + 950D51915EF83B57B5E8306F /* xh_spin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_spin.cpp; path = ../../src/xrc/xh_spin.cpp; sourceTree = ""; }; + 95186FEF3DEF39D8B1157BD5 /* stattext.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = stattext.mm; path = ../../src/osx/cocoa/stattext.mm; sourceTree = ""; }; + 95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = ""; }; + 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = ""; }; + 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = ""; }; + 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = ""; }; + 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WindowAccessor.cxx; path = ../../src/stc/scintilla/src/WindowAccessor.cxx; sourceTree = ""; }; + 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgridpagestate.cpp; path = ../../src/propgrid/propgridpagestate.cpp; sourceTree = ""; }; + 96CED508FA3C3B6B9265099E /* rendcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rendcmn.cpp; path = ../../src/common/rendcmn.cpp; sourceTree = ""; }; + 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StyleContext.cxx; path = ../../src/stc/scintilla/src/StyleContext.cxx; sourceTree = ""; }; + 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = ""; }; + 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctrl_osx.cpp; path = ../../src/osx/spinctrl_osx.cpp; sourceTree = ""; }; + 97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = ""; }; + 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = ""; }; + 98A7F0605AAC3D28A8C9F253 /* gauge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = gauge.mm; path = ../../src/osx/cocoa/gauge.mm; sourceTree = ""; }; + 9988CBB0772A3539970162FA /* arttango.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arttango.cpp; path = ../../src/common/arttango.cpp; sourceTree = ""; }; + 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checkbox_osx.cpp; path = ../../src/osx/checkbox_osx.cpp; sourceTree = ""; }; + 998D611109EC33A9A6A11C5A /* gdicmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gdicmn.cpp; path = ../../src/common/gdicmn.cpp; sourceTree = ""; }; + 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = powercmn.cpp; path = ../../src/common/powercmn.cpp; sourceTree = ""; }; + 99E5B6DD00273D978C241BCA /* radiobut.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = radiobut.mm; path = ../../src/osx/cocoa/radiobut.mm; sourceTree = ""; }; + 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_gauge.cpp; path = ../../src/xrc/xh_gauge.cpp; sourceTree = ""; }; + 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_mdi.cpp; path = ../../src/xrc/xh_mdi.cpp; sourceTree = ""; }; + 9B862D1027C4367BBF44420F /* slider.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = slider.mm; path = ../../src/osx/cocoa/slider.mm; sourceTree = ""; }; + 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaBase.cxx; path = ../../src/stc/scintilla/src/ScintillaBase.cxx; sourceTree = ""; }; + 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelg.cpp; path = ../../src/generic/panelg.cpp; sourceTree = ""; }; + 9C87B071E3593A889704F512 /* statbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbar.cpp; path = ../../src/common/statbar.cpp; sourceTree = ""; }; + 9CAA325362C73AC8BE20FAA7 /* pngpread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../../src/png/pngpread.c; sourceTree = ""; }; + 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/src/LexYAML.cxx; sourceTree = ""; }; + 9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = ""; }; + 9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = ""; }; + 9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = ""; }; + 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = ""; }; + 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = ""; }; + 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toplevel_osx.cpp; path = ../../src/osx/toplevel_osx.cpp; sourceTree = ""; }; + 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTACL.cxx; path = ../../src/stc/scintilla/src/LexTACL.cxx; sourceTree = ""; }; + 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tipwin.cpp; path = ../../src/generic/tipwin.cpp; sourceTree = ""; }; + 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloopunix.cpp; path = ../../src/unix/evtloopunix.cpp; sourceTree = ""; }; + 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCPP.cxx; path = ../../src/stc/scintilla/src/LexCPP.cxx; sourceTree = ""; }; + 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbox_osx.cpp; path = ../../src/osx/statbox_osx.cpp; sourceTree = ""; }; + 9F838F853CB03CF7932C08C3 /* choice.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = choice.mm; path = ../../src/osx/cocoa/choice.mm; sourceTree = ""; }; + 9FDDE855D9F83E4891362EB4 /* bar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bar.cpp; path = ../../src/ribbon/bar.cpp; sourceTree = ""; }; + 9FEB8204E530329FA085E5B8 /* strconv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strconv.cpp; path = ../../src/common/strconv.cpp; sourceTree = ""; }; + A06AB1974DB93EE2999EC75C /* pngrio.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrio.c; path = ../../src/png/pngrio.c; sourceTree = ""; }; + A0DCC5EF59143640BE13AD73 /* jidctfst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctfst.c; path = ../../src/jpeg/jidctfst.c; sourceTree = ""; }; + A1276C0E5D48337489DEE8DF /* LexErlang.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexErlang.cxx; path = ../../src/stc/scintilla/src/LexErlang.cxx; sourceTree = ""; }; + A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap.cpp; path = ../../src/osx/core/bitmap.cpp; sourceTree = ""; }; + A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = msgdlgg.cpp; path = ../../src/generic/msgdlgg.cpp; sourceTree = ""; }; + A1E1A01885B036C28EBDAE27 /* xmladv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmladv.cpp; path = ../../src/xrc/xmladv.cpp; sourceTree = ""; }; + A284E855892F3A9E9E19E854 /* LexTADS3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTADS3.cxx; path = ../../src/stc/scintilla/src/LexTADS3.cxx; sourceTree = ""; }; + A298576700C33F018616E7BD /* auibook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = auibook.cpp; path = ../../src/aui/auibook.cpp; sourceTree = ""; }; + A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dpycmn.cpp; path = ../../src/common/dpycmn.cpp; sourceTree = ""; }; + A3BF8C9FF2D5314591329D0D /* toolbar.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = toolbar.mm; path = ../../src/osx/cocoa/toolbar.mm; sourceTree = ""; }; + A436B55DC44E3827A757A6D8 /* accelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accelcmn.cpp; path = ../../src/common/accelcmn.cpp; sourceTree = ""; }; + A46D50BEBF523B3F88831086 /* LexAsn1.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsn1.cxx; path = ../../src/stc/scintilla/src/LexAsn1.cxx; sourceTree = ""; }; + A4A745D1821A32D591D76650 /* imagiff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagiff.cpp; path = ../../src/common/imagiff.cpp; sourceTree = ""; }; + A54B80C17F823CB5900AD2E8 /* framecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = framecmn.cpp; path = ../../src/common/framecmn.cpp; sourceTree = ""; }; + A5617D10CB7136EC9A4194EF /* display.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = display.cpp; path = ../../src/osx/core/display.cpp; sourceTree = ""; }; + A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headerctrlcmn.cpp; path = ../../src/common/headerctrlcmn.cpp; sourceTree = ""; }; + A57CF60203F53459A03951A9 /* arrstr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arrstr.cpp; path = ../../src/common/arrstr.cpp; sourceTree = ""; }; + A5BBC1E494D33D028CA547FF /* jddctmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jddctmgr.c; path = ../../src/jpeg/jddctmgr.c; sourceTree = ""; }; + A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = selectdispatcher.cpp; path = ../../src/common/selectdispatcher.cpp; sourceTree = ""; }; + A5EE0B8985443BDCB36F781F /* m_layout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_layout.cpp; path = ../../src/html/m_layout.cpp; sourceTree = ""; }; + A65399C8A6D636139E362119 /* LexAsm.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsm.cxx; path = ../../src/stc/scintilla/src/LexAsm.cxx; sourceTree = ""; }; + A6636144CDE83E8E85270FAF /* hashmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hashmap.cpp; path = ../../src/common/hashmap.cpp; sourceTree = ""; }; + A70C82ADB45A3FB99C420D03 /* regerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regerror.c; path = ../../src/regex/regerror.c; sourceTree = ""; }; + A82C367B86F83981803D55DB /* LexASY.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexASY.cxx; path = ../../src/stc/scintilla/src/LexASY.cxx; sourceTree = ""; }; + A87662D69F0432FC96701280 /* xh_notbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_notbk.cpp; path = ../../src/xrc/xh_notbk.cpp; sourceTree = ""; }; + A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiactioncmn.cpp; path = ../../src/common/uiactioncmn.cpp; sourceTree = ""; }; + A881F49ADCF33C299B041584 /* floatpane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = floatpane.cpp; path = ../../src/aui/floatpane.cpp; sourceTree = ""; }; + A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animatecmn.cpp; path = ../../src/common/animatecmn.cpp; sourceTree = ""; }; + A92B6033D8233DB1821F193B /* xmlparse.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmlparse.c; path = ../../src/expat/lib/xmlparse.c; sourceTree = ""; }; + A9B2316B32653DA0939A372D /* sound_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound_osx.cpp; path = ../../src/osx/sound_osx.cpp; sourceTree = ""; }; + A9C7F740A55E39FD890B3C7F /* editors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = editors.cpp; path = ../../src/propgrid/editors.cpp; sourceTree = ""; }; + A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontpickercmn.cpp; path = ../../src/common/fontpickercmn.cpp; sourceTree = ""; }; + A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbarcmn.cpp; path = ../../src/common/scrolbarcmn.cpp; sourceTree = ""; }; + AA6C6739C3BD3EFA9CF71102 /* jcinit.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcinit.c; path = ../../src/jpeg/jcinit.c; sourceTree = ""; }; + AA90128E29A03CCCA30F4D35 /* vlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vlbox.cpp; path = ../../src/generic/vlbox.cpp; sourceTree = ""; }; + AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_filter.cpp; path = ../../src/common/fs_filter.cpp; sourceTree = ""; }; + AAC12B4456E13F57BEA25A5E /* tif_swab.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_swab.c; path = ../../src/tiff/libtiff/tif_swab.c; sourceTree = ""; }; + AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_clrpicker.cpp; path = ../../src/xrc/xh_clrpicker.cpp; sourceTree = ""; }; + AB466912FDA23F8B87A00A3C /* threadpsx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = threadpsx.cpp; path = ../../src/unix/threadpsx.cpp; sourceTree = ""; }; + AB634FD597793A74B3B3AA7F /* docview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docview.cpp; path = ../../src/common/docview.cpp; sourceTree = ""; }; + AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clrpickercmn.cpp; path = ../../src/common/clrpickercmn.cpp; sourceTree = ""; }; + ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = settcmn.cpp; path = ../../src/common/settcmn.cpp; sourceTree = ""; }; + AC12D557950A3B0D89D9F2F3 /* fileback.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fileback.cpp; path = ../../src/common/fileback.cpp; sourceTree = ""; }; + AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wincmn.cpp; path = ../../src/common/wincmn.cpp; sourceTree = ""; }; + AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiaction_osx.cpp; path = ../../src/osx/uiaction_osx.cpp; sourceTree = ""; }; + AC8BB1AABB3D393EBA527060 /* intl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intl.cpp; path = ../../src/common/intl.cpp; sourceTree = ""; }; + ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynarray.cpp; path = ../../src/common/dynarray.cpp; sourceTree = ""; }; + ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ffile.cpp; path = ../../src/common/ffile.cpp; sourceTree = ""; }; + AE856D950B8C369EB0FE13BA /* datectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectlg.cpp; path = ../../src/generic/datectlg.cpp; sourceTree = ""; }; + AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = nonownedwnd.mm; path = ../../src/osx/cocoa/nonownedwnd.mm; sourceTree = ""; }; + AF26BAB1F4733114926F1724 /* png.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../../src/png/png.c; sourceTree = ""; }; + AF3DF03795153E039B8F1F87 /* LineMarker.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LineMarker.cxx; path = ../../src/stc/scintilla/src/LineMarker.cxx; sourceTree = ""; }; + AF76670146413EEFA005206A /* printps.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printps.cpp; path = ../../src/generic/printps.cpp; sourceTree = ""; }; + AF7CE00168AB33C994374ABA /* tif_extension.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_extension.c; path = ../../src/tiff/libtiff/tif_extension.c; sourceTree = ""; }; + AF9EE701DD653E2299293E5F /* pngwio.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwio.c; path = ../../src/png/pngwio.c; sourceTree = ""; }; + AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagtiff.cpp; path = ../../src/common/imagtiff.cpp; sourceTree = ""; }; + B0665A40F3FC3F218074C63C /* artmac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artmac.cpp; path = ../../src/osx/artmac.cpp; sourceTree = ""; }; + B14D6E7E15FD3C869E341198 /* LexLout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLout.cxx; path = ../../src/stc/scintilla/src/LexLout.cxx; sourceTree = ""; }; + B17772732159304AA7312D72 /* dcclient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcclient.cpp; path = ../../src/osx/carbon/dcclient.cpp; sourceTree = ""; }; + B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolbk.cpp; path = ../../src/xrc/xh_toolbk.cpp; sourceTree = ""; }; + B180290089B139F18B0C7BBA /* stockitem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stockitem.cpp; path = ../../src/common/stockitem.cpp; sourceTree = ""; }; + B181F564935730E89AB00D92 /* LexForth.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexForth.cxx; path = ../../src/stc/scintilla/src/LexForth.cxx; sourceTree = ""; }; + B1F3C70512D93501B0478F3E /* m_fonts.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_fonts.cpp; path = ../../src/html/m_fonts.cpp; sourceTree = ""; }; + B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmainct.c; path = ../../src/jpeg/jdmainct.c; sourceTree = ""; }; + B303230368143F37B2409DE6 /* LexKix.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexKix.cxx; path = ../../src/stc/scintilla/src/LexKix.cxx; sourceTree = ""; }; + B35DA585CFDD32468868E892 /* process.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = process.cpp; path = ../../src/common/process.cpp; sourceTree = ""; }; + B3645350F572364BABF50238 /* containr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = containr.cpp; path = ../../src/common/containr.cpp; sourceTree = ""; }; + B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCOBOL.cxx; path = ../../src/stc/scintilla/src/LexCOBOL.cxx; sourceTree = ""; }; + B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_sttxt.cpp; path = ../../src/xrc/xh_sttxt.cpp; sourceTree = ""; }; + B4028ABB08C63AB59F5F240B /* m_list.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_list.cpp; path = ../../src/html/m_list.cpp; sourceTree = ""; }; + B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appunix.cpp; path = ../../src/unix/appunix.cpp; sourceTree = ""; }; + B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = ""; }; + B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = ""; }; + B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = ""; }; + B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = ""; }; + B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = ""; }; + B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tipdlg.cpp; path = ../../src/generic/tipdlg.cpp; sourceTree = ""; }; + B580FD04D0D83601826FD5EE /* filepickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filepickerg.cpp; path = ../../src/generic/filepickerg.cpp; sourceTree = ""; }; + B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wrapsizer.cpp; path = ../../src/common/wrapsizer.cpp; sourceTree = ""; }; + B63EBEE1A04537E7887E9FD0 /* ustring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ustring.cpp; path = ../../src/common/ustring.cpp; sourceTree = ""; }; + B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBasic.cxx; path = ../../src/stc/scintilla/src/LexBasic.cxx; sourceTree = ""; }; + B7581D7140293BAE88E43DBE /* fs_inet.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_inet.cpp; path = ../../src/common/fs_inet.cpp; sourceTree = ""; }; + B83EDE2D1731311ABDE62F9F /* tif_strip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_strip.c; path = ../../src/tiff/libtiff/tif_strip.c; sourceTree = ""; }; + B890199A37723EFD86C0ADA5 /* quantize.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = quantize.cpp; path = ../../src/common/quantize.cpp; sourceTree = ""; }; + B901252876603DCEA4C66D89 /* nbkbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nbkbase.cpp; path = ../../src/common/nbkbase.cpp; sourceTree = ""; }; + B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_treebk.cpp; path = ../../src/xrc/xh_treebk.cpp; sourceTree = ""; }; + B98B72B3A0A73044B85AED60 /* propgrid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgrid.cpp; path = ../../src/propgrid/propgrid.cpp; sourceTree = ""; }; + B99CA41708513A599AE275A2 /* listbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listbox_osx.cpp; path = ../../src/osx/listbox_osx.cpp; sourceTree = ""; }; + B9B5BC858CCF3477895D2786 /* zstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = zstream.cpp; path = ../../src/common/zstream.cpp; sourceTree = ""; }; + B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../src/stc/scintilla/src/LexD.cxx; sourceTree = ""; }; + B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = ""; }; + BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = ""; }; + BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = ""; }; + BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = ""; }; + BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = ""; }; + BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_chckb.cpp; path = ../../src/xrc/xh_chckb.cpp; sourceTree = ""; }; + BBB30516233A39BE809405AA /* helpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpbase.cpp; path = ../../src/common/helpbase.cpp; sourceTree = ""; }; + BC12B97F233B3B9494DA217F /* imagpnm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpnm.cpp; path = ../../src/common/imagpnm.cpp; sourceTree = ""; }; + BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexNimrod.cxx; path = ../../src/stc/scintilla/src/LexNimrod.cxx; sourceTree = ""; }; + BCD873D873A53BBF955D8A4E /* PositionCache.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PositionCache.cxx; path = ../../src/stc/scintilla/src/PositionCache.cxx; sourceTree = ""; }; + BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_dirpicker.cpp; path = ../../src/xrc/xh_dirpicker.cpp; sourceTree = ""; }; + BD709DEB71623974B9836D69 /* dockart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dockart.cpp; path = ../../src/aui/dockart.cpp; sourceTree = ""; }; + BD88495AF72531A28D2201D0 /* tif_tile.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_tile.c; path = ../../src/tiff/libtiff/tif_tile.c; sourceTree = ""; }; + BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dialog_osx.cpp; path = ../../src/osx/dialog_osx.cpp; sourceTree = ""; }; + BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbar.cpp; path = ../../src/ribbon/toolbar.cpp; sourceTree = ""; }; + BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = progdlgg.cpp; path = ../../src/generic/progdlgg.cpp; sourceTree = ""; }; + BEB08798C70E33DDB360E563 /* layout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = layout.cpp; path = ../../src/common/layout.cpp; sourceTree = ""; }; + BEF6B3FB66243812969E5BD1 /* palette.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = palette.cpp; path = ../../src/osx/palette.cpp; sourceTree = ""; }; + BF1C44D726E63B18A98006EC /* Decoration.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Decoration.cxx; path = ../../src/stc/scintilla/src/Decoration.cxx; sourceTree = ""; }; + BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filepickercmn.cpp; path = ../../src/common/filepickercmn.cpp; sourceTree = ""; }; + BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVE.cxx; path = ../../src/stc/scintilla/src/LexAVE.cxx; sourceTree = ""; }; + BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3sm.c; path = ../../src/tiff/libtiff/tif_fax3sm.c; sourceTree = ""; }; + C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabmdi.cpp; path = ../../src/aui/tabmdi.cpp; sourceTree = ""; }; + C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatcher_kqueue.cpp; path = ../../src/unix/fswatcher_kqueue.cpp; sourceTree = ""; }; + C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdata.cpp; path = ../../src/common/fontdata.cpp; sourceTree = ""; }; + C06FED83BF933DF98C2466AE /* button.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = button.mm; path = ../../src/osx/cocoa/button.mm; sourceTree = ""; }; + C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCL.cxx; path = ../../src/stc/scintilla/src/LexTCL.cxx; sourceTree = ""; }; + C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tarstrm.cpp; path = ../../src/common/tarstrm.cpp; sourceTree = ""; }; + C125FA3837C631A9BE0ED5E7 /* splitter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splitter.cpp; path = ../../src/generic/splitter.cpp; sourceTree = ""; }; + C133B838193A35ABBB803151 /* ViewStyle.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ViewStyle.cxx; path = ../../src/stc/scintilla/src/ViewStyle.cxx; sourceTree = ""; }; + C20E46A504113C899B9DD9B7 /* props.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = props.cpp; path = ../../src/propgrid/props.cpp; sourceTree = ""; }; + C25521AF59B9324EB2809C73 /* XPM.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XPM.cxx; path = ../../src/stc/scintilla/src/XPM.cxx; sourceTree = ""; }; + C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = encconv.cpp; path = ../../src/common/encconv.cpp; sourceTree = ""; }; + C28429A964C337A192D76CC8 /* Style.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Style.cxx; path = ../../src/stc/scintilla/src/Style.cxx; sourceTree = ""; }; + C2BB2949CC0B387AB6879539 /* metafile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = metafile.cpp; path = ../../src/osx/carbon/metafile.cpp; sourceTree = ""; }; + C3019BA65DD73F30A865365F /* frame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = frame.cpp; path = ../../src/osx/carbon/frame.cpp; sourceTree = ""; }; + C356B5738AB13E829E66729E /* LexOthers.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexOthers.cxx; path = ../../src/stc/scintilla/src/LexOthers.cxx; sourceTree = ""; }; + C3784C240C2F330683494926 /* laywin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = laywin.cpp; path = ../../src/generic/laywin.cpp; sourceTree = ""; }; + C37866F41B0C31E295AA7FA6 /* wfstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wfstream.cpp; path = ../../src/common/wfstream.cpp; sourceTree = ""; }; + C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngmem.c; path = ../../src/png/pngmem.c; sourceTree = ""; }; + C466F32CCBD13DBC87285B3D /* helpdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpdata.cpp; path = ../../src/html/helpdata.cpp; sourceTree = ""; }; + C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextprint.cpp; path = ../../src/richtext/richtextprint.cpp; sourceTree = ""; }; + C513377E9E303F778BA9D7ED /* arcfind.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arcfind.cpp; path = ../../src/common/arcfind.cpp; sourceTree = ""; }; + C562D5885AFF3E15837325CE /* xpmdecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xpmdecod.cpp; path = ../../src/common/xpmdecod.cpp; sourceTree = ""; }; + C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anybutton_osx.cpp; path = ../../src/osx/anybutton_osx.cpp; sourceTree = ""; }; + C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AutoComplete.cxx; path = ../../src/stc/scintilla/src/AutoComplete.cxx; sourceTree = ""; }; + C63C964DAFAD311694367C94 /* xh_datectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_datectrl.cpp; path = ../../src/xrc/xh_datectrl.cpp; sourceTree = ""; }; + C64705CE9398316D87BAB4DC /* logg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = logg.cpp; path = ../../src/generic/logg.cpp; sourceTree = ""; }; + C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinbtncmn.cpp; path = ../../src/common/spinbtncmn.cpp; sourceTree = ""; }; + C69E48C06BD23C178F650E42 /* richtextxml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextxml.cpp; path = ../../src/richtext/richtextxml.cpp; sourceTree = ""; }; + C6EB77ED688E3EE294167EF1 /* tif_print.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_print.c; path = ../../src/tiff/libtiff/tif_print.c; sourceTree = ""; }; + C76222F466E831F896A89269 /* LexAU3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAU3.cxx; path = ../../src/stc/scintilla/src/LexAU3.cxx; sourceTree = ""; }; + C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mediactrlcmn.cpp; path = ../../src/common/mediactrlcmn.cpp; sourceTree = ""; }; + C83C97A1FCC5345896C9D7DE /* tif_warning.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_warning.c; path = ../../src/tiff/libtiff/tif_warning.c; sourceTree = ""; }; + C94DC3402FAE3C4FA776DEEA /* window.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = window.mm; path = ../../src/osx/cocoa/window.mm; sourceTree = ""; }; + C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextformatdlg.cpp; path = ../../src/richtext/richtextformatdlg.cpp; sourceTree = ""; }; + C9A305CEC03B3085B159B617 /* fs_mem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_mem.cpp; path = ../../src/common/fs_mem.cpp; sourceTree = ""; }; + C9E32802E8ED3E729FF34CFC /* printdlg.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = printdlg.mm; path = ../../src/osx/cocoa/printdlg.mm; sourceTree = ""; }; + CA0D5D47D62A3148BA51B31B /* tif_compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_compress.c; path = ../../src/tiff/libtiff/tif_compress.c; sourceTree = ""; }; + CA2D9F325F833C408657E7B7 /* dlunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dlunix.cpp; path = ../../src/unix/dlunix.cpp; sourceTree = ""; }; + CA72410F615B3A78A6340532 /* dnd_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dnd_osx.cpp; path = ../../src/osx/dnd_osx.cpp; sourceTree = ""; }; + CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlinkg.cpp; path = ../../src/generic/hyperlinkg.cpp; sourceTree = ""; }; + CBD7B44E33373BCCB60FC11F /* combog.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combog.cpp; path = ../../src/generic/combog.cpp; sourceTree = ""; }; + CC2713393AB132AA8E337AE1 /* LexPython.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPython.cxx; path = ../../src/stc/scintilla/src/LexPython.cxx; sourceTree = ""; }; + CC2E24773D853A77B9FEFA4C /* scrolbar.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = scrolbar.mm; path = ../../src/osx/cocoa/scrolbar.mm; sourceTree = ""; }; + CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_choicbk.cpp; path = ../../src/xrc/xh_choicbk.cpp; sourceTree = ""; }; + CCF7564A2B733F759AA8496B /* jdinput.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdinput.c; path = ../../src/jpeg/jdinput.c; sourceTree = ""; }; + CD72950967F33809931D4968 /* LexAbaqus.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAbaqus.cxx; path = ../../src/stc/scintilla/src/LexAbaqus.cxx; sourceTree = ""; }; + CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_tglbtn.cpp; path = ../../src/xrc/xh_tglbtn.cpp; sourceTree = ""; }; + CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imaggif.cpp; path = ../../src/common/imaggif.cpp; sourceTree = ""; }; + CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choicdgg.cpp; path = ../../src/generic/choicdgg.cpp; sourceTree = ""; }; + CF4F4F5211933057824B5621 /* button_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button_osx.cpp; path = ../../src/osx/button_osx.cpp; sourceTree = ""; }; + CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem_osx.cpp; path = ../../src/osx/menuitem_osx.cpp; sourceTree = ""; }; + D037EA567C253DEEA17E822B /* mousemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mousemanager.cpp; path = ../../src/common/mousemanager.cpp; sourceTree = ""; }; + D0817D6A1AF83608B050EBC3 /* fontmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontmap.cpp; path = ../../src/common/fontmap.cpp; sourceTree = ""; }; + D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cmdlinkbn.cpp; path = ../../src/xrc/xh_cmdlinkbn.cpp; sourceTree = ""; }; + D0B9C41A4D12345AAA764CAD /* stc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stc.cpp; path = ../../src/stc/stc.cpp; sourceTree = ""; }; + D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPerl.cxx; path = ../../src/stc/scintilla/src/LexPerl.cxx; sourceTree = ""; }; + D0CDADAF2D893E32A38351E4 /* tif_aux.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_aux.c; path = ../../src/tiff/libtiff/tif_aux.c; sourceTree = ""; }; + D1EE17722EA937E88A7F0C01 /* dcbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcbase.cpp; path = ../../src/common/dcbase.cpp; sourceTree = ""; }; + D215A0D67563350CB4EECB06 /* slider_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slider_osx.cpp; path = ../../src/osx/slider_osx.cpp; sourceTree = ""; }; + D272910EC35531E5B4D6E05B /* dynlib.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynlib.cpp; path = ../../src/common/dynlib.cpp; sourceTree = ""; }; + D30617843F33310089C1F77A /* richtextstyles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextstyles.cpp; path = ../../src/richtext/richtextstyles.cpp; sourceTree = ""; }; + D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_menu.cpp; path = ../../src/xrc/xh_menu.cpp; sourceTree = ""; }; + D324650313003AAD96E12962 /* listbox.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = listbox.mm; path = ../../src/osx/cocoa/listbox.mm; sourceTree = ""; }; + D3F32C01D122301AB00D06A5 /* tbarbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbarbase.cpp; path = ../../src/common/tbarbase.cpp; sourceTree = ""; }; + D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = ""; }; + D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = ""; }; + D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = ""; }; + D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = ""; }; + D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; + D5F9383D1CE931499F339D85 /* strconv_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strconv_cf.cpp; path = ../../src/osx/core/strconv_cf.cpp; sourceTree = ""; }; + D73954EB5397301F87881646 /* statboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statboxcmn.cpp; path = ../../src/common/statboxcmn.cpp; sourceTree = ""; }; + D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVerilog.cxx; path = ../../src/stc/scintilla/src/LexVerilog.cxx; sourceTree = ""; }; + D784A32C094730FEAA391A9B /* sckstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckstrm.cpp; path = ../../src/common/sckstrm.cpp; sourceTree = ""; }; + D7B3307E56B332769901E99F /* filehistorycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filehistorycmn.cpp; path = ../../src/common/filehistorycmn.cpp; sourceTree = ""; }; + D87406BCF3E833369E12D89A /* LexHTML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexHTML.cxx; path = ../../src/stc/scintilla/src/LexHTML.cxx; sourceTree = ""; }; + D9016355F66D3125919E017D /* listctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrl.cpp; path = ../../src/generic/listctrl.cpp; sourceTree = ""; }; + D922063B2F2536629EEEAAF0 /* popupcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = popupcmn.cpp; path = ../../src/common/popupcmn.cpp; sourceTree = ""; }; + DA2119A7C67D37B290C17989 /* statbmpg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbmpg.cpp; path = ../../src/generic/statbmpg.cpp; sourceTree = ""; }; + DA5E95D498C53A808A8E2EEB /* Editor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Editor.cxx; path = ../../src/stc/scintilla/src/Editor.cxx; sourceTree = ""; }; + DA7F7633279936EFA0B9C5CF /* markupparser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markupparser.cpp; path = ../../src/common/markupparser.cpp; sourceTree = ""; }; + DAAED71A534135A9A61612A6 /* colordlgosx.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = colordlgosx.mm; path = ../../src/osx/carbon/colordlgosx.mm; sourceTree = ""; }; + DB170BF78EFE39D692E11985 /* fontdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdlgg.cpp; path = ../../src/generic/fontdlgg.cpp; sourceTree = ""; }; + DB6963739198360DB3DBCC6C /* dataview.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = dataview.mm; path = ../../src/osx/cocoa/dataview.mm; sourceTree = ""; }; + DB82939EDC593F9CA95C3098 /* init.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = init.cpp; path = ../../src/common/init.cpp; sourceTree = ""; }; + DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = unichar.cpp; path = ../../src/common/unichar.cpp; sourceTree = ""; }; + DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = iconbndl.cpp; path = ../../src/common/iconbndl.cpp; sourceTree = ""; }; + DC0FFDC7A6163F2DA73B84EB /* jchuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jchuff.c; path = ../../src/jpeg/jchuff.c; sourceTree = ""; }; + DC3D1E222FD93A69B1D1366E /* mstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mstream.cpp; path = ../../src/common/mstream.cpp; sourceTree = ""; }; + DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsunx.cpp; path = ../../src/unix/utilsunx.cpp; sourceTree = ""; }; + DC8A52CA69053B27B09F1037 /* filedlg.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = filedlg.mm; path = ../../src/osx/cocoa/filedlg.mm; sourceTree = ""; }; + DC9153A350893820B942D37E /* LexMatlab.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMatlab.cxx; path = ../../src/stc/scintilla/src/LexMatlab.cxx; sourceTree = ""; }; + DD09A813E10A31C19554B425 /* affinematrix2d.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = affinematrix2d.cpp; path = ../../src/common/affinematrix2d.cpp; sourceTree = ""; }; + DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_aui.cpp; path = ../../src/ribbon/art_aui.cpp; sourceTree = ""; }; + DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = socketiohandler.cpp; path = ../../src/common/socketiohandler.cpp; sourceTree = ""; }; + DE16011AD6323AAC8616F973 /* stdstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdstream.cpp; path = ../../src/common/stdstream.cpp; sourceTree = ""; }; + DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statline_osx.cpp; path = ../../src/osx/statline_osx.cpp; sourceTree = ""; }; + DE8238DA30FF3FB984511250 /* sckaddr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckaddr.cpp; path = ../../src/common/sckaddr.cpp; sourceTree = ""; }; + DE8701E1CF2B352B945C17E5 /* valtext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valtext.cpp; path = ../../src/common/valtext.cpp; sourceTree = ""; }; + DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcsvg.cpp; path = ../../src/common/dcsvg.cpp; sourceTree = ""; }; + DECAF5DD80383A2CA76EB383 /* jdatasrc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdatasrc.c; path = ../../src/jpeg/jdatasrc.c; sourceTree = ""; }; + DF376BC55EA73F5FB7328142 /* helpext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpext.cpp; path = ../../src/generic/helpext.cpp; sourceTree = ""; }; + DFDC805DD3063C389F93642D /* tif_next.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_next.c; path = ../../src/tiff/libtiff/tif_next.c; sourceTree = ""; }; + E08A51FA8D8A361681B07295 /* glcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcmn.cpp; path = ../../src/common/glcmn.cpp; sourceTree = ""; }; + E0EBCDDF248638B58B01D9CC /* datetime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datetime.cpp; path = ../../src/common/datetime.cpp; sourceTree = ""; }; + E110907DDC13305E88B90086 /* dirctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirctrlcmn.cpp; path = ../../src/common/dirctrlcmn.cpp; sourceTree = ""; }; + E145FC31ED523B4AA5080A61 /* RESearch.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RESearch.cxx; path = ../../src/stc/scintilla/src/RESearch.cxx; sourceTree = ""; }; + E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrlcmn.cpp; path = ../../src/common/listctrlcmn.cpp; sourceTree = ""; }; + E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbrma.cpp; path = ../../src/osx/carbon/statbrma.cpp; sourceTree = ""; }; + E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PropSet.cxx; path = ../../src/stc/scintilla/src/PropSet.cxx; sourceTree = ""; }; + E38569D873B6394F9E5B821C /* jcphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcphuff.c; path = ../../src/jpeg/jcphuff.c; sourceTree = ""; }; + E433B890264339BA8DB97B1D /* regcomp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regcomp.c; path = ../../src/regex/regcomp.c; sourceTree = ""; }; + E4E16323A43E36DC8024EDF1 /* textctrl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = textctrl.mm; path = ../../src/osx/cocoa/textctrl.mm; sourceTree = ""; }; + E5357E76650035639844D15B /* stringimpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringimpl.cpp; path = ../../src/common/stringimpl.cpp; sourceTree = ""; }; + E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_frame.cpp; path = ../../src/xrc/xh_frame.cpp; sourceTree = ""; }; + E6AB648BC5173104A96CAE66 /* xml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xml.cpp; path = ../../src/xml/xml.cpp; sourceTree = ""; }; + E6CC2B05353C3284B37B2DD7 /* settings.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = settings.cpp; path = ../../src/osx/carbon/settings.cpp; sourceTree = ""; }; + E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = KeyMap.cxx; path = ../../src/stc/scintilla/src/KeyMap.cxx; sourceTree = ""; }; + E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMarkdown.cxx; path = ../../src/stc/scintilla/src/LexMarkdown.cxx; sourceTree = ""; }; + E79B2D1F630036129B9677A7 /* tif_dir.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dir.c; path = ../../src/tiff/libtiff/tif_dir.c; sourceTree = ""; }; + E8072CA67D19346ABF4D465F /* slidercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slidercmn.cpp; path = ../../src/common/slidercmn.cpp; sourceTree = ""; }; + E85E680C62B63D4EBAB2E784 /* jdphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdphuff.c; path = ../../src/jpeg/jdphuff.c; sourceTree = ""; }; + E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CellBuffer.cxx; path = ../../src/stc/scintilla/src/CellBuffer.cxx; sourceTree = ""; }; + E89AC104BF4F33A083F8B382 /* jccoefct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccoefct.c; path = ../../src/jpeg/jccoefct.c; sourceTree = ""; }; + E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = commandlinkbuttong.cpp; path = ../../src/generic/commandlinkbuttong.cpp; sourceTree = ""; }; + E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbase.cpp; path = ../../src/common/bmpbase.cpp; sourceTree = ""; }; + E968913A9A593B258BD8EACB /* msgout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = msgout.cpp; path = ../../src/common/msgout.cpp; sourceTree = ""; }; + E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_scwin.cpp; path = ../../src/xrc/xh_scwin.cpp; sourceTree = ""; }; + E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richmsgdlgg.cpp; path = ../../src/generic/richmsgdlgg.cpp; sourceTree = ""; }; + E9B992CB6C28339FB0CA5E27 /* tif_write.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_write.c; path = ../../src/tiff/libtiff/tif_write.c; sourceTree = ""; }; + E9B9B85572D0312BBF2878DB /* windowid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = windowid.cpp; path = ../../src/common/windowid.cpp; sourceTree = ""; }; + E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirdlgg.cpp; path = ../../src/generic/dirdlgg.cpp; sourceTree = ""; }; + EA2520F427493A22A70A5C09 /* stackwalk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stackwalk.cpp; path = ../../src/unix/stackwalk.cpp; sourceTree = ""; }; + EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = KeyWords.cxx; path = ../../src/stc/scintilla/src/KeyWords.cxx; sourceTree = ""; }; + EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_chckl.cpp; path = ../../src/xrc/xh_chckl.cpp; sourceTree = ""; }; + EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filtfind.cpp; path = ../../src/common/filtfind.cpp; sourceTree = ""; }; + EA93D41B11683E758D456531 /* log.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = log.cpp; path = ../../src/common/log.cpp; sourceTree = ""; }; + EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_wizrd.cpp; path = ../../src/xrc/xh_wizrd.cpp; sourceTree = ""; }; + EBED392D081335FA80523244 /* manager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = manager.cpp; path = ../../src/propgrid/manager.cpp; sourceTree = ""; }; + EC28591B403B32B7AFCC079D /* gauge_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gauge_osx.cpp; path = ../../src/osx/gauge_osx.cpp; sourceTree = ""; }; + EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dircmn.cpp; path = ../../src/common/dircmn.cpp; sourceTree = ""; }; + ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_hline.cpp; path = ../../src/html/m_hline.cpp; sourceTree = ""; }; + ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docmdi.cpp; path = ../../src/common/docmdi.cpp; sourceTree = ""; }; + ED19EF377E653F71B1876259 /* jdmaster.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmaster.c; path = ../../src/jpeg/jdmaster.c; sourceTree = ""; }; + EDB48813110636DBA045BF3A /* LexPS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPS.cxx; path = ../../src/stc/scintilla/src/LexPS.cxx; sourceTree = ""; }; + EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fddlgcmn.cpp; path = ../../src/common/fddlgcmn.cpp; sourceTree = ""; }; + EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filedlgg.cpp; path = ../../src/generic/filedlgg.cpp; sourceTree = ""; }; + EE959EC7BFDD3A628E856404 /* anidecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anidecod.cpp; path = ../../src/common/anidecod.cpp; sourceTree = ""; }; + EEA0945B20913754A54D0FD9 /* dcpsg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcpsg.cpp; path = ../../src/generic/dcpsg.cpp; sourceTree = ""; }; + EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_split.cpp; path = ../../src/xrc/xh_split.cpp; sourceTree = ""; }; + EED7C691150139EFA35E8EBD /* utils_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utils_osx.cpp; path = ../../src/osx/utils_osx.cpp; sourceTree = ""; }; + EEE82083BFA430D5B58F8A04 /* regfree.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regfree.c; path = ../../src/regex/regfree.c; sourceTree = ""; }; + EF330EAACFA53877BE289896 /* matrix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = matrix.cpp; path = ../../src/common/matrix.cpp; sourceTree = ""; }; + F01DDE448E4C3983ACCE67FD /* appcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appcmn.cpp; path = ../../src/common/appcmn.cpp; sourceTree = ""; }; + F0905A1EBD653F6D82395602 /* xh_combo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_combo.cpp; path = ../../src/xrc/xh_combo.cpp; sourceTree = ""; }; + F175D6E8E5723FC797701275 /* menucmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menucmn.cpp; path = ../../src/common/menucmn.cpp; sourceTree = ""; }; + F1A6F3936A0D31CBB58082BA /* jdcoefct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdcoefct.c; path = ../../src/jpeg/jdcoefct.c; sourceTree = ""; }; + F1E724EA70AB35DDB130F84F /* stringops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringops.cpp; path = ../../src/common/stringops.cpp; sourceTree = ""; }; + F2024D29170D3B50A4DFDE11 /* base64.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = ../../src/common/base64.cpp; sourceTree = ""; }; + F263022F3FEA3F75895B644D /* filesys.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filesys.cpp; path = ../../src/common/filesys.cpp; sourceTree = ""; }; + F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexFlagship.cxx; path = ../../src/stc/scintilla/src/LexFlagship.cxx; sourceTree = ""; }; + F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sysopt.cpp; path = ../../src/common/sysopt.cpp; sourceTree = ""; }; + F4020D790AE7363CB29F1C2F /* anybutton.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = anybutton.mm; path = ../../src/osx/cocoa/anybutton.mm; sourceTree = ""; }; + F43AF44465B335479752116D /* xh_radbx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_radbx.cpp; path = ../../src/xrc/xh_radbx.cpp; sourceTree = ""; }; + F46EC1508C063C8395CE7A95 /* sstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sstream.cpp; path = ../../src/common/sstream.cpp; sourceTree = ""; }; + F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_panel.cpp; path = ../../src/xrc/xh_panel.cpp; sourceTree = ""; }; + F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../src/stc/scintilla/src/LexMetapost.cxx; sourceTree = ""; }; + F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/osx/carbon/icon.cpp; sourceTree = ""; }; + F6EA240B3DB93D398A990FAD /* tif_dirread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirread.c; path = ../../src/tiff/libtiff/tif_dirread.c; sourceTree = ""; }; + F7332A03D93D3DABB050615D /* dir.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dir.cpp; path = ../../src/unix/dir.cpp; sourceTree = ""; }; + F7440859617F3B47AF4D3817 /* valgen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valgen.cpp; path = ../../src/common/valgen.cpp; sourceTree = ""; }; + F7E99B35A98D30818120B002 /* string.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = string.cpp; path = ../../src/common/string.cpp; sourceTree = ""; }; + F82278F9AF0432529891E6D7 /* tif_close.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_close.c; path = ../../src/tiff/libtiff/tif_close.c; sourceTree = ""; }; + F83172EE2DAE352FB969D4F2 /* jcapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapistd.c; path = ../../src/jpeg/jcapistd.c; sourceTree = ""; }; + F84F0DB790A23D92A193D2B4 /* http.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = http.cpp; path = ../../src/common/http.cpp; sourceTree = ""; }; + F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_collpane.cpp; path = ../../src/xrc/xh_collpane.cpp; sourceTree = ""; }; + F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths.cpp; path = ../../src/unix/stdpaths.cpp; sourceTree = ""; }; + FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcanvas_osx.cpp; path = ../../src/osx/glcanvas_osx.cpp; sourceTree = ""; }; + FA7029BB5751398AA02D8C24 /* imagtga.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagtga.cpp; path = ../../src/common/imagtga.cpp; sourceTree = ""; }; + FADE850169F7347F83FE1499 /* xh_statbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_statbar.cpp; path = ../../src/xrc/xh_statbar.cpp; sourceTree = ""; }; + FB46BC22F6B23909A938C561 /* regex.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regex.cpp; path = ../../src/common/regex.cpp; sourceTree = ""; }; + FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcbufcmn.cpp; path = ../../src/common/dcbufcmn.cpp; sourceTree = ""; }; + FBE1C531185131A89EFF7FAF /* cmdline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmdline.cpp; path = ../../src/common/cmdline.cpp; sourceTree = ""; }; + FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontpickerg.cpp; path = ../../src/generic/fontpickerg.cpp; sourceTree = ""; }; + FCCFF49F92B4323D9181CEDA /* htmltag.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmltag.cpp; path = ../../src/html/htmltag.cpp; sourceTree = ""; }; + FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTeX.cxx; path = ../../src/stc/scintilla/src/LexTeX.cxx; sourceTree = ""; }; + FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_srchctrl.cpp; path = ../../src/xrc/xh_srchctrl.cpp; sourceTree = ""; }; + FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = ""; }; + FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = ""; }; + FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = ""; }; + FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = ""; }; + FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = ""; }; + FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/src/LexMPT.cxx; sourceTree = ""; }; + FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMMIXAL.cxx; path = ../../src/stc/scintilla/src/LexMMIXAL.cxx; sourceTree = ""; }; + FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGui4Cli.cxx; path = ../../src/stc/scintilla/src/LexGui4Cli.cxx; sourceTree = ""; }; + FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stream.cpp; path = ../../src/common/stream.cpp; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 82F403E7B8653CBD908BC257 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 82F403E7B8653CBD908BC258 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 04311EAB76193D5593D43DBB /* aui */ = { + isa = PBXGroup; + children = ( + 98C15055598A3586BDB4FD0F /* src/aui */, + ); + name = aui; + sourceTree = ""; + }; + 1246F69B93FC33FFA06EF788 /* src/osx/carbon */ = { + isa = PBXGroup; + children = ( + DAAED71A534135A9A61612A6 /* colordlgosx.mm */, + 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */, + 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */, + 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */, + 18044326B5B13A98A49732DD /* fontdlg.cpp */, + 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */, + F5DAF1F49F0F3F41A427A21D /* icon.cpp */, + 757B31FCCA1F381C95B30DF8 /* app.cpp */, + 7A3F26F539473705AA82411D /* combobox.cpp */, + 12363D1F50FE301DAEE7F04A /* control.cpp */, + 271B4B77622B3411A7BF6634 /* dataobj.cpp */, + B17772732159304AA7312D72 /* dcclient.cpp */, + 238741BDA2C73E56899CCB04 /* dcprint.cpp */, + 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */, + 1C4762898E5330C28651EE73 /* graphics.cpp */, + 77F5E7BCD9B2307D8DBCC052 /* font.cpp */, + C3019BA65DD73F30A865365F /* frame.cpp */, + B568A7364ECA30288820CCE7 /* mdi.cpp */, + C2BB2949CC0B387AB6879539 /* metafile.cpp */, + 2128AD8BD12E3F33AD57478E /* overlay.cpp */, + 530DC2E26BF2313E8702AD43 /* popupwin.cpp */, + 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */, + E6CC2B05353C3284B37B2DD7 /* settings.cpp */, + E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */, + 00DA3D3EEF5E305CA73A1871 /* region.cpp */, + 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */, + ); + name = src/osx/carbon; + sourceTree = ""; + }; + 1246F69B93FC33FFA06EF789 /* src/osx/carbon */ = { + isa = PBXGroup; + children = ( + 2ACC8667173D3AB09F6214F4 /* sound.cpp */, + ); + name = src/osx/carbon; + sourceTree = ""; + }; + 1D56230B75893DBA8A923441 /* wxcocoa */ = { + isa = PBXGroup; + children = ( + 7DEBE1EB2B94305E8E8D6EA5 /* wxcocoa.xcconfig */, + 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */, + D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */, + C2FC1A9BBB8C3046994369BF /* Products */, + 83F62FA47C9636169F1E18E8 /* base */, + 2E7B4F88F81E37B4A9FF6C0F /* core */, + 374BD863E6AD33189B7E4040 /* net */, + 2FF0B5E0505D3AEA9A4ACF11 /* adv */, + 5C5CD199E7573C73AE6F392D /* media */, + 60E51BFF5CD2327483201F14 /* html */, + 60328E6EA3793DA990E18FC1 /* xrc */, + 4D98B791E17232D39944F04F /* xml */, + 816DD323A67F3B299C8F3481 /* opengl */, + 04311EAB76193D5593D43DBB /* aui */, + FE1C78F1707A30878CBB2B4B /* ribbon */, + B8F95052522B37AB86DA8917 /* propgrid */, + 64B126D857113F24BA8C4758 /* richtext */, + E96566B813153B4295AD767B /* stc */, + EB288BE7E74B3328B762A461 /* libtiff */, + 7650A73F7FC9305EA62DAE86 /* libjpeg */, + 6E2C8858F68E3FB0BEFFFCE5 /* libpng */, + B1EF68113C6338CFBBED0FBE /* libregex */, + 2BE6C101F29D318895158F98 /* libscintilla */, + 42F504C4994C38D7A8F062F4 /* libexpat */, + ); + name = wxcocoa; + sourceTree = ""; + }; + 2ABA71836A2C3590B1615B26 /* src/expat/lib */ = { + isa = PBXGroup; + children = ( + A92B6033D8233DB1821F193B /* xmlparse.c */, + 59C6B9849FF6325E890942EF /* xmlrole.c */, + 8685B8ED68F23DB0B770FD74 /* xmltok.c */, + ); + name = src/expat/lib; + sourceTree = ""; + }; + 2BE6C101F29D318895158F98 /* libscintilla */ = { + isa = PBXGroup; + children = ( + 88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */, + ); + name = libscintilla; + sourceTree = ""; + }; + 2E7B4F88F81E37B4A9FF6C0F /* core */ = { + isa = PBXGroup; + children = ( + F494694AB1FD30DEA2087AFB /* src/osx */, + AC04244D4E183DF480908047 /* src/osx/core */, + CBC07D2BC2363BB4B61D1121 /* src/unix */, + 944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */, + 1246F69B93FC33FFA06EF788 /* src/osx/carbon */, + 84E0164052A73DE5996EA691 /* src/generic */, + FC6F2C71999C3833AC0AD6E2 /* src/osx/cocoa */, + D957B1B354FC327288FDF9D7 /* src/common */, + ); + name = core; + sourceTree = ""; + }; + 2FF0B5E0505D3AEA9A4ACF11 /* adv */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D9 /* src/common */, + 84E0164052A73DE5996EA692 /* src/generic */, + F494694AB1FD30DEA2087AFC /* src/osx */, + 1246F69B93FC33FFA06EF789 /* src/osx/carbon */, + AC04244D4E183DF480908049 /* src/osx/core */, + FC6F2C71999C3833AC0AD6E3 /* src/osx/cocoa */, + ); + name = adv; + sourceTree = ""; + }; + 318BFB22ACCA37E19A1BD431 /* src/propgrid */ = { + isa = PBXGroup; + children = ( + 326723AEB79A305F90D6B41D /* advprops.cpp */, + A9C7F740A55E39FD890B3C7F /* editors.cpp */, + EBED392D081335FA80523244 /* manager.cpp */, + 58E1F571B01F34D4AB70CA18 /* property.cpp */, + B98B72B3A0A73044B85AED60 /* propgrid.cpp */, + 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */, + 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */, + C20E46A504113C899B9DD9B7 /* props.cpp */, + ); + name = src/propgrid; + sourceTree = ""; + }; + 348F9A77CB8B315FBC81D212 /* src/xrc */ = { + isa = PBXGroup; + children = ( + 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */, + 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */, + 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */, + 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */, + 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */, + 093B5233861B3F9B8C85762B /* xh_cald.cpp */, + BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */, + EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */, + 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */, + CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */, + AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */, + D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */, + F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */, + F0905A1EBD653F6D82395602 /* xh_combo.cpp */, + 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */, + C63C964DAFAD311694367C94 /* xh_datectrl.cpp */, + BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */, + 06B4A895955B32258DCD62BF /* xh_dlg.cpp */, + 05310A868F0B35999C568681 /* xh_editlbox.cpp */, + 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */, + 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */, + 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */, + E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */, + 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */, + 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */, + 93B77251C0E0382D9A8E113D /* xh_grid.cpp */, + 889FFA9573A835F280A21CB4 /* xh_html.cpp */, + B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */, + B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */, + 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */, + 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */, + 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */, + D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */, + A87662D69F0432FC96701280 /* xh_notbk.cpp */, + 0080254545B9383ABDF2045C /* xh_odcombo.cpp */, + F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */, + 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */, + 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */, + F43AF44465B335479752116D /* xh_radbx.cpp */, + 66411D54BAD338498AC59401 /* xh_scrol.cpp */, + E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */, + 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */, + 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */, + 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */, + 950D51915EF83B57B5E8306F /* xh_spin.cpp */, + EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */, + FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */, + FADE850169F7347F83FE1499 /* xh_statbar.cpp */, + 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */, + 147800BBCB80346798B35D75 /* xh_stbox.cpp */, + 5F555177554E398286DBC6FB /* xh_stlin.cpp */, + B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */, + 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */, + CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */, + 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */, + B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */, + 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */, + B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */, + 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */, + EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */, + 087B66573CD33DA99DA82B1C /* xmlres.cpp */, + A1E1A01885B036C28EBDAE27 /* xmladv.cpp */, + 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */, + ); + name = src/xrc; + sourceTree = ""; + }; + 374BD863E6AD33189B7E4040 /* net */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D8 /* src/common */, + CBC07D2BC2363BB4B61D1122 /* src/unix */, + AC04244D4E183DF480908048 /* src/osx/core */, + ); + name = net; + sourceTree = ""; + }; + 42F504C4994C38D7A8F062F4 /* libexpat */ = { + isa = PBXGroup; + children = ( + 2ABA71836A2C3590B1615B26 /* src/expat/lib */, + ); + name = libexpat; + sourceTree = ""; + }; + 4B7A97D6D29E3627B312E104 /* src/regex */ = { + isa = PBXGroup; + children = ( + E433B890264339BA8DB97B1D /* regcomp.c */, + 1482A34AC32133E4BE207223 /* regexec.c */, + A70C82ADB45A3FB99C420D03 /* regerror.c */, + EEE82083BFA430D5B58F8A04 /* regfree.c */, + ); + name = src/regex; + sourceTree = ""; + }; + 4D98B791E17232D39944F04F /* xml */ = { + isa = PBXGroup; + children = ( + C23A03BC68833F7E8BA62CF1 /* src/xml */, + D957B1B354FC327288FDF9DB /* src/common */, + ); + name = xml; + sourceTree = ""; + }; + 4E6B7B286B7938A3BD44A8E1 /* src/richtext */ = { + isa = PBXGroup; + children = ( + 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */, + FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */, + C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */, + 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */, + 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */, + C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */, + 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */, + D30617843F33310089C1F77A /* richtextstyles.cpp */, + BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */, + C69E48C06BD23C178F650E42 /* richtextxml.cpp */, + ); + name = src/richtext; + sourceTree = ""; + }; + 5C5CD199E7573C73AE6F392D /* media */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9DA /* src/common */, + ); + name = media; + sourceTree = ""; + }; + 60328E6EA3793DA990E18FC1 /* xrc */ = { + isa = PBXGroup; + children = ( + 348F9A77CB8B315FBC81D212 /* src/xrc */, + ); + name = xrc; + sourceTree = ""; + }; + 60E51BFF5CD2327483201F14 /* html */ = { + isa = PBXGroup; + children = ( + B8FCB2D33F3B3E30A75D7ABD /* src/html */, + 84E0164052A73DE5996EA693 /* src/generic */, + ); + name = html; + sourceTree = ""; + }; + 64B126D857113F24BA8C4758 /* richtext */ = { + isa = PBXGroup; + children = ( + 4E6B7B286B7938A3BD44A8E1 /* src/richtext */, + ); + name = richtext; + sourceTree = ""; + }; + 6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = { + isa = PBXGroup; + children = ( + C1D1DDEBCD103A95BE0B52D4 /* src/png */, + ); + name = libpng; + sourceTree = ""; + }; + 7650A73F7FC9305EA62DAE86 /* libjpeg */ = { + isa = PBXGroup; + children = ( + D85137B3D94F34B6B3686909 /* src/jpeg */, + ); + name = libjpeg; + sourceTree = ""; + }; + 816DD323A67F3B299C8F3481 /* opengl */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9DC /* src/common */, + FC6F2C71999C3833AC0AD6E4 /* src/osx/cocoa */, + F494694AB1FD30DEA2087AFD /* src/osx */, + ); + name = opengl; + sourceTree = ""; + }; + 83F62FA47C9636169F1E18E8 /* base */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D6 /* src/common */, + 84E0164052A73DE5996EA690 /* src/generic */, + AC04244D4E183DF480908046 /* src/osx/core */, + CBC07D2BC2363BB4B61D1120 /* src/unix */, + FC6F2C71999C3833AC0AD6E1 /* src/osx/cocoa */, + ); + name = base; + sourceTree = ""; + }; + 84E0164052A73DE5996EA690 /* src/generic */ = { + isa = PBXGroup; + children = ( + 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA691 /* src/generic */ = { + isa = PBXGroup; + children = ( + 6A82EDCFFBAC30098B238957 /* caret.cpp */, + 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */, + 84758329F2163F00A9C005DF /* collpaneg.cpp */, + 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */, + E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */, + 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */, + EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */, + B580FD04D0D83601826FD5EE /* filepickerg.cpp */, + DB170BF78EFE39D692E11985 /* fontdlgg.cpp */, + FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */, + D9016355F66D3125919E017D /* listctrl.cpp */, + 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */, + 071FEABEA61E3B559A47A7DB /* statusbr.cpp */, + BACAA6CE4A0934459F26B27C /* graphicc.cpp */, + 2F94CF171F4532B89FECF475 /* busyinfo.cpp */, + 5612DBC4125B379DA2B28824 /* buttonbar.cpp */, + CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */, + 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */, + CBD7B44E33373BCCB60FC11F /* combog.cpp */, + EEA0945B20913754A54D0FD9 /* dcpsg.cpp */, + 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */, + 2A67053D16D63C588E555C84 /* dragimgg.cpp */, + 2334539088B036BEAB230D1C /* filectrlg.cpp */, + 7273A7E255323EB3B391D997 /* headerctrlg.cpp */, + 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */, + 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */, + C64705CE9398316D87BAB4DC /* logg.cpp */, + D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */, + A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */, + 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */, + 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */, + BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */, + AF76670146413EEFA005206A /* printps.cpp */, + 49CABA38E78D34DFA260AA06 /* renderg.cpp */, + E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */, + 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */, + 5ED2105A5A033E3384EBC4ED /* selstore.cpp */, + 59572A234F0636D78BFD9F6B /* spinctlg.cpp */, + C125FA3837C631A9BE0ED5E7 /* splitter.cpp */, + D46A36564C78312CAC538E93 /* srchctlg.cpp */, + DA2119A7C67D37B290C17989 /* statbmpg.cpp */, + 5DE635F30F3935099AF1486C /* stattextg.cpp */, + 8D529E2668C23D94A7706C8A /* textdlgg.cpp */, + 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */, + 24DF23D67E693D999B875101 /* toolbkg.cpp */, + 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */, + 7925E38823563BCDB5565DCF /* treebkg.cpp */, + AA90128E29A03CCCA30F4D35 /* vlbox.cpp */, + 1629FA905F903324AA5BE72C /* vscroll.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA692 /* src/generic */ = { + isa = PBXGroup; + children = ( + 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */, + 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */, + 496674699F173A5385EAFF07 /* calctrlg.cpp */, + E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */, + 5F3D473DC5123EDAB767045C /* datavgen.cpp */, + AE856D950B8C369EB0FE13BA /* datectlg.cpp */, + 7D90D14874FD38079835AF0B /* editlbox.cpp */, + 76337016F2CA3C85831702E6 /* grid.cpp */, + 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */, + 66426B63AA3E3A279936C034 /* grideditors.cpp */, + 26381308E32A3A179E7A9B40 /* gridsel.cpp */, + DF376BC55EA73F5FB7328142 /* helpext.cpp */, + CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */, + C3784C240C2F330683494926 /* laywin.cpp */, + 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */, + 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */, + 6BC93D1DE277395592610085 /* propdlg.cpp */, + 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */, + 3F8836E29C5A370E80CE070E /* splash.cpp */, + B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */, + 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */, + 580AFC66F3003582B43043B1 /* animateg.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA693 /* src/generic */ = { + isa = PBXGroup; + children = ( + FD5F11A3646F397BA62EB037 /* htmllbox.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */ = { + isa = PBXGroup; + children = ( + C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */, + 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */, + E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */, + 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */, + 5219A792C6A736F193D4A82F /* ContractionState.cxx */, + BF1C44D726E63B18A98006EC /* Decoration.cxx */, + 71DB140E670738839EC42C2B /* Document.cxx */, + 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */, + DA5E95D498C53A808A8E2EEB /* Editor.cxx */, + FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */, + 4FDE5A962FA234FA83A605AD /* Indicator.cxx */, + E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */, + EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */, + 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */, + A82C367B86F83981803D55DB /* LexASY.cxx */, + C76222F466E831F896A89269 /* LexAU3.cxx */, + BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */, + CD72950967F33809931D4968 /* LexAbaqus.cxx */, + 375E7A99FF4C38FA9E223772 /* LexAda.cxx */, + A65399C8A6D636139E362119 /* LexAsm.cxx */, + A46D50BEBF523B3F88831086 /* LexAsn1.cxx */, + 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */, + 78D7866F95C73A28BB540606 /* LexBash.cxx */, + B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */, + 6718204F4700318E89EAC906 /* LexBullant.cxx */, + 7EE2459D69BA35838C274488 /* LexCLW.cxx */, + B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */, + 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */, + 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */, + 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */, + 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */, + 04082EC1C91334379425802D /* LexConf.cxx */, + 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */, + 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */, + B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */, + 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */, + 55EBB18CB4773C788510B14B /* LexEiffel.cxx */, + A1276C0E5D48337489DEE8DF /* LexErlang.cxx */, + F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */, + B181F564935730E89AB00D92 /* LexForth.cxx */, + 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */, + 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */, + FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */, + D87406BCF3E833369E12D89A /* LexHTML.cxx */, + 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */, + 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */, + B303230368143F37B2409DE6 /* LexKix.cxx */, + 40586C8986443431A64EB066 /* LexLisp.cxx */, + B14D6E7E15FD3C869E341198 /* LexLout.cxx */, + 5145561C78303EEE9F827962 /* LexLua.cxx */, + FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */, + FE3B47058A723243A285594D /* LexMPT.cxx */, + 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */, + 45860601270D318D93BEE1F3 /* LexMagik.cxx */, + E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */, + DC9153A350893820B942D37E /* LexMatlab.cxx */, + F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */, + 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */, + BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */, + 1BC0322549563787A21CE8F1 /* LexNsis.cxx */, + 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */, + C356B5738AB13E829E66729E /* LexOthers.cxx */, + 8744F2C80ECF375999195935 /* LexPB.cxx */, + 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */, + 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */, + EDB48813110636DBA045BF3A /* LexPS.cxx */, + 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */, + D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */, + 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */, + 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */, + 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */, + CC2713393AB132AA8E337AE1 /* LexPython.cxx */, + 7255468B6D5F3D8697994A53 /* LexR.cxx */, + 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */, + 8734C52C7559310784396455 /* LexRuby.cxx */, + 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */, + 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */, + 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */, + 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */, + 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */, + 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */, + 4592464D4868329897F3864D /* LexSpice.cxx */, + 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */, + A284E855892F3A9E9E19E854 /* LexTADS3.cxx */, + 38891BF8F51E398F9082903F /* LexTAL.cxx */, + C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */, + FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */, + 8F633793051F371F94C27530 /* LexVB.cxx */, + 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */, + D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */, + 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */, + AF3DF03795153E039B8F1F87 /* LineMarker.cxx */, + 9389DAF8B91030B7AAB029FF /* PerLine.cxx */, + BCD873D873A53BBF955D8A4E /* PositionCache.cxx */, + E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */, + E145FC31ED523B4AA5080A61 /* RESearch.cxx */, + 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */, + 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */, + 2AF7739C389536F79DAA31E5 /* Selection.cxx */, + C28429A964C337A192D76CC8 /* Style.cxx */, + 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */, + 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */, + C133B838193A35ABBB803151 /* ViewStyle.cxx */, + 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */, + C25521AF59B9324EB2809C73 /* XPM.cxx */, + ); + name = src/stc/scintilla/src; + sourceTree = ""; + }; + 944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */ = { + isa = PBXGroup; + children = ( + 2DF2456ED905357B8C1D74D9 /* webkit.mm */, + ); + name = src/html/htmlctrl/webkit; + sourceTree = ""; + }; + 98C15055598A3586BDB4FD0F /* src/aui */ = { + isa = PBXGroup; + children = ( + 26632A254717372BAA4D514D /* framemanager.cpp */, + BD709DEB71623974B9836D69 /* dockart.cpp */, + A881F49ADCF33C299B041584 /* floatpane.cpp */, + A298576700C33F018616E7BD /* auibook.cpp */, + 05A4437E9697300390FDE14E /* auibar.cpp */, + C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */, + ); + name = src/aui; + sourceTree = ""; + }; + 9A6B5D3E90513D0396CFE0EF /* src/stc */ = { + isa = PBXGroup; + children = ( + D0B9C41A4D12345AAA764CAD /* stc.cpp */, + 47FF6D792CA234C395692118 /* PlatWX.cpp */, + 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */, + ); + name = src/stc; + sourceTree = ""; + }; + A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */ = { + isa = PBXGroup; + children = ( + 5D2F8259CC99380CB8217DEF /* tif_unix.c */, + D0CDADAF2D893E32A38351E4 /* tif_aux.c */, + F82278F9AF0432529891E6D7 /* tif_close.c */, + 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */, + 149D299A0EDB3D998118EC93 /* tif_color.c */, + CA0D5D47D62A3148BA51B31B /* tif_compress.c */, + E79B2D1F630036129B9677A7 /* tif_dir.c */, + 032A38738B58394E8617617B /* tif_dirinfo.c */, + F6EA240B3DB93D398A990FAD /* tif_dirread.c */, + B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */, + 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */, + 48F1439BF6C3361296F05A33 /* tif_error.c */, + AF7CE00168AB33C994374ABA /* tif_extension.c */, + 30FD1048328234E59D319863 /* tif_fax3.c */, + BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */, + 305614D19CF23CB2B14A5B2E /* tif_flush.c */, + 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */, + 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */, + 66FDA882451239EA8DF2E0B5 /* tif_luv.c */, + 346C68F0CCD23823B78267F0 /* tif_lzw.c */, + DFDC805DD3063C389F93642D /* tif_next.c */, + 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */, + 1731A6096BFC3A468AB4755A /* tif_open.c */, + 9CE73979D0933A43830307E4 /* tif_packbits.c */, + 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */, + 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */, + C6EB77ED688E3EE294167EF1 /* tif_print.c */, + 64B25B87203E3464BCDD277D /* tif_read.c */, + B83EDE2D1731311ABDE62F9F /* tif_strip.c */, + AAC12B4456E13F57BEA25A5E /* tif_swab.c */, + 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */, + BD88495AF72531A28D2201D0 /* tif_tile.c */, + 3E6F40F4740C3ED29D83E107 /* tif_version.c */, + C83C97A1FCC5345896C9D7DE /* tif_warning.c */, + E9B992CB6C28339FB0CA5E27 /* tif_write.c */, + 726C0457DF1232C793918DC1 /* tif_zip.c */, + ); + name = src/tiff/libtiff; + sourceTree = ""; + }; + AC04244D4E183DF480908046 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 7C97C1F26B5A38C49543060C /* mimetype.cpp */, + 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */, + 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */, + 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */, + D5F9383D1CE931499F339D85 /* strconv_cf.cpp */, + 81390F96937631078EFCD891 /* utilsexc_base.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908047 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */, + 9D1F14339D1C331087650931 /* colour.cpp */, + 343D4FDD5CC030618EF24729 /* dcmemory.cpp */, + A5617D10CB7136EC9A4194EF /* display.cpp */, + 36E1DBA275AD325DB759C180 /* fontenum.cpp */, + 160EB9744CB63A0B81DC651F /* hid.cpp */, + 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */, + 69F098E47EBF34368ABAE7ED /* timer.cpp */, + 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */, + 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908048 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 4969528429903F15882F5391 /* sockosx.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908049 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 2ACC8667173D3AB09F6214F5 /* sound.cpp */, + 018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + B1EF68113C6338CFBBED0FBE /* libregex */ = { + isa = PBXGroup; + children = ( + 4B7A97D6D29E3627B312E104 /* src/regex */, + ); + name = libregex; + sourceTree = ""; + }; + B402B38DB4CF3883AF4743C0 /* src/ribbon */ = { + isa = PBXGroup; + children = ( + 4C4649974D8B3A109D1BF145 /* art_internal.cpp */, + B540E18F9C91381CA175BABB /* art_msw.cpp */, + DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */, + 9FDDE855D9F83E4891362EB4 /* bar.cpp */, + 5612DBC4125B379DA2B28825 /* buttonbar.cpp */, + 12363D1F50FE301DAEE7F04B /* control.cpp */, + 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */, + 59ED0C057D8F388A89DC7177 /* page.cpp */, + 00969CBE3B8F32C78C195619 /* panel.cpp */, + BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */, + ); + name = src/ribbon; + sourceTree = ""; + }; + B8F95052522B37AB86DA8917 /* propgrid */ = { + isa = PBXGroup; + children = ( + 318BFB22ACCA37E19A1BD431 /* src/propgrid */, + ); + name = propgrid; + sourceTree = ""; + }; + B8FCB2D33F3B3E30A75D7ABD /* src/html */ = { + isa = PBXGroup; + children = ( + 2E24C6F2A04E30EB95598305 /* chm.cpp */, + 42E433D1700631A8907B8227 /* helpctrl.cpp */, + C466F32CCBD13DBC87285B3D /* helpdata.cpp */, + 81821049E39B32C6ABCF6820 /* helpdlg.cpp */, + 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */, + 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */, + 68E5188DB6003C35A8C7754D /* htmlcell.cpp */, + 2C6C4F5468743265A02D656C /* htmlfilt.cpp */, + 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */, + FCCFF49F92B4323D9181CEDA /* htmltag.cpp */, + 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */, + 194ADD28300E329E80F7892E /* htmprint.cpp */, + 52FE1599218730CC99A3F801 /* m_dflist.cpp */, + B1F3C70512D93501B0478F3E /* m_fonts.cpp */, + ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */, + 548906E4E72935E48CE4AF87 /* m_image.cpp */, + A5EE0B8985443BDCB36F781F /* m_layout.cpp */, + 080597FC0436378E96EDA94B /* m_links.cpp */, + B4028ABB08C63AB59F5F240B /* m_list.cpp */, + 61658C3EABB4341AA38C691E /* m_pre.cpp */, + 727F25F832AD32D4B12D8E39 /* m_span.cpp */, + 7EB95BCFA255323183A996C9 /* m_style.cpp */, + 082CA018FB883999839C1DCE /* m_tables.cpp */, + 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */, + 7FCA75FE592C3469AE351FBF /* winpars.cpp */, + ); + name = src/html; + sourceTree = ""; + }; + C1D1DDEBCD103A95BE0B52D4 /* src/png */ = { + isa = PBXGroup; + children = ( + AF26BAB1F4733114926F1724 /* png.c */, + 1A0650754DC2358CA5933B28 /* pngerror.c */, + 91300EB871CC39ECBC430D48 /* pngget.c */, + C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */, + 9CAA325362C73AC8BE20FAA7 /* pngpread.c */, + 29D6506AEA5A323B8735F126 /* pngread.c */, + A06AB1974DB93EE2999EC75C /* pngrio.c */, + 87799D3168B43EB7B5686826 /* pngrtran.c */, + 358D0A3AC73F322EA732D020 /* pngrutil.c */, + 5E463A493FD930DE80E58608 /* pngset.c */, + 5B32A13D5B3336098B1B9765 /* pngtrans.c */, + AF9EE701DD653E2299293E5F /* pngwio.c */, + 69A6CAF721E53E83B4820DE6 /* pngwrite.c */, + 0964797530CF3FE7B8DB6242 /* pngwtran.c */, + 45D7558DF5E03A2EB41883F0 /* pngwutil.c */, + ); + name = src/png; + sourceTree = ""; + }; + C23A03BC68833F7E8BA62CF1 /* src/xml */ = { + isa = PBXGroup; + children = ( + E6AB648BC5173104A96CAE66 /* xml.cpp */, + ); + name = src/xml; + sourceTree = ""; + }; + C2FC1A9BBB8C3046994369BF /* Products */ = { + isa = PBXGroup; + children = ( + 65C47DFD6E243724A83603F3 /* libwx_osx_cocoa.dylib */, + 1D025E39C79E3E119D19686C /* libwx_osx_cocoa_static.a */, + ); + name = Products; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1120 /* src/unix */ = { + isa = PBXGroup; + children = ( + B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */, + F7332A03D93D3DABB050615D /* dir.cpp */, + CA2D9F325F833C408657E7B7 /* dlunix.cpp */, + 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */, + 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */, + 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */, + 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */, + EA2520F427493A22A70A5C09 /* stackwalk.cpp */, + F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */, + 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */, + AB466912FDA23F8B87A00A3C /* threadpsx.cpp */, + DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */, + C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1121 /* src/unix */ = { + isa = PBXGroup; + children = ( + D4A23A8BC7373D4BBD72851D /* apptraits.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1122 /* src/unix */ = { + isa = PBXGroup; + children = ( + BB7661E9E09A397790ED9545 /* sockunix.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + D85137B3D94F34B6B3686909 /* src/jpeg */ = { + isa = PBXGroup; + children = ( + 8EB76F786D7F3FF286948D22 /* jcomapi.c */, + 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */, + 108517BCD39230E7A89BC943 /* jerror.c */, + 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */, + 374E341C8703367686DEDE93 /* jmemnobs.c */, + 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */, + F83172EE2DAE352FB969D4F2 /* jcapistd.c */, + 725574EF98C4301989181CBF /* jctrans.c */, + 2F41EDEB298538CC86FF6DC1 /* jcparam.c */, + 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */, + AA6C6739C3BD3EFA9CF71102 /* jcinit.c */, + 3E3043D7BE9C33B59E900CCE /* jcmaster.c */, + 664736BDE465350C9C4750E9 /* jcmarker.c */, + 810EB7316DF3344197C78EC0 /* jcmainct.c */, + 7FE0455EBDC63D82B2D88587 /* jcprepct.c */, + E89AC104BF4F33A083F8B382 /* jccoefct.c */, + 8EFF4707641D3F20AB602ED6 /* jccolor.c */, + 53D06E47477B3E32BB6B915E /* jcsample.c */, + DC0FFDC7A6163F2DA73B84EB /* jchuff.c */, + E38569D873B6394F9E5B821C /* jcphuff.c */, + 6DBF3053414F3C448312165A /* jcdctmgr.c */, + 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */, + 93D07403FCA530D7A9FD2917 /* jfdctflt.c */, + 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */, + 86884BC843F6337EABF744BB /* jdapimin.c */, + 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */, + 4549845C0751356A907C23E0 /* jdtrans.c */, + DECAF5DD80383A2CA76EB383 /* jdatasrc.c */, + ED19EF377E653F71B1876259 /* jdmaster.c */, + CCF7564A2B733F759AA8496B /* jdinput.c */, + 20E4A10BCD773C84AEC481A1 /* jdmarker.c */, + 72869747E68E37998CB0A07E /* jdhuff.c */, + E85E680C62B63D4EBAB2E784 /* jdphuff.c */, + B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */, + F1A6F3936A0D31CBB58082BA /* jdcoefct.c */, + 375FF97B202F3C359402D13E /* jdpostct.c */, + A5BBC1E494D33D028CA547FF /* jddctmgr.c */, + A0DCC5EF59143640BE13AD73 /* jidctfst.c */, + 3C131F7BF8A83960ACB26242 /* jidctflt.c */, + 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */, + 646743F6FDFE3ACFA1A79B40 /* jidctred.c */, + 5FFCF47A161B3E08B19BFE14 /* jdsample.c */, + 68B81FBDA49D3C1991B6356A /* jdcolor.c */, + 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */, + 02D9332D5C5632E981936E29 /* jquant2.c */, + 0890779C662C35889A8C6C2E /* jdmerge.c */, + ); + name = src/jpeg; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D6 /* src/common */ = { + isa = PBXGroup; + children = ( + 4867546E8B8D3C8683A23ED5 /* any.cpp */, + 95A156A823B536DE8476E4F9 /* appbase.cpp */, + 75D0C937F2A03ADA8581A2BB /* arcall.cpp */, + C513377E9E303F778BA9D7ED /* arcfind.cpp */, + 02D2E8B5C89939CE90B99E2B /* archive.cpp */, + A57CF60203F53459A03951A9 /* arrstr.cpp */, + F2024D29170D3B50A4DFDE11 /* base64.cpp */, + 2C904B4BA8273355869812B2 /* clntdata.cpp */, + FBE1C531185131A89EFF7FAF /* cmdline.cpp */, + 4FE0B33481283D3493613B0F /* config.cpp */, + 20B922D61CDB3CCEB59A5194 /* convauto.cpp */, + E0EBCDDF248638B58B01D9CC /* datetime.cpp */, + 864438709B363773B8C3382D /* datetimefmt.cpp */, + 81B3DFBB73573FFDBD320334 /* datstrm.cpp */, + EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */, + ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */, + D272910EC35531E5B4D6E05B /* dynlib.cpp */, + 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */, + C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */, + 640783FBACA43206B782C77B /* evtloopcmn.cpp */, + 033B94A9AC8A3370A794503F /* extended.c */, + ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */, + 168DB301ACC736FF96D7F581 /* file.cpp */, + AC12D557950A3B0D89D9F2F3 /* fileback.cpp */, + 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */, + 58421C141C9E31C6A7A3C183 /* filefn.cpp */, + BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */, + F263022F3FEA3F75895B644D /* filesys.cpp */, + 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */, + EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */, + 832BBBFE664736D5978420C6 /* fmapbase.cpp */, + 88F2BA2F0598342186A484B5 /* fs_arc.cpp */, + AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */, + 888BD97139C936679691FF34 /* hash.cpp */, + A6636144CDE83E8E85270FAF /* hashmap.cpp */, + DB82939EDC593F9CA95C3098 /* init.cpp */, + AC8BB1AABB3D393EBA527060 /* intl.cpp */, + 2C090A76B6F23E6481A27282 /* ipcbase.cpp */, + 67D76B026121359F9B22F8B0 /* languageinfo.cpp */, + 552757A901E732CAA8E3F16D /* list.cpp */, + EA93D41B11683E758D456531 /* log.cpp */, + 72D7AF345E563587941BD868 /* longlong.cpp */, + 5466CC2D6579360E9C665EE5 /* memory.cpp */, + 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */, + 9DB43FAB1E563B02ACEFF647 /* module.cpp */, + DC3D1E222FD93A69B1D1366E /* mstream.cpp */, + 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */, + 1731D6708BFE3DE7B101CE74 /* object.cpp */, + 97FFB03FF6793506B246BAC6 /* platinfo.cpp */, + 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */, + B35DA585CFDD32468868E892 /* process.cpp */, + FB46BC22F6B23909A938C561 /* regex.cpp */, + 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */, + F46EC1508C063C8395CE7A95 /* sstream.cpp */, + DE16011AD6323AAC8616F973 /* stdstream.cpp */, + 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */, + 9FEB8204E530329FA085E5B8 /* strconv.cpp */, + FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */, + F7E99B35A98D30818120B002 /* string.cpp */, + E5357E76650035639844D15B /* stringimpl.cpp */, + F1E724EA70AB35DDB130F84F /* stringops.cpp */, + 0EEAD9C3E180305D8899441E /* strvararg.cpp */, + F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */, + C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */, + 701B84EE7C043B539FF5195A /* textbuf.cpp */, + 0903EE9B3793303285FF96E3 /* textfile.cpp */, + 7195E665E0F233839B967FC9 /* timercmn.cpp */, + 0401B7302088357BB6B7F16F /* timerimpl.cpp */, + 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */, + 6AC666417602346EA583709E /* translation.cpp */, + 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */, + DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */, + D4E1DC1869C6327C80D2F5F4 /* uri.cpp */, + B63EBEE1A04537E7887E9FD0 /* ustring.cpp */, + 31F4B9B03D52339B8F82C114 /* variant.cpp */, + C37866F41B0C31E295AA7FA6 /* wfstream.cpp */, + 23FC98E2305230E2990471E3 /* wxcrt.cpp */, + 607EF0043E723B7B9BE101EA /* wxprintf.cpp */, + 418AD9241B673308BE31DC06 /* xlocale.cpp */, + 25C86D3D4839343BA1D8BDEE /* xti.cpp */, + FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */, + 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */, + B9B5BC858CCF3477895D2786 /* zstream.cpp */, + 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */, + 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */, + A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */, + 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */, + C9A305CEC03B3085B159B617 /* fs_mem.cpp */, + E968913A9A593B258BD8EACB /* msgout.cpp */, + 4188821BBA833CCAA678B234 /* utilscmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D7 /* src/common */ = { + isa = PBXGroup; + children = ( + A436B55DC44E3827A757A6D8 /* accelcmn.cpp */, + 8555204EBA8930809B732842 /* accesscmn.cpp */, + EE959EC7BFDD3A628E856404 /* anidecod.cpp */, + DD09A813E10A31C19554B425 /* affinematrix2d.cpp */, + F01DDE448E4C3983ACCE67FD /* appcmn.cpp */, + 29387393C07C39DB8FF1663B /* artprov.cpp */, + 24E82A05E9A9323287CDB15B /* artstd.cpp */, + 9988CBB0772A3539970162FA /* arttango.cpp */, + E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */, + 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */, + 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */, + 84A7A3B499503ECABC6A838F /* btncmn.cpp */, + 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */, + 4FC2F076657431458896115A /* checkboxcmn.cpp */, + 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */, + 24930711031D35288D28B04B /* choiccmn.cpp */, + 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */, + AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */, + 2D61240ABD70328BA5789663 /* colourcmn.cpp */, + 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */, + 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */, + 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */, + 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */, + B3645350F572364BABF50238 /* containr.cpp */, + 67DCEEB6861731319C30817F /* cshelp.cpp */, + 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */, + 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */, + D1EE17722EA937E88A7F0C01 /* dcbase.cpp */, + FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */, + 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */, + DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */, + E110907DDC13305E88B90086 /* dirctrlcmn.cpp */, + 9051902662BE38B3912B34EA /* dlgcmn.cpp */, + 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */, + 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */, + ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */, + AB634FD597793A74B3B3AA7F /* docview.cpp */, + A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */, + 1197B997B1D139C5AE4D198A /* dseldlg.cpp */, + 48D72D20DB1D3E1CA5ED112A /* effects.cpp */, + EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */, + 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */, + D7B3307E56B332769901E99F /* filehistorycmn.cpp */, + BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */, + A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */, + 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */, + 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */, + C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */, + 373242CD08F330208A7CF438 /* fontenumcmn.cpp */, + D0817D6A1AF83608B050EBC3 /* fontmap.cpp */, + 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */, + A54B80C17F823CB5900AD2E8 /* framecmn.cpp */, + 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */, + 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */, + 998D611109EC33A9A6A11C5A /* gdicmn.cpp */, + 6BC0A61629E635FAB4E09505 /* geometry.cpp */, + 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */, + 1BB59DD194923D6399087A75 /* graphcmn.cpp */, + B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */, + A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */, + BBB30516233A39BE809405AA /* helpbase.cpp */, + DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */, + 8FFDFB4D208F37569AC548B0 /* imagall.cpp */, + 5F84098A475939BB9EE87E70 /* imagbmp.cpp */, + 81A30C745CA73E30B788B408 /* image.cpp */, + 137E01C362E134449BF966ED /* imagfill.cpp */, + CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */, + A4A745D1821A32D591D76650 /* imagiff.cpp */, + 6876262846EA3569B36D92E9 /* imagjpeg.cpp */, + 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */, + 24396D584D053948A3FF0DCD /* imagpng.cpp */, + BC12B97F233B3B9494DA217F /* imagpnm.cpp */, + FA7029BB5751398AA02D8C24 /* imagtga.cpp */, + AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */, + 5C85865D28DC31649440A921 /* imagxpm.cpp */, + BEB08798C70E33DDB360E563 /* layout.cpp */, + 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */, + E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */, + DA7F7633279936EFA0B9C5CF /* markupparser.cpp */, + EF330EAACFA53877BE289896 /* matrix.cpp */, + F175D6E8E5723FC797701275 /* menucmn.cpp */, + D037EA567C253DEEA17E822B /* mousemanager.cpp */, + B901252876603DCEA4C66D89 /* nbkbase.cpp */, + 303ACF199BE431BD891C9301 /* overlaycmn.cpp */, + 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */, + 87D973CA8D673267BD0844D3 /* paper.cpp */, + 70E9B2C076673C87B4218A01 /* panelcmn.cpp */, + 22D9626646773CED82449D5D /* persist.cpp */, + 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */, + D922063B2F2536629EEEAAF0 /* popupcmn.cpp */, + 242BF97B558634A79322052C /* prntbase.cpp */, + B890199A37723EFD86C0ADA5 /* quantize.cpp */, + 724927B0045F3CC0884878BB /* radiobtncmn.cpp */, + 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */, + 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */, + 96CED508FA3C3B6B9265099E /* rendcmn.cpp */, + 63867276260C3F4A980E83D8 /* rgncmn.cpp */, + A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */, + ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */, + 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */, + E8072CA67D19346ABF4D465F /* slidercmn.cpp */, + C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */, + 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */, + 1EF103B09F02315282EC8F44 /* srchcmn.cpp */, + 9C87B071E3593A889704F512 /* statbar.cpp */, + 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */, + D73954EB5397301F87881646 /* statboxcmn.cpp */, + 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */, + 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */, + B180290089B139F18B0C7BBA /* stockitem.cpp */, + D3F32C01D122301AB00D06A5 /* tbarbase.cpp */, + 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */, + 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */, + 861438BD294335D4B859EA71 /* toplvcmn.cpp */, + 7BA6ADD758693BD180D3275B /* treebase.cpp */, + A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */, + F7440859617F3B47AF4D3817 /* valgen.cpp */, + 01BA6D45FE4C381493EB4372 /* validate.cpp */, + DE8701E1CF2B352B945C17E5 /* valtext.cpp */, + 684D92E552BE313CBE0A88AA /* valnum.cpp */, + AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */, + E9B9B85572D0312BBF2878DB /* windowid.cpp */, + B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */, + C562D5885AFF3E15837325CE /* xpmdecod.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D8 /* src/common */ = { + isa = PBXGroup; + children = ( + B7581D7140293BAE88E43DBE /* fs_inet.cpp */, + 5CB4781DF8C432C688F30CDD /* ftp.cpp */, + F84F0DB790A23D92A193D2B4 /* http.cpp */, + 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */, + DE8238DA30FF3FB984511250 /* sckaddr.cpp */, + 56653FACC7D13804A70556AD /* sckfile.cpp */, + 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */, + D784A32C094730FEAA391A9B /* sckstrm.cpp */, + 40CE02524DD4385AB2C3DF95 /* socket.cpp */, + 49612306912038DDBCABB4DE /* url.cpp */, + DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D9 /* src/common */ = { + isa = PBXGroup; + children = ( + A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */, + 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */, + 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */, + 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */, + FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */, + 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */, + 6F23140777B733679D2FAAFC /* odcombocmn.cpp */, + 4692909E4B823F71822B13F8 /* taskbarcmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DA /* src/common */ = { + isa = PBXGroup; + children = ( + C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DB /* src/common */ = { + isa = PBXGroup; + children = ( + 4048A3523EC03409BD899BEF /* xtixml.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DC /* src/common */ = { + isa = PBXGroup; + children = ( + E08A51FA8D8A361681B07295 /* glcmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + E96566B813153B4295AD767B /* stc */ = { + isa = PBXGroup; + children = ( + 9A6B5D3E90513D0396CFE0EF /* src/stc */, + ); + name = stc; + sourceTree = ""; + }; + EB288BE7E74B3328B762A461 /* libtiff */ = { + isa = PBXGroup; + children = ( + A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */, + ); + name = libtiff; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFB /* src/osx */ = { + isa = PBXGroup; + children = ( + B0665A40F3FC3F218074C63C /* artmac.cpp */, + 302A13BC64C238A297F4399F /* brush.cpp */, + BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */, + 5FF661188B563D27A11F5716 /* fontutil.cpp */, + 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */, + 693F731B7D1730A79485F9EC /* minifram.cpp */, + 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */, + BEF6B3FB66243812969E5BD1 /* palette.cpp */, + 4BA819575B5136B09FA8FEB1 /* pen.cpp */, + 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */, + AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */, + EED7C691150139EFA35E8EBD /* utils_osx.cpp */, + 26D7C4995D7A35A1854B533F /* window_osx.cpp */, + C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */, + 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */, + CF4F4F5211933057824B5621 /* button_osx.cpp */, + 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */, + 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */, + 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */, + 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */, + CA72410F615B3A78A6340532 /* dnd_osx.cpp */, + EC28591B403B32B7AFCC079D /* gauge_osx.cpp */, + B99CA41708513A599AE275A2 /* listbox_osx.cpp */, + 66C21CA37BF63893887FD91B /* menu_osx.cpp */, + CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */, + 5248A45AB113341EAC361910 /* notebook_osx.cpp */, + 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */, + 773D91F8280434519BD167EA /* radiobox_osx.cpp */, + 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */, + 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */, + D215A0D67563350CB4EECB06 /* slider_osx.cpp */, + 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */, + 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */, + 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */, + 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */, + DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */, + 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */, + 777385D10CCC350C90F02824 /* textentry_osx.cpp */, + 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */, + 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */, + 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */, + 8C78A1539462370CAA429508 /* accel.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFC /* src/osx */ = { + isa = PBXGroup; + children = ( + A9B2316B32653DA0939A372D /* sound_osx.cpp */, + 5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFD /* src/osx */ = { + isa = PBXGroup; + children = ( + FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + FC6F2C71999C3833AC0AD6E1 /* src/osx/cocoa */ = { + isa = PBXGroup; + children = ( + 789F45D14FF23E248FCFB5FA /* utils.mm */, + ); + name = src/osx/cocoa; + sourceTree = ""; + }; + FC6F2C71999C3833AC0AD6E2 /* src/osx/cocoa */ = { + isa = PBXGroup; + children = ( + F4020D790AE7363CB29F1C2F /* anybutton.mm */, + C06FED83BF933DF98C2466AE /* button.mm */, + 81708CFA21A03013ACB8DDD7 /* checkbox.mm */, + 9F838F853CB03CF7932C08C3 /* choice.mm */, + 7CC8B73BB8C0391E9EC1B2D1 /* colour.mm */, + 57C06D5DB5F733A4A235B206 /* combobox.mm */, + 83B878A16ABC396E8C03A15E /* dialog.mm */, + 0B0DC125AFFC322E8E496262 /* dirdlg.mm */, + 6E53493CB84A30AE8C1CD721 /* dnd.mm */, + 8D2549709E0133C9A267E3A5 /* evtloop.mm */, + DC8A52CA69053B27B09F1037 /* filedlg.mm */, + 98A7F0605AAC3D28A8C9F253 /* gauge.mm */, + D324650313003AAD96E12962 /* listbox.mm */, + 1D799486AD7F336BB1F33DDC /* menu.mm */, + 61548D0FE1353D7C846DD721 /* menuitem.mm */, + 33CFE51FD6F0362092DF1A85 /* msgdlg.mm */, + AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */, + 0E8036758CEC3296B555E4DF /* notebook.mm */, + 99E5B6DD00273D978C241BCA /* radiobut.mm */, + C9E32802E8ED3E729FF34CFC /* printdlg.mm */, + CC2E24773D853A77B9FEFA4C /* scrolbar.mm */, + 9B862D1027C4367BBF44420F /* slider.mm */, + 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */, + 14EF4B028AD63B4A885D29A1 /* srchctrl.mm */, + 926BDF9C386C3A9A8C24D453 /* statbox.mm */, + 743EF8DB16CE371DA5C66623 /* statline.mm */, + 95186FEF3DEF39D8B1157BD5 /* stattext.mm */, + E4E16323A43E36DC8024EDF1 /* textctrl.mm */, + 5CFC6875EF4732E88E029065 /* tglbtn.mm */, + A3BF8C9FF2D5314591329D0D /* toolbar.mm */, + 31EFBD7D10003A5187348B35 /* tooltip.mm */, + C94DC3402FAE3C4FA776DEEA /* window.mm */, + ); + name = src/osx/cocoa; + sourceTree = ""; + }; + FC6F2C71999C3833AC0AD6E3 /* src/osx/cocoa */ = { + isa = PBXGroup; + children = ( + 207F0F88390138B6B41183EB /* aboutdlg.mm */, + DB6963739198360DB3DBCC6C /* dataview.mm */, + 2A4D36DE66EC3EB09E883D6B /* taskbar.mm */, + ); + name = src/osx/cocoa; + sourceTree = ""; + }; + FC6F2C71999C3833AC0AD6E4 /* src/osx/cocoa */ = { + isa = PBXGroup; + children = ( + 35007225BB683683AA7C5E48 /* glcanvas.mm */, + ); + name = src/osx/cocoa; + sourceTree = ""; + }; + FE1C78F1707A30878CBB2B4B /* ribbon */ = { + isa = PBXGroup; + children = ( + B402B38DB4CF3883AF4743C0 /* src/ribbon */, + ); + name = ribbon; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + B688C600AA163F61B2B151DE /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B688C600AA163F61B2B151DF /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 363401F972C53D8EBD3D4BD9 /* dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = F515C6D7EB103C50924F790B /* Build configuration list for PBXNativeTarget "dynamic" */; + buildPhases = ( + 94E713C89B403F568A694F9A /* ShellScript */, + B688C600AA163F61B2B151DF /* Headers */, + 8BD3A3B4622D37B8B5DB242E /* Sources */, + 82F403E7B8653CBD908BC258 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = dynamic; + productName = wxcocoa; + productReference = 65C47DFD6E243724A83603F3 /* libwx_osx_cocoa.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; + BAB02EC06578349A9171CCAC /* static */ = { + isa = PBXNativeTarget; + buildConfigurationList = 336FCCBABBEF3C4AA92AD394 /* Build configuration list for PBXNativeTarget "static" */; + buildPhases = ( + 94E713C89B403F568A694F9B /* ShellScript */, + B688C600AA163F61B2B151DE /* Headers */, + 8BD3A3B4622D37B8B5DB242D /* Sources */, + 82F403E7B8653CBD908BC257 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = static; + productName = static; + productReference = 1D025E39C79E3E119D19686C /* libwx_osx_cocoa_static.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 19367367C9323490BB936F06 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 6976B5F5F3A63A21A92029E3 /* Build configuration list for PBXProject "wxcocoa" */; + compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 1D56230B75893DBA8A923441 /* wxcocoa */; + productRefGroup = C2FC1A9BBB8C3046994369BF /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 363401F972C53D8EBD3D4BD9 /* dynamic */, + BAB02EC06578349A9171CCAC /* static */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXShellScriptBuildPhase section */ + 94E713C89B403F568A694F9A /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${WXROOT}/distrib/mac/pbsetup-sh\" \"${WXROOT}/src\" \"${WXROOT}/build/osx/setup/${WXTOOLKIT}\""; + }; + 94E713C89B403F568A694F9B /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${WXROOT}/distrib/mac/pbsetup-sh\" \"${WXROOT}/src\" \"${WXROOT}/build/osx/setup/${WXTOOLKIT}\""; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8BD3A3B4622D37B8B5DB242D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 59BFB8C8310E37B39AF8B0D5 /* any.cpp in Sources */, + D5A25AC579F436509805335B /* appbase.cpp in Sources */, + C2B07E2ECDDC3833BDC9B28D /* arcall.cpp in Sources */, + 4CF9BA40653C3153805D88AC /* arcfind.cpp in Sources */, + 3EB6B8528A0D3B6CADAE1257 /* archive.cpp in Sources */, + 3B8A54D5E5A53607A6F7979B /* arrstr.cpp in Sources */, + 0A2A4D2DC8F63FE1AC0BFAB0 /* base64.cpp in Sources */, + 319FB8E64CE731D6A58AD302 /* clntdata.cpp in Sources */, + 51437DC2AD7B3BEB9A53CE1B /* cmdline.cpp in Sources */, + DA0FA502405A37B2A5698D21 /* config.cpp in Sources */, + BB6FE851028C3DE7A070C214 /* convauto.cpp in Sources */, + F89405757B063F80B111F46A /* datetime.cpp in Sources */, + 1D726139C977341A97D0C932 /* datetimefmt.cpp in Sources */, + E63364B7E727383BA8E2B7ED /* datstrm.cpp in Sources */, + 3ED6F4B64C283232A79423D0 /* dircmn.cpp in Sources */, + 54A89D04FF953D55AE8DCCF1 /* dynarray.cpp in Sources */, + AD7EEB418C7930CB828EAF88 /* dynlib.cpp in Sources */, + 0164A65CDB7A334A8E9AA4C0 /* dynload.cpp in Sources */, + 246B4FF96BA135258FE45F50 /* encconv.cpp in Sources */, + 97BAFEAD53E238B6881178DE /* evtloopcmn.cpp in Sources */, + F07D84D124F23E7FA11CF149 /* extended.c in Sources */, + FEF99FF6C38D3B488396B143 /* ffile.cpp in Sources */, + D6C3421AD2A537AAA2F0AB81 /* file.cpp in Sources */, + FFF5BFBE600E35FAB7EA522D /* fileback.cpp in Sources */, + 41943A8F82723027A151A469 /* fileconf.cpp in Sources */, + 49260580A7F23B569A827D40 /* filefn.cpp in Sources */, + D4C87E227A28391891D89089 /* filename.cpp in Sources */, + 8A4046BD38873D9CAC9C2B5A /* filesys.cpp in Sources */, + 9E0B67E34B683412978BA82E /* filtall.cpp in Sources */, + CA4DCD57060B38CC8B2283D8 /* filtfind.cpp in Sources */, + 2FA1A8FE3644325ABAD273A5 /* fmapbase.cpp in Sources */, + FE2DBCCC1D0B36A3BE4493C1 /* fs_arc.cpp in Sources */, + F6B85CD918E93923BE631B96 /* fs_filter.cpp in Sources */, + FE5285579C7F39C48FC66B11 /* hash.cpp in Sources */, + 595DCB164D55342EB86604ED /* hashmap.cpp in Sources */, + 1B06622C8D8731FC832199E3 /* init.cpp in Sources */, + 0743AE8613F535A0ABB79316 /* intl.cpp in Sources */, + A336FD218BE63B19991CA514 /* ipcbase.cpp in Sources */, + BFD4B8871B3934048B63141A /* languageinfo.cpp in Sources */, + 68AC8860B0943C1FAF76D96C /* list.cpp in Sources */, + 3141FEDED0943BD6A2EF8590 /* log.cpp in Sources */, + 0C7E2D5C22A232368F862A61 /* longlong.cpp in Sources */, + DC978B60F6DF3176B5B114C4 /* memory.cpp in Sources */, + B59FC7345C383D9099391AC4 /* mimecmn.cpp in Sources */, + EC3A1C620D323B5590AABF03 /* module.cpp in Sources */, + F38202271C6131908C358DED /* mstream.cpp in Sources */, + 31DD19A942283FA8810B6383 /* numformatter.cpp in Sources */, + 23A7AF68A03E380785EE7C25 /* object.cpp in Sources */, + D6B73239BF0E32288161679D /* platinfo.cpp in Sources */, + 0A406D2D1ADA343891E3664D /* powercmn.cpp in Sources */, + CA85901B9E2538CFB7E44217 /* process.cpp in Sources */, + 7A7439BE66AA3771B4A89049 /* regex.cpp in Sources */, + CF3082BA1ED232F4B904BD15 /* stdpbase.cpp in Sources */, + 539B586AEAD630A79FC12ED0 /* sstream.cpp in Sources */, + 028257C52CAE3038AA862C36 /* stdstream.cpp in Sources */, + 6AA0EE765330326380989FD2 /* stopwatch.cpp in Sources */, + E882402BEE0330A080A65170 /* strconv.cpp in Sources */, + 30493B486DFF35AF80D12C4A /* stream.cpp in Sources */, + 795613831EC8332A83FF26E8 /* string.cpp in Sources */, + 55F0D287F60F3EDEA16CCB65 /* stringimpl.cpp in Sources */, + 88E1AE56FD393C8BA5CF8546 /* stringops.cpp in Sources */, + 056E30EA43753A7CB1AF8C9F /* strvararg.cpp in Sources */, + 4DD98A9436C83CF3B9425A79 /* sysopt.cpp in Sources */, + 9FB1E1763EFA334CA0C07C4A /* tarstrm.cpp in Sources */, + 2E4747E0736B30569ACD5423 /* textbuf.cpp in Sources */, + 6167245C417A32179EC37D2E /* textfile.cpp in Sources */, + 7FC3D17B3C853FE58841002E /* timercmn.cpp in Sources */, + 729091CC33C73C989B4E071A /* timerimpl.cpp in Sources */, + BF8C33B7CB3A3ECE814A95FC /* tokenzr.cpp in Sources */, + ABCD15C4AB37396EA17B7B29 /* translation.cpp in Sources */, + 087FF6DE223A32509692F39C /* txtstrm.cpp in Sources */, + DAAFBED07FF8365B96D20B9A /* unichar.cpp in Sources */, + 2E8440A2BDD53BE7B01547C3 /* uri.cpp in Sources */, + C425A172B0AB3EBD9AC9A591 /* ustring.cpp in Sources */, + 65E8A5F333D7336C816F0D0D /* variant.cpp in Sources */, + E53AFF04877D34C386D77381 /* wfstream.cpp in Sources */, + 319EA32592DA3C74B86DDE00 /* wxcrt.cpp in Sources */, + A2473402D8B83628B1F6674A /* wxprintf.cpp in Sources */, + BA7B12396B873FDA8F3A2749 /* xlocale.cpp in Sources */, + C5419BC04D6234B5A8307B82 /* xti.cpp in Sources */, + 52C0984A2A4F31BC885519B1 /* xtistrm.cpp in Sources */, + CA155860CE9A3A8189C3A4C3 /* zipstrm.cpp in Sources */, + 014AF0BAB1783A5D9D75A7EE /* zstream.cpp in Sources */, + A93D0E6F0871368EA8FC9FFA /* fswatchercmn.cpp in Sources */, + E49F0D43B5A63EF1A57A7113 /* fswatcherg.cpp in Sources */, + 4657E7382E9E3EDC8DE2401F /* mimetype.cpp in Sources */, + 1DBDF75500D73A3098015E80 /* cfstring.cpp in Sources */, + 9FBC642677C63D01AA2511BD /* evtloop_cf.cpp in Sources */, + 13250B531B1B3F9998C59DAA /* stdpaths_cf.cpp in Sources */, + AAAB5DF8E60736D88273DCFF /* strconv_cf.cpp in Sources */, + 4E140367282F38C8A904A005 /* utilsexc_base.cpp in Sources */, + D36E76A4CAF5352D9397E200 /* fdiodispatcher.cpp in Sources */, + D3FB75C8E3A73AE38EE8A6F7 /* selectdispatcher.cpp in Sources */, + BAAB6B1D80A33843A8436B11 /* appunix.cpp in Sources */, + 403FBA20CEFE3EAFB4E6B906 /* dir.cpp in Sources */, + 20BEEFFA08F3396791596871 /* dlunix.cpp in Sources */, + CBBD7B32DB7B3E24AE745D79 /* epolldispatcher.cpp in Sources */, + D18E2985C48733B2B7B3D443 /* evtloopunix.cpp in Sources */, + 3D22FC202D903007AEE3D165 /* fdiounix.cpp in Sources */, + 4B88254FF9963833A276A64D /* snglinst.cpp in Sources */, + 5F78DB0417BF3CE1B4E35C80 /* stackwalk.cpp in Sources */, + E8F0C87119C63E8E81423A7D /* stdpaths.cpp in Sources */, + 2F35A207C3993DE08E4FE0B1 /* timerunx.cpp in Sources */, + F5D2146C94E733FAAB6D286B /* threadpsx.cpp in Sources */, + B5C7FD8C27F43F3289A77FCA /* utilsunx.cpp in Sources */, + FF7DB2884F6E3C5DB4BDF61E /* fswatcher_kqueue.cpp in Sources */, + 55D893FDD00633FEA82ABD82 /* event.cpp in Sources */, + 131B879180AE3FB481F81CC8 /* fs_mem.cpp in Sources */, + 05814571E7A83F5DBFB6E4C5 /* msgout.cpp in Sources */, + 80665EEAE8613DF8A93A7985 /* utilscmn.cpp in Sources */, + A1A7D793B034398B8696EF34 /* utils.mm in Sources */, + F4C0CEADEDC23610BF6983D7 /* artmac.cpp in Sources */, + 296692A7A3783E3A83D005C7 /* brush.cpp in Sources */, + 86AED49CEAFC3637B1F10538 /* dialog_osx.cpp in Sources */, + DC6B669C9A78398F914AEE54 /* fontutil.cpp in Sources */, + 1EDED99760B23A1999E75C13 /* imaglist.cpp in Sources */, + C1CDD035AA393ACC9E202C04 /* minifram.cpp in Sources */, + 4269B85FDC5639BEB76A8AEC /* nonownedwnd_osx.cpp in Sources */, + AC91349D7F0E37739B1F5166 /* palette.cpp in Sources */, + 2480859662ED399799E120A6 /* pen.cpp in Sources */, + 0E024D145DDD38ACAE68F463 /* toplevel_osx.cpp in Sources */, + 02BB539E2AD63C078DA776B1 /* uiaction_osx.cpp in Sources */, + 052331773CF6362C9A6CF38F /* utils_osx.cpp in Sources */, + CB2E99E8FB7D3269A333A55F /* window_osx.cpp in Sources */, + 03BF1610E2FC3BD5ACB754F1 /* bitmap.cpp in Sources */, + FF50EC0EC5F23DF890C6E960 /* colour.cpp in Sources */, + BD2B17EB72E73A6EB6E0B270 /* dcmemory.cpp in Sources */, + F1F484DD591337399FCD0464 /* display.cpp in Sources */, + 371809DA4AD1382F8B532879 /* fontenum.cpp in Sources */, + 86BE5213D3F131D8A686267A /* hid.cpp in Sources */, + AB58406CEBA13BC4A2A83B67 /* printmac.cpp in Sources */, + 91BDA5B04CF33C9AB7358B8B /* timer.cpp in Sources */, + C2D45B334BE03F6C941CA042 /* utilsexc_cf.cpp in Sources */, + A92439BAFD3A30A29DD93132 /* apptraits.cpp in Sources */, + E82CB89681FF3747B6A94428 /* anybutton_osx.cpp in Sources */, + 49FE0228D8FD3F7AB64A4433 /* bmpbuttn_osx.cpp in Sources */, + 6AC347D2DCC730149A0A83D9 /* button_osx.cpp in Sources */, + 0E92CEF677AA32C9A8CDA0A8 /* checkbox_osx.cpp in Sources */, + 07412469921A3E488A2F9BA7 /* checklst_osx.cpp in Sources */, + 4666CDC48BA9301EA283C000 /* choice_osx.cpp in Sources */, + 0836590D35FE37988DE70443 /* combobox_osx.cpp in Sources */, + 2DF74933A90E34129F1BEF73 /* dnd_osx.cpp in Sources */, + 0FFFFA2F762B3160955D1D89 /* gauge_osx.cpp in Sources */, + E4B826CE70283D999CB591F4 /* listbox_osx.cpp in Sources */, + B198DA8239E9358A9D56B989 /* menu_osx.cpp in Sources */, + 1DF3A4F85FCB3BA79A552F3E /* menuitem_osx.cpp in Sources */, + A3321FE2A87D3BD69E0BB00A /* notebook_osx.cpp in Sources */, + 0C9A379D97B133FA831175A8 /* printdlg_osx.cpp in Sources */, + B1775EF7C72233408044034C /* radiobox_osx.cpp in Sources */, + 6A081BF19747385CB4C18780 /* radiobut_osx.cpp in Sources */, + DF8CE011EAC23F73BDA1C44E /* scrolbar_osx.cpp in Sources */, + 27E73CA5C35A30CE89946ECB /* slider_osx.cpp in Sources */, + 00F1531404F832C6AE0748F3 /* spinbutt_osx.cpp in Sources */, + 2939CA3680A13E39AB88CB06 /* spinctrl_osx.cpp in Sources */, + 91EA325FCE3A3A6A8D1D21A6 /* srchctrl_osx.cpp in Sources */, + 221DC4F6678A3EC5ACDDEA50 /* statbox_osx.cpp in Sources */, + 91BC7802C15337CDA84C3743 /* statline_osx.cpp in Sources */, + 283C3ABE42433244983C27C2 /* stattext_osx.cpp in Sources */, + B6891F848CA0325EAB6D1374 /* textentry_osx.cpp in Sources */, + EDCA35F1555F3509895CCA6A /* textctrl_osx.cpp in Sources */, + 664A54F914443110B7BB6929 /* tglbtn_osx.cpp in Sources */, + A569A33A2097316D8110C2C2 /* toolbar_osx.cpp in Sources */, + 0AEBA7389E223781A7A257A2 /* webkit.mm in Sources */, + F5FF98C231B33E3EB7902C65 /* colordlgosx.mm in Sources */, + 2386B575BC3931D2AF86CB34 /* fontdlgosx.mm in Sources */, + 2EECB3C2F9523D0B95847A80 /* accel.cpp in Sources */, + 7F77E347E1243D77A666FB44 /* clipbrd.cpp in Sources */, + 5417332FE2DB3CD3A647B15E /* cursor.cpp in Sources */, + D66F5D4D204B3B789C7F76BA /* fontdlg.cpp in Sources */, + 692FCCABFB963696AFC1E123 /* gdiobj.cpp in Sources */, + 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */, + B0E94A59C83637C09FAAE71D /* app.cpp in Sources */, + BB31D65BA1253A1CB64CE9D3 /* combobox.cpp in Sources */, + EB52C6A915943813932944FF /* control.cpp in Sources */, + 45AB45C6B24A3983B22E56A6 /* dataobj.cpp in Sources */, + D088E7DDE38C31DC9C9B3418 /* dcclient.cpp in Sources */, + 182DFDBB58653FD9863D4177 /* dcprint.cpp in Sources */, + AAC2CB4D851230008AE4ABA2 /* dcscreen.cpp in Sources */, + 939E53CA56F33194B4681118 /* glgrab.cpp in Sources */, + 774EB9F3F7E93A379E1F7552 /* graphics.cpp in Sources */, + 5792675690843C6AA4125A73 /* font.cpp in Sources */, + BDAB44F5D017395D9D3A1F24 /* frame.cpp in Sources */, + 27E2EABB117334CD89CFD2A5 /* mdi.cpp in Sources */, + 73AA68AB9F1236ED9F1FBB2F /* metafile.cpp in Sources */, + CD2A9111B8A83AFA8B5B97E6 /* overlay.cpp in Sources */, + 805CCAE64D023561AD334B54 /* popupwin.cpp in Sources */, + 6832385DDBB33D1B90C73CBB /* renderer.cpp in Sources */, + 437519A6002A3A0FB2C9A8FD /* settings.cpp in Sources */, + F6A1AC5CF84E32C19F91A615 /* statbrma.cpp in Sources */, + D070C3BE95483FE38BABA1BF /* region.cpp in Sources */, + 07158EBC05A637ECA9DC7B50 /* utilscocoa.mm in Sources */, + 7E6C627A325F32FFB2EF9B9F /* caret.cpp in Sources */, + FB8B6E4789A3311A98C5B0A9 /* clrpickerg.cpp in Sources */, + 7569F0BC3C603EB191680890 /* collpaneg.cpp in Sources */, + BBAABF3C693E37D3B0FF2503 /* colrdlgg.cpp in Sources */, + F70156C3E68B38FCB72FE254 /* dirdlgg.cpp in Sources */, + E1F7C51F411B3AF39476E489 /* fdrepdlg.cpp in Sources */, + A965348C7FA73CEC90C8FA26 /* filedlgg.cpp in Sources */, + FD1F6CD8286D3D428FD52A29 /* filepickerg.cpp in Sources */, + 16A382A265DE32FABC318F70 /* fontdlgg.cpp in Sources */, + BEAC2449AFA7304989BA301F /* fontpickerg.cpp in Sources */, + C3AC94EA13C1352790BF5FF8 /* listctrl.cpp in Sources */, + C005C2D547E735E9B081658F /* prntdlgg.cpp in Sources */, + A1AF8FF873D6383996995ED0 /* statusbr.cpp in Sources */, + 65AD3B31319C35F1AC9EC626 /* anybutton.mm in Sources */, + 14D6D5F8F5ED3C71936DD2B0 /* button.mm in Sources */, + 67A0583ADD8C35B8B9BA3D13 /* checkbox.mm in Sources */, + 603DF49D176737D383CE4F02 /* choice.mm in Sources */, + 8C2B50E3FC7A37C58CC9DC0B /* colour.mm in Sources */, + 8C52B1985BAA371FA22CCEBC /* combobox.mm in Sources */, + 6C3A459236F736B8A14A13AD /* dialog.mm in Sources */, + 8A9C3C04D00334418C3446FA /* dirdlg.mm in Sources */, + 5700B7F9166A37FDAA72E9DC /* dnd.mm in Sources */, + 58AABAD40AA236438347DDDF /* evtloop.mm in Sources */, + C40AA245D5773351979A2851 /* filedlg.mm in Sources */, + 23E9AF567E873B948EFEA181 /* gauge.mm in Sources */, + 6E1FD7D3DEF03748AEE3A29E /* listbox.mm in Sources */, + 2A79B68D20FE3C9B98A15535 /* menu.mm in Sources */, + 127E255EE601383A9E0EF7EB /* menuitem.mm in Sources */, + F84D59648206349A9768157D /* msgdlg.mm in Sources */, + 893BDA491EDE3A0E91FADE41 /* nonownedwnd.mm in Sources */, + 33BA7D6B9DC3378B820DEB88 /* notebook.mm in Sources */, + 9241AAE354C53190BF3D5BA4 /* radiobut.mm in Sources */, + 22E90F33B5C9308EBF37A701 /* printdlg.mm in Sources */, + 5303FA25D0773FAEB963D8E4 /* scrolbar.mm in Sources */, + 30AEDF41EC5C374DBF96EFFC /* slider.mm in Sources */, + 5DA146A9F7653F53BF5299E9 /* spinbutt.mm in Sources */, + 55F01295F1D23805BCA12F16 /* srchctrl.mm in Sources */, + B30D10F6257631B0A1926F8A /* statbox.mm in Sources */, + 1DE75213D296323B815A02BF /* statline.mm in Sources */, + 21F74D4D4D84375AB155FD5C /* stattext.mm in Sources */, + 675B4E6CBA8632E89B4AC26E /* textctrl.mm in Sources */, + E6CA1EB5550F3930BFE286CE /* tglbtn.mm in Sources */, + A53B8C3ED0D33A1D9AA8219B /* toolbar.mm in Sources */, + 2B4507BC09563DB5B0F16597 /* tooltip.mm in Sources */, + 815AE3FED68330F4933AA170 /* window.mm in Sources */, + 3CDE2B6BF88D326189F069BE /* accelcmn.cpp in Sources */, + BDB8EF0E0DA03693BFB77EF8 /* accesscmn.cpp in Sources */, + 205520440CD13C0AB9E8915A /* anidecod.cpp in Sources */, + 353B584AD0C03919A57A3049 /* affinematrix2d.cpp in Sources */, + DDC71B80D562303690FDBE4D /* appcmn.cpp in Sources */, + EE0EA850822E35F596B5EBBB /* artprov.cpp in Sources */, + A283187810EB32DAA173BD34 /* artstd.cpp in Sources */, + 75DCE6FF00E93C5D93970843 /* arttango.cpp in Sources */, + 1749412E53B9311DABA71DDD /* bmpbase.cpp in Sources */, + 3ACCC2EB8E973C11835EB598 /* bmpbtncmn.cpp in Sources */, + A5775D87FD713CBB930A783F /* bookctrl.cpp in Sources */, + C3A63D7091913CD39094AE0C /* btncmn.cpp in Sources */, + FBA19C939E1E33EDB05043FF /* cairo.cpp in Sources */, + 427E6AF88CF73D799206E37E /* checkboxcmn.cpp in Sources */, + 37749AC3468836FC857BD0D6 /* checklstcmn.cpp in Sources */, + C0CDA289E9EC3E20BE70B2E7 /* choiccmn.cpp in Sources */, + DFEB8DA3D42734949CB1E1AB /* clipcmn.cpp in Sources */, + 9D4B67A357D23B5283CA8D99 /* clrpickercmn.cpp in Sources */, + EBF2D44758003221A22202BD /* colourcmn.cpp in Sources */, + 335DD610974A33D4B6581E2B /* colourdata.cpp in Sources */, + D542C7819D593112AE5F7C3E /* combocmn.cpp in Sources */, + 6F0605F3A4E83BF0BF4C8B7F /* cmdproc.cpp in Sources */, + 20F10669703137E68318C6FE /* cmndata.cpp in Sources */, + 6FA47EAACE613B039B6EC262 /* containr.cpp in Sources */, + 0C485288EA86379D9FD66537 /* cshelp.cpp in Sources */, + 25656617A56D342AA3D1BFE3 /* ctrlcmn.cpp in Sources */, + BF1760458996391E8EB4294A /* ctrlsub.cpp in Sources */, + 2D60F289103837EA8925E3F2 /* dcbase.cpp in Sources */, + 39D6435B10073B85A499AFD9 /* dcbufcmn.cpp in Sources */, + 9564A6968D66325DAEADEBA4 /* dcgraph.cpp in Sources */, + B791BD05072B3B909A7093C3 /* dcsvg.cpp in Sources */, + B559E894684A38238CAAA116 /* dirctrlcmn.cpp in Sources */, + 63F0C8EEDF4B3641878A8B4E /* dlgcmn.cpp in Sources */, + B839235BED6F3609BDB732B9 /* dndcmn.cpp in Sources */, + 2CCC30C0162131DBBE9D8028 /* dobjcmn.cpp in Sources */, + F0B3F484C38C3BA0B9927CDA /* docmdi.cpp in Sources */, + B1E30CF6CFA932F5A3DBA950 /* docview.cpp in Sources */, + F80C2290D67B345F9CF60086 /* dpycmn.cpp in Sources */, + 6BF19C7CA9E93D989C210FE4 /* dseldlg.cpp in Sources */, + 447FEC72F3C234378CE28DE8 /* effects.cpp in Sources */, + C2E37E798F743A4199C8658F /* fddlgcmn.cpp in Sources */, + 37715483D08335B790FFE059 /* filectrlcmn.cpp in Sources */, + 0730A107A2B935A9923C8EF3 /* filehistorycmn.cpp in Sources */, + 9881E3FB23ED3283B6CC71A3 /* filepickercmn.cpp in Sources */, + 064908348009398C8EA8497D /* fontpickercmn.cpp in Sources */, + 1E166FC1A7B3371FB038B173 /* fldlgcmn.cpp in Sources */, + F747991E5C973F9B8C9D800B /* fontcmn.cpp in Sources */, + 1E2AB43075973AE59A8D89C2 /* fontdata.cpp in Sources */, + F910C74E48823E0BA7F7885E /* graphicc.cpp in Sources */, + F1E4D7CA634E33808AE3B523 /* fontenumcmn.cpp in Sources */, + D5AABE973F3A351EB1C1A5A7 /* fontmap.cpp in Sources */, + 60706F8836A130A2AF282FE2 /* fontutilcmn.cpp in Sources */, + EDD5725CF41336EFA7FB300A /* framecmn.cpp in Sources */, + EAA469E1A0CC33E4A21A3F7B /* gaugecmn.cpp in Sources */, + 5A8638C234133824BDF93BC0 /* gbsizer.cpp in Sources */, + 0E60E17BA4B23347A4F20161 /* gdicmn.cpp in Sources */, + 95AD56D602CF3C5085602AF9 /* geometry.cpp in Sources */, + 758629DA468A3EF7B1C15242 /* gifdecod.cpp in Sources */, + 7B642B17F5D23F4F8ED38BB5 /* graphcmn.cpp in Sources */, + B8FEEC2C94183AB69C963178 /* headercolcmn.cpp in Sources */, + 383A6993E90936D39A5F12BE /* headerctrlcmn.cpp in Sources */, + 4657479AF35533AEB7876677 /* helpbase.cpp in Sources */, + BF2585CFA6853023975F1E79 /* iconbndl.cpp in Sources */, + 5B5B8DF915D438AA9FCEB39F /* imagall.cpp in Sources */, + 0813551C951A3AD1A5EF01B3 /* imagbmp.cpp in Sources */, + 6C822F7F313734DCB51F44BA /* image.cpp in Sources */, + 89046455F49D3D75A21C9DB9 /* imagfill.cpp in Sources */, + 36DB80FD5B153E9099DB6913 /* imaggif.cpp in Sources */, + 9110ACFC3CFB3C7994E907B1 /* imagiff.cpp in Sources */, + D13596A4E3CD31DE810061A2 /* imagjpeg.cpp in Sources */, + D83B32B788EC310D919E0DF8 /* imagpcx.cpp in Sources */, + 23965E313EDC3BBE9B2FA1C6 /* imagpng.cpp in Sources */, + 46E331300D8F349DB36AB50B /* imagpnm.cpp in Sources */, + AAABEE399008310A8BC9BE44 /* imagtga.cpp in Sources */, + 3C36437B2E933F83984D431F /* imagtiff.cpp in Sources */, + 774A89998E09308CBFB03EE1 /* imagxpm.cpp in Sources */, + 63F2517EC6B2334CA825A6FA /* layout.cpp in Sources */, + CFF73578F04D357E83D1D831 /* lboxcmn.cpp in Sources */, + 164010B26D363F5FA09785B7 /* listctrlcmn.cpp in Sources */, + 2F7F5B9BBCD83D90B237A1A1 /* markupparser.cpp in Sources */, + 9A83D365AD1F37FA9C7030C3 /* matrix.cpp in Sources */, + E3A4615870B139D29FE727C2 /* menucmn.cpp in Sources */, + BD49EC50CB363642BDBF25C9 /* mousemanager.cpp in Sources */, + 7A84B9471A3238B4B66B1777 /* nbkbase.cpp in Sources */, + AC6AC589EFB233C7B65A3225 /* overlaycmn.cpp in Sources */, + D6B2A64A78AF3F2983B441A9 /* ownerdrwcmn.cpp in Sources */, + 0742292656623EC481B3436A /* paper.cpp in Sources */, + E2A73751CECF32A68FFAEE83 /* panelcmn.cpp in Sources */, + 4279D39CAAF834F6A5B99197 /* persist.cpp in Sources */, + AF1E3338E892336E924AF632 /* pickerbase.cpp in Sources */, + 6E68759BC2E63CA59C12FDC1 /* popupcmn.cpp in Sources */, + 1C52CB9487DF3AB9AF243B48 /* prntbase.cpp in Sources */, + 0B98B6721DEE37A1ADEA382C /* quantize.cpp in Sources */, + AE5286C71D1130EAA368A1C5 /* radiobtncmn.cpp in Sources */, + AEB9099819B33F4A8AAB9F55 /* radiocmn.cpp in Sources */, + 5116CE330E333724A66982E4 /* rearrangectrl.cpp in Sources */, + A9864F0104FA344BBE79D3BD /* rendcmn.cpp in Sources */, + A80D00249A693F43A9CBE778 /* rgncmn.cpp in Sources */, + C259D01CC62533D296EF023B /* scrolbarcmn.cpp in Sources */, + 7625D908B2CD34C78243BA90 /* settcmn.cpp in Sources */, + F5D0BCF1A6C839E5829199E3 /* sizer.cpp in Sources */, + EDD92822EBD93E86AE5A2ED1 /* slidercmn.cpp in Sources */, + F46777ABE0743B04A1E1F0A5 /* spinbtncmn.cpp in Sources */, + 49C873EE448C3CD9A32012CE /* spinctrlcmn.cpp in Sources */, + 1EA81A0E8E5A3B38B4D80338 /* srchcmn.cpp in Sources */, + 4AEC67BF65B039D99F421667 /* statbar.cpp in Sources */, + 7C52E7CC12463941B0E4D403 /* statbmpcmn.cpp in Sources */, + D9DCBE799DB634C2A73FD6BE /* statboxcmn.cpp in Sources */, + 8B38C6C416BA3A51B37F60C5 /* statlinecmn.cpp in Sources */, + D9EE059D3C3C3C13AE4419F2 /* stattextcmn.cpp in Sources */, + BAFF04F1680F32DA988EB03E /* stockitem.cpp in Sources */, + 4958BD2E717A3F03AB030189 /* tbarbase.cpp in Sources */, + 9744994E8A813AA6938A7CE3 /* textcmn.cpp in Sources */, + AD4A533C4E1633598A6D5C70 /* textentrycmn.cpp in Sources */, + 700BBDECBE313E108BA99ABE /* toplvcmn.cpp in Sources */, + 45FE206BBAD13DDCA1EA41D0 /* treebase.cpp in Sources */, + 796311E398FF313C84218825 /* uiactioncmn.cpp in Sources */, + E9EDB5C92D5D3B529E8D73B1 /* valgen.cpp in Sources */, + 9F70A89D00B03D4894AF7639 /* validate.cpp in Sources */, + 1937FBA0A0DD32A8A743CFE2 /* valtext.cpp in Sources */, + 6A032420671B375D81273715 /* valnum.cpp in Sources */, + A2769D1659AE3CA3B58C2CAF /* wincmn.cpp in Sources */, + 1BCC944F5E0936F5830F03E9 /* windowid.cpp in Sources */, + 3399AB7BB1333B5AAF5FAF56 /* wrapsizer.cpp in Sources */, + C1E5799141603A75A26BEEA8 /* xpmdecod.cpp in Sources */, + F5806029B1BA3924A8FDDBC2 /* busyinfo.cpp in Sources */, + CB078622E90F33BE9D131132 /* buttonbar.cpp in Sources */, + 03035C5CE4BC3288A5A18425 /* choicdgg.cpp in Sources */, + 9CA687845B3F30CCA44A89D1 /* choicbkg.cpp in Sources */, + 9C1F073349FD393E9220C0D4 /* combog.cpp in Sources */, + EAE02BA934B43EEE92C496C8 /* dcpsg.cpp in Sources */, + 22AE900003F73134BBEE8BB7 /* dirctrlg.cpp in Sources */, + 4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */, + 7EF89F935314301381802FAC /* filectrlg.cpp in Sources */, + 7D615329368D32709CEF4B59 /* headerctrlg.cpp in Sources */, + 2C95DFA8EE463487956B4EB5 /* infobar.cpp in Sources */, + 02E8F1195B653D26AAA89463 /* listbkg.cpp in Sources */, + 026F90F7492C316A94128917 /* logg.cpp in Sources */, + 633DD2E870263F42A8DBF9C0 /* markuptext.cpp in Sources */, + 745C39E90E8C3C08A887B51D /* msgdlgg.cpp in Sources */, + 1AF2B2346C9639DAA4D15F31 /* numdlgg.cpp in Sources */, + EE9194D6C4C138BF9DAB8634 /* panelg.cpp in Sources */, + 4D0BA8B9F72C3C31BC170CE3 /* progdlgg.cpp in Sources */, + DEB35F871F8E3B90AD207AEF /* printps.cpp in Sources */, + 96927C5A21FD3ACF936CDF6D /* renderg.cpp in Sources */, + F72020415D713C1BA41C17D0 /* richmsgdlgg.cpp in Sources */, + ED8D23D79FF33ED380FE09EC /* scrlwing.cpp in Sources */, + 85F9828B80B03178A274BD18 /* selstore.cpp in Sources */, + 84997126352137E798CD258B /* spinctlg.cpp in Sources */, + 62F1DC80D631335B892610A9 /* splitter.cpp in Sources */, + B6C364CB4AE33708A862B4B5 /* srchctlg.cpp in Sources */, + 8FC1C07FEE793897A1E96D24 /* statbmpg.cpp in Sources */, + BF9B151DC0543E37878F8B9B /* stattextg.cpp in Sources */, + 62757F24C4EE3B84B6AE3F15 /* textdlgg.cpp in Sources */, + 249C9177B1A33EFEAB30F940 /* tipwin.cpp in Sources */, + 32FECED7A7633C4D8C1BFBB4 /* toolbkg.cpp in Sources */, + DB3C3AA956A03FB492480267 /* treectlg.cpp in Sources */, + 5388468A6F8F3141B25CD401 /* treebkg.cpp in Sources */, + 87C67583D36C3465ACD64104 /* vlbox.cpp in Sources */, + A465A43B756630F1944B5A57 /* vscroll.cpp in Sources */, + 567A32722BA33AEE9FF93D7D /* fs_inet.cpp in Sources */, + 65514CD6A9F23ED98436AC03 /* ftp.cpp in Sources */, + B84642DA949638A189032CE7 /* http.cpp in Sources */, + 6CA1BAEBBDB4336E9E201F96 /* protocol.cpp in Sources */, + E39021D3CDCD33BAA646B007 /* sckaddr.cpp in Sources */, + 9F608A33D52D327FAA295625 /* sckfile.cpp in Sources */, + BCD81FD3D1EC305F801E1C1C /* sckipc.cpp in Sources */, + A3A898DA3114311EB7F02228 /* sckstrm.cpp in Sources */, + 6978D7A20DA93A329DDD1384 /* socket.cpp in Sources */, + E7140F3AB94D3FDFA86D8C07 /* url.cpp in Sources */, + 652CFDD9A1C1366E99B5D6BD /* socketiohandler.cpp in Sources */, + 346D274E17673A01B0177D5C /* sockunix.cpp in Sources */, + AD07124BBA613B47829F0693 /* sockosx.cpp in Sources */, + CFDBB80A4C9A3BA092273937 /* animatecmn.cpp in Sources */, + 5C44446AB150378696CD6B3D /* bmpcboxcmn.cpp in Sources */, + 901F659891613419B8643953 /* calctrlcmn.cpp in Sources */, + 1CD4F67F48CF3A5FA477D86F /* datavcmn.cpp in Sources */, + 2FAE979E6FE23D088C768B7E /* gridcmn.cpp in Sources */, + 7B4DA2F5F25B3E188CBAFE39 /* hyperlnkcmn.cpp in Sources */, + E6D18B2EDE353F67883085A0 /* odcombocmn.cpp in Sources */, + FEA741A9B6663A4C929893C3 /* aboutdlgg.cpp in Sources */, + B189DB62AE9F30A1B613756C /* bmpcboxg.cpp in Sources */, + 2F50DBC14FE538A49823925B /* calctrlg.cpp in Sources */, + 8A662992FFCB32E99D11950D /* commandlinkbuttong.cpp in Sources */, + 8B60964DA1DF3F3DB40BE124 /* datavgen.cpp in Sources */, + B4425B59CC27389CA9FF81D2 /* datectlg.cpp in Sources */, + 5557AA36FBCC3ED9A5F5751B /* editlbox.cpp in Sources */, + A139B846584436BCBEBAE3C0 /* grid.cpp in Sources */, + 2E930206397C3EDCBD8206FD /* gridctrl.cpp in Sources */, + E5D698D2606A304DA743AF93 /* grideditors.cpp in Sources */, + 187F921A95DA3594B0AD980E /* gridsel.cpp in Sources */, + F016C51053373E658ED4C9AA /* helpext.cpp in Sources */, + 760C729E41D93CC1AA2B4E0E /* hyperlinkg.cpp in Sources */, + 955D2199F1893D37BA2D7479 /* laywin.cpp in Sources */, + CEE0D7A7D5D8323B9957A781 /* notifmsgg.cpp in Sources */, + 1E17F95DD433379E8C18298D /* odcombo.cpp in Sources */, + 6A10511265493FA2BB79CE4E /* propdlg.cpp in Sources */, + 3554C88010CE3D2A8970A136 /* sashwin.cpp in Sources */, + 8AA341CCFB8E3F6AB3523596 /* splash.cpp in Sources */, + 77BC918AF05C30E8A0BD27F9 /* tipdlg.cpp in Sources */, + 82FA4AA043213728AC266701 /* wizard.cpp in Sources */, + D00AF125FCB63A7A8F9B87DF /* taskbarcmn.cpp in Sources */, + 46F341B46F80376B962759F6 /* animateg.cpp in Sources */, + CE2C937117FE3AB599DD30BA /* sound_osx.cpp in Sources */, + 61FEDBF2D47A3B4E861F8297 /* sound.cpp in Sources */, + 61FEDBF2D47A3B4E861F8299 /* sound.cpp in Sources */, + 14DEBD7C01FC358B917FDAF3 /* aboutdlg.mm in Sources */, + 0723C4E8B52C39FDBC2158B7 /* dataview_osx.cpp in Sources */, + 049052C49B0B3810BE0179CA /* dataview.mm in Sources */, + 25C5C1713C0B39AC8EB6A38F /* taskbar.mm in Sources */, + C1DCF69200593986A8C606A7 /* hidjoystick.cpp in Sources */, + DEC5F4B34BC037169D3E5F2B /* mediactrlcmn.cpp in Sources */, + 47EBBB18BDB539C2A948C712 /* chm.cpp in Sources */, + BAA75384DA82370298672334 /* helpctrl.cpp in Sources */, + 2CAD4DF9505F36E4A2EAD53E /* helpdata.cpp in Sources */, + D17E3053DA0D3F7EA4D0951C /* helpdlg.cpp in Sources */, + 7C87CC7641033D91823ED689 /* helpfrm.cpp in Sources */, + 3D762A0BBF1B39B88A769633 /* helpwnd.cpp in Sources */, + 4DA209AEF4AD32AAB97F9719 /* htmlcell.cpp in Sources */, + FD3CC5F0AA41384B9388A1E1 /* htmlfilt.cpp in Sources */, + C5E5AB869065307F83E27DD2 /* htmlpars.cpp in Sources */, + EBA0986930DA3B59B2FB4F1F /* htmltag.cpp in Sources */, + 93E04642049537EB8A37BA27 /* htmlwin.cpp in Sources */, + 3E99016BDE043A08B4D6B3CF /* htmprint.cpp in Sources */, + 9836B3D336963795928FE5A2 /* m_dflist.cpp in Sources */, + 66584BC871303041BA622DE1 /* m_fonts.cpp in Sources */, + 99F7D7BFBB543A04AB728376 /* m_hline.cpp in Sources */, + A3586433C4B1398FB1C361D7 /* m_image.cpp in Sources */, + BD53E095EC1136EF853A47D9 /* m_layout.cpp in Sources */, + C05BDB0B5F5A33A9A57FF013 /* m_links.cpp in Sources */, + 81B742D64BEB373DB705947B /* m_list.cpp in Sources */, + FD38B04026F930CC80BC9481 /* m_pre.cpp in Sources */, + 57AE7FCF768F3965BD39B47B /* m_span.cpp in Sources */, + 4CFB7E6E5BD53E2BB39BEF64 /* m_style.cpp in Sources */, + 3D424F4B33653A00AE9B623B /* m_tables.cpp in Sources */, + F3AC352D6DAE3A12A5664769 /* styleparams.cpp in Sources */, + 2A7640E4210334AC93366901 /* winpars.cpp in Sources */, + 87AA9C5D887B3C31A2AFB49E /* htmllbox.cpp in Sources */, + FBE4DB30865D3177B3A9993C /* xh_animatctrl.cpp in Sources */, + 94E510619F433AE3AC884756 /* xh_bmp.cpp in Sources */, + 8966F77CC97B3ED780C8F138 /* xh_bmpcbox.cpp in Sources */, + 84B3625464F732C3A79E1315 /* xh_bmpbt.cpp in Sources */, + D5C304182151365FA9FF8A3E /* xh_bttn.cpp in Sources */, + FE9A662A1F9B34D099C45C1E /* xh_cald.cpp in Sources */, + 6138BCBC8E4438FA91E0EFA0 /* xh_chckb.cpp in Sources */, + 5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */, + CE17002B5B7E37558274763A /* xh_choic.cpp in Sources */, + 26E4813A97DE323E88119164 /* xh_choicbk.cpp in Sources */, + E7AF3BF2B3473AD9BE66D1A2 /* xh_clrpicker.cpp in Sources */, + 1AB50C98FF473B33A3CA4D3A /* xh_cmdlinkbn.cpp in Sources */, + E7921B0472B63E4091F4F518 /* xh_collpane.cpp in Sources */, + 84382E5DB3203A73AC5EE391 /* xh_combo.cpp in Sources */, + F569D7A3F0E038E9B4CC2A77 /* xh_comboctrl.cpp in Sources */, + FB09720D13673A7B81BCB646 /* xh_datectrl.cpp in Sources */, + F7D10B6E0CBA32EFAF79C77D /* xh_dirpicker.cpp in Sources */, + 3B7E035ECF3D3FFB9827AC1D /* xh_dlg.cpp in Sources */, + E05B06A7FEEE32D5AD87EA50 /* xh_editlbox.cpp in Sources */, + F24F637D59F637CA9A7E23CA /* xh_filectrl.cpp in Sources */, + 5FE969523BDB3353AEF96811 /* xh_filepicker.cpp in Sources */, + 438EAEA4B30C325C827F6198 /* xh_fontpicker.cpp in Sources */, + 95826E8528CC32D8934C36ED /* xh_frame.cpp in Sources */, + BE99A85EE76236CC8C719A65 /* xh_gauge.cpp in Sources */, + 26649553E4763EE6BA268B7E /* xh_gdctl.cpp in Sources */, + 72AD4417FF7C3094BB1FF62D /* xh_grid.cpp in Sources */, + 83616D33080E3F0F9FA5FBB5 /* xh_html.cpp in Sources */, + 2B13BFC894C63373B7ACFA3E /* xh_hyperlink.cpp in Sources */, + C34B8675439F39B4845FFC51 /* xh_listb.cpp in Sources */, + F5DF7AF0FA9E371BB71EF799 /* xh_listbk.cpp in Sources */, + 96B507455762391688B5E501 /* xh_listc.cpp in Sources */, + F34D240EB4513FE996179183 /* xh_mdi.cpp in Sources */, + 65FCDBFFF3F138A3ABBAA651 /* xh_menu.cpp in Sources */, + 0FBF7C9EDFB53D8DA0991B56 /* xh_notbk.cpp in Sources */, + 0FA6E1E47F123FF4A902E4D3 /* xh_odcombo.cpp in Sources */, + 36B0B923B836358D9DB0AE11 /* xh_panel.cpp in Sources */, + CDC0FF253B503BA19693D68E /* xh_propdlg.cpp in Sources */, + 47F4FC8717AF3A848812DFCD /* xh_radbt.cpp in Sources */, + 7181709A030D3749AB355B75 /* xh_radbx.cpp in Sources */, + FDE14459359334DE9FB03ED6 /* xh_scrol.cpp in Sources */, + 87092C0C817D343DAB77E23F /* xh_scwin.cpp in Sources */, + 00E2F82590B33BDCA1F6D0C5 /* xh_htmllbox.cpp in Sources */, + E1A20811148F31D289AF98B0 /* xh_sizer.cpp in Sources */, + 5F6B4F226B473AACB7AC8DF6 /* xh_slidr.cpp in Sources */, + C32EF2EC1A103BC3A6254322 /* xh_spin.cpp in Sources */, + 33ED014A7FF7398794E6E4D0 /* xh_split.cpp in Sources */, + 7C9EAFF4A0223EE597E0E39F /* xh_srchctrl.cpp in Sources */, + 8AB7191F7CB838FC8337C48E /* xh_statbar.cpp in Sources */, + 3D3EA1BAAD1833B1B48E9C87 /* xh_stbmp.cpp in Sources */, + F22C401903993639AE05A296 /* xh_stbox.cpp in Sources */, + BF3D600A93403C589B65C5C0 /* xh_stlin.cpp in Sources */, + 8292D346BFC33D6E8D3CDDC0 /* xh_sttxt.cpp in Sources */, + 0EB6AB38A68D3845AC384A24 /* xh_text.cpp in Sources */, + B181806CC34839E791E54BF1 /* xh_tglbtn.cpp in Sources */, + F3CB42BB6D983675862C01F4 /* xh_toolb.cpp in Sources */, + 17F0494F87533196904F5314 /* xh_toolbk.cpp in Sources */, + 3357BD0518F538E9A949F887 /* xh_tree.cpp in Sources */, + 46CE8B53D2663927AAE5DF9E /* xh_treebk.cpp in Sources */, + C5A8DF376BB13A2A8290C2E6 /* xh_unkwn.cpp in Sources */, + 37DD17F479A1371ABF3589BA /* xh_wizrd.cpp in Sources */, + 1710A4BB0E6339558A187F8E /* xmlres.cpp in Sources */, + 867F5D1962383C98A8ADDC3E /* xmladv.cpp in Sources */, + 135DFCE48FC03D8294D01A8A /* xmlrsall.cpp in Sources */, + 61FD5E0E28F732E8AB1729F9 /* xml.cpp in Sources */, + 42ED9BAFD6E936849F1D36CC /* xtixml.cpp in Sources */, + EEB0B28903693C7E9D071930 /* glcmn.cpp in Sources */, + 59F995B6E6EE3CA5A4487845 /* glcanvas.mm in Sources */, + F2813BF297C73A3ABD02EC99 /* glcanvas_osx.cpp in Sources */, + 36EB5D19429D3BD1A01001D6 /* framemanager.cpp in Sources */, + C7B6240E0E213836996A178C /* dockart.cpp in Sources */, + 15048519756B33959B15B162 /* floatpane.cpp in Sources */, + E104017EE1A4357DAF84E1E7 /* auibook.cpp in Sources */, + 39CC380F801F3EE984523276 /* auibar.cpp in Sources */, + 6C46AF0370793AA0B74A5A4B /* tabmdi.cpp in Sources */, + DE43350F6C9D3148A64F0AFA /* art_internal.cpp in Sources */, + 7DC4A542372437ECA0790F88 /* art_msw.cpp in Sources */, + A0BA01A85C303C78A3130712 /* art_aui.cpp in Sources */, + 056CA84179433AA48D55DA66 /* bar.cpp in Sources */, + CB078622E90F33BE9D131134 /* buttonbar.cpp in Sources */, + EB52C6A91594381393294501 /* control.cpp in Sources */, + 5F57C4908E5038D19D68ED7B /* gallery.cpp in Sources */, + 4BAFAE70A6B1313B96D86631 /* page.cpp in Sources */, + F0D892C2618130FEAD46BB87 /* panel.cpp in Sources */, + EA02FA6D3B003F8F8A2963C7 /* toolbar.cpp in Sources */, + D54A162E557834A48F4646AA /* advprops.cpp in Sources */, + F501AB044AAC39DCB8C0B3E2 /* editors.cpp in Sources */, + 6B9EEA3CF2E536E3B1ADAC43 /* manager.cpp in Sources */, + 46A4CCF128FC3EB092074DC6 /* property.cpp in Sources */, + 26BB10834DA1388881BDD1ED /* propgrid.cpp in Sources */, + BEA90F2C6BB93143958F899B /* propgridiface.cpp in Sources */, + A423177BBC0F3BE5A436B4B8 /* propgridpagestate.cpp in Sources */, + D72D99FC424337CF9EDC2043 /* props.cpp in Sources */, + 9065A4BE3D0433B88CF45572 /* richtextbuffer.cpp in Sources */, + 5C3B0ED2EA973DFDBFBCC693 /* richtextctrl.cpp in Sources */, + 9455B49669853E71BD4FD966 /* richtextformatdlg.cpp in Sources */, + 70F898F8B129380BBECAC55A /* richtexthtml.cpp in Sources */, + F43DAE2E829A3A7493531382 /* richtextimagedlg.cpp in Sources */, + 0FDDE8E193743F3A8CBDC67D /* richtextprint.cpp in Sources */, + FADD46CB89B135D1AF1D5F8B /* richtextstyledlg.cpp in Sources */, + 2563C775427E3D68BD384F30 /* richtextstyles.cpp in Sources */, + 604ABF86317C3D4F899DBF38 /* richtextsymboldlg.cpp in Sources */, + 9058997222493A7A859A4D4D /* richtextxml.cpp in Sources */, + E3B3E4F75D503DB89B5C622E /* stc.cpp in Sources */, + 908957F65B7E36F8BF3858DE /* PlatWX.cpp in Sources */, + 3E6AA08E72A030D39D867D4C /* ScintillaWX.cpp in Sources */, + 99E7A46106C03484BA70D29F /* tif_unix.c in Sources */, + 4E396D8D2E9138D797F320C7 /* tif_aux.c in Sources */, + 1EE845DDFDDE36CA8A218206 /* tif_close.c in Sources */, + 8E674574343A3C009B1BCD01 /* tif_codec.c in Sources */, + D95C5F467D37339AB8DF2355 /* tif_color.c in Sources */, + 6D073876E1753549B5EEFDDB /* tif_compress.c in Sources */, + E3136EF5DD843ACE886E2869 /* tif_dir.c in Sources */, + 7ECC6EE6D5273F75BB6B7B75 /* tif_dirinfo.c in Sources */, + D51B3389209E370489078892 /* tif_dirread.c in Sources */, + E7F35B834A163C67B65176C7 /* tif_dirwrite.c in Sources */, + 2D4D105CA9BE3FA6995A6000 /* tif_dumpmode.c in Sources */, + C2CF6B59914A3183ADE84029 /* tif_error.c in Sources */, + 2315C8692C443ED1AE431729 /* tif_extension.c in Sources */, + FECC98B53C0F3106AB04E69F /* tif_fax3.c in Sources */, + 2C53221A318E37529E6460EC /* tif_fax3sm.c in Sources */, + 522E6CF2A62F34259BCE2DE3 /* tif_flush.c in Sources */, + 6944AC98F6F83E3D983DABD4 /* tif_getimage.c in Sources */, + 07C769F64665317BA3E1AC91 /* tif_jpeg.c in Sources */, + 88A43B1C5A7438838DE97B95 /* tif_luv.c in Sources */, + 779D3480141B3683A6D132BF /* tif_lzw.c in Sources */, + F85D632964383F29BC3B30B7 /* tif_next.c in Sources */, + 64F11C549E3035DF85691061 /* tif_ojpeg.c in Sources */, + 793F542F20AB31F6AF736796 /* tif_open.c in Sources */, + A9A5973552EE30838306D15D /* tif_packbits.c in Sources */, + 64DD406C453D39FEBBE66ED2 /* tif_pixarlog.c in Sources */, + 9A178ED42D96329D8CBF9B8A /* tif_predict.c in Sources */, + C170B941F01334F982315E4B /* tif_print.c in Sources */, + 570FA90F526E3F25A8E8FCF3 /* tif_read.c in Sources */, + 912C69ADB1673ACEB0E6CF09 /* tif_strip.c in Sources */, + 552708E6296D33EBB5F6A494 /* tif_swab.c in Sources */, + 527054445A0D3A00A5C2EC45 /* tif_thunder.c in Sources */, + FEB073547F3F3AC19D31F699 /* tif_tile.c in Sources */, + 096BA201623034AD97218369 /* tif_version.c in Sources */, + 7A79D9AC608E3B8287229175 /* tif_warning.c in Sources */, + F2F2963D8ECC32D39FDBF102 /* tif_write.c in Sources */, + 6E2C2E8AA1713ADE9C33837A /* tif_zip.c in Sources */, + FCE5B139CBE73FCB804EF7DE /* jcomapi.c in Sources */, + 311840186794346AAAA42092 /* jutils.c in Sources */, + DE26572475EE336B8EEA5D93 /* jerror.c in Sources */, + 18A318847EAC37F2B915F082 /* jmemmgr.c in Sources */, + A7692B4D8658347BA16EEB84 /* jmemnobs.c in Sources */, + 894D43C8F224394FB3171F27 /* jcapimin.c in Sources */, + 743BB23211B336A6A0F26E58 /* jcapistd.c in Sources */, + CCE4ECA9CE883B008065C6FC /* jctrans.c in Sources */, + ACD644CFA85A3B70A3E3B119 /* jcparam.c in Sources */, + 76A83A293C9F33BCB7DFDE27 /* jdatadst.c in Sources */, + 86003C8EB906304F9025F789 /* jcinit.c in Sources */, + C6DF6F29407B34F29ED1B66E /* jcmaster.c in Sources */, + DB73248401573A5996D8E68E /* jcmarker.c in Sources */, + 98DF13E96160304EBB905E74 /* jcmainct.c in Sources */, + 32486A808EBC3E088598D51D /* jcprepct.c in Sources */, + CA5BD8ABDBA13641BBE7CD67 /* jccoefct.c in Sources */, + 11DD420E32FB3EFB9DA0AB5C /* jccolor.c in Sources */, + 50D7E093424138C88BB50D28 /* jcsample.c in Sources */, + BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */, + A212431902B8343CA6D229D4 /* jcphuff.c in Sources */, + BFA6983551B4310DA7C8A405 /* jcdctmgr.c in Sources */, + 9B3F9D04FB533D99B58BD51A /* jfdctfst.c in Sources */, + 0948599C4FD53611A09B52AC /* jfdctflt.c in Sources */, + CEC6430AEB6E3200BFA75D08 /* jfdctint.c in Sources */, + 8B9C9FCB954F3596A4CED9A6 /* jdapimin.c in Sources */, + 67EBCE5FA5FF36349ADF0917 /* jdapistd.c in Sources */, + 11818B68C5263EB68D708846 /* jdtrans.c in Sources */, + 4CB3626391CE34D4B1F71AA1 /* jdatasrc.c in Sources */, + CEBAAB0C77983358A601BFFF /* jdmaster.c in Sources */, + 14EF556997B0350F931EBE8F /* jdinput.c in Sources */, + 61C3F7D495FB3E8BA402E4F9 /* jdmarker.c in Sources */, + 28ADE8D385A53445A5451F24 /* jdhuff.c in Sources */, + D0DA11B814AF30A185851230 /* jdphuff.c in Sources */, + 9FD99E06F6613A1A958FAF6C /* jdmainct.c in Sources */, + B5470121BB4B35DE9C4836DB /* jdcoefct.c in Sources */, + E7D02E64384F37BC8939A2C5 /* jdpostct.c in Sources */, + 13854E7822783719A2530793 /* jddctmgr.c in Sources */, + 48A1F28E04603A68A1E70319 /* jidctfst.c in Sources */, + B01C4EF49CF9390DA93A3503 /* jidctflt.c in Sources */, + C43A9650A9DC3372AB8F5F79 /* jidctint.c in Sources */, + 1A7FA35BDE4F35C685AB51A6 /* jidctred.c in Sources */, + D997FFC948B73FDA892DB532 /* jdsample.c in Sources */, + D9F02AFDA07D3857A905527D /* jdcolor.c in Sources */, + 15D65A523EB23EC385C05E0C /* jquant1.c in Sources */, + 3C0EB1DDA5243E31B2D92CE3 /* jquant2.c in Sources */, + 1E4832B42B95308299B767BA /* jdmerge.c in Sources */, + 94B1C88076793400810FAC31 /* png.c in Sources */, + 1569BB4728693B6285623A24 /* pngerror.c in Sources */, + D9496139621533328AE727B7 /* pngget.c in Sources */, + CFA91122523B31B9A07A3827 /* pngmem.c in Sources */, + 9EC837DA722736119D49868B /* pngpread.c in Sources */, + 9B8E5690A6103FC1BDC6C47F /* pngread.c in Sources */, + 31FEAB56919D372993CAD89D /* pngrio.c in Sources */, + 8FDC800D873F30E282691833 /* pngrtran.c in Sources */, + 61A2B54FD2E33C759CF5A5E9 /* pngrutil.c in Sources */, + 309C0A78D45C3AB7B8778B5A /* pngset.c in Sources */, + E515EAE375AE390688CBF8D4 /* pngtrans.c in Sources */, + C8C68927DB243AEAB51E11F3 /* pngwio.c in Sources */, + 0095084719983B878378CA29 /* pngwrite.c in Sources */, + 242E1D1A9BF331BA918134ED /* pngwtran.c in Sources */, + 2989056891153968B372EA15 /* pngwutil.c in Sources */, + E4131E3B445C36E6A7FC8030 /* regcomp.c in Sources */, + 768716016CE7310BB1AD7568 /* regexec.c in Sources */, + B026621DE50A3921B6598EF7 /* regerror.c in Sources */, + 05021BAB2C9B3C4CAD0A7C2D /* regfree.c in Sources */, + E741CDA71895344C974D8F51 /* AutoComplete.cxx in Sources */, + E92EB502F79638B0BE569EF5 /* CallTip.cxx in Sources */, + 682403FBBD4E3D5E88159502 /* CellBuffer.cxx in Sources */, + 1D7442C82B343F50A83B25B1 /* CharClassify.cxx in Sources */, + 6BC8B3EDB3AE3EF4BACFC08B /* ContractionState.cxx in Sources */, + 90BC965B1A1F35A3B2C9D1CA /* Decoration.cxx in Sources */, + 0D6596A44A8C37DE85D578F7 /* Document.cxx in Sources */, + 9A16829C34C9344D9AB010FA /* DocumentAccessor.cxx in Sources */, + 6D723C987BFB39B7B887DCB2 /* Editor.cxx in Sources */, + 83C492B87F4A3A97930F227B /* ExternalLexer.cxx in Sources */, + 0B4AF44DC0C439AD83CDC37F /* Indicator.cxx in Sources */, + C8F1FB8C029031A5909DBC57 /* KeyMap.cxx in Sources */, + 30509A33ED9C35D4ADEF6BBD /* KeyWords.cxx in Sources */, + 0654BCC3F0763C50A7949505 /* LexAPDL.cxx in Sources */, + 0ADC8DBEE80D36B0BB9B058B /* LexASY.cxx in Sources */, + 784F7C50882F320FA76537B6 /* LexAU3.cxx in Sources */, + 07EC76232BB3343FA5CB90B1 /* LexAVE.cxx in Sources */, + 66FD099CE5A338C18329FC37 /* LexAbaqus.cxx in Sources */, + CD35A576FD363FD49C3AC4B4 /* LexAda.cxx in Sources */, + 0C3F48DBD05E3566A4CA6D45 /* LexAsm.cxx in Sources */, + 825EAD51920B387DB4F8C427 /* LexAsn1.cxx in Sources */, + D54D3CA9E73336A08DB20706 /* LexBaan.cxx in Sources */, + 39FB197CF9EB3D76BE0723D0 /* LexBash.cxx in Sources */, + 6C7C1CC506CB329FB2D086AA /* LexBasic.cxx in Sources */, + 78E15D8200F635529F39609A /* LexBullant.cxx in Sources */, + 6F472413FFA03B53B395BB75 /* LexCLW.cxx in Sources */, + D8ADDD24BEAC3D94B3388D3F /* LexCOBOL.cxx in Sources */, + A0FCE3CF565C3F84B63712AD /* LexCPP.cxx in Sources */, + 069D53F2DFBF370A8CC99631 /* LexCSS.cxx in Sources */, + 268DDC88C99A3A64AB8B2FFB /* LexCaml.cxx in Sources */, + 6F5A0D3C7763334396A3783E /* LexCmake.cxx in Sources */, + B640A8A74D973A8FBEF63917 /* LexConf.cxx in Sources */, + 97F60B2A9CE93BC8949A8CCE /* LexCrontab.cxx in Sources */, + 834F2ADD0520313FBAC4F928 /* LexCsound.cxx in Sources */, + 8FB5FBC5730C33F1A3D85DA0 /* LexD.cxx in Sources */, + 4788F736CD9C324E8A3DFA75 /* LexEScript.cxx in Sources */, + E8BBC08597EF383597DA0309 /* LexEiffel.cxx in Sources */, + BFD3BFBDC8DA3B1EAD141F97 /* LexErlang.cxx in Sources */, + 45D88A74B3EE3837B9F79596 /* LexFlagship.cxx in Sources */, + 27759C2FBB0E35FDA847B2B6 /* LexForth.cxx in Sources */, + 020BBB417207393F8C60EFB7 /* LexFortran.cxx in Sources */, + E62F8E49FD5035D8BC71BB4A /* LexGAP.cxx in Sources */, + 9B6A35E706543CDAA6A5014B /* LexGui4Cli.cxx in Sources */, + AEEE6BC41B6531898A61CB17 /* LexHTML.cxx in Sources */, + 51D133EC44F830588FEEAEC1 /* LexHaskell.cxx in Sources */, + B37802B0A90133C68EF93DDB /* LexInno.cxx in Sources */, + 14C024EB327435A2A571DA2D /* LexKix.cxx in Sources */, + DF8124E5E17D386A84CEEA28 /* LexLisp.cxx in Sources */, + D13AE659C3AC37B68D39B2CA /* LexLout.cxx in Sources */, + 9D003890CB7035A298DB7057 /* LexLua.cxx in Sources */, + 3C394FBD47B6310C80577E3C /* LexMMIXAL.cxx in Sources */, + EC43AFB3670A3D459D9B388E /* LexMPT.cxx in Sources */, + E8EE34F0A78C31B489B19FEF /* LexMSSQL.cxx in Sources */, + E80BEED62EBF34F09B3F4020 /* LexMagik.cxx in Sources */, + E0E40333B61C33B58787078F /* LexMarkdown.cxx in Sources */, + 5AEA6E94FB76371D928D371D /* LexMatlab.cxx in Sources */, + 1A4F9F18BBEB3515AC7C7CC7 /* LexMetapost.cxx in Sources */, + CB1F37993ECB3B73A51B42FE /* LexMySQL.cxx in Sources */, + A874AF0B203D3DC99C27469B /* LexNimrod.cxx in Sources */, + 22C76BF2C3E331CD87657E6F /* LexNsis.cxx in Sources */, + 76D1A1A49CC831FFB9EBB1F6 /* LexOpal.cxx in Sources */, + BEFC179F8A0E337F9D627D85 /* LexOthers.cxx in Sources */, + 24A5A71C79733E9CB913C5B8 /* LexPB.cxx in Sources */, + 0D79F1B4EF44393AA3242140 /* LexPLM.cxx in Sources */, + A3C4D47A84E8362295867526 /* LexPOV.cxx in Sources */, + 551BF168445E3D7BB54D0175 /* LexPS.cxx in Sources */, + 0718E7524134312090541D6F /* LexPascal.cxx in Sources */, + 369BCCFF61D13A058D837836 /* LexPerl.cxx in Sources */, + 22EC132AEF863BFBAA6EDEC4 /* LexPowerPro.cxx in Sources */, + 1FB1622D59593932B25C55BB /* LexPowerShell.cxx in Sources */, + 97C551F8AEF133D680D1FD37 /* LexProgress.cxx in Sources */, + A36B5107860E326591940740 /* LexPython.cxx in Sources */, + 31380AD4F5BD38A6B9212FE1 /* LexR.cxx in Sources */, + CCFD3144A22C3A87B67D88AC /* LexRebol.cxx in Sources */, + 7C20B79175D33852A2E9DE84 /* LexRuby.cxx in Sources */, + FE5B7C7A84B83C17A38E8404 /* LexSML.cxx in Sources */, + 71CCB06E790C3C54BFF1199E /* LexSQL.cxx in Sources */, + BA9F0BBD57F63FD29E484FD4 /* LexScriptol.cxx in Sources */, + F55F3887CDE633D7877C607C /* LexSmalltalk.cxx in Sources */, + D5C5DD83882B3227A1CCFE0F /* LexSorcus.cxx in Sources */, + 6F8129E317EE3486A89D8549 /* LexSpecman.cxx in Sources */, + 9678C2B19D293818AA8E9E0E /* LexSpice.cxx in Sources */, + 0F8C79010EF0316AA1B7392E /* LexTACL.cxx in Sources */, + 2102C23970FB3F22AB46A59B /* LexTADS3.cxx in Sources */, + CAF5C5BB129431B596C4C6C2 /* LexTAL.cxx in Sources */, + 49BEDFBC3661339D90EF6936 /* LexTCL.cxx in Sources */, + 7D0E549020D33ED39751DFC9 /* LexTeX.cxx in Sources */, + D4EC9DB5F8DF319EA0FD26A5 /* LexVB.cxx in Sources */, + 16021CFD78623B8CBD08FC20 /* LexVHDL.cxx in Sources */, + 3C5E1A45A57B3169A4C073DA /* LexVerilog.cxx in Sources */, + 159E4248CB1333AD841D9F04 /* LexYAML.cxx in Sources */, + 923F4797A73A3BDD87BBD1E2 /* LineMarker.cxx in Sources */, + 523FB2A8435A3324A8E1B371 /* PerLine.cxx in Sources */, + BF068F3C06473D8CBC55D508 /* PositionCache.cxx in Sources */, + 795B9B15279D36F8899C9CA9 /* PropSet.cxx in Sources */, + A52A7D2FEB1434E29C64582D /* RESearch.cxx in Sources */, + 7B372FEA276438C186F7E341 /* RunStyles.cxx in Sources */, + 15735ED6556130F6A14F0BCE /* ScintillaBase.cxx in Sources */, + 097BC5E023C33C1DA05606B0 /* Selection.cxx in Sources */, + 4C9BA36123E43589956864C7 /* Style.cxx in Sources */, + CD241361D4693785A0B8939E /* StyleContext.cxx in Sources */, + 19D823E564D932758EA6F8D2 /* UniConversion.cxx in Sources */, + 699D88EE2DAA3594B6606891 /* ViewStyle.cxx in Sources */, + B387FAE95A9535B194A42BA5 /* WindowAccessor.cxx in Sources */, + BCDAE378D03E37F5994FB9C6 /* XPM.cxx in Sources */, + C2DEE063B5E032C1BD2B5027 /* xmlparse.c in Sources */, + AE84BC9A1CCA3ADA9C483951 /* xmlrole.c in Sources */, + DB9565CC4EAE3BCB9F490621 /* xmltok.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8BD3A3B4622D37B8B5DB242E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 59BFB8C8310E37B39AF8B0D4 /* any.cpp in Sources */, + D5A25AC579F436509805335A /* appbase.cpp in Sources */, + C2B07E2ECDDC3833BDC9B28C /* arcall.cpp in Sources */, + 4CF9BA40653C3153805D88AB /* arcfind.cpp in Sources */, + 3EB6B8528A0D3B6CADAE1256 /* archive.cpp in Sources */, + 3B8A54D5E5A53607A6F7979A /* arrstr.cpp in Sources */, + 0A2A4D2DC8F63FE1AC0BFAAF /* base64.cpp in Sources */, + 319FB8E64CE731D6A58AD301 /* clntdata.cpp in Sources */, + 51437DC2AD7B3BEB9A53CE1A /* cmdline.cpp in Sources */, + DA0FA502405A37B2A5698D20 /* config.cpp in Sources */, + BB6FE851028C3DE7A070C213 /* convauto.cpp in Sources */, + F89405757B063F80B111F469 /* datetime.cpp in Sources */, + 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */, + E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */, + 3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */, + 54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */, + AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */, + 0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */, + 246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */, + 97BAFEAD53E238B6881178DD /* evtloopcmn.cpp in Sources */, + F07D84D124F23E7FA11CF148 /* extended.c in Sources */, + FEF99FF6C38D3B488396B142 /* ffile.cpp in Sources */, + D6C3421AD2A537AAA2F0AB80 /* file.cpp in Sources */, + FFF5BFBE600E35FAB7EA522C /* fileback.cpp in Sources */, + 41943A8F82723027A151A468 /* fileconf.cpp in Sources */, + 49260580A7F23B569A827D3F /* filefn.cpp in Sources */, + D4C87E227A28391891D89088 /* filename.cpp in Sources */, + 8A4046BD38873D9CAC9C2B59 /* filesys.cpp in Sources */, + 9E0B67E34B683412978BA82D /* filtall.cpp in Sources */, + CA4DCD57060B38CC8B2283D7 /* filtfind.cpp in Sources */, + 2FA1A8FE3644325ABAD273A4 /* fmapbase.cpp in Sources */, + FE2DBCCC1D0B36A3BE4493C0 /* fs_arc.cpp in Sources */, + F6B85CD918E93923BE631B95 /* fs_filter.cpp in Sources */, + FE5285579C7F39C48FC66B10 /* hash.cpp in Sources */, + 595DCB164D55342EB86604EC /* hashmap.cpp in Sources */, + 1B06622C8D8731FC832199E2 /* init.cpp in Sources */, + 0743AE8613F535A0ABB79315 /* intl.cpp in Sources */, + A336FD218BE63B19991CA513 /* ipcbase.cpp in Sources */, + BFD4B8871B3934048B631419 /* languageinfo.cpp in Sources */, + 68AC8860B0943C1FAF76D96B /* list.cpp in Sources */, + 3141FEDED0943BD6A2EF858F /* log.cpp in Sources */, + 0C7E2D5C22A232368F862A60 /* longlong.cpp in Sources */, + DC978B60F6DF3176B5B114C3 /* memory.cpp in Sources */, + B59FC7345C383D9099391AC3 /* mimecmn.cpp in Sources */, + EC3A1C620D323B5590AABF02 /* module.cpp in Sources */, + F38202271C6131908C358DEC /* mstream.cpp in Sources */, + 31DD19A942283FA8810B6382 /* numformatter.cpp in Sources */, + 23A7AF68A03E380785EE7C24 /* object.cpp in Sources */, + D6B73239BF0E32288161679C /* platinfo.cpp in Sources */, + 0A406D2D1ADA343891E3664C /* powercmn.cpp in Sources */, + CA85901B9E2538CFB7E44216 /* process.cpp in Sources */, + 7A7439BE66AA3771B4A89048 /* regex.cpp in Sources */, + CF3082BA1ED232F4B904BD14 /* stdpbase.cpp in Sources */, + 539B586AEAD630A79FC12ECF /* sstream.cpp in Sources */, + 028257C52CAE3038AA862C35 /* stdstream.cpp in Sources */, + 6AA0EE765330326380989FD1 /* stopwatch.cpp in Sources */, + E882402BEE0330A080A6516F /* strconv.cpp in Sources */, + 30493B486DFF35AF80D12C49 /* stream.cpp in Sources */, + 795613831EC8332A83FF26E7 /* string.cpp in Sources */, + 55F0D287F60F3EDEA16CCB64 /* stringimpl.cpp in Sources */, + 88E1AE56FD393C8BA5CF8545 /* stringops.cpp in Sources */, + 056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */, + 4DD98A9436C83CF3B9425A78 /* sysopt.cpp in Sources */, + 9FB1E1763EFA334CA0C07C49 /* tarstrm.cpp in Sources */, + 2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */, + 6167245C417A32179EC37D2D /* textfile.cpp in Sources */, + 7FC3D17B3C853FE58841002D /* timercmn.cpp in Sources */, + 729091CC33C73C989B4E0719 /* timerimpl.cpp in Sources */, + BF8C33B7CB3A3ECE814A95FB /* tokenzr.cpp in Sources */, + ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */, + 087FF6DE223A32509692F39B /* txtstrm.cpp in Sources */, + DAAFBED07FF8365B96D20B99 /* unichar.cpp in Sources */, + 2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */, + C425A172B0AB3EBD9AC9A590 /* ustring.cpp in Sources */, + 65E8A5F333D7336C816F0D0C /* variant.cpp in Sources */, + E53AFF04877D34C386D77380 /* wfstream.cpp in Sources */, + 319EA32592DA3C74B86DDDFF /* wxcrt.cpp in Sources */, + A2473402D8B83628B1F66749 /* wxprintf.cpp in Sources */, + BA7B12396B873FDA8F3A2748 /* xlocale.cpp in Sources */, + C5419BC04D6234B5A8307B81 /* xti.cpp in Sources */, + 52C0984A2A4F31BC885519B0 /* xtistrm.cpp in Sources */, + CA155860CE9A3A8189C3A4C2 /* zipstrm.cpp in Sources */, + 014AF0BAB1783A5D9D75A7ED /* zstream.cpp in Sources */, + A93D0E6F0871368EA8FC9FF9 /* fswatchercmn.cpp in Sources */, + E49F0D43B5A63EF1A57A7112 /* fswatcherg.cpp in Sources */, + 4657E7382E9E3EDC8DE2401E /* mimetype.cpp in Sources */, + 1DBDF75500D73A3098015E7F /* cfstring.cpp in Sources */, + 9FBC642677C63D01AA2511BC /* evtloop_cf.cpp in Sources */, + 13250B531B1B3F9998C59DA9 /* stdpaths_cf.cpp in Sources */, + AAAB5DF8E60736D88273DCFE /* strconv_cf.cpp in Sources */, + 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */, + D36E76A4CAF5352D9397E1FF /* fdiodispatcher.cpp in Sources */, + D3FB75C8E3A73AE38EE8A6F6 /* selectdispatcher.cpp in Sources */, + BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */, + 403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */, + 20BEEFFA08F3396791596870 /* dlunix.cpp in Sources */, + CBBD7B32DB7B3E24AE745D78 /* epolldispatcher.cpp in Sources */, + D18E2985C48733B2B7B3D442 /* evtloopunix.cpp in Sources */, + 3D22FC202D903007AEE3D164 /* fdiounix.cpp in Sources */, + 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */, + 5F78DB0417BF3CE1B4E35C7F /* stackwalk.cpp in Sources */, + E8F0C87119C63E8E81423A7C /* stdpaths.cpp in Sources */, + 2F35A207C3993DE08E4FE0B0 /* timerunx.cpp in Sources */, + F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */, + B5C7FD8C27F43F3289A77FC9 /* utilsunx.cpp in Sources */, + FF7DB2884F6E3C5DB4BDF61D /* fswatcher_kqueue.cpp in Sources */, + 55D893FDD00633FEA82ABD81 /* event.cpp in Sources */, + 131B879180AE3FB481F81CC7 /* fs_mem.cpp in Sources */, + 05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */, + 80665EEAE8613DF8A93A7984 /* utilscmn.cpp in Sources */, + A1A7D793B034398B8696EF33 /* utils.mm in Sources */, + F4C0CEADEDC23610BF6983D6 /* artmac.cpp in Sources */, + 296692A7A3783E3A83D005C6 /* brush.cpp in Sources */, + 86AED49CEAFC3637B1F10537 /* dialog_osx.cpp in Sources */, + DC6B669C9A78398F914AEE53 /* fontutil.cpp in Sources */, + 1EDED99760B23A1999E75C12 /* imaglist.cpp in Sources */, + C1CDD035AA393ACC9E202C03 /* minifram.cpp in Sources */, + 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */, + AC91349D7F0E37739B1F5165 /* palette.cpp in Sources */, + 2480859662ED399799E120A5 /* pen.cpp in Sources */, + 0E024D145DDD38ACAE68F462 /* toplevel_osx.cpp in Sources */, + 02BB539E2AD63C078DA776B0 /* uiaction_osx.cpp in Sources */, + 052331773CF6362C9A6CF38E /* utils_osx.cpp in Sources */, + CB2E99E8FB7D3269A333A55E /* window_osx.cpp in Sources */, + 03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */, + FF50EC0EC5F23DF890C6E95F /* colour.cpp in Sources */, + BD2B17EB72E73A6EB6E0B26F /* dcmemory.cpp in Sources */, + F1F484DD591337399FCD0463 /* display.cpp in Sources */, + 371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */, + 86BE5213D3F131D8A6862679 /* hid.cpp in Sources */, + AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */, + 91BDA5B04CF33C9AB7358B8A /* timer.cpp in Sources */, + C2D45B334BE03F6C941CA041 /* utilsexc_cf.cpp in Sources */, + A92439BAFD3A30A29DD93131 /* apptraits.cpp in Sources */, + E82CB89681FF3747B6A94427 /* anybutton_osx.cpp in Sources */, + 49FE0228D8FD3F7AB64A4432 /* bmpbuttn_osx.cpp in Sources */, + 6AC347D2DCC730149A0A83D8 /* button_osx.cpp in Sources */, + 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */, + 07412469921A3E488A2F9BA6 /* checklst_osx.cpp in Sources */, + 4666CDC48BA9301EA283BFFF /* choice_osx.cpp in Sources */, + 0836590D35FE37988DE70442 /* combobox_osx.cpp in Sources */, + 2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */, + 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */, + E4B826CE70283D999CB591F3 /* listbox_osx.cpp in Sources */, + B198DA8239E9358A9D56B988 /* menu_osx.cpp in Sources */, + 1DF3A4F85FCB3BA79A552F3D /* menuitem_osx.cpp in Sources */, + A3321FE2A87D3BD69E0BB009 /* notebook_osx.cpp in Sources */, + 0C9A379D97B133FA831175A7 /* printdlg_osx.cpp in Sources */, + B1775EF7C72233408044034B /* radiobox_osx.cpp in Sources */, + 6A081BF19747385CB4C1877F /* radiobut_osx.cpp in Sources */, + DF8CE011EAC23F73BDA1C44D /* scrolbar_osx.cpp in Sources */, + 27E73CA5C35A30CE89946ECA /* slider_osx.cpp in Sources */, + 00F1531404F832C6AE0748F2 /* spinbutt_osx.cpp in Sources */, + 2939CA3680A13E39AB88CB05 /* spinctrl_osx.cpp in Sources */, + 91EA325FCE3A3A6A8D1D21A5 /* srchctrl_osx.cpp in Sources */, + 221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */, + 91BC7802C15337CDA84C3742 /* statline_osx.cpp in Sources */, + 283C3ABE42433244983C27C1 /* stattext_osx.cpp in Sources */, + B6891F848CA0325EAB6D1373 /* textentry_osx.cpp in Sources */, + EDCA35F1555F3509895CCA69 /* textctrl_osx.cpp in Sources */, + 664A54F914443110B7BB6928 /* tglbtn_osx.cpp in Sources */, + A569A33A2097316D8110C2C1 /* toolbar_osx.cpp in Sources */, + 0AEBA7389E223781A7A257A1 /* webkit.mm in Sources */, + F5FF98C231B33E3EB7902C64 /* colordlgosx.mm in Sources */, + 2386B575BC3931D2AF86CB33 /* fontdlgosx.mm in Sources */, + 2EECB3C2F9523D0B95847A7F /* accel.cpp in Sources */, + 7F77E347E1243D77A666FB43 /* clipbrd.cpp in Sources */, + 5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */, + D66F5D4D204B3B789C7F76B9 /* fontdlg.cpp in Sources */, + 692FCCABFB963696AFC1E122 /* gdiobj.cpp in Sources */, + 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */, + B0E94A59C83637C09FAAE71C /* app.cpp in Sources */, + BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */, + EB52C6A915943813932944FE /* control.cpp in Sources */, + 45AB45C6B24A3983B22E56A5 /* dataobj.cpp in Sources */, + D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */, + 182DFDBB58653FD9863D4176 /* dcprint.cpp in Sources */, + AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */, + 939E53CA56F33194B4681117 /* glgrab.cpp in Sources */, + 774EB9F3F7E93A379E1F7551 /* graphics.cpp in Sources */, + 5792675690843C6AA4125A72 /* font.cpp in Sources */, + BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */, + 27E2EABB117334CD89CFD2A4 /* mdi.cpp in Sources */, + 73AA68AB9F1236ED9F1FBB2E /* metafile.cpp in Sources */, + CD2A9111B8A83AFA8B5B97E5 /* overlay.cpp in Sources */, + 805CCAE64D023561AD334B53 /* popupwin.cpp in Sources */, + 6832385DDBB33D1B90C73CBA /* renderer.cpp in Sources */, + 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */, + F6A1AC5CF84E32C19F91A614 /* statbrma.cpp in Sources */, + D070C3BE95483FE38BABA1BE /* region.cpp in Sources */, + 07158EBC05A637ECA9DC7B4F /* utilscocoa.mm in Sources */, + 7E6C627A325F32FFB2EF9B9E /* caret.cpp in Sources */, + FB8B6E4789A3311A98C5B0A8 /* clrpickerg.cpp in Sources */, + 7569F0BC3C603EB19168088F /* collpaneg.cpp in Sources */, + BBAABF3C693E37D3B0FF2502 /* colrdlgg.cpp in Sources */, + F70156C3E68B38FCB72FE253 /* dirdlgg.cpp in Sources */, + E1F7C51F411B3AF39476E488 /* fdrepdlg.cpp in Sources */, + A965348C7FA73CEC90C8FA25 /* filedlgg.cpp in Sources */, + FD1F6CD8286D3D428FD52A28 /* filepickerg.cpp in Sources */, + 16A382A265DE32FABC318F6F /* fontdlgg.cpp in Sources */, + BEAC2449AFA7304989BA301E /* fontpickerg.cpp in Sources */, + C3AC94EA13C1352790BF5FF7 /* listctrl.cpp in Sources */, + C005C2D547E735E9B081658E /* prntdlgg.cpp in Sources */, + A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */, + 65AD3B31319C35F1AC9EC625 /* anybutton.mm in Sources */, + 14D6D5F8F5ED3C71936DD2AF /* button.mm in Sources */, + 67A0583ADD8C35B8B9BA3D12 /* checkbox.mm in Sources */, + 603DF49D176737D383CE4F01 /* choice.mm in Sources */, + 8C2B50E3FC7A37C58CC9DC0A /* colour.mm in Sources */, + 8C52B1985BAA371FA22CCEBB /* combobox.mm in Sources */, + 6C3A459236F736B8A14A13AC /* dialog.mm in Sources */, + 8A9C3C04D00334418C3446F9 /* dirdlg.mm in Sources */, + 5700B7F9166A37FDAA72E9DB /* dnd.mm in Sources */, + 58AABAD40AA236438347DDDE /* evtloop.mm in Sources */, + C40AA245D5773351979A2850 /* filedlg.mm in Sources */, + 23E9AF567E873B948EFEA180 /* gauge.mm in Sources */, + 6E1FD7D3DEF03748AEE3A29D /* listbox.mm in Sources */, + 2A79B68D20FE3C9B98A15534 /* menu.mm in Sources */, + 127E255EE601383A9E0EF7EA /* menuitem.mm in Sources */, + F84D59648206349A9768157C /* msgdlg.mm in Sources */, + 893BDA491EDE3A0E91FADE40 /* nonownedwnd.mm in Sources */, + 33BA7D6B9DC3378B820DEB87 /* notebook.mm in Sources */, + 9241AAE354C53190BF3D5BA3 /* radiobut.mm in Sources */, + 22E90F33B5C9308EBF37A700 /* printdlg.mm in Sources */, + 5303FA25D0773FAEB963D8E3 /* scrolbar.mm in Sources */, + 30AEDF41EC5C374DBF96EFFB /* slider.mm in Sources */, + 5DA146A9F7653F53BF5299E8 /* spinbutt.mm in Sources */, + 55F01295F1D23805BCA12F15 /* srchctrl.mm in Sources */, + B30D10F6257631B0A1926F89 /* statbox.mm in Sources */, + 1DE75213D296323B815A02BE /* statline.mm in Sources */, + 21F74D4D4D84375AB155FD5B /* stattext.mm in Sources */, + 675B4E6CBA8632E89B4AC26D /* textctrl.mm in Sources */, + E6CA1EB5550F3930BFE286CD /* tglbtn.mm in Sources */, + A53B8C3ED0D33A1D9AA8219A /* toolbar.mm in Sources */, + 2B4507BC09563DB5B0F16596 /* tooltip.mm in Sources */, + 815AE3FED68330F4933AA16F /* window.mm in Sources */, + 3CDE2B6BF88D326189F069BD /* accelcmn.cpp in Sources */, + BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */, + 205520440CD13C0AB9E89159 /* anidecod.cpp in Sources */, + 353B584AD0C03919A57A3048 /* affinematrix2d.cpp in Sources */, + DDC71B80D562303690FDBE4C /* appcmn.cpp in Sources */, + EE0EA850822E35F596B5EBBA /* artprov.cpp in Sources */, + A283187810EB32DAA173BD33 /* artstd.cpp in Sources */, + 75DCE6FF00E93C5D93970842 /* arttango.cpp in Sources */, + 1749412E53B9311DABA71DDC /* bmpbase.cpp in Sources */, + 3ACCC2EB8E973C11835EB597 /* bmpbtncmn.cpp in Sources */, + A5775D87FD713CBB930A783E /* bookctrl.cpp in Sources */, + C3A63D7091913CD39094AE0B /* btncmn.cpp in Sources */, + FBA19C939E1E33EDB05043FE /* cairo.cpp in Sources */, + 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */, + 37749AC3468836FC857BD0D5 /* checklstcmn.cpp in Sources */, + C0CDA289E9EC3E20BE70B2E6 /* choiccmn.cpp in Sources */, + DFEB8DA3D42734949CB1E1AA /* clipcmn.cpp in Sources */, + 9D4B67A357D23B5283CA8D98 /* clrpickercmn.cpp in Sources */, + EBF2D44758003221A22202BC /* colourcmn.cpp in Sources */, + 335DD610974A33D4B6581E2A /* colourdata.cpp in Sources */, + D542C7819D593112AE5F7C3D /* combocmn.cpp in Sources */, + 6F0605F3A4E83BF0BF4C8B7E /* cmdproc.cpp in Sources */, + 20F10669703137E68318C6FD /* cmndata.cpp in Sources */, + 6FA47EAACE613B039B6EC261 /* containr.cpp in Sources */, + 0C485288EA86379D9FD66536 /* cshelp.cpp in Sources */, + 25656617A56D342AA3D1BFE2 /* ctrlcmn.cpp in Sources */, + BF1760458996391E8EB42949 /* ctrlsub.cpp in Sources */, + 2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */, + 39D6435B10073B85A499AFD8 /* dcbufcmn.cpp in Sources */, + 9564A6968D66325DAEADEBA3 /* dcgraph.cpp in Sources */, + B791BD05072B3B909A7093C2 /* dcsvg.cpp in Sources */, + B559E894684A38238CAAA115 /* dirctrlcmn.cpp in Sources */, + 63F0C8EEDF4B3641878A8B4D /* dlgcmn.cpp in Sources */, + B839235BED6F3609BDB732B8 /* dndcmn.cpp in Sources */, + 2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */, + F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */, + B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */, + F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */, + 6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */, + 447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */, + C2E37E798F743A4199C8658E /* fddlgcmn.cpp in Sources */, + 37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */, + 0730A107A2B935A9923C8EF2 /* filehistorycmn.cpp in Sources */, + 9881E3FB23ED3283B6CC71A2 /* filepickercmn.cpp in Sources */, + 064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */, + 1E166FC1A7B3371FB038B172 /* fldlgcmn.cpp in Sources */, + F747991E5C973F9B8C9D800A /* fontcmn.cpp in Sources */, + 1E2AB43075973AE59A8D89C1 /* fontdata.cpp in Sources */, + F910C74E48823E0BA7F7885D /* graphicc.cpp in Sources */, + F1E4D7CA634E33808AE3B522 /* fontenumcmn.cpp in Sources */, + D5AABE973F3A351EB1C1A5A6 /* fontmap.cpp in Sources */, + 60706F8836A130A2AF282FE1 /* fontutilcmn.cpp in Sources */, + EDD5725CF41336EFA7FB3009 /* framecmn.cpp in Sources */, + EAA469E1A0CC33E4A21A3F7A /* gaugecmn.cpp in Sources */, + 5A8638C234133824BDF93BBF /* gbsizer.cpp in Sources */, + 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */, + 95AD56D602CF3C5085602AF8 /* geometry.cpp in Sources */, + 758629DA468A3EF7B1C15241 /* gifdecod.cpp in Sources */, + 7B642B17F5D23F4F8ED38BB4 /* graphcmn.cpp in Sources */, + B8FEEC2C94183AB69C963177 /* headercolcmn.cpp in Sources */, + 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */, + 4657479AF35533AEB7876676 /* helpbase.cpp in Sources */, + BF2585CFA6853023975F1E78 /* iconbndl.cpp in Sources */, + 5B5B8DF915D438AA9FCEB39E /* imagall.cpp in Sources */, + 0813551C951A3AD1A5EF01B2 /* imagbmp.cpp in Sources */, + 6C822F7F313734DCB51F44B9 /* image.cpp in Sources */, + 89046455F49D3D75A21C9DB8 /* imagfill.cpp in Sources */, + 36DB80FD5B153E9099DB6912 /* imaggif.cpp in Sources */, + 9110ACFC3CFB3C7994E907B0 /* imagiff.cpp in Sources */, + D13596A4E3CD31DE810061A1 /* imagjpeg.cpp in Sources */, + D83B32B788EC310D919E0DF7 /* imagpcx.cpp in Sources */, + 23965E313EDC3BBE9B2FA1C5 /* imagpng.cpp in Sources */, + 46E331300D8F349DB36AB50A /* imagpnm.cpp in Sources */, + AAABEE399008310A8BC9BE43 /* imagtga.cpp in Sources */, + 3C36437B2E933F83984D431E /* imagtiff.cpp in Sources */, + 774A89998E09308CBFB03EE0 /* imagxpm.cpp in Sources */, + 63F2517EC6B2334CA825A6F9 /* layout.cpp in Sources */, + CFF73578F04D357E83D1D830 /* lboxcmn.cpp in Sources */, + 164010B26D363F5FA09785B6 /* listctrlcmn.cpp in Sources */, + 2F7F5B9BBCD83D90B237A1A0 /* markupparser.cpp in Sources */, + 9A83D365AD1F37FA9C7030C2 /* matrix.cpp in Sources */, + E3A4615870B139D29FE727C1 /* menucmn.cpp in Sources */, + BD49EC50CB363642BDBF25C8 /* mousemanager.cpp in Sources */, + 7A84B9471A3238B4B66B1776 /* nbkbase.cpp in Sources */, + AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */, + D6B2A64A78AF3F2983B441A8 /* ownerdrwcmn.cpp in Sources */, + 0742292656623EC481B34369 /* paper.cpp in Sources */, + E2A73751CECF32A68FFAEE82 /* panelcmn.cpp in Sources */, + 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */, + AF1E3338E892336E924AF631 /* pickerbase.cpp in Sources */, + 6E68759BC2E63CA59C12FDC0 /* popupcmn.cpp in Sources */, + 1C52CB9487DF3AB9AF243B47 /* prntbase.cpp in Sources */, + 0B98B6721DEE37A1ADEA382B /* quantize.cpp in Sources */, + AE5286C71D1130EAA368A1C4 /* radiobtncmn.cpp in Sources */, + AEB9099819B33F4A8AAB9F54 /* radiocmn.cpp in Sources */, + 5116CE330E333724A66982E3 /* rearrangectrl.cpp in Sources */, + A9864F0104FA344BBE79D3BC /* rendcmn.cpp in Sources */, + A80D00249A693F43A9CBE777 /* rgncmn.cpp in Sources */, + C259D01CC62533D296EF023A /* scrolbarcmn.cpp in Sources */, + 7625D908B2CD34C78243BA8F /* settcmn.cpp in Sources */, + F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */, + EDD92822EBD93E86AE5A2ED0 /* slidercmn.cpp in Sources */, + F46777ABE0743B04A1E1F0A4 /* spinbtncmn.cpp in Sources */, + 49C873EE448C3CD9A32012CD /* spinctrlcmn.cpp in Sources */, + 1EA81A0E8E5A3B38B4D80337 /* srchcmn.cpp in Sources */, + 4AEC67BF65B039D99F421666 /* statbar.cpp in Sources */, + 7C52E7CC12463941B0E4D402 /* statbmpcmn.cpp in Sources */, + D9DCBE799DB634C2A73FD6BD /* statboxcmn.cpp in Sources */, + 8B38C6C416BA3A51B37F60C4 /* statlinecmn.cpp in Sources */, + D9EE059D3C3C3C13AE4419F1 /* stattextcmn.cpp in Sources */, + BAFF04F1680F32DA988EB03D /* stockitem.cpp in Sources */, + 4958BD2E717A3F03AB030188 /* tbarbase.cpp in Sources */, + 9744994E8A813AA6938A7CE2 /* textcmn.cpp in Sources */, + AD4A533C4E1633598A6D5C6F /* textentrycmn.cpp in Sources */, + 700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */, + 45FE206BBAD13DDCA1EA41CF /* treebase.cpp in Sources */, + 796311E398FF313C84218824 /* uiactioncmn.cpp in Sources */, + E9EDB5C92D5D3B529E8D73B0 /* valgen.cpp in Sources */, + 9F70A89D00B03D4894AF7638 /* validate.cpp in Sources */, + 1937FBA0A0DD32A8A743CFE1 /* valtext.cpp in Sources */, + 6A032420671B375D81273714 /* valnum.cpp in Sources */, + A2769D1659AE3CA3B58C2CAE /* wincmn.cpp in Sources */, + 1BCC944F5E0936F5830F03E8 /* windowid.cpp in Sources */, + 3399AB7BB1333B5AAF5FAF55 /* wrapsizer.cpp in Sources */, + C1E5799141603A75A26BEEA7 /* xpmdecod.cpp in Sources */, + F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */, + CB078622E90F33BE9D131131 /* buttonbar.cpp in Sources */, + 03035C5CE4BC3288A5A18424 /* choicdgg.cpp in Sources */, + 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */, + 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */, + EAE02BA934B43EEE92C496C7 /* dcpsg.cpp in Sources */, + 22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */, + 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */, + 7EF89F935314301381802FAB /* filectrlg.cpp in Sources */, + 7D615329368D32709CEF4B58 /* headerctrlg.cpp in Sources */, + 2C95DFA8EE463487956B4EB4 /* infobar.cpp in Sources */, + 02E8F1195B653D26AAA89462 /* listbkg.cpp in Sources */, + 026F90F7492C316A94128916 /* logg.cpp in Sources */, + 633DD2E870263F42A8DBF9BF /* markuptext.cpp in Sources */, + 745C39E90E8C3C08A887B51C /* msgdlgg.cpp in Sources */, + 1AF2B2346C9639DAA4D15F30 /* numdlgg.cpp in Sources */, + EE9194D6C4C138BF9DAB8633 /* panelg.cpp in Sources */, + 4D0BA8B9F72C3C31BC170CE2 /* progdlgg.cpp in Sources */, + DEB35F871F8E3B90AD207AEE /* printps.cpp in Sources */, + 96927C5A21FD3ACF936CDF6C /* renderg.cpp in Sources */, + F72020415D713C1BA41C17CF /* richmsgdlgg.cpp in Sources */, + ED8D23D79FF33ED380FE09EB /* scrlwing.cpp in Sources */, + 85F9828B80B03178A274BD17 /* selstore.cpp in Sources */, + 84997126352137E798CD258A /* spinctlg.cpp in Sources */, + 62F1DC80D631335B892610A8 /* splitter.cpp in Sources */, + B6C364CB4AE33708A862B4B4 /* srchctlg.cpp in Sources */, + 8FC1C07FEE793897A1E96D23 /* statbmpg.cpp in Sources */, + BF9B151DC0543E37878F8B9A /* stattextg.cpp in Sources */, + 62757F24C4EE3B84B6AE3F14 /* textdlgg.cpp in Sources */, + 249C9177B1A33EFEAB30F93F /* tipwin.cpp in Sources */, + 32FECED7A7633C4D8C1BFBB3 /* toolbkg.cpp in Sources */, + DB3C3AA956A03FB492480266 /* treectlg.cpp in Sources */, + 5388468A6F8F3141B25CD400 /* treebkg.cpp in Sources */, + 87C67583D36C3465ACD64103 /* vlbox.cpp in Sources */, + A465A43B756630F1944B5A56 /* vscroll.cpp in Sources */, + 567A32722BA33AEE9FF93D7C /* fs_inet.cpp in Sources */, + 65514CD6A9F23ED98436AC02 /* ftp.cpp in Sources */, + B84642DA949638A189032CE6 /* http.cpp in Sources */, + 6CA1BAEBBDB4336E9E201F95 /* protocol.cpp in Sources */, + E39021D3CDCD33BAA646B006 /* sckaddr.cpp in Sources */, + 9F608A33D52D327FAA295624 /* sckfile.cpp in Sources */, + BCD81FD3D1EC305F801E1C1B /* sckipc.cpp in Sources */, + A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */, + 6978D7A20DA93A329DDD1383 /* socket.cpp in Sources */, + E7140F3AB94D3FDFA86D8C06 /* url.cpp in Sources */, + 652CFDD9A1C1366E99B5D6BC /* socketiohandler.cpp in Sources */, + 346D274E17673A01B0177D5B /* sockunix.cpp in Sources */, + AD07124BBA613B47829F0692 /* sockosx.cpp in Sources */, + CFDBB80A4C9A3BA092273936 /* animatecmn.cpp in Sources */, + 5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */, + 901F659891613419B8643952 /* calctrlcmn.cpp in Sources */, + 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */, + 2FAE979E6FE23D088C768B7D /* gridcmn.cpp in Sources */, + 7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */, + E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */, + FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */, + B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */, + 2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */, + 8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */, + 8B60964DA1DF3F3DB40BE123 /* datavgen.cpp in Sources */, + B4425B59CC27389CA9FF81D1 /* datectlg.cpp in Sources */, + 5557AA36FBCC3ED9A5F5751A /* editlbox.cpp in Sources */, + A139B846584436BCBEBAE3BF /* grid.cpp in Sources */, + 2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */, + E5D698D2606A304DA743AF92 /* grideditors.cpp in Sources */, + 187F921A95DA3594B0AD980D /* gridsel.cpp in Sources */, + F016C51053373E658ED4C9A9 /* helpext.cpp in Sources */, + 760C729E41D93CC1AA2B4E0D /* hyperlinkg.cpp in Sources */, + 955D2199F1893D37BA2D7478 /* laywin.cpp in Sources */, + CEE0D7A7D5D8323B9957A780 /* notifmsgg.cpp in Sources */, + 1E17F95DD433379E8C18298C /* odcombo.cpp in Sources */, + 6A10511265493FA2BB79CE4D /* propdlg.cpp in Sources */, + 3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */, + 8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */, + 77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */, + 82FA4AA043213728AC266700 /* wizard.cpp in Sources */, + D00AF125FCB63A7A8F9B87DE /* taskbarcmn.cpp in Sources */, + 46F341B46F80376B962759F5 /* animateg.cpp in Sources */, + CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */, + 61FEDBF2D47A3B4E861F8296 /* sound.cpp in Sources */, + 61FEDBF2D47A3B4E861F8298 /* sound.cpp in Sources */, + 14DEBD7C01FC358B917FDAF2 /* aboutdlg.mm in Sources */, + 0723C4E8B52C39FDBC2158B6 /* dataview_osx.cpp in Sources */, + 049052C49B0B3810BE0179C9 /* dataview.mm in Sources */, + 25C5C1713C0B39AC8EB6A38E /* taskbar.mm in Sources */, + C1DCF69200593986A8C606A6 /* hidjoystick.cpp in Sources */, + DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */, + 47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */, + BAA75384DA82370298672333 /* helpctrl.cpp in Sources */, + 2CAD4DF9505F36E4A2EAD53D /* helpdata.cpp in Sources */, + D17E3053DA0D3F7EA4D0951B /* helpdlg.cpp in Sources */, + 7C87CC7641033D91823ED688 /* helpfrm.cpp in Sources */, + 3D762A0BBF1B39B88A769632 /* helpwnd.cpp in Sources */, + 4DA209AEF4AD32AAB97F9718 /* htmlcell.cpp in Sources */, + FD3CC5F0AA41384B9388A1E0 /* htmlfilt.cpp in Sources */, + C5E5AB869065307F83E27DD1 /* htmlpars.cpp in Sources */, + EBA0986930DA3B59B2FB4F1E /* htmltag.cpp in Sources */, + 93E04642049537EB8A37BA26 /* htmlwin.cpp in Sources */, + 3E99016BDE043A08B4D6B3CE /* htmprint.cpp in Sources */, + 9836B3D336963795928FE5A1 /* m_dflist.cpp in Sources */, + 66584BC871303041BA622DE0 /* m_fonts.cpp in Sources */, + 99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */, + A3586433C4B1398FB1C361D6 /* m_image.cpp in Sources */, + BD53E095EC1136EF853A47D8 /* m_layout.cpp in Sources */, + C05BDB0B5F5A33A9A57FF012 /* m_links.cpp in Sources */, + 81B742D64BEB373DB705947A /* m_list.cpp in Sources */, + FD38B04026F930CC80BC9480 /* m_pre.cpp in Sources */, + 57AE7FCF768F3965BD39B47A /* m_span.cpp in Sources */, + 4CFB7E6E5BD53E2BB39BEF63 /* m_style.cpp in Sources */, + 3D424F4B33653A00AE9B623A /* m_tables.cpp in Sources */, + F3AC352D6DAE3A12A5664768 /* styleparams.cpp in Sources */, + 2A7640E4210334AC93366900 /* winpars.cpp in Sources */, + 87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */, + FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */, + 94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */, + 8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */, + 84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */, + D5C304182151365FA9FF8A3D /* xh_bttn.cpp in Sources */, + FE9A662A1F9B34D099C45C1D /* xh_cald.cpp in Sources */, + 6138BCBC8E4438FA91E0EF9F /* xh_chckb.cpp in Sources */, + 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */, + CE17002B5B7E375582747639 /* xh_choic.cpp in Sources */, + 26E4813A97DE323E88119163 /* xh_choicbk.cpp in Sources */, + E7AF3BF2B3473AD9BE66D1A1 /* xh_clrpicker.cpp in Sources */, + 1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */, + E7921B0472B63E4091F4F517 /* xh_collpane.cpp in Sources */, + 84382E5DB3203A73AC5EE390 /* xh_combo.cpp in Sources */, + F569D7A3F0E038E9B4CC2A76 /* xh_comboctrl.cpp in Sources */, + FB09720D13673A7B81BCB645 /* xh_datectrl.cpp in Sources */, + F7D10B6E0CBA32EFAF79C77C /* xh_dirpicker.cpp in Sources */, + 3B7E035ECF3D3FFB9827AC1C /* xh_dlg.cpp in Sources */, + E05B06A7FEEE32D5AD87EA4F /* xh_editlbox.cpp in Sources */, + F24F637D59F637CA9A7E23C9 /* xh_filectrl.cpp in Sources */, + 5FE969523BDB3353AEF96810 /* xh_filepicker.cpp in Sources */, + 438EAEA4B30C325C827F6197 /* xh_fontpicker.cpp in Sources */, + 95826E8528CC32D8934C36EC /* xh_frame.cpp in Sources */, + BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */, + 26649553E4763EE6BA268B7D /* xh_gdctl.cpp in Sources */, + 72AD4417FF7C3094BB1FF62C /* xh_grid.cpp in Sources */, + 83616D33080E3F0F9FA5FBB4 /* xh_html.cpp in Sources */, + 2B13BFC894C63373B7ACFA3D /* xh_hyperlink.cpp in Sources */, + C34B8675439F39B4845FFC50 /* xh_listb.cpp in Sources */, + F5DF7AF0FA9E371BB71EF798 /* xh_listbk.cpp in Sources */, + 96B507455762391688B5E500 /* xh_listc.cpp in Sources */, + F34D240EB4513FE996179182 /* xh_mdi.cpp in Sources */, + 65FCDBFFF3F138A3ABBAA650 /* xh_menu.cpp in Sources */, + 0FBF7C9EDFB53D8DA0991B55 /* xh_notbk.cpp in Sources */, + 0FA6E1E47F123FF4A902E4D2 /* xh_odcombo.cpp in Sources */, + 36B0B923B836358D9DB0AE10 /* xh_panel.cpp in Sources */, + CDC0FF253B503BA19693D68D /* xh_propdlg.cpp in Sources */, + 47F4FC8717AF3A848812DFCC /* xh_radbt.cpp in Sources */, + 7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */, + FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */, + 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */, + 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */, + E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */, + 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */, + C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */, + 33ED014A7FF7398794E6E4CF /* xh_split.cpp in Sources */, + 7C9EAFF4A0223EE597E0E39E /* xh_srchctrl.cpp in Sources */, + 8AB7191F7CB838FC8337C48D /* xh_statbar.cpp in Sources */, + 3D3EA1BAAD1833B1B48E9C86 /* xh_stbmp.cpp in Sources */, + F22C401903993639AE05A295 /* xh_stbox.cpp in Sources */, + BF3D600A93403C589B65C5BF /* xh_stlin.cpp in Sources */, + 8292D346BFC33D6E8D3CDDBF /* xh_sttxt.cpp in Sources */, + 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */, + B181806CC34839E791E54BF0 /* xh_tglbtn.cpp in Sources */, + F3CB42BB6D983675862C01F3 /* xh_toolb.cpp in Sources */, + 17F0494F87533196904F5313 /* xh_toolbk.cpp in Sources */, + 3357BD0518F538E9A949F886 /* xh_tree.cpp in Sources */, + 46CE8B53D2663927AAE5DF9D /* xh_treebk.cpp in Sources */, + C5A8DF376BB13A2A8290C2E5 /* xh_unkwn.cpp in Sources */, + 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */, + 1710A4BB0E6339558A187F8D /* xmlres.cpp in Sources */, + 867F5D1962383C98A8ADDC3D /* xmladv.cpp in Sources */, + 135DFCE48FC03D8294D01A89 /* xmlrsall.cpp in Sources */, + 61FD5E0E28F732E8AB1729F8 /* xml.cpp in Sources */, + 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */, + EEB0B28903693C7E9D07192F /* glcmn.cpp in Sources */, + 59F995B6E6EE3CA5A4487844 /* glcanvas.mm in Sources */, + F2813BF297C73A3ABD02EC98 /* glcanvas_osx.cpp in Sources */, + 36EB5D19429D3BD1A01001D5 /* framemanager.cpp in Sources */, + C7B6240E0E213836996A178B /* dockart.cpp in Sources */, + 15048519756B33959B15B161 /* floatpane.cpp in Sources */, + E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */, + 39CC380F801F3EE984523275 /* auibar.cpp in Sources */, + 6C46AF0370793AA0B74A5A4A /* tabmdi.cpp in Sources */, + DE43350F6C9D3148A64F0AF9 /* art_internal.cpp in Sources */, + 7DC4A542372437ECA0790F87 /* art_msw.cpp in Sources */, + A0BA01A85C303C78A3130711 /* art_aui.cpp in Sources */, + 056CA84179433AA48D55DA65 /* bar.cpp in Sources */, + CB078622E90F33BE9D131133 /* buttonbar.cpp in Sources */, + EB52C6A91594381393294500 /* control.cpp in Sources */, + 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */, + 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */, + F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */, + EA02FA6D3B003F8F8A2963C6 /* toolbar.cpp in Sources */, + D54A162E557834A48F4646A9 /* advprops.cpp in Sources */, + F501AB044AAC39DCB8C0B3E1 /* editors.cpp in Sources */, + 6B9EEA3CF2E536E3B1ADAC42 /* manager.cpp in Sources */, + 46A4CCF128FC3EB092074DC5 /* property.cpp in Sources */, + 26BB10834DA1388881BDD1EC /* propgrid.cpp in Sources */, + BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */, + A423177BBC0F3BE5A436B4B7 /* propgridpagestate.cpp in Sources */, + D72D99FC424337CF9EDC2042 /* props.cpp in Sources */, + 9065A4BE3D0433B88CF45571 /* richtextbuffer.cpp in Sources */, + 5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */, + 9455B49669853E71BD4FD965 /* richtextformatdlg.cpp in Sources */, + 70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */, + F43DAE2E829A3A7493531381 /* richtextimagedlg.cpp in Sources */, + 0FDDE8E193743F3A8CBDC67C /* richtextprint.cpp in Sources */, + FADD46CB89B135D1AF1D5F8A /* richtextstyledlg.cpp in Sources */, + 2563C775427E3D68BD384F2F /* richtextstyles.cpp in Sources */, + 604ABF86317C3D4F899DBF37 /* richtextsymboldlg.cpp in Sources */, + 9058997222493A7A859A4D4C /* richtextxml.cpp in Sources */, + E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */, + 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */, + 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */, + 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */, + 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */, + 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */, + 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */, + D95C5F467D37339AB8DF2354 /* tif_color.c in Sources */, + 6D073876E1753549B5EEFDDA /* tif_compress.c in Sources */, + E3136EF5DD843ACE886E2868 /* tif_dir.c in Sources */, + 7ECC6EE6D5273F75BB6B7B74 /* tif_dirinfo.c in Sources */, + D51B3389209E370489078891 /* tif_dirread.c in Sources */, + E7F35B834A163C67B65176C6 /* tif_dirwrite.c in Sources */, + 2D4D105CA9BE3FA6995A5FFF /* tif_dumpmode.c in Sources */, + C2CF6B59914A3183ADE84028 /* tif_error.c in Sources */, + 2315C8692C443ED1AE431728 /* tif_extension.c in Sources */, + FECC98B53C0F3106AB04E69E /* tif_fax3.c in Sources */, + 2C53221A318E37529E6460EB /* tif_fax3sm.c in Sources */, + 522E6CF2A62F34259BCE2DE2 /* tif_flush.c in Sources */, + 6944AC98F6F83E3D983DABD3 /* tif_getimage.c in Sources */, + 07C769F64665317BA3E1AC90 /* tif_jpeg.c in Sources */, + 88A43B1C5A7438838DE97B94 /* tif_luv.c in Sources */, + 779D3480141B3683A6D132BE /* tif_lzw.c in Sources */, + F85D632964383F29BC3B30B6 /* tif_next.c in Sources */, + 64F11C549E3035DF85691060 /* tif_ojpeg.c in Sources */, + 793F542F20AB31F6AF736795 /* tif_open.c in Sources */, + A9A5973552EE30838306D15C /* tif_packbits.c in Sources */, + 64DD406C453D39FEBBE66ED1 /* tif_pixarlog.c in Sources */, + 9A178ED42D96329D8CBF9B89 /* tif_predict.c in Sources */, + C170B941F01334F982315E4A /* tif_print.c in Sources */, + 570FA90F526E3F25A8E8FCF2 /* tif_read.c in Sources */, + 912C69ADB1673ACEB0E6CF08 /* tif_strip.c in Sources */, + 552708E6296D33EBB5F6A493 /* tif_swab.c in Sources */, + 527054445A0D3A00A5C2EC44 /* tif_thunder.c in Sources */, + FEB073547F3F3AC19D31F698 /* tif_tile.c in Sources */, + 096BA201623034AD97218368 /* tif_version.c in Sources */, + 7A79D9AC608E3B8287229174 /* tif_warning.c in Sources */, + F2F2963D8ECC32D39FDBF101 /* tif_write.c in Sources */, + 6E2C2E8AA1713ADE9C338379 /* tif_zip.c in Sources */, + FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */, + 311840186794346AAAA42091 /* jutils.c in Sources */, + DE26572475EE336B8EEA5D92 /* jerror.c in Sources */, + 18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */, + A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */, + 894D43C8F224394FB3171F26 /* jcapimin.c in Sources */, + 743BB23211B336A6A0F26E57 /* jcapistd.c in Sources */, + CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */, + ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */, + 76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */, + 86003C8EB906304F9025F788 /* jcinit.c in Sources */, + C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */, + DB73248401573A5996D8E68D /* jcmarker.c in Sources */, + 98DF13E96160304EBB905E73 /* jcmainct.c in Sources */, + 32486A808EBC3E088598D51C /* jcprepct.c in Sources */, + CA5BD8ABDBA13641BBE7CD66 /* jccoefct.c in Sources */, + 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */, + 50D7E093424138C88BB50D27 /* jcsample.c in Sources */, + BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */, + A212431902B8343CA6D229D3 /* jcphuff.c in Sources */, + BFA6983551B4310DA7C8A404 /* jcdctmgr.c in Sources */, + 9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */, + 0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */, + CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */, + 8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */, + 67EBCE5FA5FF36349ADF0916 /* jdapistd.c in Sources */, + 11818B68C5263EB68D708845 /* jdtrans.c in Sources */, + 4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */, + CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */, + 14EF556997B0350F931EBE8E /* jdinput.c in Sources */, + 61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */, + 28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */, + D0DA11B814AF30A18585122F /* jdphuff.c in Sources */, + 9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */, + B5470121BB4B35DE9C4836DA /* jdcoefct.c in Sources */, + E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */, + 13854E7822783719A2530792 /* jddctmgr.c in Sources */, + 48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */, + B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */, + C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */, + 1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */, + D997FFC948B73FDA892DB531 /* jdsample.c in Sources */, + D9F02AFDA07D3857A905527C /* jdcolor.c in Sources */, + 15D65A523EB23EC385C05E0B /* jquant1.c in Sources */, + 3C0EB1DDA5243E31B2D92CE2 /* jquant2.c in Sources */, + 1E4832B42B95308299B767B9 /* jdmerge.c in Sources */, + 94B1C88076793400810FAC30 /* png.c in Sources */, + 1569BB4728693B6285623A23 /* pngerror.c in Sources */, + D9496139621533328AE727B6 /* pngget.c in Sources */, + CFA91122523B31B9A07A3826 /* pngmem.c in Sources */, + 9EC837DA722736119D49868A /* pngpread.c in Sources */, + 9B8E5690A6103FC1BDC6C47E /* pngread.c in Sources */, + 31FEAB56919D372993CAD89C /* pngrio.c in Sources */, + 8FDC800D873F30E282691832 /* pngrtran.c in Sources */, + 61A2B54FD2E33C759CF5A5E8 /* pngrutil.c in Sources */, + 309C0A78D45C3AB7B8778B59 /* pngset.c in Sources */, + E515EAE375AE390688CBF8D3 /* pngtrans.c in Sources */, + C8C68927DB243AEAB51E11F2 /* pngwio.c in Sources */, + 0095084719983B878378CA28 /* pngwrite.c in Sources */, + 242E1D1A9BF331BA918134EC /* pngwtran.c in Sources */, + 2989056891153968B372EA14 /* pngwutil.c in Sources */, + E4131E3B445C36E6A7FC802F /* regcomp.c in Sources */, + 768716016CE7310BB1AD7567 /* regexec.c in Sources */, + B026621DE50A3921B6598EF6 /* regerror.c in Sources */, + 05021BAB2C9B3C4CAD0A7C2C /* regfree.c in Sources */, + E741CDA71895344C974D8F50 /* AutoComplete.cxx in Sources */, + E92EB502F79638B0BE569EF4 /* CallTip.cxx in Sources */, + 682403FBBD4E3D5E88159501 /* CellBuffer.cxx in Sources */, + 1D7442C82B343F50A83B25B0 /* CharClassify.cxx in Sources */, + 6BC8B3EDB3AE3EF4BACFC08A /* ContractionState.cxx in Sources */, + 90BC965B1A1F35A3B2C9D1C9 /* Decoration.cxx in Sources */, + 0D6596A44A8C37DE85D578F6 /* Document.cxx in Sources */, + 9A16829C34C9344D9AB010F9 /* DocumentAccessor.cxx in Sources */, + 6D723C987BFB39B7B887DCB1 /* Editor.cxx in Sources */, + 83C492B87F4A3A97930F227A /* ExternalLexer.cxx in Sources */, + 0B4AF44DC0C439AD83CDC37E /* Indicator.cxx in Sources */, + C8F1FB8C029031A5909DBC56 /* KeyMap.cxx in Sources */, + 30509A33ED9C35D4ADEF6BBC /* KeyWords.cxx in Sources */, + 0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */, + 0ADC8DBEE80D36B0BB9B058A /* LexASY.cxx in Sources */, + 784F7C50882F320FA76537B5 /* LexAU3.cxx in Sources */, + 07EC76232BB3343FA5CB90B0 /* LexAVE.cxx in Sources */, + 66FD099CE5A338C18329FC36 /* LexAbaqus.cxx in Sources */, + CD35A576FD363FD49C3AC4B3 /* LexAda.cxx in Sources */, + 0C3F48DBD05E3566A4CA6D44 /* LexAsm.cxx in Sources */, + 825EAD51920B387DB4F8C426 /* LexAsn1.cxx in Sources */, + D54D3CA9E73336A08DB20705 /* LexBaan.cxx in Sources */, + 39FB197CF9EB3D76BE0723CF /* LexBash.cxx in Sources */, + 6C7C1CC506CB329FB2D086A9 /* LexBasic.cxx in Sources */, + 78E15D8200F635529F396099 /* LexBullant.cxx in Sources */, + 6F472413FFA03B53B395BB74 /* LexCLW.cxx in Sources */, + D8ADDD24BEAC3D94B3388D3E /* LexCOBOL.cxx in Sources */, + A0FCE3CF565C3F84B63712AC /* LexCPP.cxx in Sources */, + 069D53F2DFBF370A8CC99630 /* LexCSS.cxx in Sources */, + 268DDC88C99A3A64AB8B2FFA /* LexCaml.cxx in Sources */, + 6F5A0D3C7763334396A3783D /* LexCmake.cxx in Sources */, + B640A8A74D973A8FBEF63916 /* LexConf.cxx in Sources */, + 97F60B2A9CE93BC8949A8CCD /* LexCrontab.cxx in Sources */, + 834F2ADD0520313FBAC4F927 /* LexCsound.cxx in Sources */, + 8FB5FBC5730C33F1A3D85D9F /* LexD.cxx in Sources */, + 4788F736CD9C324E8A3DFA74 /* LexEScript.cxx in Sources */, + E8BBC08597EF383597DA0308 /* LexEiffel.cxx in Sources */, + BFD3BFBDC8DA3B1EAD141F96 /* LexErlang.cxx in Sources */, + 45D88A74B3EE3837B9F79595 /* LexFlagship.cxx in Sources */, + 27759C2FBB0E35FDA847B2B5 /* LexForth.cxx in Sources */, + 020BBB417207393F8C60EFB6 /* LexFortran.cxx in Sources */, + E62F8E49FD5035D8BC71BB49 /* LexGAP.cxx in Sources */, + 9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */, + AEEE6BC41B6531898A61CB16 /* LexHTML.cxx in Sources */, + 51D133EC44F830588FEEAEC0 /* LexHaskell.cxx in Sources */, + B37802B0A90133C68EF93DDA /* LexInno.cxx in Sources */, + 14C024EB327435A2A571DA2C /* LexKix.cxx in Sources */, + DF8124E5E17D386A84CEEA27 /* LexLisp.cxx in Sources */, + D13AE659C3AC37B68D39B2C9 /* LexLout.cxx in Sources */, + 9D003890CB7035A298DB7056 /* LexLua.cxx in Sources */, + 3C394FBD47B6310C80577E3B /* LexMMIXAL.cxx in Sources */, + EC43AFB3670A3D459D9B388D /* LexMPT.cxx in Sources */, + E8EE34F0A78C31B489B19FEE /* LexMSSQL.cxx in Sources */, + E80BEED62EBF34F09B3F401F /* LexMagik.cxx in Sources */, + E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */, + 5AEA6E94FB76371D928D371C /* LexMatlab.cxx in Sources */, + 1A4F9F18BBEB3515AC7C7CC6 /* LexMetapost.cxx in Sources */, + CB1F37993ECB3B73A51B42FD /* LexMySQL.cxx in Sources */, + A874AF0B203D3DC99C27469A /* LexNimrod.cxx in Sources */, + 22C76BF2C3E331CD87657E6E /* LexNsis.cxx in Sources */, + 76D1A1A49CC831FFB9EBB1F5 /* LexOpal.cxx in Sources */, + BEFC179F8A0E337F9D627D84 /* LexOthers.cxx in Sources */, + 24A5A71C79733E9CB913C5B7 /* LexPB.cxx in Sources */, + 0D79F1B4EF44393AA324213F /* LexPLM.cxx in Sources */, + A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */, + 551BF168445E3D7BB54D0174 /* LexPS.cxx in Sources */, + 0718E7524134312090541D6E /* LexPascal.cxx in Sources */, + 369BCCFF61D13A058D837835 /* LexPerl.cxx in Sources */, + 22EC132AEF863BFBAA6EDEC3 /* LexPowerPro.cxx in Sources */, + 1FB1622D59593932B25C55BA /* LexPowerShell.cxx in Sources */, + 97C551F8AEF133D680D1FD36 /* LexProgress.cxx in Sources */, + A36B5107860E32659194073F /* LexPython.cxx in Sources */, + 31380AD4F5BD38A6B9212FE0 /* LexR.cxx in Sources */, + CCFD3144A22C3A87B67D88AB /* LexRebol.cxx in Sources */, + 7C20B79175D33852A2E9DE83 /* LexRuby.cxx in Sources */, + FE5B7C7A84B83C17A38E8403 /* LexSML.cxx in Sources */, + 71CCB06E790C3C54BFF1199D /* LexSQL.cxx in Sources */, + BA9F0BBD57F63FD29E484FD3 /* LexScriptol.cxx in Sources */, + F55F3887CDE633D7877C607B /* LexSmalltalk.cxx in Sources */, + D5C5DD83882B3227A1CCFE0E /* LexSorcus.cxx in Sources */, + 6F8129E317EE3486A89D8548 /* LexSpecman.cxx in Sources */, + 9678C2B19D293818AA8E9E0D /* LexSpice.cxx in Sources */, + 0F8C79010EF0316AA1B7392D /* LexTACL.cxx in Sources */, + 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */, + CAF5C5BB129431B596C4C6C1 /* LexTAL.cxx in Sources */, + 49BEDFBC3661339D90EF6935 /* LexTCL.cxx in Sources */, + 7D0E549020D33ED39751DFC8 /* LexTeX.cxx in Sources */, + D4EC9DB5F8DF319EA0FD26A4 /* LexVB.cxx in Sources */, + 16021CFD78623B8CBD08FC1F /* LexVHDL.cxx in Sources */, + 3C5E1A45A57B3169A4C073D9 /* LexVerilog.cxx in Sources */, + 159E4248CB1333AD841D9F03 /* LexYAML.cxx in Sources */, + 923F4797A73A3BDD87BBD1E1 /* LineMarker.cxx in Sources */, + 523FB2A8435A3324A8E1B370 /* PerLine.cxx in Sources */, + BF068F3C06473D8CBC55D507 /* PositionCache.cxx in Sources */, + 795B9B15279D36F8899C9CA8 /* PropSet.cxx in Sources */, + A52A7D2FEB1434E29C64582C /* RESearch.cxx in Sources */, + 7B372FEA276438C186F7E340 /* RunStyles.cxx in Sources */, + 15735ED6556130F6A14F0BCD /* ScintillaBase.cxx in Sources */, + 097BC5E023C33C1DA05606AF /* Selection.cxx in Sources */, + 4C9BA36123E43589956864C6 /* Style.cxx in Sources */, + CD241361D4693785A0B8939D /* StyleContext.cxx in Sources */, + 19D823E564D932758EA6F8D1 /* UniConversion.cxx in Sources */, + 699D88EE2DAA3594B6606890 /* ViewStyle.cxx in Sources */, + B387FAE95A9535B194A42BA4 /* WindowAccessor.cxx in Sources */, + BCDAE378D03E37F5994FB9C5 /* XPM.cxx in Sources */, + C2DEE063B5E032C1BD2B5026 /* xmlparse.c in Sources */, + AE84BC9A1CCA3ADA9C483950 /* xmlrole.c in Sources */, + DB9565CC4EAE3BCB9F490620 /* xmltok.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 55C93151F6053EBCBDD70DF8 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7DEBE1EB2B94305E8E8D6EA5 /* wxcocoa.xcconfig */; + buildSettings = { + EXECUTABLE_PREFIX = lib; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + WXUSINGDLL, + ); + INSTALL_PATH = "@executable_path/../Frameworks/"; + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lz", + ); + }; + name = Debug; + }; + 55C93151F6053EBCBDD70DF9 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */; + buildSettings = { + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Debug; + }; + 55C93151F6053EBCBDD70DFA /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7DEBE1EB2B94305E8E8D6EA5 /* wxcocoa.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(PRODUCT_NAME)_static"; + }; + name = Debug; + }; + 99B665C6D0D137B38CEA938E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7DEBE1EB2B94305E8E8D6EA5 /* wxcocoa.xcconfig */; + buildSettings = { + EXECUTABLE_PREFIX = lib; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + WXUSINGDLL, + ); + INSTALL_PATH = "@executable_path/../Frameworks/"; + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lz", + ); + }; + name = Release; + }; + 99B665C6D0D137B38CEA938F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */; + buildSettings = { + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Release; + }; + 99B665C6D0D137B38CEA9390 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7DEBE1EB2B94305E8E8D6EA5 /* wxcocoa.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(PRODUCT_NAME)_static"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 336FCCBABBEF3C4AA92AD394 /* Build configuration list for PBXNativeTarget "static" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 55C93151F6053EBCBDD70DFA /* Debug */, + 99B665C6D0D137B38CEA9390 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 6976B5F5F3A63A21A92029E3 /* Build configuration list for PBXProject "wxcocoa" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 55C93151F6053EBCBDD70DF9 /* Debug */, + 99B665C6D0D137B38CEA938F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F515C6D7EB103C50924F790B /* Build configuration list for PBXNativeTarget "dynamic" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 55C93151F6053EBCBDD70DF8 /* Debug */, + 99B665C6D0D137B38CEA938E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 19367367C9323490BB936F06 /* Project object */; +} diff --git a/build/osx/wxcocoa_in.xcodeproj/project.pbxproj b/build/osx/wxcocoa_in.xcodeproj/project.pbxproj index 8bbbc387a6..79c5e0452d 100644 --- a/build/osx/wxcocoa_in.xcodeproj/project.pbxproj +++ b/build/osx/wxcocoa_in.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXFileReference section */ 404BEE6110EC83280080E2B8 /* libwx_osx_cocoa_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_cocoa_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxcocoa.xcconfig; sourceTree = ""; }; + 4078700713B25D34008AFE5A /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxdebug.xcconfig; sourceTree = ""; }; + 4078700813B25D34008AFE5A /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; D2AAC0C705546C1D00DB518D /* libwx_osx_cocoa.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwx_osx_cocoa.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -43,6 +45,8 @@ isa = PBXGroup; children = ( 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */, + 4078700713B25D34008AFE5A /* wxdebug.xcconfig */, + 4078700813B25D34008AFE5A /* wxrelease.xcconfig */, 034768DFFF38A50411DB9C8B /* Products */, ); name = wxcocoa; @@ -111,7 +115,14 @@ isa = PBXProject; buildConfigurationList = 1DEB918108733D990010E9CD /* Build configuration list for PBXProject "wxcocoa_in" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 0867D691FE84028FC02AAC07 /* wxcocoa */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; @@ -174,15 +185,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; EXECUTABLE_PREFIX = lib; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", - "__WXDEBUG__=1", + WXUSINGDLL, ); INSTALL_PATH = "@executable_path/../Frameworks/"; OTHER_LDFLAGS = ( @@ -196,9 +202,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; buildSettings = { - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; EXECUTABLE_PREFIX = lib; - GCC_MODEL_TUNING = G5; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + WXUSINGDLL, + ); INSTALL_PATH = "@executable_path/../Frameworks/"; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", @@ -209,26 +217,16 @@ }; 1DEB918208733D990010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 4078700713B25D34008AFE5A /* wxdebug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; WXROOT = "$(PROJECT_DIR)/../.."; }; name = Debug; }; 1DEB918308733D990010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 4078700813B25D34008AFE5A /* wxrelease.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; WXROOT = "$(PROJECT_DIR)/../.."; }; name = Release; @@ -237,18 +235,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - "__WXDEBUG__=1", - ); - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; PRODUCT_NAME = "$(PRODUCT_NAME)_static"; }; name = Debug; @@ -257,14 +243,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; PRODUCT_NAME = "$(PRODUCT_NAME)_static"; - ZERO_LINK = NO; }; name = Release; }; diff --git a/build/osx/wxdebug.xcconfig b/build/osx/wxdebug.xcconfig new file mode 100644 index 0000000000..404f5fa25d --- /dev/null +++ b/build/osx/wxdebug.xcconfig @@ -0,0 +1,3 @@ +GCC_OPTIMIZATION_LEVEL = 0 +ONLY_ACTIVE_ARCH = YES +WX_PREPROCESSOR_DEFINITIONS = __WXDEBUG__=1 \ No newline at end of file diff --git a/build/osx/wxiphone.xcconfig b/build/osx/wxiphone.xcconfig index 030eec9729..7aa9d3628f 100644 --- a/build/osx/wxiphone.xcconfig +++ b/build/osx/wxiphone.xcconfig @@ -1,4 +1,8 @@ WXTOOLKIT = iphone WXTOOLKITUPPER = IPHONE -#include "wx.xcconfig" \ No newline at end of file +#include "wx.xcconfig" + +ARCHS = $(ARCHS_STANDARD_32_BIT) +SDKROOT = iphoneos +TARGETED_DEVICE_FAMILY = 1,2 diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..d792852a4f --- /dev/null +++ b/build/osx/wxiphone.xcodeproj/project.pbxproj @@ -0,0 +1,3730 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 0095084719983B878378CA28 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 69A6CAF721E53E83B4820DE6 /* pngwrite.c */; }; + 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */; }; + 00F1531404F832C6AE0748F2 /* spinbutt_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */; }; + 014AF0BAB1783A5D9D75A7ED /* zstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B9B5BC858CCF3477895D2786 /* zstream.cpp */; }; + 0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */; }; + 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21D /* icon.cpp */; }; + 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DAF1F49F0F3F41A427A21E /* icon.cpp */; }; + 020BBB417207393F8C60EFB6 /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */; }; + 026F90F7492C316A94128916 /* logg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64705CE9398316D87BAB4DC /* logg.cpp */; }; + 028257C52CAE3038AA862C35 /* stdstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE16011AD6323AAC8616F973 /* stdstream.cpp */; }; + 02BB539E2AD63C078DA776B0 /* uiaction_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */; }; + 02E8F1195B653D26AAA89462 /* listbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */; }; + 03035C5CE4BC3288A5A18424 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */; }; + 03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */; }; + 05021BAB2C9B3C4CAD0A7C2C /* regfree.c in Sources */ = {isa = PBXBuildFile; fileRef = EEE82083BFA430D5B58F8A04 /* regfree.c */; }; + 052331773CF6362C9A6CF38E /* utils_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EED7C691150139EFA35E8EBD /* utils_osx.cpp */; }; + 056CA84179433AA48D55DA65 /* bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDDE855D9F83E4891362EB4 /* bar.cpp */; }; + 056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EEAD9C3E180305D8899441E /* strvararg.cpp */; }; + 05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E968913A9A593B258BD8EACB /* msgout.cpp */; }; + 064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */; }; + 0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */; }; + 069D53F2DFBF370A8CC99630 /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */; }; + 07158EBC05A637ECA9DC7B4F /* utilscocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */; }; + 0718E7524134312090541D6E /* LexPascal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */; }; + 0730A107A2B935A9923C8EF2 /* filehistorycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D7B3307E56B332769901E99F /* filehistorycmn.cpp */; }; + 07412469921A3E488A2F9BA6 /* checklst_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */; }; + 0742292656623EC481B34369 /* paper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87D973CA8D673267BD0844D3 /* paper.cpp */; }; + 0743AE8613F535A0ABB79315 /* intl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC8BB1AABB3D393EBA527060 /* intl.cpp */; }; + 07C769F64665317BA3E1AC90 /* tif_jpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */; }; + 07EC76232BB3343FA5CB90B0 /* LexAVE.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */; }; + 0813551C951A3AD1A5EF01B2 /* imagbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F84098A475939BB9EE87E70 /* imagbmp.cpp */; }; + 0836590D35FE37988DE70442 /* combobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */; }; + 087FF6DE223A32509692F39B /* txtstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */; }; + 0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D07403FCA530D7A9FD2917 /* jfdctflt.c */; }; + 096BA201623034AD97218368 /* tif_version.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E6F40F4740C3ED29D83E107 /* tif_version.c */; }; + 097BC5E023C33C1DA05606AF /* Selection.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2AF7739C389536F79DAA31E5 /* Selection.cxx */; }; + 0A2A4D2DC8F63FE1AC0BFAAF /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F2024D29170D3B50A4DFDE11 /* base64.cpp */; }; + 0A406D2D1ADA343891E3664C /* powercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */; }; + 0ADC8DBEE80D36B0BB9B058A /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A82C367B86F83981803D55DB /* LexASY.cxx */; }; + 0AEBA7389E223781A7A257A1 /* webkit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DF2456ED905357B8C1D74D9 /* webkit.mm */; }; + 0B4AF44DC0C439AD83CDC37E /* Indicator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4FDE5A962FA234FA83A605AD /* Indicator.cxx */; }; + 0B98B6721DEE37A1ADEA382B /* quantize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B890199A37723EFD86C0ADA5 /* quantize.cpp */; }; + 0C3F48DBD05E3566A4CA6D44 /* LexAsm.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A65399C8A6D636139E362119 /* LexAsm.cxx */; }; + 0C485288EA86379D9FD66536 /* cshelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67DCEEB6861731319C30817F /* cshelp.cpp */; }; + 0C7E2D5C22A232368F862A60 /* longlong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72D7AF345E563587941BD868 /* longlong.cpp */; }; + 0C9A379D97B133FA831175A7 /* printdlg_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */; }; + 0D6596A44A8C37DE85D578F6 /* Document.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 71DB140E670738839EC42C2B /* Document.cxx */; }; + 0D79F1B4EF44393AA324213F /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */; }; + 0E024D145DDD38ACAE68F462 /* toplevel_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */; }; + 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998D611109EC33A9A6A11C5A /* gdicmn.cpp */; }; + 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */; }; + 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */; }; + 0F8C79010EF0316AA1B7392D /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */; }; + 0FA6E1E47F123FF4A902E4D2 /* xh_odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0080254545B9383ABDF2045C /* xh_odcombo.cpp */; }; + 0FBF7C9EDFB53D8DA0991B55 /* xh_notbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87662D69F0432FC96701280 /* xh_notbk.cpp */; }; + 0FDDE8E193743F3A8CBDC67C /* richtextprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */; }; + 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC28591B403B32B7AFCC079D /* gauge_osx.cpp */; }; + 11818B68C5263EB68D708845 /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4549845C0751356A907C23E0 /* jdtrans.c */; }; + 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EFF4707641D3F20AB602ED6 /* jccolor.c */; }; + 131B879180AE3FB481F81CC7 /* fs_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9A305CEC03B3085B159B617 /* fs_mem.cpp */; }; + 13250B531B1B3F9998C59DA9 /* stdpaths_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */; }; + 135DFCE48FC03D8294D01A89 /* xmlrsall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */; }; + 13854E7822783719A2530792 /* jddctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = A5BBC1E494D33D028CA547FF /* jddctmgr.c */; }; + 14C024EB327435A2A571DA2C /* LexKix.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B303230368143F37B2409DE6 /* LexKix.cxx */; }; + 14D6D5F8F5ED3C71936DD2AF /* button.mm in Sources */ = {isa = PBXBuildFile; fileRef = C06FED83BF933DF98C2466AE /* button.mm */; }; + 14EF556997B0350F931EBE8E /* jdinput.c in Sources */ = {isa = PBXBuildFile; fileRef = CCF7564A2B733F759AA8496B /* jdinput.c */; }; + 15048519756B33959B15B161 /* floatpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A881F49ADCF33C299B041584 /* floatpane.cpp */; }; + 1569BB4728693B6285623A23 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A0650754DC2358CA5933B28 /* pngerror.c */; }; + 15735ED6556130F6A14F0BCD /* ScintillaBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */; }; + 159E4248CB1333AD841D9F03 /* LexYAML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */; }; + 15D65A523EB23EC385C05E0B /* jquant1.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */; }; + 16021CFD78623B8CBD08FC1F /* LexVHDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */; }; + 164010B26D363F5FA09785B6 /* listctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */; }; + 16A382A265DE32FABC318F6F /* fontdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB170BF78EFE39D692E11985 /* fontdlgg.cpp */; }; + 1710A4BB0E6339558A187F8D /* xmlres.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087B66573CD33DA99DA82B1C /* xmlres.cpp */; }; + 1749412E53B9311DABA71DDC /* bmpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */; }; + 17F0494F87533196904F5313 /* xh_toolbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */; }; + 182DFDBB58653FD9863D4176 /* dcprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 238741BDA2C73E56899CCB04 /* dcprint.cpp */; }; + 187F921A95DA3594B0AD980D /* gridsel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26381308E32A3A179E7A9B40 /* gridsel.cpp */; }; + 18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */; }; + 1937FBA0A0DD32A8A743CFE1 /* valtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8701E1CF2B352B945C17E5 /* valtext.cpp */; }; + 19D823E564D932758EA6F8D1 /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */; }; + 1A4F9F18BBEB3515AC7C7CC6 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; }; + 1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; }; + 1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; }; + 1AF2B2346C9639DAA4D15F30 /* numdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */; }; + 1B06622C8D8731FC832199E2 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB82939EDC593F9CA95C3098 /* init.cpp */; }; + 1BCC944F5E0936F5830F03E8 /* windowid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9B9B85572D0312BBF2878DB /* windowid.cpp */; }; + 1C52CB9487DF3AB9AF243B47 /* prntbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 242BF97B558634A79322052C /* prntbase.cpp */; }; + 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */; }; + 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 864438709B363773B8C3382D /* datetimefmt.cpp */; }; + 1D7442C82B343F50A83B25B0 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */; }; + 1DBDF75500D73A3098015E7F /* cfstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */; }; + 1DF3A4F85FCB3BA79A552F3D /* menuitem_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */; }; + 1E166FC1A7B3371FB038B172 /* fldlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */; }; + 1E17F95DD433379E8C18298C /* odcombo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */; }; + 1E2AB43075973AE59A8D89C1 /* fontdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */; }; + 1E4832B42B95308299B767B9 /* jdmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 0890779C662C35889A8C6C2E /* jdmerge.c */; }; + 1EA81A0E8E5A3B38B4D80337 /* srchcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EF103B09F02315282EC8F44 /* srchcmn.cpp */; }; + 1EDED99760B23A1999E75C12 /* imaglist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */; }; + 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */ = {isa = PBXBuildFile; fileRef = F82278F9AF0432529891E6D7 /* tif_close.c */; }; + 1FB1622D59593932B25C55BA /* LexPowerShell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */; }; + 205520440CD13C0AB9E89159 /* anidecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE959EC7BFDD3A628E856404 /* anidecod.cpp */; }; + 20BEEFFA08F3396791596870 /* dlunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA2D9F325F833C408657E7B7 /* dlunix.cpp */; }; + 20F10669703137E68318C6FD /* cmndata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */; }; + 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A284E855892F3A9E9E19E854 /* LexTADS3.cxx */; }; + 21F74D4D4D84375AB155FD5B /* stattext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95186FEF3DEF39D8B1157BD5 /* stattext.mm */; }; + 221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */; }; + 22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */; }; + 22C76BF2C3E331CD87657E6E /* LexNsis.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1BC0322549563787A21CE8F1 /* LexNsis.cxx */; }; + 22EC132AEF863BFBAA6EDEC3 /* LexPowerPro.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */; }; + 2315C8692C443ED1AE431728 /* tif_extension.c in Sources */ = {isa = PBXBuildFile; fileRef = AF7CE00168AB33C994374ABA /* tif_extension.c */; }; + 2386B575BC3931D2AF86CB33 /* fontdlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */; }; + 23965E313EDC3BBE9B2FA1C5 /* imagpng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24396D584D053948A3FF0DCD /* imagpng.cpp */; }; + 23A7AF68A03E380785EE7C24 /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1731D6708BFE3DE7B101CE74 /* object.cpp */; }; + 23E9AF567E873B948EFEA180 /* gauge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 98A7F0605AAC3D28A8C9F253 /* gauge.mm */; }; + 242E1D1A9BF331BA918134EC /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 0964797530CF3FE7B8DB6242 /* pngwtran.c */; }; + 246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */; }; + 2480859662ED399799E120A5 /* pen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA819575B5136B09FA8FEB1 /* pen.cpp */; }; + 249C9177B1A33EFEAB30F93F /* tipwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */; }; + 24A5A71C79733E9CB913C5B7 /* LexPB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8744F2C80ECF375999195935 /* LexPB.cxx */; }; + 2563C775427E3D68BD384F2F /* richtextstyles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D30617843F33310089C1F77A /* richtextstyles.cpp */; }; + 25656617A56D342AA3D1BFE2 /* ctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */; }; + 26649553E4763EE6BA268B7D /* xh_gdctl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */; }; + 268DDC88C99A3A64AB8B2FFA /* LexCaml.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */; }; + 26BB10834DA1388881BDD1EC /* propgrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B98B72B3A0A73044B85AED60 /* propgrid.cpp */; }; + 26E4813A97DE323E88119163 /* xh_choicbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */; }; + 27759C2FBB0E35FDA847B2B5 /* LexForth.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B181F564935730E89AB00D92 /* LexForth.cxx */; }; + 27E2EABB117334CD89CFD2A4 /* mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B568A7364ECA30288820CCE7 /* mdi.cpp */; }; + 27E73CA5C35A30CE89946ECA /* slider_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D215A0D67563350CB4EECB06 /* slider_osx.cpp */; }; + 283C3ABE42433244983C27C1 /* stattext_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */; }; + 28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 72869747E68E37998CB0A07E /* jdhuff.c */; }; + 2939CA3680A13E39AB88CB05 /* spinctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */; }; + 296692A7A3783E3A83D005C6 /* brush.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 302A13BC64C238A297F4399F /* brush.cpp */; }; + 2989056891153968B372EA14 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 45D7558DF5E03A2EB41883F0 /* pngwutil.c */; }; + 2A7640E4210334AC93366900 /* winpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FCA75FE592C3469AE351FBF /* winpars.cpp */; }; + 2B13BFC894C63373B7ACFA3D /* xh_hyperlink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */; }; + 2C53221A318E37529E6460EB /* tif_fax3sm.c in Sources */ = {isa = PBXBuildFile; fileRef = BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */; }; + 2C95DFA8EE463487956B4EB4 /* infobar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */; }; + 2CAD4DF9505F36E4A2EAD53D /* helpdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C466F32CCBD13DBC87285B3D /* helpdata.cpp */; }; + 2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */; }; + 2D4D105CA9BE3FA6995A5FFF /* tif_dumpmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */; }; + 2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1EE17722EA937E88A7F0C01 /* dcbase.cpp */; }; + 2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; }; + 2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; }; + 2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4E1DC1869C6327C80D2F5F4 /* uri.cpp */; }; + 2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */; }; + 2EECB3C2F9523D0B95847A7F /* accel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C78A1539462370CAA429508 /* accel.cpp */; }; + 2F35A207C3993DE08E4FE0B0 /* timerunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */; }; + 2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 496674699F173A5385EAFF07 /* calctrlg.cpp */; }; + 2F7F5B9BBCD83D90B237A1A0 /* markupparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA7F7633279936EFA0B9C5CF /* markupparser.cpp */; }; + 2FA1A8FE3644325ABAD273A4 /* fmapbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832BBBFE664736D5978420C6 /* fmapbase.cpp */; }; + 2FAE979E6FE23D088C768B7D /* gridcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */; }; + 30493B486DFF35AF80D12C49 /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */; }; + 30509A33ED9C35D4ADEF6BBC /* KeyWords.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */; }; + 309C0A78D45C3AB7B8778B59 /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 5E463A493FD930DE80E58608 /* pngset.c */; }; + 30AEDF41EC5C374DBF96EFFB /* slider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9B862D1027C4367BBF44420F /* slider.mm */; }; + 311840186794346AAAA42091 /* jutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */; }; + 31380AD4F5BD38A6B9212FE0 /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7255468B6D5F3D8697994A53 /* LexR.cxx */; }; + 3141FEDED0943BD6A2EF858F /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA93D41B11683E758D456531 /* log.cpp */; }; + 319EA32592DA3C74B86DDDFF /* wxcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23FC98E2305230E2990471E3 /* wxcrt.cpp */; }; + 319FB8E64CE731D6A58AD301 /* clntdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C904B4BA8273355869812B2 /* clntdata.cpp */; }; + 31DD19A942283FA8810B6382 /* numformatter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */; }; + 31FEAB56919D372993CAD89C /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = A06AB1974DB93EE2999EC75C /* pngrio.c */; }; + 32486A808EBC3E088598D51C /* jcprepct.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FE0455EBDC63D82B2D88587 /* jcprepct.c */; }; + 32FECED7A7633C4D8C1BFBB3 /* toolbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24DF23D67E693D999B875101 /* toolbkg.cpp */; }; + 3357BD0518F538E9A949F886 /* xh_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */; }; + 335DD610974A33D4B6581E2A /* colourdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */; }; + 3399AB7BB1333B5AAF5FAF55 /* wrapsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */; }; + 33ED014A7FF7398794E6E4CF /* xh_split.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */; }; + 346D274E17673A01B0177D5B /* sockunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7661E9E09A397790ED9545 /* sockunix.cpp */; }; + 353B584AD0C03919A57A3048 /* affinematrix2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD09A813E10A31C19554B425 /* affinematrix2d.cpp */; }; + 3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */; }; + 369BCCFF61D13A058D837835 /* LexPerl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */; }; + 36B0B923B836358D9DB0AE10 /* xh_panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */; }; + 36DB80FD5B153E9099DB6912 /* imaggif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */; }; + 36EB5D19429D3BD1A01001D5 /* framemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26632A254717372BAA4D514D /* framemanager.cpp */; }; + 371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36E1DBA275AD325DB759C180 /* fontenum.cpp */; }; + 37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */; }; + 37749AC3468836FC857BD0D5 /* checklstcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */; }; + 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */; }; + 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */; }; + 39CC380F801F3EE984523275 /* auibar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05A4437E9697300390FDE14E /* auibar.cpp */; }; + 39D6435B10073B85A499AFD8 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */; }; + 39FB197CF9EB3D76BE0723CF /* LexBash.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 78D7866F95C73A28BB540606 /* LexBash.cxx */; }; + 3ACCC2EB8E973C11835EB597 /* bmpbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */; }; + 3B7E035ECF3D3FFB9827AC1C /* xh_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06B4A895955B32258DCD62BF /* xh_dlg.cpp */; }; + 3B8A54D5E5A53607A6F7979A /* arrstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57CF60203F53459A03951A9 /* arrstr.cpp */; }; + 3C0EB1DDA5243E31B2D92CE2 /* jquant2.c in Sources */ = {isa = PBXBuildFile; fileRef = 02D9332D5C5632E981936E29 /* jquant2.c */; }; + 3C36437B2E933F83984D431E /* imagtiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */; }; + 3C394FBD47B6310C80577E3B /* LexMMIXAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */; }; + 3C5E1A45A57B3169A4C073D9 /* LexVerilog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */; }; + 3CDE2B6BF88D326189F069BD /* accelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A436B55DC44E3827A757A6D8 /* accelcmn.cpp */; }; + 3D22FC202D903007AEE3D164 /* fdiounix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */; }; + 3D3EA1BAAD1833B1B48E9C86 /* xh_stbmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */; }; + 3D424F4B33653A00AE9B623A /* m_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 082CA018FB883999839C1DCE /* m_tables.cpp */; }; + 3D762A0BBF1B39B88A769632 /* helpwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */; }; + 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */; }; + 3E99016BDE043A08B4D6B3CE /* htmprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 194ADD28300E329E80F7892E /* htmprint.cpp */; }; + 3EB6B8528A0D3B6CADAE1256 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02D2E8B5C89939CE90B99E2B /* archive.cpp */; }; + 3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */; }; + 403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7332A03D93D3DABB050615D /* dir.cpp */; }; + 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; + 41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; }; + 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */; }; + 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D9626646773CED82449D5D /* persist.cpp */; }; + 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FC2F076657431458896115A /* checkboxcmn.cpp */; }; + 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4048A3523EC03409BD899BEF /* xtixml.cpp */; }; + 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6CC2B05353C3284B37B2DD7 /* settings.cpp */; }; + 438EAEA4B30C325C827F6197 /* xh_fontpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */; }; + 447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48D72D20DB1D3E1CA5ED112A /* effects.cpp */; }; + 45AB45C6B24A3983B22E56A5 /* dataobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 271B4B77622B3411A7BF6634 /* dataobj.cpp */; }; + 45D88A74B3EE3837B9F79595 /* LexFlagship.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */; }; + 45FE206BBAD13DDCA1EA41CF /* treebase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BA6ADD758693BD180D3275B /* treebase.cpp */; }; + 4657479AF35533AEB7876676 /* helpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBB30516233A39BE809405AA /* helpbase.cpp */; }; + 4657E7382E9E3EDC8DE2401E /* mimetype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C97C1F26B5A38C49543060C /* mimetype.cpp */; }; + 4666CDC48BA9301EA283BFFF /* choice_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */; }; + 46A4CCF128FC3EB092074DC5 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58E1F571B01F34D4AB70CA18 /* property.cpp */; }; + 46CE8B53D2663927AAE5DF9D /* xh_treebk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */; }; + 46E331300D8F349DB36AB50A /* imagpnm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC12B97F233B3B9494DA217F /* imagpnm.cpp */; }; + 46F341B46F80376B962759F5 /* animateg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 580AFC66F3003582B43043B1 /* animateg.cpp */; }; + 4788F736CD9C324E8A3DFA74 /* LexEScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */; }; + 47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E24C6F2A04E30EB95598305 /* chm.cpp */; }; + 47F4FC8717AF3A848812DFCC /* xh_radbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */; }; + 48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = A0DCC5EF59143640BE13AD73 /* jidctfst.c */; }; + 49260580A7F23B569A827D3F /* filefn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 58421C141C9E31C6A7A3C183 /* filefn.cpp */; }; + 4958BD2E717A3F03AB030188 /* tbarbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3F32C01D122301AB00D06A5 /* tbarbase.cpp */; }; + 49BEDFBC3661339D90EF6935 /* LexTCL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */; }; + 49C873EE448C3CD9A32012CD /* spinctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */; }; + 49FE0228D8FD3F7AB64A4432 /* bmpbuttn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */; }; + 4AEC67BF65B039D99F421666 /* statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C87B071E3593A889704F512 /* statbar.cpp */; }; + 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */; }; + 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59ED0C057D8F388A89DC7177 /* page.cpp */; }; + 4C9BA36123E43589956864C6 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C28429A964C337A192D76CC8 /* Style.cxx */; }; + 4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; }; + 4CF9BA40653C3153805D88AB /* arcfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C513377E9E303F778BA9D7ED /* arcfind.cpp */; }; + 4CFB7E6E5BD53E2BB39BEF63 /* m_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EB95BCFA255323183A996C9 /* m_style.cpp */; }; + 4D0BA8B9F72C3C31BC170CE2 /* progdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */; }; + 4DA209AEF4AD32AAB97F9718 /* htmlcell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E5188DB6003C35A8C7754D /* htmlcell.cpp */; }; + 4DD98A9436C83CF3B9425A78 /* sysopt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */; }; + 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81390F96937631078EFCD891 /* utilsexc_base.cpp */; }; + 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */ = {isa = PBXBuildFile; fileRef = D0CDADAF2D893E32A38351E4 /* tif_aux.c */; }; + 50D7E093424138C88BB50D27 /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 53D06E47477B3E32BB6B915E /* jcsample.c */; }; + 5116CE330E333724A66982E3 /* rearrangectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */; }; + 51437DC2AD7B3BEB9A53CE1A /* cmdline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE1C531185131A89EFF7FAF /* cmdline.cpp */; }; + 51D133EC44F830588FEEAEC0 /* LexHaskell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */; }; + 522E6CF2A62F34259BCE2DE2 /* tif_flush.c in Sources */ = {isa = PBXBuildFile; fileRef = 305614D19CF23CB2B14A5B2E /* tif_flush.c */; }; + 523FB2A8435A3324A8E1B370 /* PerLine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9389DAF8B91030B7AAB029FF /* PerLine.cxx */; }; + 527054445A0D3A00A5C2EC44 /* tif_thunder.c in Sources */ = {isa = PBXBuildFile; fileRef = 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */; }; + 52C0984A2A4F31BC885519B0 /* xtistrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */; }; + 5303FA25D0773FAEB963D8E3 /* scrolbar.mm in Sources */ = {isa = PBXBuildFile; fileRef = CC2E24773D853A77B9FEFA4C /* scrolbar.mm */; }; + 5388468A6F8F3141B25CD400 /* treebkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7925E38823563BCDB5565DCF /* treebkg.cpp */; }; + 539B586AEAD630A79FC12ECF /* sstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F46EC1508C063C8395CE7A95 /* sstream.cpp */; }; + 5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; }; + 54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; }; + 551BF168445E3D7BB54D0174 /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EDB48813110636DBA045BF3A /* LexPS.cxx */; }; + 552708E6296D33EBB5F6A493 /* tif_swab.c in Sources */ = {isa = PBXBuildFile; fileRef = AAC12B4456E13F57BEA25A5E /* tif_swab.c */; }; + 5557AA36FBCC3ED9A5F5751A /* editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D90D14874FD38079835AF0B /* editlbox.cpp */; }; + 55D893FDD00633FEA82ABD81 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */; }; + 55F0D287F60F3EDEA16CCB64 /* stringimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5357E76650035639844D15B /* stringimpl.cpp */; }; + 567A32722BA33AEE9FF93D7C /* fs_inet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B7581D7140293BAE88E43DBE /* fs_inet.cpp */; }; + 570FA90F526E3F25A8E8FCF2 /* tif_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 64B25B87203E3464BCDD277D /* tif_read.c */; }; + 5792675690843C6AA4125A72 /* font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77F5E7BCD9B2307D8DBCC052 /* font.cpp */; }; + 57AE7FCF768F3965BD39B47A /* m_span.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727F25F832AD32D4B12D8E39 /* m_span.cpp */; }; + 58AABAD40AA236438347DDDE /* evtloop.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8D2549709E0133C9A267E3A5 /* evtloop.mm */; }; + 595DCB164D55342EB86604EC /* hashmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6636144CDE83E8E85270FAF /* hashmap.cpp */; }; + 59BFB8C8310E37B39AF8B0D4 /* any.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4867546E8B8D3C8683A23ED5 /* any.cpp */; }; + 59F995B6E6EE3CA5A4487844 /* glcanvas.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35007225BB683683AA7C5E48 /* glcanvas.mm */; }; + 5A8638C234133824BDF93BBF /* gbsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */; }; + 5AEA6E94FB76371D928D371C /* LexMatlab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC9153A350893820B942D37E /* LexMatlab.cxx */; }; + 5B5B8DF915D438AA9FCEB39E /* imagall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDFB4D208F37569AC548B0 /* imagall.cpp */; }; + 5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; }; + 5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; }; + 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; }; + 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; }; + 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */; }; + 5F78DB0417BF3CE1B4E35C7F /* stackwalk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA2520F427493A22A70A5C09 /* stackwalk.cpp */; }; + 5FE969523BDB3353AEF96810 /* xh_filepicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */; }; + 604ABF86317C3D4F899DBF37 /* richtextsymboldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */; }; + 60706F8836A130A2AF282FE1 /* fontutilcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */; }; + 6138BCBC8E4438FA91E0EF9F /* xh_chckb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */; }; + 6167245C417A32179EC37D2D /* textfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0903EE9B3793303285FF96E3 /* textfile.cpp */; }; + 61A2B54FD2E33C759CF5A5E8 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 358D0A3AC73F322EA732D020 /* pngrutil.c */; }; + 61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 20E4A10BCD773C84AEC481A1 /* jdmarker.c */; }; + 61FD5E0E28F732E8AB1729F8 /* xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E6AB648BC5173104A96CAE66 /* xml.cpp */; }; + 61FEDBF2D47A3B4E861F8296 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACC8667173D3AB09F6214F4 /* sound.cpp */; }; + 62757F24C4EE3B84B6AE3F14 /* textdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D529E2668C23D94A7706C8A /* textdlgg.cpp */; }; + 62F1DC80D631335B892610A8 /* splitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C125FA3837C631A9BE0ED5E7 /* splitter.cpp */; }; + 633DD2E870263F42A8DBF9BF /* markuptext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */; }; + 63F0C8EEDF4B3641878A8B4D /* dlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9051902662BE38B3912B34EA /* dlgcmn.cpp */; }; + 63F2517EC6B2334CA825A6F9 /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEB08798C70E33DDB360E563 /* layout.cpp */; }; + 64DD406C453D39FEBBE66ED1 /* tif_pixarlog.c in Sources */ = {isa = PBXBuildFile; fileRef = 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */; }; + 64F11C549E3035DF85691060 /* tif_ojpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */; }; + 652CFDD9A1C1366E99B5D6BC /* socketiohandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */; }; + 65514CD6A9F23ED98436AC02 /* ftp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB4781DF8C432C688F30CDD /* ftp.cpp */; }; + 65AD3B31319C35F1AC9EC625 /* anybutton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4020D790AE7363CB29F1C2F /* anybutton.mm */; }; + 65E8A5F333D7336C816F0D0C /* variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31F4B9B03D52339B8F82C114 /* variant.cpp */; }; + 65FCDBFFF3F138A3ABBAA650 /* xh_menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */; }; + 664A54F914443110B7BB6928 /* tglbtn_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */; }; + 66584BC871303041BA622DE0 /* m_fonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1F3C70512D93501B0478F3E /* m_fonts.cpp */; }; + 66FD099CE5A338C18329FC36 /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD72950967F33809931D4968 /* LexAbaqus.cxx */; }; + 675B4E6CBA8632E89B4AC26D /* textctrl.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E16323A43E36DC8024EDF1 /* textctrl.mm */; }; + 67A0583ADD8C35B8B9BA3D12 /* checkbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = 81708CFA21A03013ACB8DDD7 /* checkbox.mm */; }; + 67EBCE5FA5FF36349ADF0916 /* jdapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */; }; + 682403FBBD4E3D5E88159501 /* CellBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */; }; + 6832385DDBB33D1B90C73CBA /* renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */; }; + 68AC8860B0943C1FAF76D96B /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552757A901E732CAA8E3F16D /* list.cpp */; }; + 692FCCABFB963696AFC1E122 /* gdiobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */; }; + 6944AC98F6F83E3D983DABD3 /* tif_getimage.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */; }; + 6978D7A20DA93A329DDD1383 /* socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CE02524DD4385AB2C3DF95 /* socket.cpp */; }; + 699D88EE2DAA3594B6606890 /* ViewStyle.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C133B838193A35ABBB803151 /* ViewStyle.cxx */; }; + 6A032420671B375D81273714 /* valnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 684D92E552BE313CBE0A88AA /* valnum.cpp */; }; + 6A081BF19747385CB4C1877F /* radiobut_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */; }; + 6A10511265493FA2BB79CE4D /* propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC93D1DE277395592610085 /* propdlg.cpp */; }; + 6AA0EE765330326380989FD1 /* stopwatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */; }; + 6AC347D2DCC730149A0A83D8 /* button_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF4F4F5211933057824B5621 /* button_osx.cpp */; }; + 6B9EEA3CF2E536E3B1ADAC42 /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBED392D081335FA80523244 /* manager.cpp */; }; + 6BC8B3EDB3AE3EF4BACFC08A /* ContractionState.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5219A792C6A736F193D4A82F /* ContractionState.cxx */; }; + 6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1197B997B1D139C5AE4D198A /* dseldlg.cpp */; }; + 6C3A459236F736B8A14A13AC /* dialog.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83B878A16ABC396E8C03A15E /* dialog.mm */; }; + 6C46AF0370793AA0B74A5A4A /* tabmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */; }; + 6C7C1CC506CB329FB2D086A9 /* LexBasic.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */; }; + 6C822F7F313734DCB51F44B9 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81A30C745CA73E30B788B408 /* image.cpp */; }; + 6CA1BAEBBDB4336E9E201F95 /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */; }; + 6D073876E1753549B5EEFDDA /* tif_compress.c in Sources */ = {isa = PBXBuildFile; fileRef = CA0D5D47D62A3148BA51B31B /* tif_compress.c */; }; + 6D723C987BFB39B7B887DCB1 /* Editor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DA5E95D498C53A808A8E2EEB /* Editor.cxx */; }; + 6E2C2E8AA1713ADE9C338379 /* tif_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 726C0457DF1232C793918DC1 /* tif_zip.c */; }; + 6E68759BC2E63CA59C12FDC0 /* popupcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D922063B2F2536629EEEAAF0 /* popupcmn.cpp */; }; + 6F0605F3A4E83BF0BF4C8B7E /* cmdproc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */; }; + 6F472413FFA03B53B395BB74 /* LexCLW.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7EE2459D69BA35838C274488 /* LexCLW.cxx */; }; + 6F5A0D3C7763334396A3783D /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */; }; + 6F8129E317EE3486A89D8548 /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */; }; + 6FA47EAACE613B039B6EC261 /* containr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3645350F572364BABF50238 /* containr.cpp */; }; + 700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 861438BD294335D4B859EA71 /* toplvcmn.cpp */; }; + 70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */; }; + 7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F43AF44465B335479752116D /* xh_radbx.cpp */; }; + 71CCB06E790C3C54BFF1199D /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */; }; + 729091CC33C73C989B4E0719 /* timerimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0401B7302088357BB6B7F16F /* timerimpl.cpp */; }; + 72AD4417FF7C3094BB1FF62C /* xh_grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B77251C0E0382D9A8E113D /* xh_grid.cpp */; }; + 73AA68AB9F1236ED9F1FBB2E /* metafile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2BB2949CC0B387AB6879539 /* metafile.cpp */; }; + 743BB23211B336A6A0F26E57 /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = F83172EE2DAE352FB969D4F2 /* jcapistd.c */; }; + 745C39E90E8C3C08A887B51C /* msgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */; }; + 7569F0BC3C603EB19168088F /* collpaneg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84758329F2163F00A9C005DF /* collpaneg.cpp */; }; + 758629DA468A3EF7B1C15241 /* gifdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */; }; + 75DCE6FF00E93C5D93970842 /* arttango.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9988CBB0772A3539970162FA /* arttango.cpp */; }; + 760C729E41D93CC1AA2B4E0D /* hyperlinkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */; }; + 7625D908B2CD34C78243BA8F /* settcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */; }; + 768716016CE7310BB1AD7567 /* regexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 1482A34AC32133E4BE207223 /* regexec.c */; }; + 76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */ = {isa = PBXBuildFile; fileRef = 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */; }; + 76D1A1A49CC831FFB9EBB1F5 /* LexOpal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */; }; + 774A89998E09308CBFB03EE0 /* imagxpm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C85865D28DC31649440A921 /* imagxpm.cpp */; }; + 774EB9F3F7E93A379E1F7551 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4762898E5330C28651EE73 /* graphics.cpp */; }; + 779D3480141B3683A6D132BE /* tif_lzw.c in Sources */ = {isa = PBXBuildFile; fileRef = 346C68F0CCD23823B78267F0 /* tif_lzw.c */; }; + 77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */; }; + 784F7C50882F320FA76537B5 /* LexAU3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C76222F466E831F896A89269 /* LexAU3.cxx */; }; + 78E15D8200F635529F396099 /* LexBullant.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 6718204F4700318E89EAC906 /* LexBullant.cxx */; }; + 793F542F20AB31F6AF736795 /* tif_open.c in Sources */ = {isa = PBXBuildFile; fileRef = 1731A6096BFC3A468AB4755A /* tif_open.c */; }; + 795613831EC8332A83FF26E7 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7E99B35A98D30818120B002 /* string.cpp */; }; + 795B9B15279D36F8899C9CA8 /* PropSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */; }; + 796311E398FF313C84218824 /* uiactioncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */; }; + 7A7439BE66AA3771B4A89048 /* regex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB46BC22F6B23909A938C561 /* regex.cpp */; }; + 7A79D9AC608E3B8287229174 /* tif_warning.c in Sources */ = {isa = PBXBuildFile; fileRef = C83C97A1FCC5345896C9D7DE /* tif_warning.c */; }; + 7A84B9471A3238B4B66B1776 /* nbkbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B901252876603DCEA4C66D89 /* nbkbase.cpp */; }; + 7B372FEA276438C186F7E340 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */; }; + 7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */; }; + 7B642B17F5D23F4F8ED38BB4 /* graphcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB59DD194923D6399087A75 /* graphcmn.cpp */; }; + 7C20B79175D33852A2E9DE83 /* LexRuby.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8734C52C7559310784396455 /* LexRuby.cxx */; }; + 7C52E7CC12463941B0E4D402 /* statbmpcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */; }; + 7C87CC7641033D91823ED688 /* helpfrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */; }; + 7C9EAFF4A0223EE597E0E39E /* xh_srchctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */; }; + 7D0E549020D33ED39751DFC8 /* LexTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */; }; + 7D615329368D32709CEF4B58 /* headerctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7273A7E255323EB3B391D997 /* headerctrlg.cpp */; }; + 7DC4A542372437ECA0790F87 /* art_msw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B540E18F9C91381CA175BABB /* art_msw.cpp */; }; + 7E6C627A325F32FFB2EF9B9E /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; }; + 7ECC6EE6D5273F75BB6B7B74 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; }; + 7EF89F935314301381802FAB /* filectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2334539088B036BEAB230D1C /* filectrlg.cpp */; }; + 7F77E347E1243D77A666FB43 /* clipbrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */; }; + 7FC3D17B3C853FE58841002D /* timercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7195E665E0F233839B967FC9 /* timercmn.cpp */; }; + 805CCAE64D023561AD334B53 /* popupwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530DC2E26BF2313E8702AD43 /* popupwin.cpp */; }; + 80665EEAE8613DF8A93A7984 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; }; + 815AE3FED68330F4933AA16F /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = C94DC3402FAE3C4FA776DEEA /* window.mm */; }; + 81B742D64BEB373DB705947A /* m_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4028ABB08C63AB59F5F240B /* m_list.cpp */; }; + 825EAD51920B387DB4F8C426 /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A46D50BEBF523B3F88831086 /* LexAsn1.cxx */; }; + 8292D346BFC33D6E8D3CDDBF /* xh_sttxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */; }; + 82FA4AA043213728AC266700 /* wizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */; }; + 834F2ADD0520313FBAC4F927 /* LexCsound.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */; }; + 83616D33080E3F0F9FA5FBB4 /* xh_html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889FFA9573A835F280A21CB4 /* xh_html.cpp */; }; + 83C492B87F4A3A97930F227A /* ExternalLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */; }; + 84382E5DB3203A73AC5EE390 /* xh_combo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F0905A1EBD653F6D82395602 /* xh_combo.cpp */; }; + 84997126352137E798CD258A /* spinctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59572A234F0636D78BFD9F6B /* spinctlg.cpp */; }; + 84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */; }; + 85F9828B80B03178A274BD17 /* selstore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ED2105A5A033E3384EBC4ED /* selstore.cpp */; }; + 86003C8EB906304F9025F788 /* jcinit.c in Sources */ = {isa = PBXBuildFile; fileRef = AA6C6739C3BD3EFA9CF71102 /* jcinit.c */; }; + 867F5D1962383C98A8ADDC3D /* xmladv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1E1A01885B036C28EBDAE27 /* xmladv.cpp */; }; + 86AED49CEAFC3637B1F10537 /* dialog_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */; }; + 86BE5213D3F131D8A6862679 /* hid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 160EB9744CB63A0B81DC651F /* hid.cpp */; }; + 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */; }; + 87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5F11A3646F397BA62EB037 /* htmllbox.cpp */; }; + 87C67583D36C3465ACD64103 /* vlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA90128E29A03CCCA30F4D35 /* vlbox.cpp */; }; + 88A43B1C5A7438838DE97B94 /* tif_luv.c in Sources */ = {isa = PBXBuildFile; fileRef = 66FDA882451239EA8DF2E0B5 /* tif_luv.c */; }; + 88E1AE56FD393C8BA5CF8545 /* stringops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F1E724EA70AB35DDB130F84F /* stringops.cpp */; }; + 89046455F49D3D75A21C9DB8 /* imagfill.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 137E01C362E134449BF966ED /* imagfill.cpp */; }; + 893BDA491EDE3A0E91FADE40 /* nonownedwnd.mm in Sources */ = {isa = PBXBuildFile; fileRef = AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */; }; + 894D43C8F224394FB3171F26 /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */; }; + 8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */; }; + 8A4046BD38873D9CAC9C2B59 /* filesys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F263022F3FEA3F75895B644D /* filesys.cpp */; }; + 8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */; }; + 8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8836E29C5A370E80CE070E /* splash.cpp */; }; + 8AB7191F7CB838FC8337C48D /* xh_statbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FADE850169F7347F83FE1499 /* xh_statbar.cpp */; }; + 8B38C6C416BA3A51B37F60C4 /* statlinecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */; }; + 8B60964DA1DF3F3DB40BE123 /* datavgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D473DC5123EDAB767045C /* datavgen.cpp */; }; + 8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 86884BC843F6337EABF744BB /* jdapimin.c */; }; + 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */; }; + 8FB5FBC5730C33F1A3D85D9F /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */; }; + 8FC1C07FEE793897A1E96D23 /* statbmpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA2119A7C67D37B290C17989 /* statbmpg.cpp */; }; + 8FDC800D873F30E282691832 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 87799D3168B43EB7B5686826 /* pngrtran.c */; }; + 901F659891613419B8643952 /* calctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */; }; + 9058997222493A7A859A4D4C /* richtextxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C69E48C06BD23C178F650E42 /* richtextxml.cpp */; }; + 9065A4BE3D0433B88CF45571 /* richtextbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */; }; + 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47FF6D792CA234C395692118 /* PlatWX.cpp */; }; + 90BC965B1A1F35A3B2C9D1C9 /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BF1C44D726E63B18A98006EC /* Decoration.cxx */; }; + 9110ACFC3CFB3C7994E907B0 /* imagiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4A745D1821A32D591D76650 /* imagiff.cpp */; }; + 912C69ADB1673ACEB0E6CF08 /* tif_strip.c in Sources */ = {isa = PBXBuildFile; fileRef = B83EDE2D1731311ABDE62F9F /* tif_strip.c */; }; + 91BC7802C15337CDA84C3742 /* statline_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */; }; + 91BDA5B04CF33C9AB7358B8A /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F098E47EBF34368ABAE7ED /* timer.cpp */; }; + 91EA325FCE3A3A6A8D1D21A5 /* srchctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */; }; + 923F4797A73A3BDD87BBD1E1 /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AF3DF03795153E039B8F1F87 /* LineMarker.cxx */; }; + 939E53CA56F33194B4681117 /* glgrab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */; }; + 93E04642049537EB8A37BA26 /* htmlwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */; }; + 9455B49669853E71BD4FD965 /* richtextformatdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */; }; + 94B1C88076793400810FAC30 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = AF26BAB1F4733114926F1724 /* png.c */; }; + 94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */; }; + 9519D59421513FF28FF717B6 /* regiong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE538F33A1423FC2AC9E45F3 /* regiong.cpp */; }; + 955D2199F1893D37BA2D7478 /* laywin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3784C240C2F330683494926 /* laywin.cpp */; }; + 9564A6968D66325DAEADEBA3 /* dcgraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */; }; + 95826E8528CC32D8934C36EC /* xh_frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */; }; + 95AD56D602CF3C5085602AF8 /* geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BC0A61629E635FAB4E09505 /* geometry.cpp */; }; + 9678C2B19D293818AA8E9E0D /* LexSpice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4592464D4868329897F3864D /* LexSpice.cxx */; }; + 96927C5A21FD3ACF936CDF6C /* renderg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49CABA38E78D34DFA260AA06 /* renderg.cpp */; }; + 96B507455762391688B5E500 /* xh_listc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */; }; + 9744994E8A813AA6938A7CE2 /* textcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */; }; + 97BAFEAD53E238B6881178DD /* evtloopcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 640783FBACA43206B782C77B /* evtloopcmn.cpp */; }; + 97C551F8AEF133D680D1FD36 /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */; }; + 97F60B2A9CE93BC8949A8CCD /* LexCrontab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */; }; + 9836B3D336963795928FE5A1 /* m_dflist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52FE1599218730CC99A3F801 /* m_dflist.cpp */; }; + 9881E3FB23ED3283B6CC71A2 /* filepickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */; }; + 98DF13E96160304EBB905E73 /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 810EB7316DF3344197C78EC0 /* jcmainct.c */; }; + 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D2F8259CC99380CB8217DEF /* tif_unix.c */; }; + 99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */; }; + 9A16829C34C9344D9AB010F9 /* DocumentAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */; }; + 9A178ED42D96329D8CBF9B89 /* tif_predict.c in Sources */ = {isa = PBXBuildFile; fileRef = 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */; }; + 9A83D365AD1F37FA9C7030C2 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EF330EAACFA53877BE289896 /* matrix.cpp */; }; + 9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */; }; + 9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */; }; + 9B8E5690A6103FC1BDC6C47E /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D6506AEA5A323B8735F126 /* pngread.c */; }; + 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CBD7B44E33373BCCB60FC11F /* combog.cpp */; }; + 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */; }; + 9D003890CB7035A298DB7056 /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 5145561C78303EEE9F827962 /* LexLua.cxx */; }; + 9D4B67A357D23B5283CA8D98 /* clrpickercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */; }; + 9E0B67E34B683412978BA82D /* filtall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */; }; + 9EC837DA722736119D49868A /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CAA325362C73AC8BE20FAA7 /* pngpread.c */; }; + 9F608A33D52D327FAA295624 /* sckfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56653FACC7D13804A70556AD /* sckfile.cpp */; }; + 9F70A89D00B03D4894AF7638 /* validate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01BA6D45FE4C381493EB4372 /* validate.cpp */; }; + 9FB1E1763EFA334CA0C07C49 /* tarstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */; }; + 9FBC642677C63D01AA2511BC /* evtloop_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */; }; + 9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */; }; + A0BA01A85C303C78A3130711 /* art_aui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */; }; + A0FCE3CF565C3F84B63712AC /* LexCPP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */; }; + A139B846584436BCBEBAE3BF /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76337016F2CA3C85831702E6 /* grid.cpp */; }; + A1A7D793B034398B8696EF33 /* utils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 789F45D14FF23E248FCFB5FA /* utils.mm */; }; + A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; }; + A212431902B8343CA6D229D3 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; }; + A2473402D8B83628B1F66749 /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; }; + A2769D1659AE3CA3B58C2CAE /* wincmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */; }; + A283187810EB32DAA173BD33 /* artstd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24E82A05E9A9323287CDB15B /* artstd.cpp */; }; + A3321FE2A87D3BD69E0BB009 /* notebook_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5248A45AB113341EAC361910 /* notebook_osx.cpp */; }; + A336FD218BE63B19991CA513 /* ipcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C090A76B6F23E6481A27282 /* ipcbase.cpp */; }; + A3586433C4B1398FB1C361D6 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; }; + A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; }; + A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; }; + A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; }; + A423177BBC0F3BE5A436B4B7 /* propgridpagestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */; }; + A465A43B756630F1944B5A56 /* vscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1629FA905F903324AA5BE72C /* vscroll.cpp */; }; + A52A7D2FEB1434E29C64582C /* RESearch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E145FC31ED523B4AA5080A61 /* RESearch.cxx */; }; + A53B8C3ED0D33A1D9AA8219A /* toolbar.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3BF8C9FF2D5314591329D0D /* toolbar.mm */; }; + A569A33A2097316D8110C2C1 /* toolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */; }; + A5775D87FD713CBB930A783E /* bookctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */; }; + A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */ = {isa = PBXBuildFile; fileRef = 374E341C8703367686DEDE93 /* jmemnobs.c */; }; + A80D00249A693F43A9CBE777 /* rgncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 63867276260C3F4A980E83D8 /* rgncmn.cpp */; }; + A874AF0B203D3DC99C27469A /* LexNimrod.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */; }; + A92439BAFD3A30A29DD93131 /* apptraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4A23A8BC7373D4BBD72851D /* apptraits.cpp */; }; + A93D0E6F0871368EA8FC9FF9 /* fswatchercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */; }; + A965348C7FA73CEC90C8FA25 /* filedlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */; }; + A9864F0104FA344BBE79D3BC /* rendcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96CED508FA3C3B6B9265099E /* rendcmn.cpp */; }; + A9A5973552EE30838306D15C /* tif_packbits.c in Sources */ = {isa = PBXBuildFile; fileRef = 9CE73979D0933A43830307E4 /* tif_packbits.c */; }; + AAAB5DF8E60736D88273DCFE /* strconv_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D5F9383D1CE931499F339D85 /* strconv_cf.cpp */; }; + AAABEE399008310A8BC9BE43 /* imagtga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA7029BB5751398AA02D8C24 /* imagtga.cpp */; }; + AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */; }; + AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */; }; + ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC666417602346EA583709E /* translation.cpp */; }; + AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 303ACF199BE431BD891C9301 /* overlaycmn.cpp */; }; + AC91349D7F0E37739B1F5165 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF6B3FB66243812969E5BD1 /* palette.cpp */; }; + ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 2F41EDEB298538CC86FF6DC1 /* jcparam.c */; }; + AD07124BBA613B47829F0692 /* sockosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4969528429903F15882F5391 /* sockosx.cpp */; }; + AD4A533C4E1633598A6D5C6F /* textentrycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */; }; + AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D272910EC35531E5B4D6E05B /* dynlib.cpp */; }; + AE5286C71D1130EAA368A1C4 /* radiobtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 724927B0045F3CC0884878BB /* radiobtncmn.cpp */; }; + AE84BC9A1CCA3ADA9C483950 /* xmlrole.c in Sources */ = {isa = PBXBuildFile; fileRef = 59C6B9849FF6325E890942EF /* xmlrole.c */; }; + AEB9099819B33F4A8AAB9F54 /* radiocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */; }; + AEEE6BC41B6531898A61CB16 /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = D87406BCF3E833369E12D89A /* LexHTML.cxx */; }; + AF1E3338E892336E924AF631 /* pickerbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */; }; + B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C131F7BF8A83960ACB26242 /* jidctflt.c */; }; + B026621DE50A3921B6598EF6 /* regerror.c in Sources */ = {isa = PBXBuildFile; fileRef = A70C82ADB45A3FB99C420D03 /* regerror.c */; }; + B0E94A59C83637C09FAAE71C /* app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 757B31FCCA1F381C95B30DF8 /* app.cpp */; }; + B1775EF7C72233408044034B /* radiobox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 773D91F8280434519BD167EA /* radiobox_osx.cpp */; }; + B181806CC34839E791E54BF0 /* xh_tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */; }; + B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */; }; + B198DA8239E9358A9D56B988 /* menu_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66C21CA37BF63893887FD91B /* menu_osx.cpp */; }; + B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB634FD597793A74B3B3AA7F /* docview.cpp */; }; + B37802B0A90133C68EF93DDA /* LexInno.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */; }; + B387FAE95A9535B194A42BA4 /* WindowAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */; }; + B4425B59CC27389CA9FF81D1 /* datectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE856D950B8C369EB0FE13BA /* datectlg.cpp */; }; + B5470121BB4B35DE9C4836DA /* jdcoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = F1A6F3936A0D31CBB58082BA /* jdcoefct.c */; }; + B559E894684A38238CAAA115 /* dirctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E110907DDC13305E88B90086 /* dirctrlcmn.cpp */; }; + B59FC7345C383D9099391AC3 /* mimecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */; }; + B5C7FD8C27F43F3289A77FC9 /* utilsunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */; }; + B640A8A74D973A8FBEF63916 /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 04082EC1C91334379425802D /* LexConf.cxx */; }; + B6891F848CA0325EAB6D1373 /* textentry_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777385D10CCC350C90F02824 /* textentry_osx.cpp */; }; + B6C364CB4AE33708A862B4B4 /* srchctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D46A36564C78312CAC538E93 /* srchctlg.cpp */; }; + B791BD05072B3B909A7093C2 /* dcsvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */; }; + B839235BED6F3609BDB732B8 /* dndcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */; }; + B84642DA949638A189032CE6 /* http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F84F0DB790A23D92A193D2B4 /* http.cpp */; }; + B8FEEC2C94183AB69C963177 /* headercolcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */; }; + BA7B12396B873FDA8F3A2748 /* xlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 418AD9241B673308BE31DC06 /* xlocale.cpp */; }; + BA9F0BBD57F63FD29E484FD3 /* LexScriptol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */; }; + BAA75384DA82370298672333 /* helpctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42E433D1700631A8907B8227 /* helpctrl.cpp */; }; + BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */; }; + BAFF04F1680F32DA988EB03D /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; + BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; + BB6FE851028C3DE7A070C213 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; + BBAABF3C693E37D3B0FF2502 /* colrdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */; }; + BCD81FD3D1EC305F801E1C1B /* sckipc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */; }; + BCDAE378D03E37F5994FB9C5 /* XPM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C25521AF59B9324EB2809C73 /* XPM.cxx */; }; + BD2B17EB72E73A6EB6E0B26F /* dcmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 343D4FDD5CC030618EF24729 /* dcmemory.cpp */; }; + BD49EC50CB363642BDBF25C8 /* mousemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D037EA567C253DEEA17E822B /* mousemanager.cpp */; }; + BD53E095EC1136EF853A47D8 /* m_layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5EE0B8985443BDCB36F781F /* m_layout.cpp */; }; + BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3019BA65DD73F30A865365F /* frame.cpp */; }; + BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0FFDC7A6163F2DA73B84EB /* jchuff.c */; }; + BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8555204EBA8930809B732842 /* accesscmn.cpp */; }; + BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */; }; + BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */; }; + BEAC2449AFA7304989BA301E /* fontpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */; }; + BEFC179F8A0E337F9D627D84 /* LexOthers.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C356B5738AB13E829E66729E /* LexOthers.cxx */; }; + BF068F3C06473D8CBC55D507 /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BCD873D873A53BBF955D8A4E /* PositionCache.cxx */; }; + BF1760458996391E8EB42949 /* ctrlsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */; }; + BF2585CFA6853023975F1E78 /* iconbndl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */; }; + BF3D600A93403C589B65C5BF /* xh_stlin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F555177554E398286DBC6FB /* xh_stlin.cpp */; }; + BF8C33B7CB3A3ECE814A95FB /* tokenzr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */; }; + BF9B151DC0543E37878F8B9A /* stattextg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE635F30F3935099AF1486C /* stattextg.cpp */; }; + BFA6983551B4310DA7C8A404 /* jcdctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 6DBF3053414F3C448312165A /* jcdctmgr.c */; }; + BFD3BFBDC8DA3B1EAD141F96 /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A1276C0E5D48337489DEE8DF /* LexErlang.cxx */; }; + BFD4B8871B3934048B631419 /* languageinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67D76B026121359F9B22F8B0 /* languageinfo.cpp */; }; + C005C2D547E735E9B081658E /* prntdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */; }; + C05BDB0B5F5A33A9A57FF012 /* m_links.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 080597FC0436378E96EDA94B /* m_links.cpp */; }; + C0CDA289E9EC3E20BE70B2E6 /* choiccmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24930711031D35288D28B04B /* choiccmn.cpp */; }; + C170B941F01334F982315E4A /* tif_print.c in Sources */ = {isa = PBXBuildFile; fileRef = C6EB77ED688E3EE294167EF1 /* tif_print.c */; }; + C1CDD035AA393ACC9E202C03 /* minifram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 693F731B7D1730A79485F9EC /* minifram.cpp */; }; + C1E5799141603A75A26BEEA7 /* xpmdecod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C562D5885AFF3E15837325CE /* xpmdecod.cpp */; }; + C259D01CC62533D296EF023A /* scrolbarcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */; }; + C2B07E2ECDDC3833BDC9B28C /* arcall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75D0C937F2A03ADA8581A2BB /* arcall.cpp */; }; + C2CF6B59914A3183ADE84028 /* tif_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F1439BF6C3361296F05A33 /* tif_error.c */; }; + C2D45B334BE03F6C941CA041 /* utilsexc_cf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */; }; + C2DEE063B5E032C1BD2B5026 /* xmlparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A92B6033D8233DB1821F193B /* xmlparse.c */; }; + C2E37E798F743A4199C8658E /* fddlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */; }; + C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 950D51915EF83B57B5E8306F /* xh_spin.cpp */; }; + C34B8675439F39B4845FFC50 /* xh_listb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */; }; + C3A63D7091913CD39094AE0B /* btncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A7A3B499503ECABC6A838F /* btncmn.cpp */; }; + C3AC94EA13C1352790BF5FF7 /* listctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D9016355F66D3125919E017D /* listctrl.cpp */; }; + C425A172B0AB3EBD9AC9A590 /* ustring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B63EBEE1A04537E7887E9FD0 /* ustring.cpp */; }; + C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */; }; + C5419BC04D6234B5A8307B81 /* xti.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25C86D3D4839343BA1D8BDEE /* xti.cpp */; }; + C5A8DF376BB13A2A8290C2E5 /* xh_unkwn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */; }; + C5E5AB869065307F83E27DD1 /* htmlpars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */; }; + C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E3043D7BE9C33B59E900CCE /* jcmaster.c */; }; + C7B6240E0E213836996A178B /* dockart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD709DEB71623974B9836D69 /* dockart.cpp */; }; + C8C68927DB243AEAB51E11F2 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = AF9EE701DD653E2299293E5F /* pngwio.c */; }; + C8F1FB8C029031A5909DBC56 /* KeyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */; }; + CA155860CE9A3A8189C3A4C2 /* zipstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */; }; + CA4DCD57060B38CC8B2283D7 /* filtfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */; }; + CA5BD8ABDBA13641BBE7CD66 /* jccoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = E89AC104BF4F33A083F8B382 /* jccoefct.c */; }; + CA85901B9E2538CFB7E44216 /* process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B35DA585CFDD32468868E892 /* process.cpp */; }; + CAF5C5BB129431B596C4C6C1 /* LexTAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 38891BF8F51E398F9082903F /* LexTAL.cxx */; }; + CB078622E90F33BE9D131131 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28824 /* buttonbar.cpp */; }; + CB078622E90F33BE9D131132 /* buttonbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5612DBC4125B379DA2B28825 /* buttonbar.cpp */; }; + CB1F37993ECB3B73A51B42FD /* LexMySQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */; }; + CB2E99E8FB7D3269A333A55E /* window_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D7C4995D7A35A1854B533F /* window_osx.cpp */; }; + CBBD7B32DB7B3E24AE745D78 /* epolldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */; }; + CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 725574EF98C4301989181CBF /* jctrans.c */; }; + CCFD3144A22C3A87B67D88AB /* LexRebol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */; }; + CD241361D4693785A0B8939D /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */; }; + CD2A9111B8A83AFA8B5B97E5 /* overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2128AD8BD12E3F33AD57478E /* overlay.cpp */; }; + CD35A576FD363FD49C3AC4B3 /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 375E7A99FF4C38FA9E223772 /* LexAda.cxx */; }; + CDC0FF253B503BA19693D68D /* xh_propdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */; }; + CE17002B5B7E375582747639 /* xh_choic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */; }; + CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9B2316B32653DA0939A372D /* sound_osx.cpp */; }; + CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = ED19EF377E653F71B1876259 /* jdmaster.c */; }; + CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */; }; + CEE0D7A7D5D8323B9957A780 /* notifmsgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */; }; + CF3082BA1ED232F4B904BD14 /* stdpbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */; }; + CFA91122523B31B9A07A3826 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */; }; + CFDBB80A4C9A3BA092273936 /* animatecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */; }; + CFF73578F04D357E83D1D830 /* lboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */; }; + D070C3BE95483FE38BABA1BE /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00DA3D3EEF5E305CA73A1871 /* region.cpp */; }; + D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; }; + D0DA11B814AF30A18585122F /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; }; + D13596A4E3CD31DE810061A1 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; }; + D13AE659C3AC37B68D39B2C9 /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B14D6E7E15FD3C869E341198 /* LexLout.cxx */; }; + D17E3053DA0D3F7EA4D0951B /* helpdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81821049E39B32C6ABCF6820 /* helpdlg.cpp */; }; + D18E2985C48733B2B7B3D442 /* evtloopunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */; }; + D36E76A4CAF5352D9397E1FF /* fdiodispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */; }; + D3FB75C8E3A73AE38EE8A6F6 /* selectdispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */; }; + D4C87E227A28391891D89088 /* filename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */; }; + D4EC9DB5F8DF319EA0FD26A4 /* LexVB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8F633793051F371F94C27530 /* LexVB.cxx */; }; + D51B3389209E370489078891 /* tif_dirread.c in Sources */ = {isa = PBXBuildFile; fileRef = F6EA240B3DB93D398A990FAD /* tif_dirread.c */; }; + D542C7819D593112AE5F7C3D /* combocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */; }; + D54A162E557834A48F4646A9 /* advprops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 326723AEB79A305F90D6B41D /* advprops.cpp */; }; + D54D3CA9E73336A08DB20705 /* LexBaan.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */; }; + D5A25AC579F436509805335A /* appbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95A156A823B536DE8476E4F9 /* appbase.cpp */; }; + D5AABE973F3A351EB1C1A5A6 /* fontmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0817D6A1AF83608B050EBC3 /* fontmap.cpp */; }; + D5C304182151365FA9FF8A3D /* xh_bttn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */; }; + D5C5DD83882B3227A1CCFE0E /* LexSorcus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */; }; + D66F5D4D204B3B789C7F76B9 /* fontdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18044326B5B13A98A49732DD /* fontdlg.cpp */; }; + D6B2A64A78AF3F2983B441A8 /* ownerdrwcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */; }; + D6B73239BF0E32288161679C /* platinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97FFB03FF6793506B246BAC6 /* platinfo.cpp */; }; + D6C3421AD2A537AAA2F0AB80 /* file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168DB301ACC736FF96D7F581 /* file.cpp */; }; + D72D99FC424337CF9EDC2042 /* props.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C20E46A504113C899B9DD9B7 /* props.cpp */; }; + D83B32B788EC310D919E0DF7 /* imagpcx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */; }; + D8ADDD24BEAC3D94B3388D3E /* LexCOBOL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */; }; + D9496139621533328AE727B6 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 91300EB871CC39ECBC430D48 /* pngget.c */; }; + D95C5F467D37339AB8DF2354 /* tif_color.c in Sources */ = {isa = PBXBuildFile; fileRef = 149D299A0EDB3D998118EC93 /* tif_color.c */; }; + D997FFC948B73FDA892DB531 /* jdsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 5FFCF47A161B3E08B19BFE14 /* jdsample.c */; }; + D9DCBE799DB634C2A73FD6BD /* statboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D73954EB5397301F87881646 /* statboxcmn.cpp */; }; + D9EE059D3C3C3C13AE4419F1 /* stattextcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */; }; + D9F02AFDA07D3857A905527C /* jdcolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 68B81FBDA49D3C1991B6356A /* jdcolor.c */; }; + DA0FA502405A37B2A5698D20 /* config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FE0B33481283D3493613B0F /* config.cpp */; }; + DAAFBED07FF8365B96D20B99 /* unichar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */; }; + DB3C3AA956A03FB492480266 /* treectlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */; }; + DB73248401573A5996D8E68D /* jcmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 664736BDE465350C9C4750E9 /* jcmarker.c */; }; + DB9565CC4EAE3BCB9F490620 /* xmltok.c in Sources */ = {isa = PBXBuildFile; fileRef = 8685B8ED68F23DB0B770FD74 /* xmltok.c */; }; + DC6B669C9A78398F914AEE53 /* fontutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FF661188B563D27A11F5716 /* fontutil.cpp */; }; + DC978B60F6DF3176B5B114C3 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5466CC2D6579360E9C665EE5 /* memory.cpp */; }; + DDC71B80D562303690FDBE4C /* appcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F01DDE448E4C3983ACCE67FD /* appcmn.cpp */; }; + DE26572475EE336B8EEA5D92 /* jerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 108517BCD39230E7A89BC943 /* jerror.c */; }; + DE43350F6C9D3148A64F0AF9 /* art_internal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4649974D8B3A109D1BF145 /* art_internal.cpp */; }; + DEB35F871F8E3B90AD207AEE /* printps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF76670146413EEFA005206A /* printps.cpp */; }; + DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */; }; + DF8124E5E17D386A84CEEA27 /* LexLisp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40586C8986443431A64EB066 /* LexLisp.cxx */; }; + DF8CE011EAC23F73BDA1C44D /* scrolbar_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */; }; + DFEB8DA3D42734949CB1E1AA /* clipcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */; }; + E05B06A7FEEE32D5AD87EA4F /* xh_editlbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05310A868F0B35999C568681 /* xh_editlbox.cpp */; }; + E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */; }; + E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A298576700C33F018616E7BD /* auibook.cpp */; }; + E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */; }; + E1F7C51F411B3AF39476E488 /* fdrepdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */; }; + E2A73751CECF32A68FFAEE82 /* panelcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70E9B2C076673C87B4218A01 /* panelcmn.cpp */; }; + E3136EF5DD843ACE886E2868 /* tif_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = E79B2D1F630036129B9677A7 /* tif_dir.c */; }; + E39021D3CDCD33BAA646B006 /* sckaddr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8238DA30FF3FB984511250 /* sckaddr.cpp */; }; + E3A4615870B139D29FE727C1 /* menucmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F175D6E8E5723FC797701275 /* menucmn.cpp */; }; + E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B9C41A4D12345AAA764CAD /* stc.cpp */; }; + E4131E3B445C36E6A7FC802F /* regcomp.c in Sources */ = {isa = PBXBuildFile; fileRef = E433B890264339BA8DB97B1D /* regcomp.c */; }; + E49F0D43B5A63EF1A57A7112 /* fswatcherg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */; }; + E4B826CE70283D999CB591F3 /* listbox_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B99CA41708513A599AE275A2 /* listbox_osx.cpp */; }; + E515EAE375AE390688CBF8D3 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B32A13D5B3336098B1B9765 /* pngtrans.c */; }; + E53AFF04877D34C386D77380 /* wfstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C37866F41B0C31E295AA7FA6 /* wfstream.cpp */; }; + E5D698D2606A304DA743AF92 /* grideditors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66426B63AA3E3A279936C034 /* grideditors.cpp */; }; + E62F8E49FD5035D8BC71BB49 /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */; }; + E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81B3DFBB73573FFDBD320334 /* datstrm.cpp */; }; + E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6F23140777B733679D2FAAFC /* odcombocmn.cpp */; }; + E7140F3AB94D3FDFA86D8C06 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49612306912038DDBCABB4DE /* url.cpp */; }; + E741CDA71895344C974D8F50 /* AutoComplete.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */; }; + E7921B0472B63E4091F4F517 /* xh_collpane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */; }; + E7AF3BF2B3473AD9BE66D1A1 /* xh_clrpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */; }; + E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */ = {isa = PBXBuildFile; fileRef = 375FF97B202F3C359402D13E /* jdpostct.c */; }; + E7F35B834A163C67B65176C6 /* tif_dirwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */; }; + E80BEED62EBF34F09B3F401F /* LexMagik.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 45860601270D318D93BEE1F3 /* LexMagik.cxx */; }; + E82CB89681FF3747B6A94427 /* anybutton_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */; }; + E882402BEE0330A080A6516F /* strconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FEB8204E530329FA085E5B8 /* strconv.cpp */; }; + E8BBC08597EF383597DA0308 /* LexEiffel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 55EBB18CB4773C788510B14B /* LexEiffel.cxx */; }; + E8EE34F0A78C31B489B19FEE /* LexMSSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */; }; + E8F0C87119C63E8E81423A7C /* stdpaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */; }; + E92EB502F79638B0BE569EF4 /* CallTip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */; }; + E9EDB5C92D5D3B529E8D73B0 /* valgen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7440859617F3B47AF4D3817 /* valgen.cpp */; }; + EA02FA6D3B003F8F8A2963C6 /* toolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */; }; + EAA469E1A0CC33E4A21A3F7A /* gaugecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */; }; + EAE02BA934B43EEE92C496C7 /* dcpsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EEA0945B20913754A54D0FD9 /* dcpsg.cpp */; }; + EB52C6A915943813932944FE /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04A /* control.cpp */; }; + EB52C6A915943813932944FF /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12363D1F50FE301DAEE7F04B /* control.cpp */; }; + EBA0986930DA3B59B2FB4F1E /* htmltag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FCCFF49F92B4323D9181CEDA /* htmltag.cpp */; }; + EBF2D44758003221A22202BC /* colourcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D61240ABD70328BA5789663 /* colourcmn.cpp */; }; + EC3A1C620D323B5590AABF02 /* module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9DB43FAB1E563B02ACEFF647 /* module.cpp */; }; + EC43AFB3670A3D459D9B388D /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = FE3B47058A723243A285594D /* LexMPT.cxx */; }; + ED8D23D79FF33ED380FE09EB /* scrlwing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */; }; + EDCA35F1555F3509895CCA69 /* textctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */; }; + EDD5725CF41336EFA7FB3009 /* framecmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A54B80C17F823CB5900AD2E8 /* framecmn.cpp */; }; + EDD92822EBD93E86AE5A2ED0 /* slidercmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8072CA67D19346ABF4D465F /* slidercmn.cpp */; }; + EE0EA850822E35F596B5EBBA /* artprov.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29387393C07C39DB8FF1663B /* artprov.cpp */; }; + EE9194D6C4C138BF9DAB8633 /* panelg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */; }; + EEB0B28903693C7E9D07192F /* glcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E08A51FA8D8A361681B07295 /* glcmn.cpp */; }; + F016C51053373E658ED4C9A9 /* helpext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF376BC55EA73F5FB7328142 /* helpext.cpp */; }; + F07D84D124F23E7FA11CF148 /* extended.c in Sources */ = {isa = PBXBuildFile; fileRef = 033B94A9AC8A3370A794503F /* extended.c */; }; + F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */; }; + F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00969CBE3B8F32C78C195619 /* panel.cpp */; }; + F1E4D7CA634E33808AE3B522 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 373242CD08F330208A7CF438 /* fontenumcmn.cpp */; }; + F1F484DD591337399FCD0463 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5617D10CB7136EC9A4194EF /* display.cpp */; }; + F22C401903993639AE05A295 /* xh_stbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 147800BBCB80346798B35D75 /* xh_stbox.cpp */; }; + F24F637D59F637CA9A7E23C9 /* xh_filectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */; }; + F2813BF297C73A3ABD02EC98 /* glcanvas_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */; }; + F2F2963D8ECC32D39FDBF101 /* tif_write.c in Sources */ = {isa = PBXBuildFile; fileRef = E9B992CB6C28339FB0CA5E27 /* tif_write.c */; }; + F34D240EB4513FE996179182 /* xh_mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */; }; + F38202271C6131908C358DEC /* mstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC3D1E222FD93A69B1D1366E /* mstream.cpp */; }; + F3AC352D6DAE3A12A5664768 /* styleparams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */; }; + F3CB42BB6D983675862C01F3 /* xh_toolb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */; }; + F43DAE2E829A3A7493531381 /* richtextimagedlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */; }; + F46777ABE0743B04A1E1F0A4 /* spinbtncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */; }; + F4C0CEADEDC23610BF6983D6 /* artmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0665A40F3FC3F218074C63C /* artmac.cpp */; }; + F501AB044AAC39DCB8C0B3E1 /* editors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9C7F740A55E39FD890B3C7F /* editors.cpp */; }; + F55F3887CDE633D7877C607B /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */; }; + F569D7A3F0E038E9B4CC2A76 /* xh_comboctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */; }; + F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F94CF171F4532B89FECF475 /* busyinfo.cpp */; }; + F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */; }; + F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB466912FDA23F8B87A00A3C /* threadpsx.cpp */; }; + F5DF7AF0FA9E371BB71EF798 /* xh_listbk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */; }; + F5FF98C231B33E3EB7902C64 /* colordlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = DAAED71A534135A9A61612A6 /* colordlgosx.mm */; }; + F6A1AC5CF84E32C19F91A614 /* statbrma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */; }; + F6B85CD918E93923BE631B95 /* fs_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */; }; + F70156C3E68B38FCB72FE253 /* dirdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */; }; + F72020415D713C1BA41C17CF /* richmsgdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */; }; + F747991E5C973F9B8C9D800A /* fontcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */; }; + F7D10B6E0CBA32EFAF79C77C /* xh_dirpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */; }; + F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */; }; + F84D59648206349A9768157C /* msgdlg.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33CFE51FD6F0362092DF1A85 /* msgdlg.mm */; }; + F85D632964383F29BC3B30B6 /* tif_next.c in Sources */ = {isa = PBXBuildFile; fileRef = DFDC805DD3063C389F93642D /* tif_next.c */; }; + F89405757B063F80B111F469 /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E0EBCDDF248638B58B01D9CC /* datetime.cpp */; }; + F910C74E48823E0BA7F7885D /* graphicc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BACAA6CE4A0934459F26B27C /* graphicc.cpp */; }; + FADD46CB89B135D1AF1D5F8A /* richtextstyledlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */; }; + FB09720D13673A7B81BCB645 /* xh_datectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C63C964DAFAD311694367C94 /* xh_datectrl.cpp */; }; + FB8B6E4789A3311A98C5B0A8 /* clrpickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */; }; + FBA19C939E1E33EDB05043FE /* cairo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */; }; + FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */; }; + FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EB76F786D7F3FF286948D22 /* jcomapi.c */; }; + FD1F6CD8286D3D428FD52A28 /* filepickerg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B580FD04D0D83601826FD5EE /* filepickerg.cpp */; }; + FD38B04026F930CC80BC9480 /* m_pre.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61658C3EABB4341AA38C691E /* m_pre.cpp */; }; + FD3CC5F0AA41384B9388A1E0 /* htmlfilt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C6C4F5468743265A02D656C /* htmlfilt.cpp */; }; + FDDCADE58FA2313986025D77 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F190B80DD28031A98E5BCA67 /* Foundation.framework */; }; + FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66411D54BAD338498AC59401 /* xh_scrol.cpp */; }; + FE2DBCCC1D0B36A3BE4493C0 /* fs_arc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88F2BA2F0598342186A484B5 /* fs_arc.cpp */; }; + FE5285579C7F39C48FC66B10 /* hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 888BD97139C936679691FF34 /* hash.cpp */; }; + FE5B7C7A84B83C17A38E8403 /* LexSML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */; }; + FE9A662A1F9B34D099C45C1D /* xh_cald.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093B5233861B3F9B8C85762B /* xh_cald.cpp */; }; + FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */; }; + FEB073547F3F3AC19D31F698 /* tif_tile.c in Sources */ = {isa = PBXBuildFile; fileRef = BD88495AF72531A28D2201D0 /* tif_tile.c */; }; + FECC98B53C0F3106AB04E69E /* tif_fax3.c in Sources */ = {isa = PBXBuildFile; fileRef = 30FD1048328234E59D319863 /* tif_fax3.c */; }; + FEF99FF6C38D3B488396B142 /* ffile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */; }; + FF50EC0EC5F23DF890C6E95F /* colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9D1F14339D1C331087650931 /* colour.cpp */; }; + FF7DB2884F6E3C5DB4BDF61D /* fswatcher_kqueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */; }; + FFF5BFBE600E35FAB7EA522C /* fileback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC12D557950A3B0D89D9F2F3 /* fileback.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 0080254545B9383ABDF2045C /* xh_odcombo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_odcombo.cpp; path = ../../src/xrc/xh_odcombo.cpp; sourceTree = ""; }; + 00969CBE3B8F32C78C195619 /* panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panel.cpp; path = ../../src/ribbon/panel.cpp; sourceTree = ""; }; + 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bookctrl.cpp; path = ../../src/common/bookctrl.cpp; sourceTree = ""; }; + 00DA3D3EEF5E305CA73A1871 /* region.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = region.cpp; path = ../../src/osx/carbon/region.cpp; sourceTree = ""; }; + 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dndcmn.cpp; path = ../../src/common/dndcmn.cpp; sourceTree = ""; }; + 01BA6D45FE4C381493EB4372 /* validate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = validate.cpp; path = ../../src/common/validate.cpp; sourceTree = ""; }; + 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imaglist.cpp; path = ../../src/osx/imaglist.cpp; sourceTree = ""; }; + 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctfst.c; path = ../../src/jpeg/jfdctfst.c; sourceTree = ""; }; + 02D2E8B5C89939CE90B99E2B /* archive.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = archive.cpp; path = ../../src/common/archive.cpp; sourceTree = ""; }; + 02D9332D5C5632E981936E29 /* jquant2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant2.c; path = ../../src/jpeg/jquant2.c; sourceTree = ""; }; + 032A38738B58394E8617617B /* tif_dirinfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirinfo.c; path = ../../src/tiff/libtiff/tif_dirinfo.c; sourceTree = ""; }; + 033B94A9AC8A3370A794503F /* extended.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = extended.c; path = ../../src/common/extended.c; sourceTree = ""; }; + 0401B7302088357BB6B7F16F /* timerimpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timerimpl.cpp; path = ../../src/common/timerimpl.cpp; sourceTree = ""; }; + 04082EC1C91334379425802D /* LexConf.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexConf.cxx; path = ../../src/stc/scintilla/src/LexConf.cxx; sourceTree = ""; }; + 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmndata.cpp; path = ../../src/common/cmndata.cpp; sourceTree = ""; }; + 05310A868F0B35999C568681 /* xh_editlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_editlbox.cpp; path = ../../src/xrc/xh_editlbox.cpp; sourceTree = ""; }; + 05A4437E9697300390FDE14E /* auibar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = auibar.cpp; path = ../../src/aui/auibar.cpp; sourceTree = ""; }; + 06B4A895955B32258DCD62BF /* xh_dlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_dlg.cpp; path = ../../src/xrc/xh_dlg.cpp; sourceTree = ""; }; + 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combocmn.cpp; path = ../../src/common/combocmn.cpp; sourceTree = ""; }; + 071FEABEA61E3B559A47A7DB /* statusbr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statusbr.cpp; path = ../../src/generic/statusbr.cpp; sourceTree = ""; }; + 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bttn.cpp; path = ../../src/xrc/xh_bttn.cpp; sourceTree = ""; }; + 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmp.cpp; path = ../../src/xrc/xh_bmp.cpp; sourceTree = ""; }; + 080597FC0436378E96EDA94B /* m_links.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_links.cpp; path = ../../src/html/m_links.cpp; sourceTree = ""; }; + 082CA018FB883999839C1DCE /* m_tables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_tables.cpp; path = ../../src/html/m_tables.cpp; sourceTree = ""; }; + 087B66573CD33DA99DA82B1C /* xmlres.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlres.cpp; path = ../../src/xrc/xmlres.cpp; sourceTree = ""; }; + 0890779C662C35889A8C6C2E /* jdmerge.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmerge.c; path = ../../src/jpeg/jdmerge.c; sourceTree = ""; }; + 0903EE9B3793303285FF96E3 /* textfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textfile.cpp; path = ../../src/common/textfile.cpp; sourceTree = ""; }; + 093B5233861B3F9B8C85762B /* xh_cald.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cald.cpp; path = ../../src/xrc/xh_cald.cpp; sourceTree = ""; }; + 0964797530CF3FE7B8DB6242 /* pngwtran.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwtran.c; path = ../../src/png/pngwtran.c; sourceTree = ""; }; + 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choicbkg.cpp; path = ../../src/generic/choicbkg.cpp; sourceTree = ""; }; + 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCsound.cxx; path = ../../src/stc/scintilla/src/LexCsound.cxx; sourceTree = ""; }; + 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cursor.cpp; path = ../../src/osx/carbon/cursor.cpp; sourceTree = ""; }; + 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timerunx.cpp; path = ../../src/unix/timerunx.cpp; sourceTree = ""; }; + 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = ""; }; + 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/src/LexRebol.cxx; sourceTree = ""; }; + 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = ""; }; + 0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = ""; }; + 108517BCD39230E7A89BC943 /* jerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jerror.c; path = ../../src/jpeg/jerror.c; sourceTree = ""; }; + 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dumpmode.c; path = ../../src/tiff/libtiff/tif_dumpmode.c; sourceTree = ""; }; + 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVHDL.cxx; path = ../../src/stc/scintilla/src/LexVHDL.cxx; sourceTree = ""; }; + 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexHaskell.cxx; path = ../../src/stc/scintilla/src/LexHaskell.cxx; sourceTree = ""; }; + 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpcx.cpp; path = ../../src/common/imagpcx.cpp; sourceTree = ""; }; + 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = txtstrm.cpp; path = ../../src/common/txtstrm.cpp; sourceTree = ""; }; + 1197B997B1D139C5AE4D198A /* dseldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dseldlg.cpp; path = ../../src/common/dseldlg.cpp; sourceTree = ""; }; + 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmpbt.cpp; path = ../../src/xrc/xh_bmpbt.cpp; sourceTree = ""; }; + 12363D1F50FE301DAEE7F04A /* control.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = control.cpp; path = ../../src/osx/carbon/control.cpp; sourceTree = ""; }; + 12363D1F50FE301DAEE7F04B /* control.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = control.cpp; path = ../../src/ribbon/control.cpp; sourceTree = ""; }; + 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clipbrd.cpp; path = ../../src/osx/carbon/clipbrd.cpp; sourceTree = ""; }; + 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbmpcmn.cpp; path = ../../src/common/statbmpcmn.cpp; sourceTree = ""; }; + 137E01C362E134449BF966ED /* imagfill.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagfill.cpp; path = ../../src/common/imagfill.cpp; sourceTree = ""; }; + 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpcboxg.cpp; path = ../../src/generic/bmpcboxg.cpp; sourceTree = ""; }; + 147800BBCB80346798B35D75 /* xh_stbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stbox.cpp; path = ../../src/xrc/xh_stbox.cpp; sourceTree = ""; }; + 1482A34AC32133E4BE207223 /* regexec.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regexec.c; path = ../../src/regex/regexec.c; sourceTree = ""; }; + 149D299A0EDB3D998118EC93 /* tif_color.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_color.c; path = ../../src/tiff/libtiff/tif_color.c; sourceTree = ""; }; + 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jmemmgr.c; path = ../../src/jpeg/jmemmgr.c; sourceTree = ""; }; + 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ownerdrwcmn.cpp; path = ../../src/common/ownerdrwcmn.cpp; sourceTree = ""; }; + 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexInno.cxx; path = ../../src/stc/scintilla/src/LexInno.cxx; sourceTree = ""; }; + 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_unkwn.cpp; path = ../../src/xrc/xh_unkwn.cpp; sourceTree = ""; }; + 160EB9744CB63A0B81DC651F /* hid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hid.cpp; path = ../../src/osx/core/hid.cpp; sourceTree = ""; }; + 1629FA905F903324AA5BE72C /* vscroll.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vscroll.cpp; path = ../../src/generic/vscroll.cpp; sourceTree = ""; }; + 168DB301ACC736FF96D7F581 /* file.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file.cpp; path = ../../src/common/file.cpp; sourceTree = ""; }; + 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCrontab.cxx; path = ../../src/stc/scintilla/src/LexCrontab.cxx; sourceTree = ""; }; + 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gifdecod.cpp; path = ../../src/common/gifdecod.cpp; sourceTree = ""; }; + 1731A6096BFC3A468AB4755A /* tif_open.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_open.c; path = ../../src/tiff/libtiff/tif_open.c; sourceTree = ""; }; + 1731D6708BFE3DE7B101CE74 /* object.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = object.cpp; path = ../../src/common/object.cpp; sourceTree = ""; }; + 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlpars.cpp; path = ../../src/html/htmlpars.cpp; sourceTree = ""; }; + 18044326B5B13A98A49732DD /* fontdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdlg.cpp; path = ../../src/osx/carbon/fontdlg.cpp; sourceTree = ""; }; + 194ADD28300E329E80F7892E /* htmprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmprint.cpp; path = ../../src/html/htmprint.cpp; sourceTree = ""; }; + 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nonownedwnd_osx.cpp; path = ../../src/osx/nonownedwnd_osx.cpp; sourceTree = ""; }; + 1A0650754DC2358CA5933B28 /* pngerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngerror.c; path = ../../src/png/pngerror.c; sourceTree = ""; }; + 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlsub.cpp; path = ../../src/common/ctrlsub.cpp; sourceTree = ""; }; + 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tglbtn_osx.cpp; path = ../../src/osx/tglbtn_osx.cpp; sourceTree = ""; }; + 1BB59DD194923D6399087A75 /* graphcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphcmn.cpp; path = ../../src/common/graphcmn.cpp; sourceTree = ""; }; + 1BC0322549563787A21CE8F1 /* LexNsis.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexNsis.cxx; path = ../../src/stc/scintilla/src/LexNsis.cxx; sourceTree = ""; }; + 1C4762898E5330C28651EE73 /* graphics.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphics.cpp; path = ../../src/osx/carbon/graphics.cpp; sourceTree = ""; }; + 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UniConversion.cxx; path = ../../src/stc/scintilla/src/UniConversion.cxx; sourceTree = ""; }; + 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMSSQL.cxx; path = ../../src/stc/scintilla/src/LexMSSQL.cxx; sourceTree = ""; }; + 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextimagedlg.cpp; path = ../../src/richtext/richtextimagedlg.cpp; sourceTree = ""; }; + 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctint.c; path = ../../src/jpeg/jidctint.c; sourceTree = ""; }; + 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gbsizer.cpp; path = ../../src/common/gbsizer.cpp; sourceTree = ""; }; + 1EF103B09F02315282EC8F44 /* srchcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchcmn.cpp; path = ../../src/common/srchcmn.cpp; sourceTree = ""; }; + 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = ../../src/jpeg/jdapistd.c; sourceTree = ""; }; + 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckipc.cpp; path = ../../src/common/sckipc.cpp; sourceTree = ""; }; + 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pickerbase.cpp; path = ../../src/common/pickerbase.cpp; sourceTree = ""; }; + 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_ojpeg.c; path = ../../src/tiff/libtiff/tif_ojpeg.c; sourceTree = ""; }; + 20B922D61CDB3CCEB59A5194 /* convauto.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = convauto.cpp; path = ../../src/common/convauto.cpp; sourceTree = ""; }; + 20E4A10BCD773C84AEC481A1 /* jdmarker.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmarker.c; path = ../../src/jpeg/jdmarker.c; sourceTree = ""; }; + 2128AD8BD12E3F33AD57478E /* overlay.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = overlay.cpp; path = ../../src/osx/carbon/overlay.cpp; sourceTree = ""; }; + 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_tree.cpp; path = ../../src/xrc/xh_tree.cpp; sourceTree = ""; }; + 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcscreen.cpp; path = ../../src/osx/carbon/dcscreen.cpp; sourceTree = ""; }; + 22D9626646773CED82449D5D /* persist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = persist.cpp; path = ../../src/common/persist.cpp; sourceTree = ""; }; + 2334539088B036BEAB230D1C /* filectrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filectrlg.cpp; path = ../../src/generic/filectrlg.cpp; sourceTree = ""; }; + 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextstyledlg.cpp; path = ../../src/richtext/richtextstyledlg.cpp; sourceTree = ""; }; + 238741BDA2C73E56899CCB04 /* dcprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcprint.cpp; path = ../../src/osx/carbon/dcprint.cpp; sourceTree = ""; }; + 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clipcmn.cpp; path = ../../src/common/clipcmn.cpp; sourceTree = ""; }; + 23FC98E2305230E2990471E3 /* wxcrt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wxcrt.cpp; path = ../../src/common/wxcrt.cpp; sourceTree = ""; }; + 242BF97B558634A79322052C /* prntbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prntbase.cpp; path = ../../src/common/prntbase.cpp; sourceTree = ""; }; + 24396D584D053948A3FF0DCD /* imagpng.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpng.cpp; path = ../../src/common/imagpng.cpp; sourceTree = ""; }; + 24930711031D35288D28B04B /* choiccmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choiccmn.cpp; path = ../../src/common/choiccmn.cpp; sourceTree = ""; }; + 24DF23D67E693D999B875101 /* toolbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbkg.cpp; path = ../../src/generic/toolbkg.cpp; sourceTree = ""; }; + 24E82A05E9A9323287CDB15B /* artstd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artstd.cpp; path = ../../src/common/artstd.cpp; sourceTree = ""; }; + 25C86D3D4839343BA1D8BDEE /* xti.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xti.cpp; path = ../../src/common/xti.cpp; sourceTree = ""; }; + 26381308E32A3A179E7A9B40 /* gridsel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridsel.cpp; path = ../../src/generic/gridsel.cpp; sourceTree = ""; }; + 26632A254717372BAA4D514D /* framemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = framemanager.cpp; path = ../../src/aui/framemanager.cpp; sourceTree = ""; }; + 26D7C4995D7A35A1854B533F /* window_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = window_osx.cpp; path = ../../src/osx/window_osx.cpp; sourceTree = ""; }; + 271B4B77622B3411A7BF6634 /* dataobj.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dataobj.cpp; path = ../../src/osx/carbon/dataobj.cpp; sourceTree = ""; }; + 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statlinecmn.cpp; path = ../../src/common/statlinecmn.cpp; sourceTree = ""; }; + 29387393C07C39DB8FF1663B /* artprov.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artprov.cpp; path = ../../src/common/artprov.cpp; sourceTree = ""; }; + 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlrsall.cpp; path = ../../src/xrc/xmlrsall.cpp; sourceTree = ""; }; + 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg.c; path = ../../src/tiff/libtiff/tif_jpeg.c; sourceTree = ""; }; + 29D6506AEA5A323B8735F126 /* pngread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngread.c; path = ../../src/png/pngread.c; sourceTree = ""; }; + 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridctrl.cpp; path = ../../src/generic/gridctrl.cpp; sourceTree = ""; }; + 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerPro.cxx; path = ../../src/stc/scintilla/src/LexPowerPro.cxx; sourceTree = ""; }; + 2A67053D16D63C588E555C84 /* dragimgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dragimgg.cpp; path = ../../src/generic/dragimgg.cpp; sourceTree = ""; }; + 2ACC8667173D3AB09F6214F4 /* sound.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound.cpp; path = ../../src/osx/core/sound.cpp; sourceTree = ""; }; + 2AF7739C389536F79DAA31E5 /* Selection.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Selection.cxx; path = ../../src/stc/scintilla/src/Selection.cxx; sourceTree = ""; }; + 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = utilscocoa.mm; path = ../../src/osx/carbon/utilscocoa.mm; sourceTree = ""; }; + 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSQL.cxx; path = ../../src/stc/scintilla/src/LexSQL.cxx; sourceTree = ""; }; + 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clrpickerg.cpp; path = ../../src/generic/clrpickerg.cpp; sourceTree = ""; }; + 2C090A76B6F23E6481A27282 /* ipcbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ipcbase.cpp; path = ../../src/common/ipcbase.cpp; sourceTree = ""; }; + 2C6C4F5468743265A02D656C /* htmlfilt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlfilt.cpp; path = ../../src/html/htmlfilt.cpp; sourceTree = ""; }; + 2C904B4BA8273355869812B2 /* clntdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clntdata.cpp; path = ../../src/common/clntdata.cpp; sourceTree = ""; }; + 2D61240ABD70328BA5789663 /* colourcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourcmn.cpp; path = ../../src/common/colourcmn.cpp; sourceTree = ""; }; + 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpwnd.cpp; path = ../../src/html/helpwnd.cpp; sourceTree = ""; }; + 2DF2456ED905357B8C1D74D9 /* webkit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = webkit.mm; path = ../../src/html/htmlctrl/webkit/webkit.mm; sourceTree = ""; }; + 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontutilcmn.cpp; path = ../../src/common/fontutilcmn.cpp; sourceTree = ""; }; + 2E24C6F2A04E30EB95598305 /* chm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = chm.cpp; path = ../../src/html/chm.cpp; sourceTree = ""; }; + 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = epolldispatcher.cpp; path = ../../src/unix/epolldispatcher.cpp; sourceTree = ""; }; + 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexScriptol.cxx; path = ../../src/stc/scintilla/src/LexScriptol.cxx; sourceTree = ""; }; + 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mimecmn.cpp; path = ../../src/common/mimecmn.cpp; sourceTree = ""; }; + 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMySQL.cxx; path = ../../src/stc/scintilla/src/LexMySQL.cxx; sourceTree = ""; }; + 2F41EDEB298538CC86FF6DC1 /* jcparam.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcparam.c; path = ../../src/jpeg/jcparam.c; sourceTree = ""; }; + 2F94CF171F4532B89FECF475 /* busyinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = busyinfo.cpp; path = ../../src/generic/busyinfo.cpp; sourceTree = ""; }; + 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_predict.c; path = ../../src/tiff/libtiff/tif_predict.c; sourceTree = ""; }; + 302A13BC64C238A297F4399F /* brush.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brush.cpp; path = ../../src/osx/brush.cpp; sourceTree = ""; }; + 303ACF199BE431BD891C9301 /* overlaycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = overlaycmn.cpp; path = ../../src/common/overlaycmn.cpp; sourceTree = ""; }; + 305614D19CF23CB2B14A5B2E /* tif_flush.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_flush.c; path = ../../src/tiff/libtiff/tif_flush.c; sourceTree = ""; }; + 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../src/stc/scintilla/src/LexGAP.cxx; sourceTree = ""; }; + 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontcmn.cpp; path = ../../src/common/fontcmn.cpp; sourceTree = ""; }; + 30FD1048328234E59D319863 /* tif_fax3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3.c; path = ../../src/tiff/libtiff/tif_fax3.c; sourceTree = ""; }; + 31F4B9B03D52339B8F82C114 /* variant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = variant.cpp; path = ../../src/common/variant.cpp; sourceTree = ""; }; + 326723AEB79A305F90D6B41D /* advprops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = advprops.cpp; path = ../../src/propgrid/advprops.cpp; sourceTree = ""; }; + 33CFE51FD6F0362092DF1A85 /* msgdlg.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = msgdlg.mm; path = ../../src/osx/iphone/msgdlg.mm; sourceTree = ""; }; + 343D4FDD5CC030618EF24729 /* dcmemory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcmemory.cpp; path = ../../src/osx/core/dcmemory.cpp; sourceTree = ""; }; + 346C68F0CCD23823B78267F0 /* tif_lzw.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_lzw.c; path = ../../src/tiff/libtiff/tif_lzw.c; sourceTree = ""; }; + 35007225BB683683AA7C5E48 /* glcanvas.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = glcanvas.mm; path = ../../src/osx/iphone/glcanvas.mm; sourceTree = ""; }; + 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../src/stc/scintilla/src/LexSmalltalk.cxx; sourceTree = ""; }; + 358D0A3AC73F322EA732D020 /* pngrutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../../src/png/pngrutil.c; sourceTree = ""; }; + 36E1DBA275AD325DB759C180 /* fontenum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenum.cpp; path = ../../src/osx/core/fontenum.cpp; sourceTree = ""; }; + 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../src/stc/scintilla/src/LexPowerShell.cxx; sourceTree = ""; }; + 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tokenzr.cpp; path = ../../src/common/tokenzr.cpp; sourceTree = ""; }; + 373242CD08F330208A7CF438 /* fontenumcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontenumcmn.cpp; path = ../../src/common/fontenumcmn.cpp; sourceTree = ""; }; + 374E341C8703367686DEDE93 /* jmemnobs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jmemnobs.c; path = ../../src/jpeg/jmemnobs.c; sourceTree = ""; }; + 375E7A99FF4C38FA9E223772 /* LexAda.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAda.cxx; path = ../../src/stc/scintilla/src/LexAda.cxx; sourceTree = ""; }; + 375FF97B202F3C359402D13E /* jdpostct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdpostct.c; path = ../../src/jpeg/jdpostct.c; sourceTree = ""; }; + 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gdiobj.cpp; path = ../../src/osx/carbon/gdiobj.cpp; sourceTree = ""; }; + 38891BF8F51E398F9082903F /* LexTAL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTAL.cxx; path = ../../src/stc/scintilla/src/LexTAL.cxx; sourceTree = ""; }; + 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DocumentAccessor.cxx; path = ../../src/stc/scintilla/src/DocumentAccessor.cxx; sourceTree = ""; }; + 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = fontdlgosx.mm; path = ../../src/osx/carbon/fontdlgosx.mm; sourceTree = ""; }; + 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_slidr.cpp; path = ../../src/xrc/xh_slidr.cpp; sourceTree = ""; }; + 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbuttn_osx.cpp; path = ../../src/osx/bmpbuttn_osx.cpp; sourceTree = ""; }; + 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = styleparams.cpp; path = ../../src/html/styleparams.cpp; sourceTree = ""; }; + 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdiounix.cpp; path = ../../src/unix/fdiounix.cpp; sourceTree = ""; }; + 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolb.cpp; path = ../../src/xrc/xh_toolb.cpp; sourceTree = ""; }; + 3C131F7BF8A83960ACB26242 /* jidctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctflt.c; path = ../../src/jpeg/jidctflt.c; sourceTree = ""; }; + 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sizer.cpp; path = ../../src/common/sizer.cpp; sourceTree = ""; }; + 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = snglinst.cpp; path = ../../src/unix/snglinst.cpp; sourceTree = ""; }; + 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_getimage.c; path = ../../src/tiff/libtiff/tif_getimage.c; sourceTree = ""; }; + 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcmn.cpp; path = ../../src/common/textcmn.cpp; sourceTree = ""; }; + 3E3043D7BE9C33B59E900CCE /* jcmaster.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmaster.c; path = ../../src/jpeg/jcmaster.c; sourceTree = ""; }; + 3E6F40F4740C3ED29D83E107 /* tif_version.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_version.c; path = ../../src/tiff/libtiff/tif_version.c; sourceTree = ""; }; + 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dobjcmn.cpp; path = ../../src/common/dobjcmn.cpp; sourceTree = ""; }; + 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gallery.cpp; path = ../../src/ribbon/gallery.cpp; sourceTree = ""; }; + 3F8836E29C5A370E80CE070E /* splash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splash.cpp; path = ../../src/generic/splash.cpp; sourceTree = ""; }; + 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = ""; }; + 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = ""; }; + 4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = ""; }; + 40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/src/LexLisp.cxx; sourceTree = ""; }; + 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = ""; }; + 40CE02524DD4385AB2C3DF95 /* socket.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = socket.cpp; path = ../../src/common/socket.cpp; sourceTree = ""; }; + 4188821BBA833CCAA678B234 /* utilscmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilscmn.cpp; path = ../../src/common/utilscmn.cpp; sourceTree = ""; }; + 418AD9241B673308BE31DC06 /* xlocale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xlocale.cpp; path = ../../src/common/xlocale.cpp; sourceTree = ""; }; + 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = renderer.cpp; path = ../../src/osx/carbon/renderer.cpp; sourceTree = ""; }; + 42E433D1700631A8907B8227 /* helpctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpctrl.cpp; path = ../../src/html/helpctrl.cpp; sourceTree = ""; }; + 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filtall.cpp; path = ../../src/common/filtall.cpp; sourceTree = ""; }; + 4549845C0751356A907C23E0 /* jdtrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdtrans.c; path = ../../src/jpeg/jdtrans.c; sourceTree = ""; }; + 45860601270D318D93BEE1F3 /* LexMagik.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMagik.cxx; path = ../../src/stc/scintilla/src/LexMagik.cxx; sourceTree = ""; }; + 4592464D4868329897F3864D /* LexSpice.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpice.cxx; path = ../../src/stc/scintilla/src/LexSpice.cxx; sourceTree = ""; }; + 45D7558DF5E03A2EB41883F0 /* pngwutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = ../../src/png/pngwutil.c; sourceTree = ""; }; + 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fldlgcmn.cpp; path = ../../src/common/fldlgcmn.cpp; sourceTree = ""; }; + 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatcherg.cpp; path = ../../src/generic/fswatcherg.cpp; sourceTree = ""; }; + 477B609FA2373FB58F4C8768 /* wxiphone.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxiphone.xcconfig; sourceTree = ""; }; + 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextbuffer.cpp; path = ../../src/richtext/richtextbuffer.cpp; sourceTree = ""; }; + 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdiodispatcher.cpp; path = ../../src/common/fdiodispatcher.cpp; sourceTree = ""; }; + 47FF6D792CA234C395692118 /* PlatWX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlatWX.cpp; path = ../../src/stc/PlatWX.cpp; sourceTree = ""; }; + 4867546E8B8D3C8683A23ED5 /* any.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = any.cpp; path = ../../src/common/any.cpp; sourceTree = ""; }; + 48D72D20DB1D3E1CA5ED112A /* effects.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effects.cpp; path = ../../src/common/effects.cpp; sourceTree = ""; }; + 48F1439BF6C3361296F05A33 /* tif_error.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_error.c; path = ../../src/tiff/libtiff/tif_error.c; sourceTree = ""; }; + 49612306912038DDBCABB4DE /* url.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = url.cpp; path = ../../src/common/url.cpp; sourceTree = ""; }; + 496674699F173A5385EAFF07 /* calctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = calctrlg.cpp; path = ../../src/generic/calctrlg.cpp; sourceTree = ""; }; + 4969528429903F15882F5391 /* sockosx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockosx.cpp; path = ../../src/osx/core/sockosx.cpp; sourceTree = ""; }; + 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAPDL.cxx; path = ../../src/stc/scintilla/src/LexAPDL.cxx; sourceTree = ""; }; + 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_propdlg.cpp; path = ../../src/xrc/xh_propdlg.cpp; sourceTree = ""; }; + 49CABA38E78D34DFA260AA06 /* renderg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = renderg.cpp; path = ../../src/generic/renderg.cpp; sourceTree = ""; }; + 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmdproc.cpp; path = ../../src/common/cmdproc.cpp; sourceTree = ""; }; + 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBaan.cxx; path = ../../src/stc/scintilla/src/LexBaan.cxx; sourceTree = ""; }; + 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCaml.cxx; path = ../../src/stc/scintilla/src/LexCaml.cxx; sourceTree = ""; }; + 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../src/jpeg/jquant1.c; sourceTree = ""; }; + 4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = ""; }; + 4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = ""; }; + 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/src/LexCSS.cxx; sourceTree = ""; }; + 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = ""; }; + 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexProgress.cxx; path = ../../src/stc/scintilla/src/LexProgress.cxx; sourceTree = ""; }; + 4FC2F076657431458896115A /* checkboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checkboxcmn.cpp; path = ../../src/common/checkboxcmn.cpp; sourceTree = ""; }; + 4FDE5A962FA234FA83A605AD /* Indicator.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Indicator.cxx; path = ../../src/stc/scintilla/src/Indicator.cxx; sourceTree = ""; }; + 4FE0B33481283D3493613B0F /* config.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = config.cpp; path = ../../src/common/config.cpp; sourceTree = ""; }; + 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../src/stc/scintilla/src/LexSpecman.cxx; sourceTree = ""; }; + 5145561C78303EEE9F827962 /* LexLua.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../src/stc/scintilla/src/LexLua.cxx; sourceTree = ""; }; + 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = ../../src/osx/core/cfstring.cpp; sourceTree = ""; }; + 5219A792C6A736F193D4A82F /* ContractionState.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../src/stc/scintilla/src/ContractionState.cxx; sourceTree = ""; }; + 5248A45AB113341EAC361910 /* notebook_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notebook_osx.cpp; path = ../../src/osx/notebook_osx.cpp; sourceTree = ""; }; + 52FE1599218730CC99A3F801 /* m_dflist.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_dflist.cpp; path = ../../src/html/m_dflist.cpp; sourceTree = ""; }; + 530DC2E26BF2313E8702AD43 /* popupwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = popupwin.cpp; path = ../../src/osx/carbon/popupwin.cpp; sourceTree = ""; }; + 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiocmn.cpp; path = ../../src/common/radiocmn.cpp; sourceTree = ""; }; + 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_text.cpp; path = ../../src/xrc/xh_text.cpp; sourceTree = ""; }; + 53D06E47477B3E32BB6B915E /* jcsample.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcsample.c; path = ../../src/jpeg/jcsample.c; sourceTree = ""; }; + 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox_osx.cpp; path = ../../src/osx/combobox_osx.cpp; sourceTree = ""; }; + 5466CC2D6579360E9C665EE5 /* memory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = memory.cpp; path = ../../src/common/memory.cpp; sourceTree = ""; }; + 548906E4E72935E48CE4AF87 /* m_image.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_image.cpp; path = ../../src/html/m_image.cpp; sourceTree = ""; }; + 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattextcmn.cpp; path = ../../src/common/stattextcmn.cpp; sourceTree = ""; }; + 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = zipstrm.cpp; path = ../../src/common/zipstrm.cpp; sourceTree = ""; }; + 552757A901E732CAA8E3F16D /* list.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = list.cpp; path = ../../src/common/list.cpp; sourceTree = ""; }; + 55EBB18CB4773C788510B14B /* LexEiffel.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexEiffel.cxx; path = ../../src/stc/scintilla/src/LexEiffel.cxx; sourceTree = ""; }; + 5612DBC4125B379DA2B28824 /* buttonbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = buttonbar.cpp; path = ../../src/generic/buttonbar.cpp; sourceTree = ""; }; + 5612DBC4125B379DA2B28825 /* buttonbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = buttonbar.cpp; path = ../../src/ribbon/buttonbar.cpp; sourceTree = ""; }; + 56653FACC7D13804A70556AD /* sckfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckfile.cpp; path = ../../src/common/sckfile.cpp; sourceTree = ""; }; + 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gaugecmn.cpp; path = ../../src/common/gaugecmn.cpp; sourceTree = ""; }; + 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listbk.cpp; path = ../../src/xrc/xh_listbk.cpp; sourceTree = ""; }; + 580AFC66F3003582B43043B1 /* animateg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animateg.cpp; path = ../../src/generic/animateg.cpp; sourceTree = ""; }; + 58421C141C9E31C6A7A3C183 /* filefn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filefn.cpp; path = ../../src/common/filefn.cpp; sourceTree = ""; }; + 58E1F571B01F34D4AB70CA18 /* property.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = property.cpp; path = ../../src/propgrid/property.cpp; sourceTree = ""; }; + 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexEScript.cxx; path = ../../src/stc/scintilla/src/LexEScript.cxx; sourceTree = ""; }; + 59572A234F0636D78BFD9F6B /* spinctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctlg.cpp; path = ../../src/generic/spinctlg.cpp; sourceTree = ""; }; + 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdatadst.c; path = ../../src/jpeg/jdatadst.c; sourceTree = ""; }; + 59C6B9849FF6325E890942EF /* xmlrole.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmlrole.c; path = ../../src/expat/lib/xmlrole.c; sourceTree = ""; }; + 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choice_osx.cpp; path = ../../src/osx/choice_osx.cpp; sourceTree = ""; }; + 59ED0C057D8F388A89DC7177 /* page.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = page.cpp; path = ../../src/ribbon/page.cpp; sourceTree = ""; }; + 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filectrlcmn.cpp; path = ../../src/common/filectrlcmn.cpp; sourceTree = ""; }; + 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_radbt.cpp; path = ../../src/xrc/xh_radbt.cpp; sourceTree = ""; }; + 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CharClassify.cxx; path = ../../src/stc/scintilla/src/CharClassify.cxx; sourceTree = ""; }; + 5B32A13D5B3336098B1B9765 /* pngtrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../../src/png/pngtrans.c; sourceTree = ""; }; + 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloop_cf.cpp; path = ../../src/osx/core/evtloop_cf.cpp; sourceTree = ""; }; + 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jutils.c; path = ../../src/jpeg/jutils.c; sourceTree = ""; }; + 5C85865D28DC31649440A921 /* imagxpm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagxpm.cpp; path = ../../src/common/imagxpm.cpp; sourceTree = ""; }; + 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_filepicker.cpp; path = ../../src/xrc/xh_filepicker.cpp; sourceTree = ""; }; + 5CB4781DF8C432C688F30CDD /* ftp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ftp.cpp; path = ../../src/common/ftp.cpp; sourceTree = ""; }; + 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printmac.cpp; path = ../../src/osx/core/printmac.cpp; sourceTree = ""; }; + 5D2F8259CC99380CB8217DEF /* tif_unix.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_unix.c; path = ../../src/tiff/libtiff/tif_unix.c; sourceTree = ""; }; + 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cairo.cpp; path = ../../src/common/cairo.cpp; sourceTree = ""; }; + 5DE635F30F3935099AF1486C /* stattextg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattextg.cpp; path = ../../src/generic/stattextg.cpp; sourceTree = ""; }; + 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinbutt_osx.cpp; path = ../../src/osx/spinbutt_osx.cpp; sourceTree = ""; }; + 5E463A493FD930DE80E58608 /* pngset.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngset.c; path = ../../src/png/pngset.c; sourceTree = ""; }; + 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listbkg.cpp; path = ../../src/generic/listbkg.cpp; sourceTree = ""; }; + 5ED2105A5A033E3384EBC4ED /* selstore.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = selstore.cpp; path = ../../src/generic/selstore.cpp; sourceTree = ""; }; + 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fdrepdlg.cpp; path = ../../src/generic/fdrepdlg.cpp; sourceTree = ""; }; + 5F3D473DC5123EDAB767045C /* datavgen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavgen.cpp; path = ../../src/generic/datavgen.cpp; sourceTree = ""; }; + 5F555177554E398286DBC6FB /* xh_stlin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stlin.cpp; path = ../../src/xrc/xh_stlin.cpp; sourceTree = ""; }; + 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listc.cpp; path = ../../src/xrc/xh_listc.cpp; sourceTree = ""; }; + 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textentrycmn.cpp; path = ../../src/common/textentrycmn.cpp; sourceTree = ""; }; + 5F84098A475939BB9EE87E70 /* imagbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagbmp.cpp; path = ../../src/common/imagbmp.cpp; sourceTree = ""; }; + 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_comboctrl.cpp; path = ../../src/xrc/xh_comboctrl.cpp; sourceTree = ""; }; + 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexOpal.cxx; path = ../../src/stc/scintilla/src/LexOpal.cxx; sourceTree = ""; }; + 5FF661188B563D27A11F5716 /* fontutil.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontutil.cpp; path = ../../src/osx/fontutil.cpp; sourceTree = ""; }; + 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobut_osx.cpp; path = ../../src/osx/radiobut_osx.cpp; sourceTree = ""; }; + 5FFCF47A161B3E08B19BFE14 /* jdsample.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdsample.c; path = ../../src/jpeg/jdsample.c; sourceTree = ""; }; + 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbar_osx.cpp; path = ../../src/osx/scrolbar_osx.cpp; sourceTree = ""; }; + 607EF0043E723B7B9BE101EA /* wxprintf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wxprintf.cpp; path = ../../src/common/wxprintf.cpp; sourceTree = ""; }; + 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_filectrl.cpp; path = ../../src/xrc/xh_filectrl.cpp; sourceTree = ""; }; + 61658C3EABB4341AA38C691E /* m_pre.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_pre.cpp; path = ../../src/html/m_pre.cpp; sourceTree = ""; }; + 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fileconf.cpp; path = ../../src/common/fileconf.cpp; sourceTree = ""; }; + 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPLM.cxx; path = ../../src/stc/scintilla/src/LexPLM.cxx; sourceTree = ""; }; + 63867276260C3F4A980E83D8 /* rgncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rgncmn.cpp; path = ../../src/common/rgncmn.cpp; sourceTree = ""; }; + 640783FBACA43206B782C77B /* evtloopcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloopcmn.cpp; path = ../../src/common/evtloopcmn.cpp; sourceTree = ""; }; + 646743F6FDFE3ACFA1A79B40 /* jidctred.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctred.c; path = ../../src/jpeg/jidctred.c; sourceTree = ""; }; + 64B25B87203E3464BCDD277D /* tif_read.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_read.c; path = ../../src/tiff/libtiff/tif_read.c; sourceTree = ""; }; + 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prntdlgg.cpp; path = ../../src/generic/prntdlgg.cpp; sourceTree = ""; }; + 66411D54BAD338498AC59401 /* xh_scrol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_scrol.cpp; path = ../../src/xrc/xh_scrol.cpp; sourceTree = ""; }; + 66426B63AA3E3A279936C034 /* grideditors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = grideditors.cpp; path = ../../src/generic/grideditors.cpp; sourceTree = ""; }; + 664736BDE465350C9C4750E9 /* jcmarker.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmarker.c; path = ../../src/jpeg/jcmarker.c; sourceTree = ""; }; + 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colrdlgg.cpp; path = ../../src/generic/colrdlgg.cpp; sourceTree = ""; }; + 66C21CA37BF63893887FD91B /* menu_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menu_osx.cpp; path = ../../src/osx/menu_osx.cpp; sourceTree = ""; }; + 66FDA882451239EA8DF2E0B5 /* tif_luv.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_luv.c; path = ../../src/tiff/libtiff/tif_luv.c; sourceTree = ""; }; + 6718204F4700318E89EAC906 /* LexBullant.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBullant.cxx; path = ../../src/stc/scintilla/src/LexBullant.cxx; sourceTree = ""; }; + 67D76B026121359F9B22F8B0 /* languageinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = languageinfo.cpp; path = ../../src/common/languageinfo.cpp; sourceTree = ""; }; + 67DCEEB6861731319C30817F /* cshelp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cshelp.cpp; path = ../../src/common/cshelp.cpp; sourceTree = ""; }; + 684D92E552BE313CBE0A88AA /* valnum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valnum.cpp; path = ../../src/common/valnum.cpp; sourceTree = ""; }; + 6876262846EA3569B36D92E9 /* imagjpeg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagjpeg.cpp; path = ../../src/common/imagjpeg.cpp; sourceTree = ""; }; + 68B81FBDA49D3C1991B6356A /* jdcolor.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdcolor.c; path = ../../src/jpeg/jdcolor.c; sourceTree = ""; }; + 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_thunder.c; path = ../../src/tiff/libtiff/tif_thunder.c; sourceTree = ""; }; + 68E5188DB6003C35A8C7754D /* htmlcell.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlcell.cpp; path = ../../src/html/htmlcell.cpp; sourceTree = ""; }; + 693F731B7D1730A79485F9EC /* minifram.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = minifram.cpp; path = ../../src/osx/minifram.cpp; sourceTree = ""; }; + 69A6CAF721E53E83B4820DE6 /* pngwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = ../../src/png/pngwrite.c; sourceTree = ""; }; + 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = numdlgg.cpp; path = ../../src/generic/numdlgg.cpp; sourceTree = ""; }; + 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgridiface.cpp; path = ../../src/propgrid/propgridiface.cpp; sourceTree = ""; }; + 69F098E47EBF34368ABAE7ED /* timer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timer.cpp; path = ../../src/osx/core/timer.cpp; sourceTree = ""; }; + 6A82EDCFFBAC30098B238957 /* caret.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = caret.cpp; path = ../../src/generic/caret.cpp; sourceTree = ""; }; + 6AC666417602346EA583709E /* translation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = translation.cpp; path = ../../src/common/translation.cpp; sourceTree = ""; }; + 6BC0A61629E635FAB4E09505 /* geometry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = geometry.cpp; path = ../../src/common/geometry.cpp; sourceTree = ""; }; + 6BC93D1DE277395592610085 /* propdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propdlg.cpp; path = ../../src/generic/propdlg.cpp; sourceTree = ""; }; + 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = numformatter.cpp; path = ../../src/common/numformatter.cpp; sourceTree = ""; }; + 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textctrl_osx.cpp; path = ../../src/osx/textctrl_osx.cpp; sourceTree = ""; }; + 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbar_osx.cpp; path = ../../src/osx/toolbar_osx.cpp; sourceTree = ""; }; + 6DBF3053414F3C448312165A /* jcdctmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcdctmgr.c; path = ../../src/jpeg/jcdctmgr.c; sourceTree = ""; }; + 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_sizer.cpp; path = ../../src/xrc/xh_sizer.cpp; sourceTree = ""; }; + 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = ""; }; + 6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = ""; }; + 701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = ""; }; + 70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = ""; }; + 7195E665E0F233839B967FC9 /* timercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timercmn.cpp; path = ../../src/common/timercmn.cpp; sourceTree = ""; }; + 71DB140E670738839EC42C2B /* Document.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Document.cxx; path = ../../src/stc/scintilla/src/Document.cxx; sourceTree = ""; }; + 724927B0045F3CC0884878BB /* radiobtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobtncmn.cpp; path = ../../src/common/radiobtncmn.cpp; sourceTree = ""; }; + 7255468B6D5F3D8697994A53 /* LexR.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexR.cxx; path = ../../src/stc/scintilla/src/LexR.cxx; sourceTree = ""; }; + 725574EF98C4301989181CBF /* jctrans.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jctrans.c; path = ../../src/jpeg/jctrans.c; sourceTree = ""; }; + 726C0457DF1232C793918DC1 /* tif_zip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_zip.c; path = ../../src/tiff/libtiff/tif_zip.c; sourceTree = ""; }; + 7273A7E255323EB3B391D997 /* headerctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headerctrlg.cpp; path = ../../src/generic/headerctrlg.cpp; sourceTree = ""; }; + 727F25F832AD32D4B12D8E39 /* m_span.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_span.cpp; path = ../../src/html/m_span.cpp; sourceTree = ""; }; + 72869747E68E37998CB0A07E /* jdhuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdhuff.c; path = ../../src/jpeg/jdhuff.c; sourceTree = ""; }; + 72D7AF345E563587941BD868 /* longlong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longlong.cpp; path = ../../src/common/longlong.cpp; sourceTree = ""; }; + 757B31FCCA1F381C95B30DF8 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = ../../src/osx/carbon/app.cpp; sourceTree = ""; }; + 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpbase.cpp; path = ../../src/common/stdpbase.cpp; sourceTree = ""; }; + 75D0C937F2A03ADA8581A2BB /* arcall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arcall.cpp; path = ../../src/common/arcall.cpp; sourceTree = ""; }; + 76337016F2CA3C85831702E6 /* grid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = grid.cpp; path = ../../src/generic/grid.cpp; sourceTree = ""; }; + 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbtncmn.cpp; path = ../../src/common/bmpbtncmn.cpp; sourceTree = ""; }; + 773D91F8280434519BD167EA /* radiobox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobox_osx.cpp; path = ../../src/osx/radiobox_osx.cpp; sourceTree = ""; }; + 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcgraph.cpp; path = ../../src/common/dcgraph.cpp; sourceTree = ""; }; + 777385D10CCC350C90F02824 /* textentry_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textentry_osx.cpp; path = ../../src/osx/textentry_osx.cpp; sourceTree = ""; }; + 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = aboutdlgg.cpp; path = ../../src/generic/aboutdlgg.cpp; sourceTree = ""; }; + 77F5E7BCD9B2307D8DBCC052 /* font.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = font.cpp; path = ../../src/osx/carbon/font.cpp; sourceTree = ""; }; + 789F45D14FF23E248FCFB5FA /* utils.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = utils.mm; path = ../../src/osx/iphone/utils.mm; sourceTree = ""; }; + 78D7866F95C73A28BB540606 /* LexBash.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBash.cxx; path = ../../src/stc/scintilla/src/LexBash.cxx; sourceTree = ""; }; + 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombo.cpp; path = ../../src/generic/odcombo.cpp; sourceTree = ""; }; + 7925E38823563BCDB5565DCF /* treebkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebkg.cpp; path = ../../src/generic/treebkg.cpp; sourceTree = ""; }; + 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtexthtml.cpp; path = ../../src/richtext/richtexthtml.cpp; sourceTree = ""; }; + 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = ""; }; + 7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = ""; }; + 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/src/LexCmake.cxx; sourceTree = ""; }; + 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glgrab.cpp; path = ../../src/osx/core/glgrab.cpp; sourceTree = ""; }; + 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths_cf.cpp; path = ../../src/osx/core/stdpaths_cf.cpp; sourceTree = ""; }; + 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = protocol.cpp; path = ../../src/common/protocol.cpp; sourceTree = ""; }; + 7BA6ADD758693BD180D3275B /* treebase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebase.cpp; path = ../../src/common/treebase.cpp; sourceTree = ""; }; + 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctrl_osx.cpp; path = ../../src/osx/srchctrl_osx.cpp; sourceTree = ""; }; + 7C97C1F26B5A38C49543060C /* mimetype.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mimetype.cpp; path = ../../src/osx/core/mimetype.cpp; sourceTree = ""; }; + 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stattext_osx.cpp; path = ../../src/osx/stattext_osx.cpp; sourceTree = ""; }; + 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatchercmn.cpp; path = ../../src/common/fswatchercmn.cpp; sourceTree = ""; }; + 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSorcus.cxx; path = ../../src/stc/scintilla/src/LexSorcus.cxx; sourceTree = ""; }; + 7D90D14874FD38079835AF0B /* editlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = editlbox.cpp; path = ../../src/generic/editlbox.cpp; sourceTree = ""; }; + 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RunStyles.cxx; path = ../../src/stc/scintilla/src/RunStyles.cxx; sourceTree = ""; }; + 7EB95BCFA255323183A996C9 /* m_style.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_style.cpp; path = ../../src/html/m_style.cpp; sourceTree = ""; }; + 7EE2459D69BA35838C274488 /* LexCLW.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCLW.cxx; path = ../../src/stc/scintilla/src/LexCLW.cxx; sourceTree = ""; }; + 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treectlg.cpp; path = ../../src/generic/treectlg.cpp; sourceTree = ""; }; + 7FCA75FE592C3469AE351FBF /* winpars.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = winpars.cpp; path = ../../src/html/winpars.cpp; sourceTree = ""; }; + 7FE0455EBDC63D82B2D88587 /* jcprepct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcprepct.c; path = ../../src/jpeg/jcprepct.c; sourceTree = ""; }; + 810EB7316DF3344197C78EC0 /* jcmainct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcmainct.c; path = ../../src/jpeg/jcmainct.c; sourceTree = ""; }; + 81390F96937631078EFCD891 /* utilsexc_base.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_base.cpp; path = ../../src/osx/core/utilsexc_base.cpp; sourceTree = ""; }; + 81708CFA21A03013ACB8DDD7 /* checkbox.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = checkbox.mm; path = ../../src/osx/iphone/checkbox.mm; sourceTree = ""; }; + 81821049E39B32C6ABCF6820 /* helpdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpdlg.cpp; path = ../../src/html/helpdlg.cpp; sourceTree = ""; }; + 81A30C745CA73E30B788B408 /* image.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = image.cpp; path = ../../src/common/image.cpp; sourceTree = ""; }; + 81B3DFBB73573FFDBD320334 /* datstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datstrm.cpp; path = ../../src/common/datstrm.cpp; sourceTree = ""; }; + 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpfrm.cpp; path = ../../src/html/helpfrm.cpp; sourceTree = ""; }; + 832BBBFE664736D5978420C6 /* fmapbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fmapbase.cpp; path = ../../src/common/fmapbase.cpp; sourceTree = ""; }; + 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_stbmp.cpp; path = ../../src/xrc/xh_stbmp.cpp; sourceTree = ""; }; + 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklstcmn.cpp; path = ../../src/common/checklstcmn.cpp; sourceTree = ""; }; + 83B878A16ABC396E8C03A15E /* dialog.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = dialog.mm; path = ../../src/osx/iphone/dialog.mm; sourceTree = ""; }; + 84758329F2163F00A9C005DF /* collpaneg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = collpaneg.cpp; path = ../../src/generic/collpaneg.cpp; sourceTree = ""; }; + 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_gdctl.cpp; path = ../../src/xrc/xh_gdctl.cpp; sourceTree = ""; }; + 84A7A3B499503ECABC6A838F /* btncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = btncmn.cpp; path = ../../src/common/btncmn.cpp; sourceTree = ""; }; + 8555204EBA8930809B732842 /* accesscmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accesscmn.cpp; path = ../../src/common/accesscmn.cpp; sourceTree = ""; }; + 861438BD294335D4B859EA71 /* toplvcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toplvcmn.cpp; path = ../../src/common/toplvcmn.cpp; sourceTree = ""; }; + 864438709B363773B8C3382D /* datetimefmt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datetimefmt.cpp; path = ../../src/common/datetimefmt.cpp; sourceTree = ""; }; + 8685B8ED68F23DB0B770FD74 /* xmltok.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmltok.c; path = ../../src/expat/lib/xmltok.c; sourceTree = ""; }; + 86884BC843F6337EABF744BB /* jdapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapimin.c; path = ../../src/jpeg/jdapimin.c; sourceTree = ""; }; + 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexFortran.cxx; path = ../../src/stc/scintilla/src/LexFortran.cxx; sourceTree = ""; }; + 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPascal.cxx; path = ../../src/stc/scintilla/src/LexPascal.cxx; sourceTree = ""; }; + 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxdebug.xcconfig; sourceTree = ""; }; + 8734C52C7559310784396455 /* LexRuby.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRuby.cxx; path = ../../src/stc/scintilla/src/LexRuby.cxx; sourceTree = ""; }; + 8744F2C80ECF375999195935 /* LexPB.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPB.cxx; path = ../../src/stc/scintilla/src/LexPB.cxx; sourceTree = ""; }; + 87799D3168B43EB7B5686826 /* pngrtran.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../../src/png/pngrtran.c; sourceTree = ""; }; + 87D973CA8D673267BD0844D3 /* paper.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = paper.cpp; path = ../../src/common/paper.cpp; sourceTree = ""; }; + 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_fontpicker.cpp; path = ../../src/xrc/xh_fontpicker.cpp; sourceTree = ""; }; + 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_bmpcbox.cpp; path = ../../src/xrc/xh_bmpcbox.cpp; sourceTree = ""; }; + 888BD97139C936679691FF34 /* hash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hash.cpp; path = ../../src/common/hash.cpp; sourceTree = ""; }; + 889FFA9573A835F280A21CB4 /* xh_html.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_html.cpp; path = ../../src/xrc/xh_html.cpp; sourceTree = ""; }; + 88F2BA2F0598342186A484B5 /* fs_arc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_arc.cpp; path = ../../src/common/fs_arc.cpp; sourceTree = ""; }; + 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_codec.c; path = ../../src/tiff/libtiff/tif_codec.c; sourceTree = ""; }; + 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_choic.cpp; path = ../../src/xrc/xh_choic.cpp; sourceTree = ""; }; + 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlnkcmn.cpp; path = ../../src/common/hyperlnkcmn.cpp; sourceTree = ""; }; + 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_animatctrl.cpp; path = ../../src/xrc/xh_animatctrl.cpp; sourceTree = ""; }; + 8C78A1539462370CAA429508 /* accel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accel.cpp; path = ../../src/osx/accel.cpp; sourceTree = ""; }; + 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpcboxcmn.cpp; path = ../../src/common/bmpcboxcmn.cpp; sourceTree = ""; }; + 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = calctrlcmn.cpp; path = ../../src/common/calctrlcmn.cpp; sourceTree = ""; }; + 8D2549709E0133C9A267E3A5 /* evtloop.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = evtloop.mm; path = ../../src/osx/iphone/evtloop.mm; sourceTree = ""; }; + 8D529E2668C23D94A7706C8A /* textdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textdlgg.cpp; path = ../../src/generic/textdlgg.cpp; sourceTree = ""; }; + 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaWX.cpp; path = ../../src/stc/ScintillaWX.cpp; sourceTree = ""; }; + 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_htmllbox.cpp; path = ../../src/xrc/xh_htmllbox.cpp; sourceTree = ""; }; + 8EB76F786D7F3FF286948D22 /* jcomapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcomapi.c; path = ../../src/jpeg/jcomapi.c; sourceTree = ""; }; + 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPOV.cxx; path = ../../src/stc/scintilla/src/LexPOV.cxx; sourceTree = ""; }; + 8EFF4707641D3F20AB602ED6 /* jccolor.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccolor.c; path = ../../src/jpeg/jccolor.c; sourceTree = ""; }; + 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wizard.cpp; path = ../../src/generic/wizard.cpp; sourceTree = ""; }; + 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stopwatch.cpp; path = ../../src/common/stopwatch.cpp; sourceTree = ""; }; + 8F633793051F371F94C27530 /* LexVB.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVB.cxx; path = ../../src/stc/scintilla/src/LexVB.cxx; sourceTree = ""; }; + 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctrlcmn.cpp; path = ../../src/common/spinctrlcmn.cpp; sourceTree = ""; }; + 8FFDFB4D208F37569AC548B0 /* imagall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagall.cpp; path = ../../src/common/imagall.cpp; sourceTree = ""; }; + 9051902662BE38B3912B34EA /* dlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dlgcmn.cpp; path = ../../src/common/dlgcmn.cpp; sourceTree = ""; }; + 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctint.c; path = ../../src/jpeg/jfdctint.c; sourceTree = ""; }; + 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirctrlg.cpp; path = ../../src/generic/dirctrlg.cpp; sourceTree = ""; }; + 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexSML.cxx; path = ../../src/stc/scintilla/src/LexSML.cxx; sourceTree = ""; }; + 91300EB871CC39ECBC430D48 /* pngget.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = ../../src/png/pngget.c; sourceTree = ""; }; + 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sashwin.cpp; path = ../../src/generic/sashwin.cpp; sourceTree = ""; }; + 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notifmsgg.cpp; path = ../../src/generic/notifmsgg.cpp; sourceTree = ""; }; + 9389DAF8B91030B7AAB029FF /* PerLine.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PerLine.cxx; path = ../../src/stc/scintilla/src/PerLine.cxx; sourceTree = ""; }; + 93B77251C0E0382D9A8E113D /* xh_grid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_grid.cpp; path = ../../src/xrc/xh_grid.cpp; sourceTree = ""; }; + 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynload.cpp; path = ../../src/common/dynload.cpp; sourceTree = ""; }; + 93D07403FCA530D7A9FD2917 /* jfdctflt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jfdctflt.c; path = ../../src/jpeg/jfdctflt.c; sourceTree = ""; }; + 950D51915EF83B57B5E8306F /* xh_spin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_spin.cpp; path = ../../src/xrc/xh_spin.cpp; sourceTree = ""; }; + 95186FEF3DEF39D8B1157BD5 /* stattext.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = stattext.mm; path = ../../src/osx/iphone/stattext.mm; sourceTree = ""; }; + 95A156A823B536DE8476E4F9 /* appbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appbase.cpp; path = ../../src/common/appbase.cpp; sourceTree = ""; }; + 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datavcmn.cpp; path = ../../src/common/datavcmn.cpp; sourceTree = ""; }; + 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = ../../src/osx/core/utilsexc_cf.cpp; sourceTree = ""; }; + 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxcmn.cpp; path = ../../src/common/lboxcmn.cpp; sourceTree = ""; }; + 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WindowAccessor.cxx; path = ../../src/stc/scintilla/src/WindowAccessor.cxx; sourceTree = ""; }; + 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgridpagestate.cpp; path = ../../src/propgrid/propgridpagestate.cpp; sourceTree = ""; }; + 96CED508FA3C3B6B9265099E /* rendcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rendcmn.cpp; path = ../../src/common/rendcmn.cpp; sourceTree = ""; }; + 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StyleContext.cxx; path = ../../src/stc/scintilla/src/StyleContext.cxx; sourceTree = ""; }; + 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = ""; }; + 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinctrl_osx.cpp; path = ../../src/osx/spinctrl_osx.cpp; sourceTree = ""; }; + 97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = ""; }; + 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = ""; }; + 98A7F0605AAC3D28A8C9F253 /* gauge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = gauge.mm; path = ../../src/osx/iphone/gauge.mm; sourceTree = ""; }; + 9988CBB0772A3539970162FA /* arttango.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arttango.cpp; path = ../../src/common/arttango.cpp; sourceTree = ""; }; + 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checkbox_osx.cpp; path = ../../src/osx/checkbox_osx.cpp; sourceTree = ""; }; + 998D611109EC33A9A6A11C5A /* gdicmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gdicmn.cpp; path = ../../src/common/gdicmn.cpp; sourceTree = ""; }; + 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = powercmn.cpp; path = ../../src/common/powercmn.cpp; sourceTree = ""; }; + 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_gauge.cpp; path = ../../src/xrc/xh_gauge.cpp; sourceTree = ""; }; + 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_mdi.cpp; path = ../../src/xrc/xh_mdi.cpp; sourceTree = ""; }; + 9B862D1027C4367BBF44420F /* slider.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = slider.mm; path = ../../src/osx/iphone/slider.mm; sourceTree = ""; }; + 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaBase.cxx; path = ../../src/stc/scintilla/src/ScintillaBase.cxx; sourceTree = ""; }; + 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelg.cpp; path = ../../src/generic/panelg.cpp; sourceTree = ""; }; + 9C87B071E3593A889704F512 /* statbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbar.cpp; path = ../../src/common/statbar.cpp; sourceTree = ""; }; + 9CAA325362C73AC8BE20FAA7 /* pngpread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../../src/png/pngpread.c; sourceTree = ""; }; + 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../src/stc/scintilla/src/LexYAML.cxx; sourceTree = ""; }; + 9CE73979D0933A43830307E4 /* tif_packbits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_packbits.c; path = ../../src/tiff/libtiff/tif_packbits.c; sourceTree = ""; }; + 9D1F14339D1C331087650931 /* colour.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colour.cpp; path = ../../src/osx/core/colour.cpp; sourceTree = ""; }; + 9DB43FAB1E563B02ACEFF647 /* module.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cpp; path = ../../src/common/module.cpp; sourceTree = ""; }; + 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdlg_osx.cpp; path = ../../src/osx/printdlg_osx.cpp; sourceTree = ""; }; + 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = infobar.cpp; path = ../../src/generic/infobar.cpp; sourceTree = ""; }; + 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toplevel_osx.cpp; path = ../../src/osx/toplevel_osx.cpp; sourceTree = ""; }; + 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTACL.cxx; path = ../../src/stc/scintilla/src/LexTACL.cxx; sourceTree = ""; }; + 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tipwin.cpp; path = ../../src/generic/tipwin.cpp; sourceTree = ""; }; + 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloopunix.cpp; path = ../../src/unix/evtloopunix.cpp; sourceTree = ""; }; + 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCPP.cxx; path = ../../src/stc/scintilla/src/LexCPP.cxx; sourceTree = ""; }; + 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbox_osx.cpp; path = ../../src/osx/statbox_osx.cpp; sourceTree = ""; }; + 9FDDE855D9F83E4891362EB4 /* bar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bar.cpp; path = ../../src/ribbon/bar.cpp; sourceTree = ""; }; + 9FEB8204E530329FA085E5B8 /* strconv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strconv.cpp; path = ../../src/common/strconv.cpp; sourceTree = ""; }; + A06AB1974DB93EE2999EC75C /* pngrio.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrio.c; path = ../../src/png/pngrio.c; sourceTree = ""; }; + A0DCC5EF59143640BE13AD73 /* jidctfst.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctfst.c; path = ../../src/jpeg/jidctfst.c; sourceTree = ""; }; + A1276C0E5D48337489DEE8DF /* LexErlang.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexErlang.cxx; path = ../../src/stc/scintilla/src/LexErlang.cxx; sourceTree = ""; }; + A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap.cpp; path = ../../src/osx/core/bitmap.cpp; sourceTree = ""; }; + A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = msgdlgg.cpp; path = ../../src/generic/msgdlgg.cpp; sourceTree = ""; }; + A1E1A01885B036C28EBDAE27 /* xmladv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmladv.cpp; path = ../../src/xrc/xmladv.cpp; sourceTree = ""; }; + A284E855892F3A9E9E19E854 /* LexTADS3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTADS3.cxx; path = ../../src/stc/scintilla/src/LexTADS3.cxx; sourceTree = ""; }; + A298576700C33F018616E7BD /* auibook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = auibook.cpp; path = ../../src/aui/auibook.cpp; sourceTree = ""; }; + A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dpycmn.cpp; path = ../../src/common/dpycmn.cpp; sourceTree = ""; }; + A3BF8C9FF2D5314591329D0D /* toolbar.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = toolbar.mm; path = ../../src/osx/iphone/toolbar.mm; sourceTree = ""; }; + A436B55DC44E3827A757A6D8 /* accelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = accelcmn.cpp; path = ../../src/common/accelcmn.cpp; sourceTree = ""; }; + A46D50BEBF523B3F88831086 /* LexAsn1.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsn1.cxx; path = ../../src/stc/scintilla/src/LexAsn1.cxx; sourceTree = ""; }; + A4A745D1821A32D591D76650 /* imagiff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagiff.cpp; path = ../../src/common/imagiff.cpp; sourceTree = ""; }; + A54B80C17F823CB5900AD2E8 /* framecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = framecmn.cpp; path = ../../src/common/framecmn.cpp; sourceTree = ""; }; + A5617D10CB7136EC9A4194EF /* display.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = display.cpp; path = ../../src/osx/core/display.cpp; sourceTree = ""; }; + A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headerctrlcmn.cpp; path = ../../src/common/headerctrlcmn.cpp; sourceTree = ""; }; + A57CF60203F53459A03951A9 /* arrstr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arrstr.cpp; path = ../../src/common/arrstr.cpp; sourceTree = ""; }; + A5BBC1E494D33D028CA547FF /* jddctmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jddctmgr.c; path = ../../src/jpeg/jddctmgr.c; sourceTree = ""; }; + A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = selectdispatcher.cpp; path = ../../src/common/selectdispatcher.cpp; sourceTree = ""; }; + A5EE0B8985443BDCB36F781F /* m_layout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_layout.cpp; path = ../../src/html/m_layout.cpp; sourceTree = ""; }; + A65399C8A6D636139E362119 /* LexAsm.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsm.cxx; path = ../../src/stc/scintilla/src/LexAsm.cxx; sourceTree = ""; }; + A6636144CDE83E8E85270FAF /* hashmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hashmap.cpp; path = ../../src/common/hashmap.cpp; sourceTree = ""; }; + A70C82ADB45A3FB99C420D03 /* regerror.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regerror.c; path = ../../src/regex/regerror.c; sourceTree = ""; }; + A82C367B86F83981803D55DB /* LexASY.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexASY.cxx; path = ../../src/stc/scintilla/src/LexASY.cxx; sourceTree = ""; }; + A87662D69F0432FC96701280 /* xh_notbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_notbk.cpp; path = ../../src/xrc/xh_notbk.cpp; sourceTree = ""; }; + A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiactioncmn.cpp; path = ../../src/common/uiactioncmn.cpp; sourceTree = ""; }; + A881F49ADCF33C299B041584 /* floatpane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = floatpane.cpp; path = ../../src/aui/floatpane.cpp; sourceTree = ""; }; + A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animatecmn.cpp; path = ../../src/common/animatecmn.cpp; sourceTree = ""; }; + A92B6033D8233DB1821F193B /* xmlparse.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = xmlparse.c; path = ../../src/expat/lib/xmlparse.c; sourceTree = ""; }; + A9B2316B32653DA0939A372D /* sound_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound_osx.cpp; path = ../../src/osx/sound_osx.cpp; sourceTree = ""; }; + A9C7F740A55E39FD890B3C7F /* editors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = editors.cpp; path = ../../src/propgrid/editors.cpp; sourceTree = ""; }; + A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontpickercmn.cpp; path = ../../src/common/fontpickercmn.cpp; sourceTree = ""; }; + A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbarcmn.cpp; path = ../../src/common/scrolbarcmn.cpp; sourceTree = ""; }; + AA6C6739C3BD3EFA9CF71102 /* jcinit.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcinit.c; path = ../../src/jpeg/jcinit.c; sourceTree = ""; }; + AA90128E29A03CCCA30F4D35 /* vlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vlbox.cpp; path = ../../src/generic/vlbox.cpp; sourceTree = ""; }; + AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_filter.cpp; path = ../../src/common/fs_filter.cpp; sourceTree = ""; }; + AAC12B4456E13F57BEA25A5E /* tif_swab.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_swab.c; path = ../../src/tiff/libtiff/tif_swab.c; sourceTree = ""; }; + AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_clrpicker.cpp; path = ../../src/xrc/xh_clrpicker.cpp; sourceTree = ""; }; + AB466912FDA23F8B87A00A3C /* threadpsx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = threadpsx.cpp; path = ../../src/unix/threadpsx.cpp; sourceTree = ""; }; + AB634FD597793A74B3B3AA7F /* docview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docview.cpp; path = ../../src/common/docview.cpp; sourceTree = ""; }; + AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clrpickercmn.cpp; path = ../../src/common/clrpickercmn.cpp; sourceTree = ""; }; + ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = settcmn.cpp; path = ../../src/common/settcmn.cpp; sourceTree = ""; }; + AC12D557950A3B0D89D9F2F3 /* fileback.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fileback.cpp; path = ../../src/common/fileback.cpp; sourceTree = ""; }; + AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wincmn.cpp; path = ../../src/common/wincmn.cpp; sourceTree = ""; }; + AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiaction_osx.cpp; path = ../../src/osx/uiaction_osx.cpp; sourceTree = ""; }; + AC8BB1AABB3D393EBA527060 /* intl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intl.cpp; path = ../../src/common/intl.cpp; sourceTree = ""; }; + ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynarray.cpp; path = ../../src/common/dynarray.cpp; sourceTree = ""; }; + ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ffile.cpp; path = ../../src/common/ffile.cpp; sourceTree = ""; }; + AE856D950B8C369EB0FE13BA /* datectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectlg.cpp; path = ../../src/generic/datectlg.cpp; sourceTree = ""; }; + AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = nonownedwnd.mm; path = ../../src/osx/iphone/nonownedwnd.mm; sourceTree = ""; }; + AF26BAB1F4733114926F1724 /* png.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../../src/png/png.c; sourceTree = ""; }; + AF3DF03795153E039B8F1F87 /* LineMarker.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LineMarker.cxx; path = ../../src/stc/scintilla/src/LineMarker.cxx; sourceTree = ""; }; + AF76670146413EEFA005206A /* printps.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printps.cpp; path = ../../src/generic/printps.cpp; sourceTree = ""; }; + AF7CE00168AB33C994374ABA /* tif_extension.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_extension.c; path = ../../src/tiff/libtiff/tif_extension.c; sourceTree = ""; }; + AF9EE701DD653E2299293E5F /* pngwio.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngwio.c; path = ../../src/png/pngwio.c; sourceTree = ""; }; + AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagtiff.cpp; path = ../../src/common/imagtiff.cpp; sourceTree = ""; }; + B0665A40F3FC3F218074C63C /* artmac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = artmac.cpp; path = ../../src/osx/artmac.cpp; sourceTree = ""; }; + B14D6E7E15FD3C869E341198 /* LexLout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLout.cxx; path = ../../src/stc/scintilla/src/LexLout.cxx; sourceTree = ""; }; + B17772732159304AA7312D72 /* dcclient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcclient.cpp; path = ../../src/osx/carbon/dcclient.cpp; sourceTree = ""; }; + B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_toolbk.cpp; path = ../../src/xrc/xh_toolbk.cpp; sourceTree = ""; }; + B180290089B139F18B0C7BBA /* stockitem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stockitem.cpp; path = ../../src/common/stockitem.cpp; sourceTree = ""; }; + B181F564935730E89AB00D92 /* LexForth.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexForth.cxx; path = ../../src/stc/scintilla/src/LexForth.cxx; sourceTree = ""; }; + B1F3C70512D93501B0478F3E /* m_fonts.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_fonts.cpp; path = ../../src/html/m_fonts.cpp; sourceTree = ""; }; + B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmainct.c; path = ../../src/jpeg/jdmainct.c; sourceTree = ""; }; + B303230368143F37B2409DE6 /* LexKix.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexKix.cxx; path = ../../src/stc/scintilla/src/LexKix.cxx; sourceTree = ""; }; + B35DA585CFDD32468868E892 /* process.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = process.cpp; path = ../../src/common/process.cpp; sourceTree = ""; }; + B3645350F572364BABF50238 /* containr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = containr.cpp; path = ../../src/common/containr.cpp; sourceTree = ""; }; + B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCOBOL.cxx; path = ../../src/stc/scintilla/src/LexCOBOL.cxx; sourceTree = ""; }; + B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_sttxt.cpp; path = ../../src/xrc/xh_sttxt.cpp; sourceTree = ""; }; + B4028ABB08C63AB59F5F240B /* m_list.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_list.cpp; path = ../../src/html/m_list.cpp; sourceTree = ""; }; + B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appunix.cpp; path = ../../src/unix/appunix.cpp; sourceTree = ""; }; + B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listb.cpp; path = ../../src/xrc/xh_listb.cpp; sourceTree = ""; }; + B4DEA098A05736AE94F01926 /* libwx_osx_iphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_iphone.a; sourceTree = BUILT_PRODUCTS_DIR; }; + B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_hyperlink.cpp; path = ../../src/xrc/xh_hyperlink.cpp; sourceTree = ""; }; + B540E18F9C91381CA175BABB /* art_msw.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_msw.cpp; path = ../../src/ribbon/art_msw.cpp; sourceTree = ""; }; + B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headercolcmn.cpp; path = ../../src/common/headercolcmn.cpp; sourceTree = ""; }; + B568A7364ECA30288820CCE7 /* mdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mdi.cpp; path = ../../src/osx/carbon/mdi.cpp; sourceTree = ""; }; + B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tipdlg.cpp; path = ../../src/generic/tipdlg.cpp; sourceTree = ""; }; + B580FD04D0D83601826FD5EE /* filepickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filepickerg.cpp; path = ../../src/generic/filepickerg.cpp; sourceTree = ""; }; + B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wrapsizer.cpp; path = ../../src/common/wrapsizer.cpp; sourceTree = ""; }; + B63EBEE1A04537E7887E9FD0 /* ustring.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ustring.cpp; path = ../../src/common/ustring.cpp; sourceTree = ""; }; + B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexBasic.cxx; path = ../../src/stc/scintilla/src/LexBasic.cxx; sourceTree = ""; }; + B7581D7140293BAE88E43DBE /* fs_inet.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_inet.cpp; path = ../../src/common/fs_inet.cpp; sourceTree = ""; }; + B83EDE2D1731311ABDE62F9F /* tif_strip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_strip.c; path = ../../src/tiff/libtiff/tif_strip.c; sourceTree = ""; }; + B890199A37723EFD86C0ADA5 /* quantize.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = quantize.cpp; path = ../../src/common/quantize.cpp; sourceTree = ""; }; + B901252876603DCEA4C66D89 /* nbkbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nbkbase.cpp; path = ../../src/common/nbkbase.cpp; sourceTree = ""; }; + B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_treebk.cpp; path = ../../src/xrc/xh_treebk.cpp; sourceTree = ""; }; + B98B72B3A0A73044B85AED60 /* propgrid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgrid.cpp; path = ../../src/propgrid/propgrid.cpp; sourceTree = ""; }; + B99CA41708513A599AE275A2 /* listbox_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listbox_osx.cpp; path = ../../src/osx/listbox_osx.cpp; sourceTree = ""; }; + B9B5BC858CCF3477895D2786 /* zstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = zstream.cpp; path = ../../src/common/zstream.cpp; sourceTree = ""; }; + B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../src/stc/scintilla/src/LexD.cxx; sourceTree = ""; }; + B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirwrite.c; path = ../../src/tiff/libtiff/tif_dirwrite.c; sourceTree = ""; }; + BACAA6CE4A0934459F26B27C /* graphicc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicc.cpp; path = ../../src/generic/graphicc.cpp; sourceTree = ""; }; + BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filename.cpp; path = ../../src/common/filename.cpp; sourceTree = ""; }; + BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextsymboldlg.cpp; path = ../../src/richtext/richtextsymboldlg.cpp; sourceTree = ""; }; + BB7661E9E09A397790ED9545 /* sockunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sockunix.cpp; path = ../../src/unix/sockunix.cpp; sourceTree = ""; }; + BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_chckb.cpp; path = ../../src/xrc/xh_chckb.cpp; sourceTree = ""; }; + BBB30516233A39BE809405AA /* helpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpbase.cpp; path = ../../src/common/helpbase.cpp; sourceTree = ""; }; + BC12B97F233B3B9494DA217F /* imagpnm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagpnm.cpp; path = ../../src/common/imagpnm.cpp; sourceTree = ""; }; + BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexNimrod.cxx; path = ../../src/stc/scintilla/src/LexNimrod.cxx; sourceTree = ""; }; + BCD873D873A53BBF955D8A4E /* PositionCache.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PositionCache.cxx; path = ../../src/stc/scintilla/src/PositionCache.cxx; sourceTree = ""; }; + BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_dirpicker.cpp; path = ../../src/xrc/xh_dirpicker.cpp; sourceTree = ""; }; + BD709DEB71623974B9836D69 /* dockart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dockart.cpp; path = ../../src/aui/dockart.cpp; sourceTree = ""; }; + BD88495AF72531A28D2201D0 /* tif_tile.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_tile.c; path = ../../src/tiff/libtiff/tif_tile.c; sourceTree = ""; }; + BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dialog_osx.cpp; path = ../../src/osx/dialog_osx.cpp; sourceTree = ""; }; + BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = toolbar.cpp; path = ../../src/ribbon/toolbar.cpp; sourceTree = ""; }; + BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = progdlgg.cpp; path = ../../src/generic/progdlgg.cpp; sourceTree = ""; }; + BEB08798C70E33DDB360E563 /* layout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = layout.cpp; path = ../../src/common/layout.cpp; sourceTree = ""; }; + BEF6B3FB66243812969E5BD1 /* palette.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = palette.cpp; path = ../../src/osx/palette.cpp; sourceTree = ""; }; + BF1C44D726E63B18A98006EC /* Decoration.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Decoration.cxx; path = ../../src/stc/scintilla/src/Decoration.cxx; sourceTree = ""; }; + BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filepickercmn.cpp; path = ../../src/common/filepickercmn.cpp; sourceTree = ""; }; + BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVE.cxx; path = ../../src/stc/scintilla/src/LexAVE.cxx; sourceTree = ""; }; + BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_fax3sm.c; path = ../../src/tiff/libtiff/tif_fax3sm.c; sourceTree = ""; }; + C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabmdi.cpp; path = ../../src/aui/tabmdi.cpp; sourceTree = ""; }; + C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fswatcher_kqueue.cpp; path = ../../src/unix/fswatcher_kqueue.cpp; sourceTree = ""; }; + C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdata.cpp; path = ../../src/common/fontdata.cpp; sourceTree = ""; }; + C06FED83BF933DF98C2466AE /* button.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = button.mm; path = ../../src/osx/iphone/button.mm; sourceTree = ""; }; + C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCL.cxx; path = ../../src/stc/scintilla/src/LexTCL.cxx; sourceTree = ""; }; + C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tarstrm.cpp; path = ../../src/common/tarstrm.cpp; sourceTree = ""; }; + C125FA3837C631A9BE0ED5E7 /* splitter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = splitter.cpp; path = ../../src/generic/splitter.cpp; sourceTree = ""; }; + C133B838193A35ABBB803151 /* ViewStyle.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ViewStyle.cxx; path = ../../src/stc/scintilla/src/ViewStyle.cxx; sourceTree = ""; }; + C20E46A504113C899B9DD9B7 /* props.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = props.cpp; path = ../../src/propgrid/props.cpp; sourceTree = ""; }; + C25521AF59B9324EB2809C73 /* XPM.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XPM.cxx; path = ../../src/stc/scintilla/src/XPM.cxx; sourceTree = ""; }; + C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = encconv.cpp; path = ../../src/common/encconv.cpp; sourceTree = ""; }; + C28429A964C337A192D76CC8 /* Style.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Style.cxx; path = ../../src/stc/scintilla/src/Style.cxx; sourceTree = ""; }; + C2BB2949CC0B387AB6879539 /* metafile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = metafile.cpp; path = ../../src/osx/carbon/metafile.cpp; sourceTree = ""; }; + C3019BA65DD73F30A865365F /* frame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = frame.cpp; path = ../../src/osx/carbon/frame.cpp; sourceTree = ""; }; + C356B5738AB13E829E66729E /* LexOthers.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexOthers.cxx; path = ../../src/stc/scintilla/src/LexOthers.cxx; sourceTree = ""; }; + C3784C240C2F330683494926 /* laywin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = laywin.cpp; path = ../../src/generic/laywin.cpp; sourceTree = ""; }; + C37866F41B0C31E295AA7FA6 /* wfstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wfstream.cpp; path = ../../src/common/wfstream.cpp; sourceTree = ""; }; + C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngmem.c; path = ../../src/png/pngmem.c; sourceTree = ""; }; + C466F32CCBD13DBC87285B3D /* helpdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpdata.cpp; path = ../../src/html/helpdata.cpp; sourceTree = ""; }; + C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextprint.cpp; path = ../../src/richtext/richtextprint.cpp; sourceTree = ""; }; + C513377E9E303F778BA9D7ED /* arcfind.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arcfind.cpp; path = ../../src/common/arcfind.cpp; sourceTree = ""; }; + C562D5885AFF3E15837325CE /* xpmdecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xpmdecod.cpp; path = ../../src/common/xpmdecod.cpp; sourceTree = ""; }; + C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anybutton_osx.cpp; path = ../../src/osx/anybutton_osx.cpp; sourceTree = ""; }; + C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AutoComplete.cxx; path = ../../src/stc/scintilla/src/AutoComplete.cxx; sourceTree = ""; }; + C63C964DAFAD311694367C94 /* xh_datectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_datectrl.cpp; path = ../../src/xrc/xh_datectrl.cpp; sourceTree = ""; }; + C64705CE9398316D87BAB4DC /* logg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = logg.cpp; path = ../../src/generic/logg.cpp; sourceTree = ""; }; + C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinbtncmn.cpp; path = ../../src/common/spinbtncmn.cpp; sourceTree = ""; }; + C69E48C06BD23C178F650E42 /* richtextxml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextxml.cpp; path = ../../src/richtext/richtextxml.cpp; sourceTree = ""; }; + C6EB77ED688E3EE294167EF1 /* tif_print.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_print.c; path = ../../src/tiff/libtiff/tif_print.c; sourceTree = ""; }; + C76222F466E831F896A89269 /* LexAU3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAU3.cxx; path = ../../src/stc/scintilla/src/LexAU3.cxx; sourceTree = ""; }; + C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mediactrlcmn.cpp; path = ../../src/common/mediactrlcmn.cpp; sourceTree = ""; }; + C83C97A1FCC5345896C9D7DE /* tif_warning.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_warning.c; path = ../../src/tiff/libtiff/tif_warning.c; sourceTree = ""; }; + C94DC3402FAE3C4FA776DEEA /* window.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = window.mm; path = ../../src/osx/iphone/window.mm; sourceTree = ""; }; + C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextformatdlg.cpp; path = ../../src/richtext/richtextformatdlg.cpp; sourceTree = ""; }; + C9A305CEC03B3085B159B617 /* fs_mem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_mem.cpp; path = ../../src/common/fs_mem.cpp; sourceTree = ""; }; + CA0D5D47D62A3148BA51B31B /* tif_compress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_compress.c; path = ../../src/tiff/libtiff/tif_compress.c; sourceTree = ""; }; + CA2D9F325F833C408657E7B7 /* dlunix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dlunix.cpp; path = ../../src/unix/dlunix.cpp; sourceTree = ""; }; + CA72410F615B3A78A6340532 /* dnd_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dnd_osx.cpp; path = ../../src/osx/dnd_osx.cpp; sourceTree = ""; }; + CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlinkg.cpp; path = ../../src/generic/hyperlinkg.cpp; sourceTree = ""; }; + CBD7B44E33373BCCB60FC11F /* combog.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combog.cpp; path = ../../src/generic/combog.cpp; sourceTree = ""; }; + CC2713393AB132AA8E337AE1 /* LexPython.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPython.cxx; path = ../../src/stc/scintilla/src/LexPython.cxx; sourceTree = ""; }; + CC2E24773D853A77B9FEFA4C /* scrolbar.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = scrolbar.mm; path = ../../src/osx/iphone/scrolbar.mm; sourceTree = ""; }; + CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_choicbk.cpp; path = ../../src/xrc/xh_choicbk.cpp; sourceTree = ""; }; + CCF7564A2B733F759AA8496B /* jdinput.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdinput.c; path = ../../src/jpeg/jdinput.c; sourceTree = ""; }; + CD72950967F33809931D4968 /* LexAbaqus.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAbaqus.cxx; path = ../../src/stc/scintilla/src/LexAbaqus.cxx; sourceTree = ""; }; + CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_tglbtn.cpp; path = ../../src/xrc/xh_tglbtn.cpp; sourceTree = ""; }; + CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imaggif.cpp; path = ../../src/common/imaggif.cpp; sourceTree = ""; }; + CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = choicdgg.cpp; path = ../../src/generic/choicdgg.cpp; sourceTree = ""; }; + CF4F4F5211933057824B5621 /* button_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button_osx.cpp; path = ../../src/osx/button_osx.cpp; sourceTree = ""; }; + CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem_osx.cpp; path = ../../src/osx/menuitem_osx.cpp; sourceTree = ""; }; + D037EA567C253DEEA17E822B /* mousemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mousemanager.cpp; path = ../../src/common/mousemanager.cpp; sourceTree = ""; }; + D0817D6A1AF83608B050EBC3 /* fontmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontmap.cpp; path = ../../src/common/fontmap.cpp; sourceTree = ""; }; + D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cmdlinkbn.cpp; path = ../../src/xrc/xh_cmdlinkbn.cpp; sourceTree = ""; }; + D0B9C41A4D12345AAA764CAD /* stc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stc.cpp; path = ../../src/stc/stc.cpp; sourceTree = ""; }; + D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPerl.cxx; path = ../../src/stc/scintilla/src/LexPerl.cxx; sourceTree = ""; }; + D0CDADAF2D893E32A38351E4 /* tif_aux.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_aux.c; path = ../../src/tiff/libtiff/tif_aux.c; sourceTree = ""; }; + D1EE17722EA937E88A7F0C01 /* dcbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcbase.cpp; path = ../../src/common/dcbase.cpp; sourceTree = ""; }; + D215A0D67563350CB4EECB06 /* slider_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slider_osx.cpp; path = ../../src/osx/slider_osx.cpp; sourceTree = ""; }; + D272910EC35531E5B4D6E05B /* dynlib.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynlib.cpp; path = ../../src/common/dynlib.cpp; sourceTree = ""; }; + D30617843F33310089C1F77A /* richtextstyles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextstyles.cpp; path = ../../src/richtext/richtextstyles.cpp; sourceTree = ""; }; + D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_menu.cpp; path = ../../src/xrc/xh_menu.cpp; sourceTree = ""; }; + D3F32C01D122301AB00D06A5 /* tbarbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbarbase.cpp; path = ../../src/common/tbarbase.cpp; sourceTree = ""; }; + D46A36564C78312CAC538E93 /* srchctlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchctlg.cpp; path = ../../src/generic/srchctlg.cpp; sourceTree = ""; }; + D4A23A8BC7373D4BBD72851D /* apptraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apptraits.cpp; path = ../../src/unix/apptraits.cpp; sourceTree = ""; }; + D4E1DC1869C6327C80D2F5F4 /* uri.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = ../../src/common/uri.cpp; sourceTree = ""; }; + D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markuptext.cpp; path = ../../src/generic/markuptext.cpp; sourceTree = ""; }; + D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; + D5F9383D1CE931499F339D85 /* strconv_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strconv_cf.cpp; path = ../../src/osx/core/strconv_cf.cpp; sourceTree = ""; }; + D73954EB5397301F87881646 /* statboxcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statboxcmn.cpp; path = ../../src/common/statboxcmn.cpp; sourceTree = ""; }; + D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexVerilog.cxx; path = ../../src/stc/scintilla/src/LexVerilog.cxx; sourceTree = ""; }; + D784A32C094730FEAA391A9B /* sckstrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckstrm.cpp; path = ../../src/common/sckstrm.cpp; sourceTree = ""; }; + D7B3307E56B332769901E99F /* filehistorycmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filehistorycmn.cpp; path = ../../src/common/filehistorycmn.cpp; sourceTree = ""; }; + D87406BCF3E833369E12D89A /* LexHTML.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexHTML.cxx; path = ../../src/stc/scintilla/src/LexHTML.cxx; sourceTree = ""; }; + D9016355F66D3125919E017D /* listctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrl.cpp; path = ../../src/generic/listctrl.cpp; sourceTree = ""; }; + D922063B2F2536629EEEAAF0 /* popupcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = popupcmn.cpp; path = ../../src/common/popupcmn.cpp; sourceTree = ""; }; + DA2119A7C67D37B290C17989 /* statbmpg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbmpg.cpp; path = ../../src/generic/statbmpg.cpp; sourceTree = ""; }; + DA5E95D498C53A808A8E2EEB /* Editor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Editor.cxx; path = ../../src/stc/scintilla/src/Editor.cxx; sourceTree = ""; }; + DA7F7633279936EFA0B9C5CF /* markupparser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = markupparser.cpp; path = ../../src/common/markupparser.cpp; sourceTree = ""; }; + DAAED71A534135A9A61612A6 /* colordlgosx.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = colordlgosx.mm; path = ../../src/osx/carbon/colordlgosx.mm; sourceTree = ""; }; + DB170BF78EFE39D692E11985 /* fontdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontdlgg.cpp; path = ../../src/generic/fontdlgg.cpp; sourceTree = ""; }; + DB82939EDC593F9CA95C3098 /* init.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = init.cpp; path = ../../src/common/init.cpp; sourceTree = ""; }; + DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = unichar.cpp; path = ../../src/common/unichar.cpp; sourceTree = ""; }; + DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = iconbndl.cpp; path = ../../src/common/iconbndl.cpp; sourceTree = ""; }; + DC0FFDC7A6163F2DA73B84EB /* jchuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jchuff.c; path = ../../src/jpeg/jchuff.c; sourceTree = ""; }; + DC3D1E222FD93A69B1D1366E /* mstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mstream.cpp; path = ../../src/common/mstream.cpp; sourceTree = ""; }; + DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilsunx.cpp; path = ../../src/unix/utilsunx.cpp; sourceTree = ""; }; + DC9153A350893820B942D37E /* LexMatlab.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMatlab.cxx; path = ../../src/stc/scintilla/src/LexMatlab.cxx; sourceTree = ""; }; + DD09A813E10A31C19554B425 /* affinematrix2d.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = affinematrix2d.cpp; path = ../../src/common/affinematrix2d.cpp; sourceTree = ""; }; + DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_aui.cpp; path = ../../src/ribbon/art_aui.cpp; sourceTree = ""; }; + DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = socketiohandler.cpp; path = ../../src/common/socketiohandler.cpp; sourceTree = ""; }; + DE16011AD6323AAC8616F973 /* stdstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdstream.cpp; path = ../../src/common/stdstream.cpp; sourceTree = ""; }; + DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statline_osx.cpp; path = ../../src/osx/statline_osx.cpp; sourceTree = ""; }; + DE8238DA30FF3FB984511250 /* sckaddr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckaddr.cpp; path = ../../src/common/sckaddr.cpp; sourceTree = ""; }; + DE8701E1CF2B352B945C17E5 /* valtext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valtext.cpp; path = ../../src/common/valtext.cpp; sourceTree = ""; }; + DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcsvg.cpp; path = ../../src/common/dcsvg.cpp; sourceTree = ""; }; + DECAF5DD80383A2CA76EB383 /* jdatasrc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdatasrc.c; path = ../../src/jpeg/jdatasrc.c; sourceTree = ""; }; + DF376BC55EA73F5FB7328142 /* helpext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = helpext.cpp; path = ../../src/generic/helpext.cpp; sourceTree = ""; }; + DFDC805DD3063C389F93642D /* tif_next.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_next.c; path = ../../src/tiff/libtiff/tif_next.c; sourceTree = ""; }; + E08A51FA8D8A361681B07295 /* glcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcmn.cpp; path = ../../src/common/glcmn.cpp; sourceTree = ""; }; + E0EBCDDF248638B58B01D9CC /* datetime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datetime.cpp; path = ../../src/common/datetime.cpp; sourceTree = ""; }; + E110907DDC13305E88B90086 /* dirctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirctrlcmn.cpp; path = ../../src/common/dirctrlcmn.cpp; sourceTree = ""; }; + E145FC31ED523B4AA5080A61 /* RESearch.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RESearch.cxx; path = ../../src/stc/scintilla/src/RESearch.cxx; sourceTree = ""; }; + E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrlcmn.cpp; path = ../../src/common/listctrlcmn.cpp; sourceTree = ""; }; + E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbrma.cpp; path = ../../src/osx/carbon/statbrma.cpp; sourceTree = ""; }; + E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PropSet.cxx; path = ../../src/stc/scintilla/src/PropSet.cxx; sourceTree = ""; }; + E38569D873B6394F9E5B821C /* jcphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcphuff.c; path = ../../src/jpeg/jcphuff.c; sourceTree = ""; }; + E433B890264339BA8DB97B1D /* regcomp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regcomp.c; path = ../../src/regex/regcomp.c; sourceTree = ""; }; + E4E16323A43E36DC8024EDF1 /* textctrl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = textctrl.mm; path = ../../src/osx/iphone/textctrl.mm; sourceTree = ""; }; + E5357E76650035639844D15B /* stringimpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringimpl.cpp; path = ../../src/common/stringimpl.cpp; sourceTree = ""; }; + E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_frame.cpp; path = ../../src/xrc/xh_frame.cpp; sourceTree = ""; }; + E6AB648BC5173104A96CAE66 /* xml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xml.cpp; path = ../../src/xml/xml.cpp; sourceTree = ""; }; + E6CC2B05353C3284B37B2DD7 /* settings.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = settings.cpp; path = ../../src/osx/carbon/settings.cpp; sourceTree = ""; }; + E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = KeyMap.cxx; path = ../../src/stc/scintilla/src/KeyMap.cxx; sourceTree = ""; }; + E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMarkdown.cxx; path = ../../src/stc/scintilla/src/LexMarkdown.cxx; sourceTree = ""; }; + E79B2D1F630036129B9677A7 /* tif_dir.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dir.c; path = ../../src/tiff/libtiff/tif_dir.c; sourceTree = ""; }; + E8072CA67D19346ABF4D465F /* slidercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slidercmn.cpp; path = ../../src/common/slidercmn.cpp; sourceTree = ""; }; + E85E680C62B63D4EBAB2E784 /* jdphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdphuff.c; path = ../../src/jpeg/jdphuff.c; sourceTree = ""; }; + E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CellBuffer.cxx; path = ../../src/stc/scintilla/src/CellBuffer.cxx; sourceTree = ""; }; + E89AC104BF4F33A083F8B382 /* jccoefct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccoefct.c; path = ../../src/jpeg/jccoefct.c; sourceTree = ""; }; + E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = commandlinkbuttong.cpp; path = ../../src/generic/commandlinkbuttong.cpp; sourceTree = ""; }; + E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpbase.cpp; path = ../../src/common/bmpbase.cpp; sourceTree = ""; }; + E968913A9A593B258BD8EACB /* msgout.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = msgout.cpp; path = ../../src/common/msgout.cpp; sourceTree = ""; }; + E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_scwin.cpp; path = ../../src/xrc/xh_scwin.cpp; sourceTree = ""; }; + E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richmsgdlgg.cpp; path = ../../src/generic/richmsgdlgg.cpp; sourceTree = ""; }; + E9B992CB6C28339FB0CA5E27 /* tif_write.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_write.c; path = ../../src/tiff/libtiff/tif_write.c; sourceTree = ""; }; + E9B9B85572D0312BBF2878DB /* windowid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = windowid.cpp; path = ../../src/common/windowid.cpp; sourceTree = ""; }; + E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dirdlgg.cpp; path = ../../src/generic/dirdlgg.cpp; sourceTree = ""; }; + EA2520F427493A22A70A5C09 /* stackwalk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stackwalk.cpp; path = ../../src/unix/stackwalk.cpp; sourceTree = ""; }; + EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = KeyWords.cxx; path = ../../src/stc/scintilla/src/KeyWords.cxx; sourceTree = ""; }; + EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_chckl.cpp; path = ../../src/xrc/xh_chckl.cpp; sourceTree = ""; }; + EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filtfind.cpp; path = ../../src/common/filtfind.cpp; sourceTree = ""; }; + EA93D41B11683E758D456531 /* log.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = log.cpp; path = ../../src/common/log.cpp; sourceTree = ""; }; + EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_wizrd.cpp; path = ../../src/xrc/xh_wizrd.cpp; sourceTree = ""; }; + EBED392D081335FA80523244 /* manager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = manager.cpp; path = ../../src/propgrid/manager.cpp; sourceTree = ""; }; + EC28591B403B32B7AFCC079D /* gauge_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gauge_osx.cpp; path = ../../src/osx/gauge_osx.cpp; sourceTree = ""; }; + EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dircmn.cpp; path = ../../src/common/dircmn.cpp; sourceTree = ""; }; + ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = m_hline.cpp; path = ../../src/html/m_hline.cpp; sourceTree = ""; }; + ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docmdi.cpp; path = ../../src/common/docmdi.cpp; sourceTree = ""; }; + ED19EF377E653F71B1876259 /* jdmaster.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmaster.c; path = ../../src/jpeg/jdmaster.c; sourceTree = ""; }; + EDB48813110636DBA045BF3A /* LexPS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexPS.cxx; path = ../../src/stc/scintilla/src/LexPS.cxx; sourceTree = ""; }; + EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fddlgcmn.cpp; path = ../../src/common/fddlgcmn.cpp; sourceTree = ""; }; + EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filedlgg.cpp; path = ../../src/generic/filedlgg.cpp; sourceTree = ""; }; + EE959EC7BFDD3A628E856404 /* anidecod.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anidecod.cpp; path = ../../src/common/anidecod.cpp; sourceTree = ""; }; + EEA0945B20913754A54D0FD9 /* dcpsg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcpsg.cpp; path = ../../src/generic/dcpsg.cpp; sourceTree = ""; }; + EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_split.cpp; path = ../../src/xrc/xh_split.cpp; sourceTree = ""; }; + EED7C691150139EFA35E8EBD /* utils_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utils_osx.cpp; path = ../../src/osx/utils_osx.cpp; sourceTree = ""; }; + EEE82083BFA430D5B58F8A04 /* regfree.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regfree.c; path = ../../src/regex/regfree.c; sourceTree = ""; }; + EF330EAACFA53877BE289896 /* matrix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = matrix.cpp; path = ../../src/common/matrix.cpp; sourceTree = ""; }; + F01DDE448E4C3983ACCE67FD /* appcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appcmn.cpp; path = ../../src/common/appcmn.cpp; sourceTree = ""; }; + F0905A1EBD653F6D82395602 /* xh_combo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_combo.cpp; path = ../../src/xrc/xh_combo.cpp; sourceTree = ""; }; + F175D6E8E5723FC797701275 /* menucmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menucmn.cpp; path = ../../src/common/menucmn.cpp; sourceTree = ""; }; + F190B80DD28031A98E5BCA67 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + F1A6F3936A0D31CBB58082BA /* jdcoefct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdcoefct.c; path = ../../src/jpeg/jdcoefct.c; sourceTree = ""; }; + F1E724EA70AB35DDB130F84F /* stringops.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringops.cpp; path = ../../src/common/stringops.cpp; sourceTree = ""; }; + F2024D29170D3B50A4DFDE11 /* base64.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = ../../src/common/base64.cpp; sourceTree = ""; }; + F263022F3FEA3F75895B644D /* filesys.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = filesys.cpp; path = ../../src/common/filesys.cpp; sourceTree = ""; }; + F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexFlagship.cxx; path = ../../src/stc/scintilla/src/LexFlagship.cxx; sourceTree = ""; }; + F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sysopt.cpp; path = ../../src/common/sysopt.cpp; sourceTree = ""; }; + F4020D790AE7363CB29F1C2F /* anybutton.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = anybutton.mm; path = ../../src/osx/iphone/anybutton.mm; sourceTree = ""; }; + F43AF44465B335479752116D /* xh_radbx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_radbx.cpp; path = ../../src/xrc/xh_radbx.cpp; sourceTree = ""; }; + F46EC1508C063C8395CE7A95 /* sstream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sstream.cpp; path = ../../src/common/sstream.cpp; sourceTree = ""; }; + F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_panel.cpp; path = ../../src/xrc/xh_panel.cpp; sourceTree = ""; }; + F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../src/stc/scintilla/src/LexMetapost.cxx; sourceTree = ""; }; + F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/osx/carbon/icon.cpp; sourceTree = ""; }; + F5DAF1F49F0F3F41A427A21E /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/generic/icon.cpp; sourceTree = ""; }; + F6EA240B3DB93D398A990FAD /* tif_dirread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirread.c; path = ../../src/tiff/libtiff/tif_dirread.c; sourceTree = ""; }; + F7332A03D93D3DABB050615D /* dir.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dir.cpp; path = ../../src/unix/dir.cpp; sourceTree = ""; }; + F7440859617F3B47AF4D3817 /* valgen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = valgen.cpp; path = ../../src/common/valgen.cpp; sourceTree = ""; }; + F7E99B35A98D30818120B002 /* string.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = string.cpp; path = ../../src/common/string.cpp; sourceTree = ""; }; + F82278F9AF0432529891E6D7 /* tif_close.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_close.c; path = ../../src/tiff/libtiff/tif_close.c; sourceTree = ""; }; + F83172EE2DAE352FB969D4F2 /* jcapistd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapistd.c; path = ../../src/jpeg/jcapistd.c; sourceTree = ""; }; + F84F0DB790A23D92A193D2B4 /* http.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = http.cpp; path = ../../src/common/http.cpp; sourceTree = ""; }; + F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_collpane.cpp; path = ../../src/xrc/xh_collpane.cpp; sourceTree = ""; }; + F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths.cpp; path = ../../src/unix/stdpaths.cpp; sourceTree = ""; }; + FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcanvas_osx.cpp; path = ../../src/osx/glcanvas_osx.cpp; sourceTree = ""; }; + FA7029BB5751398AA02D8C24 /* imagtga.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagtga.cpp; path = ../../src/common/imagtga.cpp; sourceTree = ""; }; + FADE850169F7347F83FE1499 /* xh_statbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_statbar.cpp; path = ../../src/xrc/xh_statbar.cpp; sourceTree = ""; }; + FB46BC22F6B23909A938C561 /* regex.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regex.cpp; path = ../../src/common/regex.cpp; sourceTree = ""; }; + FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcbufcmn.cpp; path = ../../src/common/dcbufcmn.cpp; sourceTree = ""; }; + FBE1C531185131A89EFF7FAF /* cmdline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cmdline.cpp; path = ../../src/common/cmdline.cpp; sourceTree = ""; }; + FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontpickerg.cpp; path = ../../src/generic/fontpickerg.cpp; sourceTree = ""; }; + FCCFF49F92B4323D9181CEDA /* htmltag.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmltag.cpp; path = ../../src/html/htmltag.cpp; sourceTree = ""; }; + FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTeX.cxx; path = ../../src/stc/scintilla/src/LexTeX.cxx; sourceTree = ""; }; + FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_srchctrl.cpp; path = ../../src/xrc/xh_srchctrl.cpp; sourceTree = ""; }; + FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = ""; }; + FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = ""; }; + FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = ""; }; + FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gridcmn.cpp; path = ../../src/common/gridcmn.cpp; sourceTree = ""; }; + FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtextctrl.cpp; path = ../../src/richtext/richtextctrl.cpp; sourceTree = ""; }; + FE3B47058A723243A285594D /* LexMPT.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../src/stc/scintilla/src/LexMPT.cxx; sourceTree = ""; }; + FE538F33A1423FC2AC9E45F3 /* regiong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regiong.cpp; path = ../../src/generic/regiong.cpp; sourceTree = ""; }; + FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMMIXAL.cxx; path = ../../src/stc/scintilla/src/LexMMIXAL.cxx; sourceTree = ""; }; + FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexGui4Cli.cxx; path = ../../src/stc/scintilla/src/LexGui4Cli.cxx; sourceTree = ""; }; + FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stream.cpp; path = ../../src/common/stream.cpp; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 82F403E7B8653CBD908BC257 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FDDCADE58FA2313986025D77 /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 02A787C8E96336F3B7287626 /* wxiPhone */ = { + isa = PBXGroup; + children = ( + 82F403E7B8653CBD908BC258 /* Frameworks */, + C2FC1A9BBB8C3046994369BF /* Products */, + 477B609FA2373FB58F4C8768 /* wxiphone.xcconfig */, + 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */, + D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */, + 83F62FA47C9636169F1E18E8 /* base */, + 2E7B4F88F81E37B4A9FF6C0F /* core */, + 374BD863E6AD33189B7E4040 /* net */, + 2FF0B5E0505D3AEA9A4ACF11 /* adv */, + 5C5CD199E7573C73AE6F392D /* media */, + 60E51BFF5CD2327483201F14 /* html */, + 60328E6EA3793DA990E18FC1 /* xrc */, + 4D98B791E17232D39944F04F /* xml */, + 816DD323A67F3B299C8F3481 /* opengl */, + 04311EAB76193D5593D43DBB /* aui */, + FE1C78F1707A30878CBB2B4B /* ribbon */, + B8F95052522B37AB86DA8917 /* propgrid */, + 64B126D857113F24BA8C4758 /* richtext */, + E96566B813153B4295AD767B /* stc */, + EB288BE7E74B3328B762A461 /* libtiff */, + 7650A73F7FC9305EA62DAE86 /* libjpeg */, + 6E2C8858F68E3FB0BEFFFCE5 /* libpng */, + B1EF68113C6338CFBBED0FBE /* libregex */, + 2BE6C101F29D318895158F98 /* libscintilla */, + 42F504C4994C38D7A8F062F4 /* libexpat */, + ); + name = wxiPhone; + sourceTree = ""; + }; + 04311EAB76193D5593D43DBB /* aui */ = { + isa = PBXGroup; + children = ( + 98C15055598A3586BDB4FD0F /* src/aui */, + ); + name = aui; + sourceTree = ""; + }; + 1246F69B93FC33FFA06EF788 /* src/osx/carbon */ = { + isa = PBXGroup; + children = ( + DAAED71A534135A9A61612A6 /* colordlgosx.mm */, + 38CEA4A3579331EF808B8363 /* fontdlgosx.mm */, + 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */, + 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */, + 18044326B5B13A98A49732DD /* fontdlg.cpp */, + 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */, + F5DAF1F49F0F3F41A427A21D /* icon.cpp */, + 757B31FCCA1F381C95B30DF8 /* app.cpp */, + 7A3F26F539473705AA82411D /* combobox.cpp */, + 12363D1F50FE301DAEE7F04A /* control.cpp */, + 271B4B77622B3411A7BF6634 /* dataobj.cpp */, + B17772732159304AA7312D72 /* dcclient.cpp */, + 238741BDA2C73E56899CCB04 /* dcprint.cpp */, + 22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */, + 1C4762898E5330C28651EE73 /* graphics.cpp */, + 77F5E7BCD9B2307D8DBCC052 /* font.cpp */, + C3019BA65DD73F30A865365F /* frame.cpp */, + B568A7364ECA30288820CCE7 /* mdi.cpp */, + C2BB2949CC0B387AB6879539 /* metafile.cpp */, + 2128AD8BD12E3F33AD57478E /* overlay.cpp */, + 530DC2E26BF2313E8702AD43 /* popupwin.cpp */, + 425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */, + E6CC2B05353C3284B37B2DD7 /* settings.cpp */, + E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */, + 00DA3D3EEF5E305CA73A1871 /* region.cpp */, + 2AFC4A1CDA473688A590D19F /* utilscocoa.mm */, + ); + name = src/osx/carbon; + sourceTree = ""; + }; + 2ABA71836A2C3590B1615B26 /* src/expat/lib */ = { + isa = PBXGroup; + children = ( + A92B6033D8233DB1821F193B /* xmlparse.c */, + 59C6B9849FF6325E890942EF /* xmlrole.c */, + 8685B8ED68F23DB0B770FD74 /* xmltok.c */, + ); + name = src/expat/lib; + sourceTree = ""; + }; + 2BE6C101F29D318895158F98 /* libscintilla */ = { + isa = PBXGroup; + children = ( + 88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */, + ); + name = libscintilla; + sourceTree = ""; + }; + 2E7B4F88F81E37B4A9FF6C0F /* core */ = { + isa = PBXGroup; + children = ( + F494694AB1FD30DEA2087AFB /* src/osx */, + AC04244D4E183DF480908047 /* src/osx/core */, + CBC07D2BC2363BB4B61D1121 /* src/unix */, + 944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */, + 1246F69B93FC33FFA06EF788 /* src/osx/carbon */, + 84E0164052A73DE5996EA691 /* src/generic */, + D1F5E5C8429235E68E4AC902 /* src/osx/iphone */, + D957B1B354FC327288FDF9D7 /* src/common */, + ); + name = core; + sourceTree = ""; + }; + 2FF0B5E0505D3AEA9A4ACF11 /* adv */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D9 /* src/common */, + 84E0164052A73DE5996EA692 /* src/generic */, + F494694AB1FD30DEA2087AFC /* src/osx */, + AC04244D4E183DF480908049 /* src/osx/core */, + ); + name = adv; + sourceTree = ""; + }; + 318BFB22ACCA37E19A1BD431 /* src/propgrid */ = { + isa = PBXGroup; + children = ( + 326723AEB79A305F90D6B41D /* advprops.cpp */, + A9C7F740A55E39FD890B3C7F /* editors.cpp */, + EBED392D081335FA80523244 /* manager.cpp */, + 58E1F571B01F34D4AB70CA18 /* property.cpp */, + B98B72B3A0A73044B85AED60 /* propgrid.cpp */, + 69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */, + 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */, + C20E46A504113C899B9DD9B7 /* props.cpp */, + ); + name = src/propgrid; + sourceTree = ""; + }; + 348F9A77CB8B315FBC81D212 /* src/xrc */ = { + isa = PBXGroup; + children = ( + 8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */, + 07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */, + 8826A683573F35EA9789612C /* xh_bmpcbox.cpp */, + 11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */, + 0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */, + 093B5233861B3F9B8C85762B /* xh_cald.cpp */, + BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */, + EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */, + 89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */, + CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */, + AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */, + D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */, + F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */, + F0905A1EBD653F6D82395602 /* xh_combo.cpp */, + 5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */, + C63C964DAFAD311694367C94 /* xh_datectrl.cpp */, + BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */, + 06B4A895955B32258DCD62BF /* xh_dlg.cpp */, + 05310A868F0B35999C568681 /* xh_editlbox.cpp */, + 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */, + 5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */, + 87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */, + E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */, + 9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */, + 84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */, + 93B77251C0E0382D9A8E113D /* xh_grid.cpp */, + 889FFA9573A835F280A21CB4 /* xh_html.cpp */, + B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */, + B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */, + 57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */, + 5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */, + 9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */, + D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */, + A87662D69F0432FC96701280 /* xh_notbk.cpp */, + 0080254545B9383ABDF2045C /* xh_odcombo.cpp */, + F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */, + 49BF55FA3427335097F99A2C /* xh_propdlg.cpp */, + 5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */, + F43AF44465B335479752116D /* xh_radbx.cpp */, + 66411D54BAD338498AC59401 /* xh_scrol.cpp */, + E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */, + 8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */, + 6E855AB3AB08325980871AB4 /* xh_sizer.cpp */, + 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */, + 950D51915EF83B57B5E8306F /* xh_spin.cpp */, + EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */, + FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */, + FADE850169F7347F83FE1499 /* xh_statbar.cpp */, + 832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */, + 147800BBCB80346798B35D75 /* xh_stbox.cpp */, + 5F555177554E398286DBC6FB /* xh_stlin.cpp */, + B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */, + 53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */, + CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */, + 3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */, + B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */, + 21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */, + B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */, + 15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */, + EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */, + 087B66573CD33DA99DA82B1C /* xmlres.cpp */, + A1E1A01885B036C28EBDAE27 /* xmladv.cpp */, + 29922DF1D0D63C33A186E783 /* xmlrsall.cpp */, + ); + name = src/xrc; + sourceTree = ""; + }; + 374BD863E6AD33189B7E4040 /* net */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D8 /* src/common */, + CBC07D2BC2363BB4B61D1122 /* src/unix */, + AC04244D4E183DF480908048 /* src/osx/core */, + ); + name = net; + sourceTree = ""; + }; + 42F504C4994C38D7A8F062F4 /* libexpat */ = { + isa = PBXGroup; + children = ( + 2ABA71836A2C3590B1615B26 /* src/expat/lib */, + ); + name = libexpat; + sourceTree = ""; + }; + 4B7A97D6D29E3627B312E104 /* src/regex */ = { + isa = PBXGroup; + children = ( + E433B890264339BA8DB97B1D /* regcomp.c */, + 1482A34AC32133E4BE207223 /* regexec.c */, + A70C82ADB45A3FB99C420D03 /* regerror.c */, + EEE82083BFA430D5B58F8A04 /* regfree.c */, + ); + name = src/regex; + sourceTree = ""; + }; + 4D98B791E17232D39944F04F /* xml */ = { + isa = PBXGroup; + children = ( + C23A03BC68833F7E8BA62CF1 /* src/xml */, + D957B1B354FC327288FDF9DB /* src/common */, + ); + name = xml; + sourceTree = ""; + }; + 4E6B7B286B7938A3BD44A8E1 /* src/richtext */ = { + isa = PBXGroup; + children = ( + 47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */, + FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */, + C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */, + 7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */, + 1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */, + C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */, + 23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */, + D30617843F33310089C1F77A /* richtextstyles.cpp */, + BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */, + C69E48C06BD23C178F650E42 /* richtextxml.cpp */, + ); + name = src/richtext; + sourceTree = ""; + }; + 5C5CD199E7573C73AE6F392D /* media */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9DA /* src/common */, + ); + name = media; + sourceTree = ""; + }; + 60328E6EA3793DA990E18FC1 /* xrc */ = { + isa = PBXGroup; + children = ( + 348F9A77CB8B315FBC81D212 /* src/xrc */, + ); + name = xrc; + sourceTree = ""; + }; + 60E51BFF5CD2327483201F14 /* html */ = { + isa = PBXGroup; + children = ( + B8FCB2D33F3B3E30A75D7ABD /* src/html */, + 84E0164052A73DE5996EA693 /* src/generic */, + ); + name = html; + sourceTree = ""; + }; + 64B126D857113F24BA8C4758 /* richtext */ = { + isa = PBXGroup; + children = ( + 4E6B7B286B7938A3BD44A8E1 /* src/richtext */, + ); + name = richtext; + sourceTree = ""; + }; + 6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = { + isa = PBXGroup; + children = ( + C1D1DDEBCD103A95BE0B52D4 /* src/png */, + ); + name = libpng; + sourceTree = ""; + }; + 7650A73F7FC9305EA62DAE86 /* libjpeg */ = { + isa = PBXGroup; + children = ( + D85137B3D94F34B6B3686909 /* src/jpeg */, + ); + name = libjpeg; + sourceTree = ""; + }; + 816DD323A67F3B299C8F3481 /* opengl */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9DC /* src/common */, + D1F5E5C8429235E68E4AC903 /* src/osx/iphone */, + F494694AB1FD30DEA2087AFD /* src/osx */, + ); + name = opengl; + sourceTree = ""; + }; + 82F403E7B8653CBD908BC258 /* Frameworks */ = { + isa = PBXGroup; + children = ( + F190B80DD28031A98E5BCA67 /* Foundation.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 83F62FA47C9636169F1E18E8 /* base */ = { + isa = PBXGroup; + children = ( + D957B1B354FC327288FDF9D6 /* src/common */, + 84E0164052A73DE5996EA690 /* src/generic */, + AC04244D4E183DF480908046 /* src/osx/core */, + CBC07D2BC2363BB4B61D1120 /* src/unix */, + ); + name = base; + sourceTree = ""; + }; + 84E0164052A73DE5996EA690 /* src/generic */ = { + isa = PBXGroup; + children = ( + 47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA691 /* src/generic */ = { + isa = PBXGroup; + children = ( + 6A82EDCFFBAC30098B238957 /* caret.cpp */, + 2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */, + 84758329F2163F00A9C005DF /* collpaneg.cpp */, + 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */, + E9D416E57FEB3F0B95734FF6 /* dirdlgg.cpp */, + 5F094B0B07DF33BCA6077BC0 /* fdrepdlg.cpp */, + EDD97DF408EC347A8CB8EF45 /* filedlgg.cpp */, + B580FD04D0D83601826FD5EE /* filepickerg.cpp */, + DB170BF78EFE39D692E11985 /* fontdlgg.cpp */, + FBE8E520BA0530C6AD857434 /* fontpickerg.cpp */, + D9016355F66D3125919E017D /* listctrl.cpp */, + 64DA16CF41C834D7B7642024 /* prntdlgg.cpp */, + 071FEABEA61E3B559A47A7DB /* statusbr.cpp */, + FE538F33A1423FC2AC9E45F3 /* regiong.cpp */, + F5DAF1F49F0F3F41A427A21E /* icon.cpp */, + BACAA6CE4A0934459F26B27C /* graphicc.cpp */, + 2F94CF171F4532B89FECF475 /* busyinfo.cpp */, + 5612DBC4125B379DA2B28824 /* buttonbar.cpp */, + CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */, + 09F8B0818C3A3248A26EE05D /* choicbkg.cpp */, + CBD7B44E33373BCCB60FC11F /* combog.cpp */, + EEA0945B20913754A54D0FD9 /* dcpsg.cpp */, + 91292D8E11203A6B8E9767DA /* dirctrlg.cpp */, + 2A67053D16D63C588E555C84 /* dragimgg.cpp */, + 2334539088B036BEAB230D1C /* filectrlg.cpp */, + 7273A7E255323EB3B391D997 /* headerctrlg.cpp */, + 9DE6A96FDD5D381D8B33D58E /* infobar.cpp */, + 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */, + C64705CE9398316D87BAB4DC /* logg.cpp */, + D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */, + A1CB6A4171D4343BB0A9858A /* msgdlgg.cpp */, + 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */, + 9C35AF6C39A53DAF994CAC97 /* panelg.cpp */, + BEA102FF0FFC33DEAEF2FE14 /* progdlgg.cpp */, + AF76670146413EEFA005206A /* printps.cpp */, + 49CABA38E78D34DFA260AA06 /* renderg.cpp */, + E9977457BC7F3A1D93C18A02 /* richmsgdlgg.cpp */, + 3FB6D34C3029357EB64AECAA /* scrlwing.cpp */, + 5ED2105A5A033E3384EBC4ED /* selstore.cpp */, + 59572A234F0636D78BFD9F6B /* spinctlg.cpp */, + C125FA3837C631A9BE0ED5E7 /* splitter.cpp */, + D46A36564C78312CAC538E93 /* srchctlg.cpp */, + DA2119A7C67D37B290C17989 /* statbmpg.cpp */, + 5DE635F30F3935099AF1486C /* stattextg.cpp */, + 8D529E2668C23D94A7706C8A /* textdlgg.cpp */, + 9E8BF36D3A7C309482CBA9EC /* tipwin.cpp */, + 24DF23D67E693D999B875101 /* toolbkg.cpp */, + 7F039CCBBE6C32A09930EBDB /* treectlg.cpp */, + 7925E38823563BCDB5565DCF /* treebkg.cpp */, + AA90128E29A03CCCA30F4D35 /* vlbox.cpp */, + 1629FA905F903324AA5BE72C /* vscroll.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA692 /* src/generic */ = { + isa = PBXGroup; + children = ( + 77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */, + 13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */, + 496674699F173A5385EAFF07 /* calctrlg.cpp */, + E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */, + 5F3D473DC5123EDAB767045C /* datavgen.cpp */, + AE856D950B8C369EB0FE13BA /* datectlg.cpp */, + 7D90D14874FD38079835AF0B /* editlbox.cpp */, + 76337016F2CA3C85831702E6 /* grid.cpp */, + 2A1BD6BCA15430CA8A4869EF /* gridctrl.cpp */, + 66426B63AA3E3A279936C034 /* grideditors.cpp */, + 26381308E32A3A179E7A9B40 /* gridsel.cpp */, + DF376BC55EA73F5FB7328142 /* helpext.cpp */, + CBCA90340E433DBBAE74EBE1 /* hyperlinkg.cpp */, + C3784C240C2F330683494926 /* laywin.cpp */, + 924AA3A156F834BCA1A57976 /* notifmsgg.cpp */, + 7906BD74118A3B4DAC515BC2 /* odcombo.cpp */, + 6BC93D1DE277395592610085 /* propdlg.cpp */, + 917F2666B67E3D2EB84E74F8 /* sashwin.cpp */, + 3F8836E29C5A370E80CE070E /* splash.cpp */, + B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */, + 8F08F70E1EF239999A4D2AC4 /* wizard.cpp */, + 580AFC66F3003582B43043B1 /* animateg.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 84E0164052A73DE5996EA693 /* src/generic */ = { + isa = PBXGroup; + children = ( + FD5F11A3646F397BA62EB037 /* htmllbox.cpp */, + ); + name = src/generic; + sourceTree = ""; + }; + 88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */ = { + isa = PBXGroup; + children = ( + C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */, + 4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */, + E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */, + 5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */, + 5219A792C6A736F193D4A82F /* ContractionState.cxx */, + BF1C44D726E63B18A98006EC /* Decoration.cxx */, + 71DB140E670738839EC42C2B /* Document.cxx */, + 38B8924D1E583C90A4933105 /* DocumentAccessor.cxx */, + DA5E95D498C53A808A8E2EEB /* Editor.cxx */, + FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */, + 4FDE5A962FA234FA83A605AD /* Indicator.cxx */, + E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */, + EA2FCFA3723C3B1FBAB47F4C /* KeyWords.cxx */, + 497861EB7E623C68951D1AB2 /* LexAPDL.cxx */, + A82C367B86F83981803D55DB /* LexASY.cxx */, + C76222F466E831F896A89269 /* LexAU3.cxx */, + BFF5A87D79EF3BEFAC3C0C20 /* LexAVE.cxx */, + CD72950967F33809931D4968 /* LexAbaqus.cxx */, + 375E7A99FF4C38FA9E223772 /* LexAda.cxx */, + A65399C8A6D636139E362119 /* LexAsm.cxx */, + A46D50BEBF523B3F88831086 /* LexAsn1.cxx */, + 4B16CCC86CD235CB8E8EC0AA /* LexBaan.cxx */, + 78D7866F95C73A28BB540606 /* LexBash.cxx */, + B6AADC1056E03A3B80C20C5B /* LexBasic.cxx */, + 6718204F4700318E89EAC906 /* LexBullant.cxx */, + 7EE2459D69BA35838C274488 /* LexCLW.cxx */, + B3D9C4122372343DBEAF6492 /* LexCOBOL.cxx */, + 9EF09C7CC5413CC6A5E7B21B /* LexCPP.cxx */, + 4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */, + 4B3B8AD0120F3EA6BF5B0AE0 /* LexCaml.cxx */, + 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */, + 04082EC1C91334379425802D /* LexConf.cxx */, + 16A093604BDB3C22BA66EA89 /* LexCrontab.cxx */, + 0A59A5C2305D3D1C8049BE71 /* LexCsound.cxx */, + B9DFC4083C6A38CABE4BB4E3 /* LexD.cxx */, + 58EFF24DE2E737CA8A164F5C /* LexEScript.cxx */, + 55EBB18CB4773C788510B14B /* LexEiffel.cxx */, + A1276C0E5D48337489DEE8DF /* LexErlang.cxx */, + F32C0D20638232CE8F43BF33 /* LexFlagship.cxx */, + B181F564935730E89AB00D92 /* LexForth.cxx */, + 86A0C3603C8A343AAFBD2CE0 /* LexFortran.cxx */, + 30BBE92ADD8A37C992B4F919 /* LexGAP.cxx */, + FFB767BD2C7235F293F45796 /* LexGui4Cli.cxx */, + D87406BCF3E833369E12D89A /* LexHTML.cxx */, + 10EADF7E7DC032CA8522C1F8 /* LexHaskell.cxx */, + 15CBD0AAFEB435429EA96D41 /* LexInno.cxx */, + B303230368143F37B2409DE6 /* LexKix.cxx */, + 40586C8986443431A64EB066 /* LexLisp.cxx */, + B14D6E7E15FD3C869E341198 /* LexLout.cxx */, + 5145561C78303EEE9F827962 /* LexLua.cxx */, + FEFE1B83470D38D38D0E76B0 /* LexMMIXAL.cxx */, + FE3B47058A723243A285594D /* LexMPT.cxx */, + 1C71BF55495034FFBE653C80 /* LexMSSQL.cxx */, + 45860601270D318D93BEE1F3 /* LexMagik.cxx */, + E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */, + DC9153A350893820B942D37E /* LexMatlab.cxx */, + F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */, + 2F3EE2E9EE05311497826962 /* LexMySQL.cxx */, + BC5C5DB466CD3D6FA6985B56 /* LexNimrod.cxx */, + 1BC0322549563787A21CE8F1 /* LexNsis.cxx */, + 5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */, + C356B5738AB13E829E66729E /* LexOthers.cxx */, + 8744F2C80ECF375999195935 /* LexPB.cxx */, + 62C46B0CE620348FBF3860A4 /* LexPLM.cxx */, + 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */, + EDB48813110636DBA045BF3A /* LexPS.cxx */, + 86F26F6418C53AFE8154BFC8 /* LexPascal.cxx */, + D0C3A635C8BD3FA6BD47975F /* LexPerl.cxx */, + 2A5FC30FF3743DBAAF8910EC /* LexPowerPro.cxx */, + 36F7955F8075343C8A9953DB /* LexPowerShell.cxx */, + 4F8E4A9905843A4683A6B460 /* LexProgress.cxx */, + CC2713393AB132AA8E337AE1 /* LexPython.cxx */, + 7255468B6D5F3D8697994A53 /* LexR.cxx */, + 0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */, + 8734C52C7559310784396455 /* LexRuby.cxx */, + 912B2982C9413F2FB40CA2D9 /* LexSML.cxx */, + 2B1A318636A134DB93C0BA45 /* LexSQL.cxx */, + 2F1B41B0F10C3DA38188C239 /* LexScriptol.cxx */, + 3551A51B4A493090B67CA216 /* LexSmalltalk.cxx */, + 7D8BDFB06EE13E59ABB2A616 /* LexSorcus.cxx */, + 508B04B4FF913BECBC9DBFFB /* LexSpecman.cxx */, + 4592464D4868329897F3864D /* LexSpice.cxx */, + 9E5C91072D533919A78D8ED2 /* LexTACL.cxx */, + A284E855892F3A9E9E19E854 /* LexTADS3.cxx */, + 38891BF8F51E398F9082903F /* LexTAL.cxx */, + C0929D5DDFE337329FA8C6BC /* LexTCL.cxx */, + FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */, + 8F633793051F371F94C27530 /* LexVB.cxx */, + 1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */, + D76B3D3BD33E3775BEAB4737 /* LexVerilog.cxx */, + 9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */, + AF3DF03795153E039B8F1F87 /* LineMarker.cxx */, + 9389DAF8B91030B7AAB029FF /* PerLine.cxx */, + BCD873D873A53BBF955D8A4E /* PositionCache.cxx */, + E2C8FEBBDB913BCB9790DD06 /* PropSet.cxx */, + E145FC31ED523B4AA5080A61 /* RESearch.cxx */, + 7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */, + 9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */, + 2AF7739C389536F79DAA31E5 /* Selection.cxx */, + C28429A964C337A192D76CC8 /* Style.cxx */, + 9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */, + 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */, + C133B838193A35ABBB803151 /* ViewStyle.cxx */, + 96771A0D2C1A344DA1114765 /* WindowAccessor.cxx */, + C25521AF59B9324EB2809C73 /* XPM.cxx */, + ); + name = src/stc/scintilla/src; + sourceTree = ""; + }; + 944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */ = { + isa = PBXGroup; + children = ( + 2DF2456ED905357B8C1D74D9 /* webkit.mm */, + ); + name = src/html/htmlctrl/webkit; + sourceTree = ""; + }; + 98C15055598A3586BDB4FD0F /* src/aui */ = { + isa = PBXGroup; + children = ( + 26632A254717372BAA4D514D /* framemanager.cpp */, + BD709DEB71623974B9836D69 /* dockart.cpp */, + A881F49ADCF33C299B041584 /* floatpane.cpp */, + A298576700C33F018616E7BD /* auibook.cpp */, + 05A4437E9697300390FDE14E /* auibar.cpp */, + C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */, + ); + name = src/aui; + sourceTree = ""; + }; + 9A6B5D3E90513D0396CFE0EF /* src/stc */ = { + isa = PBXGroup; + children = ( + D0B9C41A4D12345AAA764CAD /* stc.cpp */, + 47FF6D792CA234C395692118 /* PlatWX.cpp */, + 8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */, + ); + name = src/stc; + sourceTree = ""; + }; + A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */ = { + isa = PBXGroup; + children = ( + 5D2F8259CC99380CB8217DEF /* tif_unix.c */, + D0CDADAF2D893E32A38351E4 /* tif_aux.c */, + F82278F9AF0432529891E6D7 /* tif_close.c */, + 88FF67EB6E7D302A9CDEF660 /* tif_codec.c */, + 149D299A0EDB3D998118EC93 /* tif_color.c */, + CA0D5D47D62A3148BA51B31B /* tif_compress.c */, + E79B2D1F630036129B9677A7 /* tif_dir.c */, + 032A38738B58394E8617617B /* tif_dirinfo.c */, + F6EA240B3DB93D398A990FAD /* tif_dirread.c */, + B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */, + 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */, + 48F1439BF6C3361296F05A33 /* tif_error.c */, + AF7CE00168AB33C994374ABA /* tif_extension.c */, + 30FD1048328234E59D319863 /* tif_fax3.c */, + BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */, + 305614D19CF23CB2B14A5B2E /* tif_flush.c */, + 3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */, + 29B9C6D27BE83DB384A108ED /* tif_jpeg.c */, + 66FDA882451239EA8DF2E0B5 /* tif_luv.c */, + 346C68F0CCD23823B78267F0 /* tif_lzw.c */, + DFDC805DD3063C389F93642D /* tif_next.c */, + 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */, + 1731A6096BFC3A468AB4755A /* tif_open.c */, + 9CE73979D0933A43830307E4 /* tif_packbits.c */, + 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */, + 2FA01C426EAF38D3B9ED35AC /* tif_predict.c */, + C6EB77ED688E3EE294167EF1 /* tif_print.c */, + 64B25B87203E3464BCDD277D /* tif_read.c */, + B83EDE2D1731311ABDE62F9F /* tif_strip.c */, + AAC12B4456E13F57BEA25A5E /* tif_swab.c */, + 68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */, + BD88495AF72531A28D2201D0 /* tif_tile.c */, + 3E6F40F4740C3ED29D83E107 /* tif_version.c */, + C83C97A1FCC5345896C9D7DE /* tif_warning.c */, + E9B992CB6C28339FB0CA5E27 /* tif_write.c */, + 726C0457DF1232C793918DC1 /* tif_zip.c */, + ); + name = src/tiff/libtiff; + sourceTree = ""; + }; + AC04244D4E183DF480908046 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 7C97C1F26B5A38C49543060C /* mimetype.cpp */, + 5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */, + 5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */, + 7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */, + D5F9383D1CE931499F339D85 /* strconv_cf.cpp */, + 81390F96937631078EFCD891 /* utilsexc_base.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908047 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */, + 9D1F14339D1C331087650931 /* colour.cpp */, + 343D4FDD5CC030618EF24729 /* dcmemory.cpp */, + A5617D10CB7136EC9A4194EF /* display.cpp */, + 36E1DBA275AD325DB759C180 /* fontenum.cpp */, + 160EB9744CB63A0B81DC651F /* hid.cpp */, + 5CC5C13F8AA1387BADB7E60C /* printmac.cpp */, + 69F098E47EBF34368ABAE7ED /* timer.cpp */, + 95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */, + 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908048 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 4969528429903F15882F5391 /* sockosx.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + AC04244D4E183DF480908049 /* src/osx/core */ = { + isa = PBXGroup; + children = ( + 2ACC8667173D3AB09F6214F4 /* sound.cpp */, + ); + name = src/osx/core; + sourceTree = ""; + }; + B1EF68113C6338CFBBED0FBE /* libregex */ = { + isa = PBXGroup; + children = ( + 4B7A97D6D29E3627B312E104 /* src/regex */, + ); + name = libregex; + sourceTree = ""; + }; + B402B38DB4CF3883AF4743C0 /* src/ribbon */ = { + isa = PBXGroup; + children = ( + 4C4649974D8B3A109D1BF145 /* art_internal.cpp */, + B540E18F9C91381CA175BABB /* art_msw.cpp */, + DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */, + 9FDDE855D9F83E4891362EB4 /* bar.cpp */, + 5612DBC4125B379DA2B28825 /* buttonbar.cpp */, + 12363D1F50FE301DAEE7F04B /* control.cpp */, + 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */, + 59ED0C057D8F388A89DC7177 /* page.cpp */, + 00969CBE3B8F32C78C195619 /* panel.cpp */, + BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */, + ); + name = src/ribbon; + sourceTree = ""; + }; + B8F95052522B37AB86DA8917 /* propgrid */ = { + isa = PBXGroup; + children = ( + 318BFB22ACCA37E19A1BD431 /* src/propgrid */, + ); + name = propgrid; + sourceTree = ""; + }; + B8FCB2D33F3B3E30A75D7ABD /* src/html */ = { + isa = PBXGroup; + children = ( + 2E24C6F2A04E30EB95598305 /* chm.cpp */, + 42E433D1700631A8907B8227 /* helpctrl.cpp */, + C466F32CCBD13DBC87285B3D /* helpdata.cpp */, + 81821049E39B32C6ABCF6820 /* helpdlg.cpp */, + 82A8381819DD37DA9A3830D1 /* helpfrm.cpp */, + 2DBD5DB511C53218B3EF1625 /* helpwnd.cpp */, + 68E5188DB6003C35A8C7754D /* htmlcell.cpp */, + 2C6C4F5468743265A02D656C /* htmlfilt.cpp */, + 1800B1884CC73C78A09E7FF1 /* htmlpars.cpp */, + FCCFF49F92B4323D9181CEDA /* htmltag.cpp */, + 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */, + 194ADD28300E329E80F7892E /* htmprint.cpp */, + 52FE1599218730CC99A3F801 /* m_dflist.cpp */, + B1F3C70512D93501B0478F3E /* m_fonts.cpp */, + ECA4A44BEC2F3AED8CF0C911 /* m_hline.cpp */, + 548906E4E72935E48CE4AF87 /* m_image.cpp */, + A5EE0B8985443BDCB36F781F /* m_layout.cpp */, + 080597FC0436378E96EDA94B /* m_links.cpp */, + B4028ABB08C63AB59F5F240B /* m_list.cpp */, + 61658C3EABB4341AA38C691E /* m_pre.cpp */, + 727F25F832AD32D4B12D8E39 /* m_span.cpp */, + 7EB95BCFA255323183A996C9 /* m_style.cpp */, + 082CA018FB883999839C1DCE /* m_tables.cpp */, + 3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */, + 7FCA75FE592C3469AE351FBF /* winpars.cpp */, + ); + name = src/html; + sourceTree = ""; + }; + C1D1DDEBCD103A95BE0B52D4 /* src/png */ = { + isa = PBXGroup; + children = ( + AF26BAB1F4733114926F1724 /* png.c */, + 1A0650754DC2358CA5933B28 /* pngerror.c */, + 91300EB871CC39ECBC430D48 /* pngget.c */, + C45AFE6CC20F3ED7A55FC8FA /* pngmem.c */, + 9CAA325362C73AC8BE20FAA7 /* pngpread.c */, + 29D6506AEA5A323B8735F126 /* pngread.c */, + A06AB1974DB93EE2999EC75C /* pngrio.c */, + 87799D3168B43EB7B5686826 /* pngrtran.c */, + 358D0A3AC73F322EA732D020 /* pngrutil.c */, + 5E463A493FD930DE80E58608 /* pngset.c */, + 5B32A13D5B3336098B1B9765 /* pngtrans.c */, + AF9EE701DD653E2299293E5F /* pngwio.c */, + 69A6CAF721E53E83B4820DE6 /* pngwrite.c */, + 0964797530CF3FE7B8DB6242 /* pngwtran.c */, + 45D7558DF5E03A2EB41883F0 /* pngwutil.c */, + ); + name = src/png; + sourceTree = ""; + }; + C23A03BC68833F7E8BA62CF1 /* src/xml */ = { + isa = PBXGroup; + children = ( + E6AB648BC5173104A96CAE66 /* xml.cpp */, + ); + name = src/xml; + sourceTree = ""; + }; + C2FC1A9BBB8C3046994369BF /* Products */ = { + isa = PBXGroup; + children = ( + B4DEA098A05736AE94F01926 /* libwx_osx_iphone.a */, + ); + name = Products; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1120 /* src/unix */ = { + isa = PBXGroup; + children = ( + B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */, + F7332A03D93D3DABB050615D /* dir.cpp */, + CA2D9F325F833C408657E7B7 /* dlunix.cpp */, + 2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */, + 9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */, + 3B548B1FF2A238809315C8A9 /* fdiounix.cpp */, + 3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */, + EA2520F427493A22A70A5C09 /* stackwalk.cpp */, + F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */, + 0CB2CC8E60833A6993BEA321 /* timerunx.cpp */, + AB466912FDA23F8B87A00A3C /* threadpsx.cpp */, + DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */, + C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1121 /* src/unix */ = { + isa = PBXGroup; + children = ( + D4A23A8BC7373D4BBD72851D /* apptraits.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + CBC07D2BC2363BB4B61D1122 /* src/unix */ = { + isa = PBXGroup; + children = ( + BB7661E9E09A397790ED9545 /* sockunix.cpp */, + ); + name = src/unix; + sourceTree = ""; + }; + D1F5E5C8429235E68E4AC902 /* src/osx/iphone */ = { + isa = PBXGroup; + children = ( + F4020D790AE7363CB29F1C2F /* anybutton.mm */, + C06FED83BF933DF98C2466AE /* button.mm */, + 81708CFA21A03013ACB8DDD7 /* checkbox.mm */, + 83B878A16ABC396E8C03A15E /* dialog.mm */, + 8D2549709E0133C9A267E3A5 /* evtloop.mm */, + 98A7F0605AAC3D28A8C9F253 /* gauge.mm */, + 33CFE51FD6F0362092DF1A85 /* msgdlg.mm */, + AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */, + CC2E24773D853A77B9FEFA4C /* scrolbar.mm */, + 9B862D1027C4367BBF44420F /* slider.mm */, + 95186FEF3DEF39D8B1157BD5 /* stattext.mm */, + E4E16323A43E36DC8024EDF1 /* textctrl.mm */, + A3BF8C9FF2D5314591329D0D /* toolbar.mm */, + 789F45D14FF23E248FCFB5FA /* utils.mm */, + C94DC3402FAE3C4FA776DEEA /* window.mm */, + ); + name = src/osx/iphone; + sourceTree = ""; + }; + D1F5E5C8429235E68E4AC903 /* src/osx/iphone */ = { + isa = PBXGroup; + children = ( + 35007225BB683683AA7C5E48 /* glcanvas.mm */, + ); + name = src/osx/iphone; + sourceTree = ""; + }; + D85137B3D94F34B6B3686909 /* src/jpeg */ = { + isa = PBXGroup; + children = ( + 8EB76F786D7F3FF286948D22 /* jcomapi.c */, + 5BEC6B3CAFB532CBB9F95D74 /* jutils.c */, + 108517BCD39230E7A89BC943 /* jerror.c */, + 14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */, + 374E341C8703367686DEDE93 /* jmemnobs.c */, + 6EDDEEEC981133E8BA6A3998 /* jcapimin.c */, + F83172EE2DAE352FB969D4F2 /* jcapistd.c */, + 725574EF98C4301989181CBF /* jctrans.c */, + 2F41EDEB298538CC86FF6DC1 /* jcparam.c */, + 59B19927E27F39ACB1D2BDA3 /* jdatadst.c */, + AA6C6739C3BD3EFA9CF71102 /* jcinit.c */, + 3E3043D7BE9C33B59E900CCE /* jcmaster.c */, + 664736BDE465350C9C4750E9 /* jcmarker.c */, + 810EB7316DF3344197C78EC0 /* jcmainct.c */, + 7FE0455EBDC63D82B2D88587 /* jcprepct.c */, + E89AC104BF4F33A083F8B382 /* jccoefct.c */, + 8EFF4707641D3F20AB602ED6 /* jccolor.c */, + 53D06E47477B3E32BB6B915E /* jcsample.c */, + DC0FFDC7A6163F2DA73B84EB /* jchuff.c */, + E38569D873B6394F9E5B821C /* jcphuff.c */, + 6DBF3053414F3C448312165A /* jcdctmgr.c */, + 029486D6A2EC3DE0902A6A24 /* jfdctfst.c */, + 93D07403FCA530D7A9FD2917 /* jfdctflt.c */, + 90EC2A5B80EE3031BA4087B9 /* jfdctint.c */, + 86884BC843F6337EABF744BB /* jdapimin.c */, + 1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */, + 4549845C0751356A907C23E0 /* jdtrans.c */, + DECAF5DD80383A2CA76EB383 /* jdatasrc.c */, + ED19EF377E653F71B1876259 /* jdmaster.c */, + CCF7564A2B733F759AA8496B /* jdinput.c */, + 20E4A10BCD773C84AEC481A1 /* jdmarker.c */, + 72869747E68E37998CB0A07E /* jdhuff.c */, + E85E680C62B63D4EBAB2E784 /* jdphuff.c */, + B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */, + F1A6F3936A0D31CBB58082BA /* jdcoefct.c */, + 375FF97B202F3C359402D13E /* jdpostct.c */, + A5BBC1E494D33D028CA547FF /* jddctmgr.c */, + A0DCC5EF59143640BE13AD73 /* jidctfst.c */, + 3C131F7BF8A83960ACB26242 /* jidctflt.c */, + 1DAF0931E4AD3E6581D7FDBC /* jidctint.c */, + 646743F6FDFE3ACFA1A79B40 /* jidctred.c */, + 5FFCF47A161B3E08B19BFE14 /* jdsample.c */, + 68B81FBDA49D3C1991B6356A /* jdcolor.c */, + 4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */, + 02D9332D5C5632E981936E29 /* jquant2.c */, + 0890779C662C35889A8C6C2E /* jdmerge.c */, + ); + name = src/jpeg; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D6 /* src/common */ = { + isa = PBXGroup; + children = ( + 4867546E8B8D3C8683A23ED5 /* any.cpp */, + 95A156A823B536DE8476E4F9 /* appbase.cpp */, + 75D0C937F2A03ADA8581A2BB /* arcall.cpp */, + C513377E9E303F778BA9D7ED /* arcfind.cpp */, + 02D2E8B5C89939CE90B99E2B /* archive.cpp */, + A57CF60203F53459A03951A9 /* arrstr.cpp */, + F2024D29170D3B50A4DFDE11 /* base64.cpp */, + 2C904B4BA8273355869812B2 /* clntdata.cpp */, + FBE1C531185131A89EFF7FAF /* cmdline.cpp */, + 4FE0B33481283D3493613B0F /* config.cpp */, + 20B922D61CDB3CCEB59A5194 /* convauto.cpp */, + E0EBCDDF248638B58B01D9CC /* datetime.cpp */, + 864438709B363773B8C3382D /* datetimefmt.cpp */, + 81B3DFBB73573FFDBD320334 /* datstrm.cpp */, + EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */, + ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */, + D272910EC35531E5B4D6E05B /* dynlib.cpp */, + 93BA27DFFB023F2EBD6295E3 /* dynload.cpp */, + C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */, + 640783FBACA43206B782C77B /* evtloopcmn.cpp */, + 033B94A9AC8A3370A794503F /* extended.c */, + ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */, + 168DB301ACC736FF96D7F581 /* file.cpp */, + AC12D557950A3B0D89D9F2F3 /* fileback.cpp */, + 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */, + 58421C141C9E31C6A7A3C183 /* filefn.cpp */, + BAD9A0BFED6A37E4A305E1D7 /* filename.cpp */, + F263022F3FEA3F75895B644D /* filesys.cpp */, + 4438C284ED5C31EF8CC28FF3 /* filtall.cpp */, + EA4AF89C36C53EB4B307DCAB /* filtfind.cpp */, + 832BBBFE664736D5978420C6 /* fmapbase.cpp */, + 88F2BA2F0598342186A484B5 /* fs_arc.cpp */, + AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */, + 888BD97139C936679691FF34 /* hash.cpp */, + A6636144CDE83E8E85270FAF /* hashmap.cpp */, + DB82939EDC593F9CA95C3098 /* init.cpp */, + AC8BB1AABB3D393EBA527060 /* intl.cpp */, + 2C090A76B6F23E6481A27282 /* ipcbase.cpp */, + 67D76B026121359F9B22F8B0 /* languageinfo.cpp */, + 552757A901E732CAA8E3F16D /* list.cpp */, + EA93D41B11683E758D456531 /* log.cpp */, + 72D7AF345E563587941BD868 /* longlong.cpp */, + 5466CC2D6579360E9C665EE5 /* memory.cpp */, + 2F316F7DD3CB3390A6E50179 /* mimecmn.cpp */, + 9DB43FAB1E563B02ACEFF647 /* module.cpp */, + DC3D1E222FD93A69B1D1366E /* mstream.cpp */, + 6BD8DAB407D231EFA5B2CAE5 /* numformatter.cpp */, + 1731D6708BFE3DE7B101CE74 /* object.cpp */, + 97FFB03FF6793506B246BAC6 /* platinfo.cpp */, + 99BC7A16DBCA36EDA9D6F1DB /* powercmn.cpp */, + B35DA585CFDD32468868E892 /* process.cpp */, + FB46BC22F6B23909A938C561 /* regex.cpp */, + 75BF90BEF2F83BF28EC0458D /* stdpbase.cpp */, + F46EC1508C063C8395CE7A95 /* sstream.cpp */, + DE16011AD6323AAC8616F973 /* stdstream.cpp */, + 8F4F0113872C39FB9D10E411 /* stopwatch.cpp */, + 9FEB8204E530329FA085E5B8 /* strconv.cpp */, + FFDD414DBCC73D0FB6C2C5FD /* stream.cpp */, + F7E99B35A98D30818120B002 /* string.cpp */, + E5357E76650035639844D15B /* stringimpl.cpp */, + F1E724EA70AB35DDB130F84F /* stringops.cpp */, + 0EEAD9C3E180305D8899441E /* strvararg.cpp */, + F32F6B47EBB23068B1FCDC0D /* sysopt.cpp */, + C0F7BBD216853E718C9F23D9 /* tarstrm.cpp */, + 701B84EE7C043B539FF5195A /* textbuf.cpp */, + 0903EE9B3793303285FF96E3 /* textfile.cpp */, + 7195E665E0F233839B967FC9 /* timercmn.cpp */, + 0401B7302088357BB6B7F16F /* timerimpl.cpp */, + 3720038D64CF3C0B8F642A90 /* tokenzr.cpp */, + 6AC666417602346EA583709E /* translation.cpp */, + 117CD1A3BCB53CEE800787AE /* txtstrm.cpp */, + DB90ADAC10693B6F91E7D4E9 /* unichar.cpp */, + D4E1DC1869C6327C80D2F5F4 /* uri.cpp */, + B63EBEE1A04537E7887E9FD0 /* ustring.cpp */, + 31F4B9B03D52339B8F82C114 /* variant.cpp */, + C37866F41B0C31E295AA7FA6 /* wfstream.cpp */, + 23FC98E2305230E2990471E3 /* wxcrt.cpp */, + 607EF0043E723B7B9BE101EA /* wxprintf.cpp */, + 418AD9241B673308BE31DC06 /* xlocale.cpp */, + 25C86D3D4839343BA1D8BDEE /* xti.cpp */, + FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */, + 54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */, + B9B5BC858CCF3477895D2786 /* zstream.cpp */, + 7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */, + 47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */, + A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */, + 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */, + C9A305CEC03B3085B159B617 /* fs_mem.cpp */, + E968913A9A593B258BD8EACB /* msgout.cpp */, + 4188821BBA833CCAA678B234 /* utilscmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D7 /* src/common */ = { + isa = PBXGroup; + children = ( + A436B55DC44E3827A757A6D8 /* accelcmn.cpp */, + 8555204EBA8930809B732842 /* accesscmn.cpp */, + EE959EC7BFDD3A628E856404 /* anidecod.cpp */, + DD09A813E10A31C19554B425 /* affinematrix2d.cpp */, + F01DDE448E4C3983ACCE67FD /* appcmn.cpp */, + 29387393C07C39DB8FF1663B /* artprov.cpp */, + 24E82A05E9A9323287CDB15B /* artstd.cpp */, + 9988CBB0772A3539970162FA /* arttango.cpp */, + E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */, + 772AD4682A3E38538511D341 /* bmpbtncmn.cpp */, + 00BC2298BC7A33B7A68584FE /* bookctrl.cpp */, + 84A7A3B499503ECABC6A838F /* btncmn.cpp */, + 5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */, + 4FC2F076657431458896115A /* checkboxcmn.cpp */, + 83A94241BCB13767AFEC5946 /* checklstcmn.cpp */, + 24930711031D35288D28B04B /* choiccmn.cpp */, + 239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */, + AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */, + 2D61240ABD70328BA5789663 /* colourcmn.cpp */, + 0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */, + 06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */, + 4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */, + 0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */, + B3645350F572364BABF50238 /* containr.cpp */, + 67DCEEB6861731319C30817F /* cshelp.cpp */, + 0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */, + 1B0533F88F3434609A54FB37 /* ctrlsub.cpp */, + D1EE17722EA937E88A7F0C01 /* dcbase.cpp */, + FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */, + 776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */, + DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */, + E110907DDC13305E88B90086 /* dirctrlcmn.cpp */, + 9051902662BE38B3912B34EA /* dlgcmn.cpp */, + 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */, + 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */, + ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */, + AB634FD597793A74B3B3AA7F /* docview.cpp */, + A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */, + 1197B997B1D139C5AE4D198A /* dseldlg.cpp */, + 48D72D20DB1D3E1CA5ED112A /* effects.cpp */, + EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */, + 5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */, + D7B3307E56B332769901E99F /* filehistorycmn.cpp */, + BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */, + A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */, + 45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */, + 30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */, + C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */, + 373242CD08F330208A7CF438 /* fontenumcmn.cpp */, + D0817D6A1AF83608B050EBC3 /* fontmap.cpp */, + 2E00E14795F23A8392713A26 /* fontutilcmn.cpp */, + A54B80C17F823CB5900AD2E8 /* framecmn.cpp */, + 570D603125ED3A14848FA2E2 /* gaugecmn.cpp */, + 1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */, + 998D611109EC33A9A6A11C5A /* gdicmn.cpp */, + 6BC0A61629E635FAB4E09505 /* geometry.cpp */, + 16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */, + 1BB59DD194923D6399087A75 /* graphcmn.cpp */, + B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */, + A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */, + BBB30516233A39BE809405AA /* helpbase.cpp */, + DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */, + 8FFDFB4D208F37569AC548B0 /* imagall.cpp */, + 5F84098A475939BB9EE87E70 /* imagbmp.cpp */, + 81A30C745CA73E30B788B408 /* image.cpp */, + 137E01C362E134449BF966ED /* imagfill.cpp */, + CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */, + A4A745D1821A32D591D76650 /* imagiff.cpp */, + 6876262846EA3569B36D92E9 /* imagjpeg.cpp */, + 10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */, + 24396D584D053948A3FF0DCD /* imagpng.cpp */, + BC12B97F233B3B9494DA217F /* imagpnm.cpp */, + FA7029BB5751398AA02D8C24 /* imagtga.cpp */, + AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */, + 5C85865D28DC31649440A921 /* imagxpm.cpp */, + BEB08798C70E33DDB360E563 /* layout.cpp */, + 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */, + E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */, + DA7F7633279936EFA0B9C5CF /* markupparser.cpp */, + EF330EAACFA53877BE289896 /* matrix.cpp */, + F175D6E8E5723FC797701275 /* menucmn.cpp */, + D037EA567C253DEEA17E822B /* mousemanager.cpp */, + B901252876603DCEA4C66D89 /* nbkbase.cpp */, + 303ACF199BE431BD891C9301 /* overlaycmn.cpp */, + 155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */, + 87D973CA8D673267BD0844D3 /* paper.cpp */, + 70E9B2C076673C87B4218A01 /* panelcmn.cpp */, + 22D9626646773CED82449D5D /* persist.cpp */, + 1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */, + D922063B2F2536629EEEAAF0 /* popupcmn.cpp */, + 242BF97B558634A79322052C /* prntbase.cpp */, + B890199A37723EFD86C0ADA5 /* quantize.cpp */, + 724927B0045F3CC0884878BB /* radiobtncmn.cpp */, + 531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */, + 972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */, + 96CED508FA3C3B6B9265099E /* rendcmn.cpp */, + 63867276260C3F4A980E83D8 /* rgncmn.cpp */, + A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */, + ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */, + 3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */, + E8072CA67D19346ABF4D465F /* slidercmn.cpp */, + C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */, + 8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */, + 1EF103B09F02315282EC8F44 /* srchcmn.cpp */, + 9C87B071E3593A889704F512 /* statbar.cpp */, + 12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */, + D73954EB5397301F87881646 /* statboxcmn.cpp */, + 292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */, + 54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */, + B180290089B139F18B0C7BBA /* stockitem.cpp */, + D3F32C01D122301AB00D06A5 /* tbarbase.cpp */, + 3DFD4F32E48039C3B9A66355 /* textcmn.cpp */, + 5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */, + 861438BD294335D4B859EA71 /* toplvcmn.cpp */, + 7BA6ADD758693BD180D3275B /* treebase.cpp */, + A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */, + F7440859617F3B47AF4D3817 /* valgen.cpp */, + 01BA6D45FE4C381493EB4372 /* validate.cpp */, + DE8701E1CF2B352B945C17E5 /* valtext.cpp */, + 684D92E552BE313CBE0A88AA /* valnum.cpp */, + AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */, + E9B9B85572D0312BBF2878DB /* windowid.cpp */, + B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */, + C562D5885AFF3E15837325CE /* xpmdecod.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D8 /* src/common */ = { + isa = PBXGroup; + children = ( + B7581D7140293BAE88E43DBE /* fs_inet.cpp */, + 5CB4781DF8C432C688F30CDD /* ftp.cpp */, + F84F0DB790A23D92A193D2B4 /* http.cpp */, + 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */, + DE8238DA30FF3FB984511250 /* sckaddr.cpp */, + 56653FACC7D13804A70556AD /* sckfile.cpp */, + 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */, + D784A32C094730FEAA391A9B /* sckstrm.cpp */, + 40CE02524DD4385AB2C3DF95 /* socket.cpp */, + 49612306912038DDBCABB4DE /* url.cpp */, + DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9D9 /* src/common */ = { + isa = PBXGroup; + children = ( + A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */, + 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */, + 8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */, + 95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */, + FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */, + 8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */, + 6F23140777B733679D2FAAFC /* odcombocmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DA /* src/common */ = { + isa = PBXGroup; + children = ( + C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DB /* src/common */ = { + isa = PBXGroup; + children = ( + 4048A3523EC03409BD899BEF /* xtixml.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + D957B1B354FC327288FDF9DC /* src/common */ = { + isa = PBXGroup; + children = ( + E08A51FA8D8A361681B07295 /* glcmn.cpp */, + ); + name = src/common; + sourceTree = ""; + }; + E96566B813153B4295AD767B /* stc */ = { + isa = PBXGroup; + children = ( + 9A6B5D3E90513D0396CFE0EF /* src/stc */, + ); + name = stc; + sourceTree = ""; + }; + EB288BE7E74B3328B762A461 /* libtiff */ = { + isa = PBXGroup; + children = ( + A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */, + ); + name = libtiff; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFB /* src/osx */ = { + isa = PBXGroup; + children = ( + B0665A40F3FC3F218074C63C /* artmac.cpp */, + 302A13BC64C238A297F4399F /* brush.cpp */, + BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */, + 5FF661188B563D27A11F5716 /* fontutil.cpp */, + 027D2F04BE933ED6B9BA1518 /* imaglist.cpp */, + 693F731B7D1730A79485F9EC /* minifram.cpp */, + 19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */, + BEF6B3FB66243812969E5BD1 /* palette.cpp */, + 4BA819575B5136B09FA8FEB1 /* pen.cpp */, + 9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */, + AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */, + EED7C691150139EFA35E8EBD /* utils_osx.cpp */, + 26D7C4995D7A35A1854B533F /* window_osx.cpp */, + C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */, + 38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */, + CF4F4F5211933057824B5621 /* button_osx.cpp */, + 998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */, + 9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */, + 59D075A3E96F3187B58F6D03 /* choice_osx.cpp */, + 543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */, + CA72410F615B3A78A6340532 /* dnd_osx.cpp */, + EC28591B403B32B7AFCC079D /* gauge_osx.cpp */, + B99CA41708513A599AE275A2 /* listbox_osx.cpp */, + 66C21CA37BF63893887FD91B /* menu_osx.cpp */, + CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */, + 5248A45AB113341EAC361910 /* notebook_osx.cpp */, + 9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */, + 773D91F8280434519BD167EA /* radiobox_osx.cpp */, + 5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */, + 600740717F7E320F8CA78384 /* scrolbar_osx.cpp */, + D215A0D67563350CB4EECB06 /* slider_osx.cpp */, + 5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */, + 97503C55E5463266A48970F8 /* spinctrl_osx.cpp */, + 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */, + 9F16A18CD9C23410B18592FD /* statbox_osx.cpp */, + DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */, + 7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */, + 777385D10CCC350C90F02824 /* textentry_osx.cpp */, + 6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */, + 1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */, + 6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */, + 8C78A1539462370CAA429508 /* accel.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFC /* src/osx */ = { + isa = PBXGroup; + children = ( + A9B2316B32653DA0939A372D /* sound_osx.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + F494694AB1FD30DEA2087AFD /* src/osx */ = { + isa = PBXGroup; + children = ( + FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */, + ); + name = src/osx; + sourceTree = ""; + }; + FE1C78F1707A30878CBB2B4B /* ribbon */ = { + isa = PBXGroup; + children = ( + B402B38DB4CF3883AF4743C0 /* src/ribbon */, + ); + name = ribbon; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + B688C600AA163F61B2B151DE /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + BAB02EC06578349A9171CCAC /* static */ = { + isa = PBXNativeTarget; + buildConfigurationList = 336FCCBABBEF3C4AA92AD394 /* Build configuration list for PBXNativeTarget "static" */; + buildPhases = ( + 94E713C89B403F568A694F9A /* ShellScript */, + B688C600AA163F61B2B151DE /* Headers */, + 8BD3A3B4622D37B8B5DB242D /* Sources */, + 82F403E7B8653CBD908BC257 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = static; + productName = wxiPhone; + productReference = B4DEA098A05736AE94F01926 /* libwx_osx_iphone.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 19367367C9323490BB936F06 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = A66311F47C8832F6A58105B6 /* Build configuration list for PBXProject "wxiphone" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 02A787C8E96336F3B7287626 /* wxiPhone */; + productRefGroup = C2FC1A9BBB8C3046994369BF /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + BAB02EC06578349A9171CCAC /* static */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXShellScriptBuildPhase section */ + 94E713C89B403F568A694F9A /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${WXROOT}/distrib/mac/pbsetup-sh\" \"${WXROOT}/src\" \"${WXROOT}/build/osx/setup/${WXTOOLKIT}\""; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8BD3A3B4622D37B8B5DB242D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 59BFB8C8310E37B39AF8B0D4 /* any.cpp in Sources */, + D5A25AC579F436509805335A /* appbase.cpp in Sources */, + C2B07E2ECDDC3833BDC9B28C /* arcall.cpp in Sources */, + 4CF9BA40653C3153805D88AB /* arcfind.cpp in Sources */, + 3EB6B8528A0D3B6CADAE1256 /* archive.cpp in Sources */, + 3B8A54D5E5A53607A6F7979A /* arrstr.cpp in Sources */, + 0A2A4D2DC8F63FE1AC0BFAAF /* base64.cpp in Sources */, + 319FB8E64CE731D6A58AD301 /* clntdata.cpp in Sources */, + 51437DC2AD7B3BEB9A53CE1A /* cmdline.cpp in Sources */, + DA0FA502405A37B2A5698D20 /* config.cpp in Sources */, + BB6FE851028C3DE7A070C213 /* convauto.cpp in Sources */, + F89405757B063F80B111F469 /* datetime.cpp in Sources */, + 1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */, + E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */, + 3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */, + 54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */, + AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */, + 0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */, + 246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */, + 97BAFEAD53E238B6881178DD /* evtloopcmn.cpp in Sources */, + F07D84D124F23E7FA11CF148 /* extended.c in Sources */, + FEF99FF6C38D3B488396B142 /* ffile.cpp in Sources */, + D6C3421AD2A537AAA2F0AB80 /* file.cpp in Sources */, + FFF5BFBE600E35FAB7EA522C /* fileback.cpp in Sources */, + 41943A8F82723027A151A468 /* fileconf.cpp in Sources */, + 49260580A7F23B569A827D3F /* filefn.cpp in Sources */, + D4C87E227A28391891D89088 /* filename.cpp in Sources */, + 8A4046BD38873D9CAC9C2B59 /* filesys.cpp in Sources */, + 9E0B67E34B683412978BA82D /* filtall.cpp in Sources */, + CA4DCD57060B38CC8B2283D7 /* filtfind.cpp in Sources */, + 2FA1A8FE3644325ABAD273A4 /* fmapbase.cpp in Sources */, + FE2DBCCC1D0B36A3BE4493C0 /* fs_arc.cpp in Sources */, + F6B85CD918E93923BE631B95 /* fs_filter.cpp in Sources */, + FE5285579C7F39C48FC66B10 /* hash.cpp in Sources */, + 595DCB164D55342EB86604EC /* hashmap.cpp in Sources */, + 1B06622C8D8731FC832199E2 /* init.cpp in Sources */, + 0743AE8613F535A0ABB79315 /* intl.cpp in Sources */, + A336FD218BE63B19991CA513 /* ipcbase.cpp in Sources */, + BFD4B8871B3934048B631419 /* languageinfo.cpp in Sources */, + 68AC8860B0943C1FAF76D96B /* list.cpp in Sources */, + 3141FEDED0943BD6A2EF858F /* log.cpp in Sources */, + 0C7E2D5C22A232368F862A60 /* longlong.cpp in Sources */, + DC978B60F6DF3176B5B114C3 /* memory.cpp in Sources */, + B59FC7345C383D9099391AC3 /* mimecmn.cpp in Sources */, + EC3A1C620D323B5590AABF02 /* module.cpp in Sources */, + F38202271C6131908C358DEC /* mstream.cpp in Sources */, + 31DD19A942283FA8810B6382 /* numformatter.cpp in Sources */, + 23A7AF68A03E380785EE7C24 /* object.cpp in Sources */, + D6B73239BF0E32288161679C /* platinfo.cpp in Sources */, + 0A406D2D1ADA343891E3664C /* powercmn.cpp in Sources */, + CA85901B9E2538CFB7E44216 /* process.cpp in Sources */, + 7A7439BE66AA3771B4A89048 /* regex.cpp in Sources */, + CF3082BA1ED232F4B904BD14 /* stdpbase.cpp in Sources */, + 539B586AEAD630A79FC12ECF /* sstream.cpp in Sources */, + 028257C52CAE3038AA862C35 /* stdstream.cpp in Sources */, + 6AA0EE765330326380989FD1 /* stopwatch.cpp in Sources */, + E882402BEE0330A080A6516F /* strconv.cpp in Sources */, + 30493B486DFF35AF80D12C49 /* stream.cpp in Sources */, + 795613831EC8332A83FF26E7 /* string.cpp in Sources */, + 55F0D287F60F3EDEA16CCB64 /* stringimpl.cpp in Sources */, + 88E1AE56FD393C8BA5CF8545 /* stringops.cpp in Sources */, + 056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */, + 4DD98A9436C83CF3B9425A78 /* sysopt.cpp in Sources */, + 9FB1E1763EFA334CA0C07C49 /* tarstrm.cpp in Sources */, + 2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */, + 6167245C417A32179EC37D2D /* textfile.cpp in Sources */, + 7FC3D17B3C853FE58841002D /* timercmn.cpp in Sources */, + 729091CC33C73C989B4E0719 /* timerimpl.cpp in Sources */, + BF8C33B7CB3A3ECE814A95FB /* tokenzr.cpp in Sources */, + ABCD15C4AB37396EA17B7B28 /* translation.cpp in Sources */, + 087FF6DE223A32509692F39B /* txtstrm.cpp in Sources */, + DAAFBED07FF8365B96D20B99 /* unichar.cpp in Sources */, + 2E8440A2BDD53BE7B01547C2 /* uri.cpp in Sources */, + C425A172B0AB3EBD9AC9A590 /* ustring.cpp in Sources */, + 65E8A5F333D7336C816F0D0C /* variant.cpp in Sources */, + E53AFF04877D34C386D77380 /* wfstream.cpp in Sources */, + 319EA32592DA3C74B86DDDFF /* wxcrt.cpp in Sources */, + A2473402D8B83628B1F66749 /* wxprintf.cpp in Sources */, + BA7B12396B873FDA8F3A2748 /* xlocale.cpp in Sources */, + C5419BC04D6234B5A8307B81 /* xti.cpp in Sources */, + 52C0984A2A4F31BC885519B0 /* xtistrm.cpp in Sources */, + CA155860CE9A3A8189C3A4C2 /* zipstrm.cpp in Sources */, + 014AF0BAB1783A5D9D75A7ED /* zstream.cpp in Sources */, + A93D0E6F0871368EA8FC9FF9 /* fswatchercmn.cpp in Sources */, + E49F0D43B5A63EF1A57A7112 /* fswatcherg.cpp in Sources */, + 4657E7382E9E3EDC8DE2401E /* mimetype.cpp in Sources */, + 1DBDF75500D73A3098015E7F /* cfstring.cpp in Sources */, + 9FBC642677C63D01AA2511BC /* evtloop_cf.cpp in Sources */, + 13250B531B1B3F9998C59DA9 /* stdpaths_cf.cpp in Sources */, + AAAB5DF8E60736D88273DCFE /* strconv_cf.cpp in Sources */, + 4E140367282F38C8A904A004 /* utilsexc_base.cpp in Sources */, + D36E76A4CAF5352D9397E1FF /* fdiodispatcher.cpp in Sources */, + D3FB75C8E3A73AE38EE8A6F6 /* selectdispatcher.cpp in Sources */, + BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */, + 403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */, + 20BEEFFA08F3396791596870 /* dlunix.cpp in Sources */, + CBBD7B32DB7B3E24AE745D78 /* epolldispatcher.cpp in Sources */, + D18E2985C48733B2B7B3D442 /* evtloopunix.cpp in Sources */, + 3D22FC202D903007AEE3D164 /* fdiounix.cpp in Sources */, + 4B88254FF9963833A276A64C /* snglinst.cpp in Sources */, + 5F78DB0417BF3CE1B4E35C7F /* stackwalk.cpp in Sources */, + E8F0C87119C63E8E81423A7C /* stdpaths.cpp in Sources */, + 2F35A207C3993DE08E4FE0B0 /* timerunx.cpp in Sources */, + F5D2146C94E733FAAB6D286A /* threadpsx.cpp in Sources */, + B5C7FD8C27F43F3289A77FC9 /* utilsunx.cpp in Sources */, + FF7DB2884F6E3C5DB4BDF61D /* fswatcher_kqueue.cpp in Sources */, + 55D893FDD00633FEA82ABD81 /* event.cpp in Sources */, + 131B879180AE3FB481F81CC7 /* fs_mem.cpp in Sources */, + 05814571E7A83F5DBFB6E4C4 /* msgout.cpp in Sources */, + 80665EEAE8613DF8A93A7984 /* utilscmn.cpp in Sources */, + F4C0CEADEDC23610BF6983D6 /* artmac.cpp in Sources */, + 296692A7A3783E3A83D005C6 /* brush.cpp in Sources */, + 86AED49CEAFC3637B1F10537 /* dialog_osx.cpp in Sources */, + DC6B669C9A78398F914AEE53 /* fontutil.cpp in Sources */, + 1EDED99760B23A1999E75C12 /* imaglist.cpp in Sources */, + C1CDD035AA393ACC9E202C03 /* minifram.cpp in Sources */, + 4269B85FDC5639BEB76A8AEB /* nonownedwnd_osx.cpp in Sources */, + AC91349D7F0E37739B1F5165 /* palette.cpp in Sources */, + 2480859662ED399799E120A5 /* pen.cpp in Sources */, + 0E024D145DDD38ACAE68F462 /* toplevel_osx.cpp in Sources */, + 02BB539E2AD63C078DA776B0 /* uiaction_osx.cpp in Sources */, + 052331773CF6362C9A6CF38E /* utils_osx.cpp in Sources */, + CB2E99E8FB7D3269A333A55E /* window_osx.cpp in Sources */, + 03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */, + FF50EC0EC5F23DF890C6E95F /* colour.cpp in Sources */, + BD2B17EB72E73A6EB6E0B26F /* dcmemory.cpp in Sources */, + F1F484DD591337399FCD0463 /* display.cpp in Sources */, + 371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */, + 86BE5213D3F131D8A6862679 /* hid.cpp in Sources */, + AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */, + 91BDA5B04CF33C9AB7358B8A /* timer.cpp in Sources */, + C2D45B334BE03F6C941CA041 /* utilsexc_cf.cpp in Sources */, + A92439BAFD3A30A29DD93131 /* apptraits.cpp in Sources */, + E82CB89681FF3747B6A94427 /* anybutton_osx.cpp in Sources */, + 49FE0228D8FD3F7AB64A4432 /* bmpbuttn_osx.cpp in Sources */, + 6AC347D2DCC730149A0A83D8 /* button_osx.cpp in Sources */, + 0E92CEF677AA32C9A8CDA0A7 /* checkbox_osx.cpp in Sources */, + 07412469921A3E488A2F9BA6 /* checklst_osx.cpp in Sources */, + 4666CDC48BA9301EA283BFFF /* choice_osx.cpp in Sources */, + 0836590D35FE37988DE70442 /* combobox_osx.cpp in Sources */, + 2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */, + 0FFFFA2F762B3160955D1D88 /* gauge_osx.cpp in Sources */, + E4B826CE70283D999CB591F3 /* listbox_osx.cpp in Sources */, + B198DA8239E9358A9D56B988 /* menu_osx.cpp in Sources */, + 1DF3A4F85FCB3BA79A552F3D /* menuitem_osx.cpp in Sources */, + A3321FE2A87D3BD69E0BB009 /* notebook_osx.cpp in Sources */, + 0C9A379D97B133FA831175A7 /* printdlg_osx.cpp in Sources */, + B1775EF7C72233408044034B /* radiobox_osx.cpp in Sources */, + 6A081BF19747385CB4C1877F /* radiobut_osx.cpp in Sources */, + DF8CE011EAC23F73BDA1C44D /* scrolbar_osx.cpp in Sources */, + 27E73CA5C35A30CE89946ECA /* slider_osx.cpp in Sources */, + 00F1531404F832C6AE0748F2 /* spinbutt_osx.cpp in Sources */, + 2939CA3680A13E39AB88CB05 /* spinctrl_osx.cpp in Sources */, + 91EA325FCE3A3A6A8D1D21A5 /* srchctrl_osx.cpp in Sources */, + 221DC4F6678A3EC5ACDDEA4F /* statbox_osx.cpp in Sources */, + 91BC7802C15337CDA84C3742 /* statline_osx.cpp in Sources */, + 283C3ABE42433244983C27C1 /* stattext_osx.cpp in Sources */, + B6891F848CA0325EAB6D1373 /* textentry_osx.cpp in Sources */, + EDCA35F1555F3509895CCA69 /* textctrl_osx.cpp in Sources */, + 664A54F914443110B7BB6928 /* tglbtn_osx.cpp in Sources */, + A569A33A2097316D8110C2C1 /* toolbar_osx.cpp in Sources */, + 0AEBA7389E223781A7A257A1 /* webkit.mm in Sources */, + F5FF98C231B33E3EB7902C64 /* colordlgosx.mm in Sources */, + 2386B575BC3931D2AF86CB33 /* fontdlgosx.mm in Sources */, + 2EECB3C2F9523D0B95847A7F /* accel.cpp in Sources */, + 7F77E347E1243D77A666FB43 /* clipbrd.cpp in Sources */, + 5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */, + D66F5D4D204B3B789C7F76B9 /* fontdlg.cpp in Sources */, + 692FCCABFB963696AFC1E122 /* gdiobj.cpp in Sources */, + 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */, + B0E94A59C83637C09FAAE71C /* app.cpp in Sources */, + BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */, + EB52C6A915943813932944FE /* control.cpp in Sources */, + 45AB45C6B24A3983B22E56A5 /* dataobj.cpp in Sources */, + D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */, + 182DFDBB58653FD9863D4176 /* dcprint.cpp in Sources */, + AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */, + 939E53CA56F33194B4681117 /* glgrab.cpp in Sources */, + 774EB9F3F7E93A379E1F7551 /* graphics.cpp in Sources */, + 5792675690843C6AA4125A72 /* font.cpp in Sources */, + BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */, + 27E2EABB117334CD89CFD2A4 /* mdi.cpp in Sources */, + 73AA68AB9F1236ED9F1FBB2E /* metafile.cpp in Sources */, + CD2A9111B8A83AFA8B5B97E5 /* overlay.cpp in Sources */, + 805CCAE64D023561AD334B53 /* popupwin.cpp in Sources */, + 6832385DDBB33D1B90C73CBA /* renderer.cpp in Sources */, + 437519A6002A3A0FB2C9A8FC /* settings.cpp in Sources */, + F6A1AC5CF84E32C19F91A614 /* statbrma.cpp in Sources */, + D070C3BE95483FE38BABA1BE /* region.cpp in Sources */, + 07158EBC05A637ECA9DC7B4F /* utilscocoa.mm in Sources */, + 7E6C627A325F32FFB2EF9B9E /* caret.cpp in Sources */, + FB8B6E4789A3311A98C5B0A8 /* clrpickerg.cpp in Sources */, + 7569F0BC3C603EB19168088F /* collpaneg.cpp in Sources */, + BBAABF3C693E37D3B0FF2502 /* colrdlgg.cpp in Sources */, + F70156C3E68B38FCB72FE253 /* dirdlgg.cpp in Sources */, + E1F7C51F411B3AF39476E488 /* fdrepdlg.cpp in Sources */, + A965348C7FA73CEC90C8FA25 /* filedlgg.cpp in Sources */, + FD1F6CD8286D3D428FD52A28 /* filepickerg.cpp in Sources */, + 16A382A265DE32FABC318F6F /* fontdlgg.cpp in Sources */, + BEAC2449AFA7304989BA301E /* fontpickerg.cpp in Sources */, + C3AC94EA13C1352790BF5FF7 /* listctrl.cpp in Sources */, + C005C2D547E735E9B081658E /* prntdlgg.cpp in Sources */, + A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */, + 9519D59421513FF28FF717B6 /* regiong.cpp in Sources */, + 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */, + 65AD3B31319C35F1AC9EC625 /* anybutton.mm in Sources */, + 14D6D5F8F5ED3C71936DD2AF /* button.mm in Sources */, + 67A0583ADD8C35B8B9BA3D12 /* checkbox.mm in Sources */, + 6C3A459236F736B8A14A13AC /* dialog.mm in Sources */, + 58AABAD40AA236438347DDDE /* evtloop.mm in Sources */, + 23E9AF567E873B948EFEA180 /* gauge.mm in Sources */, + F84D59648206349A9768157C /* msgdlg.mm in Sources */, + 893BDA491EDE3A0E91FADE40 /* nonownedwnd.mm in Sources */, + 5303FA25D0773FAEB963D8E3 /* scrolbar.mm in Sources */, + 30AEDF41EC5C374DBF96EFFB /* slider.mm in Sources */, + 21F74D4D4D84375AB155FD5B /* stattext.mm in Sources */, + 675B4E6CBA8632E89B4AC26D /* textctrl.mm in Sources */, + A53B8C3ED0D33A1D9AA8219A /* toolbar.mm in Sources */, + A1A7D793B034398B8696EF33 /* utils.mm in Sources */, + 815AE3FED68330F4933AA16F /* window.mm in Sources */, + 3CDE2B6BF88D326189F069BD /* accelcmn.cpp in Sources */, + BDB8EF0E0DA03693BFB77EF7 /* accesscmn.cpp in Sources */, + 205520440CD13C0AB9E89159 /* anidecod.cpp in Sources */, + 353B584AD0C03919A57A3048 /* affinematrix2d.cpp in Sources */, + DDC71B80D562303690FDBE4C /* appcmn.cpp in Sources */, + EE0EA850822E35F596B5EBBA /* artprov.cpp in Sources */, + A283187810EB32DAA173BD33 /* artstd.cpp in Sources */, + 75DCE6FF00E93C5D93970842 /* arttango.cpp in Sources */, + 1749412E53B9311DABA71DDC /* bmpbase.cpp in Sources */, + 3ACCC2EB8E973C11835EB597 /* bmpbtncmn.cpp in Sources */, + A5775D87FD713CBB930A783E /* bookctrl.cpp in Sources */, + C3A63D7091913CD39094AE0B /* btncmn.cpp in Sources */, + FBA19C939E1E33EDB05043FE /* cairo.cpp in Sources */, + 427E6AF88CF73D799206E37D /* checkboxcmn.cpp in Sources */, + 37749AC3468836FC857BD0D5 /* checklstcmn.cpp in Sources */, + C0CDA289E9EC3E20BE70B2E6 /* choiccmn.cpp in Sources */, + DFEB8DA3D42734949CB1E1AA /* clipcmn.cpp in Sources */, + 9D4B67A357D23B5283CA8D98 /* clrpickercmn.cpp in Sources */, + EBF2D44758003221A22202BC /* colourcmn.cpp in Sources */, + 335DD610974A33D4B6581E2A /* colourdata.cpp in Sources */, + D542C7819D593112AE5F7C3D /* combocmn.cpp in Sources */, + 6F0605F3A4E83BF0BF4C8B7E /* cmdproc.cpp in Sources */, + 20F10669703137E68318C6FD /* cmndata.cpp in Sources */, + 6FA47EAACE613B039B6EC261 /* containr.cpp in Sources */, + 0C485288EA86379D9FD66536 /* cshelp.cpp in Sources */, + 25656617A56D342AA3D1BFE2 /* ctrlcmn.cpp in Sources */, + BF1760458996391E8EB42949 /* ctrlsub.cpp in Sources */, + 2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */, + 39D6435B10073B85A499AFD8 /* dcbufcmn.cpp in Sources */, + 9564A6968D66325DAEADEBA3 /* dcgraph.cpp in Sources */, + B791BD05072B3B909A7093C2 /* dcsvg.cpp in Sources */, + B559E894684A38238CAAA115 /* dirctrlcmn.cpp in Sources */, + 63F0C8EEDF4B3641878A8B4D /* dlgcmn.cpp in Sources */, + B839235BED6F3609BDB732B8 /* dndcmn.cpp in Sources */, + 2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */, + F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */, + B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */, + F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */, + 6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */, + 447FEC72F3C234378CE28DE7 /* effects.cpp in Sources */, + C2E37E798F743A4199C8658E /* fddlgcmn.cpp in Sources */, + 37715483D08335B790FFE058 /* filectrlcmn.cpp in Sources */, + 0730A107A2B935A9923C8EF2 /* filehistorycmn.cpp in Sources */, + 9881E3FB23ED3283B6CC71A2 /* filepickercmn.cpp in Sources */, + 064908348009398C8EA8497C /* fontpickercmn.cpp in Sources */, + 1E166FC1A7B3371FB038B172 /* fldlgcmn.cpp in Sources */, + F747991E5C973F9B8C9D800A /* fontcmn.cpp in Sources */, + 1E2AB43075973AE59A8D89C1 /* fontdata.cpp in Sources */, + F910C74E48823E0BA7F7885D /* graphicc.cpp in Sources */, + F1E4D7CA634E33808AE3B522 /* fontenumcmn.cpp in Sources */, + D5AABE973F3A351EB1C1A5A6 /* fontmap.cpp in Sources */, + 60706F8836A130A2AF282FE1 /* fontutilcmn.cpp in Sources */, + EDD5725CF41336EFA7FB3009 /* framecmn.cpp in Sources */, + EAA469E1A0CC33E4A21A3F7A /* gaugecmn.cpp in Sources */, + 5A8638C234133824BDF93BBF /* gbsizer.cpp in Sources */, + 0E60E17BA4B23347A4F20160 /* gdicmn.cpp in Sources */, + 95AD56D602CF3C5085602AF8 /* geometry.cpp in Sources */, + 758629DA468A3EF7B1C15241 /* gifdecod.cpp in Sources */, + 7B642B17F5D23F4F8ED38BB4 /* graphcmn.cpp in Sources */, + B8FEEC2C94183AB69C963177 /* headercolcmn.cpp in Sources */, + 383A6993E90936D39A5F12BD /* headerctrlcmn.cpp in Sources */, + 4657479AF35533AEB7876676 /* helpbase.cpp in Sources */, + BF2585CFA6853023975F1E78 /* iconbndl.cpp in Sources */, + 5B5B8DF915D438AA9FCEB39E /* imagall.cpp in Sources */, + 0813551C951A3AD1A5EF01B2 /* imagbmp.cpp in Sources */, + 6C822F7F313734DCB51F44B9 /* image.cpp in Sources */, + 89046455F49D3D75A21C9DB8 /* imagfill.cpp in Sources */, + 36DB80FD5B153E9099DB6912 /* imaggif.cpp in Sources */, + 9110ACFC3CFB3C7994E907B0 /* imagiff.cpp in Sources */, + D13596A4E3CD31DE810061A1 /* imagjpeg.cpp in Sources */, + D83B32B788EC310D919E0DF7 /* imagpcx.cpp in Sources */, + 23965E313EDC3BBE9B2FA1C5 /* imagpng.cpp in Sources */, + 46E331300D8F349DB36AB50A /* imagpnm.cpp in Sources */, + AAABEE399008310A8BC9BE43 /* imagtga.cpp in Sources */, + 3C36437B2E933F83984D431E /* imagtiff.cpp in Sources */, + 774A89998E09308CBFB03EE0 /* imagxpm.cpp in Sources */, + 63F2517EC6B2334CA825A6F9 /* layout.cpp in Sources */, + CFF73578F04D357E83D1D830 /* lboxcmn.cpp in Sources */, + 164010B26D363F5FA09785B6 /* listctrlcmn.cpp in Sources */, + 2F7F5B9BBCD83D90B237A1A0 /* markupparser.cpp in Sources */, + 9A83D365AD1F37FA9C7030C2 /* matrix.cpp in Sources */, + E3A4615870B139D29FE727C1 /* menucmn.cpp in Sources */, + BD49EC50CB363642BDBF25C8 /* mousemanager.cpp in Sources */, + 7A84B9471A3238B4B66B1776 /* nbkbase.cpp in Sources */, + AC6AC589EFB233C7B65A3224 /* overlaycmn.cpp in Sources */, + D6B2A64A78AF3F2983B441A8 /* ownerdrwcmn.cpp in Sources */, + 0742292656623EC481B34369 /* paper.cpp in Sources */, + E2A73751CECF32A68FFAEE82 /* panelcmn.cpp in Sources */, + 4279D39CAAF834F6A5B99196 /* persist.cpp in Sources */, + AF1E3338E892336E924AF631 /* pickerbase.cpp in Sources */, + 6E68759BC2E63CA59C12FDC0 /* popupcmn.cpp in Sources */, + 1C52CB9487DF3AB9AF243B47 /* prntbase.cpp in Sources */, + 0B98B6721DEE37A1ADEA382B /* quantize.cpp in Sources */, + AE5286C71D1130EAA368A1C4 /* radiobtncmn.cpp in Sources */, + AEB9099819B33F4A8AAB9F54 /* radiocmn.cpp in Sources */, + 5116CE330E333724A66982E3 /* rearrangectrl.cpp in Sources */, + A9864F0104FA344BBE79D3BC /* rendcmn.cpp in Sources */, + A80D00249A693F43A9CBE777 /* rgncmn.cpp in Sources */, + C259D01CC62533D296EF023A /* scrolbarcmn.cpp in Sources */, + 7625D908B2CD34C78243BA8F /* settcmn.cpp in Sources */, + F5D0BCF1A6C839E5829199E2 /* sizer.cpp in Sources */, + EDD92822EBD93E86AE5A2ED0 /* slidercmn.cpp in Sources */, + F46777ABE0743B04A1E1F0A4 /* spinbtncmn.cpp in Sources */, + 49C873EE448C3CD9A32012CD /* spinctrlcmn.cpp in Sources */, + 1EA81A0E8E5A3B38B4D80337 /* srchcmn.cpp in Sources */, + 4AEC67BF65B039D99F421666 /* statbar.cpp in Sources */, + 7C52E7CC12463941B0E4D402 /* statbmpcmn.cpp in Sources */, + D9DCBE799DB634C2A73FD6BD /* statboxcmn.cpp in Sources */, + 8B38C6C416BA3A51B37F60C4 /* statlinecmn.cpp in Sources */, + D9EE059D3C3C3C13AE4419F1 /* stattextcmn.cpp in Sources */, + BAFF04F1680F32DA988EB03D /* stockitem.cpp in Sources */, + 4958BD2E717A3F03AB030188 /* tbarbase.cpp in Sources */, + 9744994E8A813AA6938A7CE2 /* textcmn.cpp in Sources */, + AD4A533C4E1633598A6D5C6F /* textentrycmn.cpp in Sources */, + 700BBDECBE313E108BA99ABD /* toplvcmn.cpp in Sources */, + 45FE206BBAD13DDCA1EA41CF /* treebase.cpp in Sources */, + 796311E398FF313C84218824 /* uiactioncmn.cpp in Sources */, + E9EDB5C92D5D3B529E8D73B0 /* valgen.cpp in Sources */, + 9F70A89D00B03D4894AF7638 /* validate.cpp in Sources */, + 1937FBA0A0DD32A8A743CFE1 /* valtext.cpp in Sources */, + 6A032420671B375D81273714 /* valnum.cpp in Sources */, + A2769D1659AE3CA3B58C2CAE /* wincmn.cpp in Sources */, + 1BCC944F5E0936F5830F03E8 /* windowid.cpp in Sources */, + 3399AB7BB1333B5AAF5FAF55 /* wrapsizer.cpp in Sources */, + C1E5799141603A75A26BEEA7 /* xpmdecod.cpp in Sources */, + F5806029B1BA3924A8FDDBC1 /* busyinfo.cpp in Sources */, + CB078622E90F33BE9D131131 /* buttonbar.cpp in Sources */, + 03035C5CE4BC3288A5A18424 /* choicdgg.cpp in Sources */, + 9CA687845B3F30CCA44A89D0 /* choicbkg.cpp in Sources */, + 9C1F073349FD393E9220C0D3 /* combog.cpp in Sources */, + EAE02BA934B43EEE92C496C7 /* dcpsg.cpp in Sources */, + 22AE900003F73134BBEE8BB6 /* dirctrlg.cpp in Sources */, + 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */, + 7EF89F935314301381802FAB /* filectrlg.cpp in Sources */, + 7D615329368D32709CEF4B58 /* headerctrlg.cpp in Sources */, + 2C95DFA8EE463487956B4EB4 /* infobar.cpp in Sources */, + 02E8F1195B653D26AAA89462 /* listbkg.cpp in Sources */, + 026F90F7492C316A94128916 /* logg.cpp in Sources */, + 633DD2E870263F42A8DBF9BF /* markuptext.cpp in Sources */, + 745C39E90E8C3C08A887B51C /* msgdlgg.cpp in Sources */, + 1AF2B2346C9639DAA4D15F30 /* numdlgg.cpp in Sources */, + EE9194D6C4C138BF9DAB8633 /* panelg.cpp in Sources */, + 4D0BA8B9F72C3C31BC170CE2 /* progdlgg.cpp in Sources */, + DEB35F871F8E3B90AD207AEE /* printps.cpp in Sources */, + 96927C5A21FD3ACF936CDF6C /* renderg.cpp in Sources */, + F72020415D713C1BA41C17CF /* richmsgdlgg.cpp in Sources */, + ED8D23D79FF33ED380FE09EB /* scrlwing.cpp in Sources */, + 85F9828B80B03178A274BD17 /* selstore.cpp in Sources */, + 84997126352137E798CD258A /* spinctlg.cpp in Sources */, + 62F1DC80D631335B892610A8 /* splitter.cpp in Sources */, + B6C364CB4AE33708A862B4B4 /* srchctlg.cpp in Sources */, + 8FC1C07FEE793897A1E96D23 /* statbmpg.cpp in Sources */, + BF9B151DC0543E37878F8B9A /* stattextg.cpp in Sources */, + 62757F24C4EE3B84B6AE3F14 /* textdlgg.cpp in Sources */, + 249C9177B1A33EFEAB30F93F /* tipwin.cpp in Sources */, + 32FECED7A7633C4D8C1BFBB3 /* toolbkg.cpp in Sources */, + DB3C3AA956A03FB492480266 /* treectlg.cpp in Sources */, + 5388468A6F8F3141B25CD400 /* treebkg.cpp in Sources */, + 87C67583D36C3465ACD64103 /* vlbox.cpp in Sources */, + A465A43B756630F1944B5A56 /* vscroll.cpp in Sources */, + 567A32722BA33AEE9FF93D7C /* fs_inet.cpp in Sources */, + 65514CD6A9F23ED98436AC02 /* ftp.cpp in Sources */, + B84642DA949638A189032CE6 /* http.cpp in Sources */, + 6CA1BAEBBDB4336E9E201F95 /* protocol.cpp in Sources */, + E39021D3CDCD33BAA646B006 /* sckaddr.cpp in Sources */, + 9F608A33D52D327FAA295624 /* sckfile.cpp in Sources */, + BCD81FD3D1EC305F801E1C1B /* sckipc.cpp in Sources */, + A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */, + 6978D7A20DA93A329DDD1383 /* socket.cpp in Sources */, + E7140F3AB94D3FDFA86D8C06 /* url.cpp in Sources */, + 652CFDD9A1C1366E99B5D6BC /* socketiohandler.cpp in Sources */, + 346D274E17673A01B0177D5B /* sockunix.cpp in Sources */, + AD07124BBA613B47829F0692 /* sockosx.cpp in Sources */, + CFDBB80A4C9A3BA092273936 /* animatecmn.cpp in Sources */, + 5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */, + 901F659891613419B8643952 /* calctrlcmn.cpp in Sources */, + 1CD4F67F48CF3A5FA477D86E /* datavcmn.cpp in Sources */, + 2FAE979E6FE23D088C768B7D /* gridcmn.cpp in Sources */, + 7B4DA2F5F25B3E188CBAFE38 /* hyperlnkcmn.cpp in Sources */, + E6D18B2EDE353F678830859F /* odcombocmn.cpp in Sources */, + FEA741A9B6663A4C929893C2 /* aboutdlgg.cpp in Sources */, + B189DB62AE9F30A1B613756B /* bmpcboxg.cpp in Sources */, + 2F50DBC14FE538A49823925A /* calctrlg.cpp in Sources */, + 8A662992FFCB32E99D11950C /* commandlinkbuttong.cpp in Sources */, + 8B60964DA1DF3F3DB40BE123 /* datavgen.cpp in Sources */, + B4425B59CC27389CA9FF81D1 /* datectlg.cpp in Sources */, + 5557AA36FBCC3ED9A5F5751A /* editlbox.cpp in Sources */, + A139B846584436BCBEBAE3BF /* grid.cpp in Sources */, + 2E930206397C3EDCBD8206FC /* gridctrl.cpp in Sources */, + E5D698D2606A304DA743AF92 /* grideditors.cpp in Sources */, + 187F921A95DA3594B0AD980D /* gridsel.cpp in Sources */, + F016C51053373E658ED4C9A9 /* helpext.cpp in Sources */, + 760C729E41D93CC1AA2B4E0D /* hyperlinkg.cpp in Sources */, + 955D2199F1893D37BA2D7478 /* laywin.cpp in Sources */, + CEE0D7A7D5D8323B9957A780 /* notifmsgg.cpp in Sources */, + 1E17F95DD433379E8C18298C /* odcombo.cpp in Sources */, + 6A10511265493FA2BB79CE4D /* propdlg.cpp in Sources */, + 3554C88010CE3D2A8970A135 /* sashwin.cpp in Sources */, + 8AA341CCFB8E3F6AB3523595 /* splash.cpp in Sources */, + 77BC918AF05C30E8A0BD27F8 /* tipdlg.cpp in Sources */, + 82FA4AA043213728AC266700 /* wizard.cpp in Sources */, + 46F341B46F80376B962759F5 /* animateg.cpp in Sources */, + CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */, + 61FEDBF2D47A3B4E861F8296 /* sound.cpp in Sources */, + DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */, + 47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */, + BAA75384DA82370298672333 /* helpctrl.cpp in Sources */, + 2CAD4DF9505F36E4A2EAD53D /* helpdata.cpp in Sources */, + D17E3053DA0D3F7EA4D0951B /* helpdlg.cpp in Sources */, + 7C87CC7641033D91823ED688 /* helpfrm.cpp in Sources */, + 3D762A0BBF1B39B88A769632 /* helpwnd.cpp in Sources */, + 4DA209AEF4AD32AAB97F9718 /* htmlcell.cpp in Sources */, + FD3CC5F0AA41384B9388A1E0 /* htmlfilt.cpp in Sources */, + C5E5AB869065307F83E27DD1 /* htmlpars.cpp in Sources */, + EBA0986930DA3B59B2FB4F1E /* htmltag.cpp in Sources */, + 93E04642049537EB8A37BA26 /* htmlwin.cpp in Sources */, + 3E99016BDE043A08B4D6B3CE /* htmprint.cpp in Sources */, + 9836B3D336963795928FE5A1 /* m_dflist.cpp in Sources */, + 66584BC871303041BA622DE0 /* m_fonts.cpp in Sources */, + 99F7D7BFBB543A04AB728375 /* m_hline.cpp in Sources */, + A3586433C4B1398FB1C361D6 /* m_image.cpp in Sources */, + BD53E095EC1136EF853A47D8 /* m_layout.cpp in Sources */, + C05BDB0B5F5A33A9A57FF012 /* m_links.cpp in Sources */, + 81B742D64BEB373DB705947A /* m_list.cpp in Sources */, + FD38B04026F930CC80BC9480 /* m_pre.cpp in Sources */, + 57AE7FCF768F3965BD39B47A /* m_span.cpp in Sources */, + 4CFB7E6E5BD53E2BB39BEF63 /* m_style.cpp in Sources */, + 3D424F4B33653A00AE9B623A /* m_tables.cpp in Sources */, + F3AC352D6DAE3A12A5664768 /* styleparams.cpp in Sources */, + 2A7640E4210334AC93366900 /* winpars.cpp in Sources */, + 87AA9C5D887B3C31A2AFB49D /* htmllbox.cpp in Sources */, + FBE4DB30865D3177B3A9993B /* xh_animatctrl.cpp in Sources */, + 94E510619F433AE3AC884755 /* xh_bmp.cpp in Sources */, + 8966F77CC97B3ED780C8F137 /* xh_bmpcbox.cpp in Sources */, + 84B3625464F732C3A79E1314 /* xh_bmpbt.cpp in Sources */, + D5C304182151365FA9FF8A3D /* xh_bttn.cpp in Sources */, + FE9A662A1F9B34D099C45C1D /* xh_cald.cpp in Sources */, + 6138BCBC8E4438FA91E0EF9F /* xh_chckb.cpp in Sources */, + 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */, + CE17002B5B7E375582747639 /* xh_choic.cpp in Sources */, + 26E4813A97DE323E88119163 /* xh_choicbk.cpp in Sources */, + E7AF3BF2B3473AD9BE66D1A1 /* xh_clrpicker.cpp in Sources */, + 1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */, + E7921B0472B63E4091F4F517 /* xh_collpane.cpp in Sources */, + 84382E5DB3203A73AC5EE390 /* xh_combo.cpp in Sources */, + F569D7A3F0E038E9B4CC2A76 /* xh_comboctrl.cpp in Sources */, + FB09720D13673A7B81BCB645 /* xh_datectrl.cpp in Sources */, + F7D10B6E0CBA32EFAF79C77C /* xh_dirpicker.cpp in Sources */, + 3B7E035ECF3D3FFB9827AC1C /* xh_dlg.cpp in Sources */, + E05B06A7FEEE32D5AD87EA4F /* xh_editlbox.cpp in Sources */, + F24F637D59F637CA9A7E23C9 /* xh_filectrl.cpp in Sources */, + 5FE969523BDB3353AEF96810 /* xh_filepicker.cpp in Sources */, + 438EAEA4B30C325C827F6197 /* xh_fontpicker.cpp in Sources */, + 95826E8528CC32D8934C36EC /* xh_frame.cpp in Sources */, + BE99A85EE76236CC8C719A64 /* xh_gauge.cpp in Sources */, + 26649553E4763EE6BA268B7D /* xh_gdctl.cpp in Sources */, + 72AD4417FF7C3094BB1FF62C /* xh_grid.cpp in Sources */, + 83616D33080E3F0F9FA5FBB4 /* xh_html.cpp in Sources */, + 2B13BFC894C63373B7ACFA3D /* xh_hyperlink.cpp in Sources */, + C34B8675439F39B4845FFC50 /* xh_listb.cpp in Sources */, + F5DF7AF0FA9E371BB71EF798 /* xh_listbk.cpp in Sources */, + 96B507455762391688B5E500 /* xh_listc.cpp in Sources */, + F34D240EB4513FE996179182 /* xh_mdi.cpp in Sources */, + 65FCDBFFF3F138A3ABBAA650 /* xh_menu.cpp in Sources */, + 0FBF7C9EDFB53D8DA0991B55 /* xh_notbk.cpp in Sources */, + 0FA6E1E47F123FF4A902E4D2 /* xh_odcombo.cpp in Sources */, + 36B0B923B836358D9DB0AE10 /* xh_panel.cpp in Sources */, + CDC0FF253B503BA19693D68D /* xh_propdlg.cpp in Sources */, + 47F4FC8717AF3A848812DFCC /* xh_radbt.cpp in Sources */, + 7181709A030D3749AB355B74 /* xh_radbx.cpp in Sources */, + FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */, + 87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */, + 00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */, + E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */, + 5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */, + C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */, + 33ED014A7FF7398794E6E4CF /* xh_split.cpp in Sources */, + 7C9EAFF4A0223EE597E0E39E /* xh_srchctrl.cpp in Sources */, + 8AB7191F7CB838FC8337C48D /* xh_statbar.cpp in Sources */, + 3D3EA1BAAD1833B1B48E9C86 /* xh_stbmp.cpp in Sources */, + F22C401903993639AE05A295 /* xh_stbox.cpp in Sources */, + BF3D600A93403C589B65C5BF /* xh_stlin.cpp in Sources */, + 8292D346BFC33D6E8D3CDDBF /* xh_sttxt.cpp in Sources */, + 0EB6AB38A68D3845AC384A23 /* xh_text.cpp in Sources */, + B181806CC34839E791E54BF0 /* xh_tglbtn.cpp in Sources */, + F3CB42BB6D983675862C01F3 /* xh_toolb.cpp in Sources */, + 17F0494F87533196904F5313 /* xh_toolbk.cpp in Sources */, + 3357BD0518F538E9A949F886 /* xh_tree.cpp in Sources */, + 46CE8B53D2663927AAE5DF9D /* xh_treebk.cpp in Sources */, + C5A8DF376BB13A2A8290C2E5 /* xh_unkwn.cpp in Sources */, + 37DD17F479A1371ABF3589B9 /* xh_wizrd.cpp in Sources */, + 1710A4BB0E6339558A187F8D /* xmlres.cpp in Sources */, + 867F5D1962383C98A8ADDC3D /* xmladv.cpp in Sources */, + 135DFCE48FC03D8294D01A89 /* xmlrsall.cpp in Sources */, + 61FD5E0E28F732E8AB1729F8 /* xml.cpp in Sources */, + 42ED9BAFD6E936849F1D36CB /* xtixml.cpp in Sources */, + EEB0B28903693C7E9D07192F /* glcmn.cpp in Sources */, + 59F995B6E6EE3CA5A4487844 /* glcanvas.mm in Sources */, + F2813BF297C73A3ABD02EC98 /* glcanvas_osx.cpp in Sources */, + 36EB5D19429D3BD1A01001D5 /* framemanager.cpp in Sources */, + C7B6240E0E213836996A178B /* dockart.cpp in Sources */, + 15048519756B33959B15B161 /* floatpane.cpp in Sources */, + E104017EE1A4357DAF84E1E6 /* auibook.cpp in Sources */, + 39CC380F801F3EE984523275 /* auibar.cpp in Sources */, + 6C46AF0370793AA0B74A5A4A /* tabmdi.cpp in Sources */, + DE43350F6C9D3148A64F0AF9 /* art_internal.cpp in Sources */, + 7DC4A542372437ECA0790F87 /* art_msw.cpp in Sources */, + A0BA01A85C303C78A3130711 /* art_aui.cpp in Sources */, + 056CA84179433AA48D55DA65 /* bar.cpp in Sources */, + CB078622E90F33BE9D131132 /* buttonbar.cpp in Sources */, + EB52C6A915943813932944FF /* control.cpp in Sources */, + 5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */, + 4BAFAE70A6B1313B96D86630 /* page.cpp in Sources */, + F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */, + EA02FA6D3B003F8F8A2963C6 /* toolbar.cpp in Sources */, + D54A162E557834A48F4646A9 /* advprops.cpp in Sources */, + F501AB044AAC39DCB8C0B3E1 /* editors.cpp in Sources */, + 6B9EEA3CF2E536E3B1ADAC42 /* manager.cpp in Sources */, + 46A4CCF128FC3EB092074DC5 /* property.cpp in Sources */, + 26BB10834DA1388881BDD1EC /* propgrid.cpp in Sources */, + BEA90F2C6BB93143958F899A /* propgridiface.cpp in Sources */, + A423177BBC0F3BE5A436B4B7 /* propgridpagestate.cpp in Sources */, + D72D99FC424337CF9EDC2042 /* props.cpp in Sources */, + 9065A4BE3D0433B88CF45571 /* richtextbuffer.cpp in Sources */, + 5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */, + 9455B49669853E71BD4FD965 /* richtextformatdlg.cpp in Sources */, + 70F898F8B129380BBECAC559 /* richtexthtml.cpp in Sources */, + F43DAE2E829A3A7493531381 /* richtextimagedlg.cpp in Sources */, + 0FDDE8E193743F3A8CBDC67C /* richtextprint.cpp in Sources */, + FADD46CB89B135D1AF1D5F8A /* richtextstyledlg.cpp in Sources */, + 2563C775427E3D68BD384F2F /* richtextstyles.cpp in Sources */, + 604ABF86317C3D4F899DBF37 /* richtextsymboldlg.cpp in Sources */, + 9058997222493A7A859A4D4C /* richtextxml.cpp in Sources */, + E3B3E4F75D503DB89B5C622D /* stc.cpp in Sources */, + 908957F65B7E36F8BF3858DD /* PlatWX.cpp in Sources */, + 3E6AA08E72A030D39D867D4B /* ScintillaWX.cpp in Sources */, + 99E7A46106C03484BA70D29E /* tif_unix.c in Sources */, + 4E396D8D2E9138D797F320C6 /* tif_aux.c in Sources */, + 1EE845DDFDDE36CA8A218205 /* tif_close.c in Sources */, + 8E674574343A3C009B1BCD00 /* tif_codec.c in Sources */, + D95C5F467D37339AB8DF2354 /* tif_color.c in Sources */, + 6D073876E1753549B5EEFDDA /* tif_compress.c in Sources */, + E3136EF5DD843ACE886E2868 /* tif_dir.c in Sources */, + 7ECC6EE6D5273F75BB6B7B74 /* tif_dirinfo.c in Sources */, + D51B3389209E370489078891 /* tif_dirread.c in Sources */, + E7F35B834A163C67B65176C6 /* tif_dirwrite.c in Sources */, + 2D4D105CA9BE3FA6995A5FFF /* tif_dumpmode.c in Sources */, + C2CF6B59914A3183ADE84028 /* tif_error.c in Sources */, + 2315C8692C443ED1AE431728 /* tif_extension.c in Sources */, + FECC98B53C0F3106AB04E69E /* tif_fax3.c in Sources */, + 2C53221A318E37529E6460EB /* tif_fax3sm.c in Sources */, + 522E6CF2A62F34259BCE2DE2 /* tif_flush.c in Sources */, + 6944AC98F6F83E3D983DABD3 /* tif_getimage.c in Sources */, + 07C769F64665317BA3E1AC90 /* tif_jpeg.c in Sources */, + 88A43B1C5A7438838DE97B94 /* tif_luv.c in Sources */, + 779D3480141B3683A6D132BE /* tif_lzw.c in Sources */, + F85D632964383F29BC3B30B6 /* tif_next.c in Sources */, + 64F11C549E3035DF85691060 /* tif_ojpeg.c in Sources */, + 793F542F20AB31F6AF736795 /* tif_open.c in Sources */, + A9A5973552EE30838306D15C /* tif_packbits.c in Sources */, + 64DD406C453D39FEBBE66ED1 /* tif_pixarlog.c in Sources */, + 9A178ED42D96329D8CBF9B89 /* tif_predict.c in Sources */, + C170B941F01334F982315E4A /* tif_print.c in Sources */, + 570FA90F526E3F25A8E8FCF2 /* tif_read.c in Sources */, + 912C69ADB1673ACEB0E6CF08 /* tif_strip.c in Sources */, + 552708E6296D33EBB5F6A493 /* tif_swab.c in Sources */, + 527054445A0D3A00A5C2EC44 /* tif_thunder.c in Sources */, + FEB073547F3F3AC19D31F698 /* tif_tile.c in Sources */, + 096BA201623034AD97218368 /* tif_version.c in Sources */, + 7A79D9AC608E3B8287229174 /* tif_warning.c in Sources */, + F2F2963D8ECC32D39FDBF101 /* tif_write.c in Sources */, + 6E2C2E8AA1713ADE9C338379 /* tif_zip.c in Sources */, + FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */, + 311840186794346AAAA42091 /* jutils.c in Sources */, + DE26572475EE336B8EEA5D92 /* jerror.c in Sources */, + 18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */, + A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */, + 894D43C8F224394FB3171F26 /* jcapimin.c in Sources */, + 743BB23211B336A6A0F26E57 /* jcapistd.c in Sources */, + CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */, + ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */, + 76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */, + 86003C8EB906304F9025F788 /* jcinit.c in Sources */, + C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */, + DB73248401573A5996D8E68D /* jcmarker.c in Sources */, + 98DF13E96160304EBB905E73 /* jcmainct.c in Sources */, + 32486A808EBC3E088598D51C /* jcprepct.c in Sources */, + CA5BD8ABDBA13641BBE7CD66 /* jccoefct.c in Sources */, + 11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */, + 50D7E093424138C88BB50D27 /* jcsample.c in Sources */, + BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */, + A212431902B8343CA6D229D3 /* jcphuff.c in Sources */, + BFA6983551B4310DA7C8A404 /* jcdctmgr.c in Sources */, + 9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */, + 0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */, + CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */, + 8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */, + 67EBCE5FA5FF36349ADF0916 /* jdapistd.c in Sources */, + 11818B68C5263EB68D708845 /* jdtrans.c in Sources */, + 4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */, + CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */, + 14EF556997B0350F931EBE8E /* jdinput.c in Sources */, + 61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */, + 28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */, + D0DA11B814AF30A18585122F /* jdphuff.c in Sources */, + 9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */, + B5470121BB4B35DE9C4836DA /* jdcoefct.c in Sources */, + E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */, + 13854E7822783719A2530792 /* jddctmgr.c in Sources */, + 48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */, + B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */, + C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */, + 1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */, + D997FFC948B73FDA892DB531 /* jdsample.c in Sources */, + D9F02AFDA07D3857A905527C /* jdcolor.c in Sources */, + 15D65A523EB23EC385C05E0B /* jquant1.c in Sources */, + 3C0EB1DDA5243E31B2D92CE2 /* jquant2.c in Sources */, + 1E4832B42B95308299B767B9 /* jdmerge.c in Sources */, + 94B1C88076793400810FAC30 /* png.c in Sources */, + 1569BB4728693B6285623A23 /* pngerror.c in Sources */, + D9496139621533328AE727B6 /* pngget.c in Sources */, + CFA91122523B31B9A07A3826 /* pngmem.c in Sources */, + 9EC837DA722736119D49868A /* pngpread.c in Sources */, + 9B8E5690A6103FC1BDC6C47E /* pngread.c in Sources */, + 31FEAB56919D372993CAD89C /* pngrio.c in Sources */, + 8FDC800D873F30E282691832 /* pngrtran.c in Sources */, + 61A2B54FD2E33C759CF5A5E8 /* pngrutil.c in Sources */, + 309C0A78D45C3AB7B8778B59 /* pngset.c in Sources */, + E515EAE375AE390688CBF8D3 /* pngtrans.c in Sources */, + C8C68927DB243AEAB51E11F2 /* pngwio.c in Sources */, + 0095084719983B878378CA28 /* pngwrite.c in Sources */, + 242E1D1A9BF331BA918134EC /* pngwtran.c in Sources */, + 2989056891153968B372EA14 /* pngwutil.c in Sources */, + E4131E3B445C36E6A7FC802F /* regcomp.c in Sources */, + 768716016CE7310BB1AD7567 /* regexec.c in Sources */, + B026621DE50A3921B6598EF6 /* regerror.c in Sources */, + 05021BAB2C9B3C4CAD0A7C2C /* regfree.c in Sources */, + E741CDA71895344C974D8F50 /* AutoComplete.cxx in Sources */, + E92EB502F79638B0BE569EF4 /* CallTip.cxx in Sources */, + 682403FBBD4E3D5E88159501 /* CellBuffer.cxx in Sources */, + 1D7442C82B343F50A83B25B0 /* CharClassify.cxx in Sources */, + 6BC8B3EDB3AE3EF4BACFC08A /* ContractionState.cxx in Sources */, + 90BC965B1A1F35A3B2C9D1C9 /* Decoration.cxx in Sources */, + 0D6596A44A8C37DE85D578F6 /* Document.cxx in Sources */, + 9A16829C34C9344D9AB010F9 /* DocumentAccessor.cxx in Sources */, + 6D723C987BFB39B7B887DCB1 /* Editor.cxx in Sources */, + 83C492B87F4A3A97930F227A /* ExternalLexer.cxx in Sources */, + 0B4AF44DC0C439AD83CDC37E /* Indicator.cxx in Sources */, + C8F1FB8C029031A5909DBC56 /* KeyMap.cxx in Sources */, + 30509A33ED9C35D4ADEF6BBC /* KeyWords.cxx in Sources */, + 0654BCC3F0763C50A7949504 /* LexAPDL.cxx in Sources */, + 0ADC8DBEE80D36B0BB9B058A /* LexASY.cxx in Sources */, + 784F7C50882F320FA76537B5 /* LexAU3.cxx in Sources */, + 07EC76232BB3343FA5CB90B0 /* LexAVE.cxx in Sources */, + 66FD099CE5A338C18329FC36 /* LexAbaqus.cxx in Sources */, + CD35A576FD363FD49C3AC4B3 /* LexAda.cxx in Sources */, + 0C3F48DBD05E3566A4CA6D44 /* LexAsm.cxx in Sources */, + 825EAD51920B387DB4F8C426 /* LexAsn1.cxx in Sources */, + D54D3CA9E73336A08DB20705 /* LexBaan.cxx in Sources */, + 39FB197CF9EB3D76BE0723CF /* LexBash.cxx in Sources */, + 6C7C1CC506CB329FB2D086A9 /* LexBasic.cxx in Sources */, + 78E15D8200F635529F396099 /* LexBullant.cxx in Sources */, + 6F472413FFA03B53B395BB74 /* LexCLW.cxx in Sources */, + D8ADDD24BEAC3D94B3388D3E /* LexCOBOL.cxx in Sources */, + A0FCE3CF565C3F84B63712AC /* LexCPP.cxx in Sources */, + 069D53F2DFBF370A8CC99630 /* LexCSS.cxx in Sources */, + 268DDC88C99A3A64AB8B2FFA /* LexCaml.cxx in Sources */, + 6F5A0D3C7763334396A3783D /* LexCmake.cxx in Sources */, + B640A8A74D973A8FBEF63916 /* LexConf.cxx in Sources */, + 97F60B2A9CE93BC8949A8CCD /* LexCrontab.cxx in Sources */, + 834F2ADD0520313FBAC4F927 /* LexCsound.cxx in Sources */, + 8FB5FBC5730C33F1A3D85D9F /* LexD.cxx in Sources */, + 4788F736CD9C324E8A3DFA74 /* LexEScript.cxx in Sources */, + E8BBC08597EF383597DA0308 /* LexEiffel.cxx in Sources */, + BFD3BFBDC8DA3B1EAD141F96 /* LexErlang.cxx in Sources */, + 45D88A74B3EE3837B9F79595 /* LexFlagship.cxx in Sources */, + 27759C2FBB0E35FDA847B2B5 /* LexForth.cxx in Sources */, + 020BBB417207393F8C60EFB6 /* LexFortran.cxx in Sources */, + E62F8E49FD5035D8BC71BB49 /* LexGAP.cxx in Sources */, + 9B6A35E706543CDAA6A5014A /* LexGui4Cli.cxx in Sources */, + AEEE6BC41B6531898A61CB16 /* LexHTML.cxx in Sources */, + 51D133EC44F830588FEEAEC0 /* LexHaskell.cxx in Sources */, + B37802B0A90133C68EF93DDA /* LexInno.cxx in Sources */, + 14C024EB327435A2A571DA2C /* LexKix.cxx in Sources */, + DF8124E5E17D386A84CEEA27 /* LexLisp.cxx in Sources */, + D13AE659C3AC37B68D39B2C9 /* LexLout.cxx in Sources */, + 9D003890CB7035A298DB7056 /* LexLua.cxx in Sources */, + 3C394FBD47B6310C80577E3B /* LexMMIXAL.cxx in Sources */, + EC43AFB3670A3D459D9B388D /* LexMPT.cxx in Sources */, + E8EE34F0A78C31B489B19FEE /* LexMSSQL.cxx in Sources */, + E80BEED62EBF34F09B3F401F /* LexMagik.cxx in Sources */, + E0E40333B61C33B58787078E /* LexMarkdown.cxx in Sources */, + 5AEA6E94FB76371D928D371C /* LexMatlab.cxx in Sources */, + 1A4F9F18BBEB3515AC7C7CC6 /* LexMetapost.cxx in Sources */, + CB1F37993ECB3B73A51B42FD /* LexMySQL.cxx in Sources */, + A874AF0B203D3DC99C27469A /* LexNimrod.cxx in Sources */, + 22C76BF2C3E331CD87657E6E /* LexNsis.cxx in Sources */, + 76D1A1A49CC831FFB9EBB1F5 /* LexOpal.cxx in Sources */, + BEFC179F8A0E337F9D627D84 /* LexOthers.cxx in Sources */, + 24A5A71C79733E9CB913C5B7 /* LexPB.cxx in Sources */, + 0D79F1B4EF44393AA324213F /* LexPLM.cxx in Sources */, + A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */, + 551BF168445E3D7BB54D0174 /* LexPS.cxx in Sources */, + 0718E7524134312090541D6E /* LexPascal.cxx in Sources */, + 369BCCFF61D13A058D837835 /* LexPerl.cxx in Sources */, + 22EC132AEF863BFBAA6EDEC3 /* LexPowerPro.cxx in Sources */, + 1FB1622D59593932B25C55BA /* LexPowerShell.cxx in Sources */, + 97C551F8AEF133D680D1FD36 /* LexProgress.cxx in Sources */, + A36B5107860E32659194073F /* LexPython.cxx in Sources */, + 31380AD4F5BD38A6B9212FE0 /* LexR.cxx in Sources */, + CCFD3144A22C3A87B67D88AB /* LexRebol.cxx in Sources */, + 7C20B79175D33852A2E9DE83 /* LexRuby.cxx in Sources */, + FE5B7C7A84B83C17A38E8403 /* LexSML.cxx in Sources */, + 71CCB06E790C3C54BFF1199D /* LexSQL.cxx in Sources */, + BA9F0BBD57F63FD29E484FD3 /* LexScriptol.cxx in Sources */, + F55F3887CDE633D7877C607B /* LexSmalltalk.cxx in Sources */, + D5C5DD83882B3227A1CCFE0E /* LexSorcus.cxx in Sources */, + 6F8129E317EE3486A89D8548 /* LexSpecman.cxx in Sources */, + 9678C2B19D293818AA8E9E0D /* LexSpice.cxx in Sources */, + 0F8C79010EF0316AA1B7392D /* LexTACL.cxx in Sources */, + 2102C23970FB3F22AB46A59A /* LexTADS3.cxx in Sources */, + CAF5C5BB129431B596C4C6C1 /* LexTAL.cxx in Sources */, + 49BEDFBC3661339D90EF6935 /* LexTCL.cxx in Sources */, + 7D0E549020D33ED39751DFC8 /* LexTeX.cxx in Sources */, + D4EC9DB5F8DF319EA0FD26A4 /* LexVB.cxx in Sources */, + 16021CFD78623B8CBD08FC1F /* LexVHDL.cxx in Sources */, + 3C5E1A45A57B3169A4C073D9 /* LexVerilog.cxx in Sources */, + 159E4248CB1333AD841D9F03 /* LexYAML.cxx in Sources */, + 923F4797A73A3BDD87BBD1E1 /* LineMarker.cxx in Sources */, + 523FB2A8435A3324A8E1B370 /* PerLine.cxx in Sources */, + BF068F3C06473D8CBC55D507 /* PositionCache.cxx in Sources */, + 795B9B15279D36F8899C9CA8 /* PropSet.cxx in Sources */, + A52A7D2FEB1434E29C64582C /* RESearch.cxx in Sources */, + 7B372FEA276438C186F7E340 /* RunStyles.cxx in Sources */, + 15735ED6556130F6A14F0BCD /* ScintillaBase.cxx in Sources */, + 097BC5E023C33C1DA05606AF /* Selection.cxx in Sources */, + 4C9BA36123E43589956864C6 /* Style.cxx in Sources */, + CD241361D4693785A0B8939D /* StyleContext.cxx in Sources */, + 19D823E564D932758EA6F8D1 /* UniConversion.cxx in Sources */, + 699D88EE2DAA3594B6606890 /* ViewStyle.cxx in Sources */, + B387FAE95A9535B194A42BA4 /* WindowAccessor.cxx in Sources */, + BCDAE378D03E37F5994FB9C5 /* XPM.cxx in Sources */, + C2DEE063B5E032C1BD2B5026 /* xmlparse.c in Sources */, + AE84BC9A1CCA3ADA9C483950 /* xmlrole.c in Sources */, + DB9565CC4EAE3BCB9F490620 /* xmltok.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 55C93151F6053EBCBDD70DF8 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 477B609FA2373FB58F4C8768 /* wxiphone.xcconfig */; + buildSettings = { + }; + name = Debug; + }; + 55C93151F6053EBCBDD70DF9 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8707324525DB344EA0E7D5CE /* wxdebug.xcconfig */; + buildSettings = { + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Debug; + }; + 99B665C6D0D137B38CEA938E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 477B609FA2373FB58F4C8768 /* wxiphone.xcconfig */; + buildSettings = { + }; + name = Release; + }; + 99B665C6D0D137B38CEA938F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D5B7B7C10A3E3C689AE1E418 /* wxrelease.xcconfig */; + buildSettings = { + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 336FCCBABBEF3C4AA92AD394 /* Build configuration list for PBXNativeTarget "static" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 55C93151F6053EBCBDD70DF8 /* Debug */, + 99B665C6D0D137B38CEA938E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A66311F47C8832F6A58105B6 /* Build configuration list for PBXProject "wxiphone" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 55C93151F6053EBCBDD70DF9 /* Debug */, + 99B665C6D0D137B38CEA938F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 19367367C9323490BB936F06 /* Project object */; +} diff --git a/build/osx/wxiphone_in.xcodeproj/project.pbxproj b/build/osx/wxiphone_in.xcodeproj/project.pbxproj index 2091243167..8ab56438d7 100644 --- a/build/osx/wxiphone_in.xcodeproj/project.pbxproj +++ b/build/osx/wxiphone_in.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -12,6 +12,8 @@ /* Begin PBXFileReference section */ 404BECEE10EBF6330080E2B8 /* wxiphone.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxiphone.xcconfig; sourceTree = ""; }; + 409120DB13B24EC2004109E0 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxdebug.xcconfig; sourceTree = ""; }; + 409120DC13B24EC2004109E0 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D2AAC07E0554694100DB518D /* libwx_osx_iphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_iphone.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -42,6 +44,8 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, 404BECEE10EBF6330080E2B8 /* wxiphone.xcconfig */, + 409120DB13B24EC2004109E0 /* wxdebug.xcconfig */, + 409120DC13B24EC2004109E0 /* wxrelease.xcconfig */, ); name = wxiPhone; sourceTree = ""; @@ -91,7 +95,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "wxiphone_in" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -141,18 +145,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BECEE10EBF6330080E2B8 /* wxiphone.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - COPY_PHASE_STRIP = NO; - DSTROOT = /tmp/wxiPhone.dst; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - "__WXDEBUG__=1", - ); - INSTALL_PATH = /usr/local/lib; }; name = Debug; }; @@ -160,37 +152,21 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BECEE10EBF6330080E2B8 /* wxiphone.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - DSTROOT = /tmp/wxiPhone.dst; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = wx_osx_iphone; }; name = Release; }; 1DEB922308733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 409120DB13B24EC2004109E0 /* wxdebug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; - SDKROOT = iphoneos; WXROOT = "$(PROJECT_DIR)/../.."; }; name = Debug; }; 1DEB922408733DC00010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 409120DC13B24EC2004109E0 /* wxrelease.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; - SDKROOT = iphoneos; WXROOT = "$(PROJECT_DIR)/../.."; }; name = Release; diff --git a/build/osx/wxrelease.xcconfig b/build/osx/wxrelease.xcconfig new file mode 100644 index 0000000000..d3fb0366a9 --- /dev/null +++ b/build/osx/wxrelease.xcconfig @@ -0,0 +1,2 @@ +GCC_OPTIMIZATION_LEVEL = 2 +WX_PREPROCESSOR_DEFINITIONS = \ No newline at end of file diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig index 6c365506a4..28855542c7 100644 --- a/build/osx/wxvers.xcconfig +++ b/build/osx/wxvers.xcconfig @@ -1,4 +1,4 @@ // update this file with new version numbers DYLIB_COMPATIBILITY_VERSION = 2.9 -DYLIB_CURRENT_VERSION = 2.9.2 +DYLIB_CURRENT_VERSION = 2.9.3 diff --git a/build/tools/bld_chm_exe.bat b/build/tools/bld_chm_exe.bat index b58a54d829..fe76b22b57 100644 --- a/build/tools/bld_chm_exe.bat +++ b/build/tools/bld_chm_exe.bat @@ -1,12 +1,12 @@ rem Uncomment the next line to set the version; used also in wxWidgets.iss -SET WXW_VER=2.9.1 +SET WXW_VER=2.9.3 if (%WXW_VER%)==() SET WXW_VER=SVN echo docs building for %WXW_VER% rem This builds the docs in %WXWIN% in a number of formats rem and a clean inno setup in a second tree -rem it uses a number of tools nmake, gnuwin32 zip & dos2unix, ghostscript +rem it uses a number of tools, gnuwin32 zip & dos2unix, rem writes a log file in c:\ echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log @@ -65,6 +65,7 @@ cd html del *.dot del *.md5 zip -r wx.htb *.* +copy wx.htb %DAILY%\wxWidgets-%WXW_VER%-html.zip zip wxWidgets-%WXW_VER%-htb.zip wx.htb copy wxWidgets-%WXW_VER%-htb.zip %DAILY% diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py index b2d8088406..548bb10456 100755 --- a/build/tools/build-wxwidgets.py +++ b/build/tools/build-wxwidgets.py @@ -306,6 +306,13 @@ def main(scriptName, args): # plus the framework specific dir structure. prefixDir = getPrefixInFramework(options) configure_opts.append("--prefix=" + prefixDir) + + # the framework build adds symlinks above the installDir + prefixDir folder + # so we need to wipe from the framework root instead of inside the prefixDir. + frameworkRootDir = os.path.abspath(os.path.join(installDir + prefixDir, "..", "..")) + if os.path.exists(frameworkRootDir): + if os.path.exists(frameworkRootDir): + shutil.rmtree(frameworkRootDir) if options.mac_universal_binary: configure_opts.append("--enable-universal_binary") @@ -389,6 +396,11 @@ def main(scriptName, args): args.append("BUILD=release") else: args.append("BUILD=debug") + + if options.shared: + args.append("SHARED=1") + if options.cairo: + args.append("USE_CAIRO=1") wxBuilder = builder.MSVCBuilder() @@ -409,34 +421,22 @@ def main(scriptName, args): if options.clean: print "Performing cleanup." - wxBuilder.clean() - - if options.wxpython: - exitIfError(wxBuilder.clean(os.path.join(contribDir, "gizmos")), "Error building gizmos") - exitIfError(wxBuilder.clean(os.path.join(contribDir, "stc")), "Error building stc") + wxBuilder.clean(dir=buildDir, options=args) sys.exit(0) if options.extra_make: args.append(options.extra_make) - args.append("--jobs=" + options.jobs) + if not sys.platform.startswith("win"): + args.append("--jobs=" + options.jobs) exitIfError(wxBuilder.build(dir=buildDir, options=args), "Error building") - - if options.wxpython and os.path.exists(contribDir): - exitIfError(wxBuilder.build(os.path.join(contribDir, "gizmos"), options=args), "Error building gizmos") - exitIfError(wxBuilder.build(os.path.join(contribDir, "stc"),options=args), "Error building stc") if options.install: extra=None if installDir: extra = ['DESTDIR='+installDir] - wxBuilder.install(dir=buildDir, options=extra) - - if options.wxpython and os.path.exists(contribDir): - exitIfError(wxBuilder.install(os.path.join(contribDir, "gizmos"), options=extra), "Error building gizmos") - exitIfError(wxBuilder.install(os.path.join(contribDir, "stc"), options=extra), "Error building stc") - + wxBuilder.install(dir=buildDir, options=extra) if options.install and options.mac_framework: @@ -464,17 +464,33 @@ def main(scriptName, args): fwname = getFrameworkName(options) version = commands.getoutput("bin/wx-config --release") + version_full = commands.getoutput("bin/wx-config --version") basename = commands.getoutput("bin/wx-config --basename") configname = commands.getoutput("bin/wx-config --selected-config") - - run("ln -s -f bin Resources") + + os.makedirs("Resources") + wxplist = dict( + CFBundleDevelopmentRegion="English", + CFBundleIdentifier='org.wxwidgets.wxosxcocoa', + CFBundleName=fwname, + CFBundleVersion=version_full, + CFBundleExecutable=fwname, + CFBundleGetInfoString="%s %s" % (fwname, version_full), + CFBundlePackageType="FMWK", + CFBundleSignature="WXCO", + CFBundleShortVersionString=version_full, + CFBundleInfoDictionaryVersion="6.0", + ) + + import plistlib + plistlib.writePlist(wxplist, os.path.join(frameworkRootDir, "Resources", "Info.plist")) # we make wx the "actual" library file and link to it from libwhatever.dylib # so that things can link to wx and survive minor version changes renameLibrary("lib/lib%s-%s.dylib" % (basename, version), fwname) run("ln -s -f lib/%s.dylib %s" % (fwname, fwname)) - run("ln -s -f include/wx Headers") + run("ln -s -f include Headers") for lib in ["GL", "STC", "Gizmos", "Gizmos_xrc"]: libfile = "lib/lib%s_%s-%s.dylib" % (basename, lib.lower(), version) @@ -504,17 +520,19 @@ def main(scriptName, args): headers = "" header_dir = "wx-%s/wx" % version for include in glob.glob(header_dir + "/*.h"): - headers += "wx/" + os.path.basename(include) + "\n" + headers += "#include \n" - framework_header = open("wx.h", "w") + framework_header = open("%s.h" % fwname, "w") framework_header.write(header_template % headers) framework_header.close() run("ln -s -f %s wx" % header_dir) - run("ln -s -f ../../../lib/wx/include/%s/wx/setup.h wx/setup.h" % configname) + os.chdir("wx-%s/wx" % version) + run("ln -s -f ../../../lib/wx/include/%s/wx/setup.h setup.h" % configname) - os.chdir(os.path.join(frameworkRootDir, "..", "..")) - run("ln -s -f %s Versions/Current" % getWxRelease()) + os.chdir(os.path.join(frameworkRootDir, "..")) + run("ln -s -f %s Current" % getWxRelease()) + os.chdir("..") run("ln -s -f Versions/Current/Headers Headers") run("ln -s -f Versions/Current/Resources Resources") run("ln -s -f Versions/Current/%s %s" % (fwname, fwname)) @@ -579,8 +597,6 @@ def main(scriptName, args): shutil.rmtree(packagedir) - - if __name__ == '__main__': exitWithException = False # use sys.exit instead main(sys.argv[0], sys.argv[1:]) diff --git a/build/tools/builder.py b/build/tools/builder.py index 5eecbe87a2..484e274f57 100755 --- a/build/tools/builder.py +++ b/build/tools/builder.py @@ -89,17 +89,21 @@ class Builder: return self.name - def clean(self, dir=None, projectFile=None): + def clean(self, dir=None, projectFile=None, options=None): """ dir = the directory containing the project file projectFile = Some formats need to explicitly specify the project file's name """ - - args = [self.getProgramPath(), "clean"] - if dir: - args.append(dir) if self.isAvailable(): - result = runInDir(args) + if options: + optionList = list(options) + else: + optionList = [] + + optionList.insert(0, self.getProgramPath()) + optionList.append("clean") + + result = runInDir(optionList, dir) return result return False @@ -200,7 +204,7 @@ class MSVCProjectBuilder(Builder): Builder.__init__(self, commandName="VCExpress.exe", formatName="msvcProject") for key in ["VS90COMNTOOLS", "VC80COMNTOOLS", "VC71COMNTOOLS"]: if os.environ.has_key(key): - self.prgoramDir = os.path.join(os.environ[key], "..", "IDE") + self.programDir = os.path.join(os.environ[key], "..", "IDE") if self.programDir == None: for version in ["9.0", "8", ".NET 2003"]: diff --git a/build/tools/git-make-release b/build/tools/git-make-release index 78f5448996..f0e7c7dcb1 100755 --- a/build/tools/git-make-release +++ b/build/tools/git-make-release @@ -28,7 +28,7 @@ version=$1 if [ -z "$version" ]; then - echo "Must specify the distribution version." >2 + echo "Must specify the distribution version." >&2 exit 1 fi diff --git a/build/tools/make-html-docs b/build/tools/make-html-docs new file mode 100755 index 0000000000..24b1622c55 --- /dev/null +++ b/build/tools/make-html-docs @@ -0,0 +1,30 @@ +#!/bin/sh +# +# This script creates archives of HTML documentation in tar.bz2 and zip +# formats. It relies on docs/doxygen/regen.sh to really generate the docs. +# +# The script should be ran from the root of wxWidgets checkout and creates the +# output files in its parent directory. + +version=$1 +if [ -z "$version" ]; then + echo "Must specify the distribution version." >&2 + exit 1 +fi + +set -e +set -x + +docs_dir_name=wxWidgets-$version +docs_file_basename=wxWidgets-docs-html-$version + +cd docs/doxygen +./regen.sh html +cd out +mv html $docs_dir_name +tar cjf ../../../../$docs_file_basename.tar.bz2 $docs_dir_name +cd $docs_dir_name +zip -q -r ../../../../../$docs_file_basename.zip . + +cd .. +mv $docs_dir_name html diff --git a/configure b/configure index e372e96e00..c79bdc5bb4 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in 67603 2011-04-26 17:35:35Z RD . +# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.2. +# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.3. # # Report bugs to . # @@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.9.2' -PACKAGE_STRING='wxWidgets 2.9.2' +PACKAGE_VERSION='2.9.3' +PACKAGE_STRING='wxWidgets 2.9.3' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' ac_unique_file="wx-config.in" @@ -1596,7 +1596,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 2.9.2 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.9.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1665,7 +1665,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.9.2:";; + short | recursive ) echo "Configuration of wxWidgets 2.9.3:";; esac cat <<\_ACEOF @@ -2095,7 +2095,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.9.2 +wxWidgets configure 2.9.3 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2109,7 +2109,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 2.9.2, which was +It was created by wxWidgets $as_me 2.9.3, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2591,7 +2591,7 @@ fi wx_major_version_number=2 wx_minor_version_number=9 -wx_release_number=2 +wx_release_number=3 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -2974,7 +2974,7 @@ esac DEFAULT_wxUSE_ALL_FEATURES=yes -DEFAULT_wxUSE_STD_CONTAINERS=$DEFAULT_STD_FLAG +DEFAULT_wxUSE_STD_CONTAINERS=no DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG @@ -4778,6 +4778,11 @@ fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_STL" = "yes"; then + DEFAULT_wxUSE_STD_CONTAINERS=yes + DEFAULT_wxUSE_STD_IOSTREAM=yes + DEFAULT_wxUSE_STD_STRING=yes +fi enablestring= defaultval= @@ -17233,7 +17238,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_prog_gcc_traditional=no fi -rm -f -r conftest* +rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -17250,7 +17255,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi -rm -f -r conftest* +rm -f conftest* fi fi @@ -19876,7 +19881,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f -r conftest* +rm -f conftest* fi @@ -19897,7 +19902,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f -r conftest* +rm -f conftest* fi @@ -24702,11 +24707,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -24746,11 +24753,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -24797,7 +24806,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f -r conftest* +rm -f conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. @@ -31489,7 +31498,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do + for ac_extension in a so sl; do if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break @@ -31642,7 +31651,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do + for ac_extension in a so sl; do if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 @@ -43746,6 +43755,12 @@ _ACEOF else wxUSE_FSWATCHER=no fi + else + if test "$wxUSE_THREADS" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5 +echo "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;} + wxUSE_FSWATCHER=no + fi fi if test "$wxUSE_FSWATCHER" = "yes"; then @@ -53419,7 +53434,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 2.9.2, which was +This file was extended by wxWidgets $as_me 2.9.3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -53472,7 +53487,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.9.2 +wxWidgets config.status 2.9.3 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index a5aa4afb40..9c35b151ce 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.9.2], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.9.3], [wx-dev@lists.wxwidgets.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -43,7 +43,7 @@ dnl wx_release_number += 1 wx_major_version_number=2 wx_minor_version_number=9 -wx_release_number=2 +wx_release_number=3 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -372,7 +372,7 @@ dnl wxUSE_ALL_FEATURES which is the only which has to be set to "yes" by dnl default) DEFAULT_wxUSE_ALL_FEATURES=yes -DEFAULT_wxUSE_STD_CONTAINERS=$DEFAULT_STD_FLAG +DEFAULT_wxUSE_STD_CONTAINERS=no DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG @@ -701,6 +701,11 @@ dnl --------------------------------------------------------------------------- WX_ARG_DISABLE(shared, [ --disable-shared create static library instead of shared], wxUSE_SHARED) WX_ARG_ENABLE(stl, [ --enable-stl use standard C++ classes for everything], wxUSE_STL) +if test "$wxUSE_STL" = "yes"; then + DEFAULT_wxUSE_STD_CONTAINERS=yes + DEFAULT_wxUSE_STD_IOSTREAM=yes + DEFAULT_wxUSE_STD_STRING=yes +fi WX_ARG_ENABLE(std_containers,[ --enable-std_containers use standard C++ container classes], wxUSE_STD_CONTAINERS) WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM) WX_ARG_ENABLE(std_string, [ --enable-std_string use standard C++ string classes], wxUSE_STD_STRING) @@ -5667,6 +5672,11 @@ if test "$wxUSE_FSWATCHER" = "yes"; then else wxUSE_FSWATCHER=no fi + else + if test "$wxUSE_THREADS" != "yes"; then + AC_MSG_WARN([wxFileSystemWatcher disabled due to --disable-threads]) + wxUSE_FSWATCHER=no + fi fi if test "$wxUSE_FSWATCHER" = "yes"; then diff --git a/demos/forty/card.cpp b/demos/forty/card.cpp index f1f9dea885..ccb8102ef4 100644 --- a/demos/forty/card.cpp +++ b/demos/forty/card.cpp @@ -60,7 +60,7 @@ Card::Card(int value, WayUp way_up) : if (!m_symbolBmap) { m_symbolBmap = new wxBitmap(symbols_xpm); - if (!m_symbolBmap->Ok()) + if (!m_symbolBmap->IsOk()) { ::wxMessageBox(wxT("Failed to load bitmap CardSymbols"), wxT("Error")); } @@ -68,7 +68,7 @@ Card::Card(int value, WayUp way_up) : if (!m_pictureBmap) { m_pictureBmap = new wxBitmap(Pictures); - if (!m_pictureBmap->Ok()) + if (!m_pictureBmap->IsOk()) { ::wxMessageBox(wxT("Failed to load bitmap CardPictures"), wxT("Error")); } diff --git a/docs/changes.txt b/docs/changes.txt index aa234eac28..a0ca39762d 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -59,43 +59,6 @@ changes: their overridden OnExecute() or override a more convenient OnExec() instead. -Use of STL containers by default --------------------------------- - -wxWidgets uses STL containers for the implementation of wxVector, wxList, -wxDList and wxStack by default since 2.9.2 release. While the STL-based -versions are mostly compatible with the old ones, there are some differences: - - - wxList::compatibility_iterator must be used instead of wxList::Node* when - iterating over the list contents. The compatibility_iterator class has the - same semantics as a Node pointer but it is an object and not a pointer, so - you need to write - - for ( wxWindowList::compatibility_iterator it = list.GetFirst(); - it; - it = it->GetNext() ) - ... - - instead of the old - - for ( wxWindowList::Node *n = list.GetFirst(); n; n = n->GetNext() ) - ... - - - wxSortedArrayString and wxArrayString are separate classes now and the - former doesn't derive from the latter. If you need to convert a sorted array - to a normal one, you must copy all the elements. Alternatively, you may - avoid the use of wxSortedArrayString by using a normal array and calling its - Sort() method when needed. - - - WX_DEFINE_ARRAY_INT(bool) cannot be used because of the differences in - std::vector specialization compared with the generic std::vector<> - class. Please either use std::vector directly or use an integer array - instead. - -Finally notice that you may set wxUSE_STD_CONTAINERS to 0 when compiling -wxWidgets to use the non-STL containers. - - wxODBC and contrib libraries removal ------------------------------------ @@ -471,13 +434,40 @@ Major new features in this release was added. -2.9.2: +2.9.3: +------ + +All: + +- Fix parsing of negated long options in wxCmdLineParser (roed_bis). + +All (GUI): + +- Added documented, public wxNavigationEnabled<> class. +- Support float, double and file name values in wxGenericValidator (troelsk). +- Fix keyboard navigation in wxGrid with hidden columns (ivan_14_32). +- Add wxDataViewEvent::IsEditCancelled() (Allonii). +- Allow marking wxTreeBook nodes to expand initially in XRC (RedTide). +- Added customizable wxDocManager::OnMRUFileNotExist() virtual method. + +OSX: + +- Implement wxRegion::Equal() (Dr.Acula). + +GTK: + +- Generate events for two auxiliary mouse buttons in wxGTK (Marcin Wojdyr). + +MSW: + +- Added wxGCDC(wxEnhMetaFileDC) ctor (Marcin Wojdyr). + + +2.9.2: (released 2011-07-05) ------ All: -- Use standard implementations of container classes by default, you need to - explicitly set wxUSE_STD_CONTAINERS to 0 to use wxWidgets implementations. - Added cwd and env arguments to wxExecute() (Emilien Kia). - Added "rest" argument to wxString::Before{First,Last}(). - Added wxThread::OnKill() and OnDelete() callbacks. @@ -492,6 +482,7 @@ All: - Added wxThread::Wait() and Delete() "wait mode" parameter (Catalin Raceanu). - Allow showing milliseconds in wxLog time stamps (tan). - Added support for processing instructions in wxXmlDocument (Nick Matthews). +- Added wxThreadEvent for communicating between threads to wxBase. Unix: @@ -504,6 +495,7 @@ All (GUI): - Added wxCommandLinkButton (Rickard Westerlund, GSoC 2010 project). - Added wxUIActionSimulator (Steven Lamerton, GSoC 2010 project). - Added support for dynamic auto-completion in wxTextEntry. +- Added images support to wxToggleButton (Garrick Meeker). - wxAUI: support auto-orientable toolbars (wsu). - wxAUI: add support for icons in pane title bars (triton). - Added wxPanel::SetBackgroundBitmap(). @@ -512,6 +504,7 @@ All (GUI): - wxHTML: render in RTL order inside RTL window (Richard Bullington-McGuire). - wxRibbon: added EVT_RIBBONGALLERY_CLICKED event (John Roberts). - wxRibbon: allow hiding the panels and showing tabs only (snowleopard). +- Add support for child documents to docview framework. - Add support for CP-866 encoding to wxEncodingConverter (madnut). - Consistency fixes for keyboard events across all major ports. - Added EVT_RIBBONBAR_TAB_LEFT_DCLICK event (snowleopard). @@ -522,10 +515,13 @@ All (GUI): - Added wxDocManager::FindTemplate() (troelsk). - Return bool, not void, from wxImage::ConvertAlphaToMask() (troelsk). - Fixed resizing columns in wxGrid when they were reordered. +- Fixed keyboard navigation when wxGrid columns are reordered. - Added wxImage::Rotate180() (Jeff Tupper). - Added support for saving TGA files. - Added wxArtProvider returning higher quality icons from Tango project. - wxPropertyGrid: Added "HasAlpha" attribute for wxColourProperty. +- wxPropertyGrid: Disabling a property didn't work properly if a child item + was selected (Sébastien Gallou). - Added support for saving PNG files with palette (troelsk). - Added support for saving as GIF and animated GIF (troelsk). - Fix wxWrapSizer minimal size calculation (Catalin Raceanu). @@ -541,6 +537,7 @@ All (GUI): - Allow customizing AUI tab colours in wxAuiTabArt (snowleopard). - Added wxAffineMatrix2D class (Catalin Raceanu). - Allow showing preview frame non modally (John Roberts). +- Improve appearance of the generic wxHyperlinkCtrl (David Connet). GTK: @@ -549,6 +546,7 @@ GTK: - wxTLW generates wxEVT_MAXIMIZE. - Fix copying clipboard data to primary selection (David Hart). - Implement wxGraphicsContext::GetSize() (Marcin Wojdyr). +- Implement wxCalendarCtrl::SetDateRange() for the native control. MSW: diff --git a/docs/doxygen/Doxyfile_docset b/docs/doxygen/Doxyfile_docset index 58a7b2c9f2..a5918de31d 100644 --- a/docs/doxygen/Doxyfile_docset +++ b/docs/doxygen/Doxyfile_docset @@ -13,4 +13,4 @@ #--------------------------------------------------------------------------- GENERATE_DOCSET = YES - +GENERATE_HTML = YES diff --git a/docs/doxygen/Doxyfile_inc b/docs/doxygen/Doxyfile_inc index 95e8e323f9..40a0163643 100644 --- a/docs/doxygen/Doxyfile_inc +++ b/docs/doxygen/Doxyfile_inc @@ -12,7 +12,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets -PROJECT_NUMBER = 2.9.2 +PROJECT_NUMBER = 2.9.3 OUTPUT_DIRECTORY = out CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -324,8 +324,10 @@ HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES HTML_DYNAMIC_SECTIONS = YES GENERATE_DOCSET = NO # Only change in format output configs -DOCSET_FEEDNAME = "wxWidgets" -DOCSET_BUNDLE_ID = org.wxwidgets.doxygen +DOCSET_FEEDNAME = "wxWidgets 2.9" +DOCSET_BUNDLE_ID = org.wxwidgets.doxygen.wx29 +DOCSET_PUBLISHER_ID = org.wxwidgets.doxygen +DOCSET_PUBLISHER_NAME = wxWidgets Team GENERATE_HTMLHELP = NO # Only change in format output configs CHM_FILE = ..\wx.chm # NOTE: Windows style separator needed HHC_LOCATION = hhc.exe # Don't modify, see Doxyfile_chm for info diff --git a/docs/doxygen/background_navigation.png b/docs/doxygen/background_navigation.png new file mode 100644 index 0000000000..d59e96ddef Binary files /dev/null and b/docs/doxygen/background_navigation.png differ diff --git a/docs/doxygen/img_downArrow.png b/docs/doxygen/img_downArrow.png new file mode 100644 index 0000000000..024a03c265 Binary files /dev/null and b/docs/doxygen/img_downArrow.png differ diff --git a/docs/doxygen/latexdocstart.inc b/docs/doxygen/latexdocstart.inc index 0d11baf802..9e509b46ce 100644 --- a/docs/doxygen/latexdocstart.inc +++ b/docs/doxygen/latexdocstart.inc @@ -49,7 +49,7 @@ \end{center} \end{figure} \vspace*{2cm} -{\large Version 2.9.2 }\\ +{\large Version 2.9.3 }\\ \vspace*{1cm} {Generated on \today}\\ \end{center} diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h index cd71ac5913..6ce79992e6 100644 --- a/docs/doxygen/mainpages/manual.h +++ b/docs/doxygen/mainpages/manual.h @@ -12,7 +12,7 @@ @mainpage Reference manual @author Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, Stefan Csomor, Francesco Montorsi, Bryan Petty, et al -@date July, 2010 +@date July, 2011 @image html main_wxlogo.png diff --git a/docs/doxygen/overviews/container.h b/docs/doxygen/overviews/container.h index 9b0ffba857..eaf176e733 100644 --- a/docs/doxygen/overviews/container.h +++ b/docs/doxygen/overviews/container.h @@ -10,21 +10,44 @@ @page overview_container Container Classes -Classes: wxList, wxArray, wxVector +Classes: wxList, wxArray, wxVector, wxStack, wxHashMap, wxHashSet -wxWidgets uses itself several container classes including doubly-linked lists -and dynamic arrays (i.e. arrays which expand automatically when they become -full). For both historical and portability reasons wxWidgets does not require -the use of STL (which provides the standard implementation of many container -classes in C++) but it can be compiled in STL mode. Additionally, wxWidgets -provides the new wxVector class template which can be used like the std::vector -class and is actually just a typedef to std::vector if wxWidgets is compiled -in STL mode. +@section overview_container_intro Overview -wxWidgets non-template container classes don't pretend to be as powerful or full as STL -ones, but they are quite useful and may be compiled with absolutely any C++ -compiler. They're used internally by wxWidgets, but may, of course, be used in -your programs as well if you wish. +For historical reasons, wxWidgets uses custom container classes internally. +This was unfortunately unavoidable during a long time when the standard library +wasn't widely available and can't be easily changed even now that it is for +compatibility reasons. If you are building your own version of the library and +don't care about compatibility nor slight (less than 5%) size penalty imposed +by the use of STL classes, you may choose to use the "STL" build of wxWidgets +in which these custom classes are replaced with their standard counterparts and +only read the section @ref overview_container_std explaining how to do it. + +Otherwise you will need to know about the custom wxWidgets container classes +such as wxList and wxArray if only to use wxWidgets functions that work +with them, e.g. wxWindow::GetChildren(), and you should find the information +about using these classes below useful. + +Notice that we recommend that you use standard classes directly in your own +code instead of the container classes provided by wxWidgets in any case as the +standard classes are easier to use and may also be safer because of extra +run-time checks they may perform as well as more efficient. + +Finally notice that recent versions of wxWidgets also provide standard-like +classes such as wxVector, wxStack or wxDList which can be used exactly +like the std::vector, std::stack and std::list, respectively, and +actually are just typedefs for the corresponding types if wxWidgets is compiled +in STL mode. These classes could be useful if you wish to avoid the use of the +standard library in your code for some reason. + +To summarize, you should use the standard container classes such as +std::vector and std::list if possible and wxVector or wxDList if +it isn't and only use legacy wxWidgets containers such as wxArray and +wxList when you must, i.e. when you use a wxWidgets function taking or +returning a container of such type. + + +@section overview_container_legacy Legacy Classes The list classes in wxWidgets are doubly-linked lists which may either own the objects they contain (meaning that the list deletes the object when it is @@ -40,10 +63,10 @@ two sorts: the "plain" arrays which store either built-in types such as "char", own the object pointers to which they store. For the same portability reasons, the container classes implementation in -wxWidgets does not use templates, but is rather based on C preprocessor i.e. is -done with the macros: WX_DECLARE_LIST() and WX_DEFINE_LIST() for the linked -lists and WX_DECLARE_ARRAY(), WX_DECLARE_OBJARRAY() and WX_DEFINE_OBJARRAY() -for the dynamic arrays. +wxWidgets don't use templates, but are rather based on C preprocessor i.e. are +implemented using the macros: WX_DECLARE_LIST() and WX_DEFINE_LIST() for the +linked lists and WX_DECLARE_ARRAY(), WX_DECLARE_OBJARRAY() and +WX_DEFINE_OBJARRAY() for the dynamic arrays. The "DECLARE" macro declares a new container class containing the elements of given type and is needed for all three types of container classes: lists, @@ -67,5 +90,41 @@ wxArrayString. The first three store elements of corresponding types, but wxArrayString is somewhat special: it is an optimized version of wxArray which uses its knowledge about wxString reference counting schema. + +@section overview_container_std STL Build + +To build wxWidgets with the standard containers you need to set +wxUSE_STD_CONTAINERS option to 1 in @c wx/msw/setup.h for wxMSW builds or +specify @c --enable-std_containers option to configure (which is also +implicitly enabled by @c --enable-stl option) in Unix builds. + +The standard container build is mostly, but not quite, compatible with the +default one. Here are the most important differences: + - wxList::compatibility_iterator must be used instead of wxList::Node* when + iterating over the list contents. The compatibility_iterator class has the + same semantics as a Node pointer but it is an object and not a pointer, so + you need to write + @code + for ( wxWindowList::compatibility_iterator it = list.GetFirst(); + it; + it = it->GetNext() ) + ... + @endcode + instead of the old + @code + for ( wxWindowList::Node *n = list.GetFirst(); n; n = n->GetNext() ) + ... + @endcode + - wxSortedArrayString and wxArrayString are separate classes now and the + former doesn't derive from the latter. If you need to convert a sorted array + to a normal one, you must copy all the elements. Alternatively, you may + avoid the use of wxSortedArrayString by using a normal array and calling its + Sort() method when needed. + - WX_DEFINE_ARRAY_INT(bool) cannot be used because of the differences in + std::vector specialization compared with the generic std::vector<> + class. Please either use std::vector directly or use an integer array + instead. + + */ diff --git a/docs/doxygen/overviews/richtextctrl.h b/docs/doxygen/overviews/richtextctrl.h index 6d33cf5a70..9203214d50 100644 --- a/docs/doxygen/overviews/richtextctrl.h +++ b/docs/doxygen/overviews/richtextctrl.h @@ -17,6 +17,8 @@ @li @ref overview_richtextctrl_styles @li @ref overview_richtextctrl_dialogs @li @ref overview_richtextctrl_impl +@li @ref overview_richtextctrl_nested_object +@li @ref overview_richtextctrl_context_menus @li @ref overview_richtextctrl_roadmap @@ -58,7 +60,7 @@ editing, wxStyledTextCtrl is a better choice. Despite its name, it cannot currently read or write RTF (rich text format) files. Instead, it uses its own XML format, and can also read and write plain -text. In future we expect to provide RTF file capabilities. Custom file formats +text. In future we expect to provide RTF or OpenDocument file capabilities. Custom file formats can be supported by creating additional file handlers and registering them with the control. @@ -250,7 +252,8 @@ between controls. @section overview_richtextctrl_styles Text Styles -Styling attributes are represented by wxTextAttr. +Styling attributes are represented by wxTextAttr, or for more control over +attributes such as margins and size, the derived class wxRichTextAttr. When setting a style, the flags of the attribute object determine which attributes are applied. When querying a style, the passed flags are ignored @@ -351,7 +354,8 @@ editing functionality. wxRichTextFormattingDialog can be used for character or paragraph formatting, or a combination of both. It's a wxPropertySheetDialog with the following -available tabs: Font, Indents @& Spacing, Tabs, Bullets, Style, and List Style. +available tabs: Font, Indents @& Spacing, Tabs, Bullets, Style, Borders, +Margins, Background, Size, and List Style. You can select which pages will be shown by supplying flags to the dialog constructor. In a character formatting dialog, typically only the Font page will be shown. In a paragraph formatting dialog, you'll show the Indents @& @@ -380,7 +384,7 @@ has one such buffer. The content is represented by a hierarchy of objects, all derived from wxRichTextObject. An object might be an image, a fragment of text, a paragraph, -or a whole buffer. Objects store a wxTextAttr containing style information; a +or a further composite object. Objects store a wxRichTextAttr containing style information; a paragraph object can contain both paragraph and character information, but content objects such as text can only store character information. The final style displayed in the control or in a printout is a combination of base style, @@ -412,6 +416,54 @@ objects with the same style where just one would do. So a Defragment function is called when updating the control's display, to ensure that the minimum number of objects is used. +@section overview_richtextctrl_nested_object Nested Objects + +wxRichTextCtrl supports nested objects such as text boxes and tables. To achieve +compatibility with the existing API, there is the concept of @e object @e focus. +When the user clicks on a nested text box, the object focus is set to that +container object so all keyboard input and API functions apply to that +container. The application can change the focus using wxRichTextCtrl::SetObjectFocus. +Call this function with a @null parameter to set the focus back to the top-level +object. + +An event will be sent to the control when the focus changes. + +When the user clicks on the control, wxRichTextCtrl determines which container to set +as the current object focus by calling the found container's overrided wxRichTextObject::AcceptsFocus +function. For example, although a table is a container, it must not itself be +the object focus because there is no text editing at the table level. Instead, a cell +within the table must accept the focus. + +Since with nested objects it is not possible to represent a section with merely +a start position and an end position, the class wxRichTextSelection is provided +which stores multiple ranges (for non-contiguous selections such as table cells) and +a pointer to the container object in question. You can pass wxRichTextSelection +to wxRichTextCtrl::SetSelection or get an instance of it from wxRichTextCtrl::GetSelection. + +When selecting multiple objects, such as cell tables, the wxRichTextCtrl dragging handler code calls the +function wxRichTextObject::HandlesChildSelections to determine whether the children +can be individual selections. Currently only table cells can be multiply-selected +in this way. + +@section overview_richtextctrl_context_menus Context menus and property dialogs + +There are three ways you can make use of context menus: you can let wxRichTextCtrl handle everything and provide a basic menu; +you can set your own context menu using wxRichTextCtrl::SetContextMenu but let wxRichTextCtrl handle showing it and adding property items; +or you can override the default context menu behaviour by adding a context menu event handler +to your class in the normal way. + +If you right-click over a text box in cell in a table, you may want to edit the properties of +one of these objects - but which properties will you be editing? + +Well, the default behaviour allows up to three property-editing menu items simultaneously - for the object clicked on, +the container of that object, and the container's parent (depending on whether any of these +objects return @true from their wxRichTextObject::CanEditProperties functions). +If you supply a context menu, add a property command item using the wxID_RICHTEXT_PROPERTIES1 identifier, +so that wxRichTextCtrl can find the position to add command items. The object should +tell the control what label to use by returning a string from wxRichTextObject::GetPropertiesMenuLabel. + +Since there may be several property-editing commands showing, it is recommended that you don't +include the word Properties - just the name of the object, such as Text Box or Table. @section overview_richtextctrl_roadmap Development Roadmap @@ -433,17 +485,17 @@ This is an incomplete list of bugs. This is a list of some of the features that have yet to be implemented. Help with them will be appreciated. -@li RTF input and output -@li Conversion from HTML +@li support for composite objects in some functions where it's not yet implemented, for example ApplyStyleSheet +@li Table API enhancements and dialogs; improved table layout especially row spans and fitting +@li Conversion from HTML, and a rewrite of the HTML output handler that includes CSS, +tables, text boxes, and floating images, in addition to a simplified-HTML mode for wxHTML compatibility @li Open Office input and output -@li Floating images, with content wrapping around them +@li RTF input and output @li A ruler control @li Standard editing toolbars -@li Tables @li Bitmap bullets -@li Borders -@li Text frames @li Justified text, in print/preview at least +@li scaling: either everything scaled, or rendering using a custom reference point size and an optional dimension scale There are also things that could be done to take advantage of the underlying text capabilities of the platform; higher-level text formatting APIs are diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index dfd1fed23d..88e32f791c 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -586,6 +586,17 @@ Example: @endcode +@subsubsection xrc_wxtogglebuttton wxBitmapToggleButton + +@beginTable +@hdr3col{property, type, description} +@row3col{bitmap, @ref overview_xrcformat_type_bitmap, + Label to display on the button (required).} +@row3col{checked, @ref overview_xrcformat_type_bool, + Should the button be checked/pressed initially (default: 0)?} +@endTable + + @subsubsection xrc_wxbutton wxButton @beginTable @@ -1028,6 +1039,8 @@ following properties: The title of the column. } @row3col{width, integer, The column width. } +@row3col{image, integer, + The zero-based index of the image associated with the item in the 'small' image list. } @endTable The columns are appended to the control in order of their appearance and may be @@ -1717,6 +1730,9 @@ pseudo-class (similarly to @ref xrc_wxnotebook "wxNotebook" and its into the image list.} @row3col{selected, @ref overview_xrcformat_type_bool, Is the page selected initially (only one page can be selected; default: 0)?} +@row3col{expanded, @ref overview_xrcformat_type_bool, + If set to 1, the page is initially expanded. By default all pages are + initially collapsed.} @endTable Each @c treebookpage has exactly one non-toplevel window as its child. diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh index 2f2c713446..8089bc1e58 100755 --- a/docs/doxygen/regen.sh +++ b/docs/doxygen/regen.sh @@ -106,6 +106,40 @@ if [[ "$1" = "qch" ]]; then qhelpgenerator out/html/index.qhp -o out/wx.qch fi +if [[ "$1" = "docset" ]]; then + DOCSETNAME="org.wxwidgets.doxygen.wx29.docset" + ATOM="org.wxwidgets.doxygen.docset.wx29.atom" + ATOMDIR="http://docs.wxwidgets.org/docsets" + XAR="org.wxwidgets.doxygen.docset.wx29.xar" + XARDIR="http://docs.wxwidgets.org/docsets" + XCODE_INSTALL=`sh xcode-select -print-path` + + cp wxdocsettabs.css out/html/wxtabs.css + cp wxdocsetwidgets.css out/html/wxwidgets.css + cp img_downArrow.png out/html + cp background_navigation.png out/html + + cd out/html + DESTINATIONDIR=`pwd` + + rm -rf $DESTINATIONDIR/$DOCSETNAME + rm -f $DESTINATIONDIR/$XAR + + make + + defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleVersion 1.3 + defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleShortVersionString 1.3 + defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleName "wxWidgets 2.9 Library" + defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFeedURL $ATOMDIR/$ATOM + defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFallbackURL http://docs.wxwidgets.org + defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetDescription "API reference and conceptual documentation for wxWidgets 2.9" + defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info NSHumanReadableCopyright "Copyright 1992-2011 wxWidgets team, Portions 1996 Artificial Intelligence Applications Institute" + + $XCODE_INSTALL/usr/bin/docsetutil package -atom $DESTINATIONDIR/$ATOM -download-url $XARDIR/$XAR -output $DESTINATIONDIR/$XAR $DESTINATIONDIR/$DOCSETNAME + + cd ../.. +fi + # Doxygen has the annoying habit to put the full path of the # affected files in the log file; remove it to make the log # more readable diff --git a/docs/doxygen/wxdocsettabs.css b/docs/doxygen/wxdocsettabs.css new file mode 100644 index 0000000000..38e0d49d1c --- /dev/null +++ b/docs/doxygen/wxdocsettabs.css @@ -0,0 +1,131 @@ +/* + tabs styles, based on http://www.alistapart.com/articles/slidingdoors + https://bitbucket.org/rc1/doxygen-style/wiki/Home +*/ + +div.navigation { + display:block; + float:left; + clear:both; + width:100%; + padding-top:10px; + padding-bottom:30px; + border-bottom:1px dotted #E0E0E0; + height: 60px; + background:url(background_navigation.png); +} + +div.contents { + float:left; + clear:both; + +} + +address { + display:none; +} + +DIV.tabs +{ + float : left; + width : 100%; + margin-bottom : 4px; +} + +DIV.tabs UL +{ + margin : 0px; + padding-left : 0px; + list-style : none; +} + +DIV.tabs LI, DIV.tabs FORM +{ + display : inline; + margin : 0px; + padding : 0px; + background-color:#FFFFFF; +} + +DIV.tabs FORM +{ + float : right; +} + +DIV.tabs A +{ + float : left; + font-size : 80%; + font-weight : bold; + text-decoration : none; +} + +DIV.tabs A:hover +{ + background-position: 100% -150px; +} + +DIV.tabs A:link, DIV.tabs A:visited, +DIV.tabs A:active, DIV.tabs A:hover +{ + color: #1A419D; +} + +DIV.tabs SPAN +{ + float : left; + display : block; + padding : 5px 9px; + white-space : nowrap; + border-top:1px dotted #E0E0E0; + border-bottom:1px dotted #E0E0E0; +} + +DIV.tabs #MSearchBox +{ + float : right; + display : inline; + font-size : 1em; +} + +DIV.tabs TD +{ + font-size : 80%; + font-weight : bold; + text-decoration : none; +} + + + +/* Commented Backslash Hack hides rule from IE5-Mac \*/ +DIV.tabs SPAN {float : none;} +/* End IE5-Mac hack */ + +DIV.tabs A:hover SPAN +{ + background-position: 0% -150px; +} + +DIV.tabs LI.current A +{ + background-position: 100% -150px; + border-width : 0px; + background-color: #F0F0F0; + background: #F0F0F0 url(img_downArrow.png) center bottom no-repeat; +} + +DIV.tabs LI.current SPAN +{ + background-position: 0% -150px; + padding-bottom : 6px; +} + +DIV.navpath +{ + background : none; + border : none; + border-bottom : 1px solid #84B0C7; + text-align : center; + margin : 2px; + padding : 2px; +} diff --git a/docs/doxygen/wxdocsetwidgets.css b/docs/doxygen/wxdocsetwidgets.css new file mode 100644 index 0000000000..210a0dd679 --- /dev/null +++ b/docs/doxygen/wxdocsetwidgets.css @@ -0,0 +1,564 @@ +/* The standard CSS for doxygen + modified by RossCairns.com + https://bitbucket.org/rc1/doxygen-style/wiki/Home +*/ + +body, table, div, p, dl { + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; + font-size: 12px; +} + +p, div, dl { + color:#3E3E3E; +} + +div.contents p { + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; +} + +/* @group Heading Levels */ + +h1 { + margin-bottom: 10px; + font-size: 30px; + padding: 0px 0px 20px 0px ; + + border-bottom:1px dotted #E0E0E0; +} + +h2 { + padding-top: 30px; + font-size: 17px; + color:#42657B; + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; +} + +h3 { + font-size: 17px; + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; +} + +dt { + font-weight: bold; +} + +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3; +} + +p.startli, p.startdd, p.starttd { + margin-top: 2px; +} + +p.endli { + margin-bottom: 0px; +} + +p.enddd { + margin-bottom: 4px; +} + +p.endtd { + margin-bottom: 2px; +} + +/* @end */ + +caption { + font-weight: bold; +} + +span.legend { + font-size: 70%; + text-align: center; +} + +h3.version { + font-size: 90%; + padding-bottom:10px; + border-bottom:1px dotted #E0E0E0; +} + +div.qindex, div.navtab{ + background-color: #e8eef2; + border: 1px solid #84b0c7; + text-align: center; + margin: 2px; + padding: 2px; +} + +div.qindex, div.navpath { + width: 100%; + line-height: 140%; +} + +div.navtab { + margin-right: 15px; +} + +/* @group Link Styling */ + +a { + color: #153788; + font-weight: normal; + text-decoration: none; +} + +.contents a:visited { + color: #1b77c5; +} + +a:hover { + text-decoration: underline; +} + +a.qindex { + font-weight: bold; +} + +a.qindexHL { + font-weight: bold; + background-color: #6666cc; + color: #ffffff; + border: 1px double #9295C2; +} + +.contents a.qindexHL:visited { + color: #ffffff; +} + +a.el { + font-weight: bold; +} + +a.elRef { +} + +a.code { + color: #3030f0; +} + +a.codeRef { + color: #3030f0; +} + +/* @end */ + +dl.el { + margin-left: -1cm; +} + +.fragment { + font-family: monospace, fixed; + font-size: 105%; +} + +pre.fragment { + border: 1px solid #CCCCCC; + background-color: #f5f5f5; + padding: 4px 6px; + margin: 4px 8px 4px 2px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; +} + +div.ah { + background-color: black; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px +} + +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + margin-bottom: 6px; + font-weight: bold; +} + +div.groupText { + margin-left: 16px; + font-style: italic; +} + +body { + background: white; + color: black; + margin-right: 20px; + margin-left: 20px; +} + +td.indexkey { + background-color: #F1F5F9; + font-weight: bold; + border: 1px solid #CCCCCC; + margin: 2px 0px 2px 0; + padding: 2px 10px; +} + +td.indexvalue { + background-color: #F1F5F9; + border: 1px solid #CCCCCC; + padding: 2px 10px; + margin: 2px 0px; +} + +tr.memlist { + background-color: #f0f0f0; +} + +p.formulaDsp { + text-align: center; +} + +img.formulaDsp { + +} + +img.formulaInl { + vertical-align: middle; +} + +div.center { + text-align: center; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; +} + +div.center img { + border: 0px; +} + +img.footer { + border: 0px; + vertical-align: middle; +} + +/* @group Code Colorization */ + +span.keyword { + color: #008000 +} + +span.keywordtype { + color: #604020 +} + +span.keywordflow { + color: #e08000 +} + +span.comment { + color: #800000 +} + +span.preprocessor { + color: #806020 +} + +span.stringliteral { + color: #002080 +} + +span.charliteral { + color: #008080 +} + +span.vhdldigit { + color: #ff00ff +} + +span.vhdlchar { + color: #000000 +} + +span.vhdlkeyword { + color: #700070 +} + +span.vhdllogic { + color: #ff0000 +} + +/* @end */ + +.search { + color: #003399; + font-weight: bold; +} + +form.search { + margin-bottom: 0px; + margin-top: 0px; +} + +input.search { + font-size: 75%; + color: #000080; + font-weight: normal; + background-color: #F1F5F9; +} + +td.tiny { + font-size: 75%; +} + +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #84b0c7; +} + +th.dirtab { + background: #F1F5F9; + font-weight: bold; +} + +hr { + height: 0; + border: none; + border-top: 1px solid #666; +} + +/* @group Member Descriptions */ + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #FAFAFA; + border: none; + margin: 4px; + padding: 1px 0 0 8px; +} + +.mdescLeft, .mdescRight { + padding: 0px 8px 4px 8px; + color: #555; +} + +.memItemLeft, .memItemRight, .memTemplParams { + border-top: 1px solid #ccc; + background-color: #F9F9F9; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memTemplParams { + color: #606060; + white-space: nowrap; +} + +/* @end */ + +/* @group Member Details */ + +/* Styles for detailed member documentation */ + +.memtemplate { + font-size: 80%; + color: #606060; + font-weight: normal; + margin-left: 3px; +} + +.memnav { + background-color: #F1F5F9; + border: 1px solid #84b0c7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.memitem { + padding: 0; + margin-bottom: 30px; +} + +.memname { + white-space: nowrap; + font-weight: bold; + color:#42657B; + padding:3px 5px; +} + +.memproto, .memdoc { + border: 1px dotted #E0E0E0; +} + +.memproto { + padding: 0; + background-color: #F9F9F9; + font-weight: bold; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + +} + +.memdoc { + padding: 2px 20px 20px; + background-color: #FFFFFF; + border-top-width: 0; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; +} + +.paramname { + color: #885656; + white-space: nowrap; +} +.paramname em { + font-style: normal; +} + +/* @end */ + +/* @group Directory (tree) */ + +/* for the tree view */ + +.ftvtree { + font-family: sans-serif; + margin: 0.5em; +} + +/* these are for tree view when used as main index */ + +.directory { + font-size: 9pt; + font-weight: bold; +} + +.directory h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +/* +The following two styles can be used to replace the root node title +with an image of your choice. Simply uncomment the next two styles, +specify the name of your image and be sure to set 'height' to the +proper pixel height of your image. +*/ + +/* +.directory h3.swap { + height: 61px; + background-repeat: no-repeat; + background-image: url("yourimage.gif"); +} +.directory h3.swap span { + display: none; +} +*/ + +.directory > h3 { + margin-top: 0; +} + +.directory p { + margin: 0px; + white-space: nowrap; +} + +.directory div { + display: none; + margin: 0px; +} + +.directory img { + vertical-align: -30%; +} + +/* these are for tree view when not used as main index */ + +.directory-alt { + font-size: 100%; + font-weight: bold; +} + +.directory-alt h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +.directory-alt > h3 { + margin-top: 0; +} + +.directory-alt p { + margin: 0px; + white-space: nowrap; +} + +.directory-alt div { + display: none; + margin: 0px; +} + +.directory-alt img { + vertical-align: -30%; +} + +/* @end */ + +address { + font-style: normal; + color: #333; +} + +table.doxtable { + border-collapse:collapse; +} + +table.doxtable td, table.doxtable th { + border: 1px solid #153788; + padding: 3px 7px 2px; +} + +table.doxtable th { + background-color: #254798; + color: #FFFFFF; + font-size: 110%; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; +} + + +hr { + border-top:1px dotted #E0E0E0; + border-bottom:1px dotted #E0E0E0; + margin-top:30px; + padding-top:10px; +} + +.contents { + padding-top: 30px; +} + +h1 { + margin-top:0; +} +.contents .dynsection { + margin-top:10px; +} diff --git a/docs/readme.txt b/docs/readme.txt index 3187c92b47..a702a85eec 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,26 +1,42 @@ - wxWidgets 2.9.1 Release Notes + wxWidgets 2.9.2 Release Notes ============================= -Welcome to the latest release of wxWidgets, a cross-platform C++ -framework for writing advanced GUI applications using native -controls where possible. +Welcome to the latest release of wxWidgets, a free cross-platform C++ +framework for writing advanced GUI applications using native controls. + In addition to common and advanced GUI facilities such as frames, scrolling windows, toolbars, tree controls, icons, device contexts, printing, splitter windows and so on, there are wrappers for common -file operations, and facilities for writing TCP/IP applications, -thread handling, and more. +file operations, facilities for writing network applications, +thread handling, and so on. You can learn more about wxWidgets at + + http://www.wxwidgets.org/ + + +wxWidgets sources are available for download from + + https://sourceforge.net/projects/wxwindows/files/2.9.2/ + +or + + ftp://ftp.wxwidgets.org/pub/2.9.2/ + +Please see the "Files" section below for the description of various +files available at these locations. + A detailed reference manual including in-depth overviews for various topics is supplied in various formats and can be accessed online at -http://docs.wxwidgets.org/ + + http://docs.wxwidgets.org/2.9.2/ -Note about naming: while 2.9.1 is called a "development" release, -this only means that API is not guaranteed to remain unchanged in -the subsequent 2.9.x releases, unlike in the stable 2.8.x branch. We -believe the current version is stable and suitable for use in -production environment. +Note about naming: while 2.9.2 is called a "development" release, +this only means that API is not guaranteed to remain unchanged in the +subsequent 2.9.x releases (although it is still likely that it will), +unlike in the stable 2.8.x branch. We believe the current version is +stable and suitable for use in production environment. @@ -71,8 +87,19 @@ date status. Files ----- -The distribution is available in archive formats appropriate to the -target system. See the download pages for details. +wxWidgets is distributed in source form in several archive formats. +ZIP and 7z archives are for Microsoft Windows users and contain the +files with DOS/Windows line endings while the compressed tar archives +for Unix systems users (including OS X) and contain the files with +Unix line endings. Please notice that some Windows tools still don't +accept files with Unix line endings and that compiling sources with +DOS line endings under Unix will fail, so please choose the correct +file for your system. + +In addition to the sources, documentation in HTML, CHM and HTB +(wxWidgets help viewer) formats is provided as well as an installer +for Microsoft Windows. Notice that you will still need to compile +wxWidgets even when using the installer. Installation @@ -133,7 +160,7 @@ Documentation ------------- wxWidgets documentation is available online at -http://docs.wxwidgets.org/2.9.1/ and can also be downloaded in HTML +http://docs.wxwidgets.org/2.9.2/ and can also be downloaded in HTML format. To generate documentation in other formats (PDF, CHM, ...) please use the scripts in docs/doxygen directory. @@ -160,11 +187,11 @@ Further information The wxWidgets Web site is located at: - http://www.wxwidgets.org + http://www.wxwidgets.org/ The main wxWidgets ftp site is at: - ftp://biolpc22.york.ac.uk/pub + ftp://ftp.wxwidgets.org/pub/ A wxWidgets CD-ROM with the latest distribution plus an HTML front-end and hundreds of MB of compilers, utilities and other @@ -173,5 +200,4 @@ web site. Have fun! -The wxWidgets Team, July 2010 - +The wxWidgets Team, July 2011 diff --git a/docs/tech/tn0022.txt b/docs/tech/tn0022.txt index f803caa26a..931efeafa0 100644 --- a/docs/tech/tn0022.txt +++ b/docs/tech/tn0022.txt @@ -1,6 +1,13 @@ Making a new wxWidgets release ============================== +Before making the release +------------------------- + +Update docs/readme.txt. Please review its contents in addition to just +changing the version number. + + Creating release files ---------------------- @@ -25,9 +32,31 @@ IMPORTANT NOTE: You *must* run this script from a clean source tree, that is, release. If you have legitimate modifications in the tree that need to be in the release, commit them first. +To generate the windows installer (.exe) and the documentation files (chm and htb formats) +run: -Also run doxygen to create HTML documentation and pack it in .tar.bz2 and .zip -formats. +build\tools\bld_chm_exe.bat + +which depends on the wxwidgets.iss file, and generates output in the %DAILY% directory. It +assumes a clean copy of the wxWidgets source tree in %INNO%. Temporary files will be generated +in the tree from which the batch file is run. It depends on doxygen, a number of gnu +win32 tools and Microsofts htmlhelp compiler. The wxwidgets.iss file should not need +editing, but you will want to check that the bld_chm_exe.bat has the correct version number. + + + +Alternative non official release scripts +---------------------------------------- + +If you use git-svn, then you can use alternative script that avoids the +problems such as using non-clean tree and also has better handling of the ends +of lines conversions. To use it you need to run + +- build/tools/svn-find-native-eols.pl +- build/tools/git-make-release +- build/tools/make-html-docs + +(the last one can also be used without git). Uploading @@ -37,7 +66,7 @@ Upload the files to SourceForge (the simplest is to scp them to sfusername,wxwindows@frs.sf.net:/home/frs/project/w/wx/wxwindows/x.y.z) and to ftp.wxwidgets.org (ask Chris to do it). -Create http://docs.wxwidgets.org/x.y.z/ (ask Bryan to do it). +Create http://docs.wxwidgets.org/x.y.z/ (ask Bryan to do it if not done yet). Announcement diff --git a/include/wx/aboutdlg.h b/include/wx/aboutdlg.h index 9c5a12ee03..edcf6fd105 100644 --- a/include/wx/aboutdlg.h +++ b/include/wx/aboutdlg.h @@ -69,7 +69,7 @@ public: // icon to be shown in the dialog, defaults to the main frame icon void SetIcon(const wxIcon& icon) { m_icon = icon; } - bool HasIcon() const { return m_icon.Ok(); } + bool HasIcon() const { return m_icon.IsOk(); } wxIcon GetIcon() const; // web site for the program and its description (defaults to URL itself if diff --git a/include/wx/affinematrix2dbase.h b/include/wx/affinematrix2dbase.h index a28bafa130..9a70402e53 100644 --- a/include/wx/affinematrix2dbase.h +++ b/include/wx/affinematrix2dbase.h @@ -36,7 +36,8 @@ class WXDLLIMPEXP_CORE wxAffineMatrix2DBase { public: wxAffineMatrix2DBase() {} - + virtual ~wxAffineMatrix2DBase() {} + // sets the matrix to the respective values virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0; diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h new file mode 100644 index 0000000000..bc5519bcfb --- /dev/null +++ b/include/wx/anybutton.h @@ -0,0 +1,202 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/anybutton.h +// Purpose: wxAnyButtonBase class +// Author: Vadim Zetlin +// Created: 2000-08-15 (extracted from button.h) +// RCS-ID: $Id: anybutton.h 65680 2010-09-30 11:44:45Z VZ $ +// Copyright: (c) Vadim Zetlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_ANYBUTTON_H_BASE_ +#define _WX_ANYBUTTON_H_BASE_ + +#include "wx/defs.h" + +#ifdef wxHAS_ANY_BUTTON + +// ---------------------------------------------------------------------------- +// wxAnyButton specific flags +// ---------------------------------------------------------------------------- + +// These flags affect label alignment +#define wxBU_LEFT 0x0040 +#define wxBU_TOP 0x0080 +#define wxBU_RIGHT 0x0100 +#define wxBU_BOTTOM 0x0200 +#define wxBU_ALIGN_MASK ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM ) + +// These two flags are obsolete +#define wxBU_NOAUTODRAW 0x0000 +#define wxBU_AUTODRAW 0x0004 + +// by default, the buttons will be created with some (system dependent) +// minimal size to make them look nicer, giving this style will make them as +// small as possible +#define wxBU_EXACTFIT 0x0001 + +// this flag can be used to disable using the text label in the button: it is +// mostly useful when creating buttons showing bitmap and having stock id as +// without it both the standard label corresponding to the stock id and the +// bitmap would be shown +#define wxBU_NOTEXT 0x0002 + + +#include "wx/bitmap.h" +#include "wx/control.h" + +// ---------------------------------------------------------------------------- +// wxAnyButton: common button functionality +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxAnyButtonBase : public wxControl +{ +public: + wxAnyButtonBase() { } + + // show the image in the button in addition to the label: this method is + // supported on all (major) platforms + void SetBitmap(const wxBitmap& bitmap, wxDirection dir = wxLEFT) + { + SetBitmapLabel(bitmap); + SetBitmapPosition(dir); + } + + wxBitmap GetBitmap() const { return DoGetBitmap(State_Normal); } + + // Methods for setting individual images for different states: normal, + // selected (meaning pushed or pressed), focused (meaning normal state for + // a focused button), disabled or hover (a.k.a. hot or current). + // + // Remember that SetBitmap() itself must be called before any other + // SetBitmapXXX() methods (except for SetBitmapLabel() which is a synonym + // for it anyhow) and that all bitmaps passed to these functions should be + // of the same size. + void SetBitmapLabel(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Normal); } + void SetBitmapPressed(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Pressed); } + void SetBitmapDisabled(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Disabled); } + void SetBitmapCurrent(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Current); } + void SetBitmapFocus(const wxBitmap& bitmap) + { DoSetBitmap(bitmap, State_Focused); } + + wxBitmap GetBitmapLabel() const { return DoGetBitmap(State_Normal); } + wxBitmap GetBitmapPressed() const { return DoGetBitmap(State_Pressed); } + wxBitmap GetBitmapDisabled() const { return DoGetBitmap(State_Disabled); } + wxBitmap GetBitmapCurrent() const { return DoGetBitmap(State_Current); } + wxBitmap GetBitmapFocus() const { return DoGetBitmap(State_Focused); } + + + // set the margins around the image + void SetBitmapMargins(wxCoord x, wxCoord y) { DoSetBitmapMargins(x, y); } + void SetBitmapMargins(const wxSize& sz) { DoSetBitmapMargins(sz.x, sz.y); } + wxSize GetBitmapMargins() { return DoGetBitmapMargins(); } + + // set the image position relative to the text, i.e. wxLEFT means that the + // image is to the left of the text (this is the default) + void SetBitmapPosition(wxDirection dir); + + + // Buttons on MSW can look bad if they are not native colours, because + // then they become owner-drawn and not theme-drawn. Disable it here + // in wxAnyButtonBase to make it consistent. + virtual bool ShouldInheritColours() const { return false; } + + // wxUniv-compatible and deprecated equivalents to SetBitmapXXX() +#if WXWIN_COMPATIBILITY_2_8 + void SetImageLabel(const wxBitmap& bitmap) { SetBitmap(bitmap); } + void SetImageMargins(wxCoord x, wxCoord y) { SetBitmapMargins(x, y); } +#endif // WXWIN_COMPATIBILITY_2_8 + + // backwards compatible names for pressed/current bitmaps: they're not + // deprecated as there is nothing really wrong with using them and no real + // advantage to using the new names but the new names are still preferred + wxBitmap GetBitmapSelected() const { return GetBitmapPressed(); } + wxBitmap GetBitmapHover() const { return GetBitmapCurrent(); } + + void SetBitmapSelected(const wxBitmap& bitmap) { SetBitmapPressed(bitmap); } + void SetBitmapHover(const wxBitmap& bitmap) { SetBitmapCurrent(bitmap); } + + + // this enum is not part of wx public API, it is public because it is used + // in non wxAnyButton-derived classes internally + // + // also notice that MSW code relies on the values of the enum elements, do + // not change them without revising src/msw/button.cpp + enum State + { + State_Normal, + State_Current, // a.k.a. hot or "hovering" + State_Pressed, // a.k.a. "selected" in public API for some reason + State_Disabled, + State_Focused, + State_Max + }; + + // return true if this button shouldn't show the text label, either because + // it doesn't have it or because it was explicitly disabled with wxBU_NOTEXT + bool DontShowLabel() const + { + return HasFlag(wxBU_NOTEXT) || GetLabel().empty(); + } + + // return true if we do show the label + bool ShowsLabel() const + { + return !DontShowLabel(); + } + +protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + + virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const + { return wxBitmap(); } + virtual void DoSetBitmap(const wxBitmap& WXUNUSED(bitmap), + State WXUNUSED(which)) + { } + + virtual wxSize DoGetBitmapMargins() const + { return wxSize(0, 0); } + + virtual void DoSetBitmapMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) + { } + + virtual void DoSetBitmapPosition(wxDirection WXUNUSED(dir)) + { } + + virtual bool DoGetAuthNeeded() const { return false; } + virtual void DoSetAuthNeeded(bool WXUNUSED(show)) { } + + + wxDECLARE_NO_COPY_CLASS(wxAnyButtonBase); +}; + +//#if defined(__WXUNIVERSAL__) +// #include "wx/univ/anybutton.h" +#if defined(__WXMSW__) + #include "wx/msw/anybutton.h" +//#elif defined(__WXMOTIF__) +// #include "wx/motif/anybutton.h" +#elif defined(__WXGTK20__) + #include "wx/gtk/anybutton.h" +//#elif defined(__WXGTK__) +// #include "wx/gtk1/anybutton.h" +#elif defined(__WXMAC__) + #include "wx/osx/anybutton.h" +//#elif defined(__WXCOCOA__) +// #include "wx/cocoa/anybutton.h" +//#elif defined(__WXPM__) +// #include "wx/os2/anybutton.h" +//#elif defined(__WXPALMOS__) +// #include "wx/palmos/anybutton.h" +#else + typedef wxAnyButtonBase wxAnyButton; +#endif + +#endif // wxHAS_ANY_BUTTON + +#endif // _WX_ANYBUTTON_H_BASE_ diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h index 874cbcddf5..42092662f8 100644 --- a/include/wx/aui/auibook.h +++ b/include/wx/aui/auibook.h @@ -502,18 +502,22 @@ protected: -class WXDLLIMPEXP_AUI wxAuiNotebook : public wxControl +class WXDLLIMPEXP_AUI wxAuiNotebook : public wxNavigationEnabled { public: - wxAuiNotebook(); + wxAuiNotebook() { Init(); } wxAuiNotebook(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxAUI_NB_DEFAULT_STYLE); + long style = wxAUI_NB_DEFAULT_STYLE) + { + Init(); + Create(parent, id, pos, size, style); + } virtual ~wxAuiNotebook(); @@ -595,6 +599,9 @@ public: virtual void Thaw(); protected: + // Common part of all ctors. + void Init(); + // choose the default border for this window virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } @@ -627,6 +634,7 @@ protected: void OnTabBeginDrag(wxAuiNotebookEvent& evt); void OnTabDragMotion(wxAuiNotebookEvent& evt); void OnTabEndDrag(wxAuiNotebookEvent& evt); + void OnTabCancelDrag(wxAuiNotebookEvent& evt); void OnTabButton(wxAuiNotebookEvent& evt); void OnTabMiddleDown(wxAuiNotebookEvent& evt); void OnTabMiddleUp(wxAuiNotebookEvent& evt); @@ -664,9 +672,6 @@ protected: DECLARE_CLASS(wxAuiNotebook) DECLARE_EVENT_TABLE() #endif - - WX_DECLARE_CONTROL_CONTAINER(); - }; diff --git a/include/wx/button.h b/include/wx/button.h index 0e987d1eda..b4f06d9ed5 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -14,44 +14,9 @@ #include "wx/defs.h" -// ---------------------------------------------------------------------------- -// wxButton flags shared with other classes -// ---------------------------------------------------------------------------- - -#if wxUSE_TOGGLEBTN || wxUSE_BUTTON - -// These flags affect label alignment -#define wxBU_LEFT 0x0040 -#define wxBU_TOP 0x0080 -#define wxBU_RIGHT 0x0100 -#define wxBU_BOTTOM 0x0200 -#define wxBU_ALIGN_MASK ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM ) -#endif - #if wxUSE_BUTTON -// ---------------------------------------------------------------------------- -// wxButton specific flags -// ---------------------------------------------------------------------------- - -// These two flags are obsolete -#define wxBU_NOAUTODRAW 0x0000 -#define wxBU_AUTODRAW 0x0004 - -// by default, the buttons will be created with some (system dependent) -// minimal size to make them look nicer, giving this style will make them as -// small as possible -#define wxBU_EXACTFIT 0x0001 - -// this flag can be used to disable using the text label in the button: it is -// mostly useful when creating buttons showing bitmap and having stock id as -// without it both the standard label corresponding to the stock id and the -// bitmap would be shown -#define wxBU_NOTEXT 0x0002 - - -#include "wx/bitmap.h" -#include "wx/control.h" +#include "wx/anybutton.h" extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; @@ -59,7 +24,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // wxButton: a push button // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxButtonBase : public wxControl +class WXDLLIMPEXP_CORE wxButtonBase : public wxAnyButton { public: wxButtonBase() { } @@ -70,132 +35,15 @@ public: void SetAuthNeeded(bool show = true) { DoSetAuthNeeded(show); } bool GetAuthNeeded() const { return DoGetAuthNeeded(); } - // show the image in the button in addition to the label: this method is - // supported on all (major) platforms - void SetBitmap(const wxBitmap& bitmap, wxDirection dir = wxLEFT) - { - SetBitmapLabel(bitmap); - SetBitmapPosition(dir); - } - - wxBitmap GetBitmap() const { return DoGetBitmap(State_Normal); } - - // Methods for setting individual images for different states: normal, - // selected (meaning pushed or pressed), focused (meaning normal state for - // a focused button), disabled or hover (a.k.a. hot or current). - // - // Remember that SetBitmap() itself must be called before any other - // SetBitmapXXX() methods (except for SetBitmapLabel() which is a synonym - // for it anyhow) and that all bitmaps passed to these functions should be - // of the same size. - void SetBitmapLabel(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Normal); } - void SetBitmapPressed(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Pressed); } - void SetBitmapDisabled(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Disabled); } - void SetBitmapCurrent(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Current); } - void SetBitmapFocus(const wxBitmap& bitmap) - { DoSetBitmap(bitmap, State_Focused); } - - wxBitmap GetBitmapLabel() const { return DoGetBitmap(State_Normal); } - wxBitmap GetBitmapPressed() const { return DoGetBitmap(State_Pressed); } - wxBitmap GetBitmapDisabled() const { return DoGetBitmap(State_Disabled); } - wxBitmap GetBitmapCurrent() const { return DoGetBitmap(State_Current); } - wxBitmap GetBitmapFocus() const { return DoGetBitmap(State_Focused); } - - - // set the margins around the image - void SetBitmapMargins(wxCoord x, wxCoord y) { DoSetBitmapMargins(x, y); } - void SetBitmapMargins(const wxSize& sz) { DoSetBitmapMargins(sz.x, sz.y); } - wxSize GetBitmapMargins() { return DoGetBitmapMargins(); } - - // set the image position relative to the text, i.e. wxLEFT means that the - // image is to the left of the text (this is the default) - void SetBitmapPosition(wxDirection dir); - - // make this button the default button in its top level window // // returns the old default item (possibly NULL) virtual wxWindow *SetDefault(); - // Buttons on MSW can look bad if they are not native colours, because - // then they become owner-drawn and not theme-drawn. Disable it here - // in wxButtonBase to make it consistent. - virtual bool ShouldInheritColours() const { return false; } - // returns the default button size for this platform static wxSize GetDefaultSize(); - // wxUniv-compatible and deprecated equivalents to SetBitmapXXX() -#if WXWIN_COMPATIBILITY_2_8 - void SetImageLabel(const wxBitmap& bitmap) { SetBitmap(bitmap); } - void SetImageMargins(wxCoord x, wxCoord y) { SetBitmapMargins(x, y); } -#endif // WXWIN_COMPATIBILITY_2_8 - - // backwards compatible names for pressed/current bitmaps: they're not - // deprecated as there is nothing really wrong with using them and no real - // advantage to using the new names but the new names are still preferred - wxBitmap GetBitmapSelected() const { return GetBitmapPressed(); } - wxBitmap GetBitmapHover() const { return GetBitmapCurrent(); } - - void SetBitmapSelected(const wxBitmap& bitmap) { SetBitmapPressed(bitmap); } - void SetBitmapHover(const wxBitmap& bitmap) { SetBitmapCurrent(bitmap); } - - - // this enum is not part of wx public API, it is public because it is used - // in non wxButton-derived classes internally - // - // also notice that MSW code relies on the values of the enum elements, do - // not change them without revising src/msw/button.cpp - enum State - { - State_Normal, - State_Current, // a.k.a. hot or "hovering" - State_Pressed, // a.k.a. "selected" in public API for some reason - State_Disabled, - State_Focused, - State_Max - }; - - // return true if this button shouldn't show the text label, either because - // it doesn't have it or because it was explicitly disabled with wxBU_NOTEXT - bool DontShowLabel() const - { - return HasFlag(wxBU_NOTEXT) || GetLabel().empty(); - } - - // return true if we do show the label - bool ShowsLabel() const - { - return !DontShowLabel(); - } - protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - - virtual bool DoGetAuthNeeded() const { return false; } - virtual void DoSetAuthNeeded(bool WXUNUSED(show)) { } - - virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const - { return wxBitmap(); } - virtual void DoSetBitmap(const wxBitmap& WXUNUSED(bitmap), - State WXUNUSED(which)) - { } - - virtual wxSize DoGetBitmapMargins() const - { return wxSize(0, 0); } - - virtual void DoSetBitmapMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) - { } - - virtual void DoSetBitmapPosition(wxDirection WXUNUSED(dir)) - { } - - wxDECLARE_NO_COPY_CLASS(wxButtonBase); }; @@ -221,5 +69,4 @@ protected: #endif // wxUSE_BUTTON -#endif - // _WX_BUTTON_H_BASE_ +#endif // _WX_BUTTON_H_BASE_ diff --git a/include/wx/cairo.h b/include/wx/cairo.h index 60e06534a0..88d570586b 100644 --- a/include/wx/cairo.h +++ b/include/wx/cairo.h @@ -132,11 +132,12 @@ public: wxDL_VOIDMETHOD_DEFINE( cairo_translate, (cairo_t *cr, double tx, double ty), (cr, tx, ty) ) +#if wxUSE_PANGO wxDL_VOIDMETHOD_DEFINE( pango_cairo_update_layout, (cairo_t *cr, PangoLayout *layout), (cr, layout) ) wxDL_VOIDMETHOD_DEFINE( pango_cairo_show_layout, (cairo_t *cr, PangoLayout *layout), (cr, layout) ) - +#endif wxDECLARE_NO_COPY_CLASS(wxCairoLibrary); }; diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h index 4cbf5720d9..ce056a11fe 100644 --- a/include/wx/calctrl.h +++ b/include/wx/calctrl.h @@ -112,10 +112,10 @@ public: void SetHoliday(bool holiday) { m_holiday = holiday; } // accessors - bool HasTextColour() const { return m_colText.Ok(); } - bool HasBackgroundColour() const { return m_colBack.Ok(); } - bool HasBorderColour() const { return m_colBorder.Ok(); } - bool HasFont() const { return m_font.Ok(); } + bool HasTextColour() const { return m_colText.IsOk(); } + bool HasBackgroundColour() const { return m_colBack.IsOk(); } + bool HasBorderColour() const { return m_colBorder.IsOk(); } + bool HasFont() const { return m_font.IsOk(); } bool HasBorder() const { return m_border != wxCAL_BORDER_NONE; } bool IsHoliday() const { return m_holiday; } diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 8ac018ce65..ecd42d07f2 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -189,7 +189,7 @@ public: // Is this data OK for showing the print dialog? bool Ok() const { return IsOk(); } - bool IsOk() const { return m_printData.Ok() ; } + bool IsOk() const { return m_printData.IsOk() ; } wxPrintData& GetPrintData() { return m_printData; } void SetPrintData(const wxPrintData& printData) { m_printData = printData; } @@ -249,7 +249,7 @@ public: // Is this data OK for showing the page setup dialog? bool Ok() const { return IsOk(); } - bool IsOk() const { return m_printData.Ok() ; } + bool IsOk() const { return m_printData.IsOk() ; } // If a corresponding paper type is found in the paper database, will set the m_printData // paper size id member as well. diff --git a/include/wx/containr.h b/include/wx/containr.h index 594af01367..7cb13e8fc1 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// // Name: wx/containr.h -// Purpose: wxControlContainer class declration: a "mix-in" class which -// implements the TAB navigation between the controls +// Purpose: wxControlContainer and wxNavigationEnabled declarations // Author: Vadim Zeitlin // Modified by: // Created: 06.08.01 // RCS-ID: $Id$ -// Copyright: (c) 2001 Vadim Zeitlin +// Copyright: (c) 2001, 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -19,12 +18,11 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxWindowBase; /* - Implementation note: wxControlContainer is not a real mix-in but rather - a class meant to be aggregated with (and not inherited from). Although - logically it should be a mix-in, doing it like this has no advantage from - the point of view of the existing code but does have some problems (we'd - need to play tricks with event handlers which may be difficult to do - safely). The price we pay for this simplicity is the ugly macros below. + This header declares wxControlContainer class however it's not a real + container of controls but rather just a helper used to implement TAB + navigation among the window children. You should rarely need to use it + directly, derive from the documented public wxNavigationEnabled<> class to + implement TAB navigation in a custom composite window. */ // ---------------------------------------------------------------------------- @@ -102,6 +100,164 @@ private: bool m_inSetFocus; }; +#ifdef wxHAS_NATIVE_TAB_TRAVERSAL + +// ---------------------------------------------------------------------------- +// wxControlContainer for native TAB navigation +// ---------------------------------------------------------------------------- + +// this must be a real class as we forward-declare it elsewhere +class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase +{ +protected: + // set the focus to the child which had it the last time + virtual bool SetFocusToChild(); +}; + +#else // !wxHAS_NATIVE_TAB_TRAVERSAL + +class WXDLLIMPEXP_FWD_CORE wxFocusEvent; +class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent; + +// ---------------------------------------------------------------------------- +// wxControlContainer for TAB navigation implemented in wx itself +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase +{ +public: + // default ctor, SetContainerWindow() must be called later + wxControlContainer(); + + // the methods to be called from the window event handlers + void HandleOnNavigationKey(wxNavigationKeyEvent& event); + void HandleOnFocus(wxFocusEvent& event); + void HandleOnWindowDestroy(wxWindowBase *child); + + // called from OnChildFocus() handler, i.e. when one of our (grand) + // children gets the focus + void SetLastFocus(wxWindow *win); + +protected: + + wxDECLARE_NO_COPY_CLASS(wxControlContainer); +}; + +#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL + +// this function is for wxWidgets internal use only +extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); + +// ---------------------------------------------------------------------------- +// wxNavigationEnabled: Derive from this class to support keyboard navigation +// among window children in a wxWindow-derived class. The details of this class +// don't matter, you just need to derive from it to make navigation work. +// ---------------------------------------------------------------------------- + +// The template parameter W must be a wxWindow-derived class. +template +class wxNavigationEnabled : public W +{ +public: + typedef W BaseWindowClass; + + wxNavigationEnabled() + { + m_container.SetContainerWindow(this); + +#ifndef wxHAS_NATIVE_TAB_TRAVERSAL + Connect(wxEVT_NAVIGATION_KEY, + wxNavigationKeyEventHandler(wxNavigationEnabled::OnNavigationKey)); + + Connect(wxEVT_SET_FOCUS, + wxFocusEventHandler(wxNavigationEnabled::OnFocus)); + + Connect(wxEVT_CHILD_FOCUS, + wxChildFocusEventHandler(wxNavigationEnabled::OnChildFocus)); +#endif // !wxHAS_NATIVE_TAB_TRAVERSAL + } + + virtual bool AcceptsFocus() const + { + return m_container.AcceptsFocus(); + } + + virtual bool AcceptsFocusRecursively() const + { + return m_container.AcceptsFocusRecursively(); + } + + virtual bool AcceptsFocusFromKeyboard() const + { + return m_container.AcceptsFocusFromKeyboard(); + } + + virtual void AddChild(wxWindowBase *child) + { + BaseWindowClass::AddChild(child); + + m_container.UpdateCanFocus(); + } + + virtual void RemoveChild(wxWindowBase *child) + { +#ifndef wxHAS_NATIVE_TAB_TRAVERSAL + m_container.HandleOnWindowDestroy(child); +#endif // !wxHAS_NATIVE_TAB_TRAVERSAL + + BaseWindowClass::RemoveChild(child); + + m_container.UpdateCanFocus(); + } + + virtual void SetFocus() + { + if ( !m_container.DoSetFocus() ) + BaseWindowClass::SetFocus(); + } + + void SetFocusIgnoringChildren() + { + BaseWindowClass::SetFocus(); + } + + void AcceptFocus(bool acceptFocus) + { + m_container.SetCanFocus(acceptFocus); + } + +protected: +#ifndef wxHAS_NATIVE_TAB_TRAVERSAL + void OnNavigationKey(wxNavigationKeyEvent& event) + { + m_container.HandleOnNavigationKey(event); + } + + void OnFocus(wxFocusEvent& event) + { + m_container.HandleOnFocus(event); + } + + void OnChildFocus(wxChildFocusEvent& event) + { + m_container.SetLastFocus(event.GetWindow()); + event.Skip(); + } +#endif // !wxHAS_NATIVE_TAB_TRAVERSAL + + wxControlContainer m_container; + + + wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxNavigationEnabled, W); +}; + +// ---------------------------------------------------------------------------- +// Compatibility macros from now on, do NOT use them and preferably do not even +// look at them. +// ---------------------------------------------------------------------------- + +#ifdef WXWIN_COMPATIBILITY_2_8 + // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases, // it should be used in the wxWindow-derived class declaration #define WX_DECLARE_CONTROL_CONTAINER_BASE() \ @@ -156,20 +312,9 @@ protected: \ return m_container.AcceptsFocusFromKeyboard(); \ } + #ifdef wxHAS_NATIVE_TAB_TRAVERSAL -// ---------------------------------------------------------------------------- -// wxControlContainer for native TAB navigation -// ---------------------------------------------------------------------------- - -// this must be a real class as we forward-declare it elsewhere -class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase -{ -protected: - // set the focus to the child which had it the last time - virtual bool SetFocusToChild(); -}; - #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) #define WX_DECLARE_CONTROL_CONTAINER WX_DECLARE_CONTROL_CONTAINER_BASE @@ -191,38 +336,6 @@ protected: #else // !wxHAS_NATIVE_TAB_TRAVERSAL -class WXDLLIMPEXP_FWD_CORE wxFocusEvent; -class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent; - -// ---------------------------------------------------------------------------- -// wxControlContainer for TAB navigation implemented in wx itself -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase -{ -public: - // default ctor, SetContainerWindow() must be called later - wxControlContainer(); - - // the methods to be called from the window event handlers - void HandleOnNavigationKey(wxNavigationKeyEvent& event); - void HandleOnFocus(wxFocusEvent& event); - void HandleOnWindowDestroy(wxWindowBase *child); - - // called from OnChildFocus() handler, i.e. when one of our (grand) - // children gets the focus - void SetLastFocus(wxWindow *win); - -protected: - - wxDECLARE_NO_COPY_CLASS(wxControlContainer); -}; - -// ---------------------------------------------------------------------------- -// macros which may be used by the classes wishing to implement TAB navigation -// among their children -// ---------------------------------------------------------------------------- - // declare the methods to be forwarded #define WX_DECLARE_CONTROL_CONTAINER() \ WX_DECLARE_CONTROL_CONTAINER_BASE(); \ @@ -274,7 +387,6 @@ public: \ #endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL -// this function is for wxWidgets internal use only -extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); +#endif // WXWIN_COMPATIBILITY_2_8 #endif // _WX_CONTAINR_H_ diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 540babf79f..be3ce240a8 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -163,7 +163,7 @@ public: void SetItalic( bool set ) { m_italic = set; } // accessors - bool HasColour() const { return m_colour.Ok(); } + bool HasColour() const { return m_colour.IsOk(); } const wxColour& GetColour() const { return m_colour; } bool HasFont() const { return m_bold || m_italic; } @@ -701,6 +701,12 @@ public: virtual void HitTest( const wxPoint & point, wxDataViewItem &item, wxDataViewColumn* &column ) const = 0; virtual wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn *column = NULL ) const = 0; + virtual bool SetRowHeight( int WXUNUSED(rowHeight) ) { return false; } + + virtual void StartEditor( const wxDataViewItem & WXUNUSED(item), + unsigned int WXUNUSED(column) ) + { } + #if wxUSE_DRAG_AND_DROP virtual bool EnableDragSource(const wxDataFormat& WXUNUSED(format)) { return false; } @@ -757,7 +763,8 @@ public: m_column(NULL), m_pos(-1,-1), m_cacheFrom(0), - m_cacheTo(0) + m_cacheTo(0), + m_editCancelled(false) #if wxUSE_DRAG_AND_DROP , m_dataObject(NULL), m_dataBuffer(NULL), @@ -774,7 +781,8 @@ public: m_column(event.m_column), m_pos(event.m_pos), m_cacheFrom(event.m_cacheFrom), - m_cacheTo(event.m_cacheTo) + m_cacheTo(event.m_cacheTo), + m_editCancelled(event.m_editCancelled) #if wxUSE_DRAG_AND_DROP , m_dataObject(event.m_dataObject), m_dataFormat(event.m_dataFormat), @@ -795,6 +803,10 @@ public: const wxVariant &GetValue() const { return m_value; } void SetValue( const wxVariant &value ) { m_value = value; } + // for wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE only + bool IsEditCancelled() const { return m_editCancelled; } + void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; } + // for wxEVT_DATAVIEW_COLUMN_HEADER_CLICKED only void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; } wxDataViewColumn *GetDataViewColumn() const { return m_column; } @@ -834,6 +846,7 @@ protected: wxPoint m_pos; int m_cacheFrom; int m_cacheTo; + bool m_editCancelled; #if wxUSE_DRAG_AND_DROP wxDataObject *m_dataObject; diff --git a/include/wx/dc.h b/include/wx/dc.h index 5734cde438..f6346888ac 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -512,6 +512,19 @@ public: // this needs to overidden if the axis is inverted virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); +#ifdef __WXMSW__ + // Native Windows functions using the underlying HDC don't honour GDI+ + // transformations which may be applied to it. Using this function we can + // transform the coordinates manually before passing them to such functions + // (as in e.g. wxRendererMSW code). It doesn't do anything if this is not a + // wxGCDC. + virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const + { + return r; + } +#endif // __WXMSW__ + + // --------------------------------------------------------- // the actual drawing API @@ -1344,13 +1357,13 @@ public: ~wxDCTextColourChanger() { - if ( m_colFgOld.Ok() ) + if ( m_colFgOld.IsOk() ) m_dc.SetTextForeground(m_colFgOld); } void Set(const wxColour& col) { - if ( !m_colFgOld.Ok() ) + if ( !m_colFgOld.IsOk() ) m_colFgOld = m_dc.GetTextForeground(); m_dc.SetTextForeground(col); } @@ -1378,7 +1391,7 @@ public: ~wxDCPenChanger() { - if ( m_penOld.Ok() ) + if ( m_penOld.IsOk() ) m_dc.SetPen(m_penOld); } @@ -1405,7 +1418,7 @@ public: ~wxDCBrushChanger() { - if ( m_brushOld.Ok() ) + if ( m_brushOld.IsOk() ) m_dc.SetBrush(m_brushOld); } @@ -1461,14 +1474,14 @@ public: void Set(const wxFont& font) { - if ( !m_fontOld.Ok() ) + if ( !m_fontOld.IsOk() ) m_fontOld = m_dc.GetFont(); m_dc.SetFont(font); } ~wxDCFontChanger() { - if ( m_fontOld.Ok() ) + if ( m_fontOld.IsOk() ) m_dc.SetFont(m_fontOld); } diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index df10beeb96..38ebbb61cc 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -28,11 +28,14 @@ public: wxGCDC( const wxMemoryDC& dc ); #if wxUSE_PRINTING_ARCHITECTURE wxGCDC( const wxPrinterDC& dc ); +#endif +#if defined(__WXMSW__) && wxUSE_ENH_METAFILE + wxGCDC( const wxEnhMetaFileDC& dc ); #endif wxGCDC(); virtual ~wxGCDC(); - wxGraphicsContext* GetGraphicsContext(); + wxGraphicsContext* GetGraphicsContext() const; void SetGraphicsContext( wxGraphicsContext* ctx ); #ifdef __WXMSW__ @@ -55,6 +58,9 @@ public: wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ); #if wxUSE_PRINTING_ARCHITECTURE wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ); +#endif +#if defined(__WXMSW__) && wxUSE_ENH_METAFILE + wxGCDCImpl( wxDC *owner, const wxEnhMetaFileDC& dc ); #endif wxGCDCImpl( wxDC *owner ); @@ -103,7 +109,7 @@ public: virtual void ComputeScaleAndOrigin(); - wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; } + wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; } virtual void SetGraphicsContext( wxGraphicsContext* ctx ); // the true implementations @@ -193,6 +199,10 @@ public: virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; +#ifdef __WXMSW__ + virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const; +#endif // __WXMSW__ + protected: // scaling variables bool m_logicalFunctionSupported; diff --git a/include/wx/defs.h b/include/wx/defs.h index f31d1e1bdd..3b66b2e0a4 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1162,7 +1162,13 @@ typedef wxUint32 wxDword; Define signed and unsigned integral types big enough to contain all of long, size_t and void *. */ -#if SIZEOF_SIZE_T >= SIZEOF_VOID_P +#if SIZEOF_LONG >= SIZEOF_VOID_P + /* + Normal case when long is the largest integral type. + */ + typedef long wxIntPtr; + typedef unsigned long wxUIntPtr; +#elif SIZEOF_SIZE_T >= SIZEOF_VOID_P /* Win64 case: size_t is the only integral type big enough for "void *". @@ -1172,12 +1178,6 @@ typedef wxUint32 wxDword; */ typedef wxW64 ssize_t wxIntPtr; typedef size_t wxUIntPtr; -#elif SIZEOF_LONG >= SIZEOF_VOID_P - /* - Normal case when long is the largest integral type. - */ - typedef long wxIntPtr; - typedef unsigned long wxUIntPtr; #else /* This should never happen for the current architectures but if you're diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index 325f467651..12e98fea54 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -22,14 +22,25 @@ #elif defined(__WINDOWS__) /* __declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well - as VC++ and gcc + as VC++. */ -# if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNUC__) || defined(__WATCOMC__) +# if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) # define WXEXPORT __declspec(dllexport) # define WXIMPORT __declspec(dllimport) -# else /* compiler doesn't support __declspec() */ -# define WXEXPORT -# define WXIMPORT + /* + While gcc also supports __declspec(dllexport), it creates unusably huge + DLL files since gcc 4.5 (while taking horribly long amounts of time), + see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601. Because of this + we rely on binutils auto export/import support which seems to work + quite well for 4.5+. + */ +# elif defined(__GNUC__) && !wxCHECK_GCC_VERSION(4, 5) + /* + __declspec could be used here too but let's use the native + __attribute__ instead for clarity. + */ +# define WXEXPORT __attribute__((dllexport)) +# define WXIMPORT __attribute__((dllimport)) # endif #elif defined(__WXPM__) # if defined (__WATCOMC__) diff --git a/include/wx/docview.h b/include/wx/docview.h index 90538ad638..502a714446 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -17,6 +17,7 @@ #if wxUSE_DOC_VIEW_ARCHITECTURE #include "wx/list.h" +#include "wx/dlist.h" #include "wx/string.h" #include "wx/frame.h" #include "wx/filehistory.h" @@ -172,6 +173,10 @@ public: // dialogs. Override if necessary. virtual wxWindow *GetDocumentWindow() const; + // Returns true if this document is a child document corresponding to a + // part of the parent document and not a disk file as usual. + bool IsChildDocument() const { return m_documentParent != NULL; } + protected: wxList m_documentViews; wxString m_documentFile; @@ -179,7 +184,12 @@ protected: wxString m_documentTypeName; wxDocTemplate* m_documentTemplate; bool m_documentModified; + + // if the document parent is non-NULL, it's a pseudo-document corresponding + // to a part of the parent document which can't be saved or loaded + // independently of its parent and is always closed when its parent is wxDocument* m_documentParent; + wxCommandProcessor* m_commandProcessor; bool m_savedYet; @@ -193,6 +203,10 @@ protected: wxString DoGetUserReadableName() const; private: + // list of all documents whose m_documentParent is this one + typedef wxDList DocsList; + DocsList m_childDocuments; + DECLARE_ABSTRACT_CLASS(wxDocument) wxDECLARE_NO_COPY_CLASS(wxDocument); }; @@ -386,6 +400,7 @@ public: void OnUpdateFileRevert(wxUpdateUIEvent& event); void OnUpdateFileNew(wxUpdateUIEvent& event); void OnUpdateFileSave(wxUpdateUIEvent& event); + void OnUpdateFileSaveAs(wxUpdateUIEvent& event); void OnUpdateUndo(wxUpdateUIEvent& event); void OnUpdateRedo(wxUpdateUIEvent& event); @@ -474,6 +489,13 @@ public: // Get the current document manager static wxDocManager* GetDocumentManager() { return sm_docManager; } +#if wxUSE_PRINTING_ARCHITECTURE + wxPageSetupDialogData& GetPageSetupDialogData() + { return m_pageSetupDialogData; } + const wxPageSetupDialogData& GetPageSetupDialogData() const + { return m_pageSetupDialogData; } +#endif // wxUSE_PRINTING_ARCHITECTURE + #if WXWIN_COMPATIBILITY_2_8 // deprecated, override GetDefaultName() instead wxDEPRECATED_BUT_USED_INTERNALLY( @@ -488,6 +510,11 @@ public: protected: + // Called when a file selected from the MRU list doesn't exist any more. + // The default behaviour is to remove the file from the MRU and notify the + // user about it but this method can be overridden to customize it. + virtual void OnMRUFileNotExist(unsigned n, const wxString& filename); + // Open the MRU file with the given index in our associated file history. void DoOpenMRUFile(unsigned n); #if wxUSE_PRINTING_ARCHITECTURE diff --git a/include/wx/event.h b/include/wx/event.h index 01b681c9a1..a94c5375df 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -615,8 +615,9 @@ extern WXDLLIMPEXP_BASE const wxEventType wxEVT_FIRST; extern WXDLLIMPEXP_BASE const wxEventType wxEVT_USER_FIRST; // Need events declared to do this +class WXDLLIMPEXP_FWD_BASE wxIdleEvent; +class WXDLLIMPEXP_FWD_BASE wxThreadEvent; class WXDLLIMPEXP_FWD_CORE wxCommandEvent; -class WXDLLIMPEXP_FWD_CORE wxThreadEvent; class WXDLLIMPEXP_FWD_CORE wxMouseEvent; class WXDLLIMPEXP_FWD_CORE wxFocusEvent; class WXDLLIMPEXP_FWD_CORE wxChildFocusEvent; @@ -649,7 +650,6 @@ class WXDLLIMPEXP_FWD_CORE wxPaletteChangedEvent; class WXDLLIMPEXP_FWD_CORE wxJoystickEvent; class WXDLLIMPEXP_FWD_CORE wxDropFilesEvent; class WXDLLIMPEXP_FWD_CORE wxInitDialogEvent; -class WXDLLIMPEXP_FWD_CORE wxIdleEvent; class WXDLLIMPEXP_FWD_CORE wxUpdateUIEvent; class WXDLLIMPEXP_FWD_CORE wxClipboardTextEvent; class WXDLLIMPEXP_FWD_CORE wxHelpEvent; @@ -678,7 +678,7 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_DROPDOWN, wxCo wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_CLOSEUP, wxCommandEvent); // Thread events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_THREAD, wxThreadEvent); +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_THREAD, wxThreadEvent); // Mouse event types wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DOWN, wxMouseEvent); @@ -1116,6 +1116,148 @@ private: wxDECLARE_NO_COPY_CLASS(wxEventProcessInHandlerOnly); }; + +class WXDLLIMPEXP_BASE wxEventBasicPayloadMixin +{ +public: + wxEventBasicPayloadMixin() + : m_commandInt(0), + m_extraLong(0) + { + } + + void SetString(const wxString& s) { m_cmdString = s; } + const wxString& GetString() const { return m_cmdString; } + + void SetInt(int i) { m_commandInt = i; } + int GetInt() const { return m_commandInt; } + + void SetExtraLong(long extraLong) { m_extraLong = extraLong; } + long GetExtraLong() const { return m_extraLong; } + +protected: + // Note: these variables have "cmd" or "command" in their name for backward compatibility: + // they used to be part of wxCommandEvent, not this mixin. + wxString m_cmdString; // String event argument + int m_commandInt; + long m_extraLong; // Additional information (e.g. select/deselect) + + wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin); +}; + +class WXDLLIMPEXP_BASE wxEventAnyPayloadMixin : public wxEventBasicPayloadMixin +{ +public: + wxEventAnyPayloadMixin() : wxEventBasicPayloadMixin() {} + +#if wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) + template + void SetPayload(const T& payload) + { + m_payload = payload; + } + + template + T GetPayload() const + { + return m_payload.As(); + } + +protected: + wxAny m_payload; +#endif // wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) + + wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin); +}; + + +// Idle event +/* + wxEVT_IDLE + */ + +// Whether to always send idle events to windows, or +// to only send update events to those with the +// wxWS_EX_PROCESS_IDLE style. + +enum wxIdleMode +{ + // Send idle events to all windows + wxIDLE_PROCESS_ALL, + + // Send idle events to windows that have + // the wxWS_EX_PROCESS_IDLE flag specified + wxIDLE_PROCESS_SPECIFIED +}; + +class WXDLLIMPEXP_BASE wxIdleEvent : public wxEvent +{ +public: + wxIdleEvent() + : wxEvent(0, wxEVT_IDLE), + m_requestMore(false) + { } + wxIdleEvent(const wxIdleEvent& event) + : wxEvent(event), + m_requestMore(event.m_requestMore) + { } + + void RequestMore(bool needMore = true) { m_requestMore = needMore; } + bool MoreRequested() const { return m_requestMore; } + + virtual wxEvent *Clone() const { return new wxIdleEvent(*this); } + + // Specify how wxWidgets will send idle events: to + // all windows, or only to those which specify that they + // will process the events. + static void SetMode(wxIdleMode mode) { sm_idleMode = mode; } + + // Returns the idle event mode + static wxIdleMode GetMode() { return sm_idleMode; } + +protected: + bool m_requestMore; + static wxIdleMode sm_idleMode; + +private: + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent) +}; + + +// Thread event + +class WXDLLIMPEXP_BASE wxThreadEvent : public wxEvent, + public wxEventAnyPayloadMixin +{ +public: + wxThreadEvent(wxEventType eventType = wxEVT_THREAD, int id = wxID_ANY) + : wxEvent(id, eventType) + { } + + wxThreadEvent(const wxThreadEvent& event) + : wxEvent(event), + wxEventAnyPayloadMixin(event) + { + // make sure our string member (which uses COW, aka refcounting) is not + // shared by other wxString instances: + SetString(GetString().c_str()); + } + + virtual wxEvent *Clone() const + { + return new wxThreadEvent(*this); + } + + // this is important to avoid that calling wxEventLoopBase::YieldFor thread events + // gets processed when this is unwanted: + virtual wxEventCategory GetEventCategory() const + { return wxEVT_CATEGORY_THREAD; } + +private: + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent) +}; + + #if wxUSE_GUI @@ -1138,16 +1280,15 @@ private: wxEVT_COMMAND_TOGGLEBUTTON_CLICKED */ -class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent +class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent, + public wxEventBasicPayloadMixin { public: wxCommandEvent(wxEventType commandType = wxEVT_NULL, int winid = 0); wxCommandEvent(const wxCommandEvent& event) : wxEvent(event), - m_cmdString(event.m_cmdString), - m_commandInt(event.m_commandInt), - m_extraLong(event.m_extraLong), + wxEventBasicPayloadMixin(event), m_clientData(event.m_clientData), m_clientObject(event.m_clientObject) { } @@ -1160,32 +1301,23 @@ public: void SetClientObject(wxClientData* clientObject) { m_clientObject = clientObject; } wxClientData *GetClientObject() const { return m_clientObject; } + // Note: this shadows wxEventBasicPayloadMixin::GetString(), because it does some + // GUI-specific hacks + wxString GetString() const; + // Get listbox selection if single-choice int GetSelection() const { return m_commandInt; } - // Set/Get listbox/choice selection string - void SetString(const wxString& s) { m_cmdString = s; } - wxString GetString() const; - // Get checkbox value bool IsChecked() const { return m_commandInt != 0; } // true if the listbox event was a selection. bool IsSelection() const { return (m_extraLong != 0); } - void SetExtraLong(long extraLong) { m_extraLong = extraLong; } - long GetExtraLong() const { return m_extraLong; } - - void SetInt(int i) { m_commandInt = i; } - int GetInt() const { return m_commandInt; } - virtual wxEvent *Clone() const { return new wxCommandEvent(*this); } virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } protected: - wxString m_cmdString; // String event argument - int m_commandInt; - long m_extraLong; // Additional information (e.g. select/deselect) void* m_clientData; // Arbitrary client data wxClientData* m_clientObject; // Arbitrary client object @@ -1225,60 +1357,6 @@ private: }; -// Thread event - -class WXDLLIMPEXP_CORE wxThreadEvent : public wxCommandEvent -{ -public: - wxThreadEvent(wxEventType eventType = wxEVT_COMMAND_THREAD, int id = wxID_ANY) - : wxCommandEvent(eventType, id) - { } - - wxThreadEvent(const wxThreadEvent& event) - : wxCommandEvent(event) - { - // make sure our string member (which uses COW, aka refcounting) is not - // shared by other wxString instances: - SetString(GetString().c_str()); - -#if wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) - m_payload = event.m_payload; -#endif - } - - virtual wxEvent *Clone() const - { - return new wxThreadEvent(*this); - } - - // this is important to avoid that calling wxEventLoopBase::YieldFor thread events - // gets processed when this is unwanted: - virtual wxEventCategory GetEventCategory() const - { return wxEVT_CATEGORY_THREAD; } - -#if wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) - template - void SetPayload(const T& payload) - { - m_payload = payload; - } - - template - T GetPayload() const - { - return m_payload.As(); - } - -protected: - wxAny m_payload; -#endif // wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent) -}; - - - // Scroll event class, derived form wxCommandEvent. wxScrollEvents are // sent by wxSlider and wxScrollBar. /* @@ -1424,8 +1502,8 @@ public: bool LeftDClick() const { return (m_eventType == wxEVT_LEFT_DCLICK); } bool MiddleDClick() const { return (m_eventType == wxEVT_MIDDLE_DCLICK); } bool RightDClick() const { return (m_eventType == wxEVT_RIGHT_DCLICK); } - bool Aux1DClick() const { return (m_eventType == wxEVT_AUX1_UP); } - bool Aux2DClick() const { return (m_eventType == wxEVT_AUX2_UP); } + bool Aux1DClick() const { return (m_eventType == wxEVT_AUX1_DCLICK); } + bool Aux2DClick() const { return (m_eventType == wxEVT_AUX2_DCLICK); } // True if a button is down and the mouse is moving bool Dragging() const @@ -1528,7 +1606,7 @@ public: void SetCursor(const wxCursor& cursor) { m_cursor = cursor; } const wxCursor& GetCursor() const { return m_cursor; } - bool HasCursor() const { return m_cursor.Ok(); } + bool HasCursor() const { return m_cursor.IsOk(); } virtual wxEvent *Clone() const { return new wxSetCursorEvent(*this); } @@ -2726,59 +2804,6 @@ private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent) }; -#endif // wxUSE_GUI - -// Idle event -/* - wxEVT_IDLE - */ - -// Whether to always send idle events to windows, or -// to only send update events to those with the -// wxWS_EX_PROCESS_IDLE style. - -enum wxIdleMode -{ - // Send idle events to all windows - wxIDLE_PROCESS_ALL, - - // Send idle events to windows that have - // the wxWS_EX_PROCESS_IDLE flag specified - wxIDLE_PROCESS_SPECIFIED -}; - -class WXDLLIMPEXP_BASE wxIdleEvent : public wxEvent -{ -public: - wxIdleEvent() - : wxEvent(0, wxEVT_IDLE), - m_requestMore(false) - { } - wxIdleEvent(const wxIdleEvent& event) - : wxEvent(event), - m_requestMore(event.m_requestMore) - { } - - void RequestMore(bool needMore = true) { m_requestMore = needMore; } - bool MoreRequested() const { return m_requestMore; } - - virtual wxEvent *Clone() const { return new wxIdleEvent(*this); } - - // Specify how wxWidgets will send idle events: to - // all windows, or only to those which specify that they - // will process the events. - static void SetMode(wxIdleMode mode) { sm_idleMode = mode; } - - // Returns the idle event mode - static wxIdleMode GetMode() { return sm_idleMode; } - -protected: - bool m_requestMore; - static wxIdleMode sm_idleMode; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent) -}; /* TODO wxEVT_MOUSE_CAPTURE_CHANGED, @@ -2790,6 +2815,7 @@ private: wxEVT_COMPARE_ITEM */ +#endif // wxUSE_GUI // ============================================================================ @@ -3422,11 +3448,14 @@ inline void wxQueueEvent(wxEvtHandler *dest, wxEvent *event) typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&); +typedef void (wxEvtHandler::*wxThreadEventFunction)(wxThreadEvent&); #define wxEventHandler(func) \ wxEVENT_HANDLER_CAST(wxEventFunction, func) #define wxIdleEventHandler(func) \ wxEVENT_HANDLER_CAST(wxIdleEventFunction, func) +#define wxThreadEventHandler(func) \ + wxEVENT_HANDLER_CAST(wxThreadEventFunction, func) #if wxUSE_GUI @@ -3455,7 +3484,6 @@ protected: }; typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&); -typedef void (wxEvtHandler::*wxThreadEventFunction)(wxThreadEvent&); typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&); typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&); typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&); @@ -3495,8 +3523,6 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent& #define wxCommandEventHandler(func) \ wxEVENT_HANDLER_CAST(wxCommandEventFunction, func) -#define wxThreadEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxThreadEventFunction, func) #define wxScrollEventHandler(func) \ wxEVENT_HANDLER_CAST(wxScrollEventFunction, func) #define wxScrollWinEventHandler(func) \ @@ -3980,7 +4006,9 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent& #define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_PASTE, winid, wxClipboardTextEventHandler(func)) // Thread events -#define EVT_THREAD(id, func) wx__DECLARE_EVT1(wxEVT_COMMAND_THREAD, id, wxThreadEventHandler(func)) +#define EVT_THREAD(id, func) wx__DECLARE_EVT1(wxEVT_THREAD, id, wxThreadEventHandler(func)) +// alias for backward compatibility with 2.9.0: +#define wxEVT_COMMAND_THREAD wxEVT_THREAD // ---------------------------------------------------------------------------- // Helper functions diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h index 6622936ff9..34e14fecd6 100644 --- a/include/wx/fswatcher.h +++ b/include/wx/fswatcher.h @@ -55,6 +55,16 @@ enum wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR }; +// Type of the path watched, used only internally for now. +enum wxFSWPathType +{ + wxFSWPath_None, // Invalid value for an initialized watch. + wxFSWPath_File, // Plain file. + wxFSWPath_Dir, // Watch a directory and the files in it. + wxFSWPath_Tree // Watch a directory and all its children recursively. +}; + + /** * Event containing information about file system change. */ @@ -179,19 +189,17 @@ typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction) // wxFileSystemWatcherBase: interface for wxFileSystemWatcher // ---------------------------------------------------------------------------- -/** - * Simple container to store information about one watched file - */ +// Simple container to store information about one watched path. class wxFSWatchInfo { public: wxFSWatchInfo() : - m_path(wxEmptyString), m_events(-1) + m_events(-1), m_type(wxFSWPath_None) { } - wxFSWatchInfo(const wxString& path, int events) : - m_path(path), m_events(events) + wxFSWatchInfo(const wxString& path, int events, wxFSWPathType type) : + m_path(path), m_events(events), m_type(type) { } @@ -205,9 +213,15 @@ public: return m_events; } + wxFSWPathType GetType() const + { + return m_type; + } + protected: wxString m_path; int m_events; + wxFSWPathType m_type; }; WX_DECLARE_STRING_HASH_MAP(wxFSWatchInfo, wxFSWatchInfoMap); @@ -304,6 +318,11 @@ protected: return path_copy.GetFullPath(); } + // Delegates the real work of adding the path to wxFSWatcherImpl::Add() and + // updates m_watches if the new path was successfully added. + bool DoAdd(const wxFileName& path, int events, wxFSWPathType type); + + wxFSWatchInfoMap m_watches; // path=>wxFSWatchInfo map wxFSWatcherImpl* m_service; // file system events service wxEvtHandler* m_owner; // handler for file system events diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h index b25c39db4e..4ee8cafcf8 100644 --- a/include/wx/generic/collpaneg.h +++ b/include/wx/generic/collpaneg.h @@ -25,7 +25,8 @@ class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle; // wxGenericCollapsiblePane // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : public wxCollapsiblePaneBase +class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : + public wxNavigationEnabled { public: wxGenericCollapsiblePane() { Init(); } @@ -103,7 +104,6 @@ private: void OnButton(wxCommandEvent &ev); void OnSize(wxSizeEvent &ev); - WX_DECLARE_CONTROL_CONTAINER(); DECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane) DECLARE_EVENT_TABLE() }; diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index d47b028b04..f56f2a5ffc 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -172,6 +172,8 @@ public: virtual wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn *column = NULL ) const; + virtual bool SetRowHeight( int rowHeight ); + virtual void Expand( const wxDataViewItem & item ); virtual void Collapse( const wxDataViewItem & item ); virtual bool IsExpanded( const wxDataViewItem & item ) const; @@ -185,7 +187,7 @@ public: virtual wxBorder GetDefaultBorder() const; - void StartEditor( const wxDataViewItem & item, unsigned int column ); + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); protected: virtual int GetSelections( wxArrayInt & sel ) const; diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index e02f4848e1..c65d2e2f50 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -432,9 +432,9 @@ public: void SetKind(wxAttrKind kind) { m_attrkind = kind; } // accessors - bool HasTextColour() const { return m_colText.Ok(); } - bool HasBackgroundColour() const { return m_colBack.Ok(); } - bool HasFont() const { return m_font.Ok(); } + bool HasTextColour() const { return m_colText.IsOk(); } + bool HasBackgroundColour() const { return m_colBack.IsOk(); } + bool HasFont() const { return m_font.IsOk(); } bool HasAlignment() const { return m_hAlign != wxALIGN_INVALID || m_vAlign != wxALIGN_INVALID; diff --git a/include/wx/generic/hyperlink.h b/include/wx/generic/hyperlink.h index 9146ba8ada..c148dba91b 100644 --- a/include/wx/generic/hyperlink.h +++ b/include/wx/generic/hyperlink.h @@ -75,6 +75,12 @@ protected: // Renders the hyperlink. void OnPaint(wxPaintEvent& event); + // Handle set/kill focus events (invalidate for painting focus rect) + void OnFocus(wxFocusEvent& event); + + // Fire a HyperlinkEvent on space + void OnChar(wxKeyEvent& event); + // Returns the wxRect of the label of this hyperlink. // This is different from the clientsize's rectangle when // clientsize != bestsize and this rectangle is influenced diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h index ebc8e2bcca..b1eb3a7adf 100644 --- a/include/wx/generic/private/grid.h +++ b/include/wx/generic/private/grid.h @@ -546,6 +546,11 @@ public: // implemented for the lines virtual int GetLineAt(const wxGrid *grid, int pos) const = 0; + // Return the display position of the line with the given index. + // + // NB: As GetLineAt(), currently this is always identity for rows. + virtual int GetLinePos(const wxGrid *grid, int line) const = 0; + // Return the index of the line just before the given one. virtual int GetLineBefore(const wxGrid* grid, int line) const = 0; @@ -613,7 +618,9 @@ public: virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const { grid->SetDefaultRowSize(size, resizeExisting); } - virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int line) const + virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int pos) const + { return pos; } // TODO: implement row reordering + virtual int GetLinePos(const wxGrid * WXUNUSED(grid), int line) const { return line; } // TODO: implement row reordering virtual int GetLineBefore(const wxGrid* WXUNUSED(grid), int line) const @@ -677,8 +684,10 @@ public: virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const { grid->SetDefaultColSize(size, resizeExisting); } - virtual int GetLineAt(const wxGrid *grid, int line) const - { return grid->GetColAt(line); } + virtual int GetLineAt(const wxGrid *grid, int pos) const + { return grid->GetColAt(pos); } + virtual int GetLinePos(const wxGrid *grid, int line) const + { return grid->GetColPos(line); } virtual int GetLineBefore(const wxGrid* grid, int line) const { return grid->GetColAt(wxMax(0, grid->GetColPos(line) - 1)); } @@ -691,7 +700,10 @@ public: // This class abstracts the difference between operations going forward // (down/right) and backward (up/left) and allows to use the same code for -// functions which differ only in the direction of grid traversal +// functions which differ only in the direction of grid traversal. +// +// Notice that all operations in this class work with display positions and not +// internal indices which can be different if the columns were reordered. // // Like wxGridOperations it's an ABC with two concrete subclasses below. Unlike // it, this is a normal object and not just a function dispatch table and has a @@ -720,6 +732,12 @@ public: // Find the line at the given distance, in pixels, away from this one // (this uses clipping, i.e. anything after the last line is counted as the // last one and anything before the first one as 0) + // + // TODO: Implementation of this method currently doesn't support column + // reordering as it mixes up indices and positions. But this doesn't + // really matter as it's only called for rows (Page Up/Down only work + // vertically) and row reordering is not currently supported. We'd + // need to fix it if this ever changes however. virtual int MoveByPixelDistance(int line, int distance) const = 0; // This class is never used polymorphically but give it a virtual dtor @@ -727,6 +745,28 @@ public: virtual ~wxGridDirectionOperations() { } protected: + // Get the position of the row or column from the given coordinates pair. + // + // This is just a shortcut to avoid repeating m_oper and m_grid multiple + // times in the derived classes code. + int GetLinePos(const wxGridCellCoords& coords) const + { + return m_oper.GetLinePos(m_grid, m_oper.Select(coords)); + } + + // Get the index of the row or column from the position. + int GetLineAt(int pos) const + { + return m_oper.GetLineAt(m_grid, pos); + } + + // Check if the given line is visible, i.e. has non 0 size. + bool IsLineVisible(int line) const + { + return m_oper.GetLineSize(m_grid, line) != 0; + } + + wxGrid * const m_grid; const wxGridOperations& m_oper; }; @@ -743,14 +783,38 @@ public: { wxASSERT_MSG( m_oper.Select(coords) >= 0, "invalid row/column" ); - return m_oper.Select(coords) == 0; + int pos = GetLinePos(coords); + while ( pos ) + { + // Check the previous line. + int line = GetLineAt(--pos); + if ( IsLineVisible(line) ) + { + // There is another visible line before this one, hence it's + // not at boundary. + return false; + } + } + + // We reached the boundary without finding any visible lines. + return true; } virtual void Advance(wxGridCellCoords& coords) const { - wxASSERT( !IsAtBoundary(coords) ); + int pos = GetLinePos(coords); + for ( ;; ) + { + // This is not supposed to happen if IsAtBoundary() returned false. + wxCHECK_RET( pos, "can't advance when already at boundary" ); - m_oper.Set(coords, m_oper.Select(coords) - 1); + int line = GetLineAt(--pos); + if ( IsLineVisible(line) ) + { + m_oper.Set(coords, line); + break; + } + } } virtual int MoveByPixelDistance(int line, int distance) const @@ -760,6 +824,8 @@ public: } }; +// Please refer to the comments above when reading this class code, it's +// absolutely symmetrical to wxGridBackwardOperations. class wxGridForwardOperations : public wxGridDirectionOperations { public: @@ -773,14 +839,32 @@ public: { wxASSERT_MSG( m_oper.Select(coords) < m_numLines, "invalid row/column" ); - return m_oper.Select(coords) == m_numLines - 1; + int pos = GetLinePos(coords); + while ( pos < m_numLines - 1 ) + { + int line = GetLineAt(++pos); + if ( IsLineVisible(line) ) + return false; + } + + return true; } virtual void Advance(wxGridCellCoords& coords) const { - wxASSERT( !IsAtBoundary(coords) ); + int pos = GetLinePos(coords); + for ( ;; ) + { + wxCHECK_RET( pos < m_numLines - 1, + "can't advance when already at boundary" ); - m_oper.Set(coords, m_oper.Select(coords) + 1); + int line = GetLineAt(++pos); + if ( IsLineVisible(line) ) + { + m_oper.Set(coords, line); + break; + } + } } virtual int MoveByPixelDistance(int line, int distance) const diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index 56eda17f9f..338dd70234 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -92,7 +92,7 @@ public: // forwarded events from children windows void OnSpinButton(wxSpinEvent& event); - void OnTextLostFocus(); + void OnTextLostFocus(wxFocusEvent& event); void OnTextChar(wxKeyEvent& event); // this window itself is used only as a container for its sub windows so it @@ -148,6 +148,8 @@ protected: private: // common part of all ctors void Init(); + + DECLARE_EVENT_TABLE() }; #else // !wxUSE_SPINBTN diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index cbb072eecc..fdaeb8023a 100644 --- a/include/wx/generic/splitter.h +++ b/include/wx/generic/splitter.h @@ -49,7 +49,7 @@ enum // to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be // standard). -class WXDLLIMPEXP_CORE wxSplitterWindow: public wxWindow +class WXDLLIMPEXP_CORE wxSplitterWindow: public wxNavigationEnabled { public: @@ -300,8 +300,6 @@ protected: bool m_checkRequestedSashPosition:1; private: - WX_DECLARE_CONTROL_CONTAINER(); - DECLARE_DYNAMIC_CLASS(wxSplitterWindow) DECLARE_EVENT_TABLE() wxDECLARE_NO_COPY_CLASS(wxSplitterWindow); diff --git a/include/wx/generic/statbmpg.h b/include/wx/generic/statbmpg.h index 4a2ece335c..6948c9d521 100644 --- a/include/wx/generic/statbmpg.h +++ b/include/wx/generic/statbmpg.h @@ -61,7 +61,7 @@ public: private: wxSize GetBitmapSize() { - return m_bitmap.Ok() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) + return m_bitmap.IsOk() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) : wxSize(16, 16); // this is completely arbitrary } diff --git a/include/wx/graphics.h b/include/wx/graphics.h index b79ba6144c..0d472b5bca 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -27,6 +27,20 @@ enum wxAntialiasMode wxANTIALIAS_DEFAULT, }; +enum wxInterpolationQuality +{ + // default interpolation + wxINTERPOLATION_DEFAULT, + // no interpolation + wxINTERPOLATION_NONE, + // fast interpolation, suited for interactivity + wxINTERPOLATION_FAST, + // better quality + wxINTERPOLATION_GOOD, + // best quality, not suited for interactivity + wxINTERPOLATION_BEST +}; + enum wxCompositionMode { // R = Result, S = Source, D = Destination, premultiplied with alpha @@ -35,6 +49,7 @@ enum wxCompositionMode // classic Porter-Duff compositions // http://keithp.com/~keithp/porterduff/p253-porter.pdf + wxCOMPOSITION_INVALID = -1, /* indicates invalid/unsupported mode */ wxCOMPOSITION_CLEAR, /* R = 0 */ wxCOMPOSITION_SOURCE, /* R = S */ wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */ @@ -50,7 +65,7 @@ enum wxCompositionMode wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */ // mathematical compositions - wxCOMPOSITION_ADD, /* R = S + D */ + wxCOMPOSITION_ADD /* R = S + D */ }; class WXDLLIMPEXP_FWD_CORE wxWindowDC; @@ -496,6 +511,12 @@ public: // sets the antialiasing mode, returns true if it supported virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0; + // returns the current interpolation quality + virtual wxInterpolationQuality GetInterpolationQuality() const { return m_interpolation; } + + // sets the interpolation quality, returns true if it supported + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0; + // returns the current compositing operator virtual wxCompositionMode GetCompositionMode() const { return m_composition; } @@ -660,6 +681,7 @@ protected: wxGraphicsFont m_font; wxAntialiasMode m_antialias; wxCompositionMode m_composition; + wxInterpolationQuality m_interpolation; bool m_enableOffset; protected: diff --git a/include/wx/gtk/anybutton.h b/include/wx/gtk/anybutton.h new file mode 100644 index 0000000000..a4c18b4056 --- /dev/null +++ b/include/wx/gtk/anybutton.h @@ -0,0 +1,81 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/gtk/anybutton.h +// Purpose: wxGTK wxAnyButton class declaration +// Author: Robert Roebling +// Created: 1998-05-20 (extracted from button.h) +// Id: $Id: anybutton.h 67066 2011-02-27 12:48:30Z VZ $ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GTK_ANYBUTTON_H_ +#define _WX_GTK_ANYBUTTON_H_ + +//----------------------------------------------------------------------------- +// wxAnyButton +//----------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase +{ +public: + wxAnyButton() + { + m_isCurrent = + m_isPressed = false; + } + + virtual bool Enable( bool enable = true ); + + // implementation + // -------------- + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + // called from GTK callbacks: they update the button state and call + // GTKUpdateBitmap() + void GTKMouseEnters(); + void GTKMouseLeaves(); + void GTKPressed(); + void GTKReleased(); + +protected: + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + + virtual wxBitmap DoGetBitmap(State which) const; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which); + virtual void DoSetBitmapPosition(wxDirection dir); + +private: + typedef wxAnyButtonBase base_type; + + // focus event handler: calls GTKUpdateBitmap() + void GTKOnFocus(wxFocusEvent& event); + + // update the bitmap to correspond to the current button state + void GTKUpdateBitmap(); + + // return the current button state from m_isXXX flags (which means that it + // might not correspond to the real current state as e.g. m_isCurrent will + // never be true if we don't have a valid current bitmap) + State GTKGetCurrentState() const; + + // show the given bitmap (must be valid) + void GTKDoShowBitmap(const wxBitmap& bitmap); + + + // the bitmaps for the different state of the buttons, all of them may be + // invalid and the button only shows a bitmap at all if State_Normal bitmap + // is valid + wxBitmap m_bitmaps[State_Max]; + + // true iff mouse is currently over the button + bool m_isCurrent; + + // true iff the button is in pressed state + bool m_isPressed; + + wxDECLARE_NO_COPY_CLASS(wxAnyButton); +}; + +#endif // _WX_GTK_ANYBUTTON_H_ diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index 8116c10f3b..2c0779aeff 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: - wxButton() { Init(); } + wxButton() {} wxButton(wxWindow *parent, wxWindowID id, const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, @@ -25,8 +25,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { - Init(); - Create(parent, id, label, pos, size, style, validator, name); } @@ -39,7 +37,6 @@ public: virtual wxWindow *SetDefault(); virtual void SetLabel( const wxString &label ); - virtual bool Enable( bool enable = true ); // implementation // -------------- @@ -61,12 +58,6 @@ protected: virtual wxSize DoGetBestSize() const; virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapPosition(wxDirection dir); - #if wxUSE_MARKUP virtual bool DoSetLabelMarkup(const wxString& markup); #endif // wxUSE_MARKUP @@ -74,42 +65,9 @@ protected: private: typedef wxButtonBase base_type; - // common part of all ctors - void Init() - { - m_isCurrent = - m_isPressed = false; - } - - // focus event handler: calls GTKUpdateBitmap() - void GTKOnFocus(wxFocusEvent& event); - - // update the bitmap to correspond to the current button state - void GTKUpdateBitmap(); - - // return the current button state from m_isXXX flags (which means that it - // might not correspond to the real current state as e.g. m_isCurrent will - // never be true if we don't have a valid current bitmap) - State GTKGetCurrentState() const; - - // show the given bitmap (must be valid) - void GTKDoShowBitmap(const wxBitmap& bitmap); - // Return the GtkLabel used by this button. GtkLabel *GTKGetLabel() const; - - // the bitmaps for the different state of the buttons, all of them may be - // invalid and the button only shows a bitmap at all if State_Normal bitmap - // is valid - wxBitmap m_bitmaps[State_Max]; - - // true iff mouse is currently over the button - bool m_isCurrent; - - // true iff the button is in pressed state - bool m_isPressed; - DECLARE_DYNAMIC_CLASS(wxButton) }; diff --git a/include/wx/gtk/calctrl.h b/include/wx/gtk/calctrl.h index e9afdfec17..fee84ec1a8 100644 --- a/include/wx/gtk/calctrl.h +++ b/include/wx/gtk/calctrl.h @@ -38,15 +38,31 @@ public: virtual bool SetDate(const wxDateTime& date); virtual wxDateTime GetDate() const; + virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, + const wxDateTime& upperdate = wxDefaultDateTime); + virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const; + virtual bool EnableMonthChange(bool enable = true); virtual void Mark(size_t day, bool mark); // implementation // -------------- - wxDateTime m_selectedDate; + + void GTKGenerateEvent(wxEventType type); private: + bool IsInValidRange(const wxDateTime& dt) const; + + // Range of the dates that can be selected by user, either or both may be + // invalid to indicate that no corresponding restriction is set. + wxDateTime m_validStart, + m_validEnd; + + // Last known selected date, may be different from the real selection in + // the control while a handler for day-selected is running. + wxDateTime m_selectedDate; + DECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl) wxDECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl); }; diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h index 03bcbdf1c3..55beb85d48 100644 --- a/include/wx/gtk/dataview.h +++ b/include/wx/gtk/dataview.h @@ -159,6 +159,10 @@ public: virtual wxRect GetItemRect( const wxDataViewItem &item, const wxDataViewColumn *column = NULL ) const; + virtual bool SetRowHeight( int rowHeight ); + + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); + virtual void Expand( const wxDataViewItem & item ); virtual void Collapse( const wxDataViewItem & item ); virtual bool IsExpanded( const wxDataViewItem & item ) const; @@ -180,6 +184,8 @@ public: virtual void OnInternalIdle(); + int GTKGetUniformRowHeight() const { return m_uniformRowHeight; } + protected: virtual void DoSetExpanderColumn(); virtual void DoSetIndent(); @@ -207,6 +213,11 @@ private: wxDataViewColumnList m_cols; wxDataViewItem m_ensureVisibleDefered; + // By default this is set to -1 and the height of the rows is determined by + // GetRect() methods of the renderers but this can be set to a positive + // value to force the height of all rows to the given value. + int m_uniformRowHeight; + virtual void AddChildGTK(wxWindowGTK* child); void GtkEnableSelectionEvents(); void GtkDisableSelectionEvents(); diff --git a/include/wx/gtk/dvrenderer.h b/include/wx/gtk/dvrenderer.h index 7f8d3d4782..c6ecb397e4 100644 --- a/include/wx/gtk/dvrenderer.h +++ b/include/wx/gtk/dvrenderer.h @@ -52,7 +52,7 @@ public: GtkCellRenderer* GetGtkHandle() { return m_renderer; } void GtkInitHandlers(); - void GtkUpdateAlignment(); + void GtkUpdateAlignment() { GtkApplyAlignment(m_renderer); } // should be overridden to return true if the renderer supports properties // corresponding to wxDataViewItemAttr field, see wxGtkTreeCellDataFunc() @@ -85,6 +85,9 @@ protected: const wxDataViewItem& item, unsigned col); + // Apply our effective alignment (i.e. m_alignment if specified or the + // associated column alignment by default) to the given renderer. + void GtkApplyAlignment(GtkCellRenderer *renderer); GtkCellRenderer *m_renderer; int m_alignment; diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h index 2e05380324..563d30944d 100644 --- a/include/wx/gtk/dvrenderers.h +++ b/include/wx/gtk/dvrenderers.h @@ -147,6 +147,10 @@ protected: bool Init(wxDataViewCellMode mode, int align); private: + // Called from GtkGetTextRenderer() to really create the renderer if + // necessary. + void GtkInitTextRenderer(); + wxDC *m_dc; GtkCellRendererText *m_text_renderer; @@ -185,9 +189,17 @@ public: virtual wxSize GetSize() const; private: + void GTKSetLabel(); + wxString m_label; int m_value; +#if !wxUSE_UNICODE + // Flag used to indicate that we need to set the label because we were + // unable to do it in the ctor (see comments there). + bool m_needsToSetLabel; +#endif // !wxUSE_UNICODE + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer) }; diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 506d1986c0..943dacce35 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -101,7 +101,6 @@ private: // common part of Append (if pos == -1) and Insert bool GtkAppend(wxMenuItem *item, int pos=-1); - GtkWidget *m_prevRadio; DECLARE_DYNAMIC_CLASS(wxMenu) }; diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index c1a8c66f6e..3ac71b7f5c 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -52,13 +52,13 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro); // helper: use the encoding of the given font if it's valid inline wxCharBuffer wxConvertToGTK(const wxString& s, const wxFont& font) { - return wxConvertToGTK(s, font.Ok() ? font.GetEncoding() + return wxConvertToGTK(s, font.IsOk() ? font.GetEncoding() : wxFONTENCODING_SYSTEM); } inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font) { - return wxConvertFromGTK(s, font.Ok() ? font.GetEncoding() + return wxConvertFromGTK(s, font.IsOk() ? font.GetEncoding() : wxFONTENCODING_SYSTEM); } diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h index 0886c2dcc4..052c88dc31 100644 --- a/include/wx/gtk/tglbtn.h +++ b/include/wx/gtk/tglbtn.h @@ -22,67 +22,6 @@ class WXDLLIMPEXP_FWD_CORE wxToggleButton; class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; -//----------------------------------------------------------------------------- -// wxBitmapToggleButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButtonBase -{ -public: - // construction/destruction - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // Get/set the value - void SetValue(bool state); - bool GetValue() const; - - // Set the label - virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); } - virtual void SetLabel(const wxBitmap& label); - bool Enable(bool enable = true); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - wxBitmap m_bitmap; - - void OnSetBitmap(); - -protected: - void GTKDisableEvents(); - void GTKEnableEvents(); - - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - -private: - typedef wxToggleButtonBase base_type; - - DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) -}; - //----------------------------------------------------------------------------- // wxToggleButton //----------------------------------------------------------------------------- @@ -119,7 +58,6 @@ public: // Set the label void SetLabel(const wxString& label); - bool Enable(bool enable = true); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -130,13 +68,61 @@ protected: virtual wxSize DoGetBestSize() const; virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + +#if wxUSE_MARKUP + virtual bool DoSetLabelMarkup(const wxString& markup); +#endif // wxUSE_MARKUP private: typedef wxToggleButtonBase base_type; + // Return the GtkLabel used by this toggle button. + GtkLabel *GTKGetLabel() const; + DECLARE_DYNAMIC_CLASS(wxToggleButton) }; +//----------------------------------------------------------------------------- +// wxBitmapToggleButton +//----------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton +{ +public: + // construction/destruction + wxBitmapToggleButton() {} + wxBitmapToggleButton(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr) + { + Create(parent, id, label, pos, size, style, validator, name); + } + + // Create the control + bool Create(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr); + + // deprecated synonym for SetBitmapLabel() + wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), + SetBitmapLabel(bitmap); ) + // prevent virtual function hiding + virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); } + +private: + typedef wxToggleButtonBase base_type; + + DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) +}; + #endif // _WX_GTK_TOGGLEBUTTON_H_ diff --git a/include/wx/listbase.h b/include/wx/listbase.h index df07401a0e..287ce790d6 100644 --- a/include/wx/listbase.h +++ b/include/wx/listbase.h @@ -23,7 +23,7 @@ // type of compare function for wxListCtrl sort operation typedef -int (wxCALLBACK *wxListCtrlCompare)(long item1, long item2, wxIntPtr sortData); +int (wxCALLBACK *wxListCtrlCompare)(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData); // ---------------------------------------------------------------------------- // wxListCtrl constants @@ -183,9 +183,9 @@ public: void SetFont(const wxFont& font) { m_font = font; } // accessors - bool HasTextColour() const { return m_colText.Ok(); } - bool HasBackgroundColour() const { return m_colBack.Ok(); } - bool HasFont() const { return m_font.Ok(); } + bool HasTextColour() const { return m_colText.IsOk(); } + bool HasBackgroundColour() const { return m_colBack.IsOk(); } + bool HasFont() const { return m_font.IsOk(); } const wxColour& GetTextColour() const { return m_colText; } const wxColour& GetBackgroundColour() const { return m_colBack; } diff --git a/include/wx/longlong.h b/include/wx/longlong.h index f248bb6d21..7c76d5f677 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -1113,6 +1113,33 @@ template<> class numeric_limits #endif // wxUSE_LONGLONG_NATIVE +// ---------------------------------------------------------------------------- +// Specialize wxArgNormalizer to allow using wxLongLong directly with wx pseudo +// vararg functions. +// ---------------------------------------------------------------------------- + +// Notice that this must be done here and not in wx/strvararg.h itself because +// we can't include wx/longlong.h from there as this header itself includes +// wx/string.h which includes wx/strvararg.h too, so to avoid the circular +// dependencies we can only do it here (or add another header just for this but +// it doesn't seem necessary). +#include "wx/strvararg.h" + +template<> +struct WXDLLIMPEXP_BASE wxArgNormalizer +{ + wxArgNormalizer(wxLongLong value, + const wxFormatString *fmt, unsigned index) + : m_value(value) + { + wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_LongLongInt ); + } + + wxLongLong_t get() const { return m_value.GetValue(); } + + wxLongLong m_value; +}; + #endif // wxUSE_LONGLONG #endif // _WX_LONGLONG_H diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index c5e3883fc7..4e1a836115 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -303,20 +303,18 @@ // usually more limited) implementations are used which allows to avoid the // dependency on the C++ run-time library. // -// Default is 1 if compiler supports it. Currently this means not one of the -// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it -// needs non-default options for such build to avoid getting "fatal error -// C1076: compiler limit : internal heap limit reached; use /Zm to specify a -// higher limit" in its own standard headers, so you need to ensure you do -// increase the heap size before enabling this option for this compiler. +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. // -// Recommended setting: 1 unless you use a system without good implementation -// of STL. -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the diff --git a/include/wx/msw/anybutton.h b/include/wx/msw/anybutton.h new file mode 100644 index 0000000000..6987649d16 --- /dev/null +++ b/include/wx/msw/anybutton.h @@ -0,0 +1,81 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/anybutton.h +// Purpose: wxAnyButton class +// Author: Julian Smart +// Created: 1997-02-01 (extracted from button.h) +// RCS-ID: $Id: anybutton.h 67065 2011-02-27 12:48:26Z VZ $ +// Copyright: (c) Julian Smart +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_ANYBUTTON_H_ +#define _WX_MSW_ANYBUTTON_H_ + +// ---------------------------------------------------------------------------- +// Common button functionality +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase +{ +public: + wxAnyButton() + { + m_imageData = NULL; +#if wxUSE_MARKUP + m_markupText = NULL; +#endif // wxUSE_MARKUP + } + + virtual ~wxAnyButton(); + + // overridden base class methods + virtual void SetLabel(const wxString& label); + virtual bool SetBackgroundColour(const wxColour &colour); + virtual bool SetForegroundColour(const wxColour &colour); + + // implementation from now on + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + + virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); + virtual State GetNormalState() const { return State_Normal; } + + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } + +protected: + // usually overridden base class virtuals + virtual wxSize DoGetBestSize() const; + + virtual wxBitmap DoGetBitmap(State which) const; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which); + virtual wxSize DoGetBitmapMargins() const; + virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); + virtual void DoSetBitmapPosition(wxDirection dir); + +#if wxUSE_MARKUP + virtual bool DoSetLabelMarkup(const wxString& markup); +#endif // wxUSE_MARKUP + + // Increases the passed in size to account for the button image. + // + // Should only be called if we do have a button, i.e. if m_imageData is + // non-NULL. + void AdjustForBitmapSize(wxSize& size) const; + + class wxButtonImageData *m_imageData; + +#if wxUSE_MARKUP + class wxMarkupText *m_markupText; +#endif // wxUSE_MARKUP + + // Switches button into owner-drawn mode: this is used if we need to draw + // something not supported by the native control, such as using non default + // colours or a bitmap on pre-XP systems. + void MakeOwnerDrawn(); + bool IsOwnerDrawn() const; + +private: + wxDECLARE_NO_COPY_CLASS(wxAnyButton); +}; + +#endif // _WX_MSW_ANYBUTTON_H_ diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index aff0c0fe14..2d67ad67ae 100644 --- a/include/wx/msw/bmpbuttn.h +++ b/include/wx/msw/bmpbuttn.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton() { Init(); } + wxBitmapButton() {} wxBitmapButton(wxWindow *parent, wxWindowID id, @@ -30,8 +30,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { - Init(); - Create(parent, id, bitmap, pos, size, style, validator, name); } @@ -45,25 +43,6 @@ public: const wxString& name = wxButtonNameStr); protected: - // common part of all ctors - void Init() - { - m_disabledSetByUser = - m_hoverSetByUser = false; - } - - // reimplement some base class virtuals - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - - // true if disabled bitmap was set by user, false if we created it - // ourselves from the normal one - bool m_disabledSetByUser; - - // true if hover bitmap was set by user, false if it was set from focused - // one - bool m_hoverSetByUser; - - DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton) }; diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index 89e9dbbe4f..ebf260e87f 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -9,8 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_BUTTON_H_ -#define _WX_BUTTON_H_ +#ifndef _WX_MSW_BUTTON_H_ +#define _WX_MSW_BUTTON_H_ // ---------------------------------------------------------------------------- // Pushbutton @@ -47,22 +47,13 @@ public: virtual wxWindow *SetDefault(); - // overridden base class methods - virtual void SetLabel(const wxString& label); - virtual bool SetBackgroundColour(const wxColour &colour); - virtual bool SetForegroundColour(const wxColour &colour); - // implementation from now on virtual void Command(wxCommandEvent& event); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); 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: // send a notification event, return true if processed bool SendClickEvent(); @@ -74,32 +65,8 @@ protected: // set or unset BS_DEFPUSHBUTTON style static void SetDefaultStyle(wxButton *btn, bool on); - // usually overridden base class virtuals - virtual wxSize DoGetBestSize() const; - virtual bool DoGetAuthNeeded() const; virtual void DoSetAuthNeeded(bool show); - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual wxSize DoGetBitmapMargins() const; - virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); - virtual void DoSetBitmapPosition(wxDirection dir); - -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - - // Increases the passed in size to account for the button image. - // - // Should only be called if we do have a button, i.e. if m_imageData is - // non-NULL. - void AdjustForBitmapSize(wxSize& size) const; - - class wxButtonImageData *m_imageData; - -#if wxUSE_MARKUP - class wxMarkupText *m_markupText; -#endif // wxUSE_MARKUP // true if the UAC symbol is shown bool m_authNeeded; @@ -107,19 +74,10 @@ protected: private: void Init() { - m_imageData = NULL; -#if wxUSE_MARKUP - m_markupText = NULL; -#endif // wxUSE_MARKUP m_authNeeded = false; } - // Switches button into owner-drawn mode: this is used if we need to draw - // something not supported by the native control, such as using non default - // colours or a bitmap on pre-XP systems. - void MakeOwnerDrawn(); - wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton); }; -#endif // _WX_BUTTON_H_ +#endif // _WX_MSW_BUTTON_H_ diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index e4cd9b3284..e134750ea6 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -89,6 +89,7 @@ public: // as above, but takes reference DC as first argument to take resolution, // size, font metrics etc. from + wxEXPLICIT wxEnhMetaFileDC(const wxDC& referenceDC, const wxString& filename = wxEmptyString, int width = 0, int height = 0, diff --git a/include/wx/msw/fswatcher.h b/include/wx/msw/fswatcher.h index 761e186b1e..005b35b25b 100644 --- a/include/wx/msw/fswatcher.h +++ b/include/wx/msw/fswatcher.h @@ -23,6 +23,12 @@ public: wxMSWFileSystemWatcher(const wxFileName& path, int events = wxFSW_EVENT_ALL); + // Override the base class function to provide a much more efficient + // implementation for it using the platform native support for watching the + // entire directory trees. + virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, + const wxString& filter = wxEmptyString); + protected: bool Init(); }; diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h index 86cb059e4c..13d062de38 100644 --- a/include/wx/msw/helpchm.h +++ b/include/wx/msw/helpchm.h @@ -82,7 +82,7 @@ protected: wxString m_helpFile; - DECLARE_CLASS(wxCHMHelpController) + DECLARE_DYNAMIC_CLASS(wxCHMHelpController) }; #endif // wxUSE_MS_HTML_HELP diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h index ee47885062..871ef5e324 100644 --- a/include/wx/msw/helpwin.h +++ b/include/wx/msw/helpwin.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase { - DECLARE_CLASS(wxWinHelpController) + DECLARE_DYNAMIC_CLASS(wxWinHelpController) public: wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {} diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index d80e85cca1..4c5e95f5ad 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -25,6 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxToolBar; #endif +class wxMenuRadioItemsData; // Not using a combined wxToolBar/wxMenuBar? then use // a commandbar in WinCE .NET to implement the @@ -63,13 +64,16 @@ public: // implementation only from now on // ------------------------------- - virtual void Attach(wxMenuBarBase *menubar); - bool MSWCommand(WXUINT param, WXWORD id); // get the native menu handle WXHMENU GetHMenu() const { return m_hMenu; } + // Return the start and end position of the radio group to which the item + // at the given position belongs. Returns false if there is no radio group + // containing this position. + bool MSWGetRadioGroupRange(int pos, int *start, int *end) const; + #if wxUSE_ACCEL // called by wxMenuBar to build its accel table from the accels of all menus bool HasAccels() const { return !m_accels.empty(); } @@ -122,15 +126,17 @@ private: // common part of Append/Insert (behaves as Append is pos == (size_t)-1) bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1); - // terminate the current radio group, if any - void EndRadioGroup(); + + // This variable contains the description of the radio item groups and + // allows to find whether an item at the given position is part of the + // group and also where its group starts and ends. + // + // It is initially NULL and only allocated if we have any radio items. + wxMenuRadioItemsData *m_radioData; // if true, insert a breal before appending the next item bool m_doBreak; - // the position of the first item in the current radio group or -1 - int m_startRadioGroup; - // the menu handle of this menu WXHMENU m_hMenu; diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h index 21be80c38f..1fe684971b 100644 --- a/include/wx/msw/menuitem.h +++ b/include/wx/msw/menuitem.h @@ -61,11 +61,6 @@ public: // Win32 API WXWPARAM GetMSWId() const; - // mark item as belonging to the given radio group - void SetAsRadioGroupStart(); - void SetRadioGroupStart(int start); - void SetRadioGroupEnd(int end); - #if WXWIN_COMPATIBILITY_2_8 // compatibility only, don't use in new code wxDEPRECATED( @@ -130,18 +125,6 @@ private: // common part of all ctors void Init(); - // the positions of the first and last items of the radio group this item - // belongs to or -1: start is the radio group start and is valid for all - // but first radio group items (m_isRadioGroupStart == false), end is valid - // only for the first one - union - { - int start; - int end; - } m_radioGroup; - - // does this item start a radio group? - bool m_isRadioGroupStart; #if wxUSE_OWNER_DRAWN // item bitmaps diff --git a/include/wx/msw/panel.h b/include/wx/msw/panel.h index 5073fe30ba..13a39dcf66 100644 --- a/include/wx/msw/panel.h +++ b/include/wx/msw/panel.h @@ -3,7 +3,7 @@ // Purpose: wxMSW-specific wxPanel class. // Author: Vadim Zeitlin // Created: 2011-03-18 -// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -34,6 +34,8 @@ public: Create(parent, winid, pos, size, style, name); } + virtual ~wxPanel(); + // This is overridden for MSW to return true for all panels that are child // of a window with themed background (such as wxNotebook) which should // show through the child panels. diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 309f4376de..e824c6e5fd 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -454,7 +454,7 @@ private: void DoInit(HGDIOBJ hgdiobj) { m_hgdiobj = ::SelectObject(m_hdc, hgdiobj); } public: - SelectInHDC() : m_hdc(NULL) { } + SelectInHDC() : m_hdc(NULL), m_hgdiobj(NULL) { } SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc) { DoInit(hgdiobj); } void Init(HDC hdc, HGDIOBJ hgdiobj) diff --git a/include/wx/msw/private/fswatcher.h b/include/wx/msw/private/fswatcher.h index 99d2a21b17..3392141efd 100644 --- a/include/wx/msw/private/fswatcher.h +++ b/include/wx/msw/private/fswatcher.h @@ -50,7 +50,7 @@ public: m_path); } } - delete m_overlapped; + free(m_overlapped); } bool IsOk() const @@ -104,7 +104,6 @@ private: wxDECLARE_NO_COPY_CLASS(wxFSWatchEntryMSW); }; - // ============================================================================ // wxFSWatcherImplMSW helper classes implementations // ============================================================================ @@ -156,6 +155,48 @@ public: return m_watches.insert(val).second; } + // Removes a watch we're currently using. Notice that this doesn't happen + // immediately, CompleteRemoval() must be called later when it's really + // safe to delete the watch, i.e. after completion of the IO operation + // using it. + bool ScheduleForRemoval(const wxSharedPtr& watch) + { + wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" ); + wxCHECK_MSG( watch->IsOk(), false, "Invalid watch" ); + + const wxString path = watch->GetPath(); + wxFSWatchEntries::iterator it = m_watches.find(path); + wxCHECK_MSG( it != m_watches.end(), false, + "Can't remove a watch we don't use" ); + + // We can't just delete the watch here as we can have pending events + // for it and if we destroyed it now, we could get a dangling (or, + // worse, reused to point to another object) pointer in ReadEvents() so + // just remember that this one should be removed when CompleteRemoval() + // is called later. + m_removedWatches.insert(wxFSWatchEntries::value_type(path, watch)); + m_watches.erase(it); + + return true; + } + + // Really remove the watch previously passed to ScheduleForRemoval(). + // + // It's ok to call this for a watch that hadn't been removed before, in + // this case we'll just return false and do nothing. + bool CompleteRemoval(wxFSWatchEntryMSW* watch) + { + wxFSWatchEntries::iterator it = m_removedWatches.find(watch->GetPath()); + if ( it == m_removedWatches.end() ) + return false; + + // Removing the object from the map will result in deleting the watch + // itself as it's not referenced from anywhere else now. + m_removedWatches.erase(it); + + return true; + } + // post completion packet bool PostEmptyStatus() { @@ -203,7 +244,13 @@ protected: } HANDLE m_iocp; + + // The hash containing all the wxFSWatchEntryMSW objects currently being + // watched keyed by their paths. wxFSWatchEntries m_watches; + + // Contains the watches which had been removed but are still pending. + wxFSWatchEntries m_removedWatches; }; diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index af86ead9ce..28ce71eaf7 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -303,20 +303,18 @@ // usually more limited) implementations are used which allows to avoid the // dependency on the C++ run-time library. // -// Default is 1 if compiler supports it. Currently this means not one of the -// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it -// needs non-default options for such build to avoid getting "fatal error -// C1076: compiler limit : internal heap limit reached; use /Zm to specify a -// higher limit" in its own standard headers, so you need to ensure you do -// increase the heap size before enabling this option for this compiler. +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. // -// Recommended setting: 1 unless you use a system without good implementation -// of STL. -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h index abd4ec4985..23de38a607 100644 --- a/include/wx/msw/slider.h +++ b/include/wx/msw/slider.h @@ -106,6 +106,10 @@ protected: wxRect GetBoundingBox() const; // Get the height and, if the pointers are non NULL, widths of both labels. + // + // Notice that the return value will be 0 if we don't have wxSL_LABELS + // style but we do fill widthMin and widthMax even if we don't have + // wxSL_MIN_MAX_LABELS style set so the caller should account for it. int GetLabelsSize(int *widthMin = NULL, int *widthMax = NULL) const; @@ -123,8 +127,6 @@ protected: int m_pageSize; int m_lineSize; int m_tickFreq; - int m_minLabelWidth; - int m_maxLabelWidth; // flag needed to detect whether we're getting THUMBRELEASE event because // of dragging the thumb or scrolling the mouse wheel diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h index 5a2984fb13..2050ced6db 100644 --- a/include/wx/msw/tglbtn.h +++ b/include/wx/msw/tglbtn.h @@ -15,71 +15,11 @@ #include "wx/bitmap.h" -//----------------------------------------------------------------------------- -// wxBitmapToggleButton -//----------------------------------------------------------------------------- - - -class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButtonBase -{ -public: - // construction/destruction - wxBitmapToggleButton() { Init(); } - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // Get/set the value - void SetValue(bool state); - bool GetValue() const; - - // Set the label - virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); } - virtual void SetLabel(const wxBitmap& label); - bool Enable(bool enable = true); - -protected: - void Init(); - - wxBitmap m_bitmap; - wxBitmap m_disabledBitmap; - bool m_capturing; - bool m_depressed,m_oldValue; - - void OnPaint(wxPaintEvent &event); - void OnMouse(wxMouseEvent &event); - void OnChar(wxKeyEvent &event); - void OnSize(wxSizeEvent &event); - - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) -}; - // Checkbox item (single checkbox) class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: - wxToggleButton() {} + wxToggleButton() { Init(); } wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label, @@ -104,23 +44,68 @@ public: virtual void SetValue(bool value); virtual bool GetValue() const ; - virtual void SetLabel(const wxString& label); - virtual bool MSWCommand(WXUINT param, WXWORD id); virtual void Command(wxCommandEvent& event); + virtual State GetNormalState() const; + // returns true if the platform should explicitly apply a theme border virtual bool CanApplyThemeBorder() const { return false; } protected: virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; + void Init(); + + // current state of the button (when owner-drawn) + bool m_state; + private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton) }; +//----------------------------------------------------------------------------- +// wxBitmapToggleButton +//----------------------------------------------------------------------------- + + +class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton +{ +public: + // construction/destruction + wxBitmapToggleButton() {} + wxBitmapToggleButton(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr) + { + Create(parent, id, label, pos, size, style, validator, name); + } + + // Create the control + bool Create(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr); + + // deprecated synonym for SetBitmapLabel() + wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), + SetBitmapLabel(bitmap); ) + // prevent virtual function hiding + virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); } + +private: + DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) +}; + #endif // _WX_TOGGLEBUTTON_H_ diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 1bc89e2d7a..ce854d68cd 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -303,20 +303,18 @@ // usually more limited) implementations are used which allows to avoid the // dependency on the C++ run-time library. // -// Default is 1 if compiler supports it. Currently this means not one of the -// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it -// needs non-default options for such build to avoid getting "fatal error -// C1076: compiler limit : internal heap limit reached; use /Zm to specify a -// higher limit" in its own standard headers, so you need to ensure you do -// increase the heap size before enabling this option for this compiler. +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. // -// Recommended setting: 1 unless you use a system without good implementation -// of STL. -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 5b41235d9f..95a9d72206 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -366,7 +366,21 @@ public: bool HandlePower(WXWPARAM wParam, WXLPARAM lParam, bool *vetoed); - // Window procedure + // The main body of common window proc for all wxWindow objects. It tries + // to handle the given message and returns true if it was handled (the + // appropriate return value is then put in result, which must be non-NULL) + // or false if it wasn't. + // + // This function should be overridden in any new code instead of + // MSWWindowProc() even if currently most of the code overrides + // MSWWindowProc() as it had been written before this function was added. + virtual bool MSWHandleMessage(WXLRESULT *result, + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam); + + // Common Window procedure for all wxWindow objects: forwards to + // MSWHandleMessage() and MSWDefWindowProc() if the message wasn't handled. virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); // Calls an appropriate default window procedure diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 711a8ba78a..267647d251 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -303,20 +303,18 @@ // usually more limited) implementations are used which allows to avoid the // dependency on the C++ run-time library. // -// Default is 1 if compiler supports it. Currently this means not one of the -// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it -// needs non-default options for such build to avoid getting "fatal error -// C1076: compiler limit : internal heap limit reached; use /Zm to specify a -// higher limit" in its own standard headers, so you need to ensure you do -// increase the heap size before enabling this option for this compiler. +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. // -// Recommended setting: 1 unless you use a system without good implementation -// of STL. -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the diff --git a/include/wx/osx/anybutton.h b/include/wx/osx/anybutton.h new file mode 100644 index 0000000000..6cc8447588 --- /dev/null +++ b/include/wx/osx/anybutton.h @@ -0,0 +1,59 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: anybutton.h +// Purpose: wxAnyButton class +// Author: Stefan Csomor +// Created: 1998-01-01 (extracted from button.h) +// RCS-ID: $Id: anybutton.h 67069 2011-02-27 12:48:46Z VZ $ +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_ANYBUTTON_H_ +#define _WX_OSX_ANYBUTTON_H_ + +// Any button +class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase +{ +public: + wxAnyButton() {} + + static wxSize GetDefaultSize(); + + virtual void SetLabel(const wxString& label); + +protected: + virtual wxSize DoGetBestSize() const ; + + void OnEnterWindow( wxMouseEvent& event); + void OnLeaveWindow( wxMouseEvent& event); + + virtual wxBitmap DoGetBitmap(State which) const; + virtual void DoSetBitmap(const wxBitmap& bitmap, State which); + virtual void DoSetBitmapPosition(wxDirection dir); + + virtual void DoSetBitmapMargins(int x, int y) + { + m_marginX = x; + m_marginY = y; + InvalidateBestSize(); + } + +#if wxUSE_MARKUP && wxOSX_USE_COCOA + virtual bool DoSetLabelMarkup(const wxString& markup); +#endif // wxUSE_MARKUP && wxOSX_USE_COCOA + + + // the margins around the bitmap + int m_marginX; + int m_marginY; + + // the bitmaps for the different state of the buttons, all of them may be + // invalid and the button only shows a bitmap at all if State_Normal bitmap + // is valid + wxBitmap m_bitmaps[State_Max]; + + wxDECLARE_NO_COPY_CLASS(wxAnyButton); + DECLARE_EVENT_TABLE() +}; + +#endif // _WX_OSX_ANYBUTTON_H_ diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h index 70b5054855..602644fe2c 100644 --- a/include/wx/osx/button.h +++ b/include/wx/osx/button.h @@ -41,8 +41,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - static wxSize GetDefaultSize(); - virtual void SetLabel(const wxString& label); virtual wxWindow *SetDefault(); virtual void Command(wxCommandEvent& event); @@ -52,38 +50,7 @@ public: virtual bool OSXHandleClicked( double timestampsec ); protected: - virtual wxSize DoGetBestSize() const ; - - void OnEnterWindow( wxMouseEvent& event); - void OnLeaveWindow( wxMouseEvent& event); - - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapPosition(wxDirection dir); - - virtual void DoSetBitmapMargins(int x, int y) - { - m_marginX = x; - m_marginY = y; - InvalidateBestSize(); - } - -#if wxUSE_MARKUP && wxOSX_USE_COCOA - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP && wxOSX_USE_COCOA - - - // the margins around the bitmap - int m_marginX; - int m_marginY; - - // the bitmaps for the different state of the buttons, all of them may be - // invalid and the button only shows a bitmap at all if State_Normal bitmap - // is valid - wxBitmap m_bitmaps[State_Max]; - DECLARE_DYNAMIC_CLASS(wxButton) - DECLARE_EVENT_TABLE() }; // OS X specific class, not part of public wx API diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h index 056a2a895c..b6d88a2661 100644 --- a/include/wx/osx/carbon/dataview.h +++ b/include/wx/osx/carbon/dataview.h @@ -427,6 +427,8 @@ public: virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height); virtual void OnSize (); + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); + // // other methods // diff --git a/include/wx/osx/carbon/evtloop.h b/include/wx/osx/carbon/evtloop.h index 9db46aa1da..8a80fef3fa 100644 --- a/include/wx/osx/carbon/evtloop.h +++ b/include/wx/osx/carbon/evtloop.h @@ -20,6 +20,8 @@ class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop public: wxGUIEventLoop(); + virtual void WakeUp(); + protected: virtual int DoDispatchTimeout(unsigned long timeout); diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h index 16546952fb..4701c91fac 100644 --- a/include/wx/osx/carbon/region.h +++ b/include/wx/osx/carbon/region.h @@ -23,6 +23,7 @@ public: wxRegion( WXHRGN hRegion ); wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxRegion(); +#if wxUSE_IMAGE wxRegion(const wxBitmap& bmp) { Union(bmp); @@ -32,6 +33,7 @@ public: { Union(bmp, transColour, tolerance); } +#endif virtual ~wxRegion(); diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h index 335bce5ad7..624c2cb3f7 100644 --- a/include/wx/osx/cocoa/dataview.h +++ b/include/wx/osx/cocoa/dataview.h @@ -496,6 +496,8 @@ public: wxDataViewColumn*& columnPtr) const; virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height); virtual void OnSize(); + + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); // drag & drop helper methods wxDataFormat GetDnDDataFormat(wxDataObjectComposite* dataObjects); diff --git a/include/wx/osx/cocoa/evtloop.h b/include/wx/osx/cocoa/evtloop.h index c8b5d9e666..a327ee45de 100644 --- a/include/wx/osx/cocoa/evtloop.h +++ b/include/wx/osx/cocoa/evtloop.h @@ -21,6 +21,8 @@ public: void EndModalSession(); + virtual void WakeUp(); + protected: virtual int DoDispatchTimeout(unsigned long timeout); @@ -31,7 +33,12 @@ protected: virtual CFRunLoopRef CFGetCurrentRunLoop() const; void* m_modalSession; + + wxWindow* m_modalWindow; + WXWindow m_dummyWindow; + + int m_modalNestedLevel; }; #endif // _WX_OSX_COCOA_EVTLOOP_H_ diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h index d8e5c186e4..8d875edd34 100644 --- a/include/wx/osx/combobox.h +++ b/include/wx/osx/combobox.h @@ -25,7 +25,13 @@ class wxComboBoxChoice; class wxComboWidgetImpl; // Combobox item -class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : +#if wxOSX_USE_CARBON + public wxNavigationEnabled, +#else + public wxControl, +#endif + public wxComboBoxBase { DECLARE_DYNAMIC_CLASS(wxComboBox) @@ -42,7 +48,7 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase virtual void DelegateTextChanged( const wxString& value ); virtual void DelegateChoice( const wxString& value ); - wxComboBox() { Init(); } + wxComboBox() { } wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -53,7 +59,6 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { - Init(); Create(parent, id, value, pos, size, n, choices, style, validator, name); } @@ -66,7 +71,6 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { - Init(); Create(parent, id, value, pos, size, choices, style, validator, name); } @@ -142,17 +146,12 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase #if wxOSX_USE_CARBON wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - - WX_DECLARE_CONTROL_CONTAINER(); #endif #if wxOSX_USE_COCOA wxComboWidgetImpl* GetComboPeer() const; #endif protected: - // common part of all ctors - void Init(); - // List functions virtual void DoDeleteOneItem(unsigned int n); virtual void DoClear(); @@ -187,10 +186,6 @@ protected: wxComboBoxChoice* m_choice; wxComboBoxDataArray m_datas; - -#if wxOSX_USE_CARBON - DECLARE_EVENT_TABLE() -#endif }; #endif // _WX_COMBOBOX_H_ diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 3d44ac1166..6b12608433 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -133,9 +133,9 @@ #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh" #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org" #define PACKAGE_NAME "wxWidgets" -#define PACKAGE_STRING "wxWidgets 2.9.2" +#define PACKAGE_STRING "wxWidgets 2.9.3" #define PACKAGE_TARNAME "wxwidgets" -#define PACKAGE_VERSION "2.9.2" +#define PACKAGE_VERSION "2.9.3" // for regex #define WX_NO_REGEX_ADVANCED 1 diff --git a/include/wx/osx/core/dataview.h b/include/wx/osx/core/dataview.h index 8a24aaefd3..1a554d704b 100644 --- a/include/wx/osx/core/dataview.h +++ b/include/wx/osx/core/dataview.h @@ -109,6 +109,7 @@ public: virtual void HitTest (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const = 0; // return the item and column pointer that contains with the passed point virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height) = 0; // sets the height of the row containg the passed item in the native control virtual void OnSize (void) = 0; // updates the layout of the native control after a size event + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ) = 0; // starts editing the passed in item and column }; #endif // _WX_DATAVIEWCTRL_CORE_H_ diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h index e2ca2a2405..e585fa01d3 100644 --- a/include/wx/osx/dataview.h +++ b/include/wx/osx/dataview.h @@ -201,6 +201,8 @@ public: // finishes editing of custom items; if no custom item is currently edited the method does nothing void FinishCustomItemEditing(); + + virtual void StartEditor( const wxDataViewItem & item, unsigned int column ); // returns the n-th pointer to a column; // this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h index 584527f622..882b9beaab 100644 --- a/include/wx/osx/dirdlg.h +++ b/include/wx/osx/dirdlg.h @@ -23,6 +23,10 @@ public: const wxSize& size = wxDefaultSize, const wxString& name = wxDirDialogNameStr); +#if wxOSX_USE_COCOA + ~wxDirDialog(); +#endif + virtual int ShowModal(); #if wxOSX_USE_COCOA @@ -33,6 +37,10 @@ public: protected: DECLARE_DYNAMIC_CLASS(wxDirDialog) + +#if wxOSX_USE_COCOA + WX_NSObject m_sheetDelegate; +#endif }; #endif diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h index 4e45db718c..00a5258fce 100644 --- a/include/wx/osx/evtloop.h +++ b/include/wx/osx/evtloop.h @@ -53,9 +53,14 @@ public: AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags); #endif // wxUSE_EVENTLOOP_SOURCE - void ObserverCallBack(CFRunLoopObserverRef observer, int activity); protected: + void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity); + void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity); + + static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info); + static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info); + // get the currently executing CFRunLoop virtual CFRunLoopRef CFGetCurrentRunLoop() const; @@ -74,8 +79,11 @@ protected: // cfrunloop CFRunLoopRef m_runLoop; - // runloop observer - CFRunLoopObserverRef m_runLoopObserver; + // common modes runloop observer + CFRunLoopObserverRef m_commonModeRunLoopObserver; + + // default mode runloop observer + CFRunLoopObserverRef m_defaultModeRunLoopObserver; private: // process all already pending events and dispatch a new one (blocking diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h index 170795379e..2d7e1648f4 100644 --- a/include/wx/osx/filedlg.h +++ b/include/wx/osx/filedlg.h @@ -41,6 +41,10 @@ public: const wxSize& sz = wxDefaultSize, const wxString& name = wxFileDialogNameStr); +#if wxOSX_USE_COCOA + ~wxFileDialog(); +#endif + virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; } virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; } @@ -81,6 +85,7 @@ protected: int m_firstFileTypeFilter; wxArrayString m_currentExtensions; WX_NSObject m_delegate; + WX_NSObject m_sheetDelegate; #endif }; diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h index 694d84dc84..cad3de35b7 100644 --- a/include/wx/osx/msgdlg.h +++ b/include/wx/osx/msgdlg.h @@ -22,6 +22,10 @@ public: long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition); +#if wxOSX_USE_COCOA + ~wxMessageDialog(); +#endif + virtual int ShowModal(); #if wxOSX_USE_COCOA @@ -42,6 +46,9 @@ protected: int m_buttonId[3]; int m_buttonCount; +#if wxOSX_USE_COCOA + WX_NSObject m_sheetDelegate; +#endif DECLARE_DYNAMIC_CLASS(wxMessageDialog) }; diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index 4967f7bf5b..57192429e2 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -304,20 +304,18 @@ // usually more limited) implementations are used which allows to avoid the // dependency on the C++ run-time library. // -// Default is 1 if compiler supports it. Currently this means not one of the -// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it -// needs non-default options for such build to avoid getting "fatal error -// C1076: compiler limit : internal heap limit reached; use /Zm to specify a -// higher limit" in its own standard headers, so you need to ensure you do -// increase the heap size before enabling this option for this compiler. +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. // -// Recommended setting: 1 unless you use a system without good implementation -// of STL. -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the diff --git a/include/wx/osx/spinctrl.h b/include/wx/osx/spinctrl.h index f95b0c10f2..f8a7ab2057 100644 --- a/include/wx/osx/spinctrl.h +++ b/include/wx/osx/spinctrl.h @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxSpinCtrlButton; // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl +class WXDLLIMPEXP_CORE wxSpinCtrl : public wxNavigationEnabled { public: wxSpinCtrl() { Init(); } @@ -93,8 +93,6 @@ public: // number is out of range bool GetTextValue(int *val) const; - WX_DECLARE_CONTROL_CONTAINER(); - protected: // override the base class virtuals involved into geometry calculations virtual wxSize DoGetBestSize() const; @@ -113,7 +111,6 @@ private: int m_oldValue; private: - DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxSpinCtrl) }; diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h index 1782efd829..b262d60a7e 100644 --- a/include/wx/osx/tglbtn.h +++ b/include/wx/osx/tglbtn.h @@ -13,53 +13,6 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase -{ -public: - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - virtual void SetValue(bool value); - virtual bool GetValue() const ; - - virtual bool OSXHandleClicked( double timestampsec ); - - virtual void Command(wxCommandEvent& event); - -private: - wxBitmap m_bitmap; - - int m_marginX, - m_marginY; - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton) -}; - - class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: @@ -94,11 +47,40 @@ public: protected: virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton) }; + +class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButton +{ +public: + wxBitmapToggleButton() {} + wxBitmapToggleButton(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr) + { + Create(parent, id, label, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxCheckBoxNameStr); + +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton) +}; + #endif // _WX_TOGGLEBUTTON_H_ diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 53b87abe95..96b03fa46d 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -303,20 +303,18 @@ // usually more limited) implementations are used which allows to avoid the // dependency on the C++ run-time library. // -// Default is 1 if compiler supports it. Currently this means not one of the -// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it -// needs non-default options for such build to avoid getting "fatal error -// C1076: compiler limit : internal heap limit reached; use /Zm to specify a -// higher limit" in its own standard headers, so you need to ensure you do -// increase the heap size before enabling this option for this compiler. +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. // -// Recommended setting: 1 unless you use a system without good implementation -// of STL. -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the diff --git a/include/wx/panel.h b/include/wx/panel.h index 74016c64f4..bb93a5771b 100644 --- a/include/wx/panel.h +++ b/include/wx/panel.h @@ -28,10 +28,10 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; // wxPanel contains other controls and implements TAB traversal between them // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPanelBase : public wxWindow +class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled { public: - wxPanelBase(); + wxPanelBase() { } // Derived classes should also provide this constructor: /* @@ -69,14 +69,10 @@ public: virtual void InitDialog(); - WX_DECLARE_CONTROL_CONTAINER(); - protected: virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) = 0; private: - wxDECLARE_EVENT_TABLE(); - wxDECLARE_NO_COPY_CLASS(wxPanelBase); }; diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h index 1982838cc2..56a30d0873 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -32,12 +32,12 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; #define wxPB_USE_TEXTCTRL 0x0002 -class WXDLLIMPEXP_CORE wxPickerBase : public wxControl +class WXDLLIMPEXP_CORE wxPickerBase : public wxNavigationEnabled { public: // ctor: text is the associated text control wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL) - { WX_INIT_CONTROL_CONTAINER(); } + { } virtual ~wxPickerBase() {} @@ -121,8 +121,6 @@ protected: void OnTextCtrlUpdate(wxCommandEvent &); void OnTextCtrlKillFocus(wxFocusEvent &); - void OnSize(wxSizeEvent &); - // returns the set of styles for the attached wxTextCtrl // from given wxPickerBase's styles virtual long GetTextCtrlStyle(long style) const @@ -178,10 +176,6 @@ protected: private: DECLARE_ABSTRACT_CLASS(wxPickerBase) - DECLARE_EVENT_TABLE() - - // This class must be something just like a panel... - WX_DECLARE_CONTROL_CONTAINER(); }; diff --git a/include/wx/platform.h b/include/wx/platform.h index 2d570db1a4..b81aa52a4e 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -182,6 +182,13 @@ #include "wx/setup_gccxml.h" #endif +/* + Convenience for any optional classes that use the wxAnyButton base class. + */ +#if wxUSE_TOGGLEBTN || wxUSE_BUTTON + #define wxHAS_ANY_BUTTON +#endif + /* Hardware platform detection. diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index c6bdc8c00f..ac78189a42 100644 --- a/include/wx/prntbase.h +++ b/include/wx/prntbase.h @@ -398,9 +398,26 @@ public: const wxString& name = wxFrameNameStr); virtual ~wxPreviewFrame(); + // Either Initialize() or InitializeWithModality() must be called before + // showing the preview frame, the former being just a particular case of + // the latter initializing the frame for being showing app-modally. + + // Notice that we must keep Initialize() with its existing signature to + // avoid breaking the old code that overrides it and we can't reuse the + // same name for the other functions to avoid virtual function hiding + // problem and the associated warnings given by some compilers (e.g. from + // g++ with -Woverloaded-virtual). + virtual void Initialize() + { + InitializeWithModality(wxPreviewFrame_AppModal); + } + + // Also note that this method is not virtual as it doesn't need to be + // overridden: it's never called by wxWidgets (of course, the same is true + // for Initialize() but, again, it must remain virtual for compatibility). + void InitializeWithModality(wxPreviewFrameModalityKind kind); + void OnCloseWindow(wxCloseEvent& event); - virtual void Initialize(wxPreviewFrameModalityKind kind - = wxPreviewFrame_AppModal); virtual void CreateCanvas(); virtual void CreateControlBar(); diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index 106e6ee0f1..cc5e30fe14 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -2387,6 +2387,11 @@ protected: void InitAfterAdded( wxPropertyGridPageState* pageState, wxPropertyGrid* propgrid ); + /** + Returns true if child property is selected. + */ + bool IsChildSelected( bool recursive = false ) const; + // Removes child property with given pointer. Does not delete it. void RemoveChild( wxPGProperty* p ); diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index a3ff7f5216..8d73233313 100644 --- a/include/wx/richtext/richtextbuffer.h +++ b/include/wx/richtext/richtextbuffer.h @@ -1993,11 +1993,21 @@ public: /** Hit-testing: returns a flag indicating hit test details, plus - information about position. contextObj is returned to specify what object + information about position. @a contextObj is returned to specify what object position is relevant to, since otherwise there's an ambiguity. - obj may not a child of contextObj, since we may be referring to the container itself + @ obj might not be a child of @a contextObj, since we may be referring to the container itself if we have no hit on a child - for example if we click outside an object. + + The function puts the position in @a textPosition if one is found. + @a pt is in logical units (a zero y position is at the beginning of the buffer). + + Pass wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS if you only want to consider objects + directly under the object you are calling HitTest on. Otherwise, it will recurse + and potentially find a nested object. + + @return One of the ::wxRichTextHitTestFlags values. */ + virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0); /** @@ -2855,7 +2865,32 @@ public: virtual bool PositionToXY(long pos, long* x, long* y) const; /** - Sets text attributes: character and/or paragraph styles. + Sets the attributes for the given range. Pass flags to determine how the + attributes are set. + + The end point of range is specified as the last character position of the span + of text. So, for example, to set the style for a character at position 5, + use the range (5,5). + This differs from the wxRichTextCtrl API, where you would specify (5,6). + + @a flags may contain a bit list of the following values: + - wxRICHTEXT_SETSTYLE_NONE: no style flag. + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this operation should be + undoable. + - wxRICHTEXT_SETSTYLE_OPTIMIZE: specifies that the style should not be applied + if the combined style at this point is already the style in question. + - wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY: specifies that the style should only be + applied to paragraphs, and not the content. + This allows content styling to be preserved independently from that + of e.g. a named paragraph style. + - wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY: specifies that the style should only be + applied to characters, and not the paragraph. + This allows content styling to be preserved independently from that + of e.g. a named paragraph style. + - wxRICHTEXT_SETSTYLE_RESET: resets (clears) the existing style before applying + the new style. + - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. + Only the style flags are used in this operation. */ virtual bool SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); @@ -2866,6 +2901,13 @@ public: /** Returns the combined text attributes for this position. + + This function gets the @e uncombined style - that is, the attributes associated + with the paragraph or character content, and not necessarily the combined + attributes you see on the screen. To get the combined attributes, use GetStyle(). + If you specify (any) paragraph attribute in @e style's flags, this function + will fetch the paragraph attributes. + Otherwise, it will return the character attributes. */ virtual bool GetStyle(long position, wxRichTextAttr& style); @@ -2881,8 +2923,27 @@ public: virtual bool DoGetStyle(long position, wxRichTextAttr& style, bool combineStyles = true); /** - Returns the combined style for a range - if any attribute is different within the range, - that attribute is not present within the flags. + This function gets a style representing the common, combined attributes in the + given range. + Attributes which have different values within the specified range will not be + included the style flags. + + The function is used to get the attributes to display in the formatting dialog: + the user can edit the attributes common to the selection, and optionally specify the + values of further attributes to be applied uniformly. + + To apply the edited attributes, you can use SetStyle() specifying + the wxRICHTEXT_SETSTYLE_OPTIMIZE flag, which will only apply attributes that + are different from the @e combined attributes within the range. + So, the user edits the effective, displayed attributes for the range, + but his choice won't be applied unnecessarily to content. As an example, + say the style for a paragraph specifies bold, but the paragraph text doesn't + specify a weight. + The combined style is bold, and this is what the user will see on-screen and + in the formatting dialog. The user now specifies red text, in addition to bold. + When applying with SetStyle(), the content font weight attributes won't be + changed to bold because this is already specified by the paragraph. + However the text colour attributes @e will be changed to show red. */ virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style); @@ -2892,42 +2953,80 @@ public: */ bool CollectStyle(wxRichTextAttr& currentStyle, const wxRichTextAttr& style, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr); + //@{ /** - Set the list style. + Sets the list attributes for the given range, passing flags to determine how + the attributes are set. + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see NumberList(), PromoteList(), ClearListStyle(). */ virtual bool SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); - - /** - Set the list style. - */ virtual bool SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + //@} /** - Clear the list for the given range. + Clears the list style from the given range, clearing list-related attributes + and applying any named paragraph style associated with each paragraph. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + + @see SetListStyle(), PromoteList(), NumberList() */ virtual bool ClearListStyle(const wxRichTextRange& range, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); + //@{ /** - Number/renumber any list elements in the given range. + Numbers the paragraphs in the given range. + + Pass flags to determine how the attributes are set. + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + @a def can be NULL to indicate that the existing list style should be used. + + @see SetListStyle(), PromoteList(), ClearListStyle() */ virtual bool NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); - - /** - Number/renumber any list elements in the given range. - @a defName can be empty to indicate that the existing list style should be used. - */ virtual bool NumberList(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + //@} + //@{ /** - Promotes the list items within the given range. @a promoteBy can be a positive or negative number, e.g. 1 or -1. + Promotes the list items within the given range. + A positive @a promoteBy produces a smaller indent, and a negative number + produces a larger indent. Pass flags to determine how the attributes are set. + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see SetListStyle(), SetListStyle(), ClearListStyle() */ virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); - - /** - Promotes the list items within the given range. @a promoteBy can be a positive or negative number, e.g. 1 or -1. - */ virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); + //@} /** Helper for NumberList and PromoteList, that does renumbering and promotion simultaneously @@ -2990,23 +3089,39 @@ public: virtual wxString GetText() const; /** - Sets the default style for new content. Setting it to a default attribute - makes new content take on the 'basic' style. + Sets the default style, affecting the style currently being applied + (for example, setting the default style to bold will cause subsequently + inserted text to be bold). + + This is not cumulative - setting the default style will replace the previous + default style. + + Setting it to a default attribute object makes new content take on the 'basic' style. */ virtual bool SetDefaultStyle(const wxRichTextAttr& style); /** - Returns the default style. + Returns the current default style, affecting the style currently being applied + (for example, setting the default style to bold will cause subsequently + inserted text to be bold). */ virtual const wxRichTextAttr& GetDefaultStyle() const { return m_defaultAttributes; } /** - Sets the basic (overall) style. + Sets the basic (overall) style. This is the style of the whole + buffer before further styles are applied, unlike the default style, which + only affects the style currently being applied (for example, setting the default + style to bold will cause subsequently inserted text to be bold). */ virtual void SetBasicStyle(const wxRichTextAttr& style) { m_attributes = style; } /** Returns the basic (overall) style. + + This is the style of the whole buffer before further styles are applied, + unlike the default style, which only affects the style currently being + applied (for example, setting the default style to bold will cause + subsequently inserted text to be bold). */ virtual const wxRichTextAttr& GetBasicStyle() const { return m_attributes; } @@ -3448,7 +3563,14 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextPlainText: public wxRichTextObject public: // Constructors + /** + Constructor. + */ wxRichTextPlainText(const wxString& text = wxEmptyString, wxRichTextObject* parent = NULL, wxRichTextAttr* style = NULL); + + /** + Copy constructor. + */ wxRichTextPlainText(const wxRichTextPlainText& obj): wxRichTextObject() { Copy(obj); } // Overridables @@ -3475,7 +3597,9 @@ public: virtual void Dump(wxTextOutputStream& stream); - /// Get the first position from pos that has a line break character. + /** + Get the first position from pos that has a line break character. + */ long GetFirstLineBreakPosition(long pos); /// Does this object take note of paragraph attributes? Text and image objects don't. @@ -3497,19 +3621,24 @@ public: // Accessors - /// Get the text + /** + Returns the text. + */ const wxString& GetText() const { return m_text; } - /// Set the text + /** + Sets the text. + */ void SetText(const wxString& text) { m_text = text; } // Operations - /// Copy + // Copies the text object, void Copy(const wxRichTextPlainText& obj); - /// Clone + // Clones the text object. virtual wxRichTextObject* Clone() const { return new wxRichTextPlainText(*this); } + private: bool DrawTabbedString(wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, wxString& str, wxCoord& x, wxCoord& y, bool selected); @@ -3531,75 +3660,148 @@ protected: class WXDLLIMPEXP_RICHTEXT wxRichTextImageBlock: public wxObject { public: + /** + Constructor. + */ wxRichTextImageBlock(); + + /** + Copy constructor. + */ wxRichTextImageBlock(const wxRichTextImageBlock& block); virtual ~wxRichTextImageBlock(); + /** + Initialises the block. + */ void Init(); + + /** + Clears the block. + */ + void Clear(); - // Load the original image into a memory block. - // If the image is not a JPEG, we must convert it into a JPEG - // to conserve space. - // If it's not a JPEG we can make use of 'image', already scaled, so we don't have to - // load the image a 2nd time. + /** + Load the original image into a memory block. + If the image is not a JPEG, we must convert it into a JPEG + to conserve space. + If it's not a JPEG we can make use of @a image, already scaled, so we don't have to + load the image a second time. + */ virtual bool MakeImageBlock(const wxString& filename, wxBitmapType imageType, wxImage& image, bool convertToJPEG = true); - // Make an image block from the wxImage in the given - // format. + /** + Make an image block from the wxImage in the given + format. + */ virtual bool MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality = 80); - // Uses a const wxImage for efficiency, but can't set quality (only relevant for JPEG) + /** + Uses a const wxImage for efficiency, but can't set quality (only relevant for JPEG) + */ virtual bool MakeImageBlockDefaultQuality(const wxImage& image, wxBitmapType imageType); - // Makes the image block + /** + Makes the image block. + */ virtual bool DoMakeImageBlock(const wxImage& image, wxBitmapType imageType); - // Write to a file + /** + Writes the block to a file. + */ bool Write(const wxString& filename); - // Write data in hex to a stream + /** + Writes the data in hex to a stream. + */ bool WriteHex(wxOutputStream& stream); - // Read data in hex from a stream + /** + Reads the data in hex from a stream. + */ bool ReadHex(wxInputStream& stream, int length, wxBitmapType imageType); - // Copy from 'block' + /** + Copy from @a block. + */ void Copy(const wxRichTextImageBlock& block); // Load a wxImage from the block + /** + */ bool Load(wxImage& image); -//// Operators +// Operators + + /** + Assignment operation. + */ void operator=(const wxRichTextImageBlock& block); -//// Accessors +// Accessors + /** + Returns the raw data. + */ unsigned char* GetData() const { return m_data; } + + /** + Returns the data size in bytes. + */ size_t GetDataSize() const { return m_dataSize; } + + /** + Returns the image type. + */ wxBitmapType GetImageType() const { return m_imageType; } + /** + */ void SetData(unsigned char* image) { m_data = image; } + + /** + Sets the data size. + */ void SetDataSize(size_t size) { m_dataSize = size; } + + /** + Sets the image type. + */ void SetImageType(wxBitmapType imageType) { m_imageType = imageType; } - bool Ok() const { return IsOk(); } + /** + Returns @true if the data is non-NULL. + */ bool IsOk() const { return GetData() != NULL; } + bool Ok() const { return IsOk(); } - // Gets the extension for the block's type + /** + Gets the extension for the block's type. + */ wxString GetExtension() const; /// Implementation - // Allocate and read from stream as a block of memory + /** + Allocates and reads from a stream as a block of memory. + */ static unsigned char* ReadBlock(wxInputStream& stream, size_t size); + + /** + Allocates and reads from a file as a block of memory. + */ static unsigned char* ReadBlock(const wxString& filename, size_t size); - // Write memory block to stream + /** + Writes a memory block to stream. + */ static bool WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size); - // Write memory block to file + /** + Writes a memory block to a file. + */ static bool WriteBlock(const wxString& filename, unsigned char* block, size_t size); protected: @@ -3627,9 +3829,24 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextImage: public wxRichTextObject public: // Constructors + /** + Default constructor. + */ wxRichTextImage(wxRichTextObject* parent = NULL): wxRichTextObject(parent) { } + + /** + Creates a wxRichTextImage from a wxImage. + */ wxRichTextImage(const wxImage& image, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL); + + /** + Creates a wxRichTextImage from an image block. + */ wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL); + + /** + Copy constructor. + */ wxRichTextImage(const wxRichTextImage& obj): wxRichTextObject(obj) { Copy(obj); } // Overridables @@ -3640,11 +3857,12 @@ public: virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const; - /// Get the 'natural' size for an object. For an image, it would be the - /// image size. + /** + Returns the 'natural' size for this object - the image size. + */ virtual wxTextAttrSize GetNaturalSize() const; - virtual bool IsEmpty() const { return false; /* !m_imageBlock.Ok(); */ } + virtual bool IsEmpty() const { return false; /* !m_imageBlock.IsOk(); */ } virtual bool CanEditProperties() const { return true; } @@ -3673,27 +3891,41 @@ public: // Accessors - /// Get the image cache (scaled bitmap) + /** + Returns the image cache (a scaled bitmap). + */ const wxBitmap& GetImageCache() const { return m_imageCache; } - /// Set the image cache + /** + Sets the image cache. + */ void SetImageCache(const wxBitmap& bitmap) { m_imageCache = bitmap; } - /// Reset the image cache + /** + Resets the image cache. + */ void ResetImageCache() { m_imageCache = wxNullBitmap; } - /// Get the image block containing the raw data + /** + Returns the image block containing the raw data. + */ wxRichTextImageBlock& GetImageBlock() { return m_imageBlock; } // Operations - /// Copy + /** + Copies the image object. + */ void Copy(const wxRichTextImage& obj); - /// Clone + /** + Clones the image object. + */ virtual wxRichTextObject* Clone() const { return new wxRichTextImage(*this); } - /// Create a cached image at the required size + /** + Creates a cached image at the required size. + */ virtual bool LoadImageCache(wxDC& dc, bool resetCache = false); protected: @@ -3721,330 +3953,620 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer: public wxRichTextParagraphLayoutBox public: // Constructors + /** + Default constructor. + */ wxRichTextBuffer() { Init(); } + + /** + Copy constructor. + */ wxRichTextBuffer(const wxRichTextBuffer& obj): wxRichTextParagraphLayoutBox() { Init(); Copy(obj); } + virtual ~wxRichTextBuffer() ; // Accessors - /// Gets the command processor + /** + Returns the command processor. + A text buffer always creates its own command processor when it is initialized. + */ wxCommandProcessor* GetCommandProcessor() const { return m_commandProcessor; } - /// Set style sheet, if any. + /** + Sets style sheet, if any. This will allow the application to use named character and paragraph + styles found in the style sheet. + + Neither the buffer nor the control owns the style sheet so must be deleted by the application. + */ void SetStyleSheet(wxRichTextStyleSheet* styleSheet) { m_styleSheet = styleSheet; } + + /** + Returns the style sheet. + */ virtual wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; } - /// Set style sheet and notify of the change + /** + Sets the style sheet and sends a notification of the change. + */ bool SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet); - /// Push style sheet to top of stack + /** + Pushes the style sheet to the top of the style sheet stack. + */ bool PushStyleSheet(wxRichTextStyleSheet* styleSheet); - /// Pop style sheet from top of stack + /** + Pops the style sheet from the top of the style sheet stack. + */ wxRichTextStyleSheet* PopStyleSheet(); - /// Set/get table storing fonts + /** + Returns the table storing fonts, for quick access and font reuse. + */ wxRichTextFontTable& GetFontTable() { return m_fontTable; } + + /** + Returns the table storing fonts, for quick access and font reuse. + */ const wxRichTextFontTable& GetFontTable() const { return m_fontTable; } + + /** + Sets table storing fonts, for quick access and font reuse. + */ void SetFontTable(const wxRichTextFontTable& table) { m_fontTable = table; } // Operations - /// Initialisation + /** + Initialisation. + */ void Init(); - /// Clears the buffer, adds an empty paragraph, and clears the command processor. + /** + Clears the buffer, adds an empty paragraph, and clears the command processor. + */ virtual void ResetAndClearCommands(); - /// Load a file + //@{ + /** + Loads content from a stream or file. + Not all handlers will implement file loading. + */ virtual bool LoadFile(const wxString& filename, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); - - /// Save a file - virtual bool SaveFile(const wxString& filename, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); - - /// Load from a stream virtual bool LoadFile(wxInputStream& stream, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); + //@} - /// Save to a stream + //@{ + /** + Saves content to a stream or file. + Not all handlers will implement file saving. + */ + virtual bool SaveFile(const wxString& filename, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); virtual bool SaveFile(wxOutputStream& stream, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); + //@} - /// Set the handler flags, controlling loading and saving + /** + Sets the handler flags, controlling loading and saving. + */ void SetHandlerFlags(int flags) { m_handlerFlags = flags; } - /// Get the handler flags, controlling loading and saving + /** + Gets the handler flags, controlling loading and saving. + */ int GetHandlerFlags() const { return m_handlerFlags; } - /// Convenience function to add a paragraph of text + /** + Convenience function to add a paragraph of text. + */ virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL) { Modify(); return wxRichTextParagraphLayoutBox::AddParagraph(text, paraStyle); } - /// Begin collapsing undo/redo commands. Note that this may not work properly - /// if combining commands that delete or insert content, changing ranges for - /// subsequent actions. + /** + Begin collapsing undo/redo commands. Note that this may not work properly + if combining commands that delete or insert content, changing ranges for + subsequent actions. + + @a cmdName should be the name of the combined command that will appear + next to Undo and Redo in the edit menu. + */ virtual bool BeginBatchUndo(const wxString& cmdName); - /// End collapsing undo/redo commands + /** + End collapsing undo/redo commands. + */ virtual bool EndBatchUndo(); - /// Collapsing commands? + /** + Returns @true if we are collapsing commands. + */ virtual bool BatchingUndo() const { return m_batchedCommandDepth > 0; } - /// Submit immediately, or delay according to whether collapsing is on + /** + Submit the action immediately, or delay according to whether collapsing is on. + */ virtual bool SubmitAction(wxRichTextAction* action); - /// Get collapsed command + /** + Returns the collapsed command. + */ virtual wxRichTextCommand* GetBatchedCommand() const { return m_batchedCommand; } - /// Begin suppressing undo/redo commands. The way undo is suppressed may be implemented - /// differently by each command. If not dealt with by a command implementation, then - /// it will be implemented automatically by not storing the command in the undo history - /// when the action is submitted to the command processor. + /** + Begin suppressing undo/redo commands. The way undo is suppressed may be implemented + differently by each command. If not dealt with by a command implementation, then + it will be implemented automatically by not storing the command in the undo history + when the action is submitted to the command processor. + */ virtual bool BeginSuppressUndo(); - /// End suppressing undo/redo commands. + /** + End suppressing undo/redo commands. + */ virtual bool EndSuppressUndo(); - /// Collapsing commands? + /** + Are we suppressing undo?? + */ virtual bool SuppressingUndo() const { return m_suppressUndo > 0; } - /// Copy the range to the clipboard + /** + Copy the range to the clipboard. + */ virtual bool CopyToClipboard(const wxRichTextRange& range); - /// Paste the clipboard content to the buffer + /** + Paste the clipboard content to the buffer. + */ virtual bool PasteFromClipboard(long position); - /// Can we paste from the clipboard? + /** + Returns @true if we can paste from the clipboard. + */ virtual bool CanPasteFromClipboard() const; - /// Begin using a style + /** + Begin using a style. + */ virtual bool BeginStyle(const wxRichTextAttr& style); - /// End the style + /** + End the style. + */ virtual bool EndStyle(); - /// End all styles + /** + End all styles. + */ virtual bool EndAllStyles(); - /// Clear the style stack + /** + Clears the style stack. + */ virtual void ClearStyleStack(); - /// Get the size of the style stack, for example to check correct nesting + /** + Returns the size of the style stack, for example to check correct nesting. + */ virtual size_t GetStyleStackSize() const { return m_attributeStack.GetCount(); } - /// Begin using bold + /** + Begins using bold. + */ bool BeginBold(); - /// End using bold + /** + Ends using bold. + */ bool EndBold() { return EndStyle(); } - /// Begin using italic + /** + Begins using italic. + */ bool BeginItalic(); - /// End using italic + /** + Ends using italic. + */ bool EndItalic() { return EndStyle(); } - /// Begin using underline + /** + Begins using underline. + */ bool BeginUnderline(); - /// End using underline + /** + Ends using underline. + */ bool EndUnderline() { return EndStyle(); } - /// Begin using point size + /** + Begins using point size. + */ bool BeginFontSize(int pointSize); - /// End using point size + /** + Ends using point size. + */ bool EndFontSize() { return EndStyle(); } - /// Begin using this font + /** + Begins using this font. + */ bool BeginFont(const wxFont& font); - /// End using a font + /** + Ends using a font. + */ bool EndFont() { return EndStyle(); } - /// Begin using this colour + /** + Begins using this colour. + */ bool BeginTextColour(const wxColour& colour); - /// End using a colour + /** + Ends using a colour. + */ bool EndTextColour() { return EndStyle(); } - /// Begin using alignment + /** + Begins using alignment. + */ bool BeginAlignment(wxTextAttrAlignment alignment); - /// End alignment + /** + Ends alignment. + */ bool EndAlignment() { return EndStyle(); } - /// Begin left indent + /** + Begins using @a leftIndent for the left indent, and optionally @a leftSubIndent for + the sub-indent. Both are expressed in tenths of a millimetre. + + The sub-indent is an offset from the left of the paragraph, and is used for all + but the first line in a paragraph. A positive value will cause the first line to appear + to the left of the subsequent lines, and a negative value will cause the first line to be + indented relative to the subsequent lines. + */ bool BeginLeftIndent(int leftIndent, int leftSubIndent = 0); - /// End left indent + /** + Ends left indent. + */ bool EndLeftIndent() { return EndStyle(); } - /// Begin right indent + /** + Begins a right indent, specified in tenths of a millimetre. + */ bool BeginRightIndent(int rightIndent); - /// End right indent + /** + Ends right indent. + */ bool EndRightIndent() { return EndStyle(); } - /// Begin paragraph spacing + /** + Begins paragraph spacing; pass the before-paragraph and after-paragraph spacing + in tenths of a millimetre. + */ bool BeginParagraphSpacing(int before, int after); - /// End paragraph spacing + /** + Ends paragraph spacing. + */ bool EndParagraphSpacing() { return EndStyle(); } - /// Begin line spacing + /** + Begins line spacing using the specified value. @e spacing is a multiple, where + 10 means single-spacing, 15 means 1.5 spacing, and 20 means double spacing. + + The ::wxTextAttrLineSpacing enumeration values are defined for convenience. + */ bool BeginLineSpacing(int lineSpacing); - /// End line spacing + /** + Ends line spacing. + */ bool EndLineSpacing() { return EndStyle(); } - /// Begin numbered bullet + /** + Begins numbered bullet. + + This call will be needed for each item in the list, and the + application should take care of incrementing the numbering. + + @a bulletNumber is a number, usually starting with 1. + @a leftIndent and @a leftSubIndent are values in tenths of a millimetre. + @a bulletStyle is a bitlist of the following values: + + wxRichTextBuffer uses indentation to render a bulleted item. + The left indent is the distance between the margin and the bullet. + The content of the paragraph, including the first line, starts + at leftMargin + leftSubIndent. + So the distance between the left edge of the bullet and the + left of the actual paragraph is leftSubIndent. + */ bool BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD); - /// End numbered bullet + /** + Ends numbered bullet. + */ bool EndNumberedBullet() { return EndStyle(); } - /// Begin symbol bullet + /** + Begins applying a symbol bullet, using a character from the current font. + + See BeginNumberedBullet() for an explanation of how indentation is used + to render the bulleted paragraph. + */ bool BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL); - /// End symbol bullet + /** + Ends symbol bullet. + */ bool EndSymbolBullet() { return EndStyle(); } - /// Begin standard bullet + /** + Begins applying a standard bullet, using one of the standard bullet names + (currently @c standard/circle or @c standard/square. + + See BeginNumberedBullet() for an explanation of how indentation is used to + render the bulleted paragraph. + */ bool BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_STANDARD); - /// End standard bullet + /** + Ends standard bullet. + */ bool EndStandardBullet() { return EndStyle(); } - /// Begin named character style + /** + Begins named character style. + */ bool BeginCharacterStyle(const wxString& characterStyle); - /// End named character style + /** + Ends named character style. + */ bool EndCharacterStyle() { return EndStyle(); } - /// Begin named paragraph style + /** + Begins named paragraph style. + */ bool BeginParagraphStyle(const wxString& paragraphStyle); - /// End named character style + /** + Ends named character style. + */ bool EndParagraphStyle() { return EndStyle(); } - /// Begin named list style + /** + Begins named list style. + + Optionally, you can also pass a level and a number. + */ bool BeginListStyle(const wxString& listStyle, int level = 1, int number = 1); - /// End named character style + /** + Ends named character style. + */ bool EndListStyle() { return EndStyle(); } - /// Begin URL + /** + Begins applying wxTEXT_ATTR_URL to the content. + + Pass a URL and optionally, a character style to apply, since it is common + to mark a URL with a familiar style such as blue text with underlining. + */ bool BeginURL(const wxString& url, const wxString& characterStyle = wxEmptyString); - /// End URL + /** + Ends URL. + */ bool EndURL() { return EndStyle(); } // Event handling - /// Add an event handler + /** + Adds an event handler. + + A buffer associated with a control has the control as the only event handler, + but the application is free to add more if further notification is required. + All handlers are notified of an event originating from the buffer, such as + the replacement of a style sheet during loading. + + The buffer never deletes any of the event handlers, unless RemoveEventHandler() + is called with @true as the second argument. + */ bool AddEventHandler(wxEvtHandler* handler); - /// Remove an event handler + /** + Removes an event handler from the buffer's list of handlers, deleting the + object if @a deleteHandler is @true. + */ bool RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler = false); - /// Clear event handlers + /** + Clear event handlers. + */ void ClearEventHandlers(); - /// Send event to event handlers. If sendToAll is true, will send to all event handlers, - /// otherwise will stop at the first successful one. + /** + Send event to event handlers. If sendToAll is true, will send to all event handlers, + otherwise will stop at the first successful one. + */ bool SendEvent(wxEvent& event, bool sendToAll = true); // Implementation virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0); - /// Copy + /** + Copies the buffer. + */ void Copy(const wxRichTextBuffer& obj); - /// Assignment + /** + Assignment operator. + */ void operator= (const wxRichTextBuffer& obj) { Copy(obj); } - /// Clone + /** + Clones the buffer. + */ virtual wxRichTextObject* Clone() const { return new wxRichTextBuffer(*this); } - /// Submit command to insert paragraphs + /** + Submits a command to insert paragraphs. + */ bool InsertParagraphsWithUndo(long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int flags = 0); - /// Submit command to insert the given text + /** + Submits a command to insert the given text. + */ bool InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags = 0); - /// Submit command to insert a newline + /** + Submits a command to insert a newline. + */ bool InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags = 0); - /// Submit command to insert the given image + /** + Submits a command to insert the given image. + */ bool InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags = 0, const wxRichTextAttr& textAttr = wxRichTextAttr()); - /// Submit command to insert an object + /** + Submits a command to insert an object. + */ wxRichTextObject* InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags); - /// Submit command to delete this range + /** + Submits a command to delete this range. + */ bool DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl); - /// Mark modified + /** + Mark modified. + */ void Modify(bool modify = true) { m_modified = modify; } + + /** + Returns @true if the buffer was modified. + */ bool IsModified() const { return m_modified; } - /// Dumps contents of buffer for debugging purposes + //@{ + /** + Dumps contents of buffer for debugging purposes. + */ virtual void Dump(); virtual void Dump(wxTextOutputStream& stream) { wxRichTextParagraphLayoutBox::Dump(stream); } + //@} - /// Returns the file handlers + /** + Returns the file handlers. + */ static wxList& GetHandlers() { return sm_handlers; } - /// Adds a handler to the end + /** + Adds a file handler to the end. + */ static void AddHandler(wxRichTextFileHandler *handler); - /// Inserts a handler at the front + /** + Inserts a file handler at the front. + */ static void InsertHandler(wxRichTextFileHandler *handler); - /// Removes a handler + /** + Removes a file handler. + */ static bool RemoveHandler(const wxString& name); - /// Finds a handler by name + /** + Finds a file handler by name. + */ static wxRichTextFileHandler *FindHandler(const wxString& name); - /// Finds a handler by extension and type + /** + Finds a file handler by extension and type. + */ static wxRichTextFileHandler *FindHandler(const wxString& extension, wxRichTextFileType imageType); - /// Finds a handler by filename or, if supplied, type + /** + Finds a handler by filename or, if supplied, type. + */ static wxRichTextFileHandler *FindHandlerFilenameOrType(const wxString& filename, wxRichTextFileType imageType); - /// Finds a handler by type + /** + Finds a handler by type. + */ static wxRichTextFileHandler *FindHandler(wxRichTextFileType imageType); - /// Gets a wildcard incorporating all visible handlers. If 'types' is present, - /// will be filled with the file type corresponding to each filter. This can be - /// used to determine the type to pass to LoadFile given a selected filter. + /** + Gets a wildcard incorporating all visible handlers. If @a types is present, + it will be filled with the file type corresponding to each filter. This can be + used to determine the type to pass to LoadFile given a selected filter. + */ static wxString GetExtWildcard(bool combine = false, bool save = false, wxArrayInt* types = NULL); - /// Clean up handlers + /** + Clean up file handlers. + */ static void CleanUpHandlers(); - /// Initialise the standard handlers + /** + Initialise the standard file handlers. + Currently, only the plain text loading/saving handler is initialised by default. + */ static void InitStandardHandlers(); - /// Get renderer + /** + Returns the renderer object. + */ static wxRichTextRenderer* GetRenderer() { return sm_renderer; } - /// Set renderer, deleting old one + /** + Sets @a renderer as the object to be used to render certain aspects of the + content, such as bullets. + + You can override default rendering by deriving a new class from + wxRichTextRenderer or wxRichTextStdRenderer, overriding one or more + virtual functions, and setting an instance of the class using this function. + */ static void SetRenderer(wxRichTextRenderer* renderer); - /// Minimum margin between bullet and paragraph in 10ths of a mm + /** + Returns the minimum margin between bullet and paragraph in 10ths of a mm. + */ static int GetBulletRightMargin() { return sm_bulletRightMargin; } + + /** + Sets the minimum margin between bullet and paragraph in 10ths of a mm. + */ static void SetBulletRightMargin(int margin) { sm_bulletRightMargin = margin; } - /// Factor to multiply by character height to get a reasonable bullet size + /** + Returns the factor to multiply by character height to get a reasonable bullet size. + */ static float GetBulletProportion() { return sm_bulletProportion; } + + /** + Sets the factor to multiply by character height to get a reasonable bullet size. + */ static void SetBulletProportion(float prop) { sm_bulletProportion = prop; } - /// Scale factor for calculating dimensions + /** + Returns the scale factor for calculating dimensions. + */ double GetScale() const { return m_scale; } + + /** + Sets the scale factor for calculating dimensions. + */ void SetScale(double scale) { m_scale = scale; } protected: @@ -4223,19 +4745,39 @@ public: // Accessors + /** + Returns the cells array. + */ const wxRichTextObjectPtrArrayArray& GetCells() const { return m_cells; } + + /** + Returns the cells array. + */ wxRichTextObjectPtrArrayArray& GetCells() { return m_cells; } + /** + Returns the row count. + */ int GetRowCount() const { return m_rowCount; } + + /** + Returns the column count. + */ int GetColumnCount() const { return m_colCount; } - /// Get the cell at the given row/column position + /** + Returns the cell at the given row/column position. + */ virtual wxRichTextCell* GetCell(int row, int col) const; - /// Get the cell at the given character position (in the range of the table). + /** + Returns the cell at the given character position (in the range of the table). + */ virtual wxRichTextCell* GetCell(long pos) const; - /// Get the row/column for a given character position + /** + Returns the row/column for a given character position. + */ virtual bool GetCellRowColumnPosition(long pos, int& row, int& col) const; // Operations @@ -4306,10 +4848,9 @@ protected: }; -/*! - * The command identifiers - * - */ +/** + The command identifiers for Do/Undo. +*/ enum wxRichTextCommandId { @@ -4337,20 +4878,52 @@ enum wxRichTextCommandId class WXDLLIMPEXP_RICHTEXT wxRichTextObjectAddress { public: - // Creates the address given container and object. + /** + Creates the address given a container and an object. + */ wxRichTextObjectAddress(wxRichTextParagraphLayoutBox* topLevelContainer, wxRichTextObject* obj) { Create(topLevelContainer, obj); } + /** + */ wxRichTextObjectAddress() { Init(); } + /** + */ wxRichTextObjectAddress(const wxRichTextObjectAddress& address) { Copy(address); } void Init() {} + + /** + Copies the address. + */ void Copy(const wxRichTextObjectAddress& address) { m_address = address.m_address; } + + /** + Assignment operator. + */ void operator=(const wxRichTextObjectAddress& address) { Copy(address); } + /** + Returns the object specified by the address, given a top level container. + */ wxRichTextObject* GetObject(wxRichTextParagraphLayoutBox* topLevelContainer) const; + + /** + Creates the address given a container and an object. + */ bool Create(wxRichTextParagraphLayoutBox* topLevelContainer, wxRichTextObject* obj); + /** + Returns the array of integers representing the object address. + */ wxArrayInt& GetAddress() { return m_address; } + + /** + Returns the array of integers representing the object address. + */ const wxArrayInt& GetAddress() const { return m_address; } + + /** + Sets the address from an array of integers. + */ void SetAddress(const wxArrayInt& address) { m_address = address; } protected: @@ -4375,21 +4948,42 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction; class WXDLLIMPEXP_RICHTEXT wxRichTextCommand: public wxCommand { public: - // Ctor for one action + /** + Constructor for one action. + */ wxRichTextCommand(const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer, wxRichTextParagraphLayoutBox* container, wxRichTextCtrl* ctrl, bool ignoreFirstTime = false); - // Ctor for multiple actions + /** + Constructor for multiple actions. + */ wxRichTextCommand(const wxString& name); virtual ~wxRichTextCommand(); + /** + Performs the command. + */ bool Do(); + + /** + Undoes the command. + */ bool Undo(); + /** + Adds an action to the action list. + */ void AddAction(wxRichTextAction* action); + + /** + Clears the action list. + */ void ClearActions(); + /** + Returns the action list. + */ wxList& GetActions() { return m_actions; } protected: @@ -4411,57 +5005,122 @@ protected: class WXDLLIMPEXP_RICHTEXT wxRichTextAction: public wxObject { public: - /// Constructor. 'buffer' is the top-level buffer, while 'container' is the object within - /// which the action is taking place. In the simplest case, they are the same. + /** + Constructor. @a buffer is the top-level buffer, while @a container is the object within + which the action is taking place. In the simplest case, they are the same. + */ wxRichTextAction(wxRichTextCommand* cmd, const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer, wxRichTextParagraphLayoutBox* container, wxRichTextCtrl* ctrl, bool ignoreFirstTime = false); virtual ~wxRichTextAction(); + /** + Performs the action. + */ bool Do(); + + /** + Undoes the action. + */ bool Undo(); - /// Update the control appearance + /** + Updates the control appearance, optimizing if possible given information from the call to Layout. + */ void UpdateAppearance(long caretPosition, bool sendUpdateEvent = false, wxArrayInt* optimizationLineCharPositions = NULL, wxArrayInt* optimizationLineYPositions = NULL, bool isDoCmd = true); - /// Replace the buffer paragraphs with the given fragment. + /** + Replaces the buffer paragraphs with the given fragment. + */ void ApplyParagraphs(const wxRichTextParagraphLayoutBox& fragment); - /// Get the fragments + /** + Returns the new fragments. + */ wxRichTextParagraphLayoutBox& GetNewParagraphs() { return m_newParagraphs; } + + /** + Returns the old fragments. + */ wxRichTextParagraphLayoutBox& GetOldParagraphs() { return m_oldParagraphs; } - /// Get the attributes + /** + Returns the attributes, for single-object commands. + */ wxRichTextAttr& GetAttributes() { return m_attributes; } - /// An object to replace the one at the position - /// defined by the container address and the action's range start position. + /** + Returns the object to replace the one at the position defined by the container address + and the action's range start position. + */ wxRichTextObject* GetObject() const { return m_object; } + + /** + Sets the object to replace the one at the position defined by the container address + and the action's range start position. + */ void SetObject(wxRichTextObject* obj) { m_object = obj; m_objectAddress.Create(m_buffer, m_object); } + + /** + Makes an address from the given object. + */ void MakeObject(wxRichTextObject* obj) { m_objectAddress.Create(m_buffer, obj); } - /// Calculate arrays for refresh optimization + /** + Calculate arrays for refresh optimization. + */ void CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions); - /// Set/get the position used for e.g. insertion + /** + Sets the position used for e.g. insertion. + */ void SetPosition(long pos) { m_position = pos; } + + /** + Returns the position used for e.g. insertion. + */ long GetPosition() const { return m_position; } - /// Set/get the range for e.g. deletion + /** + Sets the range for e.g. deletion. + */ void SetRange(const wxRichTextRange& range) { m_range = range; } + + /** + Returns the range for e.g. deletion. + */ const wxRichTextRange& GetRange() const { return m_range; } - /// The address (nested position) of the container within the buffer being manipulated + /** + Returns the address (nested position) of the container within the buffer being manipulated. + */ wxRichTextObjectAddress& GetContainerAddress() { return m_containerAddress; } + + /** + Returns the address (nested position) of the container within the buffer being manipulated. + */ const wxRichTextObjectAddress& GetContainerAddress() const { return m_containerAddress; } + + /** + Sets the address (nested position) of the container within the buffer being manipulated. + */ void SetContainerAddress(const wxRichTextObjectAddress& address) { m_containerAddress = address; } + + /** + Sets the address (nested position) of the container within the buffer being manipulated. + */ void SetContainerAddress(wxRichTextParagraphLayoutBox* container, wxRichTextObject* obj) { m_containerAddress.Create(container, obj); } - /// Returns the container that this action refers to, using the container address and top-level buffer. + /** + Returns the container that this action refers to, using the container address and top-level buffer. + */ wxRichTextParagraphLayoutBox* GetContainer() const; - /// Get name + + /** + Returns the action name. + */ const wxString& GetName() const { return m_name; } protected: @@ -4550,59 +5209,135 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextFileHandler: public wxObject { DECLARE_CLASS(wxRichTextFileHandler) public: + /** + Creates a file handler object. + */ wxRichTextFileHandler(const wxString& name = wxEmptyString, const wxString& ext = wxEmptyString, int type = 0) : m_name(name), m_extension(ext), m_type(type), m_flags(0), m_visible(true) { } #if wxUSE_STREAMS + /** + Loads the buffer from a stream. + Not all handlers will implement file loading. + */ bool LoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) { return DoLoadFile(buffer, stream); } + + /** + Saves the buffer to a stream. + Not all handlers will implement file saving. + */ bool SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) { return DoSaveFile(buffer, stream); } #endif #if wxUSE_FFILE && wxUSE_STREAMS + /** + Loads the buffer from a file. + */ virtual bool LoadFile(wxRichTextBuffer *buffer, const wxString& filename); + + /** + Saves the buffer to a file. + */ virtual bool SaveFile(wxRichTextBuffer *buffer, const wxString& filename); #endif // wxUSE_STREAMS && wxUSE_STREAMS - /// Can we handle this filename (if using files)? By default, checks the extension. + /** + Returns @true if we handle this filename (if using files). By default, checks the extension. + */ virtual bool CanHandle(const wxString& filename) const; - /// Can we save using this handler? + /** + Returns @true if we can save using this handler. + */ virtual bool CanSave() const { return false; } - /// Can we load using this handler? + /** + Returns @true if we can load using this handler. + */ virtual bool CanLoad() const { return false; } - /// Should this handler be visible to the user? + /** + Returns @true if this handler should be visible to the user. + */ virtual bool IsVisible() const { return m_visible; } + + /** + Sets whether the handler should be visible to the user (via the application's + load and save dialogs). + */ virtual void SetVisible(bool visible) { m_visible = visible; } - /// The name of the nandler + /** + Sets the name of the nandler. + */ void SetName(const wxString& name) { m_name = name; } + + /** + Returns the name of the nandler. + */ wxString GetName() const { return m_name; } - /// The default extension to recognise + /** + Sets the default extension to recognise. + */ void SetExtension(const wxString& ext) { m_extension = ext; } + + /** + Returns the default extension to recognise. + */ wxString GetExtension() const { return m_extension; } - /// The handler type + /** + Sets the handler type. + */ void SetType(int type) { m_type = type; } + + /** + Returns the handler type. + */ int GetType() const { return m_type; } - /// Flags controlling how loading and saving is done + /** + Sets flags that change the behaviour of loading or saving. + See the documentation for each handler class to see what flags are relevant + for each handler. + + You call this function directly if you are using a file handler explicitly + (without going through the text control or buffer LoadFile/SaveFile API). + Or, you can call the control or buffer's SetHandlerFlags function to set + the flags that will be used for subsequent load and save operations. + */ void SetFlags(int flags) { m_flags = flags; } + + /** + Returns flags controlling how loading and saving is done. + */ int GetFlags() const { return m_flags; } - /// Encoding to use when saving a file. If empty, a suitable encoding is chosen + /** + Sets the encoding to use when saving a file. If empty, a suitable encoding is chosen. + */ void SetEncoding(const wxString& encoding) { m_encoding = encoding; } + + /** + Returns the encoding to use when saving a file. If empty, a suitable encoding is chosen. + */ const wxString& GetEncoding() const { return m_encoding; } protected: #if wxUSE_STREAMS + /** + Override to load content from @a stream into @a buffer. + */ virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) = 0; + + /** + Override to save content to @a stream from @a buffer. + */ virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) = 0; #endif @@ -4635,10 +5370,10 @@ public: : wxRichTextFileHandler(name, ext, type) { } - /// Can we save using this handler? + // Can we save using this handler? virtual bool CanSave() const { return true; } - /// Can we load using this handler? + // Can we load using this handler? virtual bool CanLoad() const { return true; } protected: @@ -4666,16 +5401,22 @@ protected: class WXDLLIMPEXP_RICHTEXT wxRichTextBufferDataObject: public wxDataObjectSimple { public: - // ctor doesn't copy the pointer, so it shouldn't go away while this object - // is alive + /** + The constructor doesn't copy the pointer, so it shouldn't go away while this object + is alive. + */ wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer = NULL); virtual ~wxRichTextBufferDataObject(); - // after a call to this function, the buffer is owned by the caller and it - // is responsible for deleting it + /** + After a call to this function, the buffer is owned by the caller and it + is responsible for deleting it. + */ wxRichTextBuffer* GetRichTextBuffer(); - // Returns the id for the new data format + /** + Returns the id for the new data format. + */ static const wxChar* GetRichTextBufferFormatId() { return ms_richTextBufferFormatId; } // base class pure virtuals @@ -4713,19 +5454,30 @@ private: class WXDLLIMPEXP_RICHTEXT wxRichTextRenderer: public wxObject { public: + /** + Constructor. + */ wxRichTextRenderer() {} virtual ~wxRichTextRenderer() {} - /// Draw a standard bullet, as specified by the value of GetBulletName + /** + Draws a standard bullet, as specified by the value of GetBulletName. This function should be overridden. + */ virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) = 0; - /// Draw a bullet that can be described by text, such as numbered or symbol bullets + /** + Draws a bullet that can be described by text, such as numbered or symbol bullets. This function should be overridden. + */ virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text) = 0; - /// Draw a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName + /** + Draws a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName. This function should be overridden. + */ virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) = 0; - /// Enumerate the standard bullet names currently supported + /** + Enumerate the standard bullet names currently supported. This function should be overridden. + */ virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames) = 0; }; @@ -4743,18 +5495,21 @@ public: class WXDLLIMPEXP_RICHTEXT wxRichTextStdRenderer: public wxRichTextRenderer { public: + /** + Constructor. + */ wxRichTextStdRenderer() {} - /// Draw a standard bullet, as specified by the value of GetBulletName + // Draw a standard bullet, as specified by the value of GetBulletName virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect); - /// Draw a bullet that can be described by text, such as numbered or symbol bullets + // Draw a bullet that can be described by text, such as numbered or symbol bullets virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text); - /// Draw a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName + // Draw a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect); - /// Enumerate the standard bullet names currently supported + // Enumerate the standard bullet names currently supported virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames); }; diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index 35e84f2d8d..54e8a6c830 100644 --- a/include/wx/richtext/richtextctrl.h +++ b/include/wx/richtext/richtextctrl.h @@ -29,34 +29,38 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleDefinition; -/*! +/* * Styles and flags */ -/* Styles - */ +/** + Styles +*/ #define wxRE_READONLY 0x0010 #define wxRE_MULTILINE 0x0020 #define wxRE_CENTRE_CARET 0x8000 #define wxRE_CENTER_CARET wxRE_CENTRE_CARET -/* Flags - */ +/** + Flags +*/ #define wxRICHTEXT_SHIFT_DOWN 0x01 #define wxRICHTEXT_CTRL_DOWN 0x02 #define wxRICHTEXT_ALT_DOWN 0x04 -/* Extra flags - */ +/** + Extra flags +*/ // Don't draw guide lines around boxes and tables #define wxRICHTEXT_EX_NO_GUIDELINES 0x00000100 -/* Defaults - */ +/* + Defaults +*/ #define wxRICHTEXT_DEFAULT_OVERALL_SIZE wxSize(-1, -1) #define wxRICHTEXT_DEFAULT_IMAGE_SIZE wxSize(80, 80) @@ -79,866 +83,1875 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleDefinition; #define wxID_RICHTEXT_PROPERTIES2 (wxID_HIGHEST + 2) #define wxID_RICHTEXT_PROPERTIES3 (wxID_HIGHEST + 3) -/*! - * Forward declarations +/* + Normal selection occurs initially and as user drags within one container. + Common ancestor selection occurs when the user starts dragging across containers + that have a common ancestor, for example the cells in a table. */ -#if 0 -// Drawing styles/states -#define wxRICHTEXT_SELECTED 0x01 -#define wxRICHTEXT_TAGGED 0x02 -// The control is focussed -#define wxRICHTEXT_FOCUSSED 0x04 -// The item itself has the focus -#define wxRICHTEXT_IS_FOCUS 0x08 -#endif - -// Normal selection occurs initially and as user drags within one container. -// Common ancestor selection occurs when the user starts dragging across containers -// that have a common ancestor, for example the cells in a table. enum wxRichTextCtrlSelectionState { wxRichTextCtrlSelectionState_Normal, wxRichTextCtrlSelectionState_CommonAncestor }; -/*! - * wxRichTextContextMenuPropertiesInfo keeps track of objects that appear in the context menu, - * whose properties are available to be edited. +/** + @class wxRichTextContextMenuPropertiesInfo + + wxRichTextContextMenuPropertiesInfo keeps track of objects that appear in the context menu, + whose properties are available to be edited. */ class WXDLLIMPEXP_RICHTEXT wxRichTextContextMenuPropertiesInfo { public: + /** + Constructor. + */ wxRichTextContextMenuPropertiesInfo() { Init(); } // Operations - /// Initialisation + /** + Initialisation. + */ void Init() {} - /// Add an item + /** + Adds an item. + */ bool AddItem(const wxString& label, wxRichTextObject* obj); - /// Returns number of menu items were added. + /** + Returns the number of menu items that were added. + */ int AddMenuItems(wxMenu* menu, int startCmd = wxID_RICHTEXT_PROPERTIES1) const; - /// Add appropriate menu items for the current container and clicked on object - /// (and container's parent, if appropriate). + /** + Adds appropriate menu items for the current container and clicked on object + (and container's parent, if appropriate). + */ int AddItems(wxRichTextObject* container, wxRichTextObject* obj); - /// Clear the items + /** + Clears the items. + */ void Clear() { m_objects.Clear(); m_labels.Clear(); } // Accessors - /// Gets the nth label + + /** + Returns the nth label. + */ wxString GetLabel(int n) const { return m_labels[n]; } - /// Gets the nth object + /** + Returns the nth object. + */ wxRichTextObject* GetObject(int n) const { return m_objects[n]; } - /// Get objects + /** + Returns the array of objects. + */ wxRichTextObjectPtrArray& GetObjects() { return m_objects; } + + /** + Returns the array of objects. + */ const wxRichTextObjectPtrArray& GetObjects() const { return m_objects; } - /// Get labels + /** + Returns the array of labels. + */ wxArrayString& GetLabels() { return m_labels; } + + /** + Returns the array of labels. + */ const wxArrayString& GetLabels() const { return m_labels; } - /// Get number of items + /** + Returns the number of items. + */ int GetCount() const { return m_objects.GetCount(); } - //wxArrayInt m_ids; wxRichTextObjectPtrArray m_objects; wxArrayString m_labels; }; -/*! - * wxRichTextCtrl class declaration +/** + @class wxRichTextCtrl + + wxRichTextCtrl provides a generic, ground-up implementation of a text control + capable of showing multiple styles and images. + + wxRichTextCtrl sends notification events: see wxRichTextEvent. + + It also sends the standard wxTextCtrl events @c wxEVT_COMMAND_TEXT_ENTER and + @c wxEVT_COMMAND_TEXT_UPDATED, and wxTextUrlEvent when URL content is clicked. + + For more information, see the @ref overview_richtextctrl. + + @beginStyleTable + @style{wxRE_CENTRE_CARET} + The control will try to keep the caret line centred vertically while editing. + wxRE_CENTER_CARET is a synonym for this style. + @style{wxRE_MULTILINE} + The control will be multiline (mandatory). + @style{wxRE_READONLY} + The control will not be editable. + @endStyleTable + + @library{wxrichtext} + @category{richtext} + @appearance{richtextctrl.png} + */ class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxControl, public wxTextCtrlIface, public wxScrollHelper { - DECLARE_CLASS( wxRichTextCtrl ) + DECLARE_DYNAMIC_CLASS( wxRichTextCtrl ) DECLARE_EVENT_TABLE() public: // Constructors + /** + Default constructor. + */ wxRichTextCtrl( ); + + /** + Constructor, creating and showing a rich text control. + + @param parent + Parent window. Must not be @NULL. + @param id + Window identifier. The value @c wxID_ANY indicates a default value. + @param value + Default string. + @param pos + Window position. + @param size + Window size. + @param style + Window style. + @param validator + Window validator. + @param name + Window name. + + @see Create(), wxValidator + */ wxRichTextCtrl( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr); + /** + Destructor. + */ virtual ~wxRichTextCtrl( ); // Operations - /// Creation + /** + Creates the underlying window. + */ bool Create( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr ); - /// Member initialisation + /** + Initialises the members of the control. + */ void Init(); -///// wxTextCtrl compatibility - // Accessors + /** + Gets the text for the given range. + The end point of range is specified as the last character position of + the span of text, plus one. + */ virtual wxString GetRange(long from, long to) const; + /** + Returns the length of the specified line in characters. + */ virtual int GetLineLength(long lineNo) const ; + + /** + Returns the text for the given line. + */ virtual wxString GetLineText(long lineNo) const ; + + /** + Returns the number of lines in the buffer. + */ virtual int GetNumberOfLines() const ; + /** + Returns @true if the buffer has been modified. + */ virtual bool IsModified() const ; + + /** + Returns @true if the control is editable. + */ virtual bool IsEditable() const ; - // more readable flag testing methods + /** + Returns @true if the control is single-line. + Currently wxRichTextCtrl does not support single-line editing. + */ bool IsSingleLine() const { return !HasFlag(wxRE_MULTILINE); } + + /** + Returns @true if the control is multiline. + */ bool IsMultiLine() const { return !IsSingleLine(); } - // If the return values from and to are the same, there is no selection. + //@{ + /** + Returns the range of the current selection. + The end point of range is specified as the last character position of the span + of text, plus one. + If the return values @a from and @a to are the same, there is no selection. + */ virtual void GetSelection(long* from, long* to) const; - - virtual wxString GetStringSelection() const; - const wxRichTextSelection& GetSelection() const { return m_selection; } wxRichTextSelection& GetSelection() { return m_selection; } - void SetSelection(const wxRichTextSelection& sel) { m_selection = sel; } + //@} + /** + Returns the text within the current selection range, if any. + */ + virtual wxString GetStringSelection() const; - /// Get filename + /** + Gets the current filename associated with the control. + */ wxString GetFilename() const { return m_filename; } - /// Set filename + /** + Sets the current filename. + */ void SetFilename(const wxString& filename) { m_filename = filename; } - /// Set the threshold in character positions for doing layout optimization during sizing + /** + Sets the size of the buffer beyond which layout is delayed during resizing. + This optimizes sizing for large buffers. The default is 20000. + */ void SetDelayedLayoutThreshold(long threshold) { m_delayedLayoutThreshold = threshold; } - /// Get the threshold in character positions for doing layout optimization during sizing + /** + Gets the size of the buffer beyond which layout is delayed during resizing. + This optimizes sizing for large buffers. The default is 20000. + */ long GetDelayedLayoutThreshold() const { return m_delayedLayoutThreshold; } + /** + Gets the flag indicating that full layout is required. + */ bool GetFullLayoutRequired() const { return m_fullLayoutRequired; } + + /** + Sets the flag indicating that full layout is required. + */ void SetFullLayoutRequired(bool b) { m_fullLayoutRequired = b; } + /** + Returns the last time full layout was performed. + */ wxLongLong GetFullLayoutTime() const { return m_fullLayoutTime; } + + /** + Sets the last time full layout was performed. + */ void SetFullLayoutTime(wxLongLong t) { m_fullLayoutTime = t; } + /** + Returns the position that should be shown when full (delayed) layout is performed. + */ long GetFullLayoutSavedPosition() const { return m_fullLayoutSavedPosition; } + + /** + Sets the position that should be shown when full (delayed) layout is performed. + */ void SetFullLayoutSavedPosition(long p) { m_fullLayoutSavedPosition = p; } - // Force any pending layout due to large buffer + /** + Forces any pending layout due to delayed, partial layout when the control + was resized. + */ void ForceDelayedLayout(); - /// Set text cursor + /** + Sets the text (normal) cursor. + */ void SetTextCursor(const wxCursor& cursor ) { m_textCursor = cursor; } - /// Get text cursor + /** + Returns the text (normal) cursor. + */ wxCursor GetTextCursor() const { return m_textCursor; } - /// Set URL cursor + /** + Sets the cursor to be used over URLs. + */ void SetURLCursor(const wxCursor& cursor ) { m_urlCursor = cursor; } - /// Get URL cursor + /** + Returns the cursor to be used over URLs. + */ wxCursor GetURLCursor() const { return m_urlCursor; } - /// Are we showing the caret position at the start of a line - /// instead of at the end of the previous one? + /** + Returns @true if we are showing the caret position at the start of a line + instead of at the end of the previous one. + */ bool GetCaretAtLineStart() const { return m_caretAtLineStart; } + + /** + Sets a flag to remember that we are showing the caret position at the start of a line + instead of at the end of the previous one. + */ void SetCaretAtLineStart(bool atStart) { m_caretAtLineStart = atStart; } - /// Are we dragging a selection? + /** + Returns @true if we are dragging a selection. + */ bool GetDragging() const { return m_dragging; } + + /** + Sets a flag to remember if we are dragging a selection. + */ void SetDragging(bool dragging) { m_dragging = dragging; } - /// Get/set drag start position + /** + Returns the drag start position. + */ const wxPoint& GetDragStart() const { return m_dragStart; } + + /** + Sets the drag start position. + */ void SetDragStart(const wxPoint& pt) { m_dragStart = pt; } #if wxRICHTEXT_BUFFERED_PAINTING - /// Get the buffer bitmap + //@{ + /** + Returns the buffer bitmap if using buffered painting. + */ const wxBitmap& GetBufferBitmap() const { return m_bufferBitmap; } wxBitmap& GetBufferBitmap() { return m_bufferBitmap; } + //@} #endif - /// Get/set context menu + /** + Returns the current context menu. + */ wxMenu* GetContextMenu() const { return m_contextMenu; } + + /** + Sets the current context menu. + */ void SetContextMenu(wxMenu* menu); - /// Anchor so we know how to extend the selection - /// It's a caret position since it's between two characters. + /** + Returns an anchor so we know how to extend the selection. + It's a caret position since it's between two characters. + */ long GetSelectionAnchor() const { return m_selectionAnchor; } + + /** + Sets an anchor so we know how to extend the selection. + It's a caret position since it's between two characters. + */ void SetSelectionAnchor(long anchor) { m_selectionAnchor = anchor; } - /// Anchor object if selecting multiple containers. + /** + Returns the anchor object if selecting multiple containers. + */ wxRichTextObject* GetSelectionAnchorObject() const { return m_selectionAnchorObject; } + + /** + Sets the anchor object if selecting multiple containers. + */ void SetSelectionAnchorObject(wxRichTextObject* anchor) { m_selectionAnchorObject = anchor; } + //@{ + /** + Returns an object that stores information about context menu property item(s), + in order to communicate between the context menu event handler and the code + that responds to it. The wxRichTextContextMenuPropertiesInfo stores one + item for each object that could respond to a property-editing event. If + objects are nested, several might be editable. + */ wxRichTextContextMenuPropertiesInfo& GetContextMenuPropertiesInfo() { return m_contextMenuPropertiesInfo; } const wxRichTextContextMenuPropertiesInfo& GetContextMenuPropertiesInfo() const { return m_contextMenuPropertiesInfo; } + //@} - /// The wxRichTextObject object that currently has the editing focus + /** + Returns the wxRichTextObject object that currently has the editing focus. + If there are no composite objects, this will be the top-level buffer. + */ wxRichTextParagraphLayoutBox* GetFocusObject() const { return m_focusObject; } + + /** + Sets the wxRichTextObject object that currently has the editing focus. + */ bool SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setCaretPosition = true); // Operations + /** + Invalidates the whole buffer to trigger painting later. + */ void Invalidate() { GetBuffer().Invalidate(wxRICHTEXT_ALL); } - // editing + /** + Clears the buffer content, leaving a single empty paragraph. Cannot be undone. + */ virtual void Clear(); + + /** + Replaces the content in the specified range with the string specified by + @a value. + */ virtual void Replace(long from, long to, const wxString& value); + + /** + Removes the content in the specified range. + */ virtual void Remove(long from, long to); - // load/save the controls contents from/to the file +#ifdef DOXYGEN + /** + Loads content into the control's buffer using the given type. + + If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from + the filename extension. + + This function looks for a suitable wxRichTextFileHandler object. + */ + bool LoadFile(const wxString& file, + int type = wxRICHTEXT_TYPE_ANY); +#endif + + /** + Helper function for LoadFile(). Loads content into the control's buffer using the given type. + + If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from + the filename extension. + + This function looks for a suitable wxRichTextFileHandler object. + */ virtual bool DoLoadFile(const wxString& file, int fileType); + +#ifdef DOXYGEN + /** + Saves the buffer content using the given type. + + If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from + the filename extension. + + This function looks for a suitable wxRichTextFileHandler object. + */ + bool SaveFile(const wxString& file = wxEmptyString, + int type = wxRICHTEXT_TYPE_ANY); +#endif + + /** + Helper function for SaveFile(). Saves the buffer content using the given type. + + If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from + the filename extension. + + This function looks for a suitable wxRichTextFileHandler object. + */ virtual bool DoSaveFile(const wxString& file = wxEmptyString, int fileType = wxRICHTEXT_TYPE_ANY); - /// Set the handler flags, controlling loading and saving + /** + Sets flags that change the behaviour of loading or saving. + + See the documentation for each handler class to see what flags are + relevant for each handler. + */ void SetHandlerFlags(int flags) { GetBuffer().SetHandlerFlags(flags); } - /// Get the handler flags, controlling loading and saving + /** + Returns flags that change the behaviour of loading or saving. + See the documentation for each handler class to see what flags are + relevant for each handler. + */ int GetHandlerFlags() const { return GetBuffer().GetHandlerFlags(); } - // sets/clears the dirty flag + /** + Marks the buffer as modified. + */ virtual void MarkDirty(); + + /** + Sets the buffer's modified status to @false, and clears the buffer's command + history. + */ virtual void DiscardEdits(); - // set the max number of characters which may be entered in a single line - // text control + /** + Sets the maximum number of characters that may be entered in a single line + text control. For compatibility only; currently does nothing. + */ virtual void SetMaxLength(unsigned long WXUNUSED(len)) { } - // writing text inserts it at the current position, appending always - // inserts it at the end + /** + Writes text at the current position. + */ virtual void WriteText(const wxString& text); + + /** + Sets the insertion point to the end of the buffer and writes the text. + */ virtual void AppendText(const wxString& text); - // text control under some platforms supports the text styles: these - // methods allow to apply the given text style to the given selection or to - // set/get the style which will be used for all appended text + //@{ + /** + Gets the attributes at the given position. + This function gets the combined style - that is, the style you see on the + screen as a result of combining base style, paragraph style and character + style attributes. + + To get the character or paragraph style alone, use GetUncombinedStyle(). + + @beginWxPerlOnly + In wxPerl this method is implemented as GetStyle(@a position) + returning a 2-element list (ok, attr). + @endWxPerlOnly + */ + virtual bool GetStyle(long position, wxTextAttr& style); + virtual bool GetStyle(long position, wxRichTextAttr& style); + virtual bool GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container); + //@} + + //@{ + /** + Sets the attributes for the given range. + The end point of range is specified as the last character position of the span + of text, plus one. + + So, for example, to set the style for a character at position 5, use the range + (5,6). + */ virtual bool SetStyle(long start, long end, const wxTextAttr& style); virtual bool SetStyle(long start, long end, const wxRichTextAttr& style); virtual bool SetStyle(const wxRichTextRange& range, const wxTextAttr& style); virtual bool SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style); - virtual bool GetStyle(long position, wxTextAttr& style); - virtual bool GetStyle(long position, wxRichTextAttr& style); - virtual bool GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container); + //@} - // Set the style for a single object + /** + Sets the attributes for a single object + */ virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr); - // get the common set of styles for the range + //@{ + /** + Gets the attributes common to the specified range. + Attributes that differ in value within the range will not be included + in @a style flags. + + @beginWxPerlOnly + In wxPerl this method is implemented as GetStyleForRange(@a position) + returning a 2-element list (ok, attr). + @endWxPerlOnly + */ virtual bool GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style); virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style); virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container); - // extended style setting operation with flags including: - // wxRICHTEXT_SETSTYLE_WITH_UNDO, wxRICHTEXT_SETSTYLE_OPTIMIZE, wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY, wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY - // see richtextbuffer.h for more details. + //@} + + /** + Sets the attributes for the given range, passing flags to determine how the + attributes are set. + + The end point of range is specified as the last character position of the span + of text, plus one. So, for example, to set the style for a character at + position 5, use the range (5,6). + + @a flags may contain a bit list of the following values: + - wxRICHTEXT_SETSTYLE_NONE: no style flag. + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this operation should be + undoable. + - wxRICHTEXT_SETSTYLE_OPTIMIZE: specifies that the style should not be applied + if the combined style at this point is already the style in question. + - wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY: specifies that the style should only be + applied to paragraphs, and not the content. + This allows content styling to be preserved independently from that + of e.g. a named paragraph style. + - wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY: specifies that the style should only be + applied to characters, and not the paragraph. + This allows content styling to be preserved independently from that + of e.g. a named paragraph style. + - wxRICHTEXT_SETSTYLE_RESET: resets (clears) the existing style before applying + the new style. + - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags + are used in this operation. + */ virtual bool SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); - /// Get the content (uncombined) attributes for this position. + //@{ + /** + Gets the attributes at the given position. + This function gets the @e uncombined style - that is, the attributes associated + with the paragraph or character content, and not necessarily the combined + attributes you see on the screen. + To get the combined attributes, use GetStyle(). + + If you specify (any) paragraph attribute in @e style's flags, this function + will fetch the paragraph attributes. + Otherwise, it will return the character attributes. + + @beginWxPerlOnly + In wxPerl this method is implemented as GetUncombinedStyle(@a position) + returning a 2-element list (ok, attr). + @endWxPerlOnly + */ virtual bool GetUncombinedStyle(long position, wxRichTextAttr& style); virtual bool GetUncombinedStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container); + //@} + //@{ + /** + Sets the current default style, which can be used to change how subsequently + inserted text is displayed. + */ virtual bool SetDefaultStyle(const wxTextAttr& style); virtual bool SetDefaultStyle(const wxRichTextAttr& style); + //@} + /** + Returns the current default style, which can be used to change how subsequently + inserted text is displayed. + */ virtual const wxRichTextAttr& GetDefaultStyleEx() const; //virtual const wxTextAttr& GetDefaultStyle() const; - /// Set list style + //@{ + /** + Sets the list attributes for the given range, passing flags to determine how + the attributes are set. + + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see NumberList(), PromoteList(), ClearListStyle(). + */ virtual bool SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); virtual bool SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + //@} - /// Clear list for given range + /** + Clears the list style from the given range, clearing list-related attributes + and applying any named paragraph style associated with each paragraph. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + + @see SetListStyle(), PromoteList(), NumberList(). + */ virtual bool ClearListStyle(const wxRichTextRange& range, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); - /// Number/renumber any list elements in the given range - /// def/defName can be NULL/empty to indicate that the existing list style should be used. + //@{ + /** + Numbers the paragraphs in the given range. + Pass flags to determine how the attributes are set. + + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see SetListStyle(), PromoteList(), ClearListStyle(). + */ virtual bool NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); virtual bool NumberList(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + //@} - /// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1 - /// def/defName can be NULL/empty to indicate that the existing list style should be used. + //@{ + /** + Promotes or demotes the paragraphs in the given range. + A positive @a promoteBy produces a smaller indent, and a negative number + produces a larger indent. Pass flags to determine how the attributes are set. + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see SetListStyle(), @see SetListStyle(), ClearListStyle(). + */ virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); + //@} - /// Deletes the content in the given range + /** + Deletes the content within the given range. + */ virtual bool Delete(const wxRichTextRange& range); - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. + /** + Translates from column and line number to position. + */ virtual long XYToPosition(long x, long y) const; + + /** + Converts a text position to zero-based column and line numbers. + */ virtual bool PositionToXY(long pos, long *x, long *y) const; + /** + Scrolls the buffer so that the given position is in view. + */ virtual void ShowPosition(long pos); - // find the character at position given in pixels - // - // NB: pt is in device coords (not adjusted for the client area origin nor - // scrolling) + //@{ + /** + Finds the character at the given position in pixels. + @a pt is in device coords (not adjusted for the client area origin nor for + scrolling). + */ virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const; + //@} - // Clipboard operations +// Clipboard operations + + /** + Copies the selected content (if any) to the clipboard. + */ virtual void Copy(); + + /** + Copies the selected content (if any) to the clipboard and deletes the selection. + This is undoable. + */ virtual void Cut(); + + /** + Pastes content from the clipboard to the buffer. + */ virtual void Paste(); + + /** + Deletes the content in the selection, if any. This is undoable. + */ virtual void DeleteSelection(); + /** + Returns @true if selected content can be copied to the clipboard. + */ virtual bool CanCopy() const; + + /** + Returns @true if selected content can be copied to the clipboard and deleted. + */ virtual bool CanCut() const; + + /** + Returns @true if the clipboard content can be pasted to the buffer. + */ virtual bool CanPaste() const; + + /** + Returns @true if selected content can be deleted. + */ virtual bool CanDeleteSelection() const; - // Undo/redo + /** + Undoes the command at the top of the command history, if there is one. + */ virtual void Undo(); + + /** + Redoes the current command. + */ virtual void Redo(); + /** + Returns @true if there is a command in the command history that can be undone. + */ virtual bool CanUndo() const; + + /** + Returns @true if there is a command in the command history that can be redone. + */ virtual bool CanRedo() const; - // Insertion point + /** + Sets the insertion point and causes the current editing style to be taken from + the new position (unlike wxRichTextCtrl::SetCaretPosition). + */ virtual void SetInsertionPoint(long pos); + + /** + Sets the insertion point to the end of the text control. + */ virtual void SetInsertionPointEnd(); + + /** + Returns the current insertion point. + */ virtual long GetInsertionPoint() const; + + /** + Returns the last position in the buffer. + */ virtual wxTextPos GetLastPosition() const; + //@{ + /** + Sets the selection to the given range. + The end point of range is specified as the last character position of the span + of text, plus one. + + So, for example, to set the selection for a character at position 5, use the + range (5,6). + */ virtual void SetSelection(long from, long to); + void SetSelection(const wxRichTextSelection& sel) { m_selection = sel; } + //@} + + + /** + Selects all the text in the buffer. + */ virtual void SelectAll(); + + /** + Makes the control editable, or not. + */ virtual void SetEditable(bool editable); - /// Returns true if there was a selection and the object containing the selection - /// was the same as the current focus object. + /** + Returns @true if there is a selection and the object containing the selection + was the same as the current focus object. + */ virtual bool HasSelection() const; - /// Returns true if there was a selection, whether or not the current focus object - /// is the same as the selection's container object. + /** + Returns @true if there was a selection, whether or not the current focus object + is the same as the selection's container object. + */ virtual bool HasUnfocusedSelection() const; -///// Functionality specific to wxRichTextCtrl - - /// Write an image at the current insertion point. Supply optional type to use - /// for internal and file storage of the raw data. + //@{ + /** + Write a bitmap or image at the current insertion point. + Supply an optional type to use for internal and file storage of the raw data. + */ virtual bool WriteImage(const wxImage& image, wxBitmapType bitmapType = wxBITMAP_TYPE_PNG, const wxRichTextAttr& textAttr = wxRichTextAttr()); - /// Write a bitmap at the current insertion point. Supply optional type to use - /// for internal and file storage of the raw data. virtual bool WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType = wxBITMAP_TYPE_PNG, const wxRichTextAttr& textAttr = wxRichTextAttr()); + //@} - /// Load an image from file and write at the current insertion point. + /** + Loads an image from a file and writes it at the current insertion point. + */ virtual bool WriteImage(const wxString& filename, wxBitmapType bitmapType, const wxRichTextAttr& textAttr = wxRichTextAttr()); - /// Write an image block at the current insertion point. + /** + Writes an image block at the current insertion point. + */ virtual bool WriteImage(const wxRichTextImageBlock& imageBlock, const wxRichTextAttr& textAttr = wxRichTextAttr()); - /// Write a text box at the current insertion point, returning the text box. - /// You can then call SetFocusObject() to set the focus to the new object. + /** + Write a text box at the current insertion point, returning the text box. + You can then call SetFocusObject() to set the focus to the new object. + */ virtual wxRichTextBox* WriteTextBox(const wxRichTextAttr& textAttr = wxRichTextAttr()); - /// Write a table at the current insertion point, returning the table. - /// You can then call SetFocusObject() to set the focus to the new object. + /** + Write a table at the current insertion point, returning the table. + You can then call SetFocusObject() to set the focus to the new object. + */ virtual wxRichTextTable* WriteTable(int rows, int cols, const wxRichTextAttr& tableAttr = wxRichTextAttr(), const wxRichTextAttr& cellAttr = wxRichTextAttr()); - /// Insert a newline (actually paragraph) at the current insertion point. + /** + Inserts a new paragraph at the current insertion point. @see LineBreak(). + */ virtual bool Newline(); - /// Insert a line break at the current insertion point. + /** + Inserts a line break at the current insertion point. + + A line break forces wrapping within a paragraph, and can be introduced by + using this function, by appending the wxChar value @b wxRichTextLineBreakChar + to text content, or by typing Shift-Return. + */ virtual bool LineBreak(); - /// Set basic (overall) style + /** + Sets the basic (overall) style. + + This is the style of the whole buffer before further styles are applied, + unlike the default style, which only affects the style currently being + applied (for example, setting the default style to bold will cause + subsequently inserted text to be bold). + */ virtual void SetBasicStyle(const wxRichTextAttr& style) { GetBuffer().SetBasicStyle(style); } - /// Get basic (overall) style + /** + Gets the basic (overall) style. + + This is the style of the whole buffer before further styles are applied, + unlike the default style, which only affects the style currently being + applied (for example, setting the default style to bold will cause + subsequently inserted text to be bold). + */ virtual const wxRichTextAttr& GetBasicStyle() const { return GetBuffer().GetBasicStyle(); } + /** + Begins applying a style. + */ virtual bool BeginStyle(const wxRichTextAttr& style) { return GetBuffer().BeginStyle(style); } - /// End the style + /** + Ends the current style. + */ virtual bool EndStyle() { return GetBuffer().EndStyle(); } - /// End all styles + /** + Ends application of all styles in the current style stack. + */ virtual bool EndAllStyles() { return GetBuffer().EndAllStyles(); } - /// Begin using bold + /** + Begins using bold. + */ bool BeginBold() { return GetBuffer().BeginBold(); } - /// End using bold + /** + Ends using bold. + */ bool EndBold() { return GetBuffer().EndBold(); } - /// Begin using italic + /** + Begins using italic. + */ bool BeginItalic() { return GetBuffer().BeginItalic(); } - /// End using italic + /** + Ends using italic. + */ bool EndItalic() { return GetBuffer().EndItalic(); } - /// Begin using underline + /** + Begins using underlining. + */ bool BeginUnderline() { return GetBuffer().BeginUnderline(); } - /// End using underline + /** + End applying underlining. + */ bool EndUnderline() { return GetBuffer().EndUnderline(); } - /// Begin using point size + /** + Begins using the given point size. + */ bool BeginFontSize(int pointSize) { return GetBuffer().BeginFontSize(pointSize); } - /// End using point size + /** + Ends using a point size. + */ bool EndFontSize() { return GetBuffer().EndFontSize(); } - /// Begin using this font + /** + Begins using this font. + */ bool BeginFont(const wxFont& font) { return GetBuffer().BeginFont(font); } - /// End using a font + /** + Ends using a font. + */ bool EndFont() { return GetBuffer().EndFont(); } - /// Begin using this colour + /** + Begins using this colour. + */ bool BeginTextColour(const wxColour& colour) { return GetBuffer().BeginTextColour(colour); } - /// End using a colour + /** + Ends applying a text colour. + */ bool EndTextColour() { return GetBuffer().EndTextColour(); } - /// Begin using alignment + /** + Begins using alignment. + For alignment values, see wxTextAttr. + */ bool BeginAlignment(wxTextAttrAlignment alignment) { return GetBuffer().BeginAlignment(alignment); } - /// End alignment + /** + Ends alignment. + */ bool EndAlignment() { return GetBuffer().EndAlignment(); } - /// Begin left indent + /** + Begins applying a left indent and subindent in tenths of a millimetre. + The subindent is an offset from the left edge of the paragraph, and is + used for all but the first line in a paragraph. A positive value will + cause the first line to appear to the left of the subsequent lines, and + a negative value will cause the first line to be indented to the right + of the subsequent lines. + + wxRichTextBuffer uses indentation to render a bulleted item. The + content of the paragraph, including the first line, starts at the + @a leftIndent plus the @a leftSubIndent. + + @param leftIndent + The distance between the margin and the bullet. + @param leftSubIndent + The distance between the left edge of the bullet and the left edge + of the actual paragraph. + */ bool BeginLeftIndent(int leftIndent, int leftSubIndent = 0) { return GetBuffer().BeginLeftIndent(leftIndent, leftSubIndent); } - /// End left indent + /** + Ends left indent. + */ bool EndLeftIndent() { return GetBuffer().EndLeftIndent(); } - /// Begin right indent + /** + Begins a right indent, specified in tenths of a millimetre. + */ bool BeginRightIndent(int rightIndent) { return GetBuffer().BeginRightIndent(rightIndent); } - /// End right indent + /** + Ends right indent. + */ bool EndRightIndent() { return GetBuffer().EndRightIndent(); } - /// Begin paragraph spacing + /** + Begins paragraph spacing; pass the before-paragraph and after-paragraph spacing + in tenths of a millimetre. + */ bool BeginParagraphSpacing(int before, int after) { return GetBuffer().BeginParagraphSpacing(before, after); } - /// End paragraph spacing + /** + Ends paragraph spacing. + */ bool EndParagraphSpacing() { return GetBuffer().EndParagraphSpacing(); } - /// Begin line spacing + /** + Begins appling line spacing. @e spacing is a multiple, where 10 means + single-spacing, 15 means 1.5 spacing, and 20 means double spacing. + + The ::wxTextAttrLineSpacing constants are defined for convenience. + */ bool BeginLineSpacing(int lineSpacing) { return GetBuffer().BeginLineSpacing(lineSpacing); } - /// End line spacing + /** + Ends line spacing. + */ bool EndLineSpacing() { return GetBuffer().EndLineSpacing(); } - /// Begin numbered bullet + /** + Begins a numbered bullet. + + This call will be needed for each item in the list, and the + application should take care of incrementing the numbering. + + @a bulletNumber is a number, usually starting with 1. + @a leftIndent and @a leftSubIndent are values in tenths of a millimetre. + @a bulletStyle is a bitlist of the ::wxTextAttrBulletStyle values. + + wxRichTextBuffer uses indentation to render a bulleted item. + The left indent is the distance between the margin and the bullet. + The content of the paragraph, including the first line, starts + at leftMargin + leftSubIndent. + So the distance between the left edge of the bullet and the + left of the actual paragraph is leftSubIndent. + */ bool BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD) { return GetBuffer().BeginNumberedBullet(bulletNumber, leftIndent, leftSubIndent, bulletStyle); } - /// End numbered bullet + /** + Ends application of a numbered bullet. + */ bool EndNumberedBullet() { return GetBuffer().EndNumberedBullet(); } - /// Begin symbol bullet + /** + Begins applying a symbol bullet, using a character from the current font. + See BeginNumberedBullet() for an explanation of how indentation is used + to render the bulleted paragraph. + */ bool BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL) { return GetBuffer().BeginSymbolBullet(symbol, leftIndent, leftSubIndent, bulletStyle); } - /// End symbol bullet + /** + Ends applying a symbol bullet. + */ bool EndSymbolBullet() { return GetBuffer().EndSymbolBullet(); } - /// Begin standard bullet + /** + Begins applying a symbol bullet. + */ bool BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_STANDARD) { return GetBuffer().BeginStandardBullet(bulletName, leftIndent, leftSubIndent, bulletStyle); } - /// End standard bullet + /** + Begins applying a standard bullet. + */ bool EndStandardBullet() { return GetBuffer().EndStandardBullet(); } - /// Begin named character style + /** + Begins using the named character style. + */ bool BeginCharacterStyle(const wxString& characterStyle) { return GetBuffer().BeginCharacterStyle(characterStyle); } - /// End named character style + /** + Ends application of a named character style. + */ bool EndCharacterStyle() { return GetBuffer().EndCharacterStyle(); } - /// Begin named paragraph style + /** + Begins applying the named paragraph style. + */ bool BeginParagraphStyle(const wxString& paragraphStyle) { return GetBuffer().BeginParagraphStyle(paragraphStyle); } - /// End named character style + /** + Ends application of a named paragraph style. + */ bool EndParagraphStyle() { return GetBuffer().EndParagraphStyle(); } - /// Begin named list style + /** + Begins using a specified list style. + Optionally, you can also pass a level and a number. + */ bool BeginListStyle(const wxString& listStyle, int level = 1, int number = 1) { return GetBuffer().BeginListStyle(listStyle, level, number); } - /// End named character style + /** + Ends using a specified list style. + */ bool EndListStyle() { return GetBuffer().EndListStyle(); } - /// Begin URL + /** + Begins applying wxTEXT_ATTR_URL to the content. + + Pass a URL and optionally, a character style to apply, since it is common + to mark a URL with a familiar style such as blue text with underlining. + */ bool BeginURL(const wxString& url, const wxString& characterStyle = wxEmptyString) { return GetBuffer().BeginURL(url, characterStyle); } - /// End URL + /** + Ends applying a URL. + */ bool EndURL() { return GetBuffer().EndURL(); } - /// Sets the default style to the style under the cursor + /** + Sets the default style to the style under the cursor. + */ bool SetDefaultStyleToCursorStyle(); - /// Clear the selection + /** + Cancels any selection. + */ virtual void SelectNone(); - /// Select the word at the given character position + /** + Selects the word at the given character position. + */ virtual bool SelectWord(long position); - /// Get/set the selection range in character positions. -1, -1 means no selection. - /// The range is in API convention, i.e. a single character selection is denoted - /// by (n, n+1) + /** + Returns the selection range in character positions. -1, -1 means no selection. + + The range is in API convention, i.e. a single character selection is denoted + by (n, n+1) + */ wxRichTextRange GetSelectionRange() const; + + /** + Sets the selection to the given range. + The end point of range is specified as the last character position of the span + of text, plus one. + + So, for example, to set the selection for a character at position 5, use the + range (5,6). + */ void SetSelectionRange(const wxRichTextRange& range); - /// Get/set the selection range in character positions. -2, -2 means no selection - /// -1, -1 means select everything. - /// The range is in internal format, i.e. a single character selection is denoted - /// by (n, n) + /** + Returns the selection range in character positions. -2, -2 means no selection + -1, -1 means select everything. + The range is in internal format, i.e. a single character selection is denoted + by (n, n) + */ wxRichTextRange GetInternalSelectionRange() const { return m_selection.GetRange(); } + + /** + Sets the selection range in character positions. -2, -2 means no selection + -1, -1 means select everything. + The range is in internal format, i.e. a single character selection is denoted + by (n, n) + */ void SetInternalSelectionRange(const wxRichTextRange& range) { m_selection.Set(range, GetFocusObject()); } - /// Add a new paragraph of text to the end of the buffer + /** + Adds a new paragraph of text to the end of the buffer. + */ virtual wxRichTextRange AddParagraph(const wxString& text); - /// Add an image + /** + Adds an image to the control's buffer. + */ virtual wxRichTextRange AddImage(const wxImage& image); - /// Layout the buffer: which we must do before certain operations, such as - /// setting the caret position. + /** + Lays out the buffer, which must be done before certain operations, such as + setting the caret position. + This function should not normally be required by the application. + */ virtual bool LayoutContent(bool onlyVisibleRect = false); - /// Move the caret to the given character position + /** + Move the caret to the given character position. + + Please note that this does not update the current editing style + from the new position; to do that, call wxRichTextCtrl::SetInsertionPoint instead. + */ virtual bool MoveCaret(long pos, bool showAtLineStart = false, wxRichTextParagraphLayoutBox* container = NULL); - /// Move right + /** + Moves right. + */ virtual bool MoveRight(int noPositions = 1, int flags = 0); - /// Move left + /** + Moves left. + */ virtual bool MoveLeft(int noPositions = 1, int flags = 0); - /// Move up + /** + Moves to the start of the paragraph. + */ virtual bool MoveUp(int noLines = 1, int flags = 0); - /// Move up + /** + Moves the caret down. + */ virtual bool MoveDown(int noLines = 1, int flags = 0); - /// Move to the end of the line + /** + Moves to the end of the line. + */ virtual bool MoveToLineEnd(int flags = 0); - /// Move to the start of the line + /** + Moves to the start of the line. + */ virtual bool MoveToLineStart(int flags = 0); - /// Move to the end of the paragraph + /** + Moves to the end of the paragraph. + */ virtual bool MoveToParagraphEnd(int flags = 0); - /// Move to the start of the paragraph + /** + Moves to the start of the paragraph. + */ virtual bool MoveToParagraphStart(int flags = 0); - /// Move to the start of the buffer + /** + Moves to the start of the buffer. + */ virtual bool MoveHome(int flags = 0); - /// Move to the end of the buffer + /** + Moves to the end of the buffer. + */ virtual bool MoveEnd(int flags = 0); - /// Move n pages up + /** + Moves one or more pages up. + */ virtual bool PageUp(int noPages = 1, int flags = 0); - /// Move n pages down + /** + Moves one or more pages down. + */ virtual bool PageDown(int noPages = 1, int flags = 0); - /// Move n words left + /** + Moves a number of words to the left. + */ virtual bool WordLeft(int noPages = 1, int flags = 0); - /// Move n words right + /** + Move a nuber of words to the right. + */ virtual bool WordRight(int noPages = 1, int flags = 0); - /// Returns the buffer associated with the control. + //@{ + /** + Returns the buffer associated with the control. + */ wxRichTextBuffer& GetBuffer() { return m_buffer; } const wxRichTextBuffer& GetBuffer() const { return m_buffer; } + //@} - /// Start batching undo history for commands. + /** + Starts batching undo history for commands. + */ virtual bool BeginBatchUndo(const wxString& cmdName) { return m_buffer.BeginBatchUndo(cmdName); } - /// End batching undo history for commands. + /** + Ends batching undo command history. + */ virtual bool EndBatchUndo() { return m_buffer.EndBatchUndo(); } - /// Are we batching undo history for commands? + /** + Returns @true if undo commands are being batched. + */ virtual bool BatchingUndo() const { return m_buffer.BatchingUndo(); } - /// Start suppressing undo history for commands. + /** + Starts suppressing undo history for commands. + */ virtual bool BeginSuppressUndo() { return m_buffer.BeginSuppressUndo(); } - /// End suppressing undo history for commands. + /** + Ends suppressing undo command history. + */ virtual bool EndSuppressUndo() { return m_buffer.EndSuppressUndo(); } - /// Are we suppressing undo history for commands? + /** + Returns @true if undo history suppression is on. + */ virtual bool SuppressingUndo() const { return m_buffer.SuppressingUndo(); } - /// Test if this whole range has character attributes of the specified kind. If any - /// of the attributes are different within the range, the test fails. You - /// can use this to implement, for example, bold button updating. style must have - /// flags indicating which attributes are of interest. + /** + Test if this whole range has character attributes of the specified kind. + If any of the attributes are different within the range, the test fails. + + You can use this to implement, for example, bold button updating. + @a style must have flags indicating which attributes are of interest. + */ virtual bool HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const { return GetBuffer().HasCharacterAttributes(range.ToInternal(), style); } - /// Test if this whole range has paragraph attributes of the specified kind. If any - /// of the attributes are different within the range, the test fails. You - /// can use this to implement, for example, centering button updating. style must have - /// flags indicating which attributes are of interest. + /** + Test if this whole range has paragraph attributes of the specified kind. + If any of the attributes are different within the range, the test fails. + You can use this to implement, for example, centering button updating. + @a style must have flags indicating which attributes are of interest. + */ virtual bool HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const { return GetBuffer().HasParagraphAttributes(range.ToInternal(), style); } - /// Is all of the selection bold? + /** + Returns @true if all of the selection is bold. + */ virtual bool IsSelectionBold(); - /// Is all of the selection italics? + /** + Returns @true if all of the selection is italic. + */ virtual bool IsSelectionItalics(); - /// Is all of the selection underlined? + /** + Returns @true if all of the selection is underlined. + */ virtual bool IsSelectionUnderlined(); - /// Is all of the selection aligned according to the specified flag? + /** + Returns @true if all of the selection is aligned according to the specified flag. + */ virtual bool IsSelectionAligned(wxTextAttrAlignment alignment); - /// Apply bold to the selection + /** + Apples bold to the selection (undoable). + */ virtual bool ApplyBoldToSelection(); - /// Apply italic to the selection + /** + Applies italic to the selection (undoable). + */ virtual bool ApplyItalicToSelection(); - /// Apply underline to the selection + /** + Applies underline to the selection (undoable). + */ virtual bool ApplyUnderlineToSelection(); - /// Apply alignment to the selection + /** + Applies the given alignment to the selection (undoable). + For alignment values, see wxTextAttr. + */ virtual bool ApplyAlignmentToSelection(wxTextAttrAlignment alignment); - /// Apply a named style to the selection + /** + Applies the style sheet to the buffer, matching paragraph styles in the sheet + against named styles in the buffer. + + This might be useful if the styles have changed. + If @a sheet is @NULL, the sheet set with SetStyleSheet() is used. + Currently this applies paragraph styles only. + */ virtual bool ApplyStyle(wxRichTextStyleDefinition* def); - /// Set style sheet, if any + /** + Sets the style sheet associated with the control. + A style sheet allows named character and paragraph styles to be applied. + */ void SetStyleSheet(wxRichTextStyleSheet* styleSheet) { GetBuffer().SetStyleSheet(styleSheet); } + + /** + Returns the style sheet associated with the control, if any. + A style sheet allows named character and paragraph styles to be applied. + */ wxRichTextStyleSheet* GetStyleSheet() const { return GetBuffer().GetStyleSheet(); } - /// Push style sheet to top of stack + /** + Push the style sheet to top of stack. + */ bool PushStyleSheet(wxRichTextStyleSheet* styleSheet) { return GetBuffer().PushStyleSheet(styleSheet); } - /// Pop style sheet from top of stack + /** + Pops the style sheet from top of stack. + */ wxRichTextStyleSheet* PopStyleSheet() { return GetBuffer().PopStyleSheet(); } - /// Apply the style sheet to the buffer, for example if the styles have changed. + /** + Applies the style sheet to the buffer, for example if the styles have changed. + */ bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL); // Command handlers + /** + Sends the event to the control. + */ void Command(wxCommandEvent& event); + + /** + Loads the first dropped file. + */ void OnDropFiles(wxDropFilesEvent& event); + void OnCaptureLost(wxMouseCaptureLostEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); + /** + Standard handler for the wxID_CUT command. + */ void OnCut(wxCommandEvent& event); + + /** + Standard handler for the wxID_COPY command. + */ void OnCopy(wxCommandEvent& event); + + /** + Standard handler for the wxID_PASTE command. + */ void OnPaste(wxCommandEvent& event); + + /** + Standard handler for the wxID_UNDO command. + */ void OnUndo(wxCommandEvent& event); + + /** + Standard handler for the wxID_REDO command. + */ void OnRedo(wxCommandEvent& event); + + /** + Standard handler for the wxID_SELECTALL command. + */ void OnSelectAll(wxCommandEvent& event); + + /** + Standard handler for property commands. + */ void OnProperties(wxCommandEvent& event); + + /** + Standard handler for the wxID_CLEAR command. + */ void OnClear(wxCommandEvent& event); + /** + Standard update handler for the wxID_CUT command. + */ void OnUpdateCut(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_COPY command. + */ void OnUpdateCopy(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_PASTE command. + */ void OnUpdatePaste(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_UNDO command. + */ void OnUpdateUndo(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_REDO command. + */ void OnUpdateRedo(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_SELECTALL command. + */ void OnUpdateSelectAll(wxUpdateUIEvent& event); + + /** + Standard update handler for property commands. + */ + void OnUpdateProperties(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_CLEAR command. + */ void OnUpdateClear(wxUpdateUIEvent& event); - // Show a context menu for Rich Edit controls (the standard - // EDIT control has one already) + /** + Shows a standard context menu with undo, redo, cut, copy, paste, clear, and + select all commands. + */ void OnContextMenu(wxContextMenuEvent& event); // Event handlers - /// Painting + // Painting void OnPaint(wxPaintEvent& event); void OnEraseBackground(wxEraseEvent& event); - /// Left-click + // Left-click void OnLeftClick(wxMouseEvent& event); - /// Left-up + // Left-up void OnLeftUp(wxMouseEvent& event); - /// Motion + // Motion void OnMoveMouse(wxMouseEvent& event); - /// Left-double-click + // Left-double-click void OnLeftDClick(wxMouseEvent& event); - /// Middle-click + // Middle-click void OnMiddleClick(wxMouseEvent& event); - /// Right-click + // Right-click void OnRightClick(wxMouseEvent& event); - /// Key press + // Key press void OnChar(wxKeyEvent& event); - /// Sizing + // Sizing void OnSize(wxSizeEvent& event); - /// Setting/losing focus + // Setting/losing focus void OnSetFocus(wxFocusEvent& event); void OnKillFocus(wxFocusEvent& event); - /// Idle-time processing + // Idle-time processing void OnIdle(wxIdleEvent& event); - /// Scrolling + // Scrolling void OnScroll(wxScrollWinEvent& event); - /// Set font, and also default attributes + /** + Sets the font, and also the basic and default attributes + (see wxRichTextCtrl::SetDefaultStyle). + */ virtual bool SetFont(const wxFont& font); - /// Set up scrollbars, e.g. after a resize + /** + A helper function setting up scrollbars, for example after a resize. + */ virtual void SetupScrollbars(bool atTop = false); - /// Keyboard navigation + /** + Helper function implementing keyboard navigation. + */ virtual bool KeyboardNavigate(int keyCode, int flags); - /// Paint the background + /** + Paints the background. + */ virtual void PaintBackground(wxDC& dc); - /// Other user defined painting after everything else (i.e. all text) is painted + /** + Other user defined painting after everything else (i.e. all text) is painted. + + @since 2.9.1 + */ virtual void PaintAboveContent(wxDC& WXUNUSED(dc)) {} #if wxRICHTEXT_BUFFERED_PAINTING - /// Recreate buffer bitmap if necessary + /** + Recreates the buffer bitmap if necessary. + */ virtual bool RecreateBuffer(const wxSize& size = wxDefaultSize); #endif - /// Write text + // Write text virtual void DoWriteText(const wxString& value, int flags = 0); - /// Should we inherit colours? + // Should we inherit colours? virtual bool ShouldInheritColours() const { return false; } - /// Position the caret + /** + Internal function to position the visible caret according to the current caret + position. + */ virtual void PositionCaret(wxRichTextParagraphLayoutBox* container = NULL); - /// Extend the selection, returning true if the selection was - /// changed. Selections are in caret positions. + /** + Helper function for extending the selection, returning @true if the selection + was changed. Selections are in caret positions. + */ virtual bool ExtendSelection(long oldPosition, long newPosition, int flags); - /// Scroll into view. This takes a _caret_ position. + /** + Scrolls @a position into view. This function takes a caret position. + */ virtual bool ScrollIntoView(long position, int keyCode); - /// Refresh the area affected by a selection change + /** + Refreshes the area affected by a selection change. + */ bool RefreshForSelectionChange(const wxRichTextSelection& oldSelection, const wxRichTextSelection& newSelection); - /// The caret position is the character position just before the caret. - /// A value of -1 means the caret is at the start of the buffer. + /** + Sets the caret position. + + The caret position is the character position just before the caret. + A value of -1 means the caret is at the start of the buffer. + Please note that this does not update the current editing style + from the new position or cause the actual caret to be refreshed; to do that, + call wxRichTextCtrl::SetInsertionPoint instead. + */ void SetCaretPosition(long position, bool showAtLineStart = false) ; + + /** + Returns the current caret position. + */ long GetCaretPosition() const { return m_caretPosition; } - /// The adjusted caret position is the character position adjusted to take - /// into account whether we're at the start of a paragraph, in which case - /// style information should be taken from the next position, not current one. + /** + The adjusted caret position is the character position adjusted to take + into account whether we're at the start of a paragraph, in which case + style information should be taken from the next position, not current one. + */ long GetAdjustedCaretPosition(long caretPos) const; - /// Move caret one visual step forward: this may mean setting a flag - /// and keeping the same position if we're going from the end of one line - /// to the start of the next, which may be the exact same caret position. + /** + Move the caret one visual step forward: this may mean setting a flag + and keeping the same position if we're going from the end of one line + to the start of the next, which may be the exact same caret position. + */ void MoveCaretForward(long oldPosition) ; - /// Move caret one visual step forward: this may mean setting a flag - /// and keeping the same position if we're going from the end of one line - /// to the start of the next, which may be the exact same caret position. + /** + Move the caret one visual step forward: this may mean setting a flag + and keeping the same position if we're going from the end of one line + to the start of the next, which may be the exact same caret position. + */ void MoveCaretBack(long oldPosition) ; - /// Get the caret height and position for the given character position. If container is null, - /// the current focus object will be used. + /** + Returns the caret height and position for the given character position. + If container is null, the current focus object will be used. + + @beginWxPerlOnly + In wxPerl this method is implemented as + GetCaretPositionForIndex(@a position) returning a + 2-element list (ok, rect). + @endWxPerlOnly + */ bool GetCaretPositionForIndex(long position, wxRect& rect, wxRichTextParagraphLayoutBox* container = NULL); - /// Gets the line for the visible caret position. If the caret is - /// shown at the very end of the line, it means the next character is actually - /// on the following line. So let's get the line we're expecting to find - /// if this is the case. + /** + Internal helper function returning the line for the visible caret position. + If the caret is shown at the very end of the line, it means the next character + is actually on the following line. + So this function gets the line we're expecting to find if this is the case. + */ wxRichTextLine* GetVisibleLineForCaretPosition(long caretPosition) const; - /// Gets the command processor + /** + Gets the command processor associated with the control's buffer. + */ wxCommandProcessor* GetCommandProcessor() const { return GetBuffer().GetCommandProcessor(); } - /// Delete content if there is a selection, e.g. when pressing a key. - /// Returns the new caret position in newPos, or leaves it if there - /// was no action. + /** + Deletes content if there is a selection, e.g. when pressing a key. + Returns the new caret position in @e newPos, or leaves it if there + was no action. This is undoable. + + @beginWxPerlOnly + In wxPerl this method takes no arguments and returns a 2-element + list (ok, newPos). + @endWxPerlOnly + */ bool DeleteSelectedContent(long* newPos= NULL); - /// Transform logical to physical + /** + Transforms logical (unscrolled) position to physical window position. + */ wxPoint GetPhysicalPoint(const wxPoint& ptLogical) const; - /// Transform physical to logical + /** + Transforms physical window position to logical (unscrolled) position. + */ wxPoint GetLogicalPoint(const wxPoint& ptPhysical) const; - /// Finds the caret position for the next word. Direction - /// is 1 (forward) or -1 (backwards). + /** + Helper function for finding the caret position for the next word. + Direction is 1 (forward) or -1 (backwards). + */ virtual long FindNextWordPosition(int direction = 1) const; - /// Is the given position visible on the screen? + /** + Returns @true if the given position is visible on the screen. + */ bool IsPositionVisible(long pos) const; - /// Returns the first visible position in the current view + /** + Returns the first visible position in the current view. + */ long GetFirstVisiblePosition() const; - /// Returns the caret position since the default formatting was changed. As - /// soon as this position changes, we no longer reflect the default style - /// in the UI. A value of -2 means that we should only reflect the style of the - /// content under the caret. + /** + Returns the caret position since the default formatting was changed. As + soon as this position changes, we no longer reflect the default style + in the UI. A value of -2 means that we should only reflect the style of the + content under the caret. + */ long GetCaretPositionForDefaultStyle() const { return m_caretPositionForDefaultStyle; } - /// Set the caret position for the default style that the user is selecting. + /** + Set the caret position for the default style that the user is selecting. + */ void SetCaretPositionForDefaultStyle(long pos) { m_caretPositionForDefaultStyle = pos; } - /// Should the UI reflect the default style chosen by the user, rather than the style under - /// the caret? + /** + Returns @true if the user has recently set the default style without moving + the caret, and therefore the UI needs to reflect the default style and not + the style at the caret. + + Below is an example of code that uses this function to determine whether the UI + should show that the current style is bold. + + @see SetAndShowDefaultStyle(). + */ bool IsDefaultStyleShowing() const { return m_caretPositionForDefaultStyle != -2; } - /// Convenience function that tells the control to start reflecting the default - /// style, since the user is changing it. + /** + Sets @a attr as the default style and tells the control that the UI should + reflect this attribute until the user moves the caret. + + @see IsDefaultStyleShowing(). + */ void SetAndShowDefaultStyle(const wxRichTextAttr& attr) { SetDefaultStyle(attr); SetCaretPositionForDefaultStyle(GetCaretPosition()); } - /// Get the first visible point in the window + /** + Returns the first visible point in the window. + */ wxPoint GetFirstVisiblePoint() const; +#ifdef DOXYGEN + /** + Returns the content of the entire control as a string. + */ + virtual wxString GetValue() const; + + /** + Replaces existing content with the given text. + */ + virtual void SetValue(const wxString& value); + + /** + Call this function to prevent refresh and allow fast updates, and then Thaw() to + refresh the control. + */ + void Freeze(); + + /** + Call this function to end a Freeze and refresh the display. + */ + void Thaw(); + + /** + Returns @true if Freeze has been called without a Thaw. + */ + bool IsFrozen() const; + +#endif + // Implementation - /// Set up the caret for the given position and container, after a mouse click + /** + Sets up the caret for the given position and container, after a mouse click. + */ bool SetCaretPositionAfterClick(wxRichTextParagraphLayoutBox* container, long position, int hitTestFlags, bool extendSelection = false); - /// Find the caret position for the combination of hit-test flags and character position. - /// Returns the caret position and also an indication of where to place the caret (caretLineStart) - /// since this is ambiguous (same position used for end of line and start of next). + /** + Find the caret position for the combination of hit-test flags and character position. + Returns the caret position and also an indication of where to place the caret (caretLineStart) + since this is ambiguous (same position used for end of line and start of next). + */ long FindCaretPositionForCharacterPosition(long position, int hitTestFlags, wxRichTextParagraphLayoutBox* container, bool& caretLineStart); - /// Font names take a long time to retrieve, so cache them (on demand) + /** + Font names take a long time to retrieve, so cache them (on demand). + */ static const wxArrayString& GetAvailableFontNames(); + + /** + Clears the cache of available font names. + */ static void ClearAvailableFontNames(); WX_FORWARD_TO_SCROLL_HELPER() @@ -972,6 +1985,9 @@ protected: // Overrides protected: + /** + Currently this simply returns @c wxSize(10, 10). + */ virtual wxSize DoGetBestSize() const ; virtual void DoSetValue(const wxString& value, int flags = 0); @@ -1045,19 +2061,97 @@ private: wxRichTextParagraphLayoutBox* m_focusObject; }; -/*! - * wxRichTextEvent - the event class for wxRichTextCtrl notifications - */ +/** + @class wxRichTextEvent + + This is the event class for wxRichTextCtrl notifications. + + @beginEventTable{wxRichTextEvent} + @event{EVT_RICHTEXT_LEFT_CLICK(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_LEFT_CLICK event, generated when the user + releases the left mouse button over an object. + @event{EVT_RICHTEXT_RIGHT_CLICK(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK event, generated when the user + releases the right mouse button over an object. + @event{EVT_RICHTEXT_MIDDLE_CLICK(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK event, generated when the user + releases the middle mouse button over an object. + @event{EVT_RICHTEXT_LEFT_DCLICK(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_DLEFT_CLICK event, generated when the user + double-clicks an object. + @event{EVT_RICHTEXT_RETURN(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_RETURN event, generated when the user + presses the return key. Valid event functions: GetFlags, GetPosition. + @event{EVT_RICHTEXT_CHARACTER(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_CHARACTER event, generated when the user + presses a character key. Valid event functions: GetFlags, GetPosition, GetCharacter. + @event{EVT_RICHTEXT_DELETE(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_DELETE event, generated when the user + presses the backspace or delete key. Valid event functions: GetFlags, GetPosition. + @event{EVT_RICHTEXT_RETURN(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_RETURN event, generated when the user + presses the return key. Valid event functions: GetFlags, GetPosition. + @event{EVT_RICHTEXT_STYLE_CHANGED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED event, generated when + styling has been applied to the control. Valid event functions: GetPosition, GetRange. + @event{EVT_RICHTEXT_STYLESHEET_CHANGED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING event, generated + when the control's stylesheet has changed, for example the user added, + edited or deleted a style. Valid event functions: GetRange, GetPosition. + @event{EVT_RICHTEXT_STYLESHEET_REPLACING(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING event, generated + when the control's stylesheet is about to be replaced, for example when + a file is loaded into the control. + Valid event functions: Veto, GetOldStyleSheet, GetNewStyleSheet. + @event{EVT_RICHTEXT_STYLESHEET_REPLACED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED event, generated + when the control's stylesheet has been replaced, for example when a file + is loaded into the control. + Valid event functions: GetOldStyleSheet, GetNewStyleSheet. + @event{EVT_RICHTEXT_CONTENT_INSERTED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED event, generated when + content has been inserted into the control. + Valid event functions: GetPosition, GetRange. + @event{EVT_RICHTEXT_CONTENT_DELETED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED event, generated when + content has been deleted from the control. + Valid event functions: GetPosition, GetRange. + @event{EVT_RICHTEXT_BUFFER_RESET(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_BUFFER_RESET event, generated when the + buffer has been reset by deleting all content. + You can use this to set a default style for the first new paragraph. + @event{EVT_RICHTEXT_SELECTION_CHANGED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED event, generated when the + selection range has changed. + @event{EVT_RICHTEXT_FOCUS_OBJECT_CHANGED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED event, generated when the + current focus object has changed. + @endEventTable + + @library{wxrichtext} + @category{events,richtext} +*/ class WXDLLIMPEXP_RICHTEXT wxRichTextEvent : public wxNotifyEvent { public: + /** + Constructor. + + @param commandType + The type of the event. + @param id + Window identifier. The value @c wxID_ANY indicates a default value. + */ wxRichTextEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) : wxNotifyEvent(commandType, winid), m_flags(0), m_position(-1), m_oldStyleSheet(NULL), m_newStyleSheet(NULL), m_char((wxChar) 0), m_container(NULL), m_oldContainer(NULL) { } + /** + Copy constructor. + */ wxRichTextEvent(const wxRichTextEvent& event) : wxNotifyEvent(event), m_flags(event.m_flags), m_position(-1), @@ -1065,28 +2159,94 @@ public: m_char((wxChar) 0), m_container(event.m_container), m_oldContainer(event.m_oldContainer) { } + /** + Returns the buffer position at which the event occured. + */ long GetPosition() const { return m_position; } + + /** + Sets the buffer position variable. + */ void SetPosition(long pos) { m_position = pos; } + /** + Returns flags indicating modifier keys pressed. + + Possible values are @c wxRICHTEXT_CTRL_DOWN, @c wxRICHTEXT_SHIFT_DOWN, and @c wxRICHTEXT_ALT_DOWN. + */ int GetFlags() const { return m_flags; } + + /** + Sets flags indicating modifier keys pressed. + + Possible values are @c wxRICHTEXT_CTRL_DOWN, @c wxRICHTEXT_SHIFT_DOWN, and @c wxRICHTEXT_ALT_DOWN. + */ void SetFlags(int flags) { m_flags = flags; } + /** + Returns the old style sheet. + + Can be used in a @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING or + @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED event handler. + */ wxRichTextStyleSheet* GetOldStyleSheet() const { return m_oldStyleSheet; } + + /** + Sets the old style sheet variable. + */ void SetOldStyleSheet(wxRichTextStyleSheet* sheet) { m_oldStyleSheet = sheet; } + /** + Returns the new style sheet. + + Can be used in a @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING or + @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED event handler. + */ wxRichTextStyleSheet* GetNewStyleSheet() const { return m_newStyleSheet; } + + /** + Sets the new style sheet variable. + */ void SetNewStyleSheet(wxRichTextStyleSheet* sheet) { m_newStyleSheet = sheet; } + /** + Gets the range for the current operation. + */ const wxRichTextRange& GetRange() const { return m_range; } + + /** + Sets the range variable. + */ void SetRange(const wxRichTextRange& range) { m_range = range; } + /** + Returns the character pressed, within a @c wxEVT_COMMAND_RICHTEXT_CHARACTER event. + */ wxChar GetCharacter() const { return m_char; } + + /** + Sets the character variable. + */ void SetCharacter(wxChar ch) { m_char = ch; } + /** + Returns the container for which the event is relevant. + */ wxRichTextParagraphLayoutBox* GetContainer() const { return m_container; } + + /** + Sets the container for which the event is relevant. + */ void SetContainer(wxRichTextParagraphLayoutBox* container) { m_container = container; } + /** + Returns the old container, for a focus change event. + */ wxRichTextParagraphLayoutBox* GetOldContainer() const { return m_oldContainer; } + + /** + Sets the old container, for a focus change event. + */ void SetOldContainer(wxRichTextParagraphLayoutBox* container) { m_oldContainer = container; } virtual wxEvent *Clone() const { return new wxRichTextEvent(*this); } diff --git a/include/wx/richtext/richtexthtml.h b/include/wx/richtext/richtexthtml.h index d939489ac6..083bf35470 100644 --- a/include/wx/richtext/richtexthtml.h +++ b/include/wx/richtext/richtexthtml.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextHTMLHandler: public wxRichTextFileHandler { - DECLARE_CLASS(wxRichTextHTMLHandler) + DECLARE_DYNAMIC_CLASS(wxRichTextHTMLHandler) public: wxRichTextHTMLHandler(const wxString& name = wxT("HTML"), const wxString& ext = wxT("html"), int type = wxRICHTEXT_TYPE_HTML); diff --git a/include/wx/richtext/richtextuicustomization.h b/include/wx/richtext/richtextuicustomization.h index d507aba2fa..7b3afe51c8 100644 --- a/include/wx/richtext/richtextuicustomization.h +++ b/include/wx/richtext/richtextuicustomization.h @@ -60,10 +60,10 @@ public: virtual bool ShowHelp(wxWindow* win) { - if (m_uiCustomization && m_helpTopic != -1) - return m_uiCustomization->ShowHelp(win, m_helpTopic); - else + if ( !m_uiCustomization || m_helpTopic == -1 ) return false; + + return m_uiCustomization->ShowHelp(win, m_helpTopic); } /// Get the help topic identifier. diff --git a/include/wx/richtext/richtextxml.h b/include/wx/richtext/richtextxml.h index afe4e5ace2..d51d2043e5 100644 --- a/include/wx/richtext/richtextxml.h +++ b/include/wx/richtext/richtextxml.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_XML wxXmlDocument; class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHandler: public wxRichTextFileHandler { - DECLARE_CLASS(wxRichTextXMLHandler) + DECLARE_DYNAMIC_CLASS(wxRichTextXMLHandler) public: wxRichTextXMLHandler(const wxString& name = wxT("XML"), const wxString& ext = wxT("xml"), int type = wxRICHTEXT_TYPE_XML) : wxRichTextFileHandler(name, ext, type) diff --git a/include/wx/rtti.h b/include/wx/rtti.h index 565667879c..fcd463e869 100644 --- a/include/wx/rtti.h +++ b/include/wx/rtti.h @@ -144,7 +144,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name); static wxObject* wxCreateObject() #define wxDECLARE_CLASS(name) \ - wxDECLARE_DYNAMIC_CLASS(name) + wxDECLARE_ABSTRACT_CLASS(name) // common part of the macros below diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 0c18a7a7d0..22f38675a2 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -299,20 +299,18 @@ // usually more limited) implementations are used which allows to avoid the // dependency on the C++ run-time library. // -// Default is 1 if compiler supports it. Currently this means not one of the -// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it -// needs non-default options for such build to avoid getting "fatal error -// C1076: compiler limit : internal heap limit reached; use /Zm to specify a -// higher limit" in its own standard headers, so you need to ensure you do -// increase the heap size before enabling this option for this compiler. +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. // -// Recommended setting: 1 unless you use a system without good implementation -// of STL. -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h index 2a1c0ba412..74a60c303d 100644 --- a/include/wx/srchctrl.h +++ b/include/wx/srchctrl.h @@ -26,8 +26,11 @@ // no native version, use the generic one #define wxUSE_NATIVE_SEARCH_CONTROL 0 - class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass : public wxControl, - public wxTextCtrlIface + #include "wx/containr.h" + + class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass + : public wxNavigationEnabled, + public wxTextCtrlIface { }; #endif diff --git a/include/wx/sstream.h b/include/wx/sstream.h index 14845bb479..318cf776b7 100644 --- a/include/wx/sstream.h +++ b/include/wx/sstream.h @@ -66,9 +66,9 @@ public: wxStringOutputStream(wxString *pString = NULL, wxMBConv& conv = wxConvUTF8) : m_conv(conv) -#if wxUSE_UNICODE_WCHAR +#if wxUSE_UNICODE , m_unconv(0) -#endif // wxUSE_UNICODE_WCHAR +#endif // wxUSE_UNICODE { m_str = pString ? pString : &m_strInternal; m_pos = m_str->length() / sizeof(wxChar); @@ -98,10 +98,10 @@ private: // arbitrary 8 bit data wxMBConv& m_conv; -#if wxUSE_UNICODE_WCHAR +#if wxUSE_UNICODE // unconverted data from the last call to OnSysWrite() wxMemoryBuffer m_unconv; -#endif // wxUSE_UNICODE_WCHAR +#endif // wxUSE_UNICODE wxDECLARE_NO_COPY_CLASS(wxStringOutputStream); }; diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index faa33fa65d..559f8823d4 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -3056,19 +3056,19 @@ public: // Set the display mode of visual flags for wrapped lines. void SetWrapVisualFlags(int wrapVisualFlags); - // Retrieve the display mode of visual flags for wrapped lines. + // Retrive the display mode of visual flags for wrapped lines. int GetWrapVisualFlags() const; // Set the location of visual flags for wrapped lines. void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation); - // Retrieve the location of visual flags for wrapped lines. + // Retrive the location of visual flags for wrapped lines. int GetWrapVisualFlagsLocation() const; // Set the start indent for wrapped lines. void SetWrapStartIndent(int indent); - // Retrieve the start indent for wrapped lines. + // Retrive the start indent for wrapped lines. int GetWrapStartIndent() const; // Sets how wrapped sublines are placed. Default is fixed. @@ -3464,7 +3464,7 @@ public: // Delete forwards from the current position to the end of the line. void DelLineRight(); - // Get and Set the xOffset (ie, horizontal scroll position). + // Get and Set the xOffset (ie, horizonal scroll position). void SetXOffset(int newOffset); int GetXOffset() const; diff --git a/include/wx/stream.h b/include/wx/stream.h index 9119658421..ed07ce61a8 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -64,7 +64,7 @@ public: bool operator!() const { return !IsOk(); } // reset the stream state - void Reset() { m_lasterror = wxSTREAM_NO_ERROR; } + void Reset(wxStreamError error = wxSTREAM_NO_ERROR) { m_lasterror = error; } // this doesn't make sense for all streams, always test its return value virtual size_t GetSize() const; diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index eff6e627cb..0bde80b3a6 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -825,7 +825,7 @@ WX_ARG_NORMALIZER_FORWARD(const signed char&, signed char); #undef WX_ARG_NORMALIZER_FORWARD #undef _WX_ARG_NORMALIZER_FORWARD_IMPL -#undef wxASSERT_ARG_TYPE +// NB: Don't #undef wxASSERT_ARG_TYPE here as it's also used in wx/longlong.h. // ---------------------------------------------------------------------------- // WX_VA_ARG_STRING diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index eb7c2140ce..f26cb8aa10 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -379,8 +379,8 @@ public: int GetOutlineLevel() const { return m_outlineLevel; } // accessors - bool HasTextColour() const { return m_colText.Ok() && HasFlag(wxTEXT_ATTR_TEXT_COLOUR) ; } - bool HasBackgroundColour() const { return m_colBack.Ok() && HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) ; } + bool HasTextColour() const { return m_colText.IsOk() && HasFlag(wxTEXT_ATTR_TEXT_COLOUR) ; } + bool HasBackgroundColour() const { return m_colBack.IsOk() && HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) ; } bool HasAlignment() const { return (m_textAlignment != wxTEXT_ALIGNMENT_DEFAULT) && HasFlag(wxTEXT_ATTR_ALIGNMENT) ; } bool HasTabs() const { return HasFlag(wxTEXT_ATTR_TABS) ; } bool HasLeftIndent() const { return HasFlag(wxTEXT_ATTR_LEFT_INDENT); } diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h index bf455bf31a..380c617886 100644 --- a/include/wx/tglbtn.h +++ b/include/wx/tglbtn.h @@ -18,7 +18,7 @@ #if wxUSE_TOGGLEBTN #include "wx/event.h" -#include "wx/control.h" // base class +#include "wx/anybutton.h" // base class extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; @@ -28,7 +28,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, // wxToggleButtonBase // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxControl +class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxAnyButton { public: wxToggleButtonBase() { } diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index d6af2b0aa1..bf8123e5ab 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -157,7 +157,8 @@ enum // wxTopLevelWindow: a top level (as opposed to child) window // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxTopLevelWindowBase : public wxNonOwnedWindow +class WXDLLIMPEXP_CORE wxTopLevelWindowBase : + public wxNavigationEnabled { public: // construction @@ -352,7 +353,6 @@ protected: wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowBase); DECLARE_EVENT_TABLE() - WX_DECLARE_CONTROL_CONTAINER(); }; diff --git a/include/wx/treebase.h b/include/wx/treebase.h index 37dfb0e333..e623660865 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -252,9 +252,9 @@ public: void SetFont(const wxFont& font) { m_font = font; } // accessors - bool HasTextColour() const { return m_colText.Ok(); } - bool HasBackgroundColour() const { return m_colBack.Ok(); } - bool HasFont() const { return m_font.Ok(); } + bool HasTextColour() const { return m_colText.IsOk(); } + bool HasBackgroundColour() const { return m_colBack.IsOk(); } + bool HasFont() const { return m_font.IsOk(); } const wxColour& GetTextColour() const { return m_colText; } const wxColour& GetBackgroundColour() const { return m_colBack; } diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index fd37d88b06..ee5870c5c9 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -302,20 +302,18 @@ // usually more limited) implementations are used which allows to avoid the // dependency on the C++ run-time library. // -// Default is 1 if compiler supports it. Currently this means not one of the -// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it -// needs non-default options for such build to avoid getting "fatal error -// C1076: compiler limit : internal heap limit reached; use /Zm to specify a -// higher limit" in its own standard headers, so you need to ensure you do -// increase the heap size before enabling this option for this compiler. +// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't +// support using standard containers and that VC6 needs non-default options for +// such build to avoid getting "fatal error C1076: compiler limit : internal +// heap limit reached; use /Zm to specify a higher limit" in its own standard +// headers, so you need to ensure you do increase the heap size before enabling +// this option for this compiler. // -// Recommended setting: 1 unless you use a system without good implementation -// of STL. -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +// Default is 0 for compatibility reasons. +// +// Recommended setting: 1 unless compatibility with the official wxWidgets +// build and/or the existing code is a concern. +#define wxUSE_STD_CONTAINERS 0 // Use standard C++ streams if 1 instead of wx streams in some places. If // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the diff --git a/include/wx/valgen.h b/include/wx/valgen.h index b0adefaf17..592afe4981 100644 --- a/include/wx/valgen.h +++ b/include/wx/valgen.h @@ -16,6 +16,7 @@ #if wxUSE_VALIDATORS class WXDLLIMPEXP_FWD_BASE wxDateTime; +class WXDLLIMPEXP_FWD_BASE wxFileName; // ---------------------------------------------------------------------------- // wxGenericValidator performs data transfer between many standard controls and @@ -42,6 +43,13 @@ public: // wxDatePickerCtrl wxGenericValidator(wxDateTime* val); #endif // wxUSE_DATETIME + // wxTextCtrl + wxGenericValidator(wxFileName* val); + // wxTextCtrl + wxGenericValidator(float* val); + // wxTextCtrl + wxGenericValidator(double* val); + wxGenericValidator(const wxGenericValidator& copyFrom); virtual ~wxGenericValidator(){} @@ -73,6 +81,9 @@ protected: #if wxUSE_DATETIME wxDateTime* m_pDateTime; #endif // wxUSE_DATETIME + wxFileName* m_pFileName; + float* m_pFloat; + double* m_pDouble; private: DECLARE_CLASS(wxGenericValidator) diff --git a/include/wx/version.h b/include/wx/version.h index e4ef79f0a4..70b0da8008 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -28,9 +28,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 2 #define wxMINOR_VERSION 9 -#define wxRELEASE_NUMBER 2 +#define wxRELEASE_NUMBER 3 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 2.9.2") +#define wxVERSION_STRING wxT("wxWidgets 2.9.3") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index bda4ef8572..9b00b7f20d 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -188,9 +188,12 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #endif /* __WXWINCE__ */ /* Almost all compiler have strdup(), but not quite all: CodeWarrior under - Mac and VC++ for Windows CE don't provide it; additionally, gcc under - Mac and OpenVMS do not have wcsdup: */ -#if defined(__VISUALC__) && __VISUALC__ >= 1400 + Mac and VC++ for Windows CE don't provide it. Another special case is gcc in + strict ANSI mode: normally it doesn't provide strdup() but MinGW does + provide it under MSVC-compatible name so test for it before checking + __WX_STRICT_ANSI_GCC__. */ +#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || \ + defined(__MINGW32__) #define wxCRT_StrdupA _strdup #elif !((defined(__MWERKS__) && defined(__WXMAC__)) || \ defined(__WXWINCE__) || \ diff --git a/interface/wx/bitmap.h b/interface/wx/bitmap.h index 94b8843668..cf62947f78 100644 --- a/interface/wx/bitmap.h +++ b/interface/wx/bitmap.h @@ -183,6 +183,17 @@ public: Note that all available wxBitmapHandlers for a given wxWidgets port are automatically loaded at startup so you won't need to use wxBitmap::AddHandler. + More on the difference between wxImage and wxBitmap: wxImage is just a + buffer of RGB bytes with an optional buffer for the alpha bytes. It is all + generic, platform independent and image file format independent code. It + includes generic code for scaling, resizing, clipping, and other manipulations + of the image data. OTOH, wxBitmap is intended to be a wrapper of whatever is + the native image format that is quickest/easiest to draw to a DC or to be the + target of the drawing operations performed on a wxMemoryDC. By splitting the + responsibilities between wxImage/wxBitmap like this then it's easier to use + generic code shared by all platforms and image types for generic operations and + platform specific code where performance or compatibility is needed. + @library{wxcore} @category{gdi} diff --git a/interface/wx/bookctrl.h b/interface/wx/bookctrl.h index 6fd8c596a0..450cd6d4eb 100644 --- a/interface/wx/bookctrl.h +++ b/interface/wx/bookctrl.h @@ -221,6 +221,10 @@ public: /** Adds a new page. + + The page must have the book control itself as the parent and must not + have been added to this control previously. + The call to this function may generate the page changing events. @param page diff --git a/interface/wx/calctrl.h b/interface/wx/calctrl.h index 799465bc89..e4f2cd8702 100644 --- a/interface/wx/calctrl.h +++ b/interface/wx/calctrl.h @@ -424,7 +424,9 @@ public: /** Sets the current date. - The @a date parameter must be valid. + The @a date parameter must be valid and in the currently valid range as + set by SetDateRange(), otherwise the current date is not changed and + the function returns @false. */ virtual bool SetDate(const wxDateTime& date); @@ -476,14 +478,12 @@ public: /** @name Date Range Functions - - The functions in this section are currently implemented in the generic - and MSW versions and do nothing in the native GTK implementation. */ //@{ /** - Restrict the dates shown by the control to the specified range. + Restrict the dates that can be selected in the control to the specified + range. If either date is set, the corresponding limit will be enforced and @true returned. If none are set, the existing restrictions are removed diff --git a/interface/wx/chartype.h b/interface/wx/chartype.h index 5f380cba21..f674710020 100644 --- a/interface/wx/chartype.h +++ b/interface/wx/chartype.h @@ -35,10 +35,10 @@ /** Compatibility macro which expands to wxT() in wxWidgets 2 only. - This macro can be used in the code which needs to compile with both - wxWidgets 2 and 3 versions in places where v2 API requires a Unicode string - (in Unicode build) and v3 API only accepts a standard narrow - string as in e.g. wxCmdLineEntryDesc structure objects initializers. + This macro can be used in code which needs to compile with both + wxWidgets 2 and 3 versions, in places where the wx2 API requires a Unicode string + (in Unicode build) but the wx3 API only accepts a standard narrow + string, as in e.g. wxCmdLineEntryDesc structure objects initializers. Example of use: @code @@ -50,18 +50,21 @@ }; @endcode - Without @c wxT_2 the code above wouldn't compile with wxWidgets 2, with @c - wxT instead of it, it wouldn't compile with wxWidgets 3. + Without @c wxT_2 the code above wouldn't compile with wxWidgets 2, but using @c + wxT instead, it wouldn't compile with wxWidgets 3. @see wxT() + @since 2.8.12, 2.9.2 + @header{wx/chartype.h} */ +#define wxT_2(string) /** - wxS is macro which can be used with character and string literals (in other words, - @c 'x' or @c "foo") to either convert them to wide characters or wide strings - in @c wchar_t-based (UTF-16) builds or keep them unchanged in @c char-based + wxS is a macro which can be used with character and string literals (in other words, + @c 'x' or @c "foo") to convert them either to wide characters or wide strings + in @c wchar_t-based (UTF-16) builds, or to keep them unchanged in @c char-based (UTF-8) builds. Basically this macro produces characters or strings of type wxStringCharType. diff --git a/interface/wx/containr.h b/interface/wx/containr.h new file mode 100644 index 0000000000..a46f3235f6 --- /dev/null +++ b/interface/wx/containr.h @@ -0,0 +1,68 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/containr.h +// Purpose: documentation of wxNavigationEnabled<> +// Author: Vadim Zeitlin +// Created: 2011-07-23 +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +/** + A helper class implementing TAB navigation among the window children. + + This class contains the functionality needed to correctly implement TAB + navigation among the children of the window. Its exact contents is not + important and is intentionally not documented as the only way to use this + class is to inherit from it instead of inheriting from the usual base class + directly. For example, if some class needs to inherit from wxControl but + contains multiple sub-windows and needs to support keyboard navigation, it + is enough to declare it in the following way: + @code + class MyControlWithSubChildren : + public wxNavigationEnabled + { + public: + // Default constructor is implemented in the same way as always. + MyControlWithSubChildren() { } + + // Non-default constructor can't use wxControl ctor any more as + // wxControl is not its direct base class, but it can use Create(). + MyControlWithSubChildren(wxWindow *parent, wxWindowID winid) + { + wxControl::Create(parent, winid); + + // More creation code... + } + + // Everything else as usual ... + }; + @endcode + + @library{wxcore} + + @since 2.9.3 + */ +template +class wxNavigationEnabled : public W +{ +public: + /// The name of the real base window class that this class derives from. + typedef W BaseWindowClass; + + /** + Default constructor. + + This class provides only the default constructor as it's not possible, + in general, to provide all the constructors of the real base class + BaseWindowClass. + + This is however not usually a problem for wxWindow-derived classes as, + by convention, they always define a Create() method such that calling + it on an object initialized using the default constructor is equivalent + to using a non-default constructor directly. So the classes inheriting + from wxNavigationEnabled should simply call W::Create() in their + constructors. + */ + wxNavigationEnabled(); +}; diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h index aebeef76e3..8779ef96f9 100644 --- a/interface/wx/dataview.h +++ b/interface/wx/dataview.h @@ -1095,6 +1095,14 @@ public: */ virtual void SetSelections(const wxDataViewItemArray& sel); + /** + Programmatically starts editing the given item on the given column. + Currently not implemented on wxOSX Carbon. + @since 2.9.2 + */ + + virtual void StartEditor(const wxDataViewItem & item, unsigned int column); + /** Unselect the given item. */ @@ -1105,6 +1113,26 @@ public: This method only has effect if multiple selections are allowed. */ virtual void UnselectAll(); + + /** + Sets the row height. + + This function can only be used when all rows have the same height, i.e. + when wxDV_VARIABLE_LINE_HEIGHT flag is not used. + + Currently this is implemented in the generic and native GTK versions + only and nothing is done (and @false returned) when using OS X port. + + Also notice that this method can only be used to increase the row + height compared with the default one (as determined by the return value + of wxDataViewRenderer::GetSize()), if it is set to a too small value + then the minimum required by the renderers will be used. + + @return @true if the line height was changed or @false otherwise. + + @since 2.9.2 + */ + virtual bool SetRowHeight(int rowHeight); }; @@ -2687,6 +2715,26 @@ public: */ const wxVariant& GetValue() const; + /** + Can be used to determine whether the new value is going to be accepted + in wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE handler. + + Returns @true if editing the item was cancelled or if the user tried to + enter an invalid value (refused by wxDataViewRenderer::Validate()). If + this method returns @false, it means that the value in the model is + about to be changed to the new one. + + Notice that wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE event handler can + call wxNotifyEvent::Veto() to prevent this from happening. + + Currently support for setting this field and for vetoing the change is + only available in the generic version of wxDataViewCtrl, i.e. under MSW + but not GTK nor OS X. + + @since 2.9.3 + */ + bool IsEditCancelled() const; + /** Sets the column index associated with this event. */ diff --git a/interface/wx/datectrl.h b/interface/wx/datectrl.h index 3236f5a5f0..87d4598db9 100644 --- a/interface/wx/datectrl.h +++ b/interface/wx/datectrl.h @@ -105,6 +105,11 @@ public: range is set (or only one of the bounds is set), @a dt1 and/or @a dt2 are set to be invalid. + Notice that when using a native MSW implementation of this control the + lower range is always set, even if SetRange() hadn't been called + explicitly, as the native control only supports dates later than year + 1601. + @param dt1 Pointer to the object which receives the lower range limit or becomes invalid if it is not set. May be @NULL if the caller is not diff --git a/interface/wx/dcgraph.h b/interface/wx/dcgraph.h index 345d015acf..5d086485c1 100644 --- a/interface/wx/dcgraph.h +++ b/interface/wx/dcgraph.h @@ -35,9 +35,20 @@ public: */ wxGCDC( const wxPrinterDC& dc ); + /** + Constructs a wxGCDC from a wxEnhMetaFileDC. + + This constructor is only available in wxMSW port and when @c + wxUSE_ENH_METAFILE build option is enabled, i.e. when wxEnhMetaFileDC + class itself is available. + + @since 2.9.3 + */ + wxGCDC( const wxEnhMetaFileDC& dc ); + /** Retrieves associated wxGraphicsContext */ - wxGraphicsContext* GetGraphicsContext(); + wxGraphicsContext* GetGraphicsContext() const; }; diff --git a/interface/wx/docview.h b/interface/wx/docview.h index 20ad3423a8..5d5f2662dc 100644 --- a/interface/wx/docview.h +++ b/interface/wx/docview.h @@ -176,6 +176,15 @@ public: */ long GetFlags() const; + /** + Returns a reference to the wxPageSetupDialogData associated with the + printing operations of this document manager. + */ + //@{ + wxPageSetupDialogData& GetPageSetupDialogData(); + const wxPageSetupDialogData& GetPageSetupDialogData() const; + //@} + /** Returns the run-time class information that allows view instances to be constructed dynamically, as passed to the document template @@ -738,6 +747,38 @@ public: */ void SetMaxDocsOpen(int n); + +protected: + /** + Called when a file selected from the MRU list doesn't exist any more. + + The default behaviour is to remove the file from the MRU (most recently + used) files list and the corresponding menu and notify the user about + it but this method can be overridden to customize it. + + For example, an application may want to just give an error about the + missing file @a filename but not remove it from the file history. Or it + could ask the user whether the file should be kept or removed. + + Notice that this method is called only if the file selected by user + from the MRU files in the menu doesn't exist, but not if opening it + failed for any other reason because in the latter case the default + behaviour of removing the file from the MRU list is inappropriate. + If you still want to do it, you would need to do it by calling + RemoveFileFromHistory() explicitly in the part of the file opening code + that may fail. + + @since 2.9.3 + + @param n + The index of the file in the MRU list, it can be passed to + RemoveFileFromHistory() to remove this file from the list. + @param filename + The full name of the file. + */ + virtual void OnMRUFileNotExist(unsigned n, const wxString& filename); + + /** The currently active view. */ @@ -759,19 +800,16 @@ public: */ wxFileHistory* m_fileHistory; - /** - Stores the flags passed to the constructor. - */ - long m_flags; - /** The directory last selected by the user when opening a file. */ - wxFileHistory* m_fileHistory; + wxString m_lastDirectory; /** Stores the maximum number of documents that can be opened before - existing documents are closed. By default, this is 10,000. + existing documents are closed. + + By default, this is @c INT_MAX i.e. practically unlimited. */ int m_maxDocsOpen; }; @@ -1121,9 +1159,25 @@ public: @class wxDocument The document class can be used to model an application's file-based data. + It is part of the document/view framework supported by wxWidgets, and cooperates with the wxView, wxDocTemplate and wxDocManager classes. + A normal document is the one created without parent document and is + associated with a disk file. Since version 2.9.2 wxWidgets also supports a + special kind of documents called child documents which are virtual + in the sense that they do not correspond to a file but rather to a part of + their parent document. Because of this, the child documents can't be + created directly by user but can only be created by the parent document + (usually when it's being created itself). They also can't be independently + saved. A child document has its own view with the corresponding window. + This view can be closed by user but, importantly, is also automatically + closed when its parent document is closed. Thus, child documents may be + convenient for creating additional windows which need to be closed when the + main document is. The docview sample demonstrates this use of child + documents by creating a child document containing the information about the + parameters of the image opened in the main document. + @library{wxcore} @category{docview} @@ -1135,8 +1189,14 @@ public: /** Constructor. Define your own default constructor to initialize application-specific data. + + @param parent + Specifying a non-@c NULL parent document here makes this document a + special child document, see their description in the class + documentation. Notice that this parameter exists but is ignored in + wxWidgets versions prior to 2.9.1. */ - wxDocument(wxDocument* parent = 0); + wxDocument(wxDocument* parent = NULL); /** Destructor. Removes itself from the document manager. @@ -1269,6 +1329,18 @@ public: const wxList& GetViews() const; //@} + /** + Returns true if this document is a child document corresponding to a + part of the parent document and not a disk file as usual. + + This method can be used to check whether file-related operations make + sense for this document as they only apply to top-level documents and + not child ones. + + @since 2.9.2 + */ + bool IsChildDocument() const; + /** Returns @true if the document has been modified since the last save, @false otherwise. You may need to override this if your document view diff --git a/interface/wx/event.h b/interface/wx/event.h index a3d0022978..06939b2889 100644 --- a/interface/wx/event.h +++ b/interface/wx/event.h @@ -3023,27 +3023,29 @@ public: /** @class wxThreadEvent - This class adds some simple functionalities to wxCommandEvent conceived - for inter-threads communications. + This class adds some simple functionality to wxEvent to facilitate + inter-thread communication. - This event is not natively emitted by any control/class: this is just - an helper class for the user. + This event is not natively emitted by any control/class: it is just + a helper class for the user. Its most important feature is the GetEventCategory() implementation which - allows thread events to @b NOT be processed by wxEventLoopBase::YieldFor calls + allows thread events @b NOT to be processed by wxEventLoopBase::YieldFor calls (unless the @c wxEVT_CATEGORY_THREAD is specified - which is never in wx code). @library{wxcore} @category{events,threading} @see @ref overview_thread, wxEventLoopBase::YieldFor + + @since 2.9.0 */ -class wxThreadEvent : public wxCommandEvent +class wxThreadEvent : public wxEvent { public: /** Constructor. */ - wxThreadEvent(wxEventType eventType = wxEVT_COMMAND_THREAD, int id = wxID_ANY); + wxThreadEvent(wxEventType eventType = wxEVT_THREAD, int id = wxID_ANY); /** Clones this event making sure that all internal members which use @@ -3090,6 +3092,37 @@ public: */ template T GetPayload() const; + + /** + Returns extra information integer value. + */ + long GetExtraLong() const; + + /** + Returns stored integer value. + */ + int GetInt() const; + + /** + Returns stored string value. + */ + wxString GetString() const; + + + /** + Sets the extra information value. + */ + void SetExtraLong(long extraLong); + + /** + Sets the integer value. + */ + void SetInt(int intCommand); + + /** + Sets the string value. + */ + void SetString(const wxString& string); }; @@ -3464,8 +3497,8 @@ public: This event is mainly used by wxWidgets implementations. A wxNavigationKeyEvent handler is automatically provided by wxWidgets - when you make a class into a control container with the macro - WX_DECLARE_CONTROL_CONTAINER. + when you enable keyboard navigation inside a window by inheriting it from + wxNavigationEnabled<>. @beginEventTable{wxNavigationKeyEvent} @event{EVT_NAVIGATION_KEY(func)} @@ -3769,8 +3802,6 @@ public: Notice that the event is not triggered when the application is iconized (minimized) or restored under wxMSW. - Currently only wxMSW, wxGTK and wxOS2 generate such events. - @onlyfor{wxmsw,wxgtk,wxos2} @beginEventTable{wxShowEvent} @@ -4246,7 +4277,7 @@ wxEventType wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED; wxEventType wxEVT_COMMAND_TOOL_ENTER; wxEventType wxEVT_COMMAND_COMBOBOX_DROPDOWN; wxEventType wxEVT_COMMAND_COMBOBOX_CLOSEUP; -wxEventType wxEVT_COMMAND_THREAD; +wxEventType wxEVT_THREAD; wxEventType wxEVT_LEFT_DOWN; wxEventType wxEVT_LEFT_UP; wxEventType wxEVT_MIDDLE_DOWN; diff --git a/interface/wx/filename.h b/interface/wx/filename.h index 07c94f0997..7bbd0cd527 100644 --- a/interface/wx/filename.h +++ b/interface/wx/filename.h @@ -611,6 +611,10 @@ public: Don't include the trailing separator in the returned string. This is the default (the value of this flag is 0) and exists only for symmetry with wxPATH_GET_SEPARATOR. + + @note If the path is a toplevel one (e.g. @c "/" on Unix or @c "C:\" on + Windows), then the returned path will contain trailing separator + even with @c wxPATH_NO_SEPARATOR. */ wxString GetPath(int flags = wxPATH_GET_VOLUME, wxPathFormat format = wxPATH_NATIVE) const; diff --git a/interface/wx/fswatcher.h b/interface/wx/fswatcher.h index 37167c7d75..dffeabd023 100644 --- a/interface/wx/fswatcher.h +++ b/interface/wx/fswatcher.h @@ -24,54 +24,15 @@ For the full list of change types that are reported see wxFSWFlags. - There are three different ways to use this class: - - - You may derive a new class from wxFileSystemWatcher and override the - wxFileSystemWatcher::OnChange member to perform the required action - when file system change occurrs. Additionally you may also want to - override wxFileSystemWatcher::OnWarning and - wxFileSystemWatcher::OnError to be notified when an error condition - arises. - - You may use a derived class and the @c EVT_FSWATCHER macro or - wxEvtHandler::Connect to redirect events to an event handler defined in - the derived class. If the default constructor is used, the file system - watcher object will be its own owner object, since it is derived from - wxEvtHandler. - - You may redirect the notifications of file system changes as well as of - error conditions to any wxEvtHandler derived object by using - wxFileSystemWatcher::SetOwner. - Then use the @c EVT_FSWATCHER macro or wxEvtHandler::Connect to send the - events to the event handler which will receive wxFileSystemWatcherEvent. - - For example: - - @code - class MyWatcher : public wxFileSystemWatcher - { - protected: - void OnChange(int changeType, const wxFileName& path, const wxFileName& newPath) - { - // do whatever you like with the event - } - }; - - class MyApp : public wxApp - { - public: - ... - void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) - { - // you have to construct the watcher here, because it needs an active loop - m_watcher = new MyWatcher(); - - // please notify me when a new log file is created - m_watcher->Add(wxFileName::DirName("/var/log", wxFSW_EVENT_CREATE); - } - - private: - MyWatcher* m_watcher; - }; - @endcode + This class notifies the application about the file system changes by + sending events of wxFileSystemWatcherEvent class. By default these events + are sent to the wxFileSystemWatcher object itself so you can derive from it + and use the event table @c EVT_FSWATCHER macro to handle these events in a + derived class method. Alternatively, you can use + wxFileSystemWatcher::SetOwner() to send the events to another object. Or + you could use wxEvtHandler::Connect() with @c wxEVT_FSWATCHER to handle + these events in any other object. See the fswatcher sample for an example + of the latter approach. @library{wxbase} @category{file} @@ -82,9 +43,7 @@ class wxFileSystemWatcher: public wxEvtHandler { public: /** - Default constructor. If you create file system watcher using it you have - to either call SetOwner() and connect an event handler or override - OnChange(), OnWarning() and OnError(). + Default constructor. */ wxFileSystemWatcher(); @@ -95,24 +54,34 @@ public: virtual ~wxFileSystemWatcher(); /** - Adds @a path to currently watched files. Optionally a filter can be - specified to receive only events of particular type. + Adds @a path to currently watched files. - Any events concerning this particular path will be sent either to - connected handler or passed to OnChange(), OnWarning() or OnError(). + The @a path argument can currently only be a directory and any changes + to this directory itself or its immediate children will generate the + events. Use AddTree() to monitor the directory recursively. - @note When adding a directory, immediate children will be watched - as well. + @param path + The name of the path to watch. + @param events + An optional filter to receive only events of particular types. */ virtual bool Add(const wxFileName& path, int events = wxFSW_EVENT_ALL); /** This is the same as Add(), but recursively adds every file/directory in - the tree rooted at @a path. Additionally a file mask can be specified to - include only files matching that particular mask. + the tree rooted at @a path. + + Additionally a file mask can be specified to include only files + matching that particular mask. + + This method is implemented efficiently under MSW but shouldn't be used + for the directories with a lot of children (such as e.g. the root + directory) under the other platforms as it calls Add() there for each + subdirectory potentially creating a lot of watches and taking a long + time to execute. */ virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, - const wxString& filter = wxEmptyString) = 0; + const wxString& filter = wxEmptyString); /** Removes @a path from the list of watched paths. @@ -147,9 +116,8 @@ public: /** Associates the file system watcher with the given @a handler object. - Basically this means that all events will be passed to this handler - object unless you have change the default behaviour by overriding - OnChange(), OnWarning() or OnError(). + All the events generated by this object will be passed to the specified + owner. */ void SetOwner(wxEvtHandler* handler); }; diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index 5239de61f7..7425c4a78a 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -212,6 +212,23 @@ enum wxAntialiasMode wxANTIALIAS_DEFAULT, }; +/** + Interpolation quality used by wxGraphicsContext::SetInterpolationQuality(). + */ +enum wxInterpolationQuality +{ + /** default interpolation, based on type of context, in general medium quality */ + wxINTERPOLATION_DEFAULT, + /** no interpolation */ + wxINTERPOLATION_NONE, + /** fast interpolation, suited for interactivity */ + wxINTERPOLATION_FAST, + /** better quality */ + wxINTERPOLATION_GOOD, + /** best quality, not suited for interactivity */ + wxINTERPOLATION_BEST +}; + /** Compositing is done using Porter-Duff compositions (see http://keithp.com/~keithp/porterduff/p253-porter.pdf) with @@ -224,6 +241,14 @@ enum wxAntialiasMode */ enum wxCompositionMode { + /** + Indicates invalid or unsupported composition mode. + + This value can't be passed to wxGraphicsContext::SetCompositionMode(). + + @since 2.9.2 + */ + wxCOMPOSITION_INVALID = -1, wxCOMPOSITION_CLEAR, /**< @e R = 0 */ wxCOMPOSITION_SOURCE, /**< @e R = S */ wxCOMPOSITION_OVER, /**< @e R = @e S + @e D*(1 - @e Sa) */ @@ -237,7 +262,7 @@ enum wxCompositionMode wxCOMPOSITION_DEST_OUT, /**< @e R = @e D*(1 - @e Sa) */ wxCOMPOSITION_DEST_ATOP, /**< @e R = @e S*(1 - @e Da) + @e D*@e Sa */ wxCOMPOSITION_XOR, /**< @e R = @e S*(1 - @e Da) + @e D*(1 - @e Sa) */ - wxCOMPOSITION_ADD, /**< @e R = @e S + @e D */ + wxCOMPOSITION_ADD /**< @e R = @e S + @e D */ }; @@ -317,6 +342,16 @@ public: */ static wxGraphicsContext* Create(const wxPrinterDC& dc); + /** + Creates a wxGraphicsContext from a wxEnhMetaFileDC. + + This function, as wxEnhMetaFileDC class itself, is only available only + under MSW. + + @see wxGraphicsRenderer::CreateContext() + */ + static wxGraphicsContext* Create(const wxEnhMetaFileDC& dc); + /** Clips drawings to the specified region. */ @@ -658,6 +693,16 @@ public: */ virtual wxAntialiasMode GetAntialiasMode() const ; + /** + Sets the interpolation quality, returns true if it supported + */ + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0; + + /** + Returns the current interpolation quality + */ + virtual wxInterpolationQuality GetInterpolationQuality() const; + /** Sets the compositing operator, returns true if it supported */ @@ -827,6 +872,14 @@ public: */ virtual wxGraphicsContext* CreateContext(const wxPrinterDC& dc) = 0 ; + /** + Creates a wxGraphicsContext from a wxEnhMetaFileDC. + + This function, as wxEnhMetaFileDC class itself, is only available only + under MSW. + */ + virtual wxGraphicsContext* CreateContext(const wxEnhMetaFileDC& dc) = 0; + /** Creates a native brush from a wxBrush. */ diff --git a/interface/wx/image.h b/interface/wx/image.h index 34808c5c15..cdeba80f58 100644 --- a/interface/wx/image.h +++ b/interface/wx/image.h @@ -314,6 +314,17 @@ const unsigned char wxIMAGE_ALPHA_OPAQUE = 0xff; the wxBitmap::wxBitmap(wxImage,int depth) constructor. This bitmap can then be drawn in a device context, using wxDC::DrawBitmap. + More on the difference between wxImage and wxBitmap: wxImage is just a + buffer of RGB bytes with an optional buffer for the alpha bytes. It is all + generic, platform independent and image file format independent code. It + includes generic code for scaling, resizing, clipping, and other manipulations + of the image data. OTOH, wxBitmap is intended to be a wrapper of whatever is + the native image format that is quickest/easiest to draw to a DC or to be the + target of the drawing operations performed on a wxMemoryDC. By splitting the + responsibilities between wxImage/wxBitmap like this then it's easier to use + generic code shared by all platforms and image types for generic operations and + platform specific code where performance or compatibility is needed. + One colour value of the image may be used as a mask colour which will lead to the automatic creation of a wxMask object associated to the bitmap object. diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h index 11a852a3d9..90af91932b 100644 --- a/interface/wx/listctrl.h +++ b/interface/wx/listctrl.h @@ -953,7 +953,7 @@ public: using the specified @a fnSortCallBack function. This function must have the following prototype: @code - int wxCALLBACK wxListCompareFunction(long item1, long item2, wxIntPtr sortData) + int wxCALLBACK wxListCompareFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData) @endcode It is called each time when the two items must be compared and should return 0 diff --git a/interface/wx/object.h b/interface/wx/object.h index 90435866f2..dbe8a5bfba 100644 --- a/interface/wx/object.h +++ b/interface/wx/object.h @@ -708,7 +708,9 @@ public: /** Used inside a class declaration to declare that the class should be made known to the class hierarchy, but objects of this class cannot be created - dynamically. The same as wxDECLARE_DYNAMIC_CLASS(). + dynamically. + + The same as wxDECLARE_ABSTRACT_CLASS(). @header{wx/object.h} */ diff --git a/interface/wx/print.h b/interface/wx/print.h index 8eb1e3764b..4713bf32eb 100644 --- a/interface/wx/print.h +++ b/interface/wx/print.h @@ -195,21 +195,44 @@ public: virtual void CreateControlBar(); /** - Creates the preview canvas and control bar. + Initializes the frame elements and prepares for showing it. - By default also disables the other existing top level windows to - prepare for showing the preview frame modally. Since wxWidgets 2.9.2 - this can be changed by specifying either wxPreviewFrame_WindowModal -- - to disable just the parent window -- or wxPreviewFrame_NonModal -- to - not disable any windows at all -- as @a kind parameter. + Calling this method is equivalent to calling InitializeWithModality() + with wxPreviewFrame_AppModal argument, please see its documentation for + more details. - This function must be called by the application prior to showing the frame. + Please notice that this function is virtual mostly for backwards + compatibility only, there is no real need to override it as it's never + called by wxWidgets itself. + */ + virtual void Initialize(); + + /** + Initializes the frame elements and prepares for showing it with the + given modality kind. + + This method creates the frame elements by calling CreateCanvas() and + CreateControlBar() methods (which may be overridden to customize them) + and prepares to show the frame according to the value of @a kind + parameter: + - If it is wxPreviewFrame_AppModal, all the other application + windows will be disabled when this frame is shown. This is the same + behaviour as that of simple Initialize(). + - If it is wxPreviewFrame_WindowModal, only the parent window of + the preview frame will be disabled when it is shown. + - And if it is wxPreviewFrame_NonModal, no windows at all will be + disabled while the preview is shown. + + Notice that this function (or Initialize()) must be called by the + application prior to showing the frame but you still must call @c + Show(true) to actually show it afterwards. @param kind - The modality kind of preview frame. @since 2.9.2 + The modality kind of preview frame. + + @since 2.9.2 */ - virtual void Initialize(wxPreviewFrameModalityKind kind - = wxPreviewFrame_AppModal); + virtual void InitializeWithModality(wxPreviewFrameModalityKind kind); /** Enables any disabled frames in the application, and deletes the print preview diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h index 27bd0630fa..6c2a6b2707 100644 --- a/interface/wx/richtext/richtextbuffer.h +++ b/interface/wx/richtext/richtextbuffer.h @@ -1,15 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtext/richtextbuffer.h -// Purpose: interface of wxRichTextBuffer -// Author: wxWidgets team +// Name: wx/richtext/richtextbuffer.h +// Purpose: Buffer for wxRichTextCtrl +// Author: Julian Smart +// Modified by: +// Created: 2005-09-30 // RCS-ID: $Id$ +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +/** + The line break character that can be embedded in content. + */ +extern WXDLLIMPEXP_RICHTEXT const wxChar wxRichTextLineBreakChar; -/*! - * File types in wxRichText context. +/** + File types in wxRichText context. */ enum wxRichTextFileType { @@ -21,8 +28,8 @@ enum wxRichTextFileType wxRICHTEXT_TYPE_PDF }; -/*! - * Flags determining the available space, passed to Layout +/** + Flags determining the available space, passed to Layout. */ #define wxRICHTEXT_FIXED_WIDTH 0x01 @@ -34,38 +41,47 @@ enum wxRichTextFileType // the rect passed to Layout. #define wxRICHTEXT_LAYOUT_SPECIFIED_RECT 0x10 -/*! - * Flags to pass to Draw +/** + Flags to pass to Draw */ // Ignore paragraph cache optimization, e.g. for printing purposes // where one line may be drawn higher (on the next page) compared // with the previous line #define wxRICHTEXT_DRAW_IGNORE_CACHE 0x01 +#define wxRICHTEXT_DRAW_SELECTED 0x02 +#define wxRICHTEXT_DRAW_PRINT 0x04 +#define wxRICHTEXT_DRAW_GUIDELINES 0x08 -/*! - * Flags returned from hit-testing +/** + Flags returned from hit-testing, or passed to hit-test function. */ enum wxRichTextHitTestFlags { - /// The point was not on this object + // The point was not on this object wxRICHTEXT_HITTEST_NONE = 0x01, - /// The point was before the position returned from HitTest + // The point was before the position returned from HitTest wxRICHTEXT_HITTEST_BEFORE = 0x02, - /// The point was after the position returned from HitTest + // The point was after the position returned from HitTest wxRICHTEXT_HITTEST_AFTER = 0x04, - /// The point was on the position returned from HitTest + // The point was on the position returned from HitTest wxRICHTEXT_HITTEST_ON = 0x08, - /// The point was on space outside content - wxRICHTEXT_HITTEST_OUTSIDE = 0x10 + // The point was on space outside content + wxRICHTEXT_HITTEST_OUTSIDE = 0x10, + + // Only do hit-testing at the current level (don't traverse into top-level objects) + wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS = 0x20, + + // Ignore floating objects + wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS = 0x40 }; -/*! - * Flags for GetRangeSize +/** + Flags for GetRangeSize. */ #define wxRICHTEXT_FORMATTED 0x01 @@ -73,8 +89,8 @@ enum wxRichTextHitTestFlags #define wxRICHTEXT_CACHE_SIZE 0x04 #define wxRICHTEXT_HEIGHT_ONLY 0x08 -/*! - * Flags for SetStyle/SetListStyle +/** + Flags for SetStyle/SetListStyle. */ #define wxRICHTEXT_SETSTYLE_NONE 0x00 @@ -110,8 +126,8 @@ enum wxRichTextHitTestFlags // Removes the given style instead of applying it #define wxRICHTEXT_SETSTYLE_REMOVE 0x80 -/*! - * Flags for text insertion +/** + Flags for object insertion. */ #define wxRICHTEXT_INSERT_NONE 0x00 @@ -123,736 +139,2611 @@ enum wxRichTextHitTestFlags // flag to InsertFragment and DeleteRange to indicate the appropriate mode. #define wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE 0x10000000 -/*! - * Default superscript/subscript font multiplication factor +/** + Default superscript/subscript font multiplication factor. */ #define wxSCRIPT_MUL_FACTOR 1.5 +/** + The type for wxTextAttrDimension flags. + */ +typedef unsigned short wxTextAttrDimensionFlags; /** - @class wxRichTextBuffer + Miscellaneous text box flags + */ +enum wxTextBoxAttrFlags +{ + wxTEXT_BOX_ATTR_FLOAT = 0x00000001, + wxTEXT_BOX_ATTR_CLEAR = 0x00000002, + wxTEXT_BOX_ATTR_COLLAPSE_BORDERS = 0x00000004, + wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT = 0x00000008 +}; - This class represents the whole buffer associated with a wxRichTextCtrl. +/** + Whether a value is present, used in dimension flags. + */ +enum wxTextAttrValueFlags +{ + wxTEXT_ATTR_VALUE_VALID = 0x1000, + wxTEXT_ATTR_VALUE_VALID_MASK = 0x1000 +}; + +/** + Units, included in the dimension value. + */ +enum wxTextAttrUnits +{ + wxTEXT_ATTR_UNITS_TENTHS_MM = 0x0001, + wxTEXT_ATTR_UNITS_PIXELS = 0x0002, + wxTEXT_ATTR_UNITS_PERCENTAGE = 0x0004, + wxTEXT_ATTR_UNITS_POINTS = 0x0008, + + wxTEXT_ATTR_UNITS_MASK = 0x000F +}; + +/** + Position alternatives, included in the dimension flags. + */ +enum wxTextBoxAttrPosition +{ + wxTEXT_BOX_ATTR_POSITION_STATIC = 0x0000, // Default is static, i.e. as per normal layout + wxTEXT_BOX_ATTR_POSITION_RELATIVE = 0x0010, // Relative to the relevant edge + wxTEXT_BOX_ATTR_POSITION_ABSOLUTE = 0x0020, + + wxTEXT_BOX_ATTR_POSITION_MASK = 0x00F0 +}; + +/** + @class wxTextAttrDimension + + A class representing a rich text dimension, including units and position. @library{wxrichtext} @category{richtext} - @see wxTextAttr, wxRichTextCtrl + @see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimensions */ -class wxRichTextBuffer : public wxRichTextParagraphLayoutBox + +class WXDLLIMPEXP_RICHTEXT wxTextAttrDimension { public: /** Default constructor. */ - wxRichTextBuffer(); + wxTextAttrDimension() { Reset(); } + /** + Constructor taking value and units flag. + */ + wxTextAttrDimension(int value, wxTextAttrUnits units = wxTEXT_ATTR_UNITS_TENTHS_MM) { m_value = value; m_flags = units|wxTEXT_ATTR_VALUE_VALID; } + + /** + Resets the dimension value and flags. + */ + void Reset() { m_value = 0; m_flags = 0; } + + /** + Partial equality test. + */ + bool EqPartial(const wxTextAttrDimension& dim) const; + + /** Apply the dimension, but not those identical to @a compareWith if present. + */ + bool Apply(const wxTextAttrDimension& dim, const wxTextAttrDimension* compareWith = NULL); + + /** Collects the attributes that are common to a range of content, building up a note of + which attributes are absent in some objects and which clash in some objects. + */ + void CollectCommonAttributes(const wxTextAttrDimension& attr, wxTextAttrDimension& clashingAttr, wxTextAttrDimension& absentAttr); + + /** + Equality operator. + */ + bool operator==(const wxTextAttrDimension& dim) const { return m_value == dim.m_value && m_flags == dim.m_flags; } + + /** + Returns the integer value of the dimension. + */ + int GetValue() const { return m_value; } + + /** + Returns the floating-pointing value of the dimension in mm. + + */ + float GetValueMM() const { return float(m_value) / 10.0; } + + /** + Sets the value of the dimension in mm. + */ + void SetValueMM(float value) { m_value = (int) ((value * 10.0) + 0.5); m_flags |= wxTEXT_ATTR_VALUE_VALID; } + + /** + Sets the integer value of the dimension. + */ + void SetValue(int value) { m_value = value; m_flags |= wxTEXT_ATTR_VALUE_VALID; } + + /** + Sets the integer value of the dimension, passing dimension flags. + */ + void SetValue(int value, wxTextAttrDimensionFlags flags) { SetValue(value); m_flags = flags; } + + /** + Sets the integer value and units. + */ + void SetValue(int value, wxTextAttrUnits units) { m_value = value; m_flags = units | wxTEXT_ATTR_VALUE_VALID; } + + /** + Sets the dimension. + */ + void SetValue(const wxTextAttrDimension& dim) { (*this) = dim; } + + /** + Gets the units of the dimension. + */ + wxTextAttrUnits GetUnits() const { return (wxTextAttrUnits) (m_flags & wxTEXT_ATTR_UNITS_MASK); } + + /** + Sets the units of the dimension. + */ + void SetUnits(wxTextAttrUnits units) { m_flags &= ~wxTEXT_ATTR_UNITS_MASK; m_flags |= units; } + + /** + Gets the position flags. + */ + wxTextBoxAttrPosition GetPosition() const { return (wxTextBoxAttrPosition) (m_flags & wxTEXT_BOX_ATTR_POSITION_MASK); } + + /** + Sets the position flags. + */ + void SetPosition(wxTextBoxAttrPosition pos) { m_flags &= ~wxTEXT_BOX_ATTR_POSITION_MASK; m_flags |= pos; } + + /** + Returns @true if the dimension is valid. + */ + bool IsValid() const { return (m_flags & wxTEXT_ATTR_VALUE_VALID) != 0; } + + /** + Sets the valid flag. + */ + void SetValid(bool b) { m_flags &= ~wxTEXT_ATTR_VALUE_VALID_MASK; m_flags |= (b ? wxTEXT_ATTR_VALUE_VALID : 0); } + + /** + Gets the dimension flags. + */ + wxTextAttrDimensionFlags GetFlags() const { return m_flags; } + + /** + Sets the dimension flags. + */ + void SetFlags(wxTextAttrDimensionFlags flags) { m_flags = flags; } + + int m_value; + wxTextAttrDimensionFlags m_flags; +}; + +/** + @class wxTextAttrDimensions + A class for left, right, top and bottom dimensions. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension +*/ + +class WXDLLIMPEXP_RICHTEXT wxTextAttrDimensions +{ +public: + /** + Default constructor. + */ + wxTextAttrDimensions() {} + + /** + Resets the value and flags for all dimensions. + */ + void Reset() { m_left.Reset(); m_top.Reset(); m_right.Reset(); m_bottom.Reset(); } + + /** + Equality operator. + */ + bool operator==(const wxTextAttrDimensions& dims) const { return m_left == dims.m_left && m_top == dims.m_top && m_right == dims.m_right && m_bottom == dims.m_bottom; } + + /** + Partial equality test. + + */ + bool EqPartial(const wxTextAttrDimensions& dims) const; + + /** + Apply border to 'this', but not if the same as @a compareWith. + + */ + bool Apply(const wxTextAttrDimensions& dims, const wxTextAttrDimensions* compareWith = NULL); + + /** + Collects the attributes that are common to a range of content, building up a note of + which attributes are absent in some objects and which clash in some objects. + + */ + void CollectCommonAttributes(const wxTextAttrDimensions& attr, wxTextAttrDimensions& clashingAttr, wxTextAttrDimensions& absentAttr); + + /** + Remove specified attributes from this object. + */ + bool RemoveStyle(const wxTextAttrDimensions& attr); + + /** + Gets the left dimension. + */ + const wxTextAttrDimension& GetLeft() const { return m_left; } + wxTextAttrDimension& GetLeft() { return m_left; } + + /** + Gets the right dimension. + + */ + const wxTextAttrDimension& GetRight() const { return m_right; } + wxTextAttrDimension& GetRight() { return m_right; } + + /** + Gets the top dimension. + + */ + const wxTextAttrDimension& GetTop() const { return m_top; } + wxTextAttrDimension& GetTop() { return m_top; } + + /** + Gets the bottom dimension. + + */ + const wxTextAttrDimension& GetBottom() const { return m_bottom; } + wxTextAttrDimension& GetBottom() { return m_bottom; } + + wxTextAttrDimension m_left; + wxTextAttrDimension m_top; + wxTextAttrDimension m_right; + wxTextAttrDimension m_bottom; +}; + +/** + @class wxTextAttrSize + A class for representing width and height. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension +*/ + +class WXDLLIMPEXP_RICHTEXT wxTextAttrSize +{ +public: + /** + Default constructor. + */ + wxTextAttrSize() {} + + /** + Resets the width and height dimensions. + */ + void Reset() { m_width.Reset(); m_height.Reset(); } + + /** + Equality operator. + */ + bool operator==(const wxTextAttrSize& size) const { return m_width == size.m_width && m_height == size.m_height ; } + + /** + Partial equality test. + */ + bool EqPartial(const wxTextAttrSize& dims) const; + + /** + Apply border to this object, but not if the same as @a compareWith. + */ + bool Apply(const wxTextAttrSize& dims, const wxTextAttrSize* compareWith = NULL); + + /** + Collects the attributes that are common to a range of content, building up a note of + which attributes are absent in some objects and which clash in some objects. + */ + void CollectCommonAttributes(const wxTextAttrSize& attr, wxTextAttrSize& clashingAttr, wxTextAttrSize& absentAttr); + + /** + Removes the specified attributes from this object. + */ + bool RemoveStyle(const wxTextAttrSize& attr); + + /** + Returns the width. + */ + wxTextAttrDimension& GetWidth() { return m_width; } + const wxTextAttrDimension& GetWidth() const { return m_width; } + + /** + Sets the width. + */ + void SetWidth(int value, wxTextAttrDimensionFlags flags) { m_width.SetValue(value, flags); } + /** + Sets the width. + */ + void SetWidth(int value, wxTextAttrUnits units) { m_width.SetValue(value, units); } + /** + Sets the width. + */ + void SetWidth(const wxTextAttrDimension& dim) { m_width.SetValue(dim); } + + /** + Gets the height. + */ + wxTextAttrDimension& GetHeight() { return m_height; } + const wxTextAttrDimension& GetHeight() const { return m_height; } + + /** + Sets the height. + */ + void SetHeight(int value, wxTextAttrDimensionFlags flags) { m_height.SetValue(value, flags); } + /** + Sets the height. + */ + void SetHeight(int value, wxTextAttrUnits units) { m_height.SetValue(value, units); } + /** + Sets the height. + */ + void SetHeight(const wxTextAttrDimension& dim) { m_height.SetValue(dim); } + + wxTextAttrDimension m_width; + wxTextAttrDimension m_height; +}; + +/** + @class wxTextAttrDimensionConverter + A class to make it easier to convert dimensions. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension +*/ + +class WXDLLIMPEXP_RICHTEXT wxTextAttrDimensionConverter +{ +public: + /** + Constructor. + */ + wxTextAttrDimensionConverter(wxDC& dc, double scale = 1.0, const wxSize& parentSize = wxDefaultSize); + /** + Constructor. + */ + wxTextAttrDimensionConverter(int ppi, double scale = 1.0, const wxSize& parentSize = wxDefaultSize); + + /** + Gets the pixel size for the given dimension. + */ + int GetPixels(const wxTextAttrDimension& dim, int direction = wxHORIZONTAL) const; + /** + Gets the mm size for the given dimension. + */ + int GetTenthsMM(const wxTextAttrDimension& dim) const; + + /** + Converts tenths of a mm to pixels. + */ + int ConvertTenthsMMToPixels(int units) const; + /** + Converts pixels to tenths of a mm. + */ + int ConvertPixelsToTenthsMM(int pixels) const; + + int m_ppi; + double m_scale; + wxSize m_parentSize; +}; + +/** + Border styles, used with wxTextAttrBorder. + */ +enum wxTextAttrBorderStyle +{ + wxTEXT_BOX_ATTR_BORDER_NONE = 0, + wxTEXT_BOX_ATTR_BORDER_SOLID = 1, + wxTEXT_BOX_ATTR_BORDER_DOTTED = 2, + wxTEXT_BOX_ATTR_BORDER_DASHED = 3, + wxTEXT_BOX_ATTR_BORDER_DOUBLE = 4, + wxTEXT_BOX_ATTR_BORDER_GROOVE = 5, + wxTEXT_BOX_ATTR_BORDER_RIDGE = 6, + wxTEXT_BOX_ATTR_BORDER_INSET = 7, + wxTEXT_BOX_ATTR_BORDER_OUTSET = 8 +}; + +/** + Border style presence flags, used with wxTextAttrBorder. + */ +enum wxTextAttrBorderFlags +{ + wxTEXT_BOX_ATTR_BORDER_STYLE = 0x0001, + wxTEXT_BOX_ATTR_BORDER_COLOUR = 0x0002 +}; + +/** + Border width symbols for qualitative widths, used with wxTextAttrBorder. + */ +enum wxTextAttrBorderWidth +{ + wxTEXT_BOX_ATTR_BORDER_THIN = -1, + wxTEXT_BOX_ATTR_BORDER_MEDIUM = -2, + wxTEXT_BOX_ATTR_BORDER_THICK = -3 +}; + +/** + Float styles. + */ +enum wxTextBoxAttrFloatStyle +{ + wxTEXT_BOX_ATTR_FLOAT_NONE = 0, + wxTEXT_BOX_ATTR_FLOAT_LEFT = 1, + wxTEXT_BOX_ATTR_FLOAT_RIGHT = 2 +}; + +/** + Clear styles. + */ +enum wxTextBoxAttrClearStyle +{ + wxTEXT_BOX_ATTR_CLEAR_NONE = 0, + wxTEXT_BOX_ATTR_CLEAR_LEFT = 1, + wxTEXT_BOX_ATTR_CLEAR_RIGHT = 2, + wxTEXT_BOX_ATTR_CLEAR_BOTH = 3 +}; + +/** + Collapse mode styles. TODO: can they be switched on per side? + */ +enum wxTextBoxAttrCollapseMode +{ + wxTEXT_BOX_ATTR_COLLAPSE_NONE = 0, + wxTEXT_BOX_ATTR_COLLAPSE_FULL = 1 +}; + +/** + Vertical alignment values. + */ +enum wxTextBoxAttrVerticalAlignment +{ + wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_NONE = 0, + wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP = 1, + wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_CENTRE = 2, + wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_BOTTOM = 3 +}; + +/** + @class wxTextAttrBorder + A class representing a rich text object border. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextAttr, wxRichTextCtrl, wxRichTextAttrBorders +*/ + +class WXDLLIMPEXP_RICHTEXT wxTextAttrBorder +{ +public: + /** + Default constructor. + */ + wxTextAttrBorder() { Reset(); } + + /** + Equality operator. + */ + bool operator==(const wxTextAttrBorder& border) const + { + return m_flags == border.m_flags && m_borderStyle == border.m_borderStyle && + m_borderColour == border.m_borderColour && m_borderWidth == border.m_borderWidth; + } + + /** + Resets the border style, colour, width and flags. + */ + void Reset() { m_borderStyle = 0; m_borderColour = 0; m_flags = 0; m_borderWidth.Reset(); } + + /** + Partial equality test. + */ + bool EqPartial(const wxTextAttrBorder& border) const; + + /** + Applies the border to this object, but not if the same as @a compareWith. + + */ + bool Apply(const wxTextAttrBorder& border, const wxTextAttrBorder* compareWith = NULL); + + /** + Removes the specified attributes from this object. + */ + bool RemoveStyle(const wxTextAttrBorder& attr); + + /** + Collects the attributes that are common to a range of content, building up a note of + which attributes are absent in some objects and which clash in some objects. + */ + void CollectCommonAttributes(const wxTextAttrBorder& attr, wxTextAttrBorder& clashingAttr, wxTextAttrBorder& absentAttr); + + /** + Sets the border style. + */ + void SetStyle(int style) { m_borderStyle = style; m_flags |= wxTEXT_BOX_ATTR_BORDER_STYLE; } + + /** + Gets the border style. + + */ + int GetStyle() const { return m_borderStyle; } + + /** + Sets the border colour. + */ + void SetColour(unsigned long colour) { m_borderColour = colour; m_flags |= wxTEXT_BOX_ATTR_BORDER_COLOUR; } + + /** + Sets the border colour. + */ + void SetColour(const wxColour& colour) { m_borderColour = colour.GetRGB(); m_flags |= wxTEXT_BOX_ATTR_BORDER_COLOUR; } + + /** + Gets the colour as a long. + */ + unsigned long GetColourLong() const { return m_borderColour; } + + /** + Gets the colour. + */ + wxColour GetColour() const { return wxColour(m_borderColour); } + + /** + Gets the border width. + */ + wxTextAttrDimension& GetWidth() { return m_borderWidth; } + const wxTextAttrDimension& GetWidth() const { return m_borderWidth; } + + /** + Sets the border width. + */ + void SetWidth(const wxTextAttrDimension& width) { m_borderWidth = width; } + /** + Sets the border width. + */ + void SetWidth(int value, wxTextAttrUnits units = wxTEXT_ATTR_UNITS_TENTHS_MM) { SetWidth(wxTextAttrDimension(value, units)); } + + /** + True if the border has a valid style. + */ + bool HasStyle() const { return (m_flags & wxTEXT_BOX_ATTR_BORDER_STYLE) != 0; } + + /** + True if the border has a valid colour. + */ + bool HasColour() const { return (m_flags & wxTEXT_BOX_ATTR_BORDER_COLOUR) != 0; } + + /** + True if the border has a valid width. + */ + bool HasWidth() const { return m_borderWidth.IsValid(); } + + /** + True if the border is valid. + */ + bool IsValid() const { return HasWidth(); } + + /** + Set the valid flag for this border. + */ + void MakeValid() { m_borderWidth.SetValid(true); } + + /** + Returns the border flags. + */ + int GetFlags() const { return m_flags; } + + /** + Sets the border flags. + */ + void SetFlags(int flags) { m_flags = flags; } + + /** + Adds a border flag. + */ + void AddFlag(int flag) { m_flags |= flag; } + + /** + Removes a border flag. + */ + void RemoveFlag(int flag) { m_flags &= ~flag; } + + int m_borderStyle; + unsigned long m_borderColour; + wxTextAttrDimension m_borderWidth; + int m_flags; +}; + +/** + @class wxTextAttrBorders + A class representing a rich text object's borders. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextAttr, wxRichTextCtrl, wxRichTextAttrBorder +*/ + +class WXDLLIMPEXP_RICHTEXT wxTextAttrBorders +{ +public: + /** + Default constructor. + */ + wxTextAttrBorders() { } + + /** + Equality operator. + */ + bool operator==(const wxTextAttrBorders& borders) const + { + return m_left == borders.m_left && m_right == borders.m_right && + m_top == borders.m_top && m_bottom == borders.m_bottom; + } + + /** + Sets the style of all borders. + */ + void SetStyle(int style); + + /** + Sets colour of all borders. + */ + void SetColour(unsigned long colour); + + /** + Sets the colour for all borders. + */ + void SetColour(const wxColour& colour); + + /** + Sets the width of all borders. + */ + void SetWidth(const wxTextAttrDimension& width); + + /** + Sets the width of all borders. + */ + void SetWidth(int value, wxTextAttrUnits units = wxTEXT_ATTR_UNITS_TENTHS_MM) { SetWidth(wxTextAttrDimension(value, units)); } + + /** + Resets all borders. + */ + void Reset() { m_left.Reset(); m_right.Reset(); m_top.Reset(); m_bottom.Reset(); } + + /** + Partial equality test. + */ + bool EqPartial(const wxTextAttrBorders& borders) const; + + /** + Applies border to this object, but not if the same as @a compareWith. + */ + bool Apply(const wxTextAttrBorders& borders, const wxTextAttrBorders* compareWith = NULL); + + /** + Removes the specified attributes from this object. + */ + bool RemoveStyle(const wxTextAttrBorders& attr); + + /** + Collects the attributes that are common to a range of content, building up a note of + which attributes are absent in some objects and which clash in some objects. + */ + void CollectCommonAttributes(const wxTextAttrBorders& attr, wxTextAttrBorders& clashingAttr, wxTextAttrBorders& absentAttr); + + /** + Returns @true if all borders are valid. + */ + bool IsValid() const { return m_left.IsValid() || m_right.IsValid() || m_top.IsValid() || m_bottom.IsValid(); } + + /** + Returns the left border. + */ + const wxTextAttrBorder& GetLeft() const { return m_left; } + wxTextAttrBorder& GetLeft() { return m_left; } + + /** + Returns the right border. + */ + const wxTextAttrBorder& GetRight() const { return m_right; } + wxTextAttrBorder& GetRight() { return m_right; } + + /** + Returns the top border. + */ + const wxTextAttrBorder& GetTop() const { return m_top; } + wxTextAttrBorder& GetTop() { return m_top; } + + /** + Returns the bottom border. + */ + const wxTextAttrBorder& GetBottom() const { return m_bottom; } + wxTextAttrBorder& GetBottom() { return m_bottom; } + + wxTextAttrBorder m_left, m_right, m_top, m_bottom; + +}; + +/** + @class wxTextBoxAttr + A class representing the box attributes of a rich text object. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextAttr, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxTextBoxAttr +{ +public: + /** + Default constructor. + */ + wxTextBoxAttr() { Init(); } + + /** + Copy constructor. + */ + wxTextBoxAttr(const wxTextBoxAttr& attr) { Init(); (*this) = attr; } + + /** + Initialises this object. + */ + void Init() { Reset(); } + + /** + Resets this object. + */ + void Reset(); + + // Copy. Unnecessary since we let it do a binary copy + //void Copy(const wxTextBoxAttr& attr); + + // Assignment + //void operator= (const wxTextBoxAttr& attr); + + /** + Equality test. + */ + bool operator== (const wxTextBoxAttr& attr) const; + + /** + Partial equality test, ignoring unset attributes. + + */ + bool EqPartial(const wxTextBoxAttr& attr) const; + + /** + Merges the given attributes. If @a compareWith is non-NULL, then it will be used + to mask out those attributes that are the same in style and @a compareWith, for + situations where we don't want to explicitly set inherited attributes. + */ + bool Apply(const wxTextBoxAttr& style, const wxTextBoxAttr* compareWith = NULL); + + /** + Collects the attributes that are common to a range of content, building up a note of + which attributes are absent in some objects and which clash in some objects. + */ + void CollectCommonAttributes(const wxTextBoxAttr& attr, wxTextBoxAttr& clashingAttr, wxTextBoxAttr& absentAttr); + + /** + Removes the specified attributes from this object. + */ + bool RemoveStyle(const wxTextBoxAttr& attr); + + /** + Sets the flags. + */ + void SetFlags(int flags) { m_flags = flags; } + + /** + Returns the flags. + */ + int GetFlags() const { return m_flags; } + + /** + Is this flag present? + */ + bool HasFlag(wxTextBoxAttrFlags flag) const { return (m_flags & flag) != 0; } + + /** + Removes this flag. + */ + void RemoveFlag(wxTextBoxAttrFlags flag) { m_flags &= ~flag; } + + /** + Adds this flag. + */ + void AddFlag(wxTextBoxAttrFlags flag) { m_flags |= flag; } + + /** + Returns @true if no attributes are set. + */ + bool IsDefault() const; + + /** + Returns the float mode. + */ + wxTextBoxAttrFloatStyle GetFloatMode() const { return m_floatMode; } + + /** + Sets the float mode. + */ + void SetFloatMode(wxTextBoxAttrFloatStyle mode) { m_floatMode = mode; m_flags |= wxTEXT_BOX_ATTR_FLOAT; } + + /** + Returns @true if float mode is active. + */ + bool HasFloatMode() const { return HasFlag(wxTEXT_BOX_ATTR_FLOAT); } + + /** + Returns @true if this object is floating. + */ + bool IsFloating() const { return HasFloatMode() && GetFloatMode() != wxTEXT_BOX_ATTR_FLOAT_NONE; } + + /** + Returns the clear mode - whether to wrap text after object. Currently unimplemented. + */ + wxTextBoxAttrClearStyle GetClearMode() const { return m_clearMode; } + + /** + Set the clear mode. Currently unimplemented. + */ + void SetClearMode(wxTextBoxAttrClearStyle mode) { m_clearMode = mode; m_flags |= wxTEXT_BOX_ATTR_CLEAR; } + + /** + Returns @true if we have a clear flag. + */ + bool HasClearMode() const { return HasFlag(wxTEXT_BOX_ATTR_CLEAR); } + + /** + Returns the collapse mode - whether to collapse borders. Currently unimplemented. + */ + wxTextBoxAttrCollapseMode GetCollapseBorders() const { return m_collapseMode; } + + /** + Sets the collapse mode - whether to collapse borders. Currently unimplemented. + */ + void SetCollapseBorders(wxTextBoxAttrCollapseMode collapse) { m_collapseMode = collapse; m_flags |= wxTEXT_BOX_ATTR_COLLAPSE_BORDERS; } + + /** + Returns @true if the collapse borders flag is present. + */ + bool HasCollapseBorders() const { return HasFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS); } + + /** + Returns the vertical alignment. + */ + wxTextBoxAttrVerticalAlignment GetVerticalAlignment() const { return m_verticalAlignment; } + + /** + Sets the vertical alignment. + */ + void SetVerticalAlignment(wxTextBoxAttrVerticalAlignment verticalAlignment) { m_verticalAlignment = verticalAlignment; m_flags |= wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT; } + + /** + Returns @true if a vertical alignment flag is present. + */ + bool HasVerticalAlignment() const { return HasFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT); } + + /** + Returns the margin values. + */ + wxTextAttrDimensions& GetMargins() { return m_margins; } + const wxTextAttrDimensions& GetMargins() const { return m_margins; } + + /** + Returns the left margin. + */ + wxTextAttrDimension& GetLeftMargin() { return m_margins.m_left; } + const wxTextAttrDimension& GetLeftMargin() const { return m_margins.m_left; } + + /** + Returns the right margin. + */ + wxTextAttrDimension& GetRightMargin() { return m_margins.m_right; } + const wxTextAttrDimension& GetRightMargin() const { return m_margins.m_right; } + + /** + Returns the top margin. + */ + wxTextAttrDimension& GetTopMargin() { return m_margins.m_top; } + const wxTextAttrDimension& GetTopMargin() const { return m_margins.m_top; } + + /** + Returns the bottom margin. + */ + wxTextAttrDimension& GetBottomMargin() { return m_margins.m_bottom; } + const wxTextAttrDimension& GetBottomMargin() const { return m_margins.m_bottom; } + + /** + Returns the position. + */ + wxTextAttrDimensions& GetPosition() { return m_position; } + const wxTextAttrDimensions& GetPosition() const { return m_position; } + + /** + Returns the left position. + */ + wxTextAttrDimension& GetLeft() { return m_position.m_left; } + const wxTextAttrDimension& GetLeft() const { return m_position.m_left; } + + /** + Returns the right position. + */ + wxTextAttrDimension& GetRight() { return m_position.m_right; } + const wxTextAttrDimension& GetRight() const { return m_position.m_right; } + + /** + Returns the top position. + */ + wxTextAttrDimension& GetTop() { return m_position.m_top; } + const wxTextAttrDimension& GetTop() const { return m_position.m_top; } + + /** + Returns the bottom position. + */ + wxTextAttrDimension& GetBottom() { return m_position.m_bottom; } + const wxTextAttrDimension& GetBottom() const { return m_position.m_bottom; } + + /** + Returns the padding values. + */ + wxTextAttrDimensions& GetPadding() { return m_padding; } + const wxTextAttrDimensions& GetPadding() const { return m_padding; } + + /** + Returns the left padding value. + */ + wxTextAttrDimension& GetLeftPadding() { return m_padding.m_left; } + const wxTextAttrDimension& GetLeftPadding() const { return m_padding.m_left; } + + /** + Returns the right padding value. + */ + wxTextAttrDimension& GetRightPadding() { return m_padding.m_right; } + const wxTextAttrDimension& GetRightPadding() const { return m_padding.m_right; } + + /** + Returns the top padding value. + */ + wxTextAttrDimension& GetTopPadding() { return m_padding.m_top; } + const wxTextAttrDimension& GetTopPadding() const { return m_padding.m_top; } + + /** + Returns the bottom padding value. + */ + wxTextAttrDimension& GetBottomPadding() { return m_padding.m_bottom; } + const wxTextAttrDimension& GetBottomPadding() const { return m_padding.m_bottom; } + + /** + Returns the borders. + */ + wxTextAttrBorders& GetBorder() { return m_border; } + const wxTextAttrBorders& GetBorder() const { return m_border; } + + /** + Returns the left border. + */ + wxTextAttrBorder& GetLeftBorder() { return m_border.m_left; } + const wxTextAttrBorder& GetLeftBorder() const { return m_border.m_left; } + + /** + Returns the top border. + */ + wxTextAttrBorder& GetTopBorder() { return m_border.m_top; } + const wxTextAttrBorder& GetTopBorder() const { return m_border.m_top; } + + /** + Returns the right border. + */ + wxTextAttrBorder& GetRightBorder() { return m_border.m_right; } + const wxTextAttrBorder& GetRightBorder() const { return m_border.m_right; } /** - Copy ctor. + Returns the bottom border. */ - wxRichTextBuffer(const wxRichTextBuffer& obj); + wxTextAttrBorder& GetBottomBorder() { return m_border.m_bottom; } + const wxTextAttrBorder& GetBottomBorder() const { return m_border.m_bottom; } /** - Destructor. + Returns the outline. */ - virtual ~wxRichTextBuffer(); + wxTextAttrBorders& GetOutline() { return m_outline; } + const wxTextAttrBorders& GetOutline() const { return m_outline; } /** - Adds an event handler to the buffer's list of handlers. + Returns the left outline. + */ + wxTextAttrBorder& GetLeftOutline() { return m_outline.m_left; } + const wxTextAttrBorder& GetLeftOutline() const { return m_outline.m_left; } + + /** + Returns the top outline. + */ + wxTextAttrBorder& GetTopOutline() { return m_outline.m_top; } + const wxTextAttrBorder& GetTopOutline() const { return m_outline.m_top; } + + /** + Returns the right outline. + */ + wxTextAttrBorder& GetRightOutline() { return m_outline.m_right; } + const wxTextAttrBorder& GetRightOutline() const { return m_outline.m_right; } + + /** + Returns the bottom outline. + */ + wxTextAttrBorder& GetBottomOutline() { return m_outline.m_bottom; } + const wxTextAttrBorder& GetBottomOutline() const { return m_outline.m_bottom; } + + /** + Returns the object size. + */ + wxTextAttrSize& GetSize() { return m_size; } + const wxTextAttrSize& GetSize() const { return m_size; } + + /** + Sets the object size. + */ + void SetSize(const wxTextAttrSize& sz) { m_size = sz; } + + /** + Returns the object width. + */ + wxTextAttrDimension& GetWidth() { return m_size.m_width; } + const wxTextAttrDimension& GetWidth() const { return m_size.m_width; } + + /** + Returns the object height. + */ + wxTextAttrDimension& GetHeight() { return m_size.m_height; } + const wxTextAttrDimension& GetHeight() const { return m_size.m_height; } + +public: + + int m_flags; + + wxTextAttrDimensions m_margins; + wxTextAttrDimensions m_padding; + wxTextAttrDimensions m_position; + + wxTextAttrSize m_size; + + wxTextAttrBorders m_border; + wxTextAttrBorders m_outline; + + wxTextBoxAttrFloatStyle m_floatMode; + wxTextBoxAttrClearStyle m_clearMode; + wxTextBoxAttrCollapseMode m_collapseMode; + wxTextBoxAttrVerticalAlignment m_verticalAlignment; +}; + +/** + @class wxRichTextAttr + A class representing enhanced attributes for rich text objects. + This adds a wxTextBoxAttr member to the basic wxTextAttr class. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextAttr, wxTextBoxAttr, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextAttr: public wxTextAttr +{ +public: + /** + Constructor taking a wxTextAttr. + */ + wxRichTextAttr(const wxTextAttr& attr) { wxTextAttr::Copy(attr); } + + /** + Copy constructor. + */ + wxRichTextAttr(const wxRichTextAttr& attr): wxTextAttr() { Copy(attr); } + + /** + Default constructor. + */ + wxRichTextAttr() {} + + /** + Copy function. + */ + void Copy(const wxRichTextAttr& attr); + + /** + Assignment operator. + */ + void operator=(const wxRichTextAttr& attr) { Copy(attr); } + + /** + Assignment operator. + */ + void operator=(const wxTextAttr& attr) { wxTextAttr::Copy(attr); } + + /** + Equality test. + */ + bool operator==(const wxRichTextAttr& attr) const; + + /** + Partial equality test taking comparison object into account. + */ + bool EqPartial(const wxRichTextAttr& attr) const; + + /** + Merges the given attributes. If @a compareWith + is non-NULL, then it will be used to mask out those attributes that are the same in style + and @a compareWith, for situations where we don't want to explicitly set inherited attributes. + */ + bool Apply(const wxRichTextAttr& style, const wxRichTextAttr* compareWith = NULL); - A buffer associated with a control has the control as the only event handler, - but the application is free to add more if further notification is required. - All handlers are notified of an event originating from the buffer, such as - the replacement of a style sheet during loading. + /** + Collects the attributes that are common to a range of content, building up a note of + which attributes are absent in some objects and which clash in some objects. + */ + void CollectCommonAttributes(const wxRichTextAttr& attr, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr); - The buffer never deletes any of the event handlers, unless RemoveEventHandler() - is called with @true as the second argument. + /** + Removes the specified attributes from this object. */ - bool AddEventHandler(wxEvtHandler* handler); + bool RemoveStyle(const wxRichTextAttr& attr); /** - Adds a file handler. + Returns the text box attributes. */ - static void AddHandler(wxRichTextFileHandler* handler); + wxTextBoxAttr& GetTextBoxAttr() { return m_textBoxAttr; } + const wxTextBoxAttr& GetTextBoxAttr() const { return m_textBoxAttr; } /** - Adds a paragraph of text. + Set the text box attributes. */ - virtual wxRichTextRange AddParagraph(const wxString& text, - wxTextAttr* paraStyle = 0); + void SetTextBoxAttr(const wxTextBoxAttr& attr) { m_textBoxAttr = attr; } + + wxTextBoxAttr m_textBoxAttr; +}; + +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxVariant, wxRichTextVariantArray, WXDLLIMPEXP_RICHTEXT); + +/** + @class wxRichTextProperties + A simple property class using wxVariants. This is used to give each rich text object the + ability to store custom properties that can be used by the application. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextObject, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextProperties: public wxObject +{ +DECLARE_DYNAMIC_CLASS(wxRichTextProperties) +public: /** - Returns @true if the buffer is currently collapsing commands into a single - notional command. + Default constructor. */ - virtual bool BatchingUndo() const; + wxRichTextProperties() {} /** - Begins using alignment. + Copy constructor. */ - bool BeginAlignment(wxTextAttrAlignment alignment); + wxRichTextProperties(const wxRichTextProperties& props): wxObject() { Copy(props); } /** - Begins collapsing undo/redo commands. Note that this may not work properly - if combining commands that delete or insert content, changing ranges for - subsequent actions. + Assignment operator. + */ + void operator=(const wxRichTextProperties& props) { Copy(props); } - @a cmdName should be the name of the combined command that will appear - next to Undo and Redo in the edit menu. + /** + Equality operator. */ - virtual bool BeginBatchUndo(const wxString& cmdName); + bool operator==(const wxRichTextProperties& props) const; /** - Begin applying bold. + Copies from @a props. */ - bool BeginBold(); + void Copy(const wxRichTextProperties& props) { m_properties = props.m_properties; } /** - Begins applying the named character style. + Returns the variant at the given index. */ - bool BeginCharacterStyle(const wxString& characterStyle); + const wxVariant& operator[](size_t idx) const { return m_properties[idx]; } /** - Begins using this font. + Returns the variant at the given index. */ - bool BeginFont(const wxFont& font); + wxVariant& operator[](size_t idx) { return m_properties[idx]; } /** - Begins using the given point size. + Clears the properties. */ - bool BeginFontSize(int pointSize); + void Clear() { m_properties.Clear(); } /** - Begins using italic. + Returns the array of variants implementing the properties. */ - bool BeginItalic(); + const wxRichTextVariantArray& GetProperties() const { return m_properties; } /** - Begin using @a leftIndent for the left indent, and optionally @a leftSubIndent for - the sub-indent. Both are expressed in tenths of a millimetre. + Returns the array of variants implementing the properties. + */ + wxRichTextVariantArray& GetProperties() { return m_properties; } - The sub-indent is an offset from the left of the paragraph, and is used for all - but the first line in a paragraph. A positive value will cause the first line to appear - to the left of the subsequent lines, and a negative value will cause the first line to be - indented relative to the subsequent lines. + /** + Sets the array of variants. */ - bool BeginLeftIndent(int leftIndent, int leftSubIndent = 0); + void SetProperties(const wxRichTextVariantArray& props) { m_properties = props; } /** - Begins line spacing using the specified value. @e spacing is a multiple, where - 10 means single-spacing, 15 means 1.5 spacing, and 20 means double spacing. + Returns all the property names. + */ + wxArrayString GetPropertyNames() const; - The ::wxTextAttrLineSpacing enumeration values are defined for convenience. + /** + Returns a count of the properties. */ - bool BeginLineSpacing(int lineSpacing); + size_t GetCount() const { return m_properties.GetCount(); } /** - Begins using a specified list style. - Optionally, you can also pass a level and a number. + Returns @true if the given property is found. */ - bool BeginListStyle(const wxString& listStyle, int level = 1, - int number = 1); + bool HasProperty(const wxString& name) const { return Find(name) != -1; } /** - Begins a numbered bullet. + Finds the given property. + */ + int Find(const wxString& name) const; - This call will be needed for each item in the list, and the - application should take care of incrementing the numbering. + /** + Gets the property variant by name. + */ + const wxVariant& GetProperty(const wxString& name) const; - @a bulletNumber is a number, usually starting with 1. - @a leftIndent and @a leftSubIndent are values in tenths of a millimetre. - @a bulletStyle is a bitlist of the following values: + /** + Finds or creates a property with the given name, returning a pointer to the variant. + */ + wxVariant* FindOrCreateProperty(const wxString& name); - wxRichTextBuffer uses indentation to render a bulleted item. - The left indent is the distance between the margin and the bullet. - The content of the paragraph, including the first line, starts - at leftMargin + leftSubIndent. - So the distance between the left edge of the bullet and the - left of the actual paragraph is leftSubIndent. + /** + Gets the value of the named property as a string. */ - bool BeginNumberedBullet(int bulletNumber, int leftIndent, - int leftSubIndent, - int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD); + wxString GetPropertyString(const wxString& name) const; /** - Begins paragraph spacing; pass the before-paragraph and after-paragraph spacing - in tenths of a millimetre. + Gets the value of the named property as a long integer. */ - bool BeginParagraphSpacing(int before, int after); + long GetPropertyLong(const wxString& name) const; /** - Begins applying the named paragraph style. + Gets the value of the named property as a boolean. */ - bool BeginParagraphStyle(const wxString& paragraphStyle); + bool GetPropertyBool(const wxString& name) const; /** - Begins a right indent, specified in tenths of a millimetre. + Gets the value of the named property as a double. */ - bool BeginRightIndent(int rightIndent); + double GetPropertyDouble(const wxString& name) const; /** - Begins applying a standard bullet, using one of the standard bullet names - (currently @c standard/circle or @c standard/square. + Sets the property by passing a variant which contains a name and value. + */ + void SetProperty(const wxVariant& variant); - See BeginNumberedBullet() for an explanation of how indentation is used to - render the bulleted paragraph. + /** + Sets a property by name and variant. */ - bool BeginStandardBullet(const wxString& bulletName, - int leftIndent, - int leftSubIndent, - int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_STANDARD); + void SetProperty(const wxString& name, const wxVariant& variant); /** - Begins using a specified style. + Sets a property by name and string value. */ - virtual bool BeginStyle(const wxTextAttr& style); + void SetProperty(const wxString& name, const wxString& value); /** - Begins suppressing undo/redo commands. The way undo is suppressed may be - implemented differently by each command. - If not dealt with by a command implementation, then it will be implemented - automatically by not storing the command in the undo history when the - action is submitted to the command processor. + Sets property by name and long integer value. */ - virtual bool BeginSuppressUndo(); + void SetProperty(const wxString& name, long value); /** - Begins applying a symbol bullet, using a character from the current font. + Sets property by name and double value. + */ + void SetProperty(const wxString& name, double value); - See BeginNumberedBullet() for an explanation of how indentation is used - to render the bulleted paragraph. + /** + Sets property by name and boolean value. */ - bool BeginSymbolBullet(const wxString& symbol, int leftIndent, - int leftSubIndent, - int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL); + void SetProperty(const wxString& name, bool value); + +protected: + wxRichTextVariantArray m_properties; +}; + + +/** + @class wxRichTextFontTable + Manages quick access to a pool of fonts for rendering rich text. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ +class WXDLLIMPEXP_RICHTEXT wxRichTextFontTable: public wxObject +{ +public: /** - Begins using the specified text foreground colour. + Default constructor. */ - bool BeginTextColour(const wxColour& colour); + wxRichTextFontTable(); /** - Begins applying wxTEXT_ATTR_URL to the content. + Copy constructor. + */ + wxRichTextFontTable(const wxRichTextFontTable& table); + virtual ~wxRichTextFontTable(); - Pass a URL and optionally, a character style to apply, since it is common - to mark a URL with a familiar style such as blue text with underlining. + /** + Returns @true if the font table is valid. */ - bool BeginURL(const wxString& url, - const wxString& characterStyle = wxEmptyString); + bool IsOk() const { return m_refData != NULL; } /** - Begins using underline. + Finds a font for the given attribute object. */ - bool BeginUnderline(); + wxFont FindFont(const wxRichTextAttr& fontSpec); /** - Returns @true if content can be pasted from the clipboard. + Clears the font table. */ - virtual bool CanPasteFromClipboard() const; + void Clear(); /** - Cleans up the file handlers. + Assignment operator. */ - static void CleanUpHandlers(); + void operator= (const wxRichTextFontTable& table); /** - Clears the buffer. + Equality operator. */ - virtual void Clear(); + bool operator == (const wxRichTextFontTable& table) const; /** - Clears the list style from the given range, clearing list-related attributes - and applying any named paragraph style associated with each paragraph. + Inequality operator. + */ + bool operator != (const wxRichTextFontTable& table) const { return !(*this == table); } + +protected: + + DECLARE_DYNAMIC_CLASS(wxRichTextFontTable) +}; + +/** + @class wxRichTextRange + + This stores beginning and end positions for a range of data. + + @library{wxrichtext} + @category{richtext} - @a flags is a bit list of the following: - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + @see wxRichTextBuffer, wxRichTextCtrl +*/ - @see SetListStyle(), PromoteList(), NumberList() +class WXDLLIMPEXP_RICHTEXT wxRichTextRange +{ +public: +// Constructors + + /** + Default constructor. + */ + wxRichTextRange() { m_start = 0; m_end = 0; } + + /** + Constructor taking start and end positions. */ - virtual bool ClearListStyle(const wxRichTextRange& range, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); + wxRichTextRange(long start, long end) { m_start = start; m_end = end; } /** - Clears the style stack. + Copy constructor. */ - virtual void ClearStyleStack(); + wxRichTextRange(const wxRichTextRange& range) { m_start = range.m_start; m_end = range.m_end; } + ~wxRichTextRange() {} /** - Clones the object. + Assigns @a range to this range. */ - virtual wxRichTextObject* Clone() const; + void operator =(const wxRichTextRange& range) { m_start = range.m_start; m_end = range.m_end; } /** - Copies the given buffer. + Equality operator. Returns @true if @a range is the same as this range. */ - void Copy(const wxRichTextBuffer& obj); + bool operator ==(const wxRichTextRange& range) const { return (m_start == range.m_start && m_end == range.m_end); } /** - Copy the given range to the clipboard. + Inequality operator. */ - virtual bool CopyToClipboard(const wxRichTextRange& range); + bool operator !=(const wxRichTextRange& range) const { return (m_start != range.m_start || m_end != range.m_end); } /** - Submits a command to delete the given range. + Subtracts a range from this range. */ - bool DeleteRangeWithUndo(const wxRichTextRange& range, - wxRichTextCtrl* ctrl); + wxRichTextRange operator -(const wxRichTextRange& range) const { return wxRichTextRange(m_start - range.m_start, m_end - range.m_end); } - //@{ /** - Dumps the contents of the buffer for debugging purposes. + Adds a range to this range. */ - void Dump(); - void Dump(wxTextOutputStream& stream); - //@} + wxRichTextRange operator +(const wxRichTextRange& range) const { return wxRichTextRange(m_start + range.m_start, m_end + range.m_end); } /** - Ends alignment. + Sets the range start and end positions. */ - bool EndAlignment(); + void SetRange(long start, long end) { m_start = start; m_end = end; } /** - Ends all styles that have been started with a Begin... command. + Sets the start position. */ - virtual bool EndAllStyles(); + void SetStart(long start) { m_start = start; } /** - Ends collapsing undo/redo commands, and submits the combined command. + Returns the start position. */ - virtual bool EndBatchUndo(); + long GetStart() const { return m_start; } /** - Ends using bold. + Sets the end position. */ - bool EndBold(); + void SetEnd(long end) { m_end = end; } /** - Ends using the named character style. + Gets the end position. */ - bool EndCharacterStyle(); + long GetEnd() const { return m_end; } /** - Ends using a font. + Returns true if this range is completely outside @a range. */ - bool EndFont(); + bool IsOutside(const wxRichTextRange& range) const { return range.m_start > m_end || range.m_end < m_start; } /** - Ends using a point size. + Returns true if this range is completely within @a range. */ - bool EndFontSize(); + bool IsWithin(const wxRichTextRange& range) const { return m_start >= range.m_start && m_end <= range.m_end; } /** - Ends using italic. + Returns true if @a pos was within the range. Does not match if the range is empty. */ - bool EndItalic(); + bool Contains(long pos) const { return pos >= m_start && pos <= m_end ; } /** - Ends using a left indent. + Limit this range to be within @a range. */ - bool EndLeftIndent(); + bool LimitTo(const wxRichTextRange& range) ; /** - Ends using a line spacing. + Gets the length of the range. */ - bool EndLineSpacing(); + long GetLength() const { return m_end - m_start + 1; } /** - Ends using a specified list style. + Swaps the start and end. */ - bool EndListStyle(); + void Swap() { long tmp = m_start; m_start = m_end; m_end = tmp; } /** - Ends a numbered bullet. + Converts the API-standard range, whose end is one past the last character in + the range, to the internal form, which uses the first and last character + positions of the range. In other words, one is subtracted from the end position. + (n, n) is the range of a single character. */ - bool EndNumberedBullet(); + wxRichTextRange ToInternal() const { return wxRichTextRange(m_start, m_end-1); } /** - Ends paragraph spacing. + Converts the internal range, which uses the first and last character positions + of the range, to the API-standard range, whose end is one past the last + character in the range. In other words, one is added to the end position. + (n, n+1) is the range of a single character. */ - bool EndParagraphSpacing(); + wxRichTextRange FromInternal() const { return wxRichTextRange(m_start, m_end+1); } + +protected: + long m_start; + long m_end; +}; + +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextRange, wxRichTextRangeArray, WXDLLIMPEXP_RICHTEXT); + +#define wxRICHTEXT_ALL wxRichTextRange(-2, -2) +#define wxRICHTEXT_NONE wxRichTextRange(-1, -1) +#define wxRICHTEXT_NO_SELECTION wxRichTextRange(-2, -2) + +/** + @class wxRichTextSelection + + Stores selection information. The selection does not have to be contiguous, though currently non-contiguous + selections are only supported for a range of table cells (a geometric block of cells can consist + of a set of non-contiguous positions). + + The selection consists of an array of ranges, and the container that is the context for the selection. It + follows that a single selection object can only represent ranges with the same parent container. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextSelection +{ +public: /** - Ends applying a named character style. + Copy constructor. */ - bool EndParagraphStyle(); + wxRichTextSelection(const wxRichTextSelection& sel) { Copy(sel); } /** - Ends using a right indent. + Creates a selection from a range and a container. */ - bool EndRightIndent(); + wxRichTextSelection(const wxRichTextRange& range, wxRichTextParagraphLayoutBox* container) { m_ranges.Add(range); m_container = container; } /** - Ends using a standard bullet. + Default constructor. */ - bool EndStandardBullet(); + wxRichTextSelection() { Reset(); } /** - Ends the current style. + Resets the selection. */ - virtual bool EndStyle(); + void Reset() { m_ranges.Clear(); m_container = NULL; } /** - Ends suppressing undo/redo commands. + Sets the selection. */ - virtual bool EndSuppressUndo(); + + void Set(const wxRichTextRange& range, wxRichTextParagraphLayoutBox* container) + { m_ranges.Clear(); m_ranges.Add(range); m_container = container; } /** - Ends using a symbol bullet. + Adds a range to the selection. */ - bool EndSymbolBullet(); + void Add(const wxRichTextRange& range) + { m_ranges.Add(range); } /** - Ends using a text foreground colour. + Sets the selections from an array of ranges and a container object. */ - bool EndTextColour(); + void Set(const wxRichTextRangeArray& ranges, wxRichTextParagraphLayoutBox* container) + { m_ranges = ranges; m_container = container; } /** - Ends applying a URL. + Copies from @a sel. */ - bool EndURL(); + void Copy(const wxRichTextSelection& sel) + { m_ranges = sel.m_ranges; m_container = sel.m_container; } /** - Ends using underline. + Assignment operator. */ - bool EndUnderline(); + void operator=(const wxRichTextSelection& sel) { Copy(sel); } /** - Finds a handler by type. + Equality operator. */ - static wxRichTextFileHandler* FindHandler(wxRichTextFileType imageType); + bool operator==(const wxRichTextSelection& sel) const; /** - Finds a handler by extension and type. + Index operator. */ - static wxRichTextFileHandler* FindHandler(const wxString& extension, wxRichTextFileType imageType); + wxRichTextRange operator[](size_t i) const { return GetRange(i); } /** - Finds a handler by name. + Returns the selection ranges. */ - static wxRichTextFileHandler* FindHandler(const wxString& name); + wxRichTextRangeArray& GetRanges() { return m_ranges; } /** - Finds a handler by filename or, if supplied, type. + Returns the selection ranges. */ - static wxRichTextFileHandler* FindHandlerFilenameOrType(const wxString& filename, wxRichTextFileType imageType); + const wxRichTextRangeArray& GetRanges() const { return m_ranges; } /** - Gets the basic (overall) style. + Sets the selection ranges. + */ + void SetRanges(const wxRichTextRangeArray& ranges) { m_ranges = ranges; } - This is the style of the whole buffer before further styles are applied, - unlike the default style, which only affects the style currently being - applied (for example, setting the default style to bold will cause - subsequently inserted text to be bold). + /** + Returns the number of ranges in the selection. */ - virtual const wxTextAttr& GetBasicStyle() const; + size_t GetCount() const { return m_ranges.GetCount(); } /** - Gets the collapsed command. + Returns the range at the given index. + */ - virtual wxRichTextCommand* GetBatchedCommand() const; + wxRichTextRange GetRange(size_t i) const { return m_ranges[i]; } /** - Gets the command processor. - A text buffer always creates its own command processor when it is initialized. + Returns the first range if there is one, otherwise wxRICHTEXT_NO_SELECTION. */ - wxCommandProcessor* GetCommandProcessor() const; + wxRichTextRange GetRange() const { return (m_ranges.GetCount() > 0) ? (m_ranges[0]) : wxRICHTEXT_NO_SELECTION; } /** - Returns the current default style, affecting the style currently being applied - (for example, setting the default style to bold will cause subsequently - inserted text to be bold). + Sets a single range. */ - virtual const wxTextAttr& GetDefaultStyle() const; + void SetRange(const wxRichTextRange& range) { m_ranges.Clear(); m_ranges.Add(range); } /** - Gets a wildcard incorporating all visible handlers. - If @a types is present, it will be filled with the file type corresponding - to each filter. This can be used to determine the type to pass to LoadFile() - given a selected filter. + Returns the container for which the selection is valid. */ - static wxString GetExtWildcard(bool combine = false, bool save = false, - wxArrayInt* types = NULL); + wxRichTextParagraphLayoutBox* GetContainer() const { return m_container; } /** - Returns the list of file handlers. + Sets the container for which the selection is valid. */ - static wxList& GetHandlers(); + void SetContainer(wxRichTextParagraphLayoutBox* container) { m_container = container; } /** - Returns the object to be used to render certain aspects of the content, such as - bullets. + Returns @true if the selection is valid. */ - static wxRichTextRenderer* GetRenderer(); + bool IsValid() const { return m_ranges.GetCount() > 0 && GetContainer(); } /** - Gets the attributes at the given position. + Returns the selection appropriate to the specified object, if any; returns an empty array if none + at the level of the object's container. + */ + wxRichTextRangeArray GetSelectionForObject(wxRichTextObject* obj) const; - This function gets the combined style - that is, the style you see on the - screen as a result of combining base style, paragraph style and character - style attributes. To get the character or paragraph style alone, - use GetUncombinedStyle(). + /** + Returns @true if the given position is within the selection. */ - virtual bool GetStyle(long position, wxTextAttr& style); + bool WithinSelection(long pos, wxRichTextObject* obj) const; /** - This function gets a style representing the common, combined attributes in the - given range. - Attributes which have different values within the specified range will not be - included the style flags. + Returns @true if the given position is within the selection. - The function is used to get the attributes to display in the formatting dialog: - the user can edit the attributes common to the selection, and optionally specify the - values of further attributes to be applied uniformly. + */ + bool WithinSelection(long pos) const { return WithinSelection(pos, m_ranges); } - To apply the edited attributes, you can use SetStyle() specifying - the wxRICHTEXT_SETSTYLE_OPTIMIZE flag, which will only apply attributes that - are different from the @e combined attributes within the range. - So, the user edits the effective, displayed attributes for the range, - but his choice won't be applied unnecessarily to content. As an example, - say the style for a paragraph specifies bold, but the paragraph text doesn't - specify a weight. - The combined style is bold, and this is what the user will see on-screen and - in the formatting dialog. The user now specifies red text, in addition to bold. - When applying with SetStyle(), the content font weight attributes won't be - changed to bold because this is already specified by the paragraph. - However the text colour attributes @e will be changed to show red. + /** + Returns @true if the given position is within the selection range. */ - virtual bool GetStyleForRange(const wxRichTextRange& range, - wxTextAttr& style); + static bool WithinSelection(long pos, const wxRichTextRangeArray& ranges); /** - Returns the current style sheet associated with the buffer, if any. + Returns @true if the given range is within the selection range. */ - virtual wxRichTextStyleSheet* GetStyleSheet() const; + static bool WithinSelection(const wxRichTextRange& range, const wxRichTextRangeArray& ranges); + + wxRichTextRangeArray m_ranges; + wxRichTextParagraphLayoutBox* m_container; +}; + +/** + @class wxRichTextObject + This is the base for drawable rich text objects. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextObject: public wxObject +{ + DECLARE_CLASS(wxRichTextObject) +public: /** - Get the size of the style stack, for example to check correct nesting. + Constructor, taking an optional parent pointer. */ - virtual size_t GetStyleStackSize() const; + wxRichTextObject(wxRichTextObject* parent = NULL); + + virtual ~wxRichTextObject(); + +// Overridables /** - Gets the attributes at the given position. + Draw the item, within the given range. Some objects may ignore the range (for + example paragraphs) while others must obey it (lines, to implement wrapping) + */ + virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) = 0; - This function gets the @e uncombined style - that is, the attributes associated - with the paragraph or character content, and not necessarily the combined - attributes you see on the screen. To get the combined attributes, use GetStyle(). - If you specify (any) paragraph attribute in @e style's flags, this function - will fetch the paragraph attributes. - Otherwise, it will return the character attributes. + /** + Lay the item out at the specified position with the given size constraint. + Layout must set the cached size. */ - virtual bool GetUncombinedStyle(long position, wxTextAttr& style); + virtual bool Layout(wxDC& dc, const wxRect& rect, int style) = 0; /** - Finds the text position for the given position, putting the position in - @a textPosition if one is found. + Hit-testing: returns a flag indicating hit test details, plus + information about position. @a contextObj is returned to specify what object + position is relevant to, since otherwise there's an ambiguity. + @ obj might not be a child of @a contextObj, since we may be referring to the container itself + if we have no hit on a child - for example if we click outside an object. + + The function puts the position in @a textPosition if one is found. @a pt is in logical units (a zero y position is at the beginning of the buffer). @return One of the ::wxRichTextHitTestFlags values. */ - virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition); + + virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0); /** - Initialisation. + Finds the absolute position and row height for the given character position. */ - void Init(); + virtual bool FindPosition(wxDC& WXUNUSED(dc), long WXUNUSED(index), wxPoint& WXUNUSED(pt), int* WXUNUSED(height), bool WXUNUSED(forceLineStart)) { return false; } /** - Initialises the standard handlers. - Currently, only the plain text loading/saving handler is initialised by default. + Returns the best size, i.e. the ideal starting size for this object irrespective + of available space. For a short text string, it will be the size that exactly encloses + the text. For a longer string, it might use the parent width for example. */ - static void InitStandardHandlers(); + virtual wxSize GetBestSize() const { return m_size; } /** - Inserts a handler at the front of the list. + Returns the object size for the given range. Returns @false if the range + is invalid for this object. */ - static void InsertHandler(wxRichTextFileHandler* handler); + + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const = 0; + + /** + Do a split from @a pos, returning an object containing the second part, and setting + the first part in 'this'. + */ + virtual wxRichTextObject* DoSplit(long WXUNUSED(pos)) { return NULL; } + + /** + Calculates the range of the object. By default, guess that the object is 1 unit long. + */ + virtual void CalculateRange(long start, long& end) { end = start ; m_range.SetRange(start, end); } + + /** + Deletes the given range. + */ + virtual bool DeleteRange(const wxRichTextRange& WXUNUSED(range)) { return false; } + + /** + Returns @true if the object is empty. + */ + virtual bool IsEmpty() const { return false; } + + /** + Returns @true if this class of object is floatable. + */ + virtual bool IsFloatable() const { return false; } + + /** + Returns @true if this object is currently floating. + */ + virtual bool IsFloating() const { return GetAttributes().GetTextBoxAttr().IsFloating(); } + + /** + Returns the floating direction. + */ + virtual int GetFloatDirection() const { return GetAttributes().GetTextBoxAttr().GetFloatMode(); } + + /** + Returns any text in this object for the given range. + */ + virtual wxString GetTextForRange(const wxRichTextRange& WXUNUSED(range)) const { return wxEmptyString; } + + /** + Returns @true if this object can merge itself with the given one. + */ + virtual bool CanMerge(wxRichTextObject* WXUNUSED(object)) const { return false; } + + /** + Returns @true if this object merged itself with the given one. + The calling code will then delete the given object. + */ + virtual bool Merge(wxRichTextObject* WXUNUSED(object)) { return false; } + + /** + Dump object data to the given output stream for debugging. + */ + virtual void Dump(wxTextOutputStream& stream); + + /** + Returns @true if we can edit the object's properties via a GUI. + */ + virtual bool CanEditProperties() const { return false; } + + /** + Edits the object's properties via a GUI. + */ + virtual bool EditProperties(wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) { return false; } + + /** + Returns the label to be used for the properties context menu item. + */ + virtual wxString GetPropertiesMenuLabel() const { return wxEmptyString; } + + /** + Returns @true if objects of this class can accept the focus, i.e. a call to SetFocusObject + is possible. For example, containers supporting text, such as a text box object, can accept the focus, + but a table can't (set the focus to individual cells instead). + */ + virtual bool AcceptsFocus() const { return false; } + +#if wxUSE_XML + /** + Imports this object from XML. + */ + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse); +#endif + +#if wxRICHTEXT_HAVE_DIRECT_OUTPUT + /** + Exports this object directly to the given stream, bypassing the creation of a wxXmlNode hierarchy. + This method is considerably faster than creating a tree first. However, both versions of ExportXML must be + implemented so that if the tree method is made efficient in the future, we can deprecate the + more verbose direct output method. Compiled only if wxRICHTEXT_HAVE_DIRECT_OUTPUT is defined (on by default). + */ + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler); +#endif + +#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT + /** + Exports this object to the given parent node, usually creating at least one child node. + This method is less efficient than the direct-to-stream method but is retained to allow for + switching to this method if we make it more efficient. Compiled only if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT is defined + (on by default). + */ + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler); +#endif + + /** + Returns @true if this object takes note of paragraph attributes (text and image objects don't). + */ + virtual bool UsesParagraphAttributes() const { return true; } + + /** + Returns the XML node name of this object. This must be overridden for wxXmlNode-base XML export to work. + */ + virtual wxString GetXMLNodeName() const { return wxT("unknown"); } + + /** + Invalidates the object at the given range. With no argument, invalidates the whole object. + */ + virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL); + + /** + Returns @true if this object can handle the selections of its children, fOr example a table. + Required for composite selection handling to work. + */ + virtual bool HandlesChildSelections() const { return false; } + + /** + Returns a selection object specifying the selections between start and end character positions. + For example, a table would deduce what cells (of range length 1) are selected when dragging across the table. + */ + virtual wxRichTextSelection GetSelection(long WXUNUSED(start), long WXUNUSED(end)) const { return wxRichTextSelection(); } + +// Accessors + + /** + Gets the cached object size as calculated by Layout. + */ + virtual wxSize GetCachedSize() const { return m_size; } + + /** + Sets the cached object size as calculated by Layout. + */ + virtual void SetCachedSize(const wxSize& sz) { m_size = sz; } + + /** + Gets the maximum object size as calculated by Layout. This allows + us to fit an object to its contents or allocate extra space if required. + */ + virtual wxSize GetMaxSize() const { return m_maxSize; } + + /** + Sets the maximum object size as calculated by Layout. This allows + us to fit an object to its contents or allocate extra space if required. + */ + virtual void SetMaxSize(const wxSize& sz) { m_maxSize = sz; } + + /** + Gets the minimum object size as calculated by Layout. This allows + us to constrain an object to its absolute minimum size if necessary. + */ + virtual wxSize GetMinSize() const { return m_minSize; } + + /** + Sets the minimum object size as calculated by Layout. This allows + us to constrain an object to its absolute minimum size if necessary. + */ + virtual void SetMinSize(const wxSize& sz) { m_minSize = sz; } + + /** + Gets the 'natural' size for an object. For an image, it would be the + image size. + */ + virtual wxTextAttrSize GetNaturalSize() const { return wxTextAttrSize(); } + + /** + Returns the object position in pixels. + */ + virtual wxPoint GetPosition() const { return m_pos; } + + /** + Sets the object position in pixels. + */ + virtual void SetPosition(const wxPoint& pos) { m_pos = pos; } + + /** + Returns the absolute object position, by traversing up the child/parent hierarchy. + TODO: may not be needed, if all object positions are in fact relative to the + top of the coordinate space. + */ + virtual wxPoint GetAbsolutePosition() const; + + /** + Returns the rectangle enclosing the object. + */ + virtual wxRect GetRect() const { return wxRect(GetPosition(), GetCachedSize()); } + + /** + Sets the object's range within its container. + */ + void SetRange(const wxRichTextRange& range) { m_range = range; } + + /** + Returns the object's range. + */ + const wxRichTextRange& GetRange() const { return m_range; } + + /** + Returns the object's range. + */ + wxRichTextRange& GetRange() { return m_range; } + + /** + Set the object's own range, for a top-level object with its own position space. + */ + void SetOwnRange(const wxRichTextRange& range) { m_ownRange = range; } + + /** + Returns the object's own range (valid if top-level). + */ + const wxRichTextRange& GetOwnRange() const { return m_ownRange; } + + /** + Returns the object's own range (valid if top-level). + */ + wxRichTextRange& GetOwnRange() { return m_ownRange; } + + /** + Returns the object's own range only if a top-level object. + */ + wxRichTextRange GetOwnRangeIfTopLevel() const { return IsTopLevel() ? m_ownRange : m_range; } + + /** + Returns @true if this object this composite. + */ + virtual bool IsComposite() const { return false; } + + /** + Returns a pointer to the parent object. + */ + virtual wxRichTextObject* GetParent() const { return m_parent; } + + /** + Sets the pointer to the parent object. + */ + virtual void SetParent(wxRichTextObject* parent) { m_parent = parent; } + + /** + Returns the top-level container of this object. + May return itself if it's a container; use GetParentContainer to return + a different container. + */ + virtual wxRichTextParagraphLayoutBox* GetContainer() const; + + /** + Returns the top-level container of this object. + Returns a different container than itself, unless there's no parent, in which case it will return NULL. + */ + virtual wxRichTextParagraphLayoutBox* GetParentContainer() const { return GetParent() ? GetParent()->GetContainer() : GetContainer(); } + + /** + Set the margin around the object, in pixels. + */ + virtual void SetMargins(int margin); + + /** + Set the margin around the object, in pixels. + */ + virtual void SetMargins(int leftMargin, int rightMargin, int topMargin, int bottomMargin); + + /** + Returns the left margin of the object, in pixels. + */ + virtual int GetLeftMargin() const; + + /** + Returns the right margin of the object, in pixels. + */ + virtual int GetRightMargin() const; + + /** + Returns the top margin of the object, in pixels. + */ + virtual int GetTopMargin() const; + + /** + Returns the bottom margin of the object, in pixels. + */ + virtual int GetBottomMargin() const; + + /** + Calculates the available content space in the given rectangle, given the + margins, border and padding specified in the object's attributes. + */ + virtual wxRect GetAvailableContentArea(wxDC& dc, const wxRect& outerRect) const; + + /** + Lays out the object first with a given amount of space, and then if no width was specified in attr, + lays out the object again using the minimum size + */ + virtual bool LayoutToBestSize(wxDC& dc, wxRichTextBuffer* buffer, + const wxRichTextAttr& parentAttr, const wxRichTextAttr& attr, const wxRect& availableParentSpace, int style); + + /** + Sets the object's attributes. + */ + void SetAttributes(const wxRichTextAttr& attr) { m_attributes = attr; } + + /** + Returns the object's attributes. + */ + const wxRichTextAttr& GetAttributes() const { return m_attributes; } + + /** + Returns the object's attributes. + */ + wxRichTextAttr& GetAttributes() { return m_attributes; } + + /** + Sets the object's properties. + */ + wxRichTextProperties& GetProperties() { return m_properties; } + + /** + Returns the object's properties. + */ + const wxRichTextProperties& GetProperties() const { return m_properties; } + + /** + Returns the object's properties. + */ + void SetProperties(const wxRichTextProperties& props) { m_properties = props; } + + /** + Sets the stored descent value. + */ + void SetDescent(int descent) { m_descent = descent; } + + /** + Returns the stored descent value. + */ + int GetDescent() const { return m_descent; } + + /** + Returns the containing buffer. + */ + wxRichTextBuffer* GetBuffer() const; + + /** + Sets the identifying name for this object as a property using the "name" key. + */ + void SetName(const wxString& name) { m_properties.SetProperty(wxT("name"), name); } + + /** + Returns the identifying name for this object from the properties, using the "name" key. + */ + wxString GetName() const { return m_properties.GetPropertyString(wxT("name")); } + + /** + Returns @true if this object is top-level, i.e. contains its own paragraphs, such as a text box. + */ + virtual bool IsTopLevel() const { return false; } + + /** + Returns @true if the object will be shown, @false otherwise. + */ + bool IsShown() const { return m_show; } + +// Operations + + /** + Call to show or hide this object. This function does not cause the content to be + laid out or redrawn. + */ + virtual void Show(bool show) { m_show = show; } + + /** + Clones the object. + */ + virtual wxRichTextObject* Clone() const { return NULL; } + + /** + Copies the object. + */ + void Copy(const wxRichTextObject& obj); + + /** + Reference-counting allows us to use the same object in multiple + lists (not yet used). + */ + + void Reference() { m_refCount ++; } + + /** + Reference-counting allows us to use the same object in multiple + lists (not yet used). + */ + void Dereference(); + + /** + Moves the object recursively, by adding the offset from old to new. + */ + virtual void Move(const wxPoint& pt); + + /** + Converts units in tenths of a millimetre to device units. + */ + int ConvertTenthsMMToPixels(wxDC& dc, int units) const; + + /** + Converts units in tenths of a millimetre to device units. + */ + static int ConvertTenthsMMToPixels(int ppi, int units, double scale = 1.0); + + /** + Convert units in pixels to tenths of a millimetre. + */ + int ConvertPixelsToTenthsMM(wxDC& dc, int pixels) const; + + /** + Convert units in pixels to tenths of a millimetre. + */ + static int ConvertPixelsToTenthsMM(int ppi, int pixels, double scale = 1.0); + + /** + Draws the borders and background for the given rectangle and attributes. + @a boxRect is taken to be the outer margin box, not the box around the content. + */ + static bool DrawBoxAttributes(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, const wxRect& boxRect, int flags = 0); + + /** + Draws a border. + */ + static bool DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTextAttrBorders& attr, const wxRect& rect, int flags = 0); + + /** + Returns the various rectangles of the box model in pixels. You can either specify @a contentRect (inner) + or @a marginRect (outer), and the other must be the default rectangle (no width or height). + Note that the outline doesn't affect the position of the rectangle, it's drawn in whatever space + is available. + */ + static bool GetBoxRects(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, wxRect& marginRect, wxRect& borderRect, wxRect& contentRect, wxRect& paddingRect, wxRect& outlineRect); + + /** + Returns the total margin for the object in pixels, taking into account margin, padding and border size. + */ + static bool GetTotalMargin(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, int& leftMargin, int& rightMargin, + int& topMargin, int& bottomMargin); + + /** + Returns the rectangle which the child has available to it given restrictions specified in the + child attribute, e.g. 50% width of the parent, 400 pixels, x position 20% of the parent, etc. + */ + static wxRect AdjustAvailableSpace(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& parentAttr, const wxRichTextAttr& childAttr, const wxRect& availableParentSpace); + +protected: + wxSize m_size; + wxSize m_maxSize; + wxSize m_minSize; + wxPoint m_pos; + int m_descent; // Descent for this object (if any) + int m_refCount; + bool m_show; + wxRichTextObject* m_parent; + + // The range of this object (start position to end position) + wxRichTextRange m_range; + + // The internal range of this object, if it's a top-level object with its own range space + wxRichTextRange m_ownRange; + + // Attributes + wxRichTextAttr m_attributes; + + // Properties + wxRichTextProperties m_properties; +}; + +WX_DECLARE_LIST_WITH_DECL( wxRichTextObject, wxRichTextObjectList, class WXDLLIMPEXP_RICHTEXT ); + +/** + @class wxRichTextCompositeObject + + Objects of this class can contain other objects. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextCompositeObject: public wxRichTextObject +{ + DECLARE_CLASS(wxRichTextCompositeObject) +public: +// Constructors + + wxRichTextCompositeObject(wxRichTextObject* parent = NULL); + virtual ~wxRichTextCompositeObject(); + +// Overridables + + virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0); + + virtual bool FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart); + + virtual void CalculateRange(long start, long& end); + + virtual bool DeleteRange(const wxRichTextRange& range); + + virtual wxString GetTextForRange(const wxRichTextRange& range) const; + + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const; + + virtual void Dump(wxTextOutputStream& stream); + + virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL); + +// Accessors + + /** + Returns the children. + */ + wxRichTextObjectList& GetChildren() { return m_children; } + /** + Returns the children. + */ + const wxRichTextObjectList& GetChildren() const { return m_children; } + + /** + Returns the number of children. + */ + size_t GetChildCount() const ; + + /** + Returns the nth child. + */ + wxRichTextObject* GetChild(size_t n) const ; + + /** + Returns @true if this object is composite. + */ + virtual bool IsComposite() const { return true; } + + /** + Returns true if the buffer is empty. + */ + virtual bool IsEmpty() const { return GetChildCount() == 0; } + + /** + Returns the child object at the given character position. + */ + virtual wxRichTextObject* GetChildAtPosition(long pos) const; + +// Operations + + void Copy(const wxRichTextCompositeObject& obj); + + void operator= (const wxRichTextCompositeObject& obj) { Copy(obj); } + + /** + Appends a child, returning the position. + */ + size_t AppendChild(wxRichTextObject* child) ; + + /** + Inserts the child in front of the given object, or at the beginning. + */ + bool InsertChild(wxRichTextObject* child, wxRichTextObject* inFrontOf) ; + + /** + Removes and optionally deletes the specified child. + */ + bool RemoveChild(wxRichTextObject* child, bool deleteChild = false) ; + + /** + Deletes all the children. + */ + bool DeleteChildren() ; + + /** + Recursively merges all pieces that can be merged. + */ + bool Defragment(const wxRichTextRange& range = wxRICHTEXT_ALL); + + /** + Moves the object recursively, by adding the offset from old to new. + */ + virtual void Move(const wxPoint& pt); + +protected: + wxRichTextObjectList m_children; +}; + +/** + @class wxRichTextParagraphBox + + This class knows how to lay out paragraphs. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextCompositeObject, wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphLayoutBox: public wxRichTextCompositeObject +{ + DECLARE_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox) +public: +// Constructors + + wxRichTextParagraphLayoutBox(wxRichTextObject* parent = NULL); + wxRichTextParagraphLayoutBox(const wxRichTextParagraphLayoutBox& obj): wxRichTextCompositeObject() { Init(); Copy(obj); } + ~wxRichTextParagraphLayoutBox(); + +// Overridables + + virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0); + + virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); + + virtual bool Layout(wxDC& dc, const wxRect& rect, int style); + + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const; + + virtual bool DeleteRange(const wxRichTextRange& range); + + virtual wxString GetTextForRange(const wxRichTextRange& range) const; + +#if wxUSE_XML + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse); +#endif + +#if wxRICHTEXT_HAVE_DIRECT_OUTPUT + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler); +#endif + +#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler); +#endif + + virtual wxString GetXMLNodeName() const { return wxT("paragraphlayout"); } + + virtual bool AcceptsFocus() const { return true; } + +// Accessors + + /** + Associates a control with the buffer, for operations that for example require refreshing the window. + */ + void SetRichTextCtrl(wxRichTextCtrl* ctrl) { m_ctrl = ctrl; } + + /** + Returns the associated control. + */ + wxRichTextCtrl* GetRichTextCtrl() const { return m_ctrl; } + + /** + Sets a flag indicating whether the last paragraph is partial or complete. + */ + void SetPartialParagraph(bool partialPara) { m_partialParagraph = partialPara; } + + /** + Returns a flag indicating whether the last paragraph is partial or complete. + */ + bool GetPartialParagraph() const { return m_partialParagraph; } + + /** + Returns the style sheet associated with the overall buffer. + */ + virtual wxRichTextStyleSheet* GetStyleSheet() const; + + virtual bool IsTopLevel() const { return true; } + +// Operations + + /** + Submits a command to insert paragraphs. + */ + bool InsertParagraphsWithUndo(long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer, int flags = 0); + + /** + Submits a command to insert the given text. + */ + bool InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer, int flags = 0); + + /** + Submits a command to insert the given text. + */ + bool InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer, int flags = 0); /** Submits a command to insert the given image. */ bool InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, - wxRichTextCtrl* ctrl, int flags = 0); + wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer, int flags, + const wxRichTextAttr& textAttr); /** - Submits a command to insert a newline. + Returns the style that is appropriate for a new paragraph at this position. + If the previous paragraph has a paragraph style name, looks up the next-paragraph + style. */ - bool InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags = 0); + wxRichTextAttr GetStyleForNewParagraph(wxRichTextBuffer* buffer, long pos, bool caretPosition = false, bool lookUpNewParaStyle=false) const; /** - Submits a command to insert the given text. + Inserts an object. */ - bool InsertTextWithUndo(long pos, const wxString& text, - wxRichTextCtrl* ctrl, int flags = 0); + wxRichTextObject* InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer, int flags = 0); /** - Returns @true if the buffer has been modified. + Submits a command to delete this range. */ - bool IsModified() const; + bool DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer); /** - Loads content from a stream. + Draws the floating objects in this buffer. */ - virtual bool LoadFile(wxInputStream& stream, - wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); + void DrawFloats(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); /** - Loads content from a file. + Moves an anchored object to another paragraph. */ - virtual bool LoadFile(const wxString& filename, - wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); + void MoveAnchoredObjectToParagraph(wxRichTextParagraph* from, wxRichTextParagraph* to, wxRichTextObject* obj); /** - Marks the buffer as modified or unmodified. + Initializes the object. */ - void Modify(bool modify = true); - - //@{ - /** - Numbers the paragraphs in the given range. - - Pass flags to determine how the attributes are set. - Either the style definition or the name of the style definition (in the current - sheet) can be passed. - - @a flags is a bit list of the following: - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. - - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from - @a startFrom, otherwise existing attributes are used. - - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used - as the level for all paragraphs, otherwise the current indentation will be used. - - @see SetListStyle(), PromoteList(), ClearListStyle() - */ - bool NumberList(const wxRichTextRange& range, - const wxRichTextListStyleDefinition* style, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int startFrom = -1, - int listLevel = -1); - bool Number(const wxRichTextRange& range, - const wxString& styleName, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int startFrom = -1, - int listLevel = -1); - //@} + void Init(); /** - Pastes the clipboard content to the buffer at the given position. + Clears all the children. */ - virtual bool PasteFromClipboard(long position); - - //@{ - /** - Promotes or demotes the paragraphs in the given range. - - A positive @a promoteBy produces a smaller indent, and a negative number - produces a larger indent. Pass flags to determine how the attributes are set. - Either the style definition or the name of the style definition (in the current - sheet) can be passed. - - @a flags is a bit list of the following: - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. - - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from - @a startFrom, otherwise existing attributes are used. - - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used - as the level for all paragraphs, otherwise the current indentation will be used. - - @see SetListStyle(), SetListStyle(), ClearListStyle() - */ - bool PromoteList(int promoteBy, const wxRichTextRange& range, - const wxRichTextListStyleDefinition* style, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int listLevel = -1); - bool PromoteList(int promoteBy, const wxRichTextRange& range, - const wxString& styleName, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int listLevel = -1); - //@} + virtual void Clear(); /** - Removes an event handler from the buffer's list of handlers, deleting the - object if @a deleteHandler is @true. + Clears and initializes with one blank paragraph. */ - bool RemoveEventHandler(wxEvtHandler* handler, - bool deleteHandler = false); + virtual void Reset(); /** - Removes a handler. + Convenience function to add a paragraph of text. */ - static bool RemoveHandler(const wxString& name); + virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL); /** - Clears the buffer, adds a new blank paragraph, and clears the command history. + Convenience function to add an image. */ - virtual void ResetAndClearCommands(); + virtual wxRichTextRange AddImage(const wxImage& image, wxRichTextAttr* paraStyle = NULL); /** - Saves content to a stream. + Adds multiple paragraphs, based on newlines. */ - virtual bool SaveFile(wxOutputStream& stream, - wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); + virtual wxRichTextRange AddParagraphs(const wxString& text, wxRichTextAttr* paraStyle = NULL); /** - Saves content to a file. + Returns the line at the given position. If @a caretPosition is true, the position is + a caret position, which is normally a smaller number. */ - virtual bool SaveFile(const wxString& filename, - wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); + virtual wxRichTextLine* GetLineAtPosition(long pos, bool caretPosition = false) const; /** - Sets the basic (overall) style. This is the style of the whole - buffer before further styles are applied, unlike the default style, which - only affects the style currently being applied (for example, setting the default - style to bold will cause subsequently inserted text to be bold). + Returns the line at the given y pixel position, or the last line. */ - virtual void SetBasicStyle(const wxTextAttr& style); + virtual wxRichTextLine* GetLineAtYPosition(int y) const; /** - Sets the default style, affecting the style currently being applied - (for example, setting the default style to bold will cause subsequently - inserted text to be bold). - - This is not cumulative - setting the default style will replace the previous - default style. + Returns the paragraph at the given character or caret position. */ - virtual bool SetDefaultStyle(const wxTextAttr& style); - - //@{ - /** - Sets the list attributes for the given range, passing flags to determine how - the attributes are set. - Either the style definition or the name of the style definition (in the current - sheet) can be passed. - - @a flags is a bit list of the following: - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. - - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from - @a startFrom, otherwise existing attributes are used. - - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used - as the level for all paragraphs, otherwise the current indentation will be used. - - @see NumberList(), PromoteList(), ClearListStyle(). - */ - bool SetListStyle(const wxRichTextRange& range, - const wxRichTextListStyleDefinition* style, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int startFrom = -1, - int listLevel = -1); - bool SetListStyle(const wxRichTextRange& range, - const wxString& styleName, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int startFrom = -1, - int listLevel = -1); - //@} + virtual wxRichTextParagraph* GetParagraphAtPosition(long pos, bool caretPosition = false) const; /** - Sets @a renderer as the object to be used to render certain aspects of the - content, such as bullets. - - You can override default rendering by deriving a new class from - wxRichTextRenderer or wxRichTextStdRenderer, overriding one or more - virtual functions, and setting an instance of the class using this function. + Returns the line size at the given position. */ - static void SetRenderer(wxRichTextRenderer* renderer); + virtual wxSize GetLineSizeAtPosition(long pos, bool caretPosition = false) const; + + /** + Given a position, returns the number of the visible line (potentially many to a paragraph), + starting from zero at the start of the buffer. We also have to pass a bool (@a startOfLine) + that indicates whether the caret is being shown at the end of the previous line or at the start + of the next, since the caret can be shown at two visible positions for the same underlying + position. + */ + virtual long GetVisibleLineNumber(long pos, bool caretPosition = false, bool startOfLine = false) const; + + /** + Given a line number, returns the corresponding wxRichTextLine object. + */ + virtual wxRichTextLine* GetLineForVisibleLineNumber(long lineNumber) const; + + /** + Returns the leaf object in a paragraph at this position. + */ + virtual wxRichTextObject* GetLeafObjectAtPosition(long position) const; + + /** + Returns the paragraph by number. + */ + virtual wxRichTextParagraph* GetParagraphAtLine(long paragraphNumber) const; + + /** + Returns the paragraph for a given line. + */ + virtual wxRichTextParagraph* GetParagraphForLine(wxRichTextLine* line) const; + + /** + Returns the length of the paragraph. + */ + virtual int GetParagraphLength(long paragraphNumber) const; + + /** + Returns the number of paragraphs. + */ + virtual int GetParagraphCount() const { return static_cast(GetChildCount()); } + + /** + Returns the number of visible lines. + */ + virtual int GetLineCount() const; + + /** + Returns the text of the paragraph. + */ + virtual wxString GetParagraphText(long paragraphNumber) const; + + /** + Converts zero-based line column and paragraph number to a position. + */ + virtual long XYToPosition(long x, long y) const; + + /** + Converts a zero-based position to line column and paragraph number. + */ + virtual bool PositionToXY(long pos, long* x, long* y) const; /** Sets the attributes for the given range. Pass flags to determine how the @@ -882,107 +2773,1149 @@ public: - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags are used in this operation. */ - virtual bool SetStyle(const wxRichTextRange& range, const wxTextAttr& style, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); + virtual bool SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); /** - Sets the current style sheet, if any. - - This will allow the application to use named character and paragraph - styles found in the style sheet. + Sets the attributes for the given object only, for example the box attributes for a text box. */ - void SetStyleSheet(wxRichTextStyleSheet* styleSheet); + virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); /** - Submit an action immediately, or delay it according to whether collapsing is on. + Returns the combined text attributes for this position. + + This function gets the @e uncombined style - that is, the attributes associated + with the paragraph or character content, and not necessarily the combined + attributes you see on the screen. To get the combined attributes, use GetStyle(). + If you specify (any) paragraph attribute in @e style's flags, this function + will fetch the paragraph attributes. + Otherwise, it will return the character attributes. */ - virtual bool SubmitAction(wxRichTextAction* action); + virtual bool GetStyle(long position, wxRichTextAttr& style); /** - Returns @true if undo suppression is currently on. + Returns the content (uncombined) attributes for this position. */ - virtual bool SuppressingUndo() const; + virtual bool GetUncombinedStyle(long position, wxRichTextAttr& style); + + /** + Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and + context attributes. + */ + virtual bool DoGetStyle(long position, wxRichTextAttr& style, bool combineStyles = true); + + /** + This function gets a style representing the common, combined attributes in the + given range. + Attributes which have different values within the specified range will not be + included the style flags. + + The function is used to get the attributes to display in the formatting dialog: + the user can edit the attributes common to the selection, and optionally specify the + values of further attributes to be applied uniformly. + + To apply the edited attributes, you can use SetStyle() specifying + the wxRICHTEXT_SETSTYLE_OPTIMIZE flag, which will only apply attributes that + are different from the @e combined attributes within the range. + So, the user edits the effective, displayed attributes for the range, + but his choice won't be applied unnecessarily to content. As an example, + say the style for a paragraph specifies bold, but the paragraph text doesn't + specify a weight. + The combined style is bold, and this is what the user will see on-screen and + in the formatting dialog. The user now specifies red text, in addition to bold. + When applying with SetStyle(), the content font weight attributes won't be + changed to bold because this is already specified by the paragraph. + However the text colour attributes @e will be changed to show red. + */ + virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style); + + /** + Combines @a style with @a currentStyle for the purpose of summarising the attributes of a range of + content. + */ + bool CollectStyle(wxRichTextAttr& currentStyle, const wxRichTextAttr& style, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr); + + //@{ + /** + Sets the list attributes for the given range, passing flags to determine how + the attributes are set. + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see NumberList(), PromoteList(), ClearListStyle(). + */ + virtual bool SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + virtual bool SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + //@} + + /** + Clears the list style from the given range, clearing list-related attributes + and applying any named paragraph style associated with each paragraph. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + + @see SetListStyle(), PromoteList(), NumberList() + */ + virtual bool ClearListStyle(const wxRichTextRange& range, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); + + //@{ + /** + Numbers the paragraphs in the given range. + + Pass flags to determine how the attributes are set. + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @a def can be NULL to indicate that the existing list style should be used. + + @see SetListStyle(), PromoteList(), ClearListStyle() + */ + virtual bool NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + virtual bool NumberList(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + //@} + + //@{ + /** + Promotes the list items within the given range. + A positive @a promoteBy produces a smaller indent, and a negative number + produces a larger indent. Pass flags to determine how the attributes are set. + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see SetListStyle(), SetListStyle(), ClearListStyle() + */ + virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); + virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); + //@} + + /** + Helper for NumberList and PromoteList, that does renumbering and promotion simultaneously + @a def can be NULL/empty to indicate that the existing list style should be used. + */ + virtual bool DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy, wxRichTextListStyleDefinition* def, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + + /** + Fills in the attributes for numbering a paragraph after previousParagraph. + */ + virtual bool FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxRichTextAttr& attr) const; + + /** + Test if this whole range has character attributes of the specified kind. If any + of the attributes are different within the range, the test fails. You + can use this to implement, for example, bold button updating. style must have + flags indicating which attributes are of interest. + */ + virtual bool HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const; + + /** + Test if this whole range has paragraph attributes of the specified kind. If any + of the attributes are different within the range, the test fails. You + can use this to implement, for example, centering button updating. style must have + flags indicating which attributes are of interest. + */ + virtual bool HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const; + + virtual wxRichTextObject* Clone() const { return new wxRichTextParagraphLayoutBox(*this); } + + /** + Insert fragment into this box at the given position. If partialParagraph is true, + it is assumed that the last (or only) paragraph is just a piece of data with no paragraph + marker. + */ + virtual bool InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment); + + /** + Make a copy of the fragment corresponding to the given range, putting it in @a fragment. + */ + virtual bool CopyFragment(const wxRichTextRange& range, wxRichTextParagraphLayoutBox& fragment); + + /** + Apply the style sheet to the buffer, for example if the styles have changed. + */ + virtual bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet); + + void Copy(const wxRichTextParagraphLayoutBox& obj); + + void operator= (const wxRichTextParagraphLayoutBox& obj) { Copy(obj); } + + /** + Calculate ranges. + */ + virtual void UpdateRanges(); + + /** + Get all the text. + */ + virtual wxString GetText() const; + + /** + Sets the default style, affecting the style currently being applied + (for example, setting the default style to bold will cause subsequently + inserted text to be bold). + + This is not cumulative - setting the default style will replace the previous + default style. + + Setting it to a default attribute object makes new content take on the 'basic' style. + */ + virtual bool SetDefaultStyle(const wxRichTextAttr& style); + + /** + Returns the current default style, affecting the style currently being applied + (for example, setting the default style to bold will cause subsequently + inserted text to be bold). + */ + virtual const wxRichTextAttr& GetDefaultStyle() const { return m_defaultAttributes; } + + /** + Sets the basic (overall) style. This is the style of the whole + buffer before further styles are applied, unlike the default style, which + only affects the style currently being applied (for example, setting the default + style to bold will cause subsequently inserted text to be bold). + */ + virtual void SetBasicStyle(const wxRichTextAttr& style) { m_attributes = style; } + + /** + Returns the basic (overall) style. + + This is the style of the whole buffer before further styles are applied, + unlike the default style, which only affects the style currently being + applied (for example, setting the default style to bold will cause + subsequently inserted text to be bold). + */ + virtual const wxRichTextAttr& GetBasicStyle() const { return m_attributes; } + + /** + Invalidates the buffer. With no argument, invalidates whole buffer. + */ + virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL); + + /** + Do the (in)validation for this object only. + */ + virtual void DoInvalidate(const wxRichTextRange& invalidRange); + + /** + Do the (in)validation both up and down the hierarchy. + */ + virtual void InvalidateHierarchy(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL); + + /** + Gather information about floating objects. If untilObj is non-NULL, + will stop getting information if the current object is this, since we + will collect the rest later. + */ + virtual bool UpdateFloatingObjects(const wxRect& availableRect, wxRichTextObject* untilObj = NULL); + + /** + Get invalid range, rounding to entire paragraphs if argument is true. + */ + wxRichTextRange GetInvalidRange(bool wholeParagraphs = false) const; + + /** + Returns @true if this object needs layout. + */ + bool IsDirty() const { return m_invalidRange != wxRICHTEXT_NONE; } + + /** + Returns the wxRichTextFloatCollector of this object. + */ + wxRichTextFloatCollector* GetFloatCollector() { return m_floatCollector; } + + /** + Returns the number of floating objects at this level. + */ + int GetFloatingObjectCount() const; + + /** + Returns a list of floating objects. + */ + bool GetFloatingObjects(wxRichTextObjectList& objects) const; + +protected: + wxRichTextCtrl* m_ctrl; + wxRichTextAttr m_defaultAttributes; + + // The invalidated range that will need full layout + wxRichTextRange m_invalidRange; + + // Is the last paragraph partial or complete? + bool m_partialParagraph; + + // The floating layout state + wxRichTextFloatCollector* m_floatCollector; }; - - /** - @class wxRichTextFileHandler + @class wxRichTextBox - This is the base class for file handlers, for loading and/or saving content - associated with a wxRichTextBuffer. + This class implements a floating or inline text box, containing paragraphs. @library{wxrichtext} @category{richtext} + + @see wxRichTextParagraphLayoutBox, wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl */ -class wxRichTextFileHandler : public wxObject + +class WXDLLIMPEXP_RICHTEXT wxRichTextBox: public wxRichTextParagraphLayoutBox +{ + DECLARE_DYNAMIC_CLASS(wxRichTextBox) +public: +// Constructors + + /** + Default constructor; optionally pass the parent object. + */ + + wxRichTextBox(wxRichTextObject* parent = NULL); + + /** + Copy constructor. + */ + + wxRichTextBox(const wxRichTextBox& obj): wxRichTextParagraphLayoutBox() { Copy(obj); } + +// Overridables + + virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); + + virtual wxString GetXMLNodeName() const { return wxT("textbox"); } + + virtual bool CanEditProperties() const { return true; } + + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer); + + virtual wxString GetPropertiesMenuLabel() const { return _("&Box"); } + +// Accessors + +// Operations + + virtual wxRichTextObject* Clone() const { return new wxRichTextBox(*this); } + + void Copy(const wxRichTextBox& obj); + +protected: +}; + +/** + @class wxRichTextLine + + This object represents a line in a paragraph, and stores + offsets from the start of the paragraph representing the + start and end positions of the line. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextLine +{ +public: +// Constructors + + wxRichTextLine(wxRichTextParagraph* parent); + wxRichTextLine(const wxRichTextLine& obj) { Init( NULL); Copy(obj); } + virtual ~wxRichTextLine() {} + +// Overridables + +// Accessors + + /** + Sets the range associated with this line. + */ + void SetRange(const wxRichTextRange& range) { m_range = range; } + /** + Sets the range associated with this line. + */ + void SetRange(long from, long to) { m_range = wxRichTextRange(from, to); } + + /** + Returns the parent paragraph. + */ + wxRichTextParagraph* GetParent() { return m_parent; } + + /** + Returns the range. + */ + const wxRichTextRange& GetRange() const { return m_range; } + /** + Returns the range. + */ + wxRichTextRange& GetRange() { return m_range; } + + /** + Returns the absolute range. + */ + wxRichTextRange GetAbsoluteRange() const; + + /** + Returns the line size as calculated by Layout. + */ + virtual wxSize GetSize() const { return m_size; } + + /** + Sets the line size as calculated by Layout. + */ + virtual void SetSize(const wxSize& sz) { m_size = sz; } + + /** + Returns the object position relative to the parent. + */ + virtual wxPoint GetPosition() const { return m_pos; } + + /** + Sets the object position relative to the parent. + */ + virtual void SetPosition(const wxPoint& pos) { m_pos = pos; } + + /** + Returns the absolute object position. + */ + virtual wxPoint GetAbsolutePosition() const; + + /** + Returns the rectangle enclosing the line. + */ + virtual wxRect GetRect() const { return wxRect(GetAbsolutePosition(), GetSize()); } + + /** + Sets the stored descent. + */ + void SetDescent(int descent) { m_descent = descent; } + + /** + Returns the stored descent. + */ + int GetDescent() const { return m_descent; } + +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING + wxArrayInt& GetObjectSizes() { return m_objectSizes; } + const wxArrayInt& GetObjectSizes() const { return m_objectSizes; } +#endif + +// Operations + + /** + Initialises the object. + */ + void Init(wxRichTextParagraph* parent); + + /** + Copies from @a obj. + */ + void Copy(const wxRichTextLine& obj); + + virtual wxRichTextLine* Clone() const { return new wxRichTextLine(*this); } + +protected: + + // The range of the line (start position to end position) + // This is relative to the parent paragraph. + wxRichTextRange m_range; + + // Size and position measured relative to top of paragraph + wxPoint m_pos; + wxSize m_size; + + // Maximum descent for this line (location of text baseline) + int m_descent; + + // The parent object + wxRichTextParagraph* m_parent; + +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING + wxArrayInt m_objectSizes; +#endif +}; + +WX_DECLARE_LIST_WITH_DECL( wxRichTextLine, wxRichTextLineList , class WXDLLIMPEXP_RICHTEXT ); + +/** + @class wxRichTextParagraph + + This object represents a single paragraph containing various objects such as text content, images, and further paragraph layout objects. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextParagraph: public wxRichTextCompositeObject +{ + DECLARE_DYNAMIC_CLASS(wxRichTextParagraph) +public: +// Constructors + + /** + Constructor taking a parent and style. + */ + wxRichTextParagraph(wxRichTextObject* parent = NULL, wxRichTextAttr* style = NULL); + /** + Constructor taking a text string, a parent and paragraph and character attributes. + */ + wxRichTextParagraph(const wxString& text, wxRichTextObject* parent = NULL, wxRichTextAttr* paraStyle = NULL, wxRichTextAttr* charStyle = NULL); + virtual ~wxRichTextParagraph(); + wxRichTextParagraph(const wxRichTextParagraph& obj): wxRichTextCompositeObject() { Copy(obj); } + +// Overridables + + virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); + + virtual bool Layout(wxDC& dc, const wxRect& rect, int style); + + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const; + + virtual bool FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart); + + virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0); + + virtual void CalculateRange(long start, long& end); + + virtual wxString GetXMLNodeName() const { return wxT("paragraph"); } + +// Accessors + + /** + Returns the cached lines. + */ + wxRichTextLineList& GetLines() { return m_cachedLines; } + +// Operations + + /** + Copies the object. + */ + void Copy(const wxRichTextParagraph& obj); + + virtual wxRichTextObject* Clone() const { return new wxRichTextParagraph(*this); } + + /** + Clears the cached lines. + */ + void ClearLines(); + +// Implementation + + /** + Applies paragraph styles such as centering to the wrapped lines. + */ + virtual void ApplyParagraphStyle(wxRichTextLine* line, const wxRichTextAttr& attr, const wxRect& rect, wxDC& dc); + + /** + Inserts text at the given position. + */ + virtual bool InsertText(long pos, const wxString& text); + + /** + Splits an object at this position if necessary, and returns + the previous object, or NULL if inserting at the beginning. + */ + virtual wxRichTextObject* SplitAt(long pos, wxRichTextObject** previousObject = NULL); + + /** + Moves content to a list from this point. + */ + virtual void MoveToList(wxRichTextObject* obj, wxList& list); + + /** + Adds content back from a list. + */ + virtual void MoveFromList(wxList& list); + + /** + Returns the plain text searching from the start or end of the range. + The resulting string may be shorter than the range given. + */ + bool GetContiguousPlainText(wxString& text, const wxRichTextRange& range, bool fromStart = true); + + /** + Finds a suitable wrap position. @a wrapPosition is the last position in the line to the left + of the split. + */ + bool FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents); + + /** + Finds the object at the given position. + */ + wxRichTextObject* FindObjectAtPosition(long position); + + /** + Returns the bullet text for this paragraph. + */ + wxString GetBulletText(); + + /** + Allocates or reuses a line object. + */ + wxRichTextLine* AllocateLine(int pos); + + /** + Clears remaining unused line objects, if any. + */ + bool ClearUnusedLines(int lineCount); + + /** + Returns combined attributes of the base style, paragraph style and character style. We use this to dynamically + retrieve the actual style. + */ + wxRichTextAttr GetCombinedAttributes(const wxRichTextAttr& contentStyle, bool includingBoxAttr = false) const; + + /** + Returns the combined attributes of the base style and paragraph style. + */ + wxRichTextAttr GetCombinedAttributes(bool includingBoxAttr = false) const; + + /** + Returns the first position from pos that has a line break character. + */ + long GetFirstLineBreakPosition(long pos); + + /** + Creates a default tabstop array. + */ + static void InitDefaultTabs(); + + /** + Clears the default tabstop array. + */ + static void ClearDefaultTabs(); + + /** + Returns the default tabstop array. + */ + static const wxArrayInt& GetDefaultTabs() { return sm_defaultTabs; } + + /** + Lays out the floating objects. + */ + void LayoutFloat(wxDC& dc, const wxRect& rect, int style, wxRichTextFloatCollector* floatCollector); + +protected: + + // The lines that make up the wrapped paragraph + wxRichTextLineList m_cachedLines; + + // Default tabstops + static wxArrayInt sm_defaultTabs; + +friend class wxRichTextFloatCollector; +}; + +/** + @class wxRichTextPlainText + + This object represents a single piece of text. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextPlainText: public wxRichTextObject +{ + DECLARE_DYNAMIC_CLASS(wxRichTextPlainText) +public: +// Constructors + + /** + Constructor. + */ + wxRichTextPlainText(const wxString& text = wxEmptyString, wxRichTextObject* parent = NULL, wxRichTextAttr* style = NULL); + + /** + Copy constructor. + */ + wxRichTextPlainText(const wxRichTextPlainText& obj): wxRichTextObject() { Copy(obj); } + +// Overridables + + virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); + + virtual bool Layout(wxDC& dc, const wxRect& rect, int style); + + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const; + + virtual wxString GetTextForRange(const wxRichTextRange& range) const; + + virtual wxRichTextObject* DoSplit(long pos); + + virtual void CalculateRange(long start, long& end); + + virtual bool DeleteRange(const wxRichTextRange& range); + + virtual bool IsEmpty() const { return m_text.empty(); } + + virtual bool CanMerge(wxRichTextObject* object) const; + + virtual bool Merge(wxRichTextObject* object); + + virtual void Dump(wxTextOutputStream& stream); + + /** + Get the first position from pos that has a line break character. + */ + long GetFirstLineBreakPosition(long pos); + + /// Does this object take note of paragraph attributes? Text and image objects don't. + virtual bool UsesParagraphAttributes() const { return false; } + +#if wxUSE_XML + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse); +#endif + +#if wxRICHTEXT_HAVE_DIRECT_OUTPUT + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler); +#endif + +#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler); +#endif + + virtual wxString GetXMLNodeName() const { return wxT("text"); } + +// Accessors + + /** + Returns the text. + */ + const wxString& GetText() const { return m_text; } + + /** + Sets the text. + */ + void SetText(const wxString& text) { m_text = text; } + +// Operations + + // Copies the text object, + void Copy(const wxRichTextPlainText& obj); + + // Clones the text object. + virtual wxRichTextObject* Clone() const { return new wxRichTextPlainText(*this); } + +private: + bool DrawTabbedString(wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, wxString& str, wxCoord& x, wxCoord& y, bool selected); + +protected: + wxString m_text; +}; + +/** + @class wxRichTextImageBlock + + This class stores information about an image, in binary in-memory form. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextImageBlock: public wxObject { public: /** Constructor. */ - wxRichTextFileHandler(const wxString& name = wxEmptyString, - const wxString& ext = wxEmptyString, - int type = 0); + wxRichTextImageBlock(); /** - Override this function and return @true if this handler can we handle - @a filename. - - By default, this function checks the extension. + Copy constructor. */ - virtual bool CanHandle(const wxString& filename) const; + wxRichTextImageBlock(const wxRichTextImageBlock& block); + virtual ~wxRichTextImageBlock(); /** - Override and return @true if this handler can load content. + Initialises the block. */ - virtual bool CanLoad() const; + void Init(); /** - Override and return @true if this handler can save content. + Clears the block. */ - virtual bool CanSave() const; + + void Clear(); /** - Returns the encoding associated with the handler (if any). + Load the original image into a memory block. + If the image is not a JPEG, we must convert it into a JPEG + to conserve space. + If it's not a JPEG we can make use of @a image, already scaled, so we don't have to + load the image a second time. */ - const wxString& GetEncoding() const; + virtual bool MakeImageBlock(const wxString& filename, wxBitmapType imageType, + wxImage& image, bool convertToJPEG = true); /** - Returns the extension associated with the handler. + Make an image block from the wxImage in the given + format. + */ + virtual bool MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality = 80); + + /** + Uses a const wxImage for efficiency, but can't set quality (only relevant for JPEG) + */ + virtual bool MakeImageBlockDefaultQuality(const wxImage& image, wxBitmapType imageType); + + /** + Makes the image block. + */ + virtual bool DoMakeImageBlock(const wxImage& image, wxBitmapType imageType); + + /** + Writes the block to a file. + */ + bool Write(const wxString& filename); + + /** + Writes the data in hex to a stream. + */ + bool WriteHex(wxOutputStream& stream); + + /** + Reads the data in hex from a stream. + */ + bool ReadHex(wxInputStream& stream, int length, wxBitmapType imageType); + + /** + Copy from @a block. + */ + void Copy(const wxRichTextImageBlock& block); + + // Load a wxImage from the block + /** + */ + bool Load(wxImage& image); + +// Operators + + /** + Assignment operation. + */ + void operator=(const wxRichTextImageBlock& block); + +// Accessors + + /** + Returns the raw data. + */ + unsigned char* GetData() const { return m_data; } + + /** + Returns the data size in bytes. + */ + size_t GetDataSize() const { return m_dataSize; } + + /** + Returns the image type. + */ + wxBitmapType GetImageType() const { return m_imageType; } + + /** + */ + void SetData(unsigned char* image) { m_data = image; } + + /** + Sets the data size. + */ + void SetDataSize(size_t size) { m_dataSize = size; } + + /** + Sets the image type. + */ + void SetImageType(wxBitmapType imageType) { m_imageType = imageType; } + + /** + Returns @true if the data is non-NULL. + */ + bool IsOk() const { return GetData() != NULL; } + bool Ok() const { return IsOk(); } + + /** + Gets the extension for the block's type. */ wxString GetExtension() const; - /** - Returns flags that change the behaviour of loading or saving. - - See the documentation for each handler class to see what flags are - relevant for each handler. - */ - int GetFlags() const; +/// Implementation /** - Returns the name of the handler. + Allocates and reads from a stream as a block of memory. */ - wxString GetName() const; + static unsigned char* ReadBlock(wxInputStream& stream, size_t size); /** - Returns the type of the handler. + Allocates and reads from a file as a block of memory. */ - int GetType() const; + static unsigned char* ReadBlock(const wxString& filename, size_t size); /** - Returns @true if this handler should be visible to the user. + Writes a memory block to stream. */ - virtual bool IsVisible() const; + static bool WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size); + + /** + Writes a memory block to a file. + */ + static bool WriteBlock(const wxString& filename, unsigned char* block, size_t size); + +protected: + // Size in bytes of the image stored. + // This is in the raw, original form such as a JPEG file. + unsigned char* m_data; + size_t m_dataSize; + wxBitmapType m_imageType; +}; + +/** + @class wxRichTextImage + + This class implements a graphic object. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl, wxRichTextImageBlock +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextImage: public wxRichTextObject +{ + DECLARE_DYNAMIC_CLASS(wxRichTextImage) +public: +// Constructors + + /** + Default constructor. + */ + wxRichTextImage(wxRichTextObject* parent = NULL): wxRichTextObject(parent) { } + + /** + Creates a wxRichTextImage from a wxImage. + */ + wxRichTextImage(const wxImage& image, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL); + + /** + Creates a wxRichTextImage from an image block. + */ + wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL); + + /** + Copy constructor. + */ + wxRichTextImage(const wxRichTextImage& obj): wxRichTextObject(obj) { Copy(obj); } + +// Overridables + + virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); + + virtual bool Layout(wxDC& dc, const wxRect& rect, int style); + + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const; + + /** + Returns the 'natural' size for this object - the image size. + */ + virtual wxTextAttrSize GetNaturalSize() const; + + virtual bool IsEmpty() const { return false; /* !m_imageBlock.IsOk(); */ } + + virtual bool CanEditProperties() const { return true; } + + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer); + + virtual wxString GetPropertiesMenuLabel() const { return _("&Picture"); } + + virtual bool UsesParagraphAttributes() const { return false; } + +#if wxUSE_XML + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse); +#endif + +#if wxRICHTEXT_HAVE_DIRECT_OUTPUT + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler); +#endif + +#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler); +#endif + + // Images can be floatable (optionally). + virtual bool IsFloatable() const { return true; } + + virtual wxString GetXMLNodeName() const { return wxT("image"); } + +// Accessors + + /** + Returns the image cache (a scaled bitmap). + */ + const wxBitmap& GetImageCache() const { return m_imageCache; } + + /** + Sets the image cache. + */ + void SetImageCache(const wxBitmap& bitmap) { m_imageCache = bitmap; } + + /** + Resets the image cache. + */ + void ResetImageCache() { m_imageCache = wxNullBitmap; } + + /** + Returns the image block containing the raw data. + */ + wxRichTextImageBlock& GetImageBlock() { return m_imageBlock; } + +// Operations + + /** + Copies the image object. + */ + void Copy(const wxRichTextImage& obj); + + /** + Clones the image object. + */ + virtual wxRichTextObject* Clone() const { return new wxRichTextImage(*this); } + + /** + Creates a cached image at the required size. + */ + virtual bool LoadImageCache(wxDC& dc, bool resetCache = false); + +protected: + wxRichTextImageBlock m_imageBlock; + wxBitmap m_imageCache; +}; + +class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCommand; +class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction; + +/** + @class wxRichTextBuffer + + This is a kind of paragraph layout box, used to represent the whole buffer. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextParagraphLayoutBox, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer: public wxRichTextParagraphLayoutBox +{ + DECLARE_DYNAMIC_CLASS(wxRichTextBuffer) +public: +// Constructors + + /** + Default constructor. + */ + wxRichTextBuffer() { Init(); } + + /** + Copy constructor. + */ + wxRichTextBuffer(const wxRichTextBuffer& obj): wxRichTextParagraphLayoutBox() { Init(); Copy(obj); } + + virtual ~wxRichTextBuffer() ; + +// Accessors + + /** + Returns the command processor. + A text buffer always creates its own command processor when it is initialized. + */ + wxCommandProcessor* GetCommandProcessor() const { return m_commandProcessor; } + + /** + Sets style sheet, if any. This will allow the application to use named character and paragraph + styles found in the style sheet. + + Neither the buffer nor the control owns the style sheet so must be deleted by the application. + */ + void SetStyleSheet(wxRichTextStyleSheet* styleSheet) { m_styleSheet = styleSheet; } + + /** + Returns the style sheet. + */ + virtual wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; } + + /** + Sets the style sheet and sends a notification of the change. + */ + bool SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet); + + /** + Pushes the style sheet to the top of the style sheet stack. + */ + bool PushStyleSheet(wxRichTextStyleSheet* styleSheet); + + /** + Pops the style sheet from the top of the style sheet stack. + */ + wxRichTextStyleSheet* PopStyleSheet(); + + /** + Returns the table storing fonts, for quick access and font reuse. + */ + wxRichTextFontTable& GetFontTable() { return m_fontTable; } + + /** + Returns the table storing fonts, for quick access and font reuse. + */ + const wxRichTextFontTable& GetFontTable() const { return m_fontTable; } + + /** + Sets table storing fonts, for quick access and font reuse. + */ + void SetFontTable(const wxRichTextFontTable& table) { m_fontTable = table; } + +// Operations + + /** + Initialisation. + */ + void Init(); + + /** + Clears the buffer, adds an empty paragraph, and clears the command processor. + */ + virtual void ResetAndClearCommands(); //@{ /** Loads content from a stream or file. Not all handlers will implement file loading. */ - bool LoadFile(wxRichTextBuffer* buffer, wxInputStream& stream); - bool LoadFile(wxRichTextBuffer* buffer, const wxString& filename); + virtual bool LoadFile(const wxString& filename, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); + virtual bool LoadFile(wxInputStream& stream, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); //@} //@{ @@ -990,20 +3923,1263 @@ public: Saves content to a stream or file. Not all handlers will implement file saving. */ - bool SaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream); - bool SaveFile(wxRichTextBuffer* buffer, const wxString& filename); + virtual bool SaveFile(const wxString& filename, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); + virtual bool SaveFile(wxOutputStream& stream, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY); //@} /** - Sets the encoding to use when saving a file. - If empty, a suitable encoding is chosen. + Sets the handler flags, controlling loading and saving. */ - void SetEncoding(const wxString& encoding); + void SetHandlerFlags(int flags) { m_handlerFlags = flags; } + + /** + Gets the handler flags, controlling loading and saving. + */ + int GetHandlerFlags() const { return m_handlerFlags; } + + /** + Convenience function to add a paragraph of text. + */ + virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL) { Modify(); return wxRichTextParagraphLayoutBox::AddParagraph(text, paraStyle); } + + /** + Begin collapsing undo/redo commands. Note that this may not work properly + if combining commands that delete or insert content, changing ranges for + subsequent actions. + + @a cmdName should be the name of the combined command that will appear + next to Undo and Redo in the edit menu. + */ + virtual bool BeginBatchUndo(const wxString& cmdName); + + /** + End collapsing undo/redo commands. + */ + virtual bool EndBatchUndo(); + + /** + Returns @true if we are collapsing commands. + */ + virtual bool BatchingUndo() const { return m_batchedCommandDepth > 0; } + + /** + Submit the action immediately, or delay according to whether collapsing is on. + */ + virtual bool SubmitAction(wxRichTextAction* action); + + /** + Returns the collapsed command. + */ + virtual wxRichTextCommand* GetBatchedCommand() const { return m_batchedCommand; } + + /** + Begin suppressing undo/redo commands. The way undo is suppressed may be implemented + differently by each command. If not dealt with by a command implementation, then + it will be implemented automatically by not storing the command in the undo history + when the action is submitted to the command processor. + */ + virtual bool BeginSuppressUndo(); + + /** + End suppressing undo/redo commands. + */ + virtual bool EndSuppressUndo(); + + /** + Are we suppressing undo?? + */ + virtual bool SuppressingUndo() const { return m_suppressUndo > 0; } + + /** + Copy the range to the clipboard. + */ + virtual bool CopyToClipboard(const wxRichTextRange& range); + + /** + Paste the clipboard content to the buffer. + */ + virtual bool PasteFromClipboard(long position); + + /** + Returns @true if we can paste from the clipboard. + */ + virtual bool CanPasteFromClipboard() const; + + /** + Begin using a style. + */ + virtual bool BeginStyle(const wxRichTextAttr& style); + + /** + End the style. + */ + virtual bool EndStyle(); + + /** + End all styles. + */ + virtual bool EndAllStyles(); + + /** + Clears the style stack. + */ + virtual void ClearStyleStack(); + + /** + Returns the size of the style stack, for example to check correct nesting. + */ + virtual size_t GetStyleStackSize() const { return m_attributeStack.GetCount(); } + + /** + Begins using bold. + */ + bool BeginBold(); + + /** + Ends using bold. + */ + bool EndBold() { return EndStyle(); } + + /** + Begins using italic. + */ + bool BeginItalic(); + + /** + Ends using italic. + */ + bool EndItalic() { return EndStyle(); } + + /** + Begins using underline. + */ + bool BeginUnderline(); + + /** + Ends using underline. + */ + bool EndUnderline() { return EndStyle(); } + + /** + Begins using point size. + */ + bool BeginFontSize(int pointSize); + + /** + Ends using point size. + */ + bool EndFontSize() { return EndStyle(); } + + /** + Begins using this font. + */ + bool BeginFont(const wxFont& font); + + /** + Ends using a font. + */ + bool EndFont() { return EndStyle(); } + + /** + Begins using this colour. + */ + bool BeginTextColour(const wxColour& colour); + + /** + Ends using a colour. + */ + bool EndTextColour() { return EndStyle(); } + + /** + Begins using alignment. + */ + bool BeginAlignment(wxTextAttrAlignment alignment); + + /** + Ends alignment. + */ + bool EndAlignment() { return EndStyle(); } + + /** + Begins using @a leftIndent for the left indent, and optionally @a leftSubIndent for + the sub-indent. Both are expressed in tenths of a millimetre. + + The sub-indent is an offset from the left of the paragraph, and is used for all + but the first line in a paragraph. A positive value will cause the first line to appear + to the left of the subsequent lines, and a negative value will cause the first line to be + indented relative to the subsequent lines. + */ + bool BeginLeftIndent(int leftIndent, int leftSubIndent = 0); + + /** + Ends left indent. + */ + bool EndLeftIndent() { return EndStyle(); } + + /** + Begins a right indent, specified in tenths of a millimetre. + */ + bool BeginRightIndent(int rightIndent); + + /** + Ends right indent. + */ + bool EndRightIndent() { return EndStyle(); } + + /** + Begins paragraph spacing; pass the before-paragraph and after-paragraph spacing + in tenths of a millimetre. + */ + bool BeginParagraphSpacing(int before, int after); + + /** + Ends paragraph spacing. + */ + bool EndParagraphSpacing() { return EndStyle(); } + + /** + Begins line spacing using the specified value. @e spacing is a multiple, where + 10 means single-spacing, 15 means 1.5 spacing, and 20 means double spacing. + + The ::wxTextAttrLineSpacing enumeration values are defined for convenience. + */ + bool BeginLineSpacing(int lineSpacing); + + /** + Ends line spacing. + */ + bool EndLineSpacing() { return EndStyle(); } + + /** + Begins numbered bullet. + + This call will be needed for each item in the list, and the + application should take care of incrementing the numbering. + + @a bulletNumber is a number, usually starting with 1. + @a leftIndent and @a leftSubIndent are values in tenths of a millimetre. + @a bulletStyle is a bitlist of the following values: + + wxRichTextBuffer uses indentation to render a bulleted item. + The left indent is the distance between the margin and the bullet. + The content of the paragraph, including the first line, starts + at leftMargin + leftSubIndent. + So the distance between the left edge of the bullet and the + left of the actual paragraph is leftSubIndent. + */ + bool BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD); + + /** + Ends numbered bullet. + */ + bool EndNumberedBullet() { return EndStyle(); } + + /** + Begins applying a symbol bullet, using a character from the current font. + + See BeginNumberedBullet() for an explanation of how indentation is used + to render the bulleted paragraph. + */ + bool BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL); + + /** + Ends symbol bullet. + */ + bool EndSymbolBullet() { return EndStyle(); } + + /** + Begins applying a standard bullet, using one of the standard bullet names + (currently @c standard/circle or @c standard/square. + + See BeginNumberedBullet() for an explanation of how indentation is used to + render the bulleted paragraph. + */ + bool BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_STANDARD); + + /** + Ends standard bullet. + */ + bool EndStandardBullet() { return EndStyle(); } + + /** + Begins named character style. + */ + bool BeginCharacterStyle(const wxString& characterStyle); + + /** + Ends named character style. + */ + bool EndCharacterStyle() { return EndStyle(); } + + /** + Begins named paragraph style. + */ + bool BeginParagraphStyle(const wxString& paragraphStyle); + + /** + Ends named character style. + */ + bool EndParagraphStyle() { return EndStyle(); } + + /** + Begins named list style. + + Optionally, you can also pass a level and a number. + */ + bool BeginListStyle(const wxString& listStyle, int level = 1, int number = 1); + + /** + Ends named character style. + */ + bool EndListStyle() { return EndStyle(); } + + /** + Begins applying wxTEXT_ATTR_URL to the content. + + Pass a URL and optionally, a character style to apply, since it is common + to mark a URL with a familiar style such as blue text with underlining. + */ + bool BeginURL(const wxString& url, const wxString& characterStyle = wxEmptyString); + + /** + Ends URL. + */ + bool EndURL() { return EndStyle(); } + +// Event handling + + /** + Adds an event handler. + + A buffer associated with a control has the control as the only event handler, + but the application is free to add more if further notification is required. + All handlers are notified of an event originating from the buffer, such as + the replacement of a style sheet during loading. + + The buffer never deletes any of the event handlers, unless RemoveEventHandler() + is called with @true as the second argument. + */ + bool AddEventHandler(wxEvtHandler* handler); + + /** + Removes an event handler from the buffer's list of handlers, deleting the + object if @a deleteHandler is @true. + */ + bool RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler = false); + + /** + Clear event handlers. + */ + void ClearEventHandlers(); + + /** + Send event to event handlers. If sendToAll is true, will send to all event handlers, + otherwise will stop at the first successful one. + */ + bool SendEvent(wxEvent& event, bool sendToAll = true); + +// Implementation + + virtual int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0); + + /** + Copies the buffer. + */ + void Copy(const wxRichTextBuffer& obj); + + /** + Assignment operator. + */ + void operator= (const wxRichTextBuffer& obj) { Copy(obj); } + + /** + Clones the buffer. + */ + virtual wxRichTextObject* Clone() const { return new wxRichTextBuffer(*this); } + + /** + Submits a command to insert paragraphs. + */ + bool InsertParagraphsWithUndo(long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int flags = 0); + + /** + Submits a command to insert the given text. + */ + bool InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags = 0); + + /** + Submits a command to insert a newline. + */ + bool InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags = 0); + + /** + Submits a command to insert the given image. + */ + bool InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags = 0, + const wxRichTextAttr& textAttr = wxRichTextAttr()); + + /** + Submits a command to insert an object. + */ + wxRichTextObject* InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags); + + /** + Submits a command to delete this range. + */ + bool DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl); + + /** + Mark modified. + */ + void Modify(bool modify = true) { m_modified = modify; } + + /** + Returns @true if the buffer was modified. + */ + bool IsModified() const { return m_modified; } + + //@{ + /** + Dumps contents of buffer for debugging purposes. + */ + virtual void Dump(); + virtual void Dump(wxTextOutputStream& stream) { wxRichTextParagraphLayoutBox::Dump(stream); } + //@} + + /** + Returns the file handlers. + */ + static wxList& GetHandlers() { return sm_handlers; } + + /** + Adds a file handler to the end. + */ + static void AddHandler(wxRichTextFileHandler *handler); + + /** + Inserts a file handler at the front. + */ + static void InsertHandler(wxRichTextFileHandler *handler); + + /** + Removes a file handler. + */ + static bool RemoveHandler(const wxString& name); + + /** + Finds a file handler by name. + */ + static wxRichTextFileHandler *FindHandler(const wxString& name); + + /** + Finds a file handler by extension and type. + */ + static wxRichTextFileHandler *FindHandler(const wxString& extension, wxRichTextFileType imageType); + + /** + Finds a handler by filename or, if supplied, type. + */ + static wxRichTextFileHandler *FindHandlerFilenameOrType(const wxString& filename, + wxRichTextFileType imageType); + + /** + Finds a handler by type. + */ + static wxRichTextFileHandler *FindHandler(wxRichTextFileType imageType); + + /** + Gets a wildcard incorporating all visible handlers. If @a types is present, + it will be filled with the file type corresponding to each filter. This can be + used to determine the type to pass to LoadFile given a selected filter. + */ + static wxString GetExtWildcard(bool combine = false, bool save = false, wxArrayInt* types = NULL); + + /** + Clean up file handlers. + */ + static void CleanUpHandlers(); + + /** + Initialise the standard file handlers. + Currently, only the plain text loading/saving handler is initialised by default. + */ + static void InitStandardHandlers(); + + /** + Returns the renderer object. + */ + static wxRichTextRenderer* GetRenderer() { return sm_renderer; } + + /** + Sets @a renderer as the object to be used to render certain aspects of the + content, such as bullets. + + You can override default rendering by deriving a new class from + wxRichTextRenderer or wxRichTextStdRenderer, overriding one or more + virtual functions, and setting an instance of the class using this function. + */ + static void SetRenderer(wxRichTextRenderer* renderer); + + /** + Returns the minimum margin between bullet and paragraph in 10ths of a mm. + */ + static int GetBulletRightMargin() { return sm_bulletRightMargin; } + + /** + Sets the minimum margin between bullet and paragraph in 10ths of a mm. + */ + static void SetBulletRightMargin(int margin) { sm_bulletRightMargin = margin; } + + /** + Returns the factor to multiply by character height to get a reasonable bullet size. + */ + static float GetBulletProportion() { return sm_bulletProportion; } + + /** + Sets the factor to multiply by character height to get a reasonable bullet size. + */ + static void SetBulletProportion(float prop) { sm_bulletProportion = prop; } + + /** + Returns the scale factor for calculating dimensions. + */ + double GetScale() const { return m_scale; } + + /** + Sets the scale factor for calculating dimensions. + */ + void SetScale(double scale) { m_scale = scale; } + +protected: + + /// Command processor + wxCommandProcessor* m_commandProcessor; + + /// Table storing fonts + wxRichTextFontTable m_fontTable; + + /// Has been modified? + bool m_modified; + + /// Collapsed command stack + int m_batchedCommandDepth; + + /// Name for collapsed command + wxString m_batchedCommandsName; + + /// Current collapsed command accumulating actions + wxRichTextCommand* m_batchedCommand; + + /// Whether to suppress undo + int m_suppressUndo; + + /// Style sheet, if any + wxRichTextStyleSheet* m_styleSheet; + + /// List of event handlers that will be notified of events + wxList m_eventHandlers; + + /// Stack of attributes for convenience functions + wxList m_attributeStack; + + /// Flags to be passed to handlers + int m_handlerFlags; + + /// File handlers + static wxList sm_handlers; + + /// Renderer + static wxRichTextRenderer* sm_renderer; + + /// Minimum margin between bullet and paragraph in 10ths of a mm + static int sm_bulletRightMargin; + + /// Factor to multiply by character height to get a reasonable bullet size + static float sm_bulletProportion; + + /// Scaling factor in use: needed to calculate correct dimensions when printing + double m_scale; +}; + +/** + @class wxRichTextCell + + wxRichTextCell is the cell in a table. + */ + +class WXDLLIMPEXP_RICHTEXT wxRichTextCell: public wxRichTextBox +{ + DECLARE_DYNAMIC_CLASS(wxRichTextCell) +public: +// Constructors + + /** + Default constructor; optionally pass the parent object. + */ + + wxRichTextCell(wxRichTextObject* parent = NULL); + + /** + Copy constructor. + */ + + wxRichTextCell(const wxRichTextCell& obj): wxRichTextBox() { Copy(obj); } + +// Overridables + + virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); + + virtual wxString GetXMLNodeName() const { return wxT("cell"); } + + virtual bool CanEditProperties() const { return true; } + + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer); + + virtual wxString GetPropertiesMenuLabel() const { return _("&Cell"); } + +// Accessors + +// Operations + + virtual wxRichTextObject* Clone() const { return new wxRichTextCell(*this); } + + void Copy(const wxRichTextCell& obj); + +protected: +}; + +/** + @class wxRichTextTable + + wxRichTextTable represents a table with arbitrary columns and rows. + */ + +WX_DEFINE_ARRAY_PTR(wxRichTextObject*, wxRichTextObjectPtrArray); +WX_DECLARE_OBJARRAY(wxRichTextObjectPtrArray, wxRichTextObjectPtrArrayArray); + +class WXDLLIMPEXP_RICHTEXT wxRichTextTable: public wxRichTextBox +{ + DECLARE_DYNAMIC_CLASS(wxRichTextTable) +public: + +// Constructors + + /** + Default constructor; optionally pass the parent object. + */ + + wxRichTextTable(wxRichTextObject* parent = NULL); + + /** + Copy constructor. + */ + + wxRichTextTable(const wxRichTextTable& obj): wxRichTextBox() { Copy(obj); } + +// Overridables + + virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); + + virtual wxString GetXMLNodeName() const { return wxT("table"); } + + virtual bool Layout(wxDC& dc, const wxRect& rect, int style); + + virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const; + + virtual bool DeleteRange(const wxRichTextRange& range); + + virtual wxString GetTextForRange(const wxRichTextRange& range) const; + +#if wxUSE_XML + virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse); +#endif + +#if wxRICHTEXT_HAVE_DIRECT_OUTPUT + virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler); +#endif + +#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT + virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler); +#endif + + virtual bool FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart); + + virtual void CalculateRange(long start, long& end); + + // Can this object handle the selections of its children? FOr example, a table. + virtual bool HandlesChildSelections() const { return true; } + + /// Returns a selection object specifying the selections between start and end character positions. + /// For example, a table would deduce what cells (of range length 1) are selected when dragging across the table. + virtual wxRichTextSelection GetSelection(long start, long end) const; + + virtual bool CanEditProperties() const { return true; } + + virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer); + + virtual wxString GetPropertiesMenuLabel() const { return _("&Table"); } + + // Returns true if objects of this class can accept the focus, i.e. a call to SetFocusObject + // is possible. For example, containers supporting text, such as a text box object, can accept the focus, + // but a table can't (set the focus to individual cells instead). + virtual bool AcceptsFocus() const { return false; } + +// Accessors + + /** + Returns the cells array. + */ + const wxRichTextObjectPtrArrayArray& GetCells() const { return m_cells; } + + /** + Returns the cells array. + */ + wxRichTextObjectPtrArrayArray& GetCells() { return m_cells; } + + /** + Returns the row count. + */ + int GetRowCount() const { return m_rowCount; } + + /** + Returns the column count. + */ + int GetColumnCount() const { return m_colCount; } + + /** + Returns the cell at the given row/column position. + */ + virtual wxRichTextCell* GetCell(int row, int col) const; + + /** + Returns the cell at the given character position (in the range of the table). + */ + virtual wxRichTextCell* GetCell(long pos) const; + + /** + Returns the row/column for a given character position. + */ + virtual bool GetCellRowColumnPosition(long pos, int& row, int& col) const; + +// Operations + + /** + Clears the table. + */ + + virtual void ClearTable(); + + /** + Creates a table of the given dimensions. + */ + + virtual bool CreateTable(int rows, int cols); + + /** + Sets the attributes for the cells specified by the selection. + */ + + virtual bool SetCellStyle(const wxRichTextSelection& selection, const wxRichTextAttr& style, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); + + /** + Deletes rows from the given row position. + */ + + virtual bool DeleteRows(int startRow, int noRows = 1); + + /** + Deletes columns from the given column position. + */ + + virtual bool DeleteColumns(int startCol, int noCols = 1); + + /** + Adds rows from the given row position. + */ + + virtual bool AddRows(int startRow, int noRows = 1, const wxRichTextAttr& attr = wxRichTextAttr()); + + /** + Adds columns from the given column position. + */ + + virtual bool AddColumns(int startCol, int noCols = 1, const wxRichTextAttr& attr = wxRichTextAttr()); + + // Makes a clone of this object. + virtual wxRichTextObject* Clone() const { return new wxRichTextTable(*this); } + + // Copies this object. + void Copy(const wxRichTextTable& obj); + +protected: + + int m_rowCount; + int m_colCount; + + // An array of rows, each of which is a wxRichTextObjectPtrArray containing + // the cell objects. The cell objects are also children of this object. + // Problem: if boxes are immediate children of a box, this will cause problems + // with wxRichTextParagraphLayoutBox functions (and functions elsewhere) that + // expect to find just paragraphs. May have to adjust the way we handle the + // hierarchy to accept non-paragraph objects in a paragraph layout box. + // We'll be overriding much wxRichTextParagraphLayoutBox functionality so this + // may not be such a problem. Perhaps the table should derive from a different + // class? + wxRichTextObjectPtrArrayArray m_cells; +}; + + +/** + The command identifiers for Do/Undo. +*/ + +enum wxRichTextCommandId +{ + wxRICHTEXT_INSERT, + wxRICHTEXT_DELETE, + wxRICHTEXT_CHANGE_ATTRIBUTES, + wxRICHTEXT_CHANGE_STYLE, + wxRICHTEXT_CHANGE_OBJECT +}; + +/** + @class wxRichTextObjectAddress + + A class for specifying an object anywhere in an object hierarchy, + without using a pointer, necessary since wxRTC commands may delete + and recreate sub-objects so physical object addresses change. An array + of positions (one per hierarchy level) is used. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextCommand +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextObjectAddress +{ +public: + /** + Creates the address given a container and an object. + */ + wxRichTextObjectAddress(wxRichTextParagraphLayoutBox* topLevelContainer, wxRichTextObject* obj) { Create(topLevelContainer, obj); } + /** + */ + wxRichTextObjectAddress() { Init(); } + /** + */ + wxRichTextObjectAddress(const wxRichTextObjectAddress& address) { Copy(address); } + + void Init() {} + + /** + Copies the address. + */ + void Copy(const wxRichTextObjectAddress& address) { m_address = address.m_address; } + + /** + Assignment operator. + */ + void operator=(const wxRichTextObjectAddress& address) { Copy(address); } + + /** + Returns the object specified by the address, given a top level container. + */ + wxRichTextObject* GetObject(wxRichTextParagraphLayoutBox* topLevelContainer) const; + + /** + Creates the address given a container and an object. + */ + bool Create(wxRichTextParagraphLayoutBox* topLevelContainer, wxRichTextObject* obj); + + /** + Returns the array of integers representing the object address. + */ + wxArrayInt& GetAddress() { return m_address; } + + /** + Returns the array of integers representing the object address. + */ + const wxArrayInt& GetAddress() const { return m_address; } + + /** + Sets the address from an array of integers. + */ + void SetAddress(const wxArrayInt& address) { m_address = address; } + +protected: + + wxArrayInt m_address; +}; + +class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction; + +/** + @class wxRichTextCommand + + Implements a command on the undo/redo stack. A wxRichTextCommand object contains one or more wxRichTextAction + objects, allowing aggregation of a number of operations into one command. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextAction +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextCommand: public wxCommand +{ +public: + /** + Constructor for one action. + */ + wxRichTextCommand(const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer, + wxRichTextParagraphLayoutBox* container, wxRichTextCtrl* ctrl, bool ignoreFirstTime = false); + + /** + Constructor for multiple actions. + */ + wxRichTextCommand(const wxString& name); + + virtual ~wxRichTextCommand(); + + /** + Performs the command. + */ + bool Do(); + + /** + Undoes the command. + */ + bool Undo(); + + /** + Adds an action to the action list. + */ + void AddAction(wxRichTextAction* action); + + /** + Clears the action list. + */ + void ClearActions(); + + /** + Returns the action list. + */ + wxList& GetActions() { return m_actions; } + +protected: + + wxList m_actions; +}; + +/** + @class wxRichTextAction + + Implements a part of a command. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextCommand +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextAction: public wxObject +{ +public: + /** + Constructor. @a buffer is the top-level buffer, while @a container is the object within + which the action is taking place. In the simplest case, they are the same. + */ + wxRichTextAction(wxRichTextCommand* cmd, const wxString& name, wxRichTextCommandId id, + wxRichTextBuffer* buffer, wxRichTextParagraphLayoutBox* container, + wxRichTextCtrl* ctrl, bool ignoreFirstTime = false); + + virtual ~wxRichTextAction(); + + /** + Performs the action. + */ + bool Do(); + + /** + Undoes the action. + */ + bool Undo(); + + /** + Updates the control appearance, optimizing if possible given information from the call to Layout. + */ + void UpdateAppearance(long caretPosition, bool sendUpdateEvent = false, + wxArrayInt* optimizationLineCharPositions = NULL, wxArrayInt* optimizationLineYPositions = NULL, bool isDoCmd = true); + + /** + Replaces the buffer paragraphs with the given fragment. + */ + void ApplyParagraphs(const wxRichTextParagraphLayoutBox& fragment); + + /** + Returns the new fragments. + */ + wxRichTextParagraphLayoutBox& GetNewParagraphs() { return m_newParagraphs; } + + /** + Returns the old fragments. + */ + wxRichTextParagraphLayoutBox& GetOldParagraphs() { return m_oldParagraphs; } + + /** + Returns the attributes, for single-object commands. + */ + wxRichTextAttr& GetAttributes() { return m_attributes; } + + /** + Returns the object to replace the one at the position defined by the container address + and the action's range start position. + */ + wxRichTextObject* GetObject() const { return m_object; } + + /** + Sets the object to replace the one at the position defined by the container address + and the action's range start position. + */ + void SetObject(wxRichTextObject* obj) { m_object = obj; m_objectAddress.Create(m_buffer, m_object); } + + /** + Makes an address from the given object. + */ + void MakeObject(wxRichTextObject* obj) { m_objectAddress.Create(m_buffer, obj); } + + /** + Calculate arrays for refresh optimization. + */ + void CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions); + + /** + Sets the position used for e.g. insertion. + */ + void SetPosition(long pos) { m_position = pos; } + + /** + Returns the position used for e.g. insertion. + */ + long GetPosition() const { return m_position; } + + /** + Sets the range for e.g. deletion. + */ + void SetRange(const wxRichTextRange& range) { m_range = range; } + + /** + Returns the range for e.g. deletion. + */ + const wxRichTextRange& GetRange() const { return m_range; } + + /** + Returns the address (nested position) of the container within the buffer being manipulated. + */ + wxRichTextObjectAddress& GetContainerAddress() { return m_containerAddress; } + + /** + Returns the address (nested position) of the container within the buffer being manipulated. + */ + const wxRichTextObjectAddress& GetContainerAddress() const { return m_containerAddress; } + + /** + Sets the address (nested position) of the container within the buffer being manipulated. + */ + void SetContainerAddress(const wxRichTextObjectAddress& address) { m_containerAddress = address; } + + /** + Sets the address (nested position) of the container within the buffer being manipulated. + */ + void SetContainerAddress(wxRichTextParagraphLayoutBox* container, wxRichTextObject* obj) { m_containerAddress.Create(container, obj); } + + /** + Returns the container that this action refers to, using the container address and top-level buffer. + */ + wxRichTextParagraphLayoutBox* GetContainer() const; + + /** + Returns the action name. + */ + const wxString& GetName() const { return m_name; } + +protected: + // Action name + wxString m_name; + + // Buffer + wxRichTextBuffer* m_buffer; + + // The address (nested position) of the container being manipulated. + // This is necessary because objects are deleted, and we can't + // therefore store actual pointers. + wxRichTextObjectAddress m_containerAddress; + + // Control + wxRichTextCtrl* m_ctrl; + + // Stores the new paragraphs + wxRichTextParagraphLayoutBox m_newParagraphs; + + // Stores the old paragraphs + wxRichTextParagraphLayoutBox m_oldParagraphs; + + // Stores an object to replace the one at the position + // defined by the container address and the action's range start position. + wxRichTextObject* m_object; + + // Stores the attributes + wxRichTextAttr m_attributes; + + // The address of the object being manipulated (used for changing an individual object or its attributes) + wxRichTextObjectAddress m_objectAddress; + + // Stores the old attributes + // wxRichTextAttr m_oldAttributes; + + // The affected range + wxRichTextRange m_range; + + // The insertion point for this command + long m_position; + + // Ignore 1st 'Do' operation because we already did it + bool m_ignoreThis; + + // The command identifier + wxRichTextCommandId m_cmdId; +}; + +/*! + * Handler flags + */ + +// Include style sheet when loading and saving +#define wxRICHTEXT_HANDLER_INCLUDE_STYLESHEET 0x0001 + +// Save images to memory file system in HTML handler +#define wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY 0x0010 + +// Save images to files in HTML handler +#define wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES 0x0020 + +// Save images as inline base64 data in HTML handler +#define wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_BASE64 0x0040 + +// Don't write header and footer (or BODY), so we can include the fragment +// in a larger document +#define wxRICHTEXT_HANDLER_NO_HEADER_FOOTER 0x0080 + +// Convert the more common face names to names that will work on the current platform +// in a larger document +#define wxRICHTEXT_HANDLER_CONVERT_FACENAMES 0x0100 + +/** + @class wxRichTextFileHandler + + The base class for file handlers. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextFileHandler: public wxObject +{ + DECLARE_CLASS(wxRichTextFileHandler) +public: + /** + Creates a file handler object. + */ + wxRichTextFileHandler(const wxString& name = wxEmptyString, const wxString& ext = wxEmptyString, int type = 0) + : m_name(name), m_extension(ext), m_type(type), m_flags(0), m_visible(true) + { } + +#if wxUSE_STREAMS + /** + Loads the buffer from a stream. + Not all handlers will implement file loading. + */ + bool LoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) + { return DoLoadFile(buffer, stream); } + + /** + Saves the buffer to a stream. + Not all handlers will implement file saving. + */ + bool SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) + { return DoSaveFile(buffer, stream); } +#endif + +#if wxUSE_FFILE && wxUSE_STREAMS + /** + Loads the buffer from a file. + */ + virtual bool LoadFile(wxRichTextBuffer *buffer, const wxString& filename); + + /** + Saves the buffer to a file. + */ + virtual bool SaveFile(wxRichTextBuffer *buffer, const wxString& filename); +#endif // wxUSE_STREAMS && wxUSE_STREAMS + + /** + Returns @true if we handle this filename (if using files). By default, checks the extension. + */ + virtual bool CanHandle(const wxString& filename) const; + + /** + Returns @true if we can save using this handler. + */ + virtual bool CanSave() const { return false; } + + /** + Returns @true if we can load using this handler. + */ + virtual bool CanLoad() const { return false; } + + /** + Returns @true if this handler should be visible to the user. + */ + virtual bool IsVisible() const { return m_visible; } + + /** + Sets whether the handler should be visible to the user (via the application's + load and save dialogs). + */ + virtual void SetVisible(bool visible) { m_visible = visible; } + + /** + Sets the name of the nandler. + */ + void SetName(const wxString& name) { m_name = name; } + + /** + Returns the name of the nandler. + */ + wxString GetName() const { return m_name; } /** Sets the default extension to recognise. */ - void SetExtension(const wxString& ext); + void SetExtension(const wxString& ext) { m_extension = ext; } + + /** + Returns the default extension to recognise. + */ + wxString GetExtension() const { return m_extension; } + + /** + Sets the handler type. + */ + void SetType(int type) { m_type = type; } + + /** + Returns the handler type. + */ + int GetType() const { return m_type; } /** Sets flags that change the behaviour of loading or saving. @@ -1015,155 +5191,250 @@ public: Or, you can call the control or buffer's SetHandlerFlags function to set the flags that will be used for subsequent load and save operations. */ - void SetFlags(int flags); + void SetFlags(int flags) { m_flags = flags; } /** - Sets the name of the handler. + Returns flags controlling how loading and saving is done. */ - void SetName(const wxString& name); + int GetFlags() const { return m_flags; } /** - Sets the handler type. + Sets the encoding to use when saving a file. If empty, a suitable encoding is chosen. */ - void SetType(int type); + void SetEncoding(const wxString& encoding) { m_encoding = encoding; } /** - Sets whether the handler should be visible to the user (via the application's - load and save dialogs). + Returns the encoding to use when saving a file. If empty, a suitable encoding is chosen. */ - virtual void SetVisible(bool visible); + const wxString& GetEncoding() const { return m_encoding; } protected: + +#if wxUSE_STREAMS /** Override to load content from @a stream into @a buffer. */ - virtual bool DoLoadFile(wxRichTextBuffer* buffer, - wxInputStream& stream) = 0; + virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) = 0; /** Override to save content to @a stream from @a buffer. */ - virtual bool DoSaveFile(wxRichTextBuffer* buffer, - wxOutputStream& stream) = 0; + virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) = 0; +#endif + + wxString m_name; + wxString m_encoding; + wxString m_extension; + int m_type; + int m_flags; + bool m_visible; }; - - /** - @class wxRichTextRange + @class wxRichTextPlainTextHandler - This class stores beginning and end positions for a range of data. + Implements saving a buffer to plain text. @library{wxrichtext} @category{richtext} + + @see wxRichTextFileHandler, wxRichTextBuffer, wxRichTextCtrl */ -class wxRichTextRange + +class WXDLLIMPEXP_RICHTEXT wxRichTextPlainTextHandler: public wxRichTextFileHandler { + DECLARE_CLASS(wxRichTextPlainTextHandler) public: - //@{ - /** - Constructors. - */ - wxRichTextRange(long start, long end); - wxRichTextRange(const wxRichTextRange& range); - wxRichTextRange(); - //@} + wxRichTextPlainTextHandler(const wxString& name = wxT("Text"), + const wxString& ext = wxT("txt"), + wxRichTextFileType type = wxRICHTEXT_TYPE_TEXT) + : wxRichTextFileHandler(name, ext, type) + { } - /** - Destructor. - */ - ~wxRichTextRange(); + // Can we save using this handler? + virtual bool CanSave() const { return true; } - /** - Returns @true if the given position is within this range. - Does not match if the range is empty. - */ - bool Contains(long pos) const; + // Can we load using this handler? + virtual bool CanLoad() const { return true; } - /** - Converts the internal range, which uses the first and last character positions - of the range, to the API-standard range, whose end is one past the last - character in the range. - In other words, one is added to the end position. - */ - wxRichTextRange FromInternal() const; +protected: - /** - Returns the end position. - */ - long GetEnd() const; +#if wxUSE_STREAMS + virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream); + virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream); +#endif - /** - Returns the length of the range. - */ - long GetLength() const; - - /** - Returns the start of the range. - */ - long GetStart() const; - - /** - Returns @true if this range is completely outside @e range. - */ - bool IsOutside(const wxRichTextRange& range) const; - - /** - Returns @true if this range is completely within @e range. - */ - bool IsWithin(const wxRichTextRange& range) const; - - /** - Limits this range to be within @e range. - */ - bool LimitTo(const wxRichTextRange& range); - - /** - Sets the end of the range. - */ - void SetEnd(long end); - - /** - Sets the range. - */ - void SetRange(long start, long end); - - /** - Sets the start of the range. - */ - void SetStart(long start); - - /** - Swaps the start and end. - */ - void Swap(); - - /** - Converts the API-standard range, whose end is one past the last character in - the range, to the internal form, which uses the first and last character - positions of the range. - In other words, one is subtracted from the end position. - */ - wxRichTextRange ToInternal() const; - - /** - Adds @a range to this range. - */ - wxRichTextRange operator+(const wxRichTextRange& range) const; - - /** - Subtracts @a range from this range. - */ - wxRichTextRange operator-(const wxRichTextRange& range) const; - - /** - Assigns @a range to this range. - */ - void operator=(const wxRichTextRange& range); - - /** - Returns @true if @a range is the same as this range. - */ - bool operator==(const wxRichTextRange& range) const; }; +#if wxUSE_DATAOBJ + +/** + @class wxRichTextBufferDataObject + + Implements a rich text data object for clipboard transfer. + + @library{wxrichtext} + @category{richtext} + + @see wxDataObjectSimple, wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextBufferDataObject: public wxDataObjectSimple +{ +public: + /** + The constructor doesn't copy the pointer, so it shouldn't go away while this object + is alive. + */ + wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer = NULL); + virtual ~wxRichTextBufferDataObject(); + + /** + After a call to this function, the buffer is owned by the caller and it + is responsible for deleting it. + */ + wxRichTextBuffer* GetRichTextBuffer(); + + /** + Returns the id for the new data format. + */ + static const wxChar* GetRichTextBufferFormatId() { return ms_richTextBufferFormatId; } + + // base class pure virtuals + + virtual wxDataFormat GetPreferredFormat(Direction dir) const; + virtual size_t GetDataSize() const; + virtual bool GetDataHere(void *pBuf) const; + virtual bool SetData(size_t len, const void *buf); + + // prevent warnings + + virtual size_t GetDataSize(const wxDataFormat&) const { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat&, void *buf) const { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) { return SetData(len, buf); } + +private: + wxDataFormat m_formatRichTextBuffer; // our custom format + wxRichTextBuffer* m_richTextBuffer; // our data + static const wxChar* ms_richTextBufferFormatId; // our format id +}; + +#endif + +/** + @class wxRichTextRenderer + + This class isolates some common drawing functionality. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextRenderer: public wxObject +{ +public: + /** + Constructor. + */ + wxRichTextRenderer() {} + virtual ~wxRichTextRenderer() {} + + /** + Draws a standard bullet, as specified by the value of GetBulletName. This function should be overridden. + */ + virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) = 0; + + /** + Draws a bullet that can be described by text, such as numbered or symbol bullets. This function should be overridden. + */ + virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text) = 0; + + /** + Draws a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName. This function should be overridden. + */ + virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) = 0; + + /** + Enumerate the standard bullet names currently supported. This function should be overridden. + */ + virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames) = 0; +}; + +/** + @class wxRichTextStdRenderer + + The standard renderer for drawing bullets. + + @library{wxrichtext} + @category{richtext} + + @see wxRichTextRenderer, wxRichTextBuffer, wxRichTextCtrl +*/ + +class WXDLLIMPEXP_RICHTEXT wxRichTextStdRenderer: public wxRichTextRenderer +{ +public: + /** + Constructor. + */ + wxRichTextStdRenderer() {} + + // Draw a standard bullet, as specified by the value of GetBulletName + virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect); + + // Draw a bullet that can be described by text, such as numbered or symbol bullets + virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text); + + // Draw a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName + virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect); + + // Enumerate the standard bullet names currently supported + virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames); +}; + +/*! + * Utilities + * + */ + +inline bool wxRichTextHasStyle(int flags, int style) +{ + return ((flags & style) == style); +} + +/// Compare two attribute objects +WXDLLIMPEXP_RICHTEXT bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2); +WXDLLIMPEXP_RICHTEXT bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2); + +/// Compare two attribute objects, but take into account the flags +/// specifying attributes of interest. +WXDLLIMPEXP_RICHTEXT bool wxTextAttrEqPartial(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2); + +/// Apply one style to another +WXDLLIMPEXP_RICHTEXT bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith = NULL); + +// Remove attributes +WXDLLIMPEXP_RICHTEXT bool wxRichTextRemoveStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style); + +/// Combine two bitlists +WXDLLIMPEXP_RICHTEXT bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB); + +/// Compare two bitlists +WXDLLIMPEXP_RICHTEXT bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags); + +/// Split into paragraph and character styles +WXDLLIMPEXP_RICHTEXT bool wxRichTextSplitParaCharStyles(const wxRichTextAttr& style, wxRichTextAttr& parStyle, wxRichTextAttr& charStyle); + +/// Compare tabs +WXDLLIMPEXP_RICHTEXT bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2); + +/// Convert a decimal to Roman numerals +WXDLLIMPEXP_RICHTEXT wxString wxRichTextDecimalToRoman(long n); + +// Collects the attributes that are common to a range of content, building up a note of +// which attributes are absent in some objects and which clash in some objects. +WXDLLIMPEXP_RICHTEXT void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr); + +WXDLLIMPEXP_RICHTEXT void wxRichTextModuleInit(); diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h index d682329896..baf58d29a6 100644 --- a/interface/wx/richtext/richtextctrl.h +++ b/interface/wx/richtext/richtextctrl.h @@ -1,17 +1,2060 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtext/richtextctrl.h -// Purpose: interface of wxRichTextCtrl and wxRichTextEvent -// Author: wxWidgets team +// Name: wx/richtext/richtextctrl.h +// Purpose: A rich edit control +// Author: Julian Smart +// Modified by: +// Created: 2005-09-30 // RCS-ID: $Id$ +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +/* + * Styles and flags + */ + +/** + Styles +*/ + +#define wxRE_READONLY 0x0010 +#define wxRE_MULTILINE 0x0020 +#define wxRE_CENTRE_CARET 0x8000 +#define wxRE_CENTER_CARET wxRE_CENTRE_CARET + +/** + Flags +*/ + +#define wxRICHTEXT_SHIFT_DOWN 0x01 +#define wxRICHTEXT_CTRL_DOWN 0x02 +#define wxRICHTEXT_ALT_DOWN 0x04 + +/** + Extra flags +*/ + +// Don't draw guide lines around boxes and tables +#define wxRICHTEXT_EX_NO_GUIDELINES 0x00000100 + + +/* + Defaults +*/ + +#define wxRICHTEXT_DEFAULT_OVERALL_SIZE wxSize(-1, -1) +#define wxRICHTEXT_DEFAULT_IMAGE_SIZE wxSize(80, 80) +#define wxRICHTEXT_DEFAULT_SPACING 3 +#define wxRICHTEXT_DEFAULT_MARGIN 3 +#define wxRICHTEXT_DEFAULT_UNFOCUSSED_BACKGROUND wxColour(175, 175, 175) +#define wxRICHTEXT_DEFAULT_FOCUSSED_BACKGROUND wxColour(140, 140, 140) +#define wxRICHTEXT_DEFAULT_UNSELECTED_BACKGROUND wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE) +#define wxRICHTEXT_DEFAULT_TYPE_COLOUR wxColour(0, 0, 200) +#define wxRICHTEXT_DEFAULT_FOCUS_RECT_COLOUR wxColour(100, 80, 80) +#define wxRICHTEXT_DEFAULT_CARET_WIDTH 2 +// Minimum buffer size before delayed layout kicks in +#define wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD 20000 +// Milliseconds before layout occurs after resize +#define wxRICHTEXT_DEFAULT_LAYOUT_INTERVAL 50 + +/* Identifiers + */ +#define wxID_RICHTEXT_PROPERTIES1 (wxID_HIGHEST + 1) +#define wxID_RICHTEXT_PROPERTIES2 (wxID_HIGHEST + 2) +#define wxID_RICHTEXT_PROPERTIES3 (wxID_HIGHEST + 3) + +/* + Normal selection occurs initially and as user drags within one container. + Common ancestor selection occurs when the user starts dragging across containers + that have a common ancestor, for example the cells in a table. + */ + +enum wxRichTextCtrlSelectionState +{ + wxRichTextCtrlSelectionState_Normal, + wxRichTextCtrlSelectionState_CommonAncestor +}; + +/** + @class wxRichTextContextMenuPropertiesInfo + + wxRichTextContextMenuPropertiesInfo keeps track of objects that appear in the context menu, + whose properties are available to be edited. + */ + +class WXDLLIMPEXP_RICHTEXT wxRichTextContextMenuPropertiesInfo +{ +public: + /** + Constructor. + */ + wxRichTextContextMenuPropertiesInfo() { Init(); } + +// Operations + + /** + Initialisation. + */ + void Init() {} + + /** + Adds an item. + */ + bool AddItem(const wxString& label, wxRichTextObject* obj); + + /** + Returns the number of menu items that were added. + */ + int AddMenuItems(wxMenu* menu, int startCmd = wxID_RICHTEXT_PROPERTIES1) const; + + /** + Adds appropriate menu items for the current container and clicked on object + (and container's parent, if appropriate). + */ + int AddItems(wxRichTextObject* container, wxRichTextObject* obj); + + /** + Clears the items. + */ + void Clear() { m_objects.Clear(); m_labels.Clear(); } + +// Accessors + + /** + Returns the nth label. + */ + wxString GetLabel(int n) const { return m_labels[n]; } + + /** + Returns the nth object. + */ + wxRichTextObject* GetObject(int n) const { return m_objects[n]; } + + /** + Returns the array of objects. + */ + wxRichTextObjectPtrArray& GetObjects() { return m_objects; } + + /** + Returns the array of objects. + */ + const wxRichTextObjectPtrArray& GetObjects() const { return m_objects; } + + /** + Returns the array of labels. + */ + wxArrayString& GetLabels() { return m_labels; } + + /** + Returns the array of labels. + */ + const wxArrayString& GetLabels() const { return m_labels; } + + /** + Returns the number of items. + */ + int GetCount() const { return m_objects.GetCount(); } + + wxRichTextObjectPtrArray m_objects; + wxArrayString m_labels; +}; + +/** + @class wxRichTextCtrl + + wxRichTextCtrl provides a generic, ground-up implementation of a text control + capable of showing multiple styles and images. + + wxRichTextCtrl sends notification events: see wxRichTextEvent. + + It also sends the standard wxTextCtrl events @c wxEVT_COMMAND_TEXT_ENTER and + @c wxEVT_COMMAND_TEXT_UPDATED, and wxTextUrlEvent when URL content is clicked. + + For more information, see the @ref overview_richtextctrl. + + @beginStyleTable + @style{wxRE_CENTRE_CARET} + The control will try to keep the caret line centred vertically while editing. + wxRE_CENTER_CARET is a synonym for this style. + @style{wxRE_MULTILINE} + The control will be multiline (mandatory). + @style{wxRE_READONLY} + The control will not be editable. + @endStyleTable + + @library{wxrichtext} + @category{richtext} + @appearance{richtextctrl.png} + + */ + +class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxControl, + public wxTextCtrlIface, + public wxScrollHelper +{ + DECLARE_CLASS( wxRichTextCtrl ) + DECLARE_EVENT_TABLE() + +public: +// Constructors + + /** + Default constructor. + */ + wxRichTextCtrl( ); + + /** + Constructor, creating and showing a rich text control. + + @param parent + Parent window. Must not be @NULL. + @param id + Window identifier. The value @c wxID_ANY indicates a default value. + @param value + Default string. + @param pos + Window position. + @param size + Window size. + @param style + Window style. + @param validator + Window validator. + @param name + Window name. + + @see Create(), wxValidator + */ + wxRichTextCtrl( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, + long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr); + + /** + Destructor. + */ + virtual ~wxRichTextCtrl( ); + +// Operations + + /** + Creates the underlying window. + */ + bool Create( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, + long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr ); + + /** + Initialises the members of the control. + */ + void Init(); + +// Accessors + + /** + Gets the text for the given range. + The end point of range is specified as the last character position of + the span of text, plus one. + */ + virtual wxString GetRange(long from, long to) const; + + /** + Returns the length of the specified line in characters. + */ + virtual int GetLineLength(long lineNo) const ; + + /** + Returns the text for the given line. + */ + virtual wxString GetLineText(long lineNo) const ; + + /** + Returns the number of lines in the buffer. + */ + virtual int GetNumberOfLines() const ; + + /** + Returns @true if the buffer has been modified. + */ + virtual bool IsModified() const ; + + /** + Returns @true if the control is editable. + */ + virtual bool IsEditable() const ; + + /** + Returns @true if the control is single-line. + Currently wxRichTextCtrl does not support single-line editing. + */ + bool IsSingleLine() const { return !HasFlag(wxRE_MULTILINE); } + + /** + Returns @true if the control is multiline. + */ + bool IsMultiLine() const { return !IsSingleLine(); } + + //@{ + /** + Returns the range of the current selection. + The end point of range is specified as the last character position of the span + of text, plus one. + If the return values @a from and @a to are the same, there is no selection. + */ + virtual void GetSelection(long* from, long* to) const; + const wxRichTextSelection& GetSelection() const { return m_selection; } + wxRichTextSelection& GetSelection() { return m_selection; } + //@} + + /** + Returns the text within the current selection range, if any. + */ + virtual wxString GetStringSelection() const; + + /** + Gets the current filename associated with the control. + */ + wxString GetFilename() const { return m_filename; } + + /** + Sets the current filename. + */ + void SetFilename(const wxString& filename) { m_filename = filename; } + + /** + Sets the size of the buffer beyond which layout is delayed during resizing. + This optimizes sizing for large buffers. The default is 20000. + */ + void SetDelayedLayoutThreshold(long threshold) { m_delayedLayoutThreshold = threshold; } + + /** + Gets the size of the buffer beyond which layout is delayed during resizing. + This optimizes sizing for large buffers. The default is 20000. + */ + long GetDelayedLayoutThreshold() const { return m_delayedLayoutThreshold; } + + /** + */ + bool GetFullLayoutRequired() const { return m_fullLayoutRequired; } + + /** + */ + void SetFullLayoutRequired(bool b) { m_fullLayoutRequired = b; } + + /** + */ + wxLongLong GetFullLayoutTime() const { return m_fullLayoutTime; } + + /** + */ + void SetFullLayoutTime(wxLongLong t) { m_fullLayoutTime = t; } + + /** + */ + long GetFullLayoutSavedPosition() const { return m_fullLayoutSavedPosition; } + + /** + */ + void SetFullLayoutSavedPosition(long p) { m_fullLayoutSavedPosition = p; } + + // Force any pending layout due to large buffer + /** + */ + void ForceDelayedLayout(); + + /** + Sets the text (normal) cursor. + */ + void SetTextCursor(const wxCursor& cursor ) { m_textCursor = cursor; } + + /** + Returns the text (normal) cursor. + */ + wxCursor GetTextCursor() const { return m_textCursor; } + + /** + Sets the cursor to be used over URLs. + */ + void SetURLCursor(const wxCursor& cursor ) { m_urlCursor = cursor; } + + /** + Returns the cursor to be used over URLs. + */ + wxCursor GetURLCursor() const { return m_urlCursor; } + + /** + Returns @true if we are showing the caret position at the start of a line + instead of at the end of the previous one. + */ + bool GetCaretAtLineStart() const { return m_caretAtLineStart; } + + /** + Sets a flag to remember that we are showing the caret position at the start of a line + instead of at the end of the previous one. + */ + void SetCaretAtLineStart(bool atStart) { m_caretAtLineStart = atStart; } + + /** + Returns @true if we are dragging a selection. + */ + bool GetDragging() const { return m_dragging; } + + /** + Sets a flag to remember if we are dragging a selection. + */ + void SetDragging(bool dragging) { m_dragging = dragging; } + + /** + Returns the drag start position. + */ + const wxPoint& GetDragStart() const { return m_dragStart; } + + /** + Sets the drag start position. + */ + void SetDragStart(const wxPoint& pt) { m_dragStart = pt; } + +#if wxRICHTEXT_BUFFERED_PAINTING + //@{ + /** + Returns the buffer bitmap if using buffered painting. + */ + const wxBitmap& GetBufferBitmap() const { return m_bufferBitmap; } + wxBitmap& GetBufferBitmap() { return m_bufferBitmap; } + //@} +#endif + + /** + Returns the current context menu. + */ + wxMenu* GetContextMenu() const { return m_contextMenu; } + + /** + Sets the current context menu. + */ + void SetContextMenu(wxMenu* menu); + + /** + Returns an anchor so we know how to extend the selection. + It's a caret position since it's between two characters. + */ + long GetSelectionAnchor() const { return m_selectionAnchor; } + + /** + Sets an anchor so we know how to extend the selection. + It's a caret position since it's between two characters. + */ + void SetSelectionAnchor(long anchor) { m_selectionAnchor = anchor; } + + /** + Returns the anchor object if selecting multiple containers. + */ + wxRichTextObject* GetSelectionAnchorObject() const { return m_selectionAnchorObject; } + + /** + Sets the anchor object if selecting multiple containers. + */ + void SetSelectionAnchorObject(wxRichTextObject* anchor) { m_selectionAnchorObject = anchor; } + + //@{ + /** + Returns an object that stores information about context menu property item(s), + in order to communicate between the context menu event handler and the code + that responds to it. The wxRichTextContextMenuPropertiesInfo stores one + item for each object that could respond to a property-editing event. If + objects are nested, several might be editable. + */ + wxRichTextContextMenuPropertiesInfo& GetContextMenuPropertiesInfo() { return m_contextMenuPropertiesInfo; } + const wxRichTextContextMenuPropertiesInfo& GetContextMenuPropertiesInfo() const { return m_contextMenuPropertiesInfo; } + //@} + + /** + Returns the wxRichTextObject object that currently has the editing focus. + If there are no composite objects, this will be the top-level buffer. + */ + wxRichTextParagraphLayoutBox* GetFocusObject() const { return m_focusObject; } + + /** + Sets the wxRichTextObject object that currently has the editing focus. + */ + bool SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setCaretPosition = true); + +// Operations + + /** + Invalidates the whole buffer to trigger painting later. + */ + void Invalidate() { GetBuffer().Invalidate(wxRICHTEXT_ALL); } + + /** + Clears the buffer content, leaving a single empty paragraph. Cannot be undone. + */ + virtual void Clear(); + + /** + Replaces the content in the specified range with the string specified by + @a value. + */ + virtual void Replace(long from, long to, const wxString& value); + + /** + Removes the content in the specified range. + */ + virtual void Remove(long from, long to); + +#ifdef DOXYGEN + /** + Loads content into the control's buffer using the given type. + + If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from + the filename extension. + + This function looks for a suitable wxRichTextFileHandler object. + */ + bool LoadFile(const wxString& file, + int type = wxRICHTEXT_TYPE_ANY); +#endif + + /** + Helper function for LoadFile(). Loads content into the control's buffer using the given type. + + If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from + the filename extension. + + This function looks for a suitable wxRichTextFileHandler object. + */ + virtual bool DoLoadFile(const wxString& file, int fileType); + +#ifdef DOXYGEN + /** + Saves the buffer content using the given type. + + If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from + the filename extension. + + This function looks for a suitable wxRichTextFileHandler object. + */ + bool SaveFile(const wxString& file = wxEmptyString, + int type = wxRICHTEXT_TYPE_ANY); +#endif + + /** + Helper function for SaveFile(). Saves the buffer content using the given type. + + If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from + the filename extension. + + This function looks for a suitable wxRichTextFileHandler object. + */ + virtual bool DoSaveFile(const wxString& file = wxEmptyString, + int fileType = wxRICHTEXT_TYPE_ANY); + + /** + Sets flags that change the behaviour of loading or saving. + + See the documentation for each handler class to see what flags are + relevant for each handler. + */ + void SetHandlerFlags(int flags) { GetBuffer().SetHandlerFlags(flags); } + + /** + Returns flags that change the behaviour of loading or saving. + See the documentation for each handler class to see what flags are + relevant for each handler. + */ + int GetHandlerFlags() const { return GetBuffer().GetHandlerFlags(); } + + /** + Marks the buffer as modified. + */ + virtual void MarkDirty(); + + /** + Sets the buffer's modified status to @false, and clears the buffer's command + history. + */ + virtual void DiscardEdits(); + + /** + Sets the maximum number of characters that may be entered in a single line + text control. For compatibility only; currently does nothing. + */ + virtual void SetMaxLength(unsigned long WXUNUSED(len)) { } + + /** + Writes text at the current position. + */ + virtual void WriteText(const wxString& text); + + /** + Sets the insertion point to the end of the buffer and writes the text. + */ + virtual void AppendText(const wxString& text); + + //@{ + /** + Gets the attributes at the given position. + This function gets the combined style - that is, the style you see on the + screen as a result of combining base style, paragraph style and character + style attributes. + + To get the character or paragraph style alone, use GetUncombinedStyle(). + + @beginWxPerlOnly + In wxPerl this method is implemented as GetStyle(@a position) + returning a 2-element list (ok, attr). + @endWxPerlOnly + */ + virtual bool GetStyle(long position, wxTextAttr& style); + virtual bool GetStyle(long position, wxRichTextAttr& style); + virtual bool GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container); + //@} + + //@{ + /** + Sets the attributes for the given range. + The end point of range is specified as the last character position of the span + of text, plus one. + + So, for example, to set the style for a character at position 5, use the range + (5,6). + */ + virtual bool SetStyle(long start, long end, const wxTextAttr& style); + virtual bool SetStyle(long start, long end, const wxRichTextAttr& style); + virtual bool SetStyle(const wxRichTextRange& range, const wxTextAttr& style); + virtual bool SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style); + //@} + + /** + Sets the attributes for a single object + */ + virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr); + + //@{ + /** + Gets the attributes common to the specified range. + Attributes that differ in value within the range will not be included + in @a style flags. + + @beginWxPerlOnly + In wxPerl this method is implemented as GetStyleForRange(@a position) + returning a 2-element list (ok, attr). + @endWxPerlOnly + */ + virtual bool GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style); + virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style); + virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container); + //@} + + /** + Sets the attributes for the given range, passing flags to determine how the + attributes are set. + + The end point of range is specified as the last character position of the span + of text, plus one. So, for example, to set the style for a character at + position 5, use the range (5,6). + + @a flags may contain a bit list of the following values: + - wxRICHTEXT_SETSTYLE_NONE: no style flag. + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this operation should be + undoable. + - wxRICHTEXT_SETSTYLE_OPTIMIZE: specifies that the style should not be applied + if the combined style at this point is already the style in question. + - wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY: specifies that the style should only be + applied to paragraphs, and not the content. + This allows content styling to be preserved independently from that + of e.g. a named paragraph style. + - wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY: specifies that the style should only be + applied to characters, and not the paragraph. + This allows content styling to be preserved independently from that + of e.g. a named paragraph style. + - wxRICHTEXT_SETSTYLE_RESET: resets (clears) the existing style before applying + the new style. + - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags + are used in this operation. + */ + virtual bool SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); + + //@{ + /** + Gets the attributes at the given position. + This function gets the @e uncombined style - that is, the attributes associated + with the paragraph or character content, and not necessarily the combined + attributes you see on the screen. + To get the combined attributes, use GetStyle(). + + If you specify (any) paragraph attribute in @e style's flags, this function + will fetch the paragraph attributes. + Otherwise, it will return the character attributes. + + @beginWxPerlOnly + In wxPerl this method is implemented as GetUncombinedStyle(@a position) + returning a 2-element list (ok, attr). + @endWxPerlOnly + */ + virtual bool GetUncombinedStyle(long position, wxRichTextAttr& style); + virtual bool GetUncombinedStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container); + //@} + + //@{ + /** + Sets the current default style, which can be used to change how subsequently + inserted text is displayed. + */ + virtual bool SetDefaultStyle(const wxTextAttr& style); + virtual bool SetDefaultStyle(const wxRichTextAttr& style); + //@} + + /** + Returns the current default style, which can be used to change how subsequently + inserted text is displayed. + */ + virtual const wxRichTextAttr& GetDefaultStyleEx() const; + + //virtual const wxTextAttr& GetDefaultStyle() const; + + //@{ + /** + Sets the list attributes for the given range, passing flags to determine how + the attributes are set. + + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see NumberList(), PromoteList(), ClearListStyle(). + */ + virtual bool SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + virtual bool SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + //@} + + /** + Clears the list style from the given range, clearing list-related attributes + and applying any named paragraph style associated with each paragraph. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + + @see SetListStyle(), PromoteList(), NumberList(). + */ + virtual bool ClearListStyle(const wxRichTextRange& range, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); + + //@{ + /** + Numbers the paragraphs in the given range. + Pass flags to determine how the attributes are set. + + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see SetListStyle(), PromoteList(), ClearListStyle(). + */ + virtual bool NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + virtual bool NumberList(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1); + //@} + + //@{ + /** + Promotes or demotes the paragraphs in the given range. + A positive @a promoteBy produces a smaller indent, and a negative number + produces a larger indent. Pass flags to determine how the attributes are set. + Either the style definition or the name of the style definition (in the current + sheet) can be passed. + + @a flags is a bit list of the following: + - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. + - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from + @a startFrom, otherwise existing attributes are used. + - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used + as the level for all paragraphs, otherwise the current indentation will be used. + + @see SetListStyle(), @see SetListStyle(), ClearListStyle(). + */ + virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); + virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); + //@} + + /** + Deletes the content within the given range. + */ + virtual bool Delete(const wxRichTextRange& range); + + /** + Translates from column and line number to position. + */ + virtual long XYToPosition(long x, long y) const; + + /** + Converts a text position to zero-based column and line numbers. + */ + virtual bool PositionToXY(long pos, long *x, long *y) const; + + /** + Scrolls the buffer so that the given position is in view. + */ + virtual void ShowPosition(long pos); + + //@{ + /** + Finds the character at the given position in pixels. + @a pt is in device coords (not adjusted for the client area origin nor for + scrolling). + */ + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, + wxTextCoord *col, + wxTextCoord *row) const; + //@} + +// Clipboard operations + + /** + Copies the selected content (if any) to the clipboard. + */ + virtual void Copy(); + + /** + Copies the selected content (if any) to the clipboard and deletes the selection. + This is undoable. + */ + virtual void Cut(); + + /** + Pastes content from the clipboard to the buffer. + */ + virtual void Paste(); + + /** + Deletes the content in the selection, if any. This is undoable. + */ + virtual void DeleteSelection(); + + /** + Returns @true if selected content can be copied to the clipboard. + */ + virtual bool CanCopy() const; + + /** + Returns @true if selected content can be copied to the clipboard and deleted. + */ + virtual bool CanCut() const; + + /** + Returns @true if the clipboard content can be pasted to the buffer. + */ + virtual bool CanPaste() const; + + /** + Returns @true if selected content can be deleted. + */ + virtual bool CanDeleteSelection() const; + + /** + Undoes the command at the top of the command history, if there is one. + */ + virtual void Undo(); + + /** + Redoes the current command. + */ + virtual void Redo(); + + /** + Returns @true if there is a command in the command history that can be undone. + */ + virtual bool CanUndo() const; + + /** + Returns @true if there is a command in the command history that can be redone. + */ + virtual bool CanRedo() const; + + /** + Sets the insertion point and causes the current editing style to be taken from + the new position (unlike wxRichTextCtrl::SetCaretPosition). + */ + virtual void SetInsertionPoint(long pos); + + /** + Sets the insertion point to the end of the text control. + */ + virtual void SetInsertionPointEnd(); + + /** + Returns the current insertion point. + */ + virtual long GetInsertionPoint() const; + + /** + Returns the last position in the buffer. + */ + virtual wxTextPos GetLastPosition() const; + + //@{ + /** + Sets the selection to the given range. + The end point of range is specified as the last character position of the span + of text, plus one. + + So, for example, to set the selection for a character at position 5, use the + range (5,6). + */ + virtual void SetSelection(long from, long to); + void SetSelection(const wxRichTextSelection& sel) { m_selection = sel; } + //@} + + + /** + Selects all the text in the buffer. + */ + virtual void SelectAll(); + + /** + Makes the control editable, or not. + */ + virtual void SetEditable(bool editable); + + /** + Returns @true if there is a selection and the object containing the selection + was the same as the current focus object. + */ + virtual bool HasSelection() const; + + /** + Returns @true if there was a selection, whether or not the current focus object + is the same as the selection's container object. + */ + virtual bool HasUnfocusedSelection() const; + + //@{ + /** + Write a bitmap or image at the current insertion point. + Supply an optional type to use for internal and file storage of the raw data. + */ + virtual bool WriteImage(const wxImage& image, wxBitmapType bitmapType = wxBITMAP_TYPE_PNG, + const wxRichTextAttr& textAttr = wxRichTextAttr()); + + virtual bool WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType = wxBITMAP_TYPE_PNG, + const wxRichTextAttr& textAttr = wxRichTextAttr()); + //@} + + /** + Loads an image from a file and writes it at the current insertion point. + */ + virtual bool WriteImage(const wxString& filename, wxBitmapType bitmapType, + const wxRichTextAttr& textAttr = wxRichTextAttr()); + + /** + Writes an image block at the current insertion point. + */ + virtual bool WriteImage(const wxRichTextImageBlock& imageBlock, + const wxRichTextAttr& textAttr = wxRichTextAttr()); + + /** + Write a text box at the current insertion point, returning the text box. + You can then call SetFocusObject() to set the focus to the new object. + */ + virtual wxRichTextBox* WriteTextBox(const wxRichTextAttr& textAttr = wxRichTextAttr()); + + /** + Write a table at the current insertion point, returning the table. + You can then call SetFocusObject() to set the focus to the new object. + */ + virtual wxRichTextTable* WriteTable(int rows, int cols, const wxRichTextAttr& tableAttr = wxRichTextAttr(), const wxRichTextAttr& cellAttr = wxRichTextAttr()); + + /** + Inserts a new paragraph at the current insertion point. @see LineBreak(). + */ + virtual bool Newline(); + + /** + Inserts a line break at the current insertion point. + + A line break forces wrapping within a paragraph, and can be introduced by + using this function, by appending the wxChar value @b wxRichTextLineBreakChar + to text content, or by typing Shift-Return. + */ + virtual bool LineBreak(); + + /** + Sets the basic (overall) style. + + This is the style of the whole buffer before further styles are applied, + unlike the default style, which only affects the style currently being + applied (for example, setting the default style to bold will cause + subsequently inserted text to be bold). + */ + virtual void SetBasicStyle(const wxRichTextAttr& style) { GetBuffer().SetBasicStyle(style); } + + /** + Gets the basic (overall) style. + + This is the style of the whole buffer before further styles are applied, + unlike the default style, which only affects the style currently being + applied (for example, setting the default style to bold will cause + subsequently inserted text to be bold). + */ + virtual const wxRichTextAttr& GetBasicStyle() const { return GetBuffer().GetBasicStyle(); } + + /** + Begins applying a style. + */ + virtual bool BeginStyle(const wxRichTextAttr& style) { return GetBuffer().BeginStyle(style); } + + /** + Ends the current style. + */ + virtual bool EndStyle() { return GetBuffer().EndStyle(); } + + /** + Ends application of all styles in the current style stack. + */ + virtual bool EndAllStyles() { return GetBuffer().EndAllStyles(); } + + /** + Begins using bold. + */ + bool BeginBold() { return GetBuffer().BeginBold(); } + + /** + Ends using bold. + */ + bool EndBold() { return GetBuffer().EndBold(); } + + /** + Begins using italic. + */ + bool BeginItalic() { return GetBuffer().BeginItalic(); } + + /** + Ends using italic. + */ + bool EndItalic() { return GetBuffer().EndItalic(); } + + /** + Begins using underlining. + */ + bool BeginUnderline() { return GetBuffer().BeginUnderline(); } + + /** + End applying underlining. + */ + bool EndUnderline() { return GetBuffer().EndUnderline(); } + + /** + Begins using the given point size. + */ + bool BeginFontSize(int pointSize) { return GetBuffer().BeginFontSize(pointSize); } + + /** + Ends using a point size. + */ + bool EndFontSize() { return GetBuffer().EndFontSize(); } + + /** + Begins using this font. + */ + bool BeginFont(const wxFont& font) { return GetBuffer().BeginFont(font); } + + /** + Ends using a font. + */ + bool EndFont() { return GetBuffer().EndFont(); } + + /** + Begins using this colour. + */ + bool BeginTextColour(const wxColour& colour) { return GetBuffer().BeginTextColour(colour); } + + /** + Ends applying a text colour. + */ + bool EndTextColour() { return GetBuffer().EndTextColour(); } + + /** + Begins using alignment. + For alignment values, see wxTextAttr. + */ + bool BeginAlignment(wxTextAttrAlignment alignment) { return GetBuffer().BeginAlignment(alignment); } + + /** + Ends alignment. + */ + bool EndAlignment() { return GetBuffer().EndAlignment(); } + + /** + Begins applying a left indent and subindent in tenths of a millimetre. + The subindent is an offset from the left edge of the paragraph, and is + used for all but the first line in a paragraph. A positive value will + cause the first line to appear to the left of the subsequent lines, and + a negative value will cause the first line to be indented to the right + of the subsequent lines. + + wxRichTextBuffer uses indentation to render a bulleted item. The + content of the paragraph, including the first line, starts at the + @a leftIndent plus the @a leftSubIndent. + + @param leftIndent + The distance between the margin and the bullet. + @param leftSubIndent + The distance between the left edge of the bullet and the left edge + of the actual paragraph. + */ + bool BeginLeftIndent(int leftIndent, int leftSubIndent = 0) { return GetBuffer().BeginLeftIndent(leftIndent, leftSubIndent); } + + /** + Ends left indent. + */ + bool EndLeftIndent() { return GetBuffer().EndLeftIndent(); } + + /** + Begins a right indent, specified in tenths of a millimetre. + */ + bool BeginRightIndent(int rightIndent) { return GetBuffer().BeginRightIndent(rightIndent); } + + /** + Ends right indent. + */ + bool EndRightIndent() { return GetBuffer().EndRightIndent(); } + + /** + Begins paragraph spacing; pass the before-paragraph and after-paragraph spacing + in tenths of a millimetre. + */ + bool BeginParagraphSpacing(int before, int after) { return GetBuffer().BeginParagraphSpacing(before, after); } + + /** + Ends paragraph spacing. + */ + bool EndParagraphSpacing() { return GetBuffer().EndParagraphSpacing(); } + + /** + Begins appling line spacing. @e spacing is a multiple, where 10 means + single-spacing, 15 means 1.5 spacing, and 20 means double spacing. + + The ::wxTextAttrLineSpacing constants are defined for convenience. + */ + bool BeginLineSpacing(int lineSpacing) { return GetBuffer().BeginLineSpacing(lineSpacing); } + + /** + Ends line spacing. + */ + bool EndLineSpacing() { return GetBuffer().EndLineSpacing(); } + + /** + Begins a numbered bullet. + + This call will be needed for each item in the list, and the + application should take care of incrementing the numbering. + + @a bulletNumber is a number, usually starting with 1. + @a leftIndent and @a leftSubIndent are values in tenths of a millimetre. + @a bulletStyle is a bitlist of the ::wxTextAttrBulletStyle values. + + wxRichTextBuffer uses indentation to render a bulleted item. + The left indent is the distance between the margin and the bullet. + The content of the paragraph, including the first line, starts + at leftMargin + leftSubIndent. + So the distance between the left edge of the bullet and the + left of the actual paragraph is leftSubIndent. + */ + bool BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD) + { return GetBuffer().BeginNumberedBullet(bulletNumber, leftIndent, leftSubIndent, bulletStyle); } + + /** + Ends application of a numbered bullet. + */ + bool EndNumberedBullet() { return GetBuffer().EndNumberedBullet(); } + + /** + Begins applying a symbol bullet, using a character from the current font. + See BeginNumberedBullet() for an explanation of how indentation is used + to render the bulleted paragraph. + */ + bool BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL) + { return GetBuffer().BeginSymbolBullet(symbol, leftIndent, leftSubIndent, bulletStyle); } + + /** + Ends applying a symbol bullet. + */ + bool EndSymbolBullet() { return GetBuffer().EndSymbolBullet(); } + + /** + Begins applying a symbol bullet. + */ + bool BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_STANDARD) + { return GetBuffer().BeginStandardBullet(bulletName, leftIndent, leftSubIndent, bulletStyle); } + + /** + Begins applying a standard bullet. + */ + bool EndStandardBullet() { return GetBuffer().EndStandardBullet(); } + + /** + Begins using the named character style. + */ + bool BeginCharacterStyle(const wxString& characterStyle) { return GetBuffer().BeginCharacterStyle(characterStyle); } + + /** + Ends application of a named character style. + */ + bool EndCharacterStyle() { return GetBuffer().EndCharacterStyle(); } + + /** + Begins applying the named paragraph style. + */ + bool BeginParagraphStyle(const wxString& paragraphStyle) { return GetBuffer().BeginParagraphStyle(paragraphStyle); } + + /** + Ends application of a named paragraph style. + */ + bool EndParagraphStyle() { return GetBuffer().EndParagraphStyle(); } + + /** + Begins using a specified list style. + Optionally, you can also pass a level and a number. + */ + bool BeginListStyle(const wxString& listStyle, int level = 1, int number = 1) { return GetBuffer().BeginListStyle(listStyle, level, number); } + + /** + Ends using a specified list style. + */ + bool EndListStyle() { return GetBuffer().EndListStyle(); } + + /** + Begins applying wxTEXT_ATTR_URL to the content. + + Pass a URL and optionally, a character style to apply, since it is common + to mark a URL with a familiar style such as blue text with underlining. + */ + bool BeginURL(const wxString& url, const wxString& characterStyle = wxEmptyString) { return GetBuffer().BeginURL(url, characterStyle); } + + /** + Ends applying a URL. + */ + bool EndURL() { return GetBuffer().EndURL(); } + + /** + Sets the default style to the style under the cursor. + */ + bool SetDefaultStyleToCursorStyle(); + + /** + Cancels any selection. + */ + virtual void SelectNone(); + + /** + Selects the word at the given character position. + */ + virtual bool SelectWord(long position); + + /** + Returns the selection range in character positions. -1, -1 means no selection. + + The range is in API convention, i.e. a single character selection is denoted + by (n, n+1) + */ + wxRichTextRange GetSelectionRange() const; + + /** + Sets the selection to the given range. + The end point of range is specified as the last character position of the span + of text, plus one. + + So, for example, to set the selection for a character at position 5, use the + range (5,6). + */ + void SetSelectionRange(const wxRichTextRange& range); + + /** + Returns the selection range in character positions. -2, -2 means no selection + -1, -1 means select everything. + The range is in internal format, i.e. a single character selection is denoted + by (n, n) + */ + wxRichTextRange GetInternalSelectionRange() const { return m_selection.GetRange(); } + + /** + Sets the selection range in character positions. -2, -2 means no selection + -1, -1 means select everything. + The range is in internal format, i.e. a single character selection is denoted + by (n, n) + */ + void SetInternalSelectionRange(const wxRichTextRange& range) { m_selection.Set(range, GetFocusObject()); } + + /** + Adds a new paragraph of text to the end of the buffer. + */ + virtual wxRichTextRange AddParagraph(const wxString& text); + + /** + Adds an image to the control's buffer. + */ + virtual wxRichTextRange AddImage(const wxImage& image); + + /** + Lays out the buffer, which must be done before certain operations, such as + setting the caret position. + This function should not normally be required by the application. + */ + virtual bool LayoutContent(bool onlyVisibleRect = false); + + /** + Move the caret to the given character position. + + Please note that this does not update the current editing style + from the new position; to do that, call wxRichTextCtrl::SetInsertionPoint instead. + */ + virtual bool MoveCaret(long pos, bool showAtLineStart = false, wxRichTextParagraphLayoutBox* container = NULL); + + /** + Moves right. + */ + virtual bool MoveRight(int noPositions = 1, int flags = 0); + + /** + Moves left. + */ + virtual bool MoveLeft(int noPositions = 1, int flags = 0); + + /** + Moves to the start of the paragraph. + */ + virtual bool MoveUp(int noLines = 1, int flags = 0); + + /** + Moves the caret down. + */ + virtual bool MoveDown(int noLines = 1, int flags = 0); + + /** + Moves to the end of the line. + */ + virtual bool MoveToLineEnd(int flags = 0); + + /** + Moves to the start of the line. + */ + virtual bool MoveToLineStart(int flags = 0); + + /** + Moves to the end of the paragraph. + */ + virtual bool MoveToParagraphEnd(int flags = 0); + + /** + Moves to the start of the paragraph. + */ + virtual bool MoveToParagraphStart(int flags = 0); + + /** + Moves to the start of the buffer. + */ + virtual bool MoveHome(int flags = 0); + + /** + Moves to the end of the buffer. + */ + virtual bool MoveEnd(int flags = 0); + + /** + Moves one or more pages up. + */ + virtual bool PageUp(int noPages = 1, int flags = 0); + + /** + Moves one or more pages down. + */ + virtual bool PageDown(int noPages = 1, int flags = 0); + + /** + Moves a number of words to the left. + */ + virtual bool WordLeft(int noPages = 1, int flags = 0); + + /** + Move a nuber of words to the right. + */ + virtual bool WordRight(int noPages = 1, int flags = 0); + + //@{ + /** + Returns the buffer associated with the control. + */ + wxRichTextBuffer& GetBuffer() { return m_buffer; } + const wxRichTextBuffer& GetBuffer() const { return m_buffer; } + //@} + + /** + Starts batching undo history for commands. + */ + virtual bool BeginBatchUndo(const wxString& cmdName) { return m_buffer.BeginBatchUndo(cmdName); } + + /** + Ends batching undo command history. + */ + virtual bool EndBatchUndo() { return m_buffer.EndBatchUndo(); } + + /** + Returns @true if undo commands are being batched. + */ + virtual bool BatchingUndo() const { return m_buffer.BatchingUndo(); } + + /** + Starts suppressing undo history for commands. + */ + virtual bool BeginSuppressUndo() { return m_buffer.BeginSuppressUndo(); } + + /** + Ends suppressing undo command history. + */ + virtual bool EndSuppressUndo() { return m_buffer.EndSuppressUndo(); } + + /** + Returns @true if undo history suppression is on. + */ + virtual bool SuppressingUndo() const { return m_buffer.SuppressingUndo(); } + + /** + Test if this whole range has character attributes of the specified kind. + If any of the attributes are different within the range, the test fails. + + You can use this to implement, for example, bold button updating. + @a style must have flags indicating which attributes are of interest. + */ + virtual bool HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const + { + return GetBuffer().HasCharacterAttributes(range.ToInternal(), style); + } + + /** + Test if this whole range has paragraph attributes of the specified kind. + If any of the attributes are different within the range, the test fails. + You can use this to implement, for example, centering button updating. + @a style must have flags indicating which attributes are of interest. + */ + virtual bool HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const + { + return GetBuffer().HasParagraphAttributes(range.ToInternal(), style); + } + + /** + Returns @true if all of the selection is bold. + */ + virtual bool IsSelectionBold(); + + /** + Returns @true if all of the selection is italic. + */ + virtual bool IsSelectionItalics(); + + /** + Returns @true if all of the selection is underlined. + */ + virtual bool IsSelectionUnderlined(); + + /** + Returns @true if all of the selection is aligned according to the specified flag. + */ + virtual bool IsSelectionAligned(wxTextAttrAlignment alignment); + + /** + Apples bold to the selection (undoable). + */ + virtual bool ApplyBoldToSelection(); + + /** + Applies italic to the selection (undoable). + */ + virtual bool ApplyItalicToSelection(); + + /** + Applies underline to the selection (undoable). + */ + virtual bool ApplyUnderlineToSelection(); + + /** + Applies the given alignment to the selection (undoable). + For alignment values, see wxTextAttr. + */ + virtual bool ApplyAlignmentToSelection(wxTextAttrAlignment alignment); + + /** + Applies the style sheet to the buffer, matching paragraph styles in the sheet + against named styles in the buffer. + + This might be useful if the styles have changed. + If @a sheet is @NULL, the sheet set with SetStyleSheet() is used. + Currently this applies paragraph styles only. + */ + virtual bool ApplyStyle(wxRichTextStyleDefinition* def); + + /** + Sets the style sheet associated with the control. + A style sheet allows named character and paragraph styles to be applied. + */ + void SetStyleSheet(wxRichTextStyleSheet* styleSheet) { GetBuffer().SetStyleSheet(styleSheet); } + + /** + Returns the style sheet associated with the control, if any. + A style sheet allows named character and paragraph styles to be applied. + */ + wxRichTextStyleSheet* GetStyleSheet() const { return GetBuffer().GetStyleSheet(); } + + /** + Push the style sheet to top of stack. + */ + bool PushStyleSheet(wxRichTextStyleSheet* styleSheet) { return GetBuffer().PushStyleSheet(styleSheet); } + + /** + Pops the style sheet from top of stack. + */ + wxRichTextStyleSheet* PopStyleSheet() { return GetBuffer().PopStyleSheet(); } + + /** + Applies the style sheet to the buffer, for example if the styles have changed. + */ + bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL); + +// Command handlers + + /** + Sends the event to the control. + */ + void Command(wxCommandEvent& event); + + /** + Loads the first dropped file. + */ + void OnDropFiles(wxDropFilesEvent& event); + + void OnCaptureLost(wxMouseCaptureLostEvent& event); + void OnSysColourChanged(wxSysColourChangedEvent& event); + + /** + Standard handler for the wxID_CUT command. + */ + void OnCut(wxCommandEvent& event); + + /** + Standard handler for the wxID_COPY command. + */ + void OnCopy(wxCommandEvent& event); + + /** + Standard handler for the wxID_PASTE command. + */ + void OnPaste(wxCommandEvent& event); + + /** + Standard handler for the wxID_UNDO command. + */ + void OnUndo(wxCommandEvent& event); + + /** + Standard handler for the wxID_REDO command. + */ + void OnRedo(wxCommandEvent& event); + + /** + Standard handler for the wxID_SELECTALL command. + */ + void OnSelectAll(wxCommandEvent& event); + + /** + Standard handler for property commands. + */ + void OnProperties(wxCommandEvent& event); + + /** + Standard handler for the wxID_CLEAR command. + */ + void OnClear(wxCommandEvent& event); + + /** + Standard update handler for the wxID_CUT command. + */ + void OnUpdateCut(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_COPY command. + */ + void OnUpdateCopy(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_PASTE command. + */ + void OnUpdatePaste(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_UNDO command. + */ + void OnUpdateUndo(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_REDO command. + */ + void OnUpdateRedo(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_SELECTALL command. + */ + void OnUpdateSelectAll(wxUpdateUIEvent& event); + + /** + Standard update handler for property commands. + */ + + void OnUpdateProperties(wxUpdateUIEvent& event); + + /** + Standard update handler for the wxID_CLEAR command. + */ + void OnUpdateClear(wxUpdateUIEvent& event); + + /** + Shows a standard context menu with undo, redo, cut, copy, paste, clear, and + select all commands. + */ + void OnContextMenu(wxContextMenuEvent& event); + +// Event handlers + + // Painting + void OnPaint(wxPaintEvent& event); + void OnEraseBackground(wxEraseEvent& event); + + // Left-click + void OnLeftClick(wxMouseEvent& event); + + // Left-up + void OnLeftUp(wxMouseEvent& event); + + // Motion + void OnMoveMouse(wxMouseEvent& event); + + // Left-double-click + void OnLeftDClick(wxMouseEvent& event); + + // Middle-click + void OnMiddleClick(wxMouseEvent& event); + + // Right-click + void OnRightClick(wxMouseEvent& event); + + // Key press + void OnChar(wxKeyEvent& event); + + // Sizing + void OnSize(wxSizeEvent& event); + + // Setting/losing focus + void OnSetFocus(wxFocusEvent& event); + void OnKillFocus(wxFocusEvent& event); + + // Idle-time processing + void OnIdle(wxIdleEvent& event); + + // Scrolling + void OnScroll(wxScrollWinEvent& event); + + /** + Sets the font, and also the basic and default attributes + (see wxRichTextCtrl::SetDefaultStyle). + */ + virtual bool SetFont(const wxFont& font); + + /** + A helper function setting up scrollbars, for example after a resize. + */ + virtual void SetupScrollbars(bool atTop = false); + + /** + Helper function implementing keyboard navigation. + */ + virtual bool KeyboardNavigate(int keyCode, int flags); + + /** + Paints the background. + */ + virtual void PaintBackground(wxDC& dc); + + /** + Other user defined painting after everything else (i.e. all text) is painted. + + @since 2.9.1 + */ + virtual void PaintAboveContent(wxDC& WXUNUSED(dc)) {} + +#if wxRICHTEXT_BUFFERED_PAINTING + /** + Recreates the buffer bitmap if necessary. + */ + virtual bool RecreateBuffer(const wxSize& size = wxDefaultSize); +#endif + + // Write text + virtual void DoWriteText(const wxString& value, int flags = 0); + + // Should we inherit colours? + virtual bool ShouldInheritColours() const { return false; } + + /** + Internal function to position the visible caret according to the current caret + position. + */ + virtual void PositionCaret(wxRichTextParagraphLayoutBox* container = NULL); + + /** + Helper function for extending the selection, returning @true if the selection + was changed. Selections are in caret positions. + */ + virtual bool ExtendSelection(long oldPosition, long newPosition, int flags); + + /** + Scrolls @a position into view. This function takes a caret position. + */ + virtual bool ScrollIntoView(long position, int keyCode); + + /** + Refreshes the area affected by a selection change. + */ + bool RefreshForSelectionChange(const wxRichTextSelection& oldSelection, const wxRichTextSelection& newSelection); + + /** + Sets the caret position. + + The caret position is the character position just before the caret. + A value of -1 means the caret is at the start of the buffer. + Please note that this does not update the current editing style + from the new position or cause the actual caret to be refreshed; to do that, + call wxRichTextCtrl::SetInsertionPoint instead. + */ + void SetCaretPosition(long position, bool showAtLineStart = false) ; + + /** + Returns the current caret position. + */ + long GetCaretPosition() const { return m_caretPosition; } + + /** + The adjusted caret position is the character position adjusted to take + into account whether we're at the start of a paragraph, in which case + style information should be taken from the next position, not current one. + */ + long GetAdjustedCaretPosition(long caretPos) const; + + /** + Move the caret one visual step forward: this may mean setting a flag + and keeping the same position if we're going from the end of one line + to the start of the next, which may be the exact same caret position. + */ + void MoveCaretForward(long oldPosition) ; + + /** + Move the caret one visual step forward: this may mean setting a flag + and keeping the same position if we're going from the end of one line + to the start of the next, which may be the exact same caret position. + */ + void MoveCaretBack(long oldPosition) ; + + /** + Returns the caret height and position for the given character position. + If container is null, the current focus object will be used. + + @beginWxPerlOnly + In wxPerl this method is implemented as + GetCaretPositionForIndex(@a position) returning a + 2-element list (ok, rect). + @endWxPerlOnly + */ + bool GetCaretPositionForIndex(long position, wxRect& rect, wxRichTextParagraphLayoutBox* container = NULL); + + /** + Internal helper function returning the line for the visible caret position. + If the caret is shown at the very end of the line, it means the next character + is actually on the following line. + So this function gets the line we're expecting to find if this is the case. + */ + wxRichTextLine* GetVisibleLineForCaretPosition(long caretPosition) const; + + /** + Gets the command processor associated with the control's buffer. + */ + wxCommandProcessor* GetCommandProcessor() const { return GetBuffer().GetCommandProcessor(); } + + /** + Deletes content if there is a selection, e.g. when pressing a key. + Returns the new caret position in @e newPos, or leaves it if there + was no action. This is undoable. + + @beginWxPerlOnly + In wxPerl this method takes no arguments and returns a 2-element + list (ok, newPos). + @endWxPerlOnly + */ + bool DeleteSelectedContent(long* newPos= NULL); + + /** + Transforms logical (unscrolled) position to physical window position. + */ + wxPoint GetPhysicalPoint(const wxPoint& ptLogical) const; + + /** + Transforms physical window position to logical (unscrolled) position. + */ + wxPoint GetLogicalPoint(const wxPoint& ptPhysical) const; + + /** + Helper function for finding the caret position for the next word. + Direction is 1 (forward) or -1 (backwards). + */ + virtual long FindNextWordPosition(int direction = 1) const; + + /** + Returns @true if the given position is visible on the screen. + */ + bool IsPositionVisible(long pos) const; + + /** + Returns the first visible position in the current view. + */ + long GetFirstVisiblePosition() const; + + /** + Returns the caret position since the default formatting was changed. As + soon as this position changes, we no longer reflect the default style + in the UI. A value of -2 means that we should only reflect the style of the + content under the caret. + */ + long GetCaretPositionForDefaultStyle() const { return m_caretPositionForDefaultStyle; } + + /** + Set the caret position for the default style that the user is selecting. + */ + void SetCaretPositionForDefaultStyle(long pos) { m_caretPositionForDefaultStyle = pos; } + + /** + Returns @true if the user has recently set the default style without moving + the caret, and therefore the UI needs to reflect the default style and not + the style at the caret. + + Below is an example of code that uses this function to determine whether the UI + should show that the current style is bold. + + @see SetAndShowDefaultStyle(). + */ + bool IsDefaultStyleShowing() const { return m_caretPositionForDefaultStyle != -2; } + + /** + Sets @a attr as the default style and tells the control that the UI should + reflect this attribute until the user moves the caret. + + @see IsDefaultStyleShowing(). + */ + void SetAndShowDefaultStyle(const wxRichTextAttr& attr) + { + SetDefaultStyle(attr); + SetCaretPositionForDefaultStyle(GetCaretPosition()); + } + + /** + Returns the first visible point in the window. + */ + wxPoint GetFirstVisiblePoint() const; + +#ifdef DOXYGEN + /** + Returns the content of the entire control as a string. + */ + virtual wxString GetValue() const; + + /** + Replaces existing content with the given text. + */ + virtual void SetValue(const wxString& value); + + /** + Call this function to prevent refresh and allow fast updates, and then Thaw() to + refresh the control. + */ + void Freeze(); + + /** + Call this function to end a Freeze and refresh the display. + */ + void Thaw(); + + /** + Returns @true if Freeze has been called without a Thaw. + */ + bool IsFrozen() const; + +#endif + +// Implementation + + /** + Sets up the caret for the given position and container, after a mouse click. + */ + bool SetCaretPositionAfterClick(wxRichTextParagraphLayoutBox* container, long position, int hitTestFlags, bool extendSelection = false); + + /** + Find the caret position for the combination of hit-test flags and character position. + Returns the caret position and also an indication of where to place the caret (caretLineStart) + since this is ambiguous (same position used for end of line and start of next). + */ + long FindCaretPositionForCharacterPosition(long position, int hitTestFlags, wxRichTextParagraphLayoutBox* container, + bool& caretLineStart); + + /** + Font names take a long time to retrieve, so cache them (on demand). + */ + static const wxArrayString& GetAvailableFontNames(); + + /** + Clears the cache of available font names. + */ + static void ClearAvailableFontNames(); + + WX_FORWARD_TO_SCROLL_HELPER() + + // implement wxTextEntry methods + virtual wxString DoGetValue() const; + +protected: + // implement the wxTextEntry pure virtual method + virtual wxWindow *GetEditableWindow() { return this; } + + // margins functions + virtual bool DoSetMargins(const wxPoint& pt); + virtual wxPoint DoGetMargins() const; + + // FIXME: this does not work, it allows this code to compile but will fail + // during run-time +#ifndef __WXUNIVERSAL__ +#ifdef __WXMSW__ + virtual WXHWND GetEditHWND() const { return GetHWND(); } +#endif +#ifdef __WXMOTIF__ + virtual WXWidget GetTextWidget() const { return NULL; } +#endif +#ifdef __WXGTK20__ + virtual GtkEditable *GetEditable() const { return NULL; } + virtual GtkEntry *GetEntry() const { return NULL; } +#endif +#endif // !__WXUNIVERSAL__ + +// Overrides +protected: + + /** + Currently this simply returns @c wxSize(10, 10). + */ + virtual wxSize DoGetBestSize() const ; + + virtual void DoSetValue(const wxString& value, int flags = 0); + + virtual void DoThaw(); + + +// Data members +private: +#if wxRICHTEXT_BUFFERED_PAINTING + /// Buffer bitmap + wxBitmap m_bufferBitmap; +#endif + + /// Text buffer + wxRichTextBuffer m_buffer; + + wxMenu* m_contextMenu; + + /// Caret position (1 less than the character position, so -1 is the + /// first caret position). + long m_caretPosition; + + /// Caret position when the default formatting has been changed. As + /// soon as this position changes, we no longer reflect the default style + /// in the UI. + long m_caretPositionForDefaultStyle; + + /// Selection range in character positions. -2, -2 means no selection. + wxRichTextSelection m_selection; + + wxRichTextCtrlSelectionState m_selectionState; + + /// Anchor so we know how to extend the selection + /// It's a caret position since it's between two characters. + long m_selectionAnchor; + + /// Anchor object if selecting multiple container objects, such as grid cells. + wxRichTextObject* m_selectionAnchorObject; + + /// Are we editable? + bool m_editable; + + /// Are we showing the caret position at the start of a line + /// instead of at the end of the previous one? + bool m_caretAtLineStart; + + /// Are we dragging a selection? + bool m_dragging; + + /// Start position for drag + wxPoint m_dragStart; + + /// Do we need full layout in idle? + bool m_fullLayoutRequired; + wxLongLong m_fullLayoutTime; + long m_fullLayoutSavedPosition; + + /// Threshold for doing delayed layout + long m_delayedLayoutThreshold; + + /// Cursors + wxCursor m_textCursor; + wxCursor m_urlCursor; + + static wxArrayString sm_availableFontNames; + + wxRichTextContextMenuPropertiesInfo m_contextMenuPropertiesInfo; + + /// The object that currently has the editing focus + wxRichTextParagraphLayoutBox* m_focusObject; +}; + /** @class wxRichTextEvent This is the event class for wxRichTextCtrl notifications. @beginEventTable{wxRichTextEvent} + @event{EVT_RICHTEXT_LEFT_CLICK(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_LEFT_CLICK event, generated when the user + releases the left mouse button over an object. + @event{EVT_RICHTEXT_RIGHT_CLICK(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK event, generated when the user + releases the right mouse button over an object. + @event{EVT_RICHTEXT_MIDDLE_CLICK(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK event, generated when the user + releases the middle mouse button over an object. + @event{EVT_RICHTEXT_LEFT_DCLICK(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_DLEFT_CLICK event, generated when the user + double-clicks an object. + @event{EVT_RICHTEXT_RETURN(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_RETURN event, generated when the user + presses the return key. Valid event functions: GetFlags, GetPosition. @event{EVT_RICHTEXT_CHARACTER(id, func)} Process a @c wxEVT_COMMAND_RICHTEXT_CHARACTER event, generated when the user presses a character key. Valid event functions: GetFlags, GetPosition, GetCharacter. @@ -50,19 +2093,21 @@ Process a @c wxEVT_COMMAND_RICHTEXT_BUFFER_RESET event, generated when the buffer has been reset by deleting all content. You can use this to set a default style for the first new paragraph. + @event{EVT_RICHTEXT_SELECTION_CHANGED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED event, generated when the + selection range has changed. + @event{EVT_RICHTEXT_FOCUS_OBJECT_CHANGED(id, func)} + Process a @c wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED event, generated when the + current focus object has changed. @endEventTable @library{wxrichtext} @category{events,richtext} */ -class wxRichTextEvent : public wxNotifyEvent + +class WXDLLIMPEXP_RICHTEXT wxRichTextEvent : public wxNotifyEvent { public: - /** - Copy constructor. - */ - wxRichTextEvent(const wxRichTextEvent& event); - /** Constructor. @@ -71,27 +2116,45 @@ public: @param id Window identifier. The value @c wxID_ANY indicates a default value. */ - wxRichTextEvent(wxEventType commandType = wxEVT_NULL, int id = 0); + wxRichTextEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) + : wxNotifyEvent(commandType, winid), + m_flags(0), m_position(-1), m_oldStyleSheet(NULL), m_newStyleSheet(NULL), + m_char((wxChar) 0), m_container(NULL), m_oldContainer(NULL) + { } /** - Returns the character pressed, within a @c wxEVT_COMMAND_RICHTEXT_CHARACTER event. + Copy constructor. */ - wxChar GetCharacter() const; + wxRichTextEvent(const wxRichTextEvent& event) + : wxNotifyEvent(event), + m_flags(event.m_flags), m_position(-1), + m_oldStyleSheet(event.m_oldStyleSheet), m_newStyleSheet(event.m_newStyleSheet), + m_char((wxChar) 0), m_container(event.m_container), m_oldContainer(event.m_oldContainer) + { } + + /** + Returns the buffer position at which the event occured. + */ + long GetPosition() const { return m_position; } + + /** + Sets the buffer position variable. + */ + void SetPosition(long pos) { m_position = pos; } /** Returns flags indicating modifier keys pressed. Possible values are @c wxRICHTEXT_CTRL_DOWN, @c wxRICHTEXT_SHIFT_DOWN, and @c wxRICHTEXT_ALT_DOWN. */ - int GetFlags() const; + int GetFlags() const { return m_flags; } /** - Returns the new style sheet. + Sets flags indicating modifier keys pressed. - Can be used in a @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING or - @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED event handler. + Possible values are @c wxRICHTEXT_CTRL_DOWN, @c wxRICHTEXT_SHIFT_DOWN, and @c wxRICHTEXT_ALT_DOWN. */ - wxRichTextStyleSheet* GetNewStyleSheet() const; + void SetFlags(int flags) { m_flags = flags; } /** Returns the old style sheet. @@ -99,1440 +2162,78 @@ public: Can be used in a @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING or @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED event handler. */ - wxRichTextStyleSheet* GetOldStyleSheet() const; - - /** - Returns the buffer position at which the event occured. - */ - long GetPosition() const; - - /** - Gets the range for the current operation. - */ - const wxRichTextRange& GetRange() const; - - /** - Sets the character variable. - */ - void SetCharacter(wxChar ch); - - /** - Sets flags indicating modifier keys pressed. - - Possible values are @c wxRICHTEXT_CTRL_DOWN, @c wxRICHTEXT_SHIFT_DOWN, and @c wxRICHTEXT_ALT_DOWN. - */ - void SetFlags(int flags); - - /** - Sets the new style sheet variable. - */ - void SetNewStyleSheet(wxRichTextStyleSheet* sheet); + wxRichTextStyleSheet* GetOldStyleSheet() const { return m_oldStyleSheet; } /** Sets the old style sheet variable. */ - void SetOldStyleSheet(wxRichTextStyleSheet* sheet); + void SetOldStyleSheet(wxRichTextStyleSheet* sheet) { m_oldStyleSheet = sheet; } /** - Sets the buffer position variable. + Returns the new style sheet. + + Can be used in a @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING or + @c wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED event handler. */ - void SetPosition(long pos); + wxRichTextStyleSheet* GetNewStyleSheet() const { return m_newStyleSheet; } + + /** + Sets the new style sheet variable. + */ + void SetNewStyleSheet(wxRichTextStyleSheet* sheet) { m_newStyleSheet = sheet; } + + /** + Gets the range for the current operation. + */ + const wxRichTextRange& GetRange() const { return m_range; } /** Sets the range variable. */ - void SetRange(const wxRichTextRange& range); -}; - - - -/** - @class wxRichTextCtrl - - wxRichTextCtrl provides a generic, ground-up implementation of a text control - capable of showing multiple styles and images. - - wxRichTextCtrl sends notification events: see wxRichTextEvent. - - It also sends the standard wxTextCtrl events @c wxEVT_COMMAND_TEXT_ENTER and - @c wxEVT_COMMAND_TEXT_UPDATED, and wxTextUrlEvent when URL content is clicked. - - For more information, see the @ref overview_richtextctrl. - - @beginStyleTable - @style{wxRE_CENTRE_CARET} - The control will try to keep the caret line centred vertically while editing. - wxRE_CENTER_CARET is a synonym for this style. - @style{wxRE_MULTILINE} - The control will be multiline (mandatory). - @style{wxRE_READONLY} - The control will not be editable. - @endStyleTable - - @library{wxrichtext} - @category{richtext} - @appearance{richtextctrl.png} -*/ -class wxRichTextCtrl -{ -public: - /** - Default Constructor. - */ - wxRichTextCtrl(); - - /** - Constructor, creating and showing a rich text control. - - @param parent - Parent window. Must not be @NULL. - @param id - Window identifier. The value @c wxID_ANY indicates a default value. - @param value - Default string. - @param pos - Window position. - @param size - Window size. - @param style - Window style. - @param validator - Window validator. - @param name - Window name. - - @see Create(), wxValidator - */ - wxRichTextCtrl(wxWindow* parent, wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxRE_MULTILINE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr); - - /** - Destructor. - */ - virtual ~wxRichTextCtrl(); - - /** - Adds an image to the control's buffer. - */ - virtual wxRichTextRange AddImage(const wxImage& image); - - /** - Adds a new paragraph of text to the end of the buffer. - */ - virtual wxRichTextRange AddParagraph(const wxString& text); - - /** - Sets the insertion point to the end of the buffer and writes the text. - */ - virtual void AppendText(const wxString& text); - - /** - Applies the given alignment to the selection (undoable). - For alignment values, see wxTextAttr. - */ - virtual bool ApplyAlignmentToSelection(wxTextAttrAlignment alignment); - - /** - Apples bold to the selection (undoable). - */ - virtual bool ApplyBoldToSelection(); - - /** - Applies italic to the selection (undoable). - */ - virtual bool ApplyItalicToSelection(); - - /** - Applies the given style to the selection. - */ - virtual bool ApplyStyle(wxRichTextStyleDefinition* def); - - /** - Applies the style sheet to the buffer, matching paragraph styles in the sheet - against named styles in the buffer. - - This might be useful if the styles have changed. - If @a sheet is @NULL, the sheet set with SetStyleSheet() is used. - Currently this applies paragraph styles only. - */ - bool ApplyStyleSheet(wxRichTextStyleSheet* sheet = NULL); - - /** - Applies underline to the selection (undoable). - */ - virtual bool ApplyUnderlineToSelection(); - - /** - Returns @true if undo commands are being batched. - */ - virtual bool BatchingUndo() const; - - /** - Begins using alignment. - For alignment values, see wxTextAttr. - */ - bool BeginAlignment(wxTextAttrAlignment alignment); - - /** - Starts batching undo history for commands. - */ - virtual bool BeginBatchUndo(const wxString& cmdName); - - /** - Begins using bold. - */ - bool BeginBold(); - - /** - Begins using the named character style. - */ - bool BeginCharacterStyle(const wxString& characterStyle); - - /** - Begins using this font. - */ - bool BeginFont(const wxFont& font); - - /** - Begins using the given point size. - */ - bool BeginFontSize(int pointSize); - - /** - Begins using italic. - */ - bool BeginItalic(); - - /** - Begins applying a left indent and subindent in tenths of a millimetre. - The subindent is an offset from the left edge of the paragraph, and is - used for all but the first line in a paragraph. A positive value will - cause the first line to appear to the left of the subsequent lines, and - a negative value will cause the first line to be indented to the right - of the subsequent lines. - - wxRichTextBuffer uses indentation to render a bulleted item. The - content of the paragraph, including the first line, starts at the - @a leftIndent plus the @a leftSubIndent. - - @param leftIndent - The distance between the margin and the bullet. - @param leftSubIndent - The distance between the left edge of the bullet and the left edge - of the actual paragraph. - */ - bool BeginLeftIndent(int leftIndent, int leftSubIndent = 0); - - /** - Begins appling line spacing. @e spacing is a multiple, where 10 means - single-spacing, 15 means 1.5 spacing, and 20 means double spacing. - - The ::wxTextAttrLineSpacing constants are defined for convenience. - */ - bool BeginLineSpacing(int lineSpacing); - - /** - Begins using a specified list style. - Optionally, you can also pass a level and a number. - */ - bool BeginListStyle(const wxString& listStyle, int level = 1, - int number = 1); - - /** - Begins a numbered bullet. - - This call will be needed for each item in the list, and the - application should take care of incrementing the numbering. - - @a bulletNumber is a number, usually starting with 1. - @a leftIndent and @a leftSubIndent are values in tenths of a millimetre. - @a bulletStyle is a bitlist of the ::wxTextAttrBulletStyle values. - - wxRichTextBuffer uses indentation to render a bulleted item. - The left indent is the distance between the margin and the bullet. - The content of the paragraph, including the first line, starts - at leftMargin + leftSubIndent. - So the distance between the left edge of the bullet and the - left of the actual paragraph is leftSubIndent. - */ - bool BeginNumberedBullet(int bulletNumber, int leftIndent, - int leftSubIndent, - int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD); - - /** - Begins paragraph spacing; pass the before-paragraph and after-paragraph spacing - in tenths of a millimetre. - */ - bool BeginParagraphSpacing(int before, int after); - - /** - Begins applying the named paragraph style. - */ - bool BeginParagraphStyle(const wxString& paragraphStyle); - - /** - Begins a right indent, specified in tenths of a millimetre. - */ - bool BeginRightIndent(int rightIndent); - - /** - Begins applying a style. - */ - virtual bool BeginStyle(const wxTextAttr& style); - - /** - Starts suppressing undo history for commands. - */ - virtual bool BeginSuppressUndo(); - - /** - Begins applying a symbol bullet, using a character from the current font. - See BeginNumberedBullet() for an explanation of how indentation is used - to render the bulleted paragraph. - */ - bool BeginSymbolBullet(const wxString& symbol, int leftIndent, - int leftSubIndent, - int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL); - - /** - Begins using this colour. - */ - bool BeginTextColour(const wxColour& colour); - - /** - Begins applying wxTEXT_ATTR_URL to the content. - - Pass a URL and optionally, a character style to apply, since it is common - to mark a URL with a familiar style such as blue text with underlining. - */ - bool BeginURL(const wxString& url, - const wxString& characterStyle = wxEmptyString); - - /** - Begins using underlining. - */ - bool BeginUnderline(); - - /** - Returns @true if selected content can be copied to the clipboard. - */ - virtual bool CanCopy() const; - - /** - Returns @true if selected content can be copied to the clipboard and deleted. - */ - virtual bool CanCut() const; - - /** - Returns @true if selected content can be deleted. - */ - virtual bool CanDeleteSelection() const; - - /** - Returns @true if the clipboard content can be pasted to the buffer. - */ - virtual bool CanPaste() const; - - /** - Returns @true if there is a command in the command history that can be redone. - */ - virtual bool CanRedo() const; - - /** - Returns @true if there is a command in the command history that can be undone. - */ - virtual bool CanUndo() const; - - /** - Clears the buffer content, leaving a single empty paragraph. Cannot be undone. - */ - virtual void Clear(); - - /** - Clears the list style from the given range, clearing list-related attributes - and applying any named paragraph style associated with each paragraph. - - @a flags is a bit list of the following: - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. - - @see SetListStyle(), PromoteList(), NumberList(). - */ - virtual bool ClearListStyle(const wxRichTextRange& range, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); - - /** - Sends the event to the control. - */ - virtual void Command(wxCommandEvent& event); - - /** - Copies the selected content (if any) to the clipboard. - */ - virtual void Copy(); - - /** - Creates the underlying window. - */ - bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxRE_MULTILINE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr); - - /** - Copies the selected content (if any) to the clipboard and deletes the selection. - This is undoable. - */ - virtual void Cut(); - - /** - Deletes the content within the given range. - */ - virtual bool Delete(const wxRichTextRange& range); - - /** - Deletes content if there is a selection, e.g. when pressing a key. - Returns the new caret position in @e newPos, or leaves it if there - was no action. This is undoable. - - @beginWxPerlOnly - In wxPerl this method takes no arguments and returns a 2-element - list (ok, newPos). - @endWxPerlOnly - */ - bool DeleteSelectedContent(long* newPos = NULL); - - /** - Deletes the content in the selection, if any. This is undoable. - */ - virtual void DeleteSelection(); - - /** - Sets the buffer's modified status to @false, and clears the buffer's command - history. - */ - virtual void DiscardEdits(); - - /** - Ends alignment. - */ - bool EndAlignment(); - - /** - Ends application of all styles in the current style stack. - */ - virtual bool EndAllStyles(); - - /** - Ends batching undo command history. - */ - virtual bool EndBatchUndo(); - - /** - Ends using bold. - */ - bool EndBold(); - - /** - Ends application of a named character style. - */ - bool EndCharacterStyle(); - - /** - Ends using a font. - */ - bool EndFont(); - - /** - Ends using a point size. - */ - bool EndFontSize(); - - /** - Ends using italic. - */ - bool EndItalic(); - - /** - Ends left indent. - */ - bool EndLeftIndent(); - - /** - Ends line spacing. - */ - bool EndLineSpacing(); - - /** - Ends using a specified list style. - */ - bool EndListStyle(); - - /** - Ends application of a numbered bullet. - */ - bool EndNumberedBullet(); - - /** - Ends paragraph spacing. - */ - bool EndParagraphSpacing(); - - /** - Ends application of a named character style. - */ - bool EndParagraphStyle(); - - /** - Ends right indent. - */ - bool EndRightIndent(); - - /** - Ends the current style. - */ - virtual bool EndStyle(); - - /** - Ends suppressing undo command history. - */ - virtual bool EndSuppressUndo(); - - /** - Ends applying a symbol bullet. - */ - bool EndSymbolBullet(); - - /** - Ends applying a text colour. - */ - bool EndTextColour(); - - /** - Ends applying a URL. - */ - bool EndURL(); - - /** - End applying underlining. - */ - bool EndUnderline(); - - /** - Helper function for extending the selection, returning @true if the selection - was changed. Selections are in caret positions. - */ - virtual bool ExtendSelection(long oldPosition, long newPosition, int flags); - - /** - Helper function for finding the caret position for the next word. - Direction is 1 (forward) or -1 (backwards). - */ - virtual long FindNextWordPosition(int direction = 1) const; - - /** - Call this function to prevent refresh and allow fast updates, and then Thaw() to - refresh the control. - */ - void Freeze(); - - /** - Gets the basic (overall) style. - - This is the style of the whole buffer before further styles are applied, - unlike the default style, which only affects the style currently being - applied (for example, setting the default style to bold will cause - subsequently inserted text to be bold). - */ - virtual const wxTextAttr& GetBasicStyle() const; - - //@{ - /** - Returns the buffer associated with the control. - */ - const wxRichTextBuffer GetBuffer(); - const wxRichTextBuffer& GetBuffer(); - //@} - - /** - Returns the current caret position. - */ - long GetCaretPosition() const; - - /** - Returns the caret height and position for the given character position. - - @beginWxPerlOnly - In wxPerl this method is implemented as - GetCaretPositionForIndex(@a position) returning a - 2-element list (ok, rect). - @endWxPerlOnly - */ - bool GetCaretPositionForIndex(long position, wxRect& rect); - - /** - Gets the command processor associated with the control's buffer. - */ - wxCommandProcessor* GetCommandProcessor() const; - - /** - Returns the current default style, which can be used to change how subsequently - inserted text is displayed. - */ - virtual const wxTextAttr& GetDefaultStyle() const; - - /** - Gets the size of the buffer beyond which layout is delayed during resizing. - This optimizes sizing for large buffers. The default is 20000. - */ - long GetDelayedLayoutThreshold() const; - - /** - Gets the current filename associated with the control. - */ - wxString GetFilename() const; - - /** - Returns the first visible position in the current view. - */ - long GetFirstVisiblePosition() const; - - /** - Returns flags that change the behaviour of loading or saving. - See the documentation for each handler class to see what flags are - relevant for each handler. - */ - int GetHandlerFlags() const; - - /** - Returns the current insertion point. - */ - virtual long GetInsertionPoint() const; - - /** - Returns the last position in the buffer. - */ - virtual wxTextPos GetLastPosition() const; - - /** - Returns the length of the specified line in characters. - */ - virtual int GetLineLength(long lineNo) const; - - /** - Returns the text for the given line. - */ - virtual wxString GetLineText(long lineNo) const; - - /** - Transforms physical window position to logical (unscrolled) position. - */ - wxPoint GetLogicalPoint(const wxPoint& ptPhysical) const; - - /** - Returns the number of lines in the buffer. - */ - virtual int GetNumberOfLines() const; - - /** - Transforms logical (unscrolled) position to physical window position. - */ - wxPoint GetPhysicalPoint(const wxPoint& ptLogical) const; - - /** - Gets the text for the given range. - The end point of range is specified as the last character position of - the span of text, plus one. - */ - virtual wxString GetRange(long from, long to) const; - - /** - Returns the range of the current selection. - The end point of range is specified as the last character position of the span - of text, plus one. - If the return values @a from and @a to are the same, there is no selection. - */ - virtual void GetSelection(long* from, long* to) const; - - /** - Returns the selection range in character positions. -1, -1 means no selection. - */ - wxRichTextRange GetSelectionRange() const; - - /** - Returns the text within the current selection range, if any. - */ - virtual wxString GetStringSelection() const; - - /** - Gets the attributes at the given position. - This function gets the combined style - that is, the style you see on the - screen as a result of combining base style, paragraph style and character - style attributes. - - To get the character or paragraph style alone, use GetUncombinedStyle(). - - @beginWxPerlOnly - In wxPerl this method is implemented as GetStyle(@a position) - returning a 2-element list (ok, attr). - @endWxPerlOnly - */ - virtual bool GetStyle(long position, wxTextAttr& style); - - /** - Gets the attributes common to the specified range. - Attributes that differ in value within the range will not be included - in @a style flags. - - @beginWxPerlOnly - In wxPerl this method is implemented as GetStyleForRange(@a position) - returning a 2-element list (ok, attr). - @endWxPerlOnly - */ - virtual bool GetStyleForRange(const wxRichTextRange& range, - wxTextAttr& style); - - /** - Returns the style sheet associated with the control, if any. - A style sheet allows named character and paragraph styles to be applied. - */ - wxRichTextStyleSheet* GetStyleSheet() const; - - /** - Gets the attributes at the given position. - This function gets the @e uncombined style - that is, the attributes associated - with the paragraph or character content, and not necessarily the combined - attributes you see on the screen. - To get the combined attributes, use GetStyle(). - - If you specify (any) paragraph attribute in @e style's flags, this function - will fetch the paragraph attributes. - Otherwise, it will return the character attributes. - - @beginWxPerlOnly - In wxPerl this method is implemented as GetUncombinedStyle(@a position) - returning a 2-element list (ok, attr). - @endWxPerlOnly - */ - virtual bool GetUncombinedStyle(long position, wxTextAttr& style); - - /** - Returns the content of the entire control as a string. - */ - virtual wxString GetValue() const; - - /** - Internal helper function returning the line for the visible caret position. - If the caret is shown at the very end of the line, it means the next character - is actually on the following line. - So this function gets the line we're expecting to find if this is the case. - */ - wxRichTextLine* GetVisibleLineForCaretPosition(long caretPosition) const; - - /** - Test if this whole range has character attributes of the specified kind. - If any of the attributes are different within the range, the test fails. - - You can use this to implement, for example, bold button updating. - @a style must have flags indicating which attributes are of interest. - */ - virtual bool HasCharacterAttributes(const wxRichTextRange& range, - const wxTextAttr& style) const; - - /** - Test if this whole range has paragraph attributes of the specified kind. - If any of the attributes are different within the range, the test fails. - You can use this to implement, for example, centering button updating. - @a style must have flags indicating which attributes are of interest. - */ - virtual bool HasParagraphAttributes(const wxRichTextRange& range, - const wxTextAttr& style) const; - - /** - Returns @true if there is a selection. - */ - virtual bool HasSelection() const; - - //@{ - /** - Finds the character at the given position in pixels. - @a pt is in device coords (not adjusted for the client area origin nor for - scrolling). - */ - wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long* pos) const; - const wxTextCtrlHitTestResult HitTest(const wxPoint& pt, - wxTextCoord* col, - wxTextCoord* row) const; - //@} - - /** - Initialises the members of the control. - */ - void Init(); - - /** - Returns @true if the user has recently set the default style without moving - the caret, and therefore the UI needs to reflect the default style and not - the style at the caret. - - Below is an example of code that uses this function to determine whether the UI - should show that the current style is bold. - - @see SetAndShowDefaultStyle(). - */ - bool IsDefaultStyleShowing() const; - - /** - Returns @true if the control is editable. - */ - virtual bool IsEditable() const; - - /** - Returns @true if Freeze has been called without a Thaw. - */ - bool IsFrozen() const; - - /** - Returns @true if the buffer has been modified. - */ - virtual bool IsModified() const; - - /** - Returns @true if the control is multiline. - */ - bool IsMultiLine() const; - - /** - Returns @true if the given position is visible on the screen. - */ - bool IsPositionVisible(long pos) const; - - /** - Returns @true if all of the selection is aligned according to the specified flag. - */ - virtual bool IsSelectionAligned(wxTextAttrAlignment alignment); - - /** - Returns @true if all of the selection is bold. - */ - virtual bool IsSelectionBold(); - - /** - Returns @true if all of the selection is italic. - */ - virtual bool IsSelectionItalics(); + void SetRange(const wxRichTextRange& range) { m_range = range; } /** - Returns @true if all of the selection is underlined. + Returns the character pressed, within a @c wxEVT_COMMAND_RICHTEXT_CHARACTER event. */ - virtual bool IsSelectionUnderlined(); + wxChar GetCharacter() const { return m_char; } /** - Returns @true if the control is single-line. - Currently wxRichTextCtrl does not support single-line editing. + Sets the character variable. */ - bool IsSingleLine() const; + void SetCharacter(wxChar ch) { m_char = ch; } /** - Helper function implementing keyboard navigation. + Returns the container for which the event is relevant. */ - virtual bool KeyboardNavigate(int keyCode, int flags); + wxRichTextParagraphLayoutBox* GetContainer() const { return m_container; } /** - Lays out the buffer, which must be done before certain operations, such as - setting the caret position. - This function should not normally be required by the application. + Sets the container for which the event is relevant. */ - virtual bool LayoutContent(bool onlyVisibleRect = false); + void SetContainer(wxRichTextParagraphLayoutBox* container) { m_container = container; } /** - Inserts a line break at the current insertion point. - - A line break forces wrapping within a paragraph, and can be introduced by - using this function, by appending the wxChar value @b wxRichTextLineBreakChar - to text content, or by typing Shift-Return. - */ - virtual bool LineBreak(); - - /** - Loads content into the control's buffer using the given type. - - If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from - the filename extension. - - This function looks for a suitable wxRichTextFileHandler object. - */ - bool LoadFile(const wxString& file, - int type = wxRICHTEXT_TYPE_ANY); - - /** - Marks the buffer as modified. - */ - virtual void MarkDirty(); - - /** - Move the caret to the given character position. - - Please note that this does not update the current editing style - from the new position; to do that, call wxRichTextCtrl::SetInsertionPoint instead. - */ - virtual bool MoveCaret(long pos, bool showAtLineStart = false); - - /** - Move the caret one visual step forward: this may mean setting a flag - and keeping the same position if we're going from the end of one line - to the start of the next, which may be the exact same caret position. - */ - void MoveCaretBack(long oldPosition); - - /** - Move the caret one visual step forward: this may mean setting a flag - and keeping the same position if we're going from the end of one line - to the start of the next, which may be the exact same caret position. - */ - void MoveCaretForward(long oldPosition); - - /** - Moves the caret down. - */ - virtual bool MoveDown(int noLines = 1, int flags = 0); - - /** - Moves to the end of the buffer. - */ - virtual bool MoveEnd(int flags = 0); - - /** - Moves to the start of the buffer. - */ - virtual bool MoveHome(int flags = 0); - - /** - Moves left. - */ - virtual bool MoveLeft(int noPositions = 1, int flags = 0); - - /** - Moves right. - */ - virtual bool MoveRight(int noPositions = 1, int flags = 0); - - /** - Moves to the end of the line. - */ - virtual bool MoveToLineEnd(int flags = 0); - - /** - Moves to the start of the line. - */ - virtual bool MoveToLineStart(int flags = 0); - - /** - Moves to the end of the paragraph. - */ - virtual bool MoveToParagraphEnd(int flags = 0); - - /** - Moves to the start of the paragraph. - */ - virtual bool MoveToParagraphStart(int flags = 0); - - /** - Moves up. - */ - virtual bool MoveUp(int noLines = 1, int flags = 0); - - /** - Inserts a new paragraph at the current insertion point. @see LineBreak(). - */ - virtual bool Newline(); - - //@{ - /** - Numbers the paragraphs in the given range. - Pass flags to determine how the attributes are set. - - Either the style definition or the name of the style definition (in the current - sheet) can be passed. - - @a flags is a bit list of the following: - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. - - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from - @a startFrom, otherwise existing attributes are used. - - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used - as the level for all paragraphs, otherwise the current indentation will be used. - - @see SetListStyle(), PromoteList(), ClearListStyle(). - */ - bool NumberList(const wxRichTextRange& range, - const wxRichTextListStyleDefinition* style, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int startFrom = -1, - int listLevel = -1); - bool Number(const wxRichTextRange& range, - const wxString& styleName, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int startFrom = -1, - int listLevel = -1); - //@} - - /** - Standard handler for the wxID_CLEAR command. - */ - void OnClear(wxCommandEvent& event); - - /** - Shows a standard context menu with undo, redo, cut, copy, paste, clear, and - select all commands. - */ - void OnContextMenu(wxContextMenuEvent& event); - - /** - Standard handler for the wxID_COPY command. - */ - void OnCopy(wxCommandEvent& event); - - /** - Standard handler for the wxID_CUT command. - */ - void OnCut(wxCommandEvent& event); - - /** - Loads the first dropped file. - */ - void OnDropFiles(wxDropFilesEvent& event); - - /** - Standard handler for the wxID_PASTE command. - */ - void OnPaste(wxCommandEvent& event); - - /** - Standard handler for the wxID_REDO command. - */ - void OnRedo(wxCommandEvent& event); - - /** - Standard handler for the wxID_SELECTALL command. - */ - void OnSelectAll(wxCommandEvent& event); - - /** - Standard handler for the wxID_UNDO command. - */ - void OnUndo(wxCommandEvent& event); - - /** - Standard update handler for the wxID_CLEAR command. - */ - void OnUpdateClear(wxUpdateUIEvent& event); - - /** - Standard update handler for the wxID_COPY command. - */ - void OnUpdateCopy(wxUpdateUIEvent& event); - - /** - Standard update handler for the wxID_CUT command. - */ - void OnUpdateCut(wxUpdateUIEvent& event); - - /** - Standard update handler for the wxID_PASTE command. - */ - void OnUpdatePaste(wxUpdateUIEvent& event); - - /** - Standard update handler for the wxID_REDO command. - */ - void OnUpdateRedo(wxUpdateUIEvent& event); - - /** - Standard update handler for the wxID_SELECTALL command. - */ - void OnUpdateSelectAll(wxUpdateUIEvent& event); - - /** - Standard update handler for the wxID_UNDO command. - */ - void OnUpdateUndo(wxUpdateUIEvent& event); - - /** - Moves one or more pages down. - */ - virtual bool PageDown(int noPages = 1, int flags = 0); - - /** - Moves one or more pages up. - */ - virtual bool PageUp(int noPages = 1, int flags = 0); - - /** - Paints the background. - */ - virtual void PaintBackground(wxDC& dc); - - /** - Other user defined painting after everything else (i.e. all text) is painted. - - @since 2.9.1 - */ - virtual void PaintAboveContent(wxDC& dc); - - /** - Pastes content from the clipboard to the buffer. - */ - virtual void Paste(); - - /** - Internal function to position the visible caret according to the current caret - position. - */ - virtual void PositionCaret(); - - /** - Converts a text position to zero-based column and line numbers. + Returns the old container, for a focus change event. */ - virtual bool PositionToXY(long pos, long* x, long* y) const; + wxRichTextParagraphLayoutBox* GetOldContainer() const { return m_oldContainer; } - //@{ /** - Promotes or demotes the paragraphs in the given range. - A positive @a promoteBy produces a smaller indent, and a negative number - produces a larger indent. Pass flags to determine how the attributes are set. - Either the style definition or the name of the style definition (in the current - sheet) can be passed. - - @a flags is a bit list of the following: - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. - - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from - @a startFrom, otherwise existing attributes are used. - - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used - as the level for all paragraphs, otherwise the current indentation will be used. - - @see SetListStyle(), @see SetListStyle(), ClearListStyle(). - */ - bool PromoteList(int promoteBy, const wxRichTextRange& range, - const wxRichTextListStyleDefinition* style, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int listLevel = -1); - bool PromoteList(int promoteBy, const wxRichTextRange& range, - const wxString& styleName, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int listLevel = -1); - //@} - - /** - Redoes the current command. - */ - virtual void Redo(); - - /** - Removes the content in the specified range. - */ - virtual void Remove(long from, long to); - - /** - Replaces the content in the specified range with the string specified by - @a value. - */ - virtual void Replace(long from, long to, const wxString& value); - - /** - Saves the buffer content using the given type. - - If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from - the filename extension. - - This function looks for a suitable wxRichTextFileHandler object. - */ - bool SaveFile(const wxString& file = wxEmptyString, - int type = wxRICHTEXT_TYPE_ANY); - - /** - Scrolls @a position into view. This function takes a caret position. - */ - virtual bool ScrollIntoView(long position, int keyCode); - - /** - Selects all the text in the buffer. - */ - virtual void SelectAll(); - - /** - Cancels any selection. - */ - virtual void SelectNone(); - - /** - Sets @a attr as the default style and tells the control that the UI should - reflect this attribute until the user moves the caret. - - @see IsDefaultStyleShowing(). - */ - void SetAndShowDefaultStyle(const wxTextAttr& attr); - - /** - Sets the basic (overall) style. - - This is the style of the whole buffer before further styles are applied, - unlike the default style, which only affects the style currently being - applied (for example, setting the default style to bold will cause - subsequently inserted text to be bold). - */ - virtual void SetBasicStyle(const wxTextAttr& style); - - /** - Sets the caret position. - - The caret position is the character position just before the caret. - A value of -1 means the caret is at the start of the buffer. - Please note that this does not update the current editing style - from the new position or cause the actual caret to be refreshed; to do that, - call wxRichTextCtrl::SetInsertionPoint instead. - */ - void SetCaretPosition(long position, - bool showAtLineStart = false); - - /** - Sets the current default style, which can be used to change how subsequently - inserted text is displayed. - */ - virtual bool SetDefaultStyle(const wxTextAttr& style); - - /** - Sets the default style to the style under the cursor. - */ - bool SetDefaultStyleToCursorStyle(); - - /** - Sets the size of the buffer beyond which layout is delayed during resizing. - This optimizes sizing for large buffers. The default is 20000. - */ - void SetDelayedLayoutThreshold(long threshold); - - /** - Makes the control editable, or not. - */ - virtual void SetEditable(bool editable); - - /** - Sets the current filename. - */ - void SetFilename(const wxString& filename); - - /** - Sets the font, and also the basic and default attributes - (see wxRichTextCtrl::SetDefaultStyle). - */ - virtual bool SetFont(const wxFont& font); - - /** - Sets flags that change the behaviour of loading or saving. - - See the documentation for each handler class to see what flags are - relevant for each handler. - */ - void SetHandlerFlags(int flags); - - /** - Sets the insertion point and causes the current editing style to be taken from - the new position (unlike wxRichTextCtrl::SetCaretPosition). - */ - virtual void SetInsertionPoint(long pos); - - /** - Sets the insertion point to the end of the text control. - */ - virtual void SetInsertionPointEnd(); - - //@{ - /** - Sets the list attributes for the given range, passing flags to determine how - the attributes are set. - - Either the style definition or the name of the style definition (in the current - sheet) can be passed. - @a flags is a bit list of the following: - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable. - - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from - @a startFrom, otherwise existing attributes are used. - - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used - as the level for all paragraphs, otherwise the current indentation will be used. - - @see NumberList(), PromoteList(), ClearListStyle(). - */ - bool SetListStyle(const wxRichTextRange& range, - const wxRichTextListStyleDefinition* style, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int startFrom = -1, - int listLevel = -1); - bool SetListStyle(const wxRichTextRange& range, - const wxString& styleName, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, - int startFrom = -1, - int listLevel = -1); - //@} - - /** - Sets the selection to the given range. - The end point of range is specified as the last character position of the span - of text, plus one. - - So, for example, to set the selection for a character at position 5, use the - range (5,6). - */ - virtual void SetSelection(long from, long to); - - /** - Sets the selection to the given range. - The end point of range is specified as the last character position of the span - of text, plus one. - - So, for example, to set the selection for a character at position 5, use the - range (5,6). - */ - void SetSelectionRange(const wxRichTextRange& range); - - //@{ - /** - Sets the attributes for the given range. - The end point of range is specified as the last character position of the span - of text, plus one. - - So, for example, to set the style for a character at position 5, use the range - (5,6). - */ - bool SetStyle(const wxRichTextRange& range, - const wxTextAttr& style); - bool SetStyle(long start, long end, const wxTextAttr& style); - //@} - - /** - Sets the attributes for the given range, passing flags to determine how the - attributes are set. - - The end point of range is specified as the last character position of the span - of text, plus one. So, for example, to set the style for a character at - position 5, use the range (5,6). - - @a flags may contain a bit list of the following values: - - wxRICHTEXT_SETSTYLE_NONE: no style flag. - - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this operation should be - undoable. - - wxRICHTEXT_SETSTYLE_OPTIMIZE: specifies that the style should not be applied - if the combined style at this point is already the style in question. - - wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY: specifies that the style should only be - applied to paragraphs, and not the content. - This allows content styling to be preserved independently from that - of e.g. a named paragraph style. - - wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY: specifies that the style should only be - applied to characters, and not the paragraph. - This allows content styling to be preserved independently from that - of e.g. a named paragraph style. - - wxRICHTEXT_SETSTYLE_RESET: resets (clears) the existing style before applying - the new style. - - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags - are used in this operation. - */ - virtual bool SetStyleEx(const wxRichTextRange& range, - const wxTextAttr& style, - int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO); - - /** - Sets the style sheet associated with the control. - A style sheet allows named character and paragraph styles to be applied. - */ - void SetStyleSheet(wxRichTextStyleSheet* styleSheet); - - /** - Replaces existing content with the given text. - */ - virtual void SetValue(const wxString& value); - - /** - A helper function setting up scrollbars, for example after a resize. + Sets the old container, for a focus change event. */ - virtual void SetupScrollbars(bool atTop = false); + void SetOldContainer(wxRichTextParagraphLayoutBox* container) { m_oldContainer = container; } - /** - Scrolls the buffer so that the given position is in view. - */ - virtual void ShowPosition(long pos); - - /** - Returns @true if undo history suppression is on. - */ - virtual bool SuppressingUndo() const; - - /** - Call this function to end a Freeze and refresh the display. - */ - void Thaw(); - - /** - Undoes the command at the top of the command history, if there is one. - */ - virtual void Undo(); - - /** - Moves a number of words to the left. - */ - virtual bool WordLeft(int noWords = 1, int flags = 0); - - /** - Move a nuber of words to the right. - */ - virtual bool WordRight(int noWords = 1, int flags = 0); - - /** - Loads an image from a file and writes it at the current insertion point. - */ - virtual bool WriteImage(const wxString& filename, wxBitmapType bitmapType); - - /** - Writes an image block at the current insertion point. - */ - virtual bool WriteImage(const wxRichTextImageBlock& imageBlock); - - //@{ - /** - Write a bitmap or image at the current insertion point. - Supply an optional type to use for internal and file storage of the raw data. - */ - bool WriteImage(const wxBitmap& bitmap, - int bitmapType = wxBITMAP_TYPE_PNG); - bool WriteImage(const wxImage& image, - int bitmapType = wxBITMAP_TYPE_PNG); - //@} - - /** - Writes text at the current position. - */ - virtual void WriteText(const wxString& text); - - /** - Translates from column and line number to position. - */ - virtual long XYToPosition(long x, long y) const; + virtual wxEvent *Clone() const { return new wxRichTextEvent(*this); } protected: + int m_flags; + long m_position; + wxRichTextStyleSheet* m_oldStyleSheet; + wxRichTextStyleSheet* m_newStyleSheet; + wxRichTextRange m_range; + wxChar m_char; + wxRichTextParagraphLayoutBox* m_container; + wxRichTextParagraphLayoutBox* m_oldContainer; - /** - Currently this simply returns @c wxSize(10, 10). - */ - virtual wxSize DoGetBestSize() const; - - /** - Initialises the command event. - */ - void InitCommandEvent(wxCommandEvent& event) const; +private: + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRichTextEvent) }; - diff --git a/interface/wx/stream.h b/interface/wx/stream.h index 36617cc091..4f3bb18a45 100644 --- a/interface/wx/stream.h +++ b/interface/wx/stream.h @@ -80,6 +80,18 @@ public: */ virtual bool IsSeekable() const; + /** + Resets the stream state. + + By default, resets the stream to good state, i.e. clears any errors. + Since wxWidgets 2.9.3 can be also used to explicitly set the state to + the specified error (the @a error argument didn't exist in the previous + versions). + + @see GetLastError() + */ + void Reset(wxStreamError error = wxSTREAM_NO_ERROR); + /** Returns the opposite of IsOk(). You can use this function to test the validity of the stream as if diff --git a/interface/wx/valgen.h b/interface/wx/valgen.h index 9a4dc6b45b..2a5f025d77 100644 --- a/interface/wx/valgen.h +++ b/interface/wx/valgen.h @@ -96,6 +96,42 @@ public: window). */ wxGenericValidator(wxDateTime* valPtr); + /** + Constructor taking a wxFileName pointer. This will be used for + wxTextCtrl. + + @param valPtr + A pointer to a variable that contains the value. This variable + should have a lifetime equal to or longer than the validator + lifetime (which is usually determined by the lifetime of the + window). + @since 2.9.3 + */ + wxGenericValidator(wxFileName* valPtr); + /** + Constructor taking a float pointer. This will be used for + wxTextCtrl. + + @param valPtr + A pointer to a variable that contains the value. This variable + should have a lifetime equal to or longer than the validator + lifetime (which is usually determined by the lifetime of the + window). + @since 2.9.3 + */ + wxGenericValidator(float* valPtr); + /** + Constructor taking a double pointer. This will be used for + wxTextCtrl. + + @param valPtr + A pointer to a variable that contains the value. This variable + should have a lifetime equal to or longer than the validator + lifetime (which is usually determined by the lifetime of the + window). + @since 2.9.3 + */ + wxGenericValidator(double* valPtr); /** Destructor. diff --git a/interface/wx/window.h b/interface/wx/window.h index 6a13cadcfd..2bc1c680b7 100644 --- a/interface/wx/window.h +++ b/interface/wx/window.h @@ -495,6 +495,9 @@ public: current parent window (e.g. a non-standard toolbar in a wxFrame) and then re-inserted into another. + Notice that currently you need to explicitly call + wxNotebook::RemovePage() before reparenting a notebook page. + @param newParent New parent. */ diff --git a/locale/de.po b/locale/de.po index 2e40aeda87..dbfd4676ad 100644 --- a/locale/de.po +++ b/locale/de.po @@ -251,7 +251,7 @@ msgstr "Stil des &Gliederungspunktes:" #: ../src/generic/wizard.cpp:460 #: ../src/mac/carbon/fontdlg.cpp:525 msgid "&Cancel" -msgstr "Ab&bruch" +msgstr "Ab&brechen" #: ../src/msw/mdi.cpp:171 msgid "&Cascade" @@ -551,11 +551,11 @@ msgstr "&Rechts:" #: ../src/common/stockitem.cpp:151 msgid "&Save" -msgstr "&Sichern" +msgstr "&Speichern" #: ../src/generic/logg.cpp:511 msgid "&Save..." -msgstr "&Sichern..." +msgstr "&Speichern..." #: ../src/generic/tipdlg.cpp:268 msgid "&Show tips at startup" @@ -709,7 +709,7 @@ msgstr "(Hilfe)" #: ../src/richtext/richtextliststylepage.cpp:483 #: ../src/richtext/richtextbulletspage.cpp:281 msgid "(None)" -msgstr "(Unbenannt)" +msgstr "(Kein)" #: ../src/richtext/richtextsymboldlg.cpp:524 msgid "(Normal text)" @@ -723,7 +723,7 @@ msgstr "(Lesezeichen)" #: ../src/richtext/richtextformatdlg.cpp:627 msgid "(none)" -msgstr "(namenlos)" +msgstr "(Kein)" #: ../src/richtext/richtextliststylepage.cpp:494 #: ../src/richtext/richtextbulletspage.cpp:292 @@ -1547,7 +1547,7 @@ msgstr "Kann nicht in den gepackten Datenstrom schreiben: %s" #: ../src/mac/carbon/msgdlg.cpp:68 #: ../contrib/src/deprecated/proplist.cpp:514 msgid "Cancel" -msgstr "Abbruch" +msgstr "Abbrechen" #: ../src/xrc/xmlres.cpp:1268 #: ../src/xrc/xmlres.cpp:1316 @@ -3152,7 +3152,7 @@ msgstr "Suchen" #: ../src/html/helpwnd.cpp:1215 msgid "Fixed font:" -msgstr "Fixed font:" +msgstr "Schrift fester Breite:" #: ../src/html/helpwnd.cpp:1275 msgid "Fixed size face.
bold italic " @@ -5318,7 +5318,7 @@ msgid "" "[Cancel] if it cannot be replaced" msgstr "" "Die Zeichensatz '%s' ist nicht bekannt. Wählen Sie \n" -"einen Ersatzzeichensatz oder 'Abbruch', \n" +"einen Ersatzzeichensatz oder 'Abbrechen', \n" "falls er nicht ersetzt werden kann." #: ../src/msw/ole/dataobj.cpp:161 diff --git a/locale/it.po b/locale/it.po index 6f3791d833..a6261966ac 100644 --- a/locale/it.po +++ b/locale/it.po @@ -1,58 +1,63 @@ -#: ../src/stc/scintilla/src/ScintillaBase.cxx:424 -#: ../src/stc/scintilla/src/ScintillaBase.cxx:429 msgid "" msgstr "" "Project-Id-Version: $Id$\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-24 09:31+0200\n" -"PO-Revision-Date: 2006-10-30 20:46+0100\n" -"Last-Translator: Mattia Barbon \n" +"POT-Creation-Date: 2010-05-31 16:38+0200\n" +"PO-Revision-Date: 2011-06-16 14:21+0100\n" +"Last-Translator: bovirus \n" "Language-Team: wxWidgets translators \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Italian\n" "X-Poedit-Country: ITALY\n" -#: ../src/common/debugrpt.cpp:578 +#: ../src/common/debugrpt.cpp:580 msgid "" "\n" "Please send this report to the program maintainer, thank you!\n" msgstr "" "\n" -"Si prega di inviare questa segnalazione all'autore del programma, grazie!\n" +"Invia questa segnalazione all'autore del programma, grazie!\n" +#: ../src/palmos/utils.cpp:265 #: ../src/richtext/richtextstyledlg.cpp:202 -#: ../src/richtext/richtextstyledlg.cpp:214 ../src/palmos/utils.cpp:265 +#: ../src/richtext/richtextstyledlg.cpp:214 msgid " " msgstr " " -#: ../src/generic/dbgrptg.cpp:322 +#: ../src/generic/dbgrptg.cpp:323 msgid " Thank you and we're sorry for the inconvenience!\n" msgstr " Grazie, e ci scusiamo per il disturbo!\n" -#: ../src/common/log.cpp:411 +#: ../src/common/log.cpp:355 #, c-format msgid " (error %ld: %s)" msgstr " (errore %ld: %s)" -#: ../src/common/docview.cpp:1464 +#: ../src/common/imagtiff.cpp:79 +#, c-format +msgid " (in module \"%s\")" +msgstr " (in modulo \"%s\")" + +#: ../src/common/docview.cpp:1500 msgid " - " msgstr " - " -#: ../src/richtext/richtextprint.cpp:549 ../src/html/htmprint.cpp:579 +#: ../src/richtext/richtextprint.cpp:549 +#: ../src/html/htmprint.cpp:712 msgid " Preview" msgstr " Anteprima" -#: ../src/common/fontcmn.cpp:620 +#: ../src/common/fontcmn.cpp:685 msgid " bold" msgstr " grassetto " -#: ../src/common/fontcmn.cpp:636 +#: ../src/common/fontcmn.cpp:701 msgid " italic" msgstr " corsivo " -#: ../src/common/fontcmn.cpp:616 +#: ../src/common/fontcmn.cpp:681 msgid " light" msgstr " leggero " @@ -76,104 +81,74 @@ msgstr "Busta #14, 5 x 11 1/2 pollici" msgid "#9 Envelope, 3 7/8 x 8 7/8 in" msgstr "Busta #9, 3 7/8 x 8 7/8 pollici" -#: ../src/common/filename.cpp:2368 -#, c-format -msgid "%.*f GB" -msgstr "%.*f GB" - -#: ../src/common/filename.cpp:2366 -#, c-format -msgid "%.*f MB" -msgstr "%.*f MB" - -#: ../src/common/filename.cpp:2370 -#, c-format -msgid "%.*f TB" -msgstr "%.*f TB" - -#: ../src/common/filename.cpp:2364 -#, c-format -msgid "%.*f kB" -msgstr "%.*f KiB" - -#: ../src/html/helpwnd.cpp:1047 ../src/html/helpwnd.cpp:1049 -#: ../src/html/helpwnd.cpp:1681 ../src/html/helpwnd.cpp:1719 +#: ../src/html/helpwnd.cpp:1042 +#: ../src/html/helpwnd.cpp:1044 +#: ../src/html/helpwnd.cpp:1685 +#: ../src/html/helpwnd.cpp:1723 #, c-format msgid "%i of %i" msgstr "%i di %i" -#: ../src/generic/filectrlg.cpp:314 +#: ../src/generic/filectrlg.cpp:309 #, c-format msgid "%ld byte" -msgid_plural "%ld bytes" -msgstr[0] "" -msgstr[1] "" +msgstr "%ld bytes" -#: ../src/gtk/print.cpp:677 -#, fuzzy, c-format +#: ../src/gtk/print.cpp:652 +#, c-format msgid "%s" -msgstr "%s B" +msgstr "%s" -#: ../src/common/cmdline.cpp:922 +#: ../src/common/cmdline.cpp:980 #, c-format msgid "%s (or %s)" msgstr "%s (o %s)" -#: ../src/common/filename.cpp:2362 -#, c-format -msgid "%s B" -msgstr "%s B" - -#: ../src/generic/logg.cpp:285 +#: ../src/generic/logg.cpp:239 #, c-format msgid "%s Error" msgstr "%s: errore" -#: ../src/generic/logg.cpp:293 +#: ../src/generic/logg.cpp:251 #, c-format msgid "%s Information" msgstr "%s: informazione" -#: ../src/generic/logg.cpp:289 +#: ../src/generic/logg.cpp:243 #, c-format msgid "%s Warning" msgstr "%s: avviso" -#: ../src/common/tarstrm.cpp:1311 +#: ../src/common/tarstrm.cpp:1320 #, c-format msgid "%s did not fit the tar header for entry '%s'" msgstr "%s non ha trovato l'intestazione del file TAR per la voce '%s'" -#: ../src/common/fldlgcmn.cpp:96 +#: ../src/common/fldlgcmn.cpp:97 #, c-format msgid "%s files (%s)|%s" msgstr "File %s (%s)|%s" -#: ../src/common/msgout.cpp:209 -#, c-format -msgid "%s message" -msgstr "%s: messaggio" - -#: ../src/common/stockitem.cpp:110 ../src/html/helpfrm.cpp:130 -#: ../src/html/helpfrm.cpp:132 +#: ../src/common/stockitem.cpp:128 +#: ../src/html/helpfrm.cpp:142 +#: ../src/html/helpfrm.cpp:144 msgid "&About..." msgstr "&Informazioni su..." -#: ../src/common/stockitem.cpp:160 +#: ../src/common/stockitem.cpp:196 msgid "&Actual Size" -msgstr "Dimensione &effettiva" +msgstr "Dimensione &attuale" #: ../src/richtext/richtextindentspage.cpp:296 -#, fuzzy msgid "&After a paragraph:" -msgstr "Dopo un paragrafo:" +msgstr "&Dopo un paragrafo:" -#: ../src/richtext/richtextliststylepage.cpp:318 #: ../src/richtext/richtextindentspage.cpp:138 +#: ../src/richtext/richtextliststylepage.cpp:318 msgid "&Alignment" msgstr "&Allineamento" -#: ../src/common/stockitem.cpp:112 +#: ../src/common/stockitem.cpp:130 msgid "&Apply" msgstr "&Applica" @@ -181,11 +156,15 @@ msgstr "&Applica" msgid "&Apply Style" msgstr "&Applica lo stile" -#: ../src/msw/mdi.cpp:171 +#: ../src/msw/mdi.cpp:168 msgid "&Arrange Icons" msgstr "&Disponi icone" -#: ../src/common/stockitem.cpp:124 +#: ../src/common/stockitem.cpp:184 +msgid "&Ascending" +msgstr "&Ascendente" + +#: ../src/common/stockitem.cpp:131 msgid "&Back" msgstr "&Indietro" @@ -194,63 +173,93 @@ msgid "&Based on:" msgstr "&Basato su:" #: ../src/richtext/richtextindentspage.cpp:284 -#, fuzzy msgid "&Before a paragraph:" -msgstr "Prima di un paragrafo:" +msgstr "&Prima di un paragrafo:" -#: ../src/common/stockitem.cpp:113 +#: ../src/richtext/richtextfontpage.cpp:230 +msgid "&Bg colour:" +msgstr "&Colore sfondo:" + +#: ../src/common/stockitem.cpp:132 msgid "&Bold" msgstr "&Grassetto" +#: ../src/common/stockitem.cpp:133 +msgid "&Bottom" +msgstr "&Basso" + #: ../src/richtext/richtextliststylepage.cpp:209 -#: ../src/richtext/richtextbulletspage.cpp:157 +#: ../src/richtext/richtextbulletspage.cpp:156 msgid "&Bullet style:" msgstr "Stile del &punto:" -#: ../src/common/stockitem.cpp:114 ../src/generic/fontdlgg.cpp:472 -#: ../src/generic/fontdlgg.cpp:491 ../src/generic/wizard.cpp:458 -#: ../src/mac/carbon/fontdlg.cpp:564 +#: ../src/common/stockitem.cpp:135 +msgid "&CD-Rom" +msgstr "&CD-Rom" + +#: ../src/generic/wizard.cpp:439 +#: ../src/generic/fontdlgg.cpp:472 +#: ../src/generic/fontdlgg.cpp:491 +#: ../src/osx/carbon/fontdlg.cpp:576 +#: ../src/common/stockitem.cpp:134 msgid "&Cancel" msgstr "&Annulla" -#: ../src/msw/mdi.cpp:167 +#: ../src/msw/mdi.cpp:164 msgid "&Cascade" msgstr "&Sovrapponi finestre" -#: ../src/richtext/richtextsymboldlg.cpp:432 +#: ../src/richtext/richtextsymboldlg.cpp:433 msgid "&Character code:" msgstr "&Codice carattere:" -#: ../src/common/stockitem.cpp:115 +#: ../src/common/stockitem.cpp:136 msgid "&Clear" msgstr "C&ancella" -#: ../src/common/prntbase.cpp:1115 ../src/common/stockitem.cpp:116 -#: ../src/html/helpfrm.cpp:127 ../src/generic/logg.cpp:539 +#: ../src/generic/logg.cpp:528 +#: ../src/common/stockitem.cpp:137 +#: ../src/common/prntbase.cpp:1136 +#: ../src/html/helpfrm.cpp:139 msgid "&Close" msgstr "&Chiudi" -#: ../src/richtext/richtextfontpage.cpp:213 +#: ../src/common/stockitem.cpp:182 +msgid "&Color" +msgstr "&Colore" + +#: ../src/richtext/richtextfontpage.cpp:218 msgid "&Colour:" msgstr "&Colore:" -#: ../src/common/stockitem.cpp:117 ../src/richtext/richtextctrl.cpp:2596 -#: ../src/msw/textctrl.cpp:2152 ../src/mac/carbon/textctrl.cpp:1065 +#: ../src/common/stockitem.cpp:138 +msgid "&Convert" +msgstr "&Converti" + +#: ../src/richtext/richtextctrl.cpp:297 +#: ../src/osx/textctrl_osx.cpp:588 +#: ../src/common/stockitem.cpp:139 +#: ../src/msw/textctrl.cpp:2175 msgid "&Copy" msgstr "&Copia" -#: ../src/generic/hyperlinkg.cpp:150 -#, fuzzy +#: ../src/generic/hyperlinkg.cpp:151 msgid "&Copy URL" -msgstr "&Copia" +msgstr "&Copia URL" -#: ../src/generic/dbgrptg.cpp:330 +#: ../src/common/headerctrlcmn.cpp:307 +msgid "&Customize..." +msgstr "&Personalizza" + +#: ../src/generic/dbgrptg.cpp:331 msgid "&Debug report preview:" msgstr "Anteprima della segnalazione di errore:" -#: ../src/common/stockitem.cpp:119 ../src/richtext/richtextctrl.cpp:2598 -#: ../src/richtext/richtexttabspage.cpp:142 ../src/msw/textctrl.cpp:2154 -#: ../src/mac/carbon/textctrl.cpp:1067 +#: ../src/richtext/richtexttabspage.cpp:141 +#: ../src/richtext/richtextctrl.cpp:299 +#: ../src/osx/textctrl_osx.cpp:590 +#: ../src/common/stockitem.cpp:141 +#: ../src/msw/textctrl.cpp:2177 msgid "&Delete" msgstr "Ca&ncella" @@ -258,15 +267,19 @@ msgstr "Ca&ncella" msgid "&Delete Style..." msgstr "&Elimina lo stile" -#: ../src/generic/logg.cpp:750 +#: ../src/common/stockitem.cpp:185 +msgid "&Descending" +msgstr "&Discendente" + +#: ../src/generic/logg.cpp:695 msgid "&Details" msgstr "&Dettagli" -#: ../src/common/stockitem.cpp:125 +#: ../src/common/stockitem.cpp:142 msgid "&Down" -msgstr "&Giù" +msgstr "&Giù" -#: ../src/common/stockitem.cpp:120 +#: ../src/common/stockitem.cpp:143 msgid "&Edit" msgstr "&Modifica" @@ -274,18 +287,35 @@ msgstr "&Modifica" msgid "&Edit Style..." msgstr "&Modifica lo stile" -#: ../src/common/stockitem.cpp:122 ../src/html/helpfrm.cpp:134 +#: ../src/common/stockitem.cpp:144 +msgid "&Execute" +msgstr "&Esegui" + +#: ../src/common/stockitem.cpp:146 +#: ../src/html/helpfrm.cpp:146 msgid "&File" msgstr "&File" -#: ../src/common/stockitem.cpp:121 +#: ../src/common/stockitem.cpp:147 msgid "&Find" msgstr "&Trova" -#: ../src/generic/wizard.cpp:660 +#: ../src/generic/wizard.cpp:630 msgid "&Finish" msgstr "&Fine" +#: ../src/common/stockitem.cpp:148 +msgid "&First" +msgstr "&Primo" + +#: ../src/common/stockitem.cpp:149 +msgid "&Floppy" +msgstr "&Floppy" + +#: ../src/common/stockitem.cpp:183 +msgid "&Font" +msgstr "&Font" + #: ../src/generic/fontdlgg.cpp:373 msgid "&Font family:" msgstr "&Tipo carattere:" @@ -294,63 +324,80 @@ msgstr "&Tipo carattere:" msgid "&Font for Level..." msgstr "&Font per questo livello..." -#: ../src/richtext/richtextsymboldlg.cpp:393 -#: ../src/richtext/richtextfontpage.cpp:134 +#: ../src/richtext/richtextfontpage.cpp:137 +#: ../src/richtext/richtextsymboldlg.cpp:394 msgid "&Font:" msgstr "&Font:" -#: ../src/common/stockitem.cpp:126 +#: ../src/common/stockitem.cpp:150 msgid "&Forward" msgstr "&Avanti" -#: ../src/richtext/richtextsymboldlg.cpp:444 +#: ../src/richtext/richtextsymboldlg.cpp:445 msgid "&From:" msgstr "&Da:" -#: ../src/common/prntbase.cpp:1161 +#: ../src/common/prntbase.cpp:1182 msgid "&Goto..." msgstr "&Vai a..." -#: ../src/common/stockitem.cpp:128 ../src/html/helpfrm.cpp:135 -#: ../src/generic/wizard.cpp:454 ../src/generic/wizard.cpp:461 -#: ../src/mac/carbon/menu.cpp:772 +#: ../src/common/stockitem.cpp:151 +msgid "&Harddisk" +msgstr "&Disco fisso" + +#: ../src/generic/wizard.cpp:442 +#: ../src/osx/menu_osx.cpp:637 +#: ../src/common/stockitem.cpp:152 +#: ../src/html/helpfrm.cpp:147 msgid "&Help" msgstr "&Aiuto" -#: ../src/common/stockitem.cpp:129 +#: ../src/common/stockitem.cpp:153 msgid "&Home" msgstr "&Home" -#: ../src/richtext/richtextliststylepage.cpp:371 #: ../src/richtext/richtextindentspage.cpp:194 +#: ../src/richtext/richtextliststylepage.cpp:371 msgid "&Indentation (tenths of a mm)" msgstr "&Rientro (decimi di millimetro)" -#: ../src/richtext/richtextliststylepage.cpp:355 #: ../src/richtext/richtextindentspage.cpp:177 +#: ../src/richtext/richtextliststylepage.cpp:355 msgid "&Indeterminate" msgstr "&Indeterminato" -#: ../src/common/stockitem.cpp:131 +#: ../src/common/stockitem.cpp:155 msgid "&Index" msgstr "&Indice" -#: ../src/common/stockitem.cpp:132 +#: ../src/common/stockitem.cpp:156 +msgid "&Info" +msgstr "&Info" + +#: ../src/common/stockitem.cpp:157 msgid "&Italic" msgstr "&Corsivo" -#: ../src/richtext/richtextliststylepage.cpp:341 +#: ../src/common/stockitem.cpp:158 +msgid "&Jump to" +msgstr "&Vai a" + #: ../src/richtext/richtextindentspage.cpp:163 +#: ../src/richtext/richtextliststylepage.cpp:341 msgid "&Justified" msgstr "&Giustificato" -#: ../src/richtext/richtextliststylepage.cpp:327 +#: ../src/common/stockitem.cpp:163 +msgid "&Last" +msgstr "&Ultimo" + #: ../src/richtext/richtextindentspage.cpp:149 +#: ../src/richtext/richtextliststylepage.cpp:327 msgid "&Left" msgstr "&Sinistra" -#: ../src/richtext/richtextliststylepage.cpp:380 #: ../src/richtext/richtextindentspage.cpp:205 +#: ../src/richtext/richtextliststylepage.cpp:380 msgid "&Left:" msgstr "&Sinistra:" @@ -358,28 +405,35 @@ msgstr "&Sinistra:" msgid "&List level:" msgstr "&Livello:" -#: ../src/generic/logg.cpp:540 +#: ../src/generic/logg.cpp:529 msgid "&Log" msgstr "&Registro" -#: ../src/univ/themes/win32.cpp:3734 +#: ../src/univ/themes/win32.cpp:3772 msgid "&Move" msgstr "&Sposta" -#: ../src/common/stockitem.cpp:137 ../src/richtext/richtexttabspage.cpp:136 +#: ../src/common/stockitem.cpp:164 +msgid "&Network" +msgstr "&Rete" + +#: ../src/richtext/richtexttabspage.cpp:135 +#: ../src/common/stockitem.cpp:165 msgid "&New" msgstr "&Nuovo" -#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:118 -#: ../src/msw/mdi.cpp:172 +#: ../src/aui/tabmdi.cpp:108 +#: ../src/generic/mdig.cpp:105 +#: ../src/msw/mdi.cpp:169 msgid "&Next" msgstr "&Successivo" -#: ../src/generic/wizard.cpp:457 ../src/generic/wizard.cpp:658 +#: ../src/generic/wizard.cpp:438 +#: ../src/generic/wizard.cpp:630 msgid "&Next >" msgstr "&Successivo >" -#: ../src/generic/tipdlg.cpp:274 +#: ../src/generic/tipdlg.cpp:277 msgid "&Next Tip" msgstr "&Prossimo suggerimento" @@ -387,34 +441,40 @@ msgstr "&Prossimo suggerimento" msgid "&Next style:" msgstr "Stile &successivo >" -#: ../src/common/stockitem.cpp:138 +#: ../src/common/stockitem.cpp:166 +#: ../src/msw/msgdlg.cpp:461 msgid "&No" msgstr "&No" -#: ../src/generic/dbgrptg.cpp:352 +#: ../src/generic/dbgrptg.cpp:353 msgid "&Notes:" msgstr "&Note:" -#: ../src/richtext/richtextbulletspage.cpp:262 +#: ../src/richtext/richtextbulletspage.cpp:261 msgid "&Number:" msgstr "&Numero:" -#: ../src/common/stockitem.cpp:139 ../src/generic/fontdlgg.cpp:477 -#: ../src/generic/fontdlgg.cpp:484 ../src/mac/carbon/fontdlg.cpp:570 +#: ../src/generic/fontdlgg.cpp:477 +#: ../src/generic/fontdlgg.cpp:484 +#: ../src/osx/carbon/fontdlg.cpp:582 +#: ../src/common/stockitem.cpp:167 msgid "&OK" msgstr "&OK" -#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:125 +#: ../src/generic/dbgrptg.cpp:339 +#: ../src/common/stockitem.cpp:168 +#: ../src/html/helpfrm.cpp:137 msgid "&Open..." msgstr "&Apri..." #: ../src/richtext/richtextindentspage.cpp:241 -#, fuzzy msgid "&Outline level:" -msgstr "&Livello:" +msgstr "&Livello contorni:" -#: ../src/common/stockitem.cpp:141 ../src/richtext/richtextctrl.cpp:2597 -#: ../src/msw/textctrl.cpp:2153 ../src/mac/carbon/textctrl.cpp:1066 +#: ../src/richtext/richtextctrl.cpp:298 +#: ../src/osx/textctrl_osx.cpp:589 +#: ../src/common/stockitem.cpp:169 +#: ../src/msw/textctrl.cpp:2176 msgid "&Paste" msgstr "Incoll&a" @@ -426,34 +486,40 @@ msgstr "C&orpo:" msgid "&Position (tenths of a mm):" msgstr "&Posizione (decimi di millimetro):" -#: ../src/common/stockitem.cpp:142 +#: ../src/common/stockitem.cpp:170 msgid "&Preferences" msgstr "&Profilo" -#: ../src/aui/tabmdi.cpp:109 ../src/generic/mdig.cpp:119 -#: ../src/msw/mdi.cpp:173 +#: ../src/aui/tabmdi.cpp:109 +#: ../src/generic/mdig.cpp:106 +#: ../src/msw/mdi.cpp:170 msgid "&Previous" msgstr "&Precedente" -#: ../src/common/prntbase.cpp:1120 ../src/common/stockitem.cpp:143 +#: ../src/common/stockitem.cpp:172 +#: ../src/common/prntbase.cpp:1141 msgid "&Print..." msgstr "&Stampa..." -#: ../src/common/stockitem.cpp:145 +#: ../src/common/stockitem.cpp:173 msgid "&Properties" -msgstr "&Proprietà" +msgstr "&Proprietà" -#: ../src/common/stockitem.cpp:146 +#: ../src/common/stockitem.cpp:145 msgid "&Quit" msgstr "&Esci" -#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:295 -#: ../src/common/stockitem.cpp:147 ../src/richtext/richtextctrl.cpp:2593 -#: ../src/msw/textctrl.cpp:2149 ../src/mac/carbon/textctrl.cpp:1062 +#: ../src/richtext/richtextctrl.cpp:294 +#: ../src/osx/textctrl_osx.cpp:585 +#: ../src/common/stockitem.cpp:174 +#: ../src/common/cmdproc.cpp:292 +#: ../src/common/cmdproc.cpp:299 +#: ../src/msw/textctrl.cpp:2172 msgid "&Redo" msgstr "&Ripeti" -#: ../src/common/cmdproc.cpp:284 ../src/common/cmdproc.cpp:304 +#: ../src/common/cmdproc.cpp:288 +#: ../src/common/cmdproc.cpp:308 msgid "&Redo " msgstr "&Ripeti " @@ -469,59 +535,64 @@ msgstr "&Sostituisci" msgid "&Restart numbering" msgstr "&Ricomincia la numerazione" -#: ../src/univ/themes/win32.cpp:3733 +#: ../src/univ/themes/win32.cpp:3771 msgid "&Restore" msgstr "&Ripristina" -#: ../src/richtext/richtextliststylepage.cpp:334 #: ../src/richtext/richtextindentspage.cpp:156 +#: ../src/richtext/richtextliststylepage.cpp:334 msgid "&Right" msgstr "&Destra" -#: ../src/richtext/richtextliststylepage.cpp:402 #: ../src/richtext/richtextindentspage.cpp:229 +#: ../src/richtext/richtextliststylepage.cpp:402 msgid "&Right:" msgstr "&Destra:" -#: ../src/common/stockitem.cpp:151 +#: ../src/common/stockitem.cpp:179 msgid "&Save" msgstr "&Salva" -#: ../src/generic/logg.cpp:535 +#: ../src/generic/logg.cpp:524 msgid "&Save..." msgstr "&Salva..." -#: ../src/generic/tipdlg.cpp:268 +#: ../src/generic/tipdlg.cpp:271 msgid "&Show tips at startup" msgstr "&Mostra suggerimenti all'avvio" -#: ../src/univ/themes/win32.cpp:3736 +#: ../src/univ/themes/win32.cpp:3774 msgid "&Size" -msgstr "&Ridimensiona" +msgstr "&Dimensione" -#: ../src/richtext/richtextfontpage.cpp:152 +#: ../src/richtext/richtextfontpage.cpp:155 msgid "&Size:" msgstr "&Dimensione:" -#: ../src/generic/progdlgg.cpp:246 -#, fuzzy +#: ../src/generic/progdlgg.cpp:241 msgid "&Skip" -msgstr "Salta" +msgstr "&Ignora" -#: ../src/richtext/richtextliststylepage.cpp:422 #: ../src/richtext/richtextindentspage.cpp:272 +#: ../src/richtext/richtextliststylepage.cpp:422 msgid "&Spacing (tenths of a mm)" msgstr "&Spaziatura (decimi di millimetro)" -#: ../src/common/stockitem.cpp:154 +#: ../src/common/stockitem.cpp:186 +msgid "&Spell Check" +msgstr "&Controllo ortografia" + +#: ../src/common/stockitem.cpp:187 msgid "&Stop" msgstr "&Stop" -#: ../src/richtext/richtextfontpage.cpp:225 +#: ../src/richtext/richtextfontpage.cpp:242 +#: ../src/common/stockitem.cpp:188 msgid "&Strikethrough" -msgstr "" +msgstr "&Barrato" -#: ../src/richtext/richtextstylepage.cpp:103 ../src/generic/fontdlgg.cpp:384 +#: ../src/generic/fontdlgg.cpp:384 +#: ../src/richtext/richtextstylepage.cpp:103 msgid "&Style:" msgstr "&Stile:" @@ -529,158 +600,223 @@ msgstr "&Stile:" msgid "&Styles:" msgstr "&Stili:" -#: ../src/richtext/richtextsymboldlg.cpp:406 +#: ../src/richtext/richtextsymboldlg.cpp:407 msgid "&Subset:" msgstr "&Sottoinsieme:" #: ../src/richtext/richtextliststylepage.cpp:267 -#: ../src/richtext/richtextbulletspage.cpp:217 +#: ../src/richtext/richtextbulletspage.cpp:219 msgid "&Symbol:" msgstr "&Simbolo:" -#: ../src/common/stockitem.cpp:156 ../src/generic/fontdlgg.cpp:446 +#: ../src/common/stockitem.cpp:189 +msgid "&Top" +msgstr "&Alto" + +#: ../src/generic/fontdlgg.cpp:446 +#: ../src/common/stockitem.cpp:191 msgid "&Underline" msgstr "&Sottolineato" -#: ../src/richtext/richtextfontpage.cpp:200 +#: ../src/richtext/richtextfontpage.cpp:203 msgid "&Underlining:" msgstr "&Sottolineatura:" -#: ../src/common/cmdproc.cpp:266 ../src/common/stockitem.cpp:157 -#: ../src/richtext/richtextctrl.cpp:2592 ../src/msw/textctrl.cpp:2148 -#: ../src/mac/carbon/textctrl.cpp:1061 +#: ../src/richtext/richtextctrl.cpp:293 +#: ../src/osx/textctrl_osx.cpp:584 +#: ../src/common/stockitem.cpp:192 +#: ../src/common/cmdproc.cpp:270 +#: ../src/msw/textctrl.cpp:2171 msgid "&Undo" msgstr "&Annulla" -#: ../src/common/cmdproc.cpp:260 +#: ../src/common/cmdproc.cpp:264 msgid "&Undo " msgstr "&Annulla " -#: ../src/common/stockitem.cpp:158 +#: ../src/common/stockitem.cpp:193 msgid "&Unindent" msgstr "&Rimuovi indentazione" -#: ../src/common/stockitem.cpp:127 +#: ../src/common/stockitem.cpp:194 msgid "&Up" msgstr "&Su" +#: ../src/generic/dbgrptg.cpp:337 +msgid "&View..." +msgstr "&Visualizza..." + #: ../src/generic/fontdlgg.cpp:395 msgid "&Weight:" msgstr "&Peso:" -#: ../src/aui/tabmdi.cpp:301 ../src/aui/tabmdi.cpp:317 -#: ../src/aui/tabmdi.cpp:319 ../src/generic/mdig.cpp:298 -#: ../src/generic/mdig.cpp:314 ../src/generic/mdig.cpp:318 -#: ../src/msw/mdi.cpp:1429 ../src/msw/mdi.cpp:1437 ../src/msw/mdi.cpp:1467 +#: ../src/aui/tabmdi.cpp:301 +#: ../src/aui/tabmdi.cpp:317 +#: ../src/aui/tabmdi.cpp:319 +#: ../src/generic/mdig.cpp:299 +#: ../src/generic/mdig.cpp:315 +#: ../src/generic/mdig.cpp:319 +#: ../src/msw/mdi.cpp:70 msgid "&Window" msgstr "&Finestra" -#: ../src/common/stockitem.cpp:159 +#: ../src/common/stockitem.cpp:195 +#: ../src/msw/msgdlg.cpp:461 msgid "&Yes" msgstr "&Si" -#: ../src/common/config.cpp:482 ../src/msw/regconf.cpp:259 +#: ../src/common/fontcmn.cpp:718 +msgid "'" +msgstr "'" + +#: ../src/common/config.cpp:524 +#: ../src/msw/regconf.cpp:259 #, c-format msgid "'%s' has extra '..', ignored." msgstr "'%s' ha troppi '..', ignorati." -#: ../src/common/valtext.cpp:147 ../src/common/valtext.cpp:177 -#: ../src/common/valtext.cpp:183 +#: ../src/common/valtext.cpp:240 +#: ../src/common/valtext.cpp:242 +#: ../src/common/valtext.cpp:244 +#: ../src/common/valtext.cpp:246 #, c-format msgid "'%s' is invalid" msgstr "'%s' non valida" -#: ../src/common/cmdline.cpp:820 ../src/common/cmdline.cpp:838 +#: ../src/common/cmdline.cpp:878 +#: ../src/common/cmdline.cpp:896 #, c-format msgid "'%s' is not a correct numeric value for option '%s'." -msgstr "'%s' non è un valore numerico corretto per l'opzione '%s'." +msgstr "'%s' non è un valore numerico corretto per l'opzione '%s'." -#: ../src/common/intl.cpp:1283 +#: ../src/common/translation.cpp:924 #, c-format msgid "'%s' is not a valid message catalog." -msgstr "'%s' non è un catalogo di messaggi valido." +msgstr "'%s' non è un catalogo di messaggi valido." #: ../src/common/textbuf.cpp:245 #, c-format msgid "'%s' is probably a binary buffer." -msgstr "Probabilmente '%s' è un buffer binario." +msgstr "'%s' probabilmente è un buffer binario." -#: ../src/common/valtext.cpp:172 +#: ../src/common/valtext.cpp:238 #, c-format msgid "'%s' should be numeric." msgstr "'%s' deve essere numerico." -#: ../src/common/valtext.cpp:154 +#: ../src/common/valtext.cpp:230 #, c-format msgid "'%s' should only contain ASCII characters." msgstr "'%s' deve contenere unicamente caratteri ASCII." -#: ../src/common/valtext.cpp:160 +#: ../src/common/valtext.cpp:232 #, c-format msgid "'%s' should only contain alphabetic characters." msgstr "'%s' deve contenere unicamente caratteri alfabetici." -#: ../src/common/valtext.cpp:166 +#: ../src/common/valtext.cpp:234 #, c-format msgid "'%s' should only contain alphabetic or numeric characters." msgstr "'%s' deve contenere unicamente caratteri alfabetici o numerici." +#: ../src/common/valtext.cpp:236 +#, c-format +msgid "'%s' should only contain digits." +msgstr "'%s' deve contenere unicamente numeri." + #: ../src/richtext/richtextliststylepage.cpp:228 -#: ../src/richtext/richtextbulletspage.cpp:177 +#: ../src/richtext/richtextbulletspage.cpp:176 msgid "(*)" msgstr "(*)" -#: ../src/html/htmlhelp.cpp:638 ../src/html/helpwnd.cpp:982 +#: ../src/html/helpwnd.cpp:977 msgid "(Help)" msgstr "(Aiuto)" #: ../src/richtext/richtextliststylepage.cpp:483 -#: ../src/richtext/richtextbulletspage.cpp:281 +#: ../src/richtext/richtextbulletspage.cpp:283 msgid "(None)" msgstr "(Nessuno)" -#: ../src/richtext/richtextsymboldlg.cpp:493 +#: ../src/richtext/richtextsymboldlg.cpp:494 msgid "(Normal text)" msgstr "(Testo normale)" -#: ../src/html/helpwnd.cpp:412 ../src/html/helpwnd.cpp:1118 -#: ../src/html/helpwnd.cpp:1746 +#: ../src/html/helpwnd.cpp:424 +#: ../src/html/helpwnd.cpp:1114 +#: ../src/html/helpwnd.cpp:1750 msgid "(bookmarks)" msgstr "(segnalibri)" -#: ../src/richtext/richtextformatdlg.cpp:630 +#: ../src/richtext/richtextformatdlg.cpp:629 msgid "(none)" msgstr "(nessuno)" #: ../src/richtext/richtextliststylepage.cpp:494 -#: ../src/richtext/richtextbulletspage.cpp:292 +#: ../src/richtext/richtextbulletspage.cpp:294 msgid "*" msgstr "*" #: ../src/richtext/richtextliststylepage.cpp:235 -#: ../src/richtext/richtextbulletspage.cpp:184 +#: ../src/richtext/richtextbulletspage.cpp:183 msgid "*)" msgstr "*)" #: ../src/richtext/richtextliststylepage.cpp:497 -#: ../src/richtext/richtextbulletspage.cpp:295 +#: ../src/richtext/richtextbulletspage.cpp:297 msgid "+" msgstr "+" +#: ../src/msw/utils.cpp:1299 +msgid ", 64-bit edition" +msgstr ", versione 64-bit" + #: ../src/richtext/richtextliststylepage.cpp:495 -#: ../src/richtext/richtextbulletspage.cpp:293 +#: ../src/richtext/richtextbulletspage.cpp:295 msgid "-" msgstr "-" #: ../src/richtext/richtextindentspage.cpp:246 msgid "1" -msgstr "" +msgstr "1" -#: ../src/richtext/richtextliststylepage.cpp:460 #: ../src/richtext/richtextindentspage.cpp:315 +msgid "1.1" +msgstr "1.1" + +#: ../src/richtext/richtextindentspage.cpp:316 +msgid "1.2" +msgstr "1.2" + +#: ../src/richtext/richtextindentspage.cpp:317 +msgid "1.3" +msgstr "1.3" + +#: ../src/richtext/richtextindentspage.cpp:318 +msgid "1.4" +msgstr "1.4" + +#: ../src/richtext/richtextindentspage.cpp:319 +#: ../src/richtext/richtextliststylepage.cpp:460 msgid "1.5" msgstr "1.5" +#: ../src/richtext/richtextindentspage.cpp:320 +msgid "1.6" +msgstr "1.6" + +#: ../src/richtext/richtextindentspage.cpp:321 +msgid "1.7" +msgstr "1.7" + +#: ../src/richtext/richtextindentspage.cpp:322 +msgid "1.8" +msgstr "1.8" + +#: ../src/richtext/richtextindentspage.cpp:323 +msgid "1.9" +msgstr "1.9" + #: ../src/common/paper.cpp:142 msgid "10 x 11 in" msgstr "10 x 11 pollici" @@ -701,27 +837,27 @@ msgstr "11 x 11 pollici" msgid "15 x 11 in" msgstr "15 x 11 pollici" -#: ../src/richtext/richtextliststylepage.cpp:461 #: ../src/richtext/richtextindentspage.cpp:247 -#: ../src/richtext/richtextindentspage.cpp:316 +#: ../src/richtext/richtextindentspage.cpp:324 +#: ../src/richtext/richtextliststylepage.cpp:461 msgid "2" msgstr "Doppia" #: ../src/richtext/richtextindentspage.cpp:248 msgid "3" -msgstr "" +msgstr "3" #: ../src/richtext/richtextindentspage.cpp:249 msgid "4" -msgstr "" +msgstr "4" #: ../src/richtext/richtextindentspage.cpp:250 msgid "5" -msgstr "" +msgstr "5" #: ../src/richtext/richtextindentspage.cpp:251 msgid "6" -msgstr "" +msgstr "6" #: ../src/common/paper.cpp:134 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in" @@ -729,21 +865,21 @@ msgstr "Busta 6 3/4, 3 5/8 x 6 1/2 pollici" #: ../src/richtext/richtextindentspage.cpp:252 msgid "7" -msgstr "" +msgstr "7" #: ../src/richtext/richtextindentspage.cpp:253 msgid "8" -msgstr "" +msgstr "8" #: ../src/richtext/richtextindentspage.cpp:254 msgid "9" -msgstr "" +msgstr "9" #: ../src/common/paper.cpp:141 msgid "9 x 11 in" msgstr "9 x 11 pollici" -#: ../src/html/htmprint.cpp:303 +#: ../src/html/htmprint.cpp:432 msgid ": file does not exist!" msgstr ": file non esistente!" @@ -755,57 +891,66 @@ msgstr ": set di caratteri sconosciuto" msgid ": unknown encoding" msgstr ": codifica sconosciuta" -#: ../src/generic/wizard.cpp:463 +#: ../src/generic/wizard.cpp:444 msgid "< &Back" msgstr "< &Precedente" -#: ../src/common/prntbase.cpp:1143 +#: ../src/common/prntbase.cpp:1164 msgid "<<" msgstr "<<" -#: ../src/mac/carbon/fontdlg.cpp:584 ../src/mac/carbon/fontdlg.cpp:791 -#: ../src/mac/carbon/fontdlg.cpp:811 +#: ../src/osx/carbon/fontdlg.cpp:596 +#: ../src/osx/carbon/fontdlg.cpp:803 +#: ../src/osx/carbon/fontdlg.cpp:823 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:585 ../src/mac/carbon/fontdlg.cpp:793 -#: ../src/mac/carbon/fontdlg.cpp:813 +#: ../src/osx/carbon/fontdlg.cpp:597 +#: ../src/osx/carbon/fontdlg.cpp:805 +#: ../src/osx/carbon/fontdlg.cpp:825 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:583 ../src/mac/carbon/fontdlg.cpp:789 -#: ../src/mac/carbon/fontdlg.cpp:809 +#: ../src/osx/carbon/fontdlg.cpp:595 +#: ../src/osx/carbon/fontdlg.cpp:801 +#: ../src/osx/carbon/fontdlg.cpp:821 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:586 ../src/mac/carbon/fontdlg.cpp:795 -#: ../src/mac/carbon/fontdlg.cpp:815 +#: ../src/osx/carbon/fontdlg.cpp:598 +#: ../src/osx/carbon/fontdlg.cpp:807 +#: ../src/osx/carbon/fontdlg.cpp:827 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:587 ../src/mac/carbon/fontdlg.cpp:800 -#: ../src/mac/carbon/fontdlg.cpp:819 +#: ../src/osx/carbon/fontdlg.cpp:599 +#: ../src/osx/carbon/fontdlg.cpp:812 +#: ../src/osx/carbon/fontdlg.cpp:831 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:588 ../src/mac/carbon/fontdlg.cpp:797 -#: ../src/mac/carbon/fontdlg.cpp:817 +#: ../src/osx/carbon/fontdlg.cpp:600 +#: ../src/osx/carbon/fontdlg.cpp:809 +#: ../src/osx/carbon/fontdlg.cpp:829 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:582 +#: ../src/osx/carbon/fontdlg.cpp:594 msgid "" msgstr "" -#: ../src/generic/filectrlg.cpp:285 ../src/generic/filectrlg.cpp:308 +#: ../src/generic/filectrlg.cpp:280 +#: ../src/generic/filectrlg.cpp:303 msgid "" msgstr "" -#: ../src/generic/filectrlg.cpp:289 ../src/generic/filectrlg.cpp:312 +#: ../src/generic/filectrlg.cpp:284 +#: ../src/generic/filectrlg.cpp:307 msgid "" msgstr "" -#: ../src/generic/filectrlg.cpp:287 ../src/generic/filectrlg.cpp:310 +#: ../src/generic/filectrlg.cpp:282 +#: ../src/generic/filectrlg.cpp:305 msgid "" msgstr "" @@ -826,26 +971,25 @@ msgid "Italic face. " msgstr "Corsivo. " #: ../src/richtext/richtextliststylepage.cpp:496 -#: ../src/richtext/richtextbulletspage.cpp:294 +#: ../src/richtext/richtextbulletspage.cpp:296 msgid ">" msgstr ">" -#: ../src/common/prntbase.cpp:1149 +#: ../src/common/prntbase.cpp:1170 msgid ">>" msgstr ">>" -#: ../src/common/prntbase.cpp:1155 +#: ../src/common/prntbase.cpp:1176 msgid ">>|" msgstr ">>|" -#: ../src/generic/dbgrptg.cpp:314 +#: ../src/generic/dbgrptg.cpp:315 msgid "A debug report has been generated in the directory\n" -msgstr "Una segnalazione di errore è stata generata nella cartella\n" +msgstr "Una segnalazione di errore è stata generata nella cartella\n" -#: ../src/common/debugrpt.cpp:565 -#, fuzzy +#: ../src/common/debugrpt.cpp:567 msgid "A debug report has been generated. It can be found in" -msgstr "Una segnalazione di errore è stata generata nella cartella\n" +msgstr "E' stata generato un rapporto di debug nella cartella" #: ../src/common/xtixml.cpp:406 msgid "A non empty collection must consist of 'element' nodes" @@ -853,11 +997,19 @@ msgstr "Una collezione non vuota deve contenere nodi 'element'" #: ../src/richtext/richtextliststylepage.cpp:303 #: ../src/richtext/richtextliststylepage.cpp:305 -#: ../src/richtext/richtextbulletspage.cpp:255 -#: ../src/richtext/richtextbulletspage.cpp:257 +#: ../src/richtext/richtextbulletspage.cpp:254 +#: ../src/richtext/richtextbulletspage.cpp:256 msgid "A standard bullet name." msgstr "Il nome di una puntatura standard." +#: ../src/common/paper.cpp:219 +msgid "A0 sheet, 841 x 1189 mm" +msgstr "Foglio A0, 841 x 1189 mm" + +#: ../src/common/paper.cpp:220 +msgid "A1 sheet, 594 x 841 mm" +msgstr "Foglio A1, 594 x 841 mm" + #: ../src/common/paper.cpp:161 msgid "A2 420 x 594 mm" msgstr "Foglio A2 420 x 594 mm" @@ -930,35 +1082,36 @@ msgstr "Foglio A6 105 x 148 mm" msgid "A6 Rotated 148 x 105 mm" msgstr "Foglio A6 Ruotato 148 x 105 mm" -#: ../src/richtext/richtextformatdlg.cpp:426 ../src/generic/fontdlgg.cpp:85 -#: ../src/mac/carbon/fontdlg.cpp:315 +#: ../src/generic/fontdlgg.cpp:85 +#: ../src/richtext/richtextformatdlg.cpp:426 +#: ../src/osx/carbon/fontdlg.cpp:327 msgid "ABCDEFGabcdefg12345" msgstr "ABCDEFGabcdefg12345" #: ../src/common/accelcmn.cpp:75 msgid "ADD" -msgstr "" +msgstr "AGGIUNGI" -#: ../src/common/ftp.cpp:382 ../src/richtext/richtextsymboldlg.cpp:451 -#: ../src/richtext/richtextsymboldlg.cpp:453 -#: ../src/richtext/richtextsymboldlg.cpp:454 +#: ../src/richtext/richtextsymboldlg.cpp:452 +#: ../src/common/ftp.cpp:405 msgid "ASCII" msgstr "ASCII" -#: ../src/generic/aboutdlgg.cpp:106 +#: ../src/generic/aboutdlgg.cpp:141 msgid "About " -msgstr "Informazioni su" +msgstr "Informazioni su " #: ../src/msw/aboutdlg.cpp:65 -#, fuzzy, c-format +#, c-format msgid "About %s" -msgstr "Informazioni su" +msgstr "Informazioni su %s" -#: ../src/common/stockitem.cpp:111 +#: ../src/common/stockitem.cpp:129 +#: ../src/propgrid/props.cpp:2133 msgid "Add" msgstr "Aggiungi" -#: ../src/html/helpwnd.cpp:425 +#: ../src/html/helpwnd.cpp:437 msgid "Add current page to bookmarks" msgstr "Aggiungi la pagina corrente ai segnalibri" @@ -966,24 +1119,32 @@ msgstr "Aggiungi la pagina corrente ai segnalibri" msgid "Add to custom colours" msgstr "Aggiungi ai colori personalizzati" -#: ../src/mac/carbon/dataview.cpp:220 +#: ../src/osx/dataview_osx.cpp:99 msgid "Added item is invalid." -msgstr "" +msgstr "Elemento aggiunto non valido." -#: ../src/html/helpctrl.cpp:139 +#: ../src/html/helpctrl.cpp:140 #, c-format msgid "Adding book %s" msgstr "Aggiunta del libro %s in corso" +#: ../src/osx/carbon/dataview.cpp:1891 +msgid "Adding flavor TEXT failed" +msgstr "Aggiunta TESTO fallita" + +#: ../src/osx/carbon/dataview.cpp:1912 +msgid "Adding flavor utxt failed" +msgstr "Aggiunta utxt fallita" + #: ../src/richtext/richtextliststylepage.cpp:442 msgid "After a paragraph:" msgstr "Dopo un paragrafo:" -#: ../src/common/stockitem.cpp:135 +#: ../src/common/stockitem.cpp:161 msgid "Align Left" msgstr "Allinea a destra" -#: ../src/common/stockitem.cpp:136 +#: ../src/common/stockitem.cpp:162 msgid "Align Right" msgstr "Allinea a destra" @@ -991,78 +1152,80 @@ msgstr "Allinea a destra" msgid "All" msgstr "Tutto" -#: ../src/common/fldlgcmn.cpp:79 ../src/generic/filectrlg.cpp:1198 +#: ../src/generic/filectrlg.cpp:1195 +#: ../src/common/fldlgcmn.cpp:80 #, c-format msgid "All files (%s)|%s" msgstr "Tutti i file (%s)|%s" -#: ../include/wx/defs.h:2582 +#: ../include/wx/defs.h:2658 msgid "All files (*)|*" msgstr "Tutti i file (*)|*" -#: ../src/html/helpwnd.cpp:1556 +#: ../src/html/helpwnd.cpp:1560 msgid "All files (*.*)|*" msgstr "Tutti i file (*.*)|*" -#: ../include/wx/defs.h:2579 +#: ../include/wx/defs.h:2655 +#: ../src/propgrid/props.cpp:1609 +#: ../src/propgrid/props.cpp:1638 msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" -#: ../src/richtext/richtextstyles.cpp:838 +#: ../src/richtext/richtextstyles.cpp:904 msgid "All styles" msgstr "Tutti gli stili" +#: ../src/propgrid/manager.cpp:1506 +msgid "Alphabetic Mode" +msgstr "Modo alfabetico" + #: ../src/common/xtistrm.cpp:381 msgid "Already Registered Object passed to SetObjectClassInfo" -msgstr "Oggetto già registrato passato a SetObjectClassInfo" +msgstr "Oggetto già registrato passato a SetObjectClassInfo" #: ../src/unix/dialup.cpp:356 msgid "Already dialling ISP." -msgstr "Chiamata verso l'ISP già in corso." +msgstr "Chiamata verso l'ISP già in corso." #: ../src/common/accelcmn.cpp:294 -msgid "Alt-" -msgstr "Alt-" +msgid "Alt+" +msgstr "Alt+" -#: ../src/common/debugrpt.cpp:568 -#, fuzzy +#: ../src/common/debugrpt.cpp:570 msgid "And includes the following files:\n" -msgstr "*** Include i seguenti file:\n" +msgstr "E includi i seguenti file:\n" -#: ../src/generic/animateg.cpp:164 +#: ../src/generic/animateg.cpp:163 #, c-format msgid "Animation file is not of type %ld." -msgstr "Il file animazione non è di tipo %ld." +msgstr "Il file animazione non è di tipo %ld." -#: ../src/generic/logg.cpp:1087 +#: ../src/generic/logg.cpp:1035 #, c-format msgid "Append log to file '%s' (choosing [No] will overwrite it)?" msgstr "Aggiungere registro al file '%s' (scegliere [No] per sovrascriverlo)?" #: ../src/richtext/richtextliststylepage.cpp:484 -#: ../src/richtext/richtextbulletspage.cpp:282 +#: ../src/richtext/richtextbulletspage.cpp:284 msgid "Arabic" msgstr "Numeri arabi" -#: ../src/common/fmapbase.cpp:113 +#: ../src/common/fmapbase.cpp:154 msgid "Arabic (ISO-8859-6)" msgstr "Arabo (ISO-8859-6)" -#: ../src/html/chm.cpp:564 -msgid "Archive doesnt contain #SYSTEM file" -msgstr "L'archivio non contiene il file #SYSTEM" - -#: ../src/generic/aboutdlgg.cpp:150 +#: ../src/generic/aboutdlgg.cpp:185 msgid "Artists" -msgstr "" +msgstr "Artisti" -#: ../src/generic/filectrlg.cpp:467 +#: ../src/generic/filectrlg.cpp:462 msgid "Attributes" msgstr "Attributi" #: ../src/richtext/richtextliststylepage.cpp:293 -#: ../src/richtext/richtextbulletspage.cpp:243 -#: ../src/richtext/richtextbulletspage.cpp:245 +#: ../src/richtext/richtextbulletspage.cpp:242 +#: ../src/richtext/richtextbulletspage.cpp:244 msgid "Available fonts." msgstr "Font disponibili." @@ -1116,49 +1279,51 @@ msgstr "Busta B6, 176 x 125 mm" #: ../src/common/accelcmn.cpp:48 msgid "BACK" -msgstr "" +msgstr "INDIETRO" -#: ../src/common/fmapbase.cpp:154 +#: ../src/common/fmapbase.cpp:195 msgid "BIG5" msgstr "BIG5" -#: ../src/common/imagbmp.cpp:499 ../src/common/imagbmp.cpp:515 +#: ../src/common/imagbmp.cpp:514 +#: ../src/common/imagbmp.cpp:536 +#: ../src/common/imagbmp.cpp:551 msgid "BMP: Couldn't allocate memory." msgstr "BMP: Impossibile allocare la memoria." -#: ../src/common/imagbmp.cpp:86 +#: ../src/common/imagbmp.cpp:88 msgid "BMP: Couldn't save invalid image." msgstr "BMP: Impossibile salvare un'immagine non valida." -#: ../src/common/imagbmp.cpp:320 +#: ../src/common/imagbmp.cpp:329 msgid "BMP: Couldn't write RGB color map." msgstr "BMP: Impossibile scrivere la mappa dei colori RGB." -#: ../src/common/imagbmp.cpp:453 +#: ../src/common/imagbmp.cpp:464 msgid "BMP: Couldn't write data." msgstr "BMP: Impossibile scrivere i dati." -#: ../src/common/imagbmp.cpp:225 +#: ../src/common/imagbmp.cpp:230 msgid "BMP: Couldn't write the file (Bitmap) header." msgstr "BMP: Impossibile scrivere l'header (Bitmap) del file." -#: ../src/common/imagbmp.cpp:246 +#: ../src/common/imagbmp.cpp:253 msgid "BMP: Couldn't write the file (BitmapInfo) header." msgstr "BMP: Impossibile scrivere l'header (BitmapInfo) del file." -#: ../src/common/imagbmp.cpp:120 +#: ../src/common/imagbmp.cpp:124 msgid "BMP: wxImage doesn't have own wxPalette." msgstr "BMP: l'oggetto wxImage non ha una propria wxPalette." -#: ../src/mac/carbon/fontdlg.cpp:382 +#: ../src/osx/carbon/fontdlg.cpp:394 msgid "Background colour" msgstr "Colore di sfondo" -#: ../src/common/fmapbase.cpp:120 +#: ../src/common/fmapbase.cpp:161 msgid "Baltic (ISO-8859-13)" msgstr "Baltico (ISO-8859-13)" -#: ../src/common/fmapbase.cpp:111 +#: ../src/common/fmapbase.cpp:152 msgid "Baltic (old) (ISO-8859-4)" msgstr "Baltico (vecchio) (ISO-8859-4)" @@ -1167,31 +1332,33 @@ msgid "Before a paragraph:" msgstr "Prima di un paragrafo:" #: ../src/richtext/richtextliststylepage.cpp:491 -#: ../src/richtext/richtextbulletspage.cpp:289 +#: ../src/richtext/richtextbulletspage.cpp:291 msgid "Bitmap" msgstr "Immagine" -#: ../src/mac/carbon/dataview.cpp:575 +#: ../src/osx/carbon/dataview.cpp:2353 msgid "Bitmap renderer cannot render value; value type: " -msgstr "" +msgstr "Renderizzazione bitmap non puà rednere valore; tipo valore:" -#: ../src/richtext/richtextfontpage.cpp:269 -#: ../src/richtext/richtextfontpage.cpp:331 -#: ../src/richtext/richtextfontpage.cpp:577 ../src/generic/fontdlgg.cpp:335 -#: ../src/mac/carbon/fontdlg.cpp:516 +#: ../src/generic/fontdlgg.cpp:335 +#: ../src/richtext/richtextfontpage.cpp:286 +#: ../src/richtext/richtextfontpage.cpp:348 +#: ../src/richtext/richtextfontpage.cpp:611 +#: ../src/osx/carbon/fontdlg.cpp:528 msgid "Bold" msgstr "Grassetto" -#: ../src/generic/prntdlgg.cpp:898 +#: ../src/generic/prntdlgg.cpp:899 msgid "Bottom margin (mm):" msgstr "Margine inferiore (mm):" -#: ../src/common/filepickercmn.cpp:44 ../src/common/filepickercmn.cpp:45 +#: ../src/common/filepickercmn.cpp:44 +#: ../src/common/filepickercmn.cpp:45 msgid "Browse" -msgstr "" +msgstr "Sfoglia" #: ../src/richtext/richtextliststylepage.cpp:244 -#: ../src/richtext/richtextbulletspage.cpp:193 +#: ../src/richtext/richtextbulletspage.cpp:192 msgid "Bullet &Alignment:" msgstr "Puntatura e allineamento" @@ -1207,7 +1374,7 @@ msgstr "Puntatura" msgid "C sheet, 17 x 22 in" msgstr "Foglio C, 17 x 22 pollici" -#: ../src/generic/logg.cpp:537 +#: ../src/generic/logg.cpp:526 msgid "C&lear" msgstr "C&ancella" @@ -1237,147 +1404,147 @@ msgstr "Busta C65, 114 x 229 mm" #: ../src/common/accelcmn.cpp:65 msgid "CANCEL" -msgstr "" +msgstr "ANNULLA" #: ../src/common/accelcmn.cpp:69 msgid "CAPITAL" -msgstr "" +msgstr "MAIUSCOLO" -#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:854 +#: ../src/html/chm.cpp:814 +#: ../src/html/chm.cpp:871 msgid "CHM handler currently supports only local files!" msgstr "Il gestore di file CHM supporta unicamente file locali!" #: ../src/common/accelcmn.cpp:66 msgid "CLEAR" -msgstr "" +msgstr "AZZERA" #: ../src/common/accelcmn.cpp:110 msgid "COMMAND" -msgstr "" +msgstr "COMANDO" -#: ../src/richtext/richtextfontpage.cpp:232 +#: ../src/richtext/richtextfontpage.cpp:249 msgid "Ca&pitals" -msgstr "" +msgstr "&Maiuscole" #: ../src/os2/thread.cpp:117 msgid "Cannot create mutex." -msgstr "Impossibile creare mutex" +msgstr "Impossibile creare mutex." -#: ../src/common/filefn.cpp:1421 +#: ../src/common/filefn.cpp:1359 #, c-format msgid "Cannot enumerate files '%s'" msgstr "Impossibile elencare i file '%s'" -#: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204 +#: ../src/msw/dir.cpp:212 #, c-format msgid "Cannot enumerate files in directory '%s'" msgstr "Impossibile elencare i file nella cartella '%s'" -#: ../src/os2/thread.cpp:526 +#: ../src/os2/thread.cpp:528 #, c-format msgid "Cannot resume thread %lu" msgstr "Impossibile riprendere il thread %lu" -#: ../src/msw/thread.cpp:873 +#: ../src/msw/thread.cpp:895 #, c-format msgid "Cannot resume thread %x" msgstr "Impossibile riprendere il thread %x" -#: ../src/msw/thread.cpp:526 +#: ../src/msw/thread.cpp:548 msgid "Cannot start thread: error writing TLS." msgstr "Impossibile avviare il thread: errore nella scrittura del TLS." -#: ../src/os2/thread.cpp:512 +#: ../src/os2/thread.cpp:514 #, c-format msgid "Cannot suspend thread %lu" msgstr "Impossibile sospendere il thread %lu" -#: ../src/msw/thread.cpp:858 +#: ../src/msw/thread.cpp:880 #, c-format msgid "Cannot suspend thread %x" msgstr "Impossibile sospendere il thread %x" -#: ../src/msw/thread.cpp:781 +#: ../src/msw/thread.cpp:803 msgid "Cannot wait for thread termination" msgstr "Impossibile attendere la fine del thread" -#: ../src/common/cmdproc.cpp:262 +#: ../src/common/cmdproc.cpp:266 msgid "Can't &Undo " msgstr "&Annulla impossibile " -#: ../src/common/image.cpp:2648 +#: ../src/common/image.cpp:2843 #, c-format msgid "Can't check image format of file '%s': file does not exist." -msgstr "" -"Impossibile verificare il formato del file immagine '%s': file non esistente." +msgstr "Impossibile verificare il formato del file immagine '%s': file non esistente." -#: ../src/msw/registry.cpp:451 +#: ../src/msw/registry.cpp:463 #, c-format msgid "Can't close registry key '%s'" msgstr "Impossibile chiudere la chiave '%s' del registro di sistema" -#: ../src/msw/registry.cpp:529 +#: ../src/msw/registry.cpp:541 #, c-format msgid "Can't copy values of unsupported type %d." msgstr "Impossibile copiare valori del tipo non supportato %d." -#: ../src/msw/registry.cpp:432 +#: ../src/msw/registry.cpp:444 #, c-format msgid "Can't create registry key '%s'" msgstr "Impossibile creare la chiave '%s' del registro di sistema" -#: ../src/os2/thread.cpp:493 ../src/msw/thread.cpp:652 -#: ../src/mac/carbon/mpthread.cpp:906 +#: ../src/msw/thread.cpp:674 +#: ../src/os2/thread.cpp:495 msgid "Can't create thread" msgstr "Impossibile creare il thread" -#: ../src/msw/window.cpp:3717 +#: ../src/msw/window.cpp:3745 #, c-format msgid "Can't create window of class %s" msgstr "impossibile creare una finestra di classe '%s'" -#: ../src/msw/registry.cpp:705 +#: ../src/msw/registry.cpp:717 #, c-format msgid "Can't delete key '%s'" msgstr "Impossibile eliminare la chiave '%s'" -#: ../src/os2/iniconf.cpp:466 ../src/msw/iniconf.cpp:453 +#: ../src/msw/iniconf.cpp:459 +#: ../src/os2/iniconf.cpp:472 #, c-format msgid "Can't delete the INI file '%s'" msgstr "Impossibile eliminare il file INI '%s'" -#: ../src/msw/registry.cpp:733 +#: ../src/msw/registry.cpp:745 #, c-format msgid "Can't delete value '%s' from key '%s'" msgstr "Impossibile eliminare il valore '%s' dalla chiave '%s'" -#: ../src/msw/registry.cpp:1090 +#: ../src/msw/registry.cpp:1102 #, c-format msgid "Can't enumerate subkeys of key '%s'" msgstr "Impossibile elencare le sottochiavi della chiave '%s'" -#: ../src/msw/registry.cpp:1045 +#: ../src/msw/registry.cpp:1057 #, c-format msgid "Can't enumerate values of key '%s'" msgstr "Impossibile elencare i valori della chiave '%s'" -#: ../src/msw/registry.cpp:1308 +#: ../src/msw/registry.cpp:1320 #, c-format msgid "Can't export value of unsupported type %d." msgstr "Impossibile esportare valori del tipo non supportato %d." -#: ../src/common/ffile.cpp:247 +#: ../src/common/ffile.cpp:235 #, c-format msgid "Can't find current position in file '%s'" msgstr "Impossibile determinare la posizione corrente del file '%s'" -#: ../src/msw/registry.cpp:360 +#: ../src/msw/registry.cpp:372 #, c-format msgid "Can't get info about registry key '%s'" -msgstr "" -"Impossibile ottenere informazioni sulla chiave '%s' del registro di sistema" +msgstr "Impossibile ottenere informazioni sulla chiave '%s' del registro di sistema" -#: ../src/common/zstream.cpp:318 +#: ../src/common/zstream.cpp:330 msgid "Can't initialize zlib deflate stream." msgstr "Impossibile inizializzare il flusso zlib di decompressione." @@ -1385,118 +1552,100 @@ msgstr "Impossibile inizializzare il flusso zlib di decompressione." msgid "Can't initialize zlib inflate stream." msgstr "Impossibile inizializzare il flusso di compressione zlib." -#: ../src/common/image.cpp:2029 ../src/common/image.cpp:2051 +#: ../src/common/image.cpp:2175 +#: ../src/common/image.cpp:2197 #, c-format msgid "Can't load image from file '%s': file does not exist." msgstr "Impossibile caricare l'immagine dal file '%s': file non esistente." -#: ../src/msw/registry.cpp:396 +#: ../src/msw/registry.cpp:408 #, c-format msgid "Can't open registry key '%s'" msgstr "Impossibile aprire la chiave '%s' del registro di sistema" -#: ../src/common/zstream.cpp:234 +#: ../src/common/zstream.cpp:236 #, c-format msgid "Can't read from inflate stream: %s" msgstr "Impossibile leggere dal flusso di decompressione: %s" -#: ../src/common/zstream.cpp:227 +#: ../src/common/zstream.cpp:228 msgid "Can't read inflate stream: unexpected EOF in underlying stream." -msgstr "" -"Impossibile leggere il flusso di decompressione: fine del file inattesa nel " -"flusso di ingresso." +msgstr "Impossibile leggere il flusso di decompressione: fine del file inattesa nel flusso di ingresso." -#: ../src/msw/registry.cpp:977 +#: ../src/msw/registry.cpp:989 #, c-format msgid "Can't read value of '%s'" msgstr "Impossibile leggere il valore di '%s'" -#: ../src/msw/registry.cpp:806 ../src/msw/registry.cpp:838 -#: ../src/msw/registry.cpp:900 +#: ../src/msw/registry.cpp:818 +#: ../src/msw/registry.cpp:850 +#: ../src/msw/registry.cpp:912 #, c-format msgid "Can't read value of key '%s'" msgstr "Impossibile leggere il valore della chiave '%s'" -#: ../src/common/image.cpp:2072 +#: ../src/common/image.cpp:2214 #, c-format msgid "Can't save image to file '%s': unknown extension." msgstr "Impossibile salvare l'immagine nel file '%s': estensione sconosciuta." -#: ../src/generic/logg.cpp:599 ../src/generic/logg.cpp:1049 +#: ../src/generic/logg.cpp:587 +#: ../src/generic/logg.cpp:997 msgid "Can't save log contents to file." msgstr "Impossibile salvare il contenuto del registro su file." -#: ../src/os2/thread.cpp:476 ../src/msw/thread.cpp:608 +#: ../src/msw/thread.cpp:630 +#: ../src/os2/thread.cpp:478 msgid "Can't set thread priority" -msgstr "Impossibile impostare la priorità del thread" +msgstr "Impossibile impostare la priorità del thread" -#: ../src/msw/registry.cpp:824 ../src/msw/registry.cpp:868 -#: ../src/msw/registry.cpp:994 +#: ../src/msw/registry.cpp:836 +#: ../src/msw/registry.cpp:880 +#: ../src/msw/registry.cpp:1006 #, c-format msgid "Can't set value of '%s'" msgstr "Impossibile impostare il valore di '%s'" -#: ../src/common/zstream.cpp:402 +#: ../src/common/zstream.cpp:414 #, c-format msgid "Can't write to deflate stream: %s" msgstr "Impossibile scrivere new flusso di compressione: %s" -#: ../src/richtext/richtextstyledlg.cpp:289 ../src/gtk1/fontdlg.cpp:145 -#: ../src/html/htmlhelp.cpp:434 ../src/generic/dirdlgg.cpp:108 -#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:38 +#: ../src/generic/dirdlgg.cpp:108 +#: ../src/richtext/richtextstyledlg.cpp:289 +#: ../src/msw/msgdlg.cpp:473 +#: ../src/gtk1/fontdlg.cpp:145 +#: ../src/motif/msgdlg.cpp:194 msgid "Cancel" msgstr "Annulla" -#: ../src/xrc/xmlres.cpp:1297 ../src/xrc/xmlres.cpp:1345 -msgid "Cannot convert dialog units: dialog unknown." -msgstr "" -"Impossibile convertire le unità di misura del riquadro di dialogo: riguadro " -"di dialogo sconosciuto." - -#: ../src/common/strconv.cpp:2975 -#, c-format -msgid "Cannot convert from the charset '%s'!" -msgstr "Impossibile convertire il set di caratteri '%s'!" - -#: ../src/mac/carbon/dataview.cpp:1056 ../src/mac/carbon/dataview.cpp:1176 +#: ../src/osx/carbon/dataview.cpp:896 msgid "Cannot create new column's ID. Probably max. number of columns reached." -msgstr "" +msgstr "Impossibile creare ID nuove colonne. Probabilmente raggiunto numero max. colonne." -#: ../src/msw/dialup.cpp:545 +#: ../src/msw/dialup.cpp:546 #, c-format msgid "Cannot find active dialup connection: %s" msgstr "Impossibile trovare la connessione attiva: %s" -#: ../src/xrc/xmlres.cpp:371 -#, c-format -msgid "Cannot find container for unknown control '%s'." -msgstr "Impossibile trovare il contenitore per il controllo sconosciuto '%s'." - -#: ../src/xrc/xmlres.cpp:1380 -#, c-format -msgid "Cannot find font node '%s'." -msgstr "Impossibile trovare il nodo di tipo font '%s'." - -#: ../src/msw/dialup.cpp:856 +#: ../src/msw/dialup.cpp:857 msgid "Cannot find the location of address book file" msgstr "Impossibile trovare il file degli indirizzi" -#: ../src/unix/threadpsx.cpp:1192 +#: ../src/unix/threadpsx.cpp:1197 #, c-format msgid "Cannot get priority range for scheduling policy %d." -msgstr "" -"Impossibile ottenere un intervallo di priorità per la strategia di " -"scheduling %d." +msgstr "Impossibile ottenere un intervallo di priorità per la strategia di scheduling %d." -#: ../src/unix/utilsunx.cpp:842 +#: ../src/unix/utilsunx.cpp:779 msgid "Cannot get the hostname" msgstr "Impossibile ottenere il nome dell'host" -#: ../src/unix/utilsunx.cpp:878 +#: ../src/unix/utilsunx.cpp:815 msgid "Cannot get the official hostname" msgstr "Impossibile ottenere il nome ufficiale dell'host" -#: ../src/msw/dialup.cpp:953 +#: ../src/msw/dialup.cpp:958 msgid "Cannot hang up - no active dialup connection." msgstr "Impossibile disconnettersi - nessuna connessione attiva." @@ -1504,7 +1653,7 @@ msgstr "Impossibile disconnettersi - nessuna connessione attiva." msgid "Cannot initialize OLE" msgstr "Impossibile inizializzare OLE" -#: ../src/mgl/app.cpp:279 +#: ../src/mgl/app.cpp:229 msgid "Cannot initialize SciTech MGL!" msgstr "Impossibile inizializzare SciTech MGL!" @@ -1512,12 +1661,21 @@ msgstr "Impossibile inizializzare SciTech MGL!" msgid "Cannot initialize display." msgstr "Impossibile inizializzare il display" -#: ../src/msw/volume.cpp:614 +#: ../src/common/socket.cpp:844 +msgid "Cannot initialize sockets" +msgstr "Impossibile inizializzare socket" + +#: ../src/msw/volume.cpp:619 #, c-format msgid "Cannot load icon from '%s'." msgstr "Impossibile caricare l'icona da '%s'." -#: ../src/xrc/xmlres.cpp:504 +#: ../src/xrc/xmlres.cpp:264 +#, c-format +msgid "Cannot load resources from '%s'." +msgstr "Impossibile caricare le risorse da '%s'." + +#: ../src/xrc/xmlres.cpp:599 #, c-format msgid "Cannot load resources from file '%s'." msgstr "Impossibile caricare le risorse dal file '%s'." @@ -1527,7 +1685,7 @@ msgstr "Impossibile caricare le risorse dal file '%s'." msgid "Cannot open HTML document: %s" msgstr "Impossibile aprire il documento HTML: %s" -#: ../src/html/helpdata.cpp:658 +#: ../src/html/helpdata.cpp:652 #, c-format msgid "Cannot open HTML help book: %s" msgstr "Impossibile aprire il libro di help HTML: %s" @@ -1537,7 +1695,7 @@ msgstr "Impossibile aprire il libro di help HTML: %s" msgid "Cannot open contents file: %s" msgstr "Impossibile aprire il file sommario: %s" -#: ../src/xrc/xmlres.cpp:469 +#: ../src/xrc/xmlres.cpp:564 #, c-format msgid "Cannot open file '%s'." msgstr "Impossibile aprire il file '%s'." @@ -1551,140 +1709,124 @@ msgstr "Impossibile aprire il file per la stampa PostScript!" msgid "Cannot open index file: %s" msgstr "Impossibile aprire il file di indice: %s" -#: ../src/common/intl.cpp:1337 -#, c-format -msgid "Cannot parse Plural-Forms:'%s'" -msgstr "Impossibile leggere le forme plurali: '%s'" - -#: ../src/xrc/xmlres.cpp:1281 -#, c-format -msgid "Cannot parse coordinates from '%s'." -msgstr "Formato scorretto nella specifica di coordinate '%s'." - -#: ../src/xrc/xmlres.cpp:1329 -#, c-format -msgid "Cannot parse dimension from '%s'." -msgstr "Formato scorretto nella specifica di dimensione '%s'." - -#: ../src/html/helpwnd.cpp:1540 +#: ../src/html/helpwnd.cpp:1541 msgid "Cannot print empty page." msgstr "Impossibile stampare una pagina vuota." -#: ../src/msw/volume.cpp:504 +#: ../src/msw/volume.cpp:508 #, c-format msgid "Cannot read typename from '%s'!" msgstr "Impossibile leggere l'identificatore di tipo da '%s'!" -#: ../src/unix/threadpsx.cpp:1173 +#: ../src/unix/threadpsx.cpp:1178 msgid "Cannot retrieve thread scheduling policy." msgstr "Impossibile determinare la strategia di scheduling." -#: ../src/common/intl.cpp:1907 +#: ../src/common/intl.cpp:546 #, c-format msgid "Cannot set locale to language \"%s\"." -msgstr "" +msgstr "Impossibile impostare locale a lingua \"%s\"." -#: ../src/unix/threadpsx.cpp:797 +#: ../src/unix/threadpsx.cpp:819 msgid "Cannot start thread: error writing TLS" msgstr "Impossibile avviare il thread: errore nella scrittura del TLS" -#: ../src/mac/carbon/mpthread.cpp:972 -msgid "Cannot wait for thread termination." -msgstr "Impossibile attendere la fine del thread." - -#: ../src/mac/carbon/mpthread.cpp:888 -msgid "Cant create the thread event queue" -msgstr "Impossibile creare la coda di eventi per il thread" - -#: ../src/html/helpwnd.cpp:532 +#: ../src/html/helpwnd.cpp:544 msgid "Case sensitive" msgstr "Maiuscole/minuscole" -#: ../src/common/fmapbase.cpp:121 +#: ../src/propgrid/manager.cpp:1505 +msgid "Categorized Mode" +msgstr "Modo categorizzato" + +#: ../src/common/fmapbase.cpp:162 msgid "Celtic (ISO-8859-14)" msgstr "Celtico (ISO-8859-14)" -#: ../src/richtext/richtextliststylepage.cpp:348 #: ../src/richtext/richtextindentspage.cpp:170 +#: ../src/richtext/richtextliststylepage.cpp:348 msgid "Cen&tred" msgstr "Cen&trato" -#: ../src/common/stockitem.cpp:133 +#: ../src/common/stockitem.cpp:159 msgid "Centered" msgstr "Centrato" -#: ../src/common/fmapbase.cpp:109 +#: ../src/common/fmapbase.cpp:150 msgid "Central European (ISO-8859-2)" msgstr "Europeo Centrale (ISO-8859-2)" #: ../src/richtext/richtextliststylepage.cpp:249 -#: ../src/richtext/richtextbulletspage.cpp:198 +#: ../src/richtext/richtextbulletspage.cpp:197 msgid "Centre" msgstr "Centro" -#: ../src/richtext/richtextliststylepage.cpp:350 -#: ../src/richtext/richtextliststylepage.cpp:352 #: ../src/richtext/richtextindentspage.cpp:172 #: ../src/richtext/richtextindentspage.cpp:174 +#: ../src/richtext/richtextliststylepage.cpp:350 +#: ../src/richtext/richtextliststylepage.cpp:352 msgid "Centre text." msgstr "Centra il testo." #: ../src/richtext/richtextliststylepage.cpp:279 -#: ../src/richtext/richtextbulletspage.cpp:230 +#: ../src/richtext/richtextbulletspage.cpp:229 msgid "Ch&oose..." msgstr "&Scegli..." -#: ../src/richtext/richtextbuffer.cpp:2685 +#: ../src/richtext/richtextbuffer.cpp:2738 msgid "Change List Style" msgstr "Modifica lo stile della lista" -#: ../src/richtext/richtextbuffer.cpp:1721 +#: ../src/richtext/richtextbuffer.cpp:1733 msgid "Change Style" msgstr "Modifica lo stile" -#: ../src/mac/carbon/dataview.cpp:251 +#: ../src/osx/dataview_osx.cpp:120 msgid "Changed item is invalid." -msgstr "" +msgstr "Elemento modificato non valido." -#: ../src/common/fileconf.cpp:378 +#: ../src/common/fileconf.cpp:373 #, c-format msgid "Changes won't be saved to avoid overwriting the existing file \"%s\"" -msgstr "" +msgstr "I cambiamenti non verranno salvati per evitare la sovrascrittura del file \"%s\"" -#: ../src/richtext/richtextstyles.cpp:840 +#: ../src/richtext/richtextstyles.cpp:906 msgid "Character styles" msgstr "Stili di carattere" #: ../src/richtext/richtextliststylepage.cpp:223 #: ../src/richtext/richtextliststylepage.cpp:225 -#: ../src/richtext/richtextbulletspage.cpp:172 -#: ../src/richtext/richtextbulletspage.cpp:174 +#: ../src/richtext/richtextbulletspage.cpp:171 +#: ../src/richtext/richtextbulletspage.cpp:173 msgid "Check to add a period after the bullet." msgstr "Spunta per aggiungere un punto dopo il pallino" #: ../src/richtext/richtextliststylepage.cpp:237 #: ../src/richtext/richtextliststylepage.cpp:239 -#: ../src/richtext/richtextbulletspage.cpp:186 -#: ../src/richtext/richtextbulletspage.cpp:188 +#: ../src/richtext/richtextbulletspage.cpp:185 +#: ../src/richtext/richtextbulletspage.cpp:187 msgid "Check to add a right parenthesis." msgstr "Spunta per aggiungere una parentesi chiusa a destra." #: ../src/richtext/richtextliststylepage.cpp:230 #: ../src/richtext/richtextliststylepage.cpp:232 -#: ../src/richtext/richtextbulletspage.cpp:179 -#: ../src/richtext/richtextbulletspage.cpp:181 +#: ../src/richtext/richtextbulletspage.cpp:178 +#: ../src/richtext/richtextbulletspage.cpp:180 msgid "Check to enclose the bullet in parentheses." msgstr "Spunta pe racchiudere la puntatura in una coppia di parentesi" -#: ../src/mac/carbon/fontdlg.cpp:518 ../src/mac/carbon/fontdlg.cpp:520 +#: ../src/osx/carbon/fontdlg.cpp:530 +#: ../src/osx/carbon/fontdlg.cpp:532 msgid "Check to make the font bold." msgstr "Click per rendere il font grassetto" -#: ../src/mac/carbon/fontdlg.cpp:525 ../src/mac/carbon/fontdlg.cpp:527 +#: ../src/osx/carbon/fontdlg.cpp:537 +#: ../src/osx/carbon/fontdlg.cpp:539 msgid "Check to make the font italic." msgstr "Click per rendere il font corsivo" -#: ../src/mac/carbon/fontdlg.cpp:534 ../src/mac/carbon/fontdlg.cpp:536 +#: ../src/osx/carbon/fontdlg.cpp:546 +#: ../src/osx/carbon/fontdlg.cpp:548 msgid "Check to make the font underlined." msgstr "Click per rendere il font sottolineato" @@ -1693,54 +1835,61 @@ msgstr "Click per rendere il font sottolineato" msgid "Check to restart numbering." msgstr "Spunta per ricominciare la numerazione." -#: ../src/richtext/richtextfontpage.cpp:227 -#: ../src/richtext/richtextfontpage.cpp:229 -#, fuzzy +#: ../src/richtext/richtextfontpage.cpp:244 +#: ../src/richtext/richtextfontpage.cpp:246 msgid "Check to show a line through the text." -msgstr "Spunta per aggiungere un punto dopo il pallino" +msgstr "Spunta per visualizzare una linea attraverso il testo" -#: ../src/richtext/richtextfontpage.cpp:234 -#: ../src/richtext/richtextfontpage.cpp:236 -#, fuzzy +#: ../src/richtext/richtextfontpage.cpp:251 +#: ../src/richtext/richtextfontpage.cpp:253 msgid "Check to show the text in capitals." -msgstr "Click per rendere il font corsivo" +msgstr "Spunta per visualizzare il testo in maiuscolo." -#: ../src/richtext/richtextfontpage.cpp:248 -#: ../src/richtext/richtextfontpage.cpp:250 -#, fuzzy +#: ../src/richtext/richtextfontpage.cpp:265 +#: ../src/richtext/richtextfontpage.cpp:267 msgid "Check to show the text in subscript." -msgstr "Click per modificare il colore del testo." +msgstr "Spunta per visualizzare il testo come pedice." -#: ../src/richtext/richtextfontpage.cpp:241 -#: ../src/richtext/richtextfontpage.cpp:243 -#, fuzzy +#: ../src/richtext/richtextfontpage.cpp:258 +#: ../src/richtext/richtextfontpage.cpp:260 msgid "Check to show the text in superscript." -msgstr "Spunta pe racchiudere la puntatura in una coppia di parentesi" +msgstr "Spunta pe visualizzare il testo ome apice." -#: ../src/msw/dialup.cpp:791 +#: ../src/msw/dialup.cpp:792 msgid "Choose ISP to dial" msgstr "Scegliere l'ISP da chiamare" -#: ../src/gtk/colordlg.cpp:52 ../src/generic/colrdlgg.cpp:144 +#: ../src/propgrid/props.cpp:1547 +msgid "Choose a directory:" +msgstr "Secli una cartella:" + +#: ../src/propgrid/props.cpp:1606 +msgid "Choose a file" +msgstr "Scegli un file" + #: ../src/palmos/colordlg.cpp:74 +#: ../src/generic/colrdlgg.cpp:144 +#: ../src/gtk/colordlg.cpp:60 msgid "Choose colour" msgstr "Scegli un colore" -#: ../src/gtk/fontdlg.cpp:99 ../src/gtk1/fontdlg.cpp:126 +#: ../src/generic/fontpickerg.cpp:51 +#: ../src/gtk/fontdlg.cpp:99 +#: ../src/gtk1/fontdlg.cpp:126 msgid "Choose font" msgstr "Carattere" #: ../src/common/module.cpp:75 #, c-format msgid "Circular dependency involving module \"%s\" detected." -msgstr "" -"È stata trovata una dipendenza circolare che coinvolge il modulo \"%s\"." +msgstr "È stata trovata una dipendenza circolare che coinvolge il modulo \"%s\"." -#: ../src/aui/tabmdi.cpp:105 ../src/generic/mdig.cpp:115 +#: ../src/aui/tabmdi.cpp:105 +#: ../src/generic/mdig.cpp:102 msgid "Cl&ose" msgstr "C&hiudi" -#: ../src/generic/logg.cpp:537 +#: ../src/generic/logg.cpp:526 msgid "Clear the log contents" msgstr "Eliminare il contenuto del registro" @@ -1751,16 +1900,18 @@ msgstr "Click per applicare lo stile corrente." #: ../src/richtext/richtextliststylepage.cpp:280 #: ../src/richtext/richtextliststylepage.cpp:282 -#: ../src/richtext/richtextbulletspage.cpp:231 -#: ../src/richtext/richtextbulletspage.cpp:233 +#: ../src/richtext/richtextbulletspage.cpp:230 +#: ../src/richtext/richtextbulletspage.cpp:232 msgid "Click to browse for a symbol." msgstr "Click per selezionare un simbolo." -#: ../src/mac/carbon/fontdlg.cpp:565 ../src/mac/carbon/fontdlg.cpp:567 +#: ../src/osx/carbon/fontdlg.cpp:577 +#: ../src/osx/carbon/fontdlg.cpp:579 msgid "Click to cancel changes to the font." msgstr "Click per annullare le modifiche al font" -#: ../src/generic/fontdlgg.cpp:474 ../src/generic/fontdlgg.cpp:493 +#: ../src/generic/fontdlgg.cpp:474 +#: ../src/generic/fontdlgg.cpp:493 msgid "Click to cancel the font selection." msgstr "Click per annullare la selezione del font" @@ -1769,12 +1920,18 @@ msgstr "Click per annullare la selezione del font" msgid "Click to cancel this window." msgstr "Click per annullare questa finestra." -#: ../src/mac/carbon/fontdlg.cpp:546 ../src/mac/carbon/fontdlg.cpp:548 +#: ../src/osx/carbon/fontdlg.cpp:558 +#: ../src/osx/carbon/fontdlg.cpp:560 msgid "Click to change the font colour." msgstr "Click per modificare il colore del font" -#: ../src/richtext/richtextfontpage.cpp:217 -#: ../src/richtext/richtextfontpage.cpp:219 +#: ../src/richtext/richtextfontpage.cpp:234 +#: ../src/richtext/richtextfontpage.cpp:236 +msgid "Click to change the text background colour." +msgstr "Clic per modificare il colore di sfondo del testo." + +#: ../src/richtext/richtextfontpage.cpp:222 +#: ../src/richtext/richtextfontpage.cpp:224 msgid "Click to change the text colour." msgstr "Click per modificare il colore del testo." @@ -1788,12 +1945,15 @@ msgstr "Click per selezionare il font per il livello corrente" msgid "Click to close this window." msgstr "Click per chiudere questa finestra." -#: ../src/mac/carbon/fontdlg.cpp:572 ../src/mac/carbon/fontdlg.cpp:574 +#: ../src/osx/carbon/fontdlg.cpp:584 +#: ../src/osx/carbon/fontdlg.cpp:586 msgid "Click to confirm changes to the font." msgstr "Click per confermare le modifiche al font" -#: ../src/generic/fontdlgg.cpp:479 ../src/generic/fontdlgg.cpp:481 -#: ../src/generic/fontdlgg.cpp:486 ../src/generic/fontdlgg.cpp:488 +#: ../src/generic/fontdlgg.cpp:479 +#: ../src/generic/fontdlgg.cpp:481 +#: ../src/generic/fontdlgg.cpp:486 +#: ../src/generic/fontdlgg.cpp:488 msgid "Click to confirm the font selection." msgstr "Click per confermare la selezione del font" @@ -1817,13 +1977,13 @@ msgstr "Click per creare un nuovo stile di lista" msgid "Click to create a new paragraph style." msgstr "Click per creare un nuovo stile di paragrafo" -#: ../src/richtext/richtexttabspage.cpp:137 -#: ../src/richtext/richtexttabspage.cpp:139 +#: ../src/richtext/richtexttabspage.cpp:136 +#: ../src/richtext/richtexttabspage.cpp:138 msgid "Click to create a new tab position." msgstr "Click per creare un nuovo punto di tabulazione." -#: ../src/richtext/richtexttabspage.cpp:149 -#: ../src/richtext/richtexttabspage.cpp:151 +#: ../src/richtext/richtexttabspage.cpp:148 +#: ../src/richtext/richtexttabspage.cpp:150 msgid "Click to delete all tab positions." msgstr "Click per eliminare tutti i punti di tabulazione." @@ -1832,8 +1992,8 @@ msgstr "Click per eliminare tutti i punti di tabulazione." msgid "Click to delete the selected style." msgstr "Click per eliminare lo stile selezionato" -#: ../src/richtext/richtexttabspage.cpp:143 -#: ../src/richtext/richtexttabspage.cpp:145 +#: ../src/richtext/richtexttabspage.cpp:142 +#: ../src/richtext/richtexttabspage.cpp:144 msgid "Click to delete the selected tab position." msgstr "Click per eliminare il punto di tabulazione selezionato." @@ -1847,280 +2007,280 @@ msgstr "Click per modificare lo stile selezionato." msgid "Click to rename the selected style." msgstr "Click per rinominare lo stile selezionato." +#: ../src/generic/dbgrptg.cpp:94 +#: ../src/generic/progdlgg.cpp:717 +#: ../src/generic/progdlgg.cpp:722 #: ../src/richtext/richtextstyledlg.cpp:263 -#: ../src/richtext/richtextsymboldlg.cpp:474 ../src/html/helpdlg.cpp:91 -#: ../src/generic/dbgrptg.cpp:93 ../src/generic/progdlgg.cpp:642 -#: ../src/generic/progdlgg.cpp:647 +#: ../src/richtext/richtextsymboldlg.cpp:475 +#: ../src/html/helpdlg.cpp:91 msgid "Close" msgstr "Chiudi" -#: ../src/univ/themes/win32.cpp:3742 +#: ../src/univ/themes/win32.cpp:3780 msgid "Close\tAlt-F4" msgstr "Chiudi\tAlt-F4" -#: ../src/aui/tabmdi.cpp:106 ../src/generic/mdig.cpp:116 +#: ../src/aui/tabmdi.cpp:106 +#: ../src/generic/mdig.cpp:103 msgid "Close All" msgstr "Chiudi &tutto" -#: ../src/common/stockitem.cpp:211 +#: ../src/common/stockitem.cpp:268 msgid "Close current document" msgstr "Chiudi il documento corrente" -#: ../src/generic/logg.cpp:539 +#: ../src/generic/logg.cpp:528 msgid "Close this window" msgstr "Chiudi questa finestra" -#: ../src/richtext/richtextformatdlg.cpp:524 -#, fuzzy +#: ../src/richtext/richtextformatdlg.cpp:523 msgid "Colour" -msgstr "Colore:" +msgstr "Colore" -#: ../src/msw/colordlg.cpp:155 -#, fuzzy, c-format +#: ../src/msw/colordlg.cpp:156 +#, c-format msgid "Colour selection dialog failed with error %0lx." -msgstr "Esecuzione del comando '%s' fallita con errore: %ul" +msgstr "Finestra seelzione colre fallita con errore %0lx." -#: ../src/mac/carbon/fontdlg.cpp:542 +#: ../src/osx/carbon/fontdlg.cpp:554 msgid "Colour:" msgstr "Colore:" -#: ../src/mac/carbon/dataview.cpp:1064 ../src/mac/carbon/dataview.cpp:1184 -#, fuzzy +#: ../src/osx/dataview_osx.cpp:406 +msgid "Column could not be added to native control." +msgstr "La colonna non può essere aggiunta al controllo nativo." + +#: ../src/osx/carbon/dataview.cpp:901 msgid "Column could not be added." -msgstr "Impossibile caricare il file." +msgstr "la colonna non può essere aggiunta." -#: ../src/mac/carbon/dataview.cpp:1063 ../src/mac/carbon/dataview.cpp:1183 +#: ../src/osx/carbon/dataview.cpp:900 msgid "Column description could not be initialized." -msgstr "" +msgstr "La descrizione colonna non può essere inzializzata." -#: ../src/mac/carbon/dataview.cpp:1050 ../src/mac/carbon/dataview.cpp:1170 +#: ../src/osx/dataview_osx.cpp:380 msgid "Column does not have a renderer." -msgstr "" +msgstr "La colonna non ha un renderizzatore." -#: ../src/mac/carbon/databrow.cpp:883 ../src/mac/carbon/databrow.cpp:904 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:1499 +#: ../src/osx/carbon/dataview.cpp:1520 msgid "Column index not found." -msgstr "File della guida \"%s\" non trovato." +msgstr "Indice colonna non trovato." -#: ../src/mac/carbon/dataview.cpp:1049 ../src/mac/carbon/dataview.cpp:1169 +#: ../src/osx/dataview_osx.cpp:379 msgid "Column pointer must not be NULL." -msgstr "" +msgstr "Puntatore colonna non può essere NULL." -#: ../src/mac/carbon/databrow.cpp:959 +#: ../src/osx/carbon/dataview.cpp:1575 msgid "Column width could not be determined" -msgstr "" +msgstr "Impossibile determinare larghezza colonna" -#: ../src/mac/carbon/dataview.cpp:1067 ../src/mac/carbon/dataview.cpp:1187 +#: ../src/osx/carbon/dataview.cpp:902 msgid "Column width could not be set." -msgstr "" +msgstr "Impossibile impostare la larghezza della colonna." -#: ../src/mac/carbon/dataview.cpp:1053 ../src/mac/carbon/dataview.cpp:1173 +#: ../src/osx/dataview_osx.cpp:383 msgid "Column's model column has no equivalent in the associated model." -msgstr "" +msgstr "Il modello colonna non ha un equivalente del modello associato." -#: ../src/common/init.cpp:189 +#: ../src/common/init.cpp:185 #, c-format -msgid "" -"Command line argument %d couldn't be converted to Unicode and will be " -"ignored." -msgstr "" +msgid "Command line argument %d couldn't be converted to Unicode and will be ignored." +msgstr "L'argomento %d della linea di comando non può essere convertito in Unicode e verrà ignorato." -#: ../src/html/helpwnd.cpp:1554 +#: ../src/msw/fontdlg.cpp:118 +#, c-format +msgid "Common dialog failed with error code %0lx." +msgstr "Finestra di dialogo comune fallita con codice errore %0lx." + +#: ../src/html/helpwnd.cpp:1558 msgid "Compressed HTML Help file (*.chm)|*.chm|" msgstr "HTML Help (*.chm)|*.chm|" -#: ../src/generic/dirctrlg.cpp:591 +#: ../src/generic/dirctrlg.cpp:595 msgid "Computer" msgstr "Computer" -#: ../src/common/fileconf.cpp:959 +#: ../src/common/fileconf.cpp:966 #, c-format msgid "Config entry name cannot start with '%c'." -msgstr "Il nome di una voce di configurazione non può iniziare con '%c'." +msgstr "Il nome di una voce di configurazione non può iniziare con '%c'." -#: ../src/gtk/filedlg.cpp:55 +#: ../src/gtk/filedlg.cpp:56 msgid "Confirm" msgstr "Conferma" -#: ../src/msw/mimetype.cpp:706 +#: ../src/msw/mimetype.cpp:715 msgid "Confirm registry update" msgstr "Conferma l'aggiornamento del registro di sistema" -#: ../src/html/htmlwin.cpp:517 +#: ../src/html/htmlwin.cpp:541 msgid "Connecting..." msgstr "Connessione..." -#: ../src/html/htmlhelp.cpp:565 ../src/html/helpwnd.cpp:468 +#: ../src/html/helpwnd.cpp:480 msgid "Contents" msgstr "Sommario" -#: ../src/mac/carbon/dataview.cpp:377 -msgid "Control is wrongly initialized." -msgstr "" - -#: ../src/common/strconv.cpp:2003 +#: ../src/common/strconv.cpp:2241 #, c-format msgid "Conversion to charset '%s' doesn't work." msgstr "La conversione nella codifica '%s' non funziona." -#: ../src/html/htmlwin.cpp:941 +#: ../src/html/htmlwin.cpp:1054 #, c-format msgid "Copied to clipboard:\"%s\"" msgstr "Copiato negli appunti:\"%s\"" -#: ../src/generic/prntdlgg.cpp:254 +#: ../src/generic/prntdlgg.cpp:253 msgid "Copies:" msgstr "Copie:" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:426 -#, fuzzy +#: ../src/stc/scintilla/src/ScintillaBase.cxx:456 msgid "Copy" -msgstr "&Copia" +msgstr "Copia" -#: ../src/common/stockitem.cpp:203 +#: ../src/common/stockitem.cpp:260 msgid "Copy selection" msgstr "Copia selezione" -#: ../src/mac/carbon/dataview.cpp:1061 ../src/mac/carbon/dataview.cpp:1181 +#: ../src/osx/dataview_osx.cpp:415 msgid "Could not add column to internal structures." -msgstr "" +msgstr "Potresti aggiungere la colonna alle strutture interne." -#: ../src/html/chm.cpp:703 +#: ../src/html/chm.cpp:717 #, c-format msgid "Could not create temporary file '%s'" msgstr "Impossibile creare il file temporaneo '%s'" -#: ../src/mac/carbon/databrow.cpp:628 ../src/mac/carbon/databrow.cpp:1011 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:1246 +#: ../src/osx/carbon/dataview.cpp:1633 msgid "Could not determine column index." -msgstr "Impossibile mostrare l'anteprima del documento." +msgstr "Impossibile determinare indice colonna." -#: ../src/mac/carbon/dataview.cpp:1145 +#: ../src/osx/carbon/dataview.cpp:877 msgid "Could not determine column's position" -msgstr "" +msgstr "Impossibile determinare posizione colonne" -#: ../src/mac/carbon/dataview.cpp:1253 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:844 +msgid "Could not determine number of columns." +msgstr "Impossibile determinare il numero di colonne" + +#: ../src/osx/carbon/dataview.cpp:976 msgid "Could not determine number of items" -msgstr "Impossibile trovare il file di inclusione di risorsa %s." +msgstr "Impossibile determinare numero elementi." #: ../src/html/chm.cpp:274 #, c-format msgid "Could not extract %s into %s: %s" msgstr "Impossibile estrarre %s in %s: %s" -#: ../src/generic/tabg.cpp:1051 +#: ../src/generic/tabg.cpp:1049 msgid "Could not find tab for id" msgstr "Impossibile trovare l'etichetta per l'id" -#: ../src/mac/carbon/dataview.cpp:739 ../src/mac/carbon/dataview.cpp:776 -#: ../src/mac/carbon/dataview.cpp:814 ../src/mac/carbon/dataview.cpp:837 -#: ../src/mac/carbon/dataview.cpp:948 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2511 +#: ../src/osx/carbon/dataview.cpp:2546 +#: ../src/osx/carbon/dataview.cpp:2570 +#: ../src/osx/carbon/dataview.cpp:2591 +#: ../src/osx/carbon/dataview.cpp:2728 msgid "Could not get header description." -msgstr "Impossibile avviare la stampa." +msgstr "Impossibile ottenere descrione intestazione." -#: ../src/mac/carbon/dataview.cpp:1335 ../src/mac/carbon/dataview.cpp:1395 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:1135 +#: ../src/osx/carbon/dataview.cpp:1161 msgid "Could not get items." -msgstr "Impossibile trovare il file '%s'." +msgstr "Impossibile ottenere elementi." -#: ../src/mac/carbon/dataview.cpp:861 ../src/mac/carbon/dataview.cpp:891 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2614 +#: ../src/osx/carbon/dataview.cpp:2679 msgid "Could not get property flags." -msgstr "Impossibile creare il file temporaneo '%s'" +msgstr "Impossibile ottenere indicatori proprietà." -#: ../src/mac/carbon/databrow.cpp:504 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:727 msgid "Could not get selected items." -msgstr "Impossibile trovare il file '%s'." +msgstr "Impossibile ottenere elementi selezionati." #: ../src/html/chm.cpp:445 #, c-format msgid "Could not locate file '%s'." msgstr "Impossibile trovare il file '%s'." -#: ../src/mac/carbon/dataview.cpp:1090 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:846 msgid "Could not remove column." -msgstr "Impossibile creare un cursore." +msgstr "Impossibnile rimuovere colonne." -#: ../src/mac/carbon/databrow.cpp:425 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:643 msgid "Could not retrieve number of items" -msgstr "Impossibile creare il file temporaneo '%s'" +msgstr "Impossibile ottenere numero elementi" -#: ../src/mac/carbon/dataview.cpp:755 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2527 msgid "Could not set alignment." -msgstr "Impossibile avviare la stampa." +msgstr "Impossibile impostare allineamento" -#: ../src/mac/carbon/dataview.cpp:969 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2748 msgid "Could not set column width." -msgstr "Impossibile mostrare l'anteprima del documento." +msgstr "Impossibile impostare larghezza colonna." -#: ../src/mac/carbon/dataview.cpp:950 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2730 msgid "Could not set header description." -msgstr "Impossibile avviare la stampa." +msgstr "Impossibile impostare descrizione intestazione." -#: ../src/mac/carbon/dataview.cpp:785 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2551 msgid "Could not set icon." -msgstr "Impossibile avviare la stampa." +msgstr "Impossibile impostare icona." -#: ../src/mac/carbon/dataview.cpp:816 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2572 msgid "Could not set maximum width." -msgstr "Impossibile avviare la stampa." +msgstr "Impossibile impostare larghezza amssima" -#: ../src/mac/carbon/dataview.cpp:839 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2593 msgid "Could not set minimum width." -msgstr "Impossibile avviare la stampa." +msgstr "Impossibile impostare larghezza minima" -#: ../src/mac/carbon/dataview.cpp:866 ../src/mac/carbon/dataview.cpp:896 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:2619 +#: ../src/osx/carbon/dataview.cpp:2684 msgid "Could not set property flags." -msgstr "Impossibile avviare la stampa." +msgstr "Impossibile impostare indicatori proprietà." -#: ../src/common/prntbase.cpp:1547 +#: ../src/common/prntbase.cpp:1558 msgid "Could not start document preview." msgstr "Impossibile mostrare l'anteprima del documento." -#: ../src/gtk/gnome/gprint.cpp:925 ../src/gtk/print.cpp:1042 -#: ../src/generic/printps.cpp:181 ../src/msw/printwin.cpp:233 +#: ../src/generic/printps.cpp:179 +#: ../src/msw/printwin.cpp:205 +#: ../src/gtk/print.cpp:1011 +#: ../src/gtk/gnome/gprint.cpp:916 msgid "Could not start printing." msgstr "Impossibile avviare la stampa." -#: ../src/common/wincmn.cpp:1621 +#: ../src/common/wincmn.cpp:1786 msgid "Could not transfer data to window" msgstr "Impossibile trasferire i dati verso la finestra" -#: ../src/mac/carbon/mpthread.cpp:222 ../src/mac/carbon/mpthread.cpp:301 -msgid "Could not unlock mutex" -msgstr "Impossibile rilasciare un mutex" - -#: ../src/os2/thread.cpp:159 +#: ../src/os2/thread.cpp:161 msgid "Couldn't acquire a mutex lock" msgstr "Impossibile acquisire il lock del mutex" -#: ../src/msw/dragimag.cpp:156 ../src/msw/dragimag.cpp:195 -#: ../src/msw/imaglist.cpp:149 ../src/msw/imaglist.cpp:167 -#: ../src/msw/imaglist.cpp:179 +#: ../src/msw/imaglist.cpp:147 +#: ../src/msw/imaglist.cpp:165 +#: ../src/msw/imaglist.cpp:177 +#: ../src/msw/dragimag.cpp:156 +#: ../src/msw/dragimag.cpp:195 msgid "Couldn't add an image to the image list." msgstr "Impossibile aggiungere un'immagine alla lista." -#: ../src/os2/timer.cpp:114 ../src/msw/timer.cpp:83 +#: ../src/msw/timer.cpp:139 +#: ../src/os2/timer.cpp:114 msgid "Couldn't create a timer" msgstr "Impossibile creare un timer" -#: ../src/mgl/cursor.cpp:132 ../src/mgl/cursor.cpp:163 +#: ../src/mgl/cursor.cpp:132 +#: ../src/mgl/cursor.cpp:153 msgid "Couldn't create cursor." msgstr "Impossibile creare un cursore." -#: ../src/mac/carbon/overlay.cpp:125 +#: ../src/osx/carbon/overlay.cpp:123 msgid "Couldn't create the overlay window" msgstr "Impossibile creare la finestra di overlay" @@ -2129,30 +2289,28 @@ msgstr "Impossibile creare la finestra di overlay" msgid "Couldn't find symbol '%s' in a dynamic library" msgstr "Impossibile trovare il simbolo '%s' nella libreria dinamica" -#: ../src/gtk/print.cpp:2055 +#: ../src/gtk/print.cpp:1957 msgid "Couldn't get hatch style from wxBrush." -msgstr "" +msgstr "Impossibile ottenere stile hatch da wxBrush." -#: ../src/msw/thread.cpp:899 +#: ../src/msw/thread.cpp:921 msgid "Couldn't get the current thread pointer" msgstr "Impossibile ottenere un puntatore al thread corrente" -#: ../src/mac/carbon/overlay.cpp:132 +#: ../src/osx/carbon/overlay.cpp:130 msgid "Couldn't init the context on the overlay window" msgstr "Impossibile inizializzare il contesto della finestra di overlay" -#: ../src/common/imagpng.cpp:615 +#: ../src/common/imagpng.cpp:614 msgid "Couldn't load a PNG image - file is corrupted or not enough memory." -msgstr "" -"Impossibile caricare un'immagine PNG - file danneggiato o memoria " -"insufficiente." +msgstr "Impossibile caricare un'immagine PNG - file danneggiato o memoria insufficiente." #: ../src/unix/sound.cpp:471 #, c-format msgid "Couldn't load sound data from '%s'." msgstr "Impossibile leggere dati sonori da '%s'." -#: ../src/unix/sound_sdl.cpp:228 +#: ../src/unix/sound_sdl.cpp:226 #, c-format msgid "Couldn't open audio: %s" msgstr "Impossibile inizializzare l'audio: %s" @@ -2162,21 +2320,22 @@ msgstr "Impossibile inizializzare l'audio: %s" msgid "Couldn't register clipboard format '%s'." msgstr "Impossibile registrare il formato '%s' degli appunti." -#: ../src/os2/thread.cpp:176 +#: ../src/os2/thread.cpp:178 msgid "Couldn't release a mutex" msgstr "Impossibile rilasciare un mutex" -#: ../src/msw/listctrl.cpp:802 +#: ../src/msw/listctrl.cpp:828 #, c-format msgid "Couldn't retrieve information about list control item %d." msgstr "Impossibile ottenere informazioni sull'elemento %d del list control." -#: ../src/common/imagpng.cpp:664 ../src/common/imagpng.cpp:673 -#: ../src/common/imagpng.cpp:681 +#: ../src/common/imagpng.cpp:665 +#: ../src/common/imagpng.cpp:676 +#: ../src/common/imagpng.cpp:686 msgid "Couldn't save PNG image." msgstr "Impossibile salvare l'immagine PNG." -#: ../src/msw/thread.cpp:669 +#: ../src/msw/thread.cpp:691 msgid "Couldn't terminate thread" msgstr "Impossibile terminare il thread" @@ -2188,38 +2347,43 @@ msgstr "Create Parameter non trovato in declared RTTI Parameters" msgid "Create directory" msgstr "Crea cartella" -#: ../src/generic/dirdlgg.cpp:132 ../src/generic/filedlgg.cpp:230 +#: ../src/generic/filedlgg.cpp:230 +#: ../src/generic/dirdlgg.cpp:132 msgid "Create new directory" msgstr "Crea una nuova cartella" #: ../src/common/accelcmn.cpp:296 -msgid "Ctrl-" -msgstr "Ctrl-" +msgid "Ctrl+" +msgstr "Ctrl+" -#: ../src/common/stockitem.cpp:118 ../src/richtext/richtextctrl.cpp:2595 -#: ../src/msw/textctrl.cpp:2151 ../src/mac/carbon/textctrl.cpp:1064 +#: ../src/richtext/richtextctrl.cpp:296 +#: ../src/osx/textctrl_osx.cpp:587 +#: ../src/common/stockitem.cpp:140 +#: ../src/msw/textctrl.cpp:2174 msgid "Cu&t" msgstr "Ta&glia" -#: ../src/generic/filectrlg.cpp:951 +#: ../src/generic/filectrlg.cpp:946 msgid "Current directory:" msgstr "Cartella corrente:" -#: ../src/gtk/print.cpp:756 -#, fuzzy +#: ../src/gtk/print.cpp:731 msgid "Custom size" -msgstr "corpo" +msgstr "Dimensione personalizzata" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:425 -#, fuzzy +#: ../src/common/headerctrlcmn.cpp:60 +msgid "Customize Columns" +msgstr "Personalizzazione colonne" + +#: ../src/stc/scintilla/src/ScintillaBase.cxx:455 msgid "Cut" -msgstr "Ta&glia" +msgstr "Taglia" -#: ../src/common/stockitem.cpp:204 +#: ../src/common/stockitem.cpp:261 msgid "Cut selection" msgstr "taglia selezione" -#: ../src/common/fmapbase.cpp:112 +#: ../src/common/fmapbase.cpp:153 msgid "Cyrillic (ISO-8859-5)" msgstr "Cirillico (ISO-8859-5)" @@ -2233,41 +2397,39 @@ msgstr "Richiesta DDE (poke) fallita" #: ../src/common/accelcmn.cpp:78 msgid "DECIMAL" -msgstr "" +msgstr "DECIMALE" #: ../src/common/accelcmn.cpp:46 msgid "DEL" -msgstr "" +msgstr "CANC" #: ../src/common/accelcmn.cpp:47 msgid "DELETE" -msgstr "" +msgstr "ELIMINA" -#: ../src/common/imagbmp.cpp:944 +#: ../src/common/imagbmp.cpp:1019 msgid "DIB Header: Encoding doesn't match bitdepth." -msgstr "" -"Intestazione DIB: La codifica non corrisponde al numero di bit per pixel." +msgstr "Intestazione DIB: La codifica non corrisponde al numero di bit per pixel." -#: ../src/common/imagbmp.cpp:905 +#: ../src/common/imagbmp.cpp:974 msgid "DIB Header: Image height > 32767 pixels for file." -msgstr "Intestazione DIB: L'altezza dell'immagine nel file è > di 32767 pixel." +msgstr "Intestazione DIB: L'altezza dell'immagine nel file è > di 32767 pixel." -#: ../src/common/imagbmp.cpp:899 +#: ../src/common/imagbmp.cpp:966 msgid "DIB Header: Image width > 32767 pixels for file." -msgstr "" -"Intestazione DIB: La larghezza dell'immagine nel file è > di 32767 pixel." +msgstr "Intestazione DIB: La larghezza dell'immagine nel file è > di 32767 pixel." -#: ../src/common/imagbmp.cpp:919 +#: ../src/common/imagbmp.cpp:990 msgid "DIB Header: Unknown bitdepth in file." msgstr "Header DIB: Numero di bit per pixel nel file sconosciuto." -#: ../src/common/imagbmp.cpp:929 +#: ../src/common/imagbmp.cpp:1002 msgid "DIB Header: Unknown encoding in file." msgstr "Header DIB: Codifica del file sconosciuta." #: ../src/common/accelcmn.cpp:79 msgid "DIVIDE" -msgstr "" +msgstr "DIVIDI" #: ../src/common/paper.cpp:123 msgid "DL Envelope, 110 x 220 mm" @@ -2275,17 +2437,17 @@ msgstr "Busta DL, 110 x 220 mm" #: ../src/common/accelcmn.cpp:58 msgid "DOWN" -msgstr "" +msgstr "GIU" -#: ../src/mac/carbon/dataview.cpp:345 -msgid "Data view control is not correctly initialized" -msgstr "" +#: ../src/osx/carbon/dataview.cpp:1879 +msgid "Data object has invalid data format" +msgstr "Oggetto dati ha un formato dati non valido" -#: ../src/mac/carbon/dataview.cpp:694 +#: ../src/osx/carbon/dataview.cpp:2448 msgid "Date renderer cannot render value; value type: " -msgstr "" +msgstr "Data renderizzazione non può rendere valore; tipo valore:" -#: ../src/generic/dbgrptg.cpp:296 +#: ../src/generic/dbgrptg.cpp:297 #, c-format msgid "Debug report \"%s\"" msgstr "Segnalazione di errore \"%s\"" @@ -2294,7 +2456,7 @@ msgstr "Segnalazione di errore \"%s\"" msgid "Debug report couldn't be created." msgstr "Impossibile creare la segnalazione di errore." -#: ../src/common/debugrpt.cpp:545 +#: ../src/common/debugrpt.cpp:547 msgid "Debug report generation has failed." msgstr "Generazione della segnalazione di errore fallita." @@ -2302,45 +2464,46 @@ msgstr "Generazione della segnalazione di errore fallita." msgid "Decorative" msgstr "Decorativo" -#: ../src/common/fmapbase.cpp:661 +#: ../src/common/fmapbase.cpp:788 msgid "Default encoding" msgstr "Codifca predefinita" -#: ../src/dfb/fontmgr.cpp:184 -#, fuzzy +#: ../src/dfb/fontmgr.cpp:181 msgid "Default font" -msgstr "Stampante predefinita" +msgstr "Fint predefinita" -#: ../src/generic/prntdlgg.cpp:515 +#: ../src/generic/prntdlgg.cpp:516 msgid "Default printer" msgstr "Stampante predefinita" -#: ../src/richtext/richtextbuffer.cpp:5343 -#: ../src/stc/scintilla/src/ScintillaBase.cxx:428 +#: ../src/richtext/richtextbuffer.cpp:5538 +#: ../src/stc/scintilla/src/ScintillaBase.cxx:458 msgid "Delete" msgstr "Cancella" -#: ../src/richtext/richtexttabspage.cpp:148 +#: ../src/richtext/richtexttabspage.cpp:147 msgid "Delete A&ll" msgstr "&Candella tutti" -#: ../src/richtext/richtextstyledlg.cpp:734 +#: ../src/richtext/richtextstyledlg.cpp:735 msgid "Delete Style" msgstr "Elimina stile" -#: ../src/richtext/richtextctrl.cpp:639 ../src/richtext/richtextctrl.cpp:687 +#: ../src/richtext/richtextctrl.cpp:794 +#: ../src/richtext/richtextctrl.cpp:898 +#: ../src/richtext/richtextctrl.cpp:947 msgid "Delete Text" msgstr "Elimina testo" -#: ../src/generic/editlbox.cpp:274 +#: ../src/generic/editlbox.cpp:275 msgid "Delete item" msgstr "Elimina elemento" -#: ../src/common/stockitem.cpp:205 +#: ../src/common/stockitem.cpp:262 msgid "Delete selection" msgstr "Elimina selezione" -#: ../src/richtext/richtextstyledlg.cpp:734 +#: ../src/richtext/richtextstyledlg.cpp:735 #, c-format msgid "Delete style %s?" msgstr "Eliminare stile %s?" @@ -2355,7 +2518,7 @@ msgstr "Eliminato file di lock obsoleto '%s'" msgid "Dependency \"%s\" of module \"%s\" doesn't exist." msgstr "La dipendenza \"%s\" del modulo \"%s\" non esiste." -#: ../src/generic/dirctrlg.cpp:660 +#: ../src/generic/dirctrlg.cpp:677 msgid "Desktop" msgstr "Desktop" @@ -2363,21 +2526,15 @@ msgstr "Desktop" msgid "Developed by " msgstr "Sviluppato da" -#: ../src/generic/aboutdlgg.cpp:142 -#, fuzzy +#: ../src/generic/aboutdlgg.cpp:177 msgid "Developers" -msgstr "Sviluppato da" +msgstr "Sviluppatori" -#: ../src/msw/dialup.cpp:396 -msgid "" -"Dial up functions are unavailable because the remote access service (RAS) is " -"not installed on this machine. Please install it." -msgstr "" -"Funzionalità di composizione telefonica non disponibili perchè il servizio " -"di Accesso Remoto (RAS) non è installato su questo computer. Si prega di " -"installarlo." +#: ../src/msw/dialup.cpp:397 +msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it." +msgstr "Funzionalità di composizione telefonica non disponibili perchè il servizio di Accesso Remoto (RAS) non è installato su questo computer. Si prega di installarlo." -#: ../src/generic/tipdlg.cpp:228 +#: ../src/generic/tipdlg.cpp:231 msgid "Did you know..." msgstr "Sapevate..." @@ -2386,15 +2543,20 @@ msgstr "Sapevate..." msgid "DirectFB error %d occured." msgstr "Errore DirectFB %d." -#: ../src/motif/filedlg.cpp:219 +#: ../src/motif/filedlg.cpp:218 msgid "Directories" msgstr "Cartelle" -#: ../src/common/filefn.cpp:1290 +#: ../src/common/filefn.cpp:1265 #, c-format msgid "Directory '%s' couldn't be created" msgstr "Impossibile creare la cartella '%s'" +#: ../src/common/filefn.cpp:1289 +#, c-format +msgid "Directory '%s' couldn't be deleted" +msgstr "La cartella '%s' non può essere eliminata" + #: ../src/mgl/dirmgl.cpp:211 #, c-format msgid "Directory '%s' doesn't exist!" @@ -2404,65 +2566,63 @@ msgstr "La cartella '%s' non esiste!" msgid "Directory does not exist" msgstr "Cartella non esistente" -#: ../src/generic/filectrlg.cpp:1405 +#: ../src/generic/filectrlg.cpp:1402 msgid "Directory doesn't exist." msgstr "Cartella non esistente." -#: ../src/html/helpwnd.cpp:498 -msgid "" -"Display all index items that contain given substring. Search is case " -"insensitive." -msgstr "" -"Visualizza tutte le voci dell'indice contenenti un dato testo. La ricerca " -"non distingue maiuscole e minuscole." +#: ../src/common/docview.cpp:407 +msgid "Discard changes and reload the last saved version?" +msgstr "Annullare le modifiche e ricaricare l'ultima versione salvata?" -#: ../src/html/helpwnd.cpp:695 +#: ../src/html/helpwnd.cpp:510 +msgid "Display all index items that contain given substring. Search is case insensitive." +msgstr "Visualizza tutte le voci dell'indice contenenti un dato testo. La ricerca non distingue maiuscole e minuscole." + +#: ../src/html/helpwnd.cpp:690 msgid "Display options dialog" msgstr "Mostra riquadro di dialogo per le opzioni" -#: ../src/html/helpwnd.cpp:325 +#: ../src/html/helpwnd.cpp:329 msgid "Displays help as you browse the books on the left." msgstr "Visualizza la guida mentre sfogli i manuali sulla sinistra." -#: ../src/msw/mimetype.cpp:699 +#: ../src/msw/mimetype.cpp:708 msgid "" -"Do you want to overwrite the command used to %s files with extension \"%s" -"\" ?\n" +"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n" "Current value is \n" "%s, \n" "New value is \n" "%s %1" msgstr "" -"Si desidera modificare il comando utilizzato per %s i file con estensione \"%" -"s\"?\n" -"Il valore corrente è \n" +"Si desidera modificare il comando utilizzato per %s i file con estensione \"%s\"?\n" +"Il valore corrente è \n" "%s, \n" -"Il nuovo valore è \n" +"Il nuovo valore è \n" "%s %1" -#: ../src/common/docview.cpp:481 +#: ../src/common/docview.cpp:483 #, c-format -msgid "Do you want to save changes to document %s?" -msgstr "Salvare le modifiche al documento %s?" +msgid "Do you want to save changes to %s?" +msgstr "Salvare le modifiche in %s?" #: ../src/generic/aboutdlgg.cpp:74 msgid "Documentation by " msgstr "Documentazione di" -#: ../src/generic/aboutdlgg.cpp:146 -#, fuzzy +#: ../src/generic/aboutdlgg.cpp:181 msgid "Documentation writers" -msgstr "Documentazione di" +msgstr "Autori documentazione" -#: ../src/common/sizer.cpp:2428 +#: ../src/common/sizer.cpp:2568 msgid "Don't Save" msgstr "Non salvare" -#: ../src/html/htmlwin.cpp:583 ../src/msw/frame.cpp:195 +#: ../src/msw/frame.cpp:195 +#: ../src/html/htmlwin.cpp:608 msgid "Done" msgstr "Finito" -#: ../src/generic/progdlgg.cpp:408 +#: ../src/generic/progdlgg.cpp:406 msgid "Done." msgstr "Finito." @@ -2476,8 +2636,9 @@ msgid "Doubly used id : %d" msgstr "Doppio utilizzo di id : %d" #: ../src/generic/fdrepdlg.cpp:153 +#: ../src/propgrid/props.cpp:2170 msgid "Down" -msgstr "Giù" +msgstr "Giù" #: ../src/common/paper.cpp:102 msgid "E sheet, 34 x 44 in" @@ -2485,47 +2646,49 @@ msgstr "Foglio E, 34 x 44 pollici" #: ../src/common/accelcmn.cpp:60 msgid "END" -msgstr "" +msgstr "FINE" #: ../src/common/accelcmn.cpp:51 msgid "ENTER" -msgstr "" +msgstr "INVIO" + +#: ../src/unix/fswatcher_inotify.cpp:336 +msgid "EOF while reading from inotify descriptor" +msgstr "Fine file durante lettura da descrittore inotify" #: ../src/common/accelcmn.cpp:63 msgid "ESC" -msgstr "" +msgstr "ESC" #: ../src/common/accelcmn.cpp:64 msgid "ESCAPE" -msgstr "" +msgstr "ESCAPE" #: ../src/common/accelcmn.cpp:72 msgid "EXECUTE" -msgstr "" +msgstr "ESEGUI" -#: ../src/generic/editlbox.cpp:272 +#: ../src/generic/editlbox.cpp:273 msgid "Edit item" msgstr "Modifica elemento" -#: ../src/generic/progdlgg.cpp:198 -#, fuzzy +#: ../src/generic/progdlgg.cpp:195 msgid "Elapsed time:" -msgstr "Tempo trascorso : " +msgstr "Tempo trascorso: " #: ../src/richtext/richtextstyledlg.cpp:568 msgid "Enter a character style name" msgstr "Immetti il nome dello stile di carattere" -#: ../src/richtext/richtextstyledlg.cpp:770 +#: ../src/richtext/richtextstyledlg.cpp:771 msgid "Enter a list style name" msgstr "Immetti il nome dello stile di lista" -#: ../src/richtext/richtextstyledlg.cpp:843 -#, fuzzy +#: ../src/richtext/richtextstyledlg.cpp:844 msgid "Enter a new style name" -msgstr "Immetti il nome dello stile di lista" +msgstr "Inserisci il nome di un nuovo stile" -#: ../src/common/prntbase.cpp:1086 +#: ../src/common/prntbase.cpp:1107 #, c-format msgid "Enter a page number between %d and %d:" msgstr "Immettere un numero di pagina compreso tra %d e %d:" @@ -2534,7 +2697,7 @@ msgstr "Immettere un numero di pagina compreso tra %d e %d:" msgid "Enter a paragraph style name" msgstr "Immetti il nome dello stile di paragrafo" -#: ../src/generic/dbgrptg.cpp:170 +#: ../src/generic/dbgrptg.cpp:171 #, c-format msgid "Enter command to open file \"%s\":" msgstr "Specificare il comando per aprire il file \"%s\":" @@ -2547,71 +2710,80 @@ msgstr "Trovati" msgid "Envelope Invite 220 x 220 mm" msgstr "Busta Invite 220 x 220 mm" -#: ../src/common/config.cpp:433 +#: ../src/common/config.cpp:474 #, c-format -msgid "" -"Environment variables expansion failed: missing '%c' at position %u in '%s'." -msgstr "" -"Espansione delle variabili di ambiente fallita: carattere '%c' non trovato " -"alla posizione %u in '%s'." +msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'." +msgstr "Espansione delle variabili di ambiente fallita: carattere '%c' non trovato alla posizione %u in '%s'." -#: ../src/gtk/filedlg.cpp:67 ../src/gtk1/fontdlg.cpp:75 -#: ../src/generic/filectrlg.cpp:676 ../src/generic/filectrlg.cpp:790 -#: ../src/generic/filectrlg.cpp:804 ../src/generic/filectrlg.cpp:820 -#: ../src/generic/filectrlg.cpp:1374 ../src/generic/filectrlg.cpp:1405 -#: ../src/generic/dirdlgg.cpp:353 ../src/generic/dirctrlg.cpp:703 -#: ../src/generic/dirctrlg.cpp:721 ../src/generic/dirctrlg.cpp:732 +#: ../src/generic/dirctrlg.cpp:721 +#: ../src/generic/dirctrlg.cpp:739 +#: ../src/generic/dirctrlg.cpp:750 +#: ../src/generic/dirdlgg.cpp:353 +#: ../src/generic/filectrlg.cpp:671 +#: ../src/generic/filectrlg.cpp:785 +#: ../src/generic/filectrlg.cpp:799 +#: ../src/generic/filectrlg.cpp:815 +#: ../src/generic/filectrlg.cpp:1371 +#: ../src/generic/filectrlg.cpp:1402 +#: ../src/gtk/filedlg.cpp:69 +#: ../src/gtk1/fontdlg.cpp:75 msgid "Error" msgstr "Errore" -#: ../src/unix/epolldispatcher.cpp:101 -#, fuzzy +#: ../src/unix/epolldispatcher.cpp:104 msgid "Error closing epoll descriptor" -msgstr "Errore nella creazione della cartella" +msgstr "Errore nella chiusura descrittore epoll" + +#: ../src/unix/fswatcher_kqueue.cpp:115 +msgid "Error closing kqueue instance" +msgstr "Errore chiusra istanza kqueue" #: ../src/generic/dirdlgg.cpp:252 msgid "Error creating directory" msgstr "Errore nella creazione della cartella" -#: ../src/common/imagbmp.cpp:953 +#: ../src/common/imagbmp.cpp:1030 msgid "Error in reading image DIB." msgstr "Errore durante la lettura dell'immagine DIB." -#: ../src/common/fileconf.cpp:459 +#: ../src/propgrid/propgrid.cpp:6444 +#, c-format +msgid "Error in resource: %s" +msgstr "Errore nelal risorsa: %s" + +#: ../src/common/fileconf.cpp:454 msgid "Error reading config options." msgstr "Errore durante la lettura del file di configurazione." -#: ../src/common/fileconf.cpp:1058 +#: ../src/common/fileconf.cpp:1065 msgid "Error saving user configuration data." msgstr "Errore durante il salvataggio del file di configurazione." -#: ../src/gtk/print.cpp:677 -#, fuzzy +#: ../src/gtk/print.cpp:652 msgid "Error while printing: " -msgstr "Errore durante l'attesa su di un semaforo" +msgstr "Errore durante la stampa:" -#: ../src/mac/carbon/mpthread.cpp:477 -msgid "Error while waiting on semaphore" -msgstr "Errore durante l'attesa su di un semaforo" - -#: ../src/common/log.cpp:709 +#: ../src/common/log.cpp:404 msgid "Error: " msgstr "Errore: " -#: ../src/common/fmapbase.cpp:110 +#: ../src/common/fmapbase.cpp:151 msgid "Esperanto (ISO-8859-3)" msgstr "Esperanto (ISO-8859-3)" -#: ../src/generic/progdlgg.cpp:206 -#, fuzzy +#: ../src/generic/progdlgg.cpp:202 msgid "Estimated time:" -msgstr "Tempo stimato : " +msgstr "Tempo stimato: " -#: ../src/generic/dbgrptg.cpp:230 +#: ../src/unix/fswatcher_inotify.cpp:416 +msgid "Event queue overflowed" +msgstr "Coda eveti satura" + +#: ../src/generic/dbgrptg.cpp:231 msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||" msgstr "File eseguibili (*.exe)|*.exe|Tutti i file (*.*)|*.*||" -#: ../src/msw/utilsexc.cpp:838 +#: ../src/msw/utilsexc.cpp:848 #, c-format msgid "Execution of command '%s' failed" msgstr "Esecuzione del comando '%s' fallita" @@ -2625,56 +2797,57 @@ msgstr "Esecuzione del comando '%s' fallita con errore: %ul" msgid "Executive, 7 1/4 x 10 1/2 in" msgstr "Executive, 7 1/4 x 10 1/2 pollici" -#: ../src/msw/registry.cpp:1159 +#: ../src/msw/registry.cpp:1171 #, c-format -msgid "" -"Exporting registry key: file \"%s\" already exists and won't be overwritten." -msgstr "" -"Durante l'esportazione dela chiave di registro: il file \"%s\" esiste e non " -"verrà sovrascritto." +msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten." +msgstr "Durante l'esportazione dela chiave di registro: il file \"%s\" esiste e non verrà sovrascritto." -#: ../src/common/fmapbase.cpp:152 +#: ../src/common/fmapbase.cpp:193 msgid "Extended Unix Codepage for Japanese (EUC-JP)" msgstr "Pagina codici Unix estesa per il Giapponese (EUC-JP)" -#: ../src/html/chm.cpp:710 +#: ../src/html/chm.cpp:724 #, c-format msgid "Extraction of '%s' into '%s' failed." msgstr "Estrazione di '%s' in '%s' fallita." -#: ../src/common/accelcmn.cpp:231 ../src/common/accelcmn.cpp:303 +#: ../src/common/accelcmn.cpp:231 +#: ../src/common/accelcmn.cpp:303 msgid "F" -msgstr "" +msgstr "F" + +#: ../src/propgrid/advprops.cpp:640 +msgid "Face Name" +msgstr "Nome faccia" #: ../src/unix/snglinst.cpp:270 msgid "Failed to access lock file." msgstr "Impossibile accedere al file di lock." -#: ../src/unix/epolldispatcher.cpp:114 -#, fuzzy, c-format -msgid "Failed to add descriptor %d to epoll descriptor %d" -msgstr "impossibile scrivere sul descrittore di file %d" - -#: ../src/common/glcmn.cpp:82 -#, fuzzy -msgid "Failed to allocate colour for OpenGL" -msgstr "Impossibile creare il cursore." - -#: ../src/msw/dib.cpp:567 +#: ../src/unix/epolldispatcher.cpp:117 #, c-format -msgid "Failed to allocated %luKb of memory for bitmap data." -msgstr "Impossibile riservare %luKb di memoria per i dati bitmap." +msgid "Failed to add descriptor %d to epoll descriptor %d" +msgstr "impossibile aggiungere descrittore %d al descrittore epoll %d" -#: ../src/unix/displayx11.cpp:234 +#: ../src/msw/dib.cpp:561 +#, c-format +msgid "Failed to allocate %luKb of memory for bitmap data." +msgstr "Impossibile allocare %luKb di memoria per i dati bitmap." + +#: ../src/common/glcmn.cpp:88 +msgid "Failed to allocate colour for OpenGL" +msgstr "Impossibile allocare colore per OpenGL." + +#: ../src/unix/displayx11.cpp:289 msgid "Failed to change video mode" -msgstr "Impossibile cambiare la modalità video" +msgstr "Impossibile cambiare la modalità video" #: ../src/common/debugrpt.cpp:243 #, c-format msgid "Failed to clean up debug report directory \"%s\"" msgstr "Impossibile svuotare la cartella \"%s\" delle segnalazioni di errore" -#: ../src/common/filename.cpp:196 +#: ../src/common/filename.cpp:223 msgid "Failed to close file handle" msgstr "Impossibile chiudere il file" @@ -2683,7 +2856,7 @@ msgstr "Impossibile chiudere il file" msgid "Failed to close lock file '%s'" msgstr "Impossibile chiudere il file di lock '%s'" -#: ../src/msw/clipbrd.cpp:113 +#: ../src/msw/clipbrd.cpp:115 msgid "Failed to close the clipboard." msgstr "Impossibile chiudere gli appunti." @@ -2692,42 +2865,39 @@ msgstr "Impossibile chiudere gli appunti." msgid "Failed to close the display \"%s\"" msgstr "Impossibile chiudere il display \"%s\"." -#: ../src/gtk/utilsgtk.cpp:293 -#, fuzzy, c-format -msgid "Failed to connect to session manager: %s" -msgstr "Impossibile %s la connessione: %s" - -#: ../src/msw/dialup.cpp:825 +#: ../src/msw/dialup.cpp:826 msgid "Failed to connect: missing username/password." msgstr "Connessione impossibile: mancano nome utente/password." -#: ../src/msw/dialup.cpp:771 +#: ../src/msw/dialup.cpp:772 msgid "Failed to connect: no ISP to dial." msgstr "Connessione impossibile: numero dell'ISP mancante." -#: ../src/common/textfile.cpp:177 -#, fuzzy, c-format +#: ../src/common/textfile.cpp:201 +#, c-format msgid "Failed to convert file \"%s\" to Unicode." -msgstr "Impossibile convertire in Unicode il contenuto del file." +msgstr "Impossibile convertire il file \"%s\" in Unicode." -#: ../src/msw/registry.cpp:637 +#: ../src/generic/logg.cpp:977 +msgid "Failed to copy dialog contents to the clipboard." +msgstr "Impossibile copiare contenuto finestra di dialogo negli Appunti." + +#: ../src/msw/registry.cpp:649 #, c-format msgid "Failed to copy registry value '%s'" msgstr "Impossibile copiare il valore '%s' del registro di sistema" -#: ../src/msw/registry.cpp:646 +#: ../src/msw/registry.cpp:658 #, c-format msgid "Failed to copy the contents of registry key '%s' to '%s'." -msgstr "" -"Impossibile copiare il contenuto della chiave '%s' del registro di sistema " -"in '%s'." +msgstr "Impossibile copiare il contenuto della chiave '%s' del registro di sistema in '%s'." -#: ../src/common/filefn.cpp:1095 +#: ../src/common/filefn.cpp:1067 #, c-format msgid "Failed to copy the file '%s' to '%s'" msgstr "Impossibile copiare copiare il file '%s' in '%s'" -#: ../src/msw/registry.cpp:624 +#: ../src/msw/registry.cpp:636 #, c-format msgid "Failed to copy the registry subkey '%s' to '%s'." msgstr "Impossibile copiare la chiave '%s' del registro di sistema in '%s'." @@ -2736,19 +2906,19 @@ msgstr "Impossibile copiare la chiave '%s' del registro di sistema in '%s'." msgid "Failed to create DDE string" msgstr "Impossibile creare la stringa DDE" -#: ../src/msw/mdi.cpp:470 +#: ../src/msw/mdi.cpp:570 msgid "Failed to create MDI parent frame." msgstr "Impossibile creare la finestra MDI madre." -#: ../src/msw/statusbar.cpp:115 +#: ../src/msw/statusbar.cpp:144 msgid "Failed to create a status bar." msgstr "Impossibile creare la barra di stato." -#: ../src/common/filename.cpp:859 +#: ../src/common/filename.cpp:988 msgid "Failed to create a temporary file name" msgstr "Impossibile creare il nome per il file temporaneo" -#: ../src/msw/utilsexc.cpp:272 +#: ../src/msw/utilsexc.cpp:273 msgid "Failed to create an anonymous pipe" msgstr "Impossibile creare una pipe anonima." @@ -2775,12 +2945,11 @@ msgstr "" "Impossibile creare la cartella '%s'\n" "(Si dispone dei permessi necessari?)" -#: ../src/unix/epolldispatcher.cpp:82 -#, fuzzy +#: ../src/unix/epolldispatcher.cpp:85 msgid "Failed to create epoll descriptor" -msgstr "Impossibile creare il cursore." +msgstr "Impossibile creare descrittore epoll." -#: ../src/msw/mimetype.cpp:190 +#: ../src/msw/mimetype.cpp:199 #, c-format msgid "Failed to create registry entry for '%s' files." msgstr "Impossibile creare la voce del registro di sistema per i file '%s'." @@ -2788,90 +2957,86 @@ msgstr "Impossibile creare la voce del registro di sistema per i file '%s'." #: ../src/msw/fdrepdlg.cpp:443 #, c-format msgid "Failed to create the standard find/replace dialog (error code %d)" -msgstr "" -"Impossibile creare riquadro di ricerca/sostituzione standard (codice di " -"errore %d)" +msgstr "Impossibile creare riquadro di ricerca/sostituzione standard (codice di errore %d)" -#: ../src/unix/evtloopunix.cpp:52 -#, fuzzy +#: ../src/unix/evtloopunix.cpp:87 msgid "Failed to create wake up pipe used by event loop." -msgstr "Impossibile creare la barra di stato." +msgstr "Impossibile creare coda risveglio usato da un loop evento." -#: ../src/html/winpars.cpp:704 +#: ../src/html/winpars.cpp:738 #, c-format msgid "Failed to display HTML document in %s encoding" msgstr "Impossibile mostrare la pagina HTML con la codifica %s" -#: ../src/msw/clipbrd.cpp:125 +#: ../src/msw/clipbrd.cpp:127 msgid "Failed to empty the clipboard." msgstr "Impossibile eliminare il contenuto degli appunti." -#: ../src/unix/displayx11.cpp:211 +#: ../src/unix/displayx11.cpp:266 msgid "Failed to enumerate video modes" -msgstr "Impossibile enumerare le modalità video" +msgstr "Impossibile enumerare le modalità video" #: ../src/msw/dde.cpp:725 msgid "Failed to establish an advise loop with DDE server" msgstr "Impossibile stabilire un ciclo advise con il server DDE" -#: ../src/msw/dialup.cpp:657 ../src/msw/dialup.cpp:889 +#: ../src/msw/dialup.cpp:658 +#: ../src/msw/dialup.cpp:893 #, c-format msgid "Failed to establish dialup connection: %s" msgstr "Impossibile connettersi: %s" -#: ../src/unix/utilsunx.cpp:549 ../src/unix/utilsunx.cpp:563 +#: ../src/unix/utilsunx.cpp:506 +#: ../src/unix/utilsunx.cpp:520 #, c-format msgid "Failed to execute '%s'\n" msgstr "Impossibile eseguire '%s'\n" -#: ../src/common/debugrpt.cpp:672 +#: ../src/common/debugrpt.cpp:698 msgid "Failed to execute curl, please install it in PATH." msgstr "Impossibile eseguire 'curl', si prega di installarlo nel PATH." -#: ../src/common/regex.cpp:433 ../src/common/regex.cpp:481 +#: ../src/common/regex.cpp:435 +#: ../src/common/regex.cpp:483 #, c-format msgid "Failed to find match for regular expression: %s" -msgstr "" -"Impossibile trovare una corrispondenza per l'espressione regolare (regular " -"expression): %s" +msgstr "Impossibile trovare una corrispondenza per l'espressione regolare (regular expression): %s" -#: ../src/msw/dialup.cpp:723 +#: ../src/msw/dialup.cpp:724 #, c-format msgid "Failed to get ISP names: %s" msgstr "Impossibile ottenere i nomi degli ISP: %s" -#: ../src/msw/clipbrd.cpp:743 +#: ../src/msw/clipbrd.cpp:745 msgid "Failed to get data from the clipboard" msgstr "Impossibile ottenere i dati dagli appunti" -#: ../src/common/stopwatch.cpp:219 +#: ../src/common/stopwatch.cpp:210 msgid "Failed to get the local system time" msgstr "Impossibile ottenere l'ora locale di sistema" -#: ../src/common/filefn.cpp:1544 +#: ../src/common/filefn.cpp:1482 msgid "Failed to get the working directory" msgstr "Impossibile determinare la cartella di lavoro" #: ../src/univ/theme.cpp:114 msgid "Failed to initialize GUI: no built-in themes found." -msgstr "" -"Impossibile inizializzare l'interfaccia grafica (GUI): temi predefiniti non " -"trovati." +msgstr "Impossibile inizializzare l'interfaccia grafica (GUI): temi predefiniti non trovati." #: ../src/msw/helpchm.cpp:64 msgid "Failed to initialize MS HTML Help." msgstr "Impossibile inizializzare MS HTML Help" -#: ../src/msw/glcanvas.cpp:662 +#: ../src/msw/glcanvas.cpp:882 msgid "Failed to initialize OpenGL" msgstr "Impossibile inizializzare OpenGL" -#: ../src/msw/dialup.cpp:886 -#, fuzzy, c-format +#: ../src/msw/dialup.cpp:888 +#, c-format msgid "Failed to initiate dialup connection: %s" -msgstr "Impossibile terminare la connessione: %s" +msgstr "Impossibile inizializzare connessione dialup: %s" -#: ../src/gtk/textctrl.cpp:1027 +#: ../src/gtk/textctrl.cpp:1072 msgid "Failed to insert text in the control." msgstr "Impossibile inserire il testo nella casella di testo." @@ -2880,96 +3045,116 @@ msgstr "Impossibile inserire il testo nella casella di testo." msgid "Failed to inspect the lock file '%s'" msgstr "Impossibile leggere il file di lock '%s'" -#: ../src/unix/appunix.cpp:89 -#, fuzzy +#: ../src/unix/appunix.cpp:90 msgid "Failed to install signal handler" -msgstr "Impossibile chiudere il file" +msgstr "Impossibile installare gestore segnale" -#: ../src/unix/threadpsx.cpp:979 -msgid "" -"Failed to join a thread, potential memory leak detected - please restart the " -"program" -msgstr "" -"Impossibile esegure la join su di un thread, possibile memoria persa (leak) " -"- per favore lanciare nuovamente il programma" +#: ../src/unix/threadpsx.cpp:1001 +msgid "Failed to join a thread, potential memory leak detected - please restart the program" +msgstr "Impossibile esegure la join su di un thread, possibile memoria persa (leak) - per favore lanciare nuovamente il programma" -#: ../src/msw/utils.cpp:735 +#: ../src/msw/utils.cpp:734 #, c-format msgid "Failed to kill process %d" msgstr "Impossibile terminare il processo %d" -#: ../src/common/iconbndl.cpp:127 +#: ../src/common/iconbndl.cpp:173 #, c-format -msgid "Failed to load image %d from file '%s'." -msgstr "Impossibile leggere l'immagine %d dal file '%s'." +msgid "Failed to load image %%d from file '%s'." +msgstr "Impossibile caricare immagine %%d dal file '%s'." -#: ../src/msw/enhmeta.cpp:97 +#: ../src/common/iconbndl.cpp:181 +#, c-format +msgid "Failed to load image %d from stream." +msgstr "Impossibile caricare immagine %d dallo stream." + +#: ../src/msw/enhmeta.cpp:98 #, c-format msgid "Failed to load metafile from file \"%s\"." msgstr "Impossibile leggere il metafile dal file '%s'." -#: ../src/msw/volume.cpp:324 +#: ../src/msw/volume.cpp:328 msgid "Failed to load mpr.dll." msgstr "Impossibile caricare mpr.dll." +#: ../src/msw/utils.cpp:1102 +#, c-format +msgid "Failed to load resource \"%s\"." +msgstr "Impossibile caricare risorsa \"%s\"." + #: ../src/common/dynlib.cpp:105 #, c-format msgid "Failed to load shared library '%s'" msgstr "Impossibile caricare la libreria dinamica '%s'" +#: ../src/msw/utils.cpp:1109 +#, c-format +msgid "Failed to lock resource \"%s\"." +msgstr "Impossibile bloccare risorsa \"%s\"." + #: ../src/unix/snglinst.cpp:199 #, c-format msgid "Failed to lock the lock file '%s'" msgstr "Impossibile bloccare il file di lock '%s'" -#: ../src/unix/epolldispatcher.cpp:134 +#: ../src/unix/epolldispatcher.cpp:137 #, c-format msgid "Failed to modify descriptor %d in epoll descriptor %d" -msgstr "" +msgstr "Impossibile modificare il descrittore %d nel descrittore epoll %d" -#: ../src/common/filename.cpp:2206 +#: ../src/common/filename.cpp:2510 #, c-format msgid "Failed to modify file times for '%s'" msgstr "Impossibile modificare le date del file '%s'" -#: ../src/common/selectdispatcher.cpp:234 +#: ../src/common/selectdispatcher.cpp:253 msgid "Failed to monitor I/O channels" -msgstr "" +msgstr "Impossibile monitorare canali I/O" -#: ../src/common/filename.cpp:182 -#, fuzzy, c-format +#: ../src/common/filename.cpp:206 +#, c-format msgid "Failed to open '%s' for reading" -msgstr "Impossibile aprire '%s' in %s" +msgstr "Impossibile aprire '%s' in lettura" -#: ../src/common/filename.cpp:185 -#, fuzzy, c-format +#: ../src/common/filename.cpp:211 +#, c-format msgid "Failed to open '%s' for writing" -msgstr "Impossibile aprire '%s' in %s" +msgstr "Impossibile aprire '%s' in scrittura" #: ../src/html/chm.cpp:142 #, c-format msgid "Failed to open CHM archive '%s'." msgstr "Impossibile aprire l'archivio CHM '%s'." -#: ../src/common/utilscmn.cpp:1150 -#, fuzzy, c-format +#: ../src/common/utilscmn.cpp:1071 +#, c-format msgid "Failed to open URL \"%s\" in default browser." -msgstr "Impossibile aprire '%s' in %s" +msgstr "Impossibile aprire URL '%s' nel browser predefinito." + +#: ../include/wx/msw/private/fswatcher.h:93 +#, c-format +msgid "Failed to open directory \"%s\" for monitoring." +msgstr "Impossibile aprire cartella \"%s\" per il monitoraggio." #: ../src/x11/utils.cpp:226 #, c-format msgid "Failed to open display \"%s\"." msgstr "Impossibile aprire il display \"%s\"." -#: ../src/common/filename.cpp:894 +#: ../src/common/filename.cpp:1023 msgid "Failed to open temporary file." msgstr "Impossibile aprire un file temporaneo." -#: ../src/msw/clipbrd.cpp:93 +#: ../src/msw/clipbrd.cpp:94 msgid "Failed to open the clipboard." msgstr "Impossibile aprire gli appunti." -#: ../src/msw/clipbrd.cpp:643 +#: ../src/common/translation.cpp:1008 +#, c-format +msgid "Failed to parse Plural-Forms: '%s'" +msgstr "Impossibile lanalizzare forme plurali: '%s'" + +#: ../src/msw/clipbrd.cpp:645 msgid "Failed to put data on the clipboard" msgstr "Impossibile mettere dati negli appunti" @@ -2977,21 +3162,28 @@ msgstr "Impossibile mettere dati negli appunti" msgid "Failed to read PID from lock file." msgstr "Impossibile leggere il PID dal file di lock." -#: ../src/common/fileconf.cpp:470 -#, fuzzy +#: ../src/common/fileconf.cpp:465 msgid "Failed to read config options." -msgstr "Errore durante la lettura del file di configurazione." +msgstr "Impossibile leggere opzioni configurazione." -#: ../src/unix/evtloopunix.cpp:104 -#, fuzzy +#: ../src/common/docview.cpp:630 +#, c-format +msgid "Failed to read document from the file \"%s\"." +msgstr "Impossibile leggere il documento dal file \"%s\"." + +#: ../src/dfb/evtloop.cpp:99 +msgid "Failed to read event from DirectFB pipe" +msgstr "Impossibile leggere evento dalla coda DirectFB." + +#: ../src/unix/evtloopunix.cpp:139 msgid "Failed to read from wake-up pipe" -msgstr "Impossibile leggere il PID dal file di lock." +msgstr "Impossibile leggere dalla coda di risveglio." -#: ../src/unix/utilsunx.cpp:635 +#: ../src/unix/utilsunx.cpp:572 msgid "Failed to redirect child process input/output" msgstr "Impossibile redirigere l'input/output del processo figlio" -#: ../src/msw/utilsexc.cpp:724 +#: ../src/msw/utilsexc.cpp:734 msgid "Failed to redirect the child process IO" msgstr "Impossibile redirigere l'input/output del processo figlio" @@ -3000,10 +3192,6 @@ msgstr "Impossibile redirigere l'input/output del processo figlio" msgid "Failed to register DDE server '%s'" msgstr "Impossibile registrare il server DDE '%s'" -#: ../src/msw/glcanvas.cpp:270 -msgid "Failed to register OpenGL window class." -msgstr "Impossibile inizializzare la window class OpenGL." - #: ../src/common/fontmap.cpp:243 #, c-format msgid "Failed to remember the encoding for the charset '%s'." @@ -3024,44 +3212,44 @@ msgstr "Impossibile eliminare il file di lock '%s'" msgid "Failed to remove stale lock file '%s'." msgstr "Impossibile eliminare il file di lock obsoleto '%s'." -#: ../src/msw/registry.cpp:474 +#: ../src/msw/registry.cpp:486 #, c-format msgid "Failed to rename registry value '%s' to '%s'." msgstr "Impossibile rinominare il valore '%s' del registro di sistema in '%s'." -#: ../src/common/filefn.cpp:1208 +#: ../src/common/filefn.cpp:1180 #, c-format -msgid "" -"Failed to rename the file '%s' to '%s' because the destination file already " -"exists." -msgstr "" -"Impossibile rinominare il file '%s' in '%s' perchè la destinazione esiste " -"già." +msgid "Failed to rename the file '%s' to '%s' because the destination file already exists." +msgstr "Impossibile rinominare il file '%s' in '%s' perchè la destinazione esiste già." -#: ../src/msw/registry.cpp:579 +#: ../src/msw/registry.cpp:591 #, c-format msgid "Failed to rename the registry key '%s' to '%s'." msgstr "Impossibile rinominare la chiave '%s' del registro di sistema in '%s'." -#: ../src/msw/clipbrd.cpp:497 +#: ../src/msw/clipbrd.cpp:499 msgid "Failed to retrieve data from the clipboard." msgstr "Impossibile leggere dati dagli appunti." -#: ../src/common/filename.cpp:2300 +#: ../src/common/filename.cpp:2604 #, c-format msgid "Failed to retrieve file times for '%s'" msgstr "Impossibile ottenere le date del file '%s'" -#: ../src/msw/dialup.cpp:490 +#: ../src/msw/dialup.cpp:491 msgid "Failed to retrieve text of RAS error message" -msgstr "" -"Impossibile ottenere il testo del messaggio di errore di Accesso Remoto (RAS)" +msgstr "Impossibile ottenere il testo del messaggio di errore di Accesso Remoto (RAS)" -#: ../src/msw/clipbrd.cpp:780 +#: ../src/msw/clipbrd.cpp:782 msgid "Failed to retrieve the supported clipboard formats" msgstr "Impossibile ottenere i formati supportati dagli appunti" -#: ../src/msw/dib.cpp:345 +#: ../src/common/docview.cpp:601 +#, c-format +msgid "Failed to save document to the file \"%s\"." +msgstr "Impossibile salvare il dcoumento nel file \"%s\"." + +#: ../src/msw/dib.cpp:339 #, c-format msgid "Failed to save the bitmap image to file \"%s\"." msgstr "Impossibile salvare l'immagine bitmap nel file '%s'." @@ -3070,12 +3258,12 @@ msgstr "Impossibile salvare l'immagine bitmap nel file '%s'." msgid "Failed to send DDE advise notification" msgstr "Impossibile inviare una notifica advise DDE" -#: ../src/common/ftp.cpp:381 +#: ../src/common/ftp.cpp:404 #, c-format msgid "Failed to set FTP transfer mode to %s." -msgstr "Impossibile impostare la modalità di trasferimneto FTP %s.." +msgstr "Impossibile impostare la modalità di trasferimneto FTP %s.." -#: ../src/msw/clipbrd.cpp:373 +#: ../src/msw/clipbrd.cpp:375 msgid "Failed to set clipboard data." msgstr "Impossibile scrivere i dati degli appunti." @@ -3084,29 +3272,34 @@ msgstr "Impossibile scrivere i dati degli appunti." msgid "Failed to set permissions on lock file '%s'" msgstr "Impossibile impostare i permessi per il file di lock '%s'" -#: ../src/common/file.cpp:509 +#: ../src/common/file.cpp:532 msgid "Failed to set temporary file permissions" msgstr "Impossibile impostare i permessi del file temporaneo." -#: ../src/gtk/textctrl.cpp:969 +#: ../src/gtk/textctrl.cpp:1013 msgid "Failed to set text in the text control." msgstr "Impossibile impostare il testo nella casella di testo." -#: ../src/unix/threadpsx.cpp:1317 ../src/unix/threadpsx.cpp:1327 +#: ../src/unix/threadpsx.cpp:1322 +#: ../src/unix/threadpsx.cpp:1332 #, c-format msgid "Failed to set thread priority %d." -msgstr "Impossibile assegnare la priorità %d al thread." +msgstr "Impossibile assegnare la priorità %d al thread." -#: ../src/common/fs_mem.cpp:256 +#: ../src/common/fs_mem.cpp:266 #, c-format msgid "Failed to store image '%s' to memory VFS!" msgstr "Impossibile memorizzare l'immagine '%s' nella memoria VFS!" -#: ../src/unix/evtloopunix.cpp:61 -msgid "Failed to switch wake up pipe to non-blocking mode" -msgstr "" +#: ../src/dfb/evtloop.cpp:171 +msgid "Failed to switch DirectFB pipe to non-blocking mode" +msgstr "Impossibile commutare coda DirectFB in modalità non bloccante." -#: ../src/unix/threadpsx.cpp:1500 ../src/mac/carbon/mpthread.cpp:1268 +#: ../src/unix/evtloopunix.cpp:96 +msgid "Failed to switch wake up pipe to non-blocking mode" +msgstr "Impossibile commutare coda risevglio in modalità non bloccante." + +#: ../src/unix/threadpsx.cpp:1510 msgid "Failed to terminate a thread." msgstr "Impossibile terminare il thread." @@ -3114,12 +3307,12 @@ msgstr "Impossibile terminare il thread." msgid "Failed to terminate the advise loop with DDE server" msgstr "Impossibile terminare il ciclo advise con il server DDE" -#: ../src/msw/dialup.cpp:963 +#: ../src/msw/dialup.cpp:968 #, c-format msgid "Failed to terminate the dialup connection: %s" msgstr "Impossibile terminare la connessione: %s" -#: ../src/common/filename.cpp:2221 +#: ../src/common/filename.cpp:2525 #, c-format msgid "Failed to touch the file '%s'" msgstr "Impossibile eseguire 'touch' sul file '%s'" @@ -3134,16 +3327,16 @@ msgstr "Impossibile sbloccare il file di lock '%s'" msgid "Failed to unregister DDE server '%s'" msgstr "Impossibile cancellare la registrazione del server DDE '%s'" -#: ../src/unix/epolldispatcher.cpp:153 -#, fuzzy, c-format +#: ../src/unix/epolldispatcher.cpp:156 +#, c-format msgid "Failed to unregister descriptor %d from epoll descriptor %d" -msgstr "Impossibile leggere dati dagli appunti." +msgstr "Impossibile deregistrare descrittore %d dal descrittore epoll %d" -#: ../src/common/fileconf.cpp:1031 +#: ../src/common/fileconf.cpp:1038 msgid "Failed to update user configuration file." msgstr "impossibile aggiornare il file di configurazione utente." -#: ../src/common/debugrpt.cpp:685 +#: ../src/common/debugrpt.cpp:711 #, c-format msgid "Failed to upload the debug report (error code %d)." msgstr "Impossibile inviare la segnalazione di errore (codice di errore %d)." @@ -3153,29 +3346,39 @@ msgstr "Impossibile inviare la segnalazione di errore (codice di errore %d)." msgid "Failed to write to lock file '%s'" msgstr "Impossibile scrivere nel file di lock '%s'" -#: ../src/generic/logg.cpp:424 -msgid "Fatal error" -msgstr "Errore Fatale" +#: ../src/propgrid/propgrid.cpp:172 +msgid "False" +msgstr "Falso" -#: ../src/common/log.cpp:698 -msgid "Fatal error: " -msgstr "Errore fatale: " +#: ../src/propgrid/advprops.cpp:658 +msgid "Family" +msgstr "Famiglia" #: ../src/msw/wince/filedlgwce.cpp:119 msgid "File" msgstr "File" -#: ../src/mgl/bitmap.cpp:409 +#: ../src/common/docview.cpp:618 +#, c-format +msgid "File \"%s\" could not be opened for reading." +msgstr "Impossibile aprire il file \"%s\" per la lettura." + +#: ../src/common/docview.cpp:595 +#, c-format +msgid "File \"%s\" could not be opened for writing." +msgstr "Impossibile aprire il file \"%s\" per la scrittura." + +#: ../src/mgl/bitmap.cpp:439 #, c-format msgid "File %s does not exist." msgstr "Il file %s non esiste." -#: ../src/gtk/filedlg.cpp:52 +#: ../src/gtk/filedlg.cpp:53 #, c-format msgid "File '%s' already exists, do you really want to overwrite it?" msgstr "File '%s' esistente, si desidera sovrascriverlo?" -#: ../src/os2/filedlg.cpp:307 +#: ../src/os2/filedlg.cpp:308 #, c-format msgid "" "File '%s' already exists.\n" @@ -3184,36 +3387,47 @@ msgstr "" "File '%s' esistente,\n" "si desidera sostituirlo?" -#: ../src/common/textcmn.cpp:724 ../src/richtext/richtextctrl.cpp:1901 +#: ../src/richtext/richtextctrl.cpp:2137 +#: ../src/common/textcmn.cpp:775 msgid "File couldn't be loaded." msgstr "Impossibile caricare il file." -#: ../src/common/docview.cpp:587 ../src/common/docview.cpp:1641 +#: ../src/msw/filedlg.cpp:355 +#, c-format +msgid "File dialog failed with error code %0lx." +msgstr "Finestra dialogo file fallita con codice errore %0lx." + +#: ../src/common/docview.cpp:1647 msgid "File error" msgstr "Errore di file" -#: ../src/generic/filectrlg.cpp:804 ../src/generic/dirctrlg.cpp:721 +#: ../src/generic/dirctrlg.cpp:739 +#: ../src/generic/filectrlg.cpp:799 msgid "File name exists already." msgstr "Nome di file esistente." -#: ../src/motif/filedlg.cpp:220 +#: ../src/unix/fswatcher_inotify.cpp:414 +msgid "File system containing watched object was unmounted" +msgstr "Il file system contiene oggetti monitorati che sono stati smontati" + +#: ../src/motif/filedlg.cpp:219 msgid "Files" msgstr "File" -#: ../src/common/filefn.cpp:1835 +#: ../src/common/filefn.cpp:1775 #, c-format msgid "Files (%s)" msgstr "File (%s)" -#: ../src/motif/filedlg.cpp:218 +#: ../src/motif/filedlg.cpp:217 msgid "Filter" msgstr "Filtra" -#: ../src/html/helpwnd.cpp:486 +#: ../src/html/helpwnd.cpp:498 msgid "Find" msgstr "Trova" -#: ../src/html/helpwnd.cpp:1217 +#: ../src/html/helpwnd.cpp:1214 msgid "Fixed font:" msgstr "Carattere a corpo fisso:" @@ -3225,32 +3439,33 @@ msgstr "Larghezza fissa.
grassetto corsivo " msgid "Folio, 8 1/2 x 13 in" msgstr "Folio, 8 1/2 x 13 pollici" -#: ../src/richtext/richtextformatdlg.cpp:275 ../src/mac/carbon/fontdlg.cpp:449 +#: ../src/richtext/richtextformatdlg.cpp:275 +#: ../src/osx/carbon/fontdlg.cpp:461 msgid "Font" msgstr "Font" -#: ../src/richtext/richtextfontpage.cpp:187 +#: ../src/richtext/richtextfontpage.cpp:190 msgid "Font &weight:" msgstr "&Peso del font" -#: ../src/html/helpwnd.cpp:1218 +#: ../src/html/helpwnd.cpp:1215 msgid "Font size:" msgstr "Corpo:" -#: ../src/richtext/richtextfontpage.cpp:174 +#: ../src/richtext/richtextfontpage.cpp:177 msgid "Font st&yle:" msgstr "St&ile:" -#: ../src/mac/carbon/fontdlg.cpp:491 +#: ../src/osx/carbon/fontdlg.cpp:503 msgid "Font:" msgstr "Font:" -#: ../src/dfb/fontmgr.cpp:202 +#: ../src/dfb/fontmgr.cpp:199 #, c-format msgid "Fonts index file %s disappeared while loading fonts." -msgstr "" +msgstr "Il file indice font %s è sparito durante il caricamento delle font." -#: ../src/unix/utilsunx.cpp:582 +#: ../src/unix/utilsunx.cpp:539 msgid "Fork failed" msgstr "Fork fallita" @@ -3258,16 +3473,16 @@ msgstr "Fork fallita" msgid "Forward hrefs are not supported" msgstr "Forward hrefs non supportata" -#: ../src/html/htmlhelp.cpp:460 ../src/html/helpwnd.cpp:893 +#: ../src/html/helpwnd.cpp:888 #, c-format msgid "Found %i matches" msgstr "Trovate %i corrispondenze" -#: ../src/generic/prntdlgg.cpp:245 +#: ../src/generic/prntdlgg.cpp:244 msgid "From:" msgstr "Da:" -#: ../src/common/fmapbase.cpp:156 +#: ../src/common/fmapbase.cpp:197 msgid "GB-2312" msgstr "GB-2312" @@ -3307,27 +3522,20 @@ msgstr "German Legal Fanfold, 8 1/2 x 13 pollici" msgid "German Std Fanfold, 8 1/2 x 12 in" msgstr "German Std Fanfold, 8 1/2 x 12 pollici" -#: ../src/html/helpwnd.cpp:661 +#: ../src/html/helpwnd.cpp:671 msgid "Go back" msgstr "Indietro" -#: ../src/html/htmlhelp.cpp:541 -msgid "Go back to the previous HTML page" -msgstr "Ritorna alla pagina HTML precedente" - -#: ../src/html/helpwnd.cpp:664 +#: ../src/html/helpwnd.cpp:672 msgid "Go forward" msgstr "Avanti" -#: ../src/html/htmlhelp.cpp:543 -msgid "Go forward to the next HTML page" -msgstr "Avanza alla pagina HTML successiva" - -#: ../src/html/helpwnd.cpp:669 +#: ../src/html/helpwnd.cpp:674 msgid "Go one level up in document hierarchy" msgstr "Livello superiore nella gerarchia di documenti" -#: ../src/generic/dirdlgg.cpp:137 ../src/generic/filedlgg.cpp:225 +#: ../src/generic/filedlgg.cpp:225 +#: ../src/generic/dirdlgg.cpp:137 msgid "Go to home directory" msgstr "Vai alla Home directory" @@ -3335,7 +3543,7 @@ msgstr "Vai alla Home directory" msgid "Go to parent directory" msgstr "Cartella superiore" -#: ../src/common/prntbase.cpp:1091 +#: ../src/common/prntbase.cpp:1112 msgid "Goto Page" msgstr "Vai alla pagina" @@ -3343,62 +3551,55 @@ msgstr "Vai alla pagina" msgid "Graphics art by " msgstr "Grafica di" -#: ../src/common/fmapbase.cpp:114 +#: ../src/common/fmapbase.cpp:155 msgid "Greek (ISO-8859-7)" msgstr "Greco (ISO-8859-7)" -#: ../src/common/zstream.cpp:142 ../src/common/zstream.cpp:290 +#: ../src/common/zstream.cpp:142 +#: ../src/common/zstream.cpp:302 msgid "Gzip not supported by this version of zlib" -msgstr "Gzip non è supportato da questa versione della libreria zlib" +msgstr "Gzip non è supportato da questa versione della libreria zlib" #: ../src/common/accelcmn.cpp:74 msgid "HELP" -msgstr "" +msgstr "GUIDA" #: ../src/common/accelcmn.cpp:59 msgid "HOME" -msgstr "" +msgstr "HOME" -#: ../src/html/helpwnd.cpp:1552 +#: ../src/html/helpwnd.cpp:1556 msgid "HTML Help Project (*.hhp)|*.hhp|" msgstr "Progetto HTML Help (*.hhp)|*.hhp|" -#: ../src/html/htmlwin.cpp:630 +#: ../src/html/htmlwin.cpp:656 #, c-format msgid "HTML anchor %s does not exist." msgstr "Ancora HTML %s non esistente." -#: ../src/html/helpwnd.cpp:1550 +#: ../src/html/helpwnd.cpp:1554 msgid "HTML files (*.html;*.htm)|*.html;*.htm|" msgstr "File HTML (*.html;*.htm)|*.html;*.htm|" -#: ../src/html/htmprint.cpp:379 -#, fuzzy -msgid "" -"HTML pagination algorithm generated more than the allowed maximum number of " -"pages and it can't continue any longer!" -msgstr "" -"L'algoritmo di paginazione HTML ha generato un numero di pagine maggiore di " -"quello consentito e non è in grado di proseguire!" +#: ../src/html/htmprint.cpp:508 +msgid "HTML pagination algorithm generated more than the allowed maximum number of pages and it can't continue any longer!" +msgstr "L'algoritmo di paginazione HTML ha generato un numero di pagine maggiore di quello consentito e non è in grado di proseguire!" -#: ../src/common/fmapbase.cpp:115 +#: ../src/common/fmapbase.cpp:156 msgid "Hebrew (ISO-8859-8)" msgstr "Ebraico (ISO-8859-8)" -#: ../src/html/helpdlg.cpp:67 ../src/html/helpfrm.cpp:104 +#: ../src/html/helpdlg.cpp:67 +#: ../src/html/helpfrm.cpp:116 msgid "Help" msgstr "Aiuto" -#: ../src/html/htmlhelp.cpp:87 -#, c-format -msgid "Help : %s" -msgstr "Aiuto: %s" - -#: ../src/html/helpwnd.cpp:1211 +#: ../src/html/helpwnd.cpp:1208 msgid "Help Browser Options" msgstr "Opzioni del browser della Guida" -#: ../src/generic/helpext.cpp:460 ../src/generic/helpext.cpp:461 +#: ../src/generic/helpext.cpp:460 +#: ../src/generic/helpext.cpp:461 msgid "Help Index" msgstr "Indice" @@ -3406,11 +3607,11 @@ msgstr "Indice" msgid "Help Printing" msgstr "Stampa" -#: ../src/html/helpwnd.cpp:820 +#: ../src/html/helpwnd.cpp:815 msgid "Help Topics" msgstr "Contenuti" -#: ../src/html/helpwnd.cpp:1551 +#: ../src/html/helpwnd.cpp:1555 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|" msgstr "Help book (*.htb)|*.htb|Help books (*.zip)|*.zip|" @@ -3424,79 +3625,90 @@ msgstr "Cartella \"%s\" della guida non trovata." msgid "Help file \"%s\" not found." msgstr "File della guida \"%s\" non trovato." -#: ../src/html/helpctrl.cpp:51 +#: ../src/html/helpctrl.cpp:53 #, c-format msgid "Help: %s" msgstr "Aiuto: %s" +#: ../src/generic/infobar.cpp:139 +msgid "Hide this notification message." +msgstr "Nascondi questo messaggio di notifica." + #: ../src/generic/dirdlgg.cpp:99 msgid "Home" msgstr "Home" -#: ../src/generic/dirctrlg.cpp:658 +#: ../src/generic/dirctrlg.cpp:675 msgid "Home directory" msgstr "Cartella home" -#: ../include/wx/filefn.h:146 +#: ../include/wx/filefn.h:191 msgid "I64" msgstr "I64" -#: ../src/common/imagbmp.cpp:966 +#: ../src/common/imagbmp.cpp:1045 msgid "ICO: Error in reading mask DIB." msgstr "ICO: Errore durante la lettura della maschera DIB." -#: ../src/common/imagbmp.cpp:1076 ../src/common/imagbmp.cpp:1135 -#: ../src/common/imagbmp.cpp:1144 ../src/common/imagbmp.cpp:1155 -#: ../src/common/imagbmp.cpp:1199 ../src/common/imagbmp.cpp:1209 -#: ../src/common/imagbmp.cpp:1218 +#: ../src/common/imagbmp.cpp:1161 +#: ../src/common/imagbmp.cpp:1222 +#: ../src/common/imagbmp.cpp:1233 +#: ../src/common/imagbmp.cpp:1246 +#: ../src/common/imagbmp.cpp:1292 +#: ../src/common/imagbmp.cpp:1304 +#: ../src/common/imagbmp.cpp:1315 msgid "ICO: Error writing the image file!" msgstr "ICO: Errore durante la scrittura dell'immagine." -#: ../src/common/imagbmp.cpp:1044 +#: ../src/common/imagbmp.cpp:1125 msgid "ICO: Image too tall for an icon." msgstr "ICO: Immagine troppo alta per essere un'icona." -#: ../src/common/imagbmp.cpp:1050 +#: ../src/common/imagbmp.cpp:1133 msgid "ICO: Image too wide for an icon." msgstr "ICO: Immagine troppo larga per essere un'icona." -#: ../src/common/imagbmp.cpp:1283 +#: ../src/common/imagbmp.cpp:1385 msgid "ICO: Invalid icon index." msgstr "ICO: Indice dell'icona non valido." -#: ../src/common/imagiff.cpp:758 +#: ../src/common/imagiff.cpp:766 msgid "IFF: data stream seems to be truncated." msgstr "IFF: il flusso dati dembra essere interrotto." -#: ../src/common/imagiff.cpp:742 +#: ../src/common/imagiff.cpp:750 msgid "IFF: error in IFF image format." msgstr "IFF: errore nel formato IFF dell'immagine." -#: ../src/common/imagiff.cpp:745 +#: ../src/common/imagiff.cpp:753 msgid "IFF: not enough memory." msgstr "IFF: memoria insufficiente." -#: ../src/common/imagiff.cpp:748 +#: ../src/common/imagiff.cpp:756 msgid "IFF: unknown error!!!" msgstr "IFF: errore sconosciuto!!!" #: ../src/common/accelcmn.cpp:49 msgid "INS" -msgstr "" +msgstr "INS" #: ../src/common/accelcmn.cpp:50 msgid "INSERT" -msgstr "" +msgstr "INSERISCI" -#: ../src/common/fmapbase.cpp:157 +#: ../src/common/fmapbase.cpp:198 msgid "ISO-2022-JP" -msgstr "" +msgstr "ISO-2022-JP" -#: ../src/mac/carbon/dataview.cpp:609 +#: ../src/osx/carbon/dataview.cpp:2377 msgid "Icon & text renderer cannot render value; value type: " -msgstr "" +msgstr "Rendirizzatore icona e testo non può rendirizzare valore; tipo valore:" -#: ../src/generic/dbgrptg.cpp:354 +#: ../src/html/htmprint.cpp:283 +msgid "If possible, try changing the layout parameters to make the printout more narrow." +msgstr "Se possibile prova a modificare i parametri del layout per rendere la stampa più stretta." + +#: ../src/generic/dbgrptg.cpp:355 msgid "" "If you have any additional information pertaining to this bug\n" "report, please enter it here and it will be joined to it:" @@ -3504,77 +3716,78 @@ msgstr "" "Se si dispone di ulteriori informazioni relativamente a questo errore,\n" "si prega di digitarle e verranno allegate:" -#: ../src/generic/dbgrptg.cpp:320 +#: ../src/generic/dbgrptg.cpp:321 msgid "" -"If you wish to suppress this debug report completely, please choose the " -"\"Cancel\" button,\n" +"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n" "but be warned that it may hinder improving the program, so if\n" "at all possible please do continue with the report generation.\n" msgstr "" -"Se non si desidera inviare una segnalazione di errore, scegliere il pulsante " -"\"Annulla\",\n" +"Se non si desidera inviare una segnalazione di errore, scegliere il pulsante \"Annulla\",\n" "anche se questo potrebbe ostacolare il miglioramento del programma. Si\n" "invita pertanto a continuare con la generazione della segnalazione.\n" -#: ../src/msw/registry.cpp:1324 +#: ../src/msw/registry.cpp:1336 #, c-format msgid "Ignoring value \"%s\" of the key \"%s\"." -msgstr "Il valore \"%s\" della chiave \"%s\" è stato ignorato." +msgstr "Il valore \"%s\" della chiave \"%s\" è stato ignorato." #: ../src/common/xtistrm.cpp:256 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source" msgstr "Object Class (Non-wxEvtHandler) come Event Source non consentito" -#: ../src/generic/filectrlg.cpp:790 ../src/generic/dirctrlg.cpp:703 +#: ../src/generic/dirctrlg.cpp:721 +#: ../src/generic/filectrlg.cpp:785 msgid "Illegal directory name." msgstr "Nome di cartella non valido." -#: ../src/generic/filectrlg.cpp:1373 +#: ../src/generic/filectrlg.cpp:1370 msgid "Illegal file specification." msgstr "Specifica di file non valida." -#: ../src/common/image.cpp:1841 +#: ../src/common/image.cpp:1979 msgid "Image and mask have different sizes." msgstr "L'immagine e la maschera hanno dimensioni diverse" -#: ../src/common/image.cpp:2195 ../src/common/image.cpp:2240 +#: ../src/common/image.cpp:2340 +#: ../src/common/image.cpp:2414 #, c-format msgid "Image file is not of type %ld." -msgstr "Il file immagine non è di tipo %ld." +msgstr "Il file immagine non è di tipo %ld." -#: ../src/common/image.cpp:2264 +#: ../src/common/image.cpp:2437 #, c-format msgid "Image file is not of type %s." -msgstr "Il file immagine non è di tipo %s." +msgstr "Il file immagine non è di tipo %s." -#: ../src/msw/textctrl.cpp:464 -msgid "" -"Impossible to create a rich edit control, using simple text control instead. " -"Please reinstall riched32.dll" -msgstr "" -"Impossibile creare un controllo rich edit, impiegato un controllo di tipo " -"testo semplice. Per favore reinstallare riched32.dll" +#: ../src/msw/textctrl.cpp:466 +msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll" +msgstr "Impossibile creare un controllo rich edit, impiegato un controllo di tipo testo semplice. Per favore reinstallare riched32.dll" -#: ../src/unix/utilsunx.cpp:314 +#: ../src/unix/utilsunx.cpp:322 msgid "Impossible to get child process input" msgstr "Impossibile ottenere l'input del processo figlio" -#: ../src/common/filefn.cpp:1114 +#: ../src/common/filefn.cpp:1086 #, c-format msgid "Impossible to get permissions for file '%s'" msgstr "Impossibile determinare i permessi per il file '%s'" -#: ../src/common/filefn.cpp:1128 +#: ../src/common/filefn.cpp:1100 #, c-format msgid "Impossible to overwrite the file '%s'" msgstr "impossibile sovrascrivere il file '%s'" -#: ../src/common/filefn.cpp:1182 +#: ../src/common/filefn.cpp:1154 #, c-format msgid "Impossible to set permissions for the file '%s'" msgstr "Impossibile impostare i permessi per il file '%s'" -#: ../src/common/stockitem.cpp:130 +#: ../src/common/gifdecod.cpp:776 +#, c-format +msgid "Incorrect GIF frame size (%u, %d) for the frame #%u" +msgstr "Dimensione frame GTK non valida (%u, %d) per il frame #%u" + +#: ../src/common/stockitem.cpp:154 msgid "Indent" msgstr "Indenta" @@ -3582,31 +3795,32 @@ msgstr "Indenta" msgid "Indents && Spacing" msgstr "Rientri e spaziatura" -#: ../src/html/htmlhelp.cpp:578 ../src/html/helpwnd.cpp:511 +#: ../src/html/helpwnd.cpp:523 msgid "Index" msgstr "Indice" -#: ../src/common/fmapbase.cpp:119 +#: ../src/common/fmapbase.cpp:160 msgid "Indian (ISO-8859-12)" msgstr "Indiano (ISO-8859-12)" -#: ../src/common/init.cpp:248 +#: ../src/common/init.cpp:262 msgid "Initialization failed in post init, aborting." msgstr "Inizializzazione fallita in \"post init\", esco." -#: ../src/richtext/richtextsymboldlg.cpp:470 +#: ../src/richtext/richtextsymboldlg.cpp:471 msgid "Insert" msgstr "Inserisci" -#: ../src/richtext/richtextbuffer.cpp:5244 -#: ../src/richtext/richtextbuffer.cpp:6024 +#: ../src/richtext/richtextbuffer.cpp:5428 +#: ../src/richtext/richtextbuffer.cpp:6218 msgid "Insert Image" msgstr "Inserisci un'immagine" -#: ../src/richtext/richtextbuffer.cpp:5105 -#: ../src/richtext/richtextbuffer.cpp:5139 -#: ../src/richtext/richtextbuffer.cpp:5177 -#: ../src/richtext/richtextctrl.cpp:600 ../src/richtext/richtextctrl.cpp:867 +#: ../src/richtext/richtextctrl.cpp:857 +#: ../src/richtext/richtextctrl.cpp:1051 +#: ../src/richtext/richtextbuffer.cpp:5274 +#: ../src/richtext/richtextbuffer.cpp:5317 +#: ../src/richtext/richtextbuffer.cpp:5355 msgid "Insert Text" msgstr "Inserisci del testo" @@ -3614,31 +3828,26 @@ msgstr "Inserisci del testo" msgid "Internal error, illegal wxCustomTypeInfo" msgstr "Errore interno, wxCustomTypeInfo non consentito" -#: ../src/gtk/app.cpp:484 +#: ../src/gtk/app.cpp:411 #, c-format msgid "Invalid GTK+ command line option, use \"%s --help\"" -msgstr "" +msgstr "Opzione non valida linea di comando GTK, usare \"%s --help\"" -#: ../src/common/imagtiff.cpp:280 +#: ../src/common/imagtiff.cpp:284 msgid "Invalid TIFF image index." msgstr "Indice dell'immagine TIFF non valido." -#: ../src/xrc/xmlres.cpp:511 -#, c-format -msgid "Invalid XRC resource '%s': doesn't have root node 'resource'." -msgstr "" -"Risorsa XRC '%s' non valida: il nodo radice deve essere di tipo 'resource'." - -#: ../src/mac/carbon/databrow.cpp:1112 +#: ../src/osx/carbon/dataview.cpp:1743 +#: ../src/osx/carbon/dataview.cpp:1835 msgid "Invalid data view item" -msgstr "" +msgstr "Dati elemento visualizzazione non validi" -#: ../src/common/appcmn.cpp:254 +#: ../src/common/appcmn.cpp:247 #, c-format msgid "Invalid display mode specification '%s'." -msgstr "Specifica della modalità video '%s' non valida." +msgstr "Specifica della modalità video '%s' non valida." -#: ../src/x11/app.cpp:124 +#: ../src/x11/app.cpp:122 #, c-format msgid "Invalid geometry specification '%s'" msgstr "Specifica della posizione e/o dimensioni '%s' non valida." @@ -3648,7 +3857,12 @@ msgstr "Specifica della posizione e/o dimensioni '%s' non valida." msgid "Invalid lock file '%s'." msgstr "File di blocco '%s' non valido." -#: ../src/common/xtistrm.cpp:361 ../src/common/xtistrm.cpp:376 +#: ../src/common/translation.cpp:949 +msgid "Invalid message catalog." +msgstr "Messaggio catalogo non valido." + +#: ../src/common/xtistrm.cpp:361 +#: ../src/common/xtistrm.cpp:376 msgid "Invalid or Null Object ID passed to GetObjectClassInfo" msgstr "ID Oggetto Invalid o Null passato a GetObjectClassInfo" @@ -3656,15 +3870,20 @@ msgstr "ID Oggetto Invalid o Null passato a GetObjectClassInfo" msgid "Invalid or Null Object ID passed to HasObjectClassInfo" msgstr "ID Oggetto Invalid o Null passato a HasObjectClassInfo" -#: ../src/common/regex.cpp:312 +#: ../src/common/regex.cpp:314 #, c-format msgid "Invalid regular expression '%s': %s" msgstr "Espressione regolare ( regular expression ) '%s' non valida: %s" -#: ../src/richtext/richtextfontpage.cpp:266 -#: ../src/richtext/richtextfontpage.cpp:318 -#: ../src/richtext/richtextfontpage.cpp:566 ../src/generic/fontdlgg.cpp:331 -#: ../src/mac/carbon/fontdlg.cpp:523 +#: ../src/common/docview.cpp:1944 +msgid "It has been removed from the most recently used files list." +msgstr "E' stato rimosso dall'elenco file usati recentemente." + +#: ../src/generic/fontdlgg.cpp:331 +#: ../src/richtext/richtextfontpage.cpp:283 +#: ../src/richtext/richtextfontpage.cpp:335 +#: ../src/richtext/richtextfontpage.cpp:600 +#: ../src/osx/carbon/fontdlg.cpp:535 msgid "Italic" msgstr "Corsivo" @@ -3672,11 +3891,11 @@ msgstr "Corsivo" msgid "Italy Envelope, 110 x 230 mm" msgstr "Busta Italiana, 110 x 230 mm" -#: ../src/common/imagjpeg.cpp:251 +#: ../src/common/imagjpeg.cpp:255 msgid "JPEG: Couldn't load - file is probably corrupted." -msgstr "JPEG: Caricamento impossibile - probabilmente il file è danneggiato." +msgstr "JPEG: Caricamento impossibile - probabilmente il file è danneggiato." -#: ../src/common/imagjpeg.cpp:410 +#: ../src/common/imagjpeg.cpp:427 msgid "JPEG: Couldn't save image." msgstr "JPEG: Impossibile salvare l'immagine." @@ -3732,131 +3951,132 @@ msgstr "Cartolina giapponese 100 x 148 mm" msgid "Japanese Postcard Rotated 148 x 100 mm" msgstr "Cartolina giapponese ruotata 148 x 100 mm" -#: ../src/common/stockitem.cpp:134 +#: ../src/common/stockitem.cpp:160 msgid "Justified" msgstr "Giustificato" -#: ../src/richtext/richtextliststylepage.cpp:343 -#: ../src/richtext/richtextliststylepage.cpp:345 #: ../src/richtext/richtextindentspage.cpp:165 #: ../src/richtext/richtextindentspage.cpp:167 +#: ../src/richtext/richtextliststylepage.cpp:343 +#: ../src/richtext/richtextliststylepage.cpp:345 msgid "Justify text left and right." msgstr "Justifica il testo a sinistra e a destra." -#: ../src/common/fmapbase.cpp:123 +#: ../src/common/fmapbase.cpp:164 msgid "KOI8-R" msgstr "KOI8-R" -#: ../src/common/fmapbase.cpp:124 +#: ../src/common/fmapbase.cpp:165 msgid "KOI8-U" msgstr "KOI8-U" -#: ../src/common/accelcmn.cpp:247 ../src/common/accelcmn.cpp:305 +#: ../src/common/accelcmn.cpp:247 +#: ../src/common/accelcmn.cpp:305 msgid "KP_" -msgstr "" +msgstr "KP_" #: ../src/common/accelcmn.cpp:102 msgid "KP_ADD" -msgstr "" +msgstr "KP_AGGIUNGI" #: ../src/common/accelcmn.cpp:97 msgid "KP_BEGIN" -msgstr "" +msgstr "KP_INIZIO" #: ../src/common/accelcmn.cpp:105 msgid "KP_DECIMAL" -msgstr "" +msgstr "KP_DECIMALE" #: ../src/common/accelcmn.cpp:99 msgid "KP_DELETE" -msgstr "" +msgstr "KP_ELIMINA" #: ../src/common/accelcmn.cpp:106 msgid "KP_DIVIDE" -msgstr "" +msgstr "KP_DIVIDI" #: ../src/common/accelcmn.cpp:91 msgid "KP_DOWN" -msgstr "" +msgstr "KP_GIU" #: ../src/common/accelcmn.cpp:96 msgid "KP_END" -msgstr "" +msgstr "KP_FINE" #: ../src/common/accelcmn.cpp:86 msgid "KP_ENTER" -msgstr "" +msgstr "KP_INSERIMENTO" #: ../src/common/accelcmn.cpp:100 msgid "KP_EQUAL" -msgstr "" +msgstr "KP_UGUALE" #: ../src/common/accelcmn.cpp:87 msgid "KP_HOME" -msgstr "" +msgstr "KP_HOME" #: ../src/common/accelcmn.cpp:98 msgid "KP_INSERT" -msgstr "" +msgstr "KP_INSERIMENTO" #: ../src/common/accelcmn.cpp:88 msgid "KP_LEFT" -msgstr "" +msgstr "KP_SINISTRA" #: ../src/common/accelcmn.cpp:101 msgid "KP_MULTIPLY" -msgstr "" +msgstr "KP_MOLTIPLICA" #: ../src/common/accelcmn.cpp:94 msgid "KP_NEXT" -msgstr "" +msgstr "KP_SUCCESSIVO" #: ../src/common/accelcmn.cpp:95 msgid "KP_PAGEDOWN" -msgstr "" +msgstr "KP_PAGINAGIU" #: ../src/common/accelcmn.cpp:93 msgid "KP_PAGEUP" -msgstr "" +msgstr "KP_PAGINASU" #: ../src/common/accelcmn.cpp:92 msgid "KP_PRIOR" -msgstr "" +msgstr "KP_PRECEDENTE" #: ../src/common/accelcmn.cpp:90 msgid "KP_RIGHT" -msgstr "" +msgstr "KP_DESTRA" #: ../src/common/accelcmn.cpp:103 msgid "KP_SEPARATOR" -msgstr "" +msgstr "KP_SEPARATORE" #: ../src/common/accelcmn.cpp:84 msgid "KP_SPACE" -msgstr "" +msgstr "KP_SPAZIO" #: ../src/common/accelcmn.cpp:104 msgid "KP_SUBTRACT" -msgstr "" +msgstr "KP_SOTTTRATTO" #: ../src/common/accelcmn.cpp:85 msgid "KP_TAB" -msgstr "" +msgstr "KP_TAB" #: ../src/common/accelcmn.cpp:89 msgid "KP_UP" -msgstr "" +msgstr "KP_SU" #: ../src/richtext/richtextindentspage.cpp:307 -#, fuzzy msgid "L&ine spacing:" -msgstr "Interlinea:" +msgstr "&Interlinea:" #: ../src/common/accelcmn.cpp:55 msgid "LEFT" -msgstr "" +msgstr "SINISTRA" -#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873 +#: ../src/generic/prntdlgg.cpp:619 +#: ../src/generic/prntdlgg.cpp:874 msgid "Landscape" msgstr "Orizzontale" @@ -3867,25 +4087,25 @@ msgstr "Ledger, 17 x 11 pollici" #: ../src/richtext/richtextliststylepage.cpp:248 #: ../src/richtext/richtextliststylepage.cpp:251 #: ../src/richtext/richtextliststylepage.cpp:252 -#: ../src/richtext/richtextbulletspage.cpp:197 +#: ../src/richtext/richtextbulletspage.cpp:196 +#: ../src/richtext/richtextbulletspage.cpp:199 #: ../src/richtext/richtextbulletspage.cpp:200 -#: ../src/richtext/richtextbulletspage.cpp:201 msgid "Left" msgstr "Sinistra" -#: ../src/richtext/richtextliststylepage.cpp:391 #: ../src/richtext/richtextindentspage.cpp:217 +#: ../src/richtext/richtextliststylepage.cpp:391 msgid "Left (&first line):" msgstr "Sinistra (&prima riga):" -#: ../src/generic/prntdlgg.cpp:885 +#: ../src/generic/prntdlgg.cpp:886 msgid "Left margin (mm):" msgstr "Margine sinistro (mm):" -#: ../src/richtext/richtextliststylepage.cpp:329 -#: ../src/richtext/richtextliststylepage.cpp:331 #: ../src/richtext/richtextindentspage.cpp:151 #: ../src/richtext/richtextindentspage.cpp:153 +#: ../src/richtext/richtextliststylepage.cpp:329 +#: ../src/richtext/richtextliststylepage.cpp:331 msgid "Left-align text." msgstr "Allinea a sinistra" @@ -3925,9 +4145,9 @@ msgstr "Letter Transverse 8 1/2 x 11 pollici" msgid "Letter, 8 1/2 x 11 in" msgstr "Letter, 8 1/2 x 11 pollici" -#: ../src/generic/aboutdlgg.cpp:139 +#: ../src/generic/aboutdlgg.cpp:174 msgid "License" -msgstr "" +msgstr "Licenza" #: ../src/generic/fontdlgg.cpp:334 msgid "Light" @@ -3936,42 +4156,40 @@ msgstr "Leggero" #: ../src/generic/helpext.cpp:300 #, c-format msgid "Line %lu of map file \"%s\" has invalid syntax, skipped." -msgstr "" -"La riga %lu del file di mappa \"%s\" è stata scartata in quanto scorretta." +msgstr "La riga %lu del file di mappa \"%s\" è stata scartata in quanto scorretta." #: ../src/richtext/richtextliststylepage.cpp:453 msgid "Line spacing:" msgstr "Interlinea:" -#: ../src/html/chm.cpp:820 +#: ../src/html/chm.cpp:837 msgid "Link contained '//', converted to absolute link." -msgstr "" -"Il collegamnto conteneva '//', è stato convertito a un collegamento assoluto." +msgstr "Il collegamnto conteneva '//', è stato convertito a un collegamento assoluto." #: ../src/richtext/richtextformatdlg.cpp:300 msgid "List Style" msgstr "Stile di lista" -#: ../src/richtext/richtextstyles.cpp:841 +#: ../src/richtext/richtextstyles.cpp:907 msgid "List styles" msgstr "Stili di lista" -#: ../src/richtext/richtextfontpage.cpp:163 -#: ../src/richtext/richtextfontpage.cpp:165 +#: ../src/richtext/richtextfontpage.cpp:166 +#: ../src/richtext/richtextfontpage.cpp:168 msgid "Lists font sizes in points." msgstr "Elenca le dimensioni in punti del font." -#: ../src/richtext/richtextfontpage.cpp:144 -#: ../src/richtext/richtextfontpage.cpp:146 +#: ../src/richtext/richtextfontpage.cpp:147 +#: ../src/richtext/richtextfontpage.cpp:149 msgid "Lists the available fonts." msgstr "Elenca i font disponibili." -#: ../src/common/fldlgcmn.cpp:282 +#: ../src/common/fldlgcmn.cpp:316 #, c-format msgid "Load %s file" msgstr "Caricare il file %s" -#: ../src/html/htmlwin.cpp:548 +#: ../src/html/htmlwin.cpp:572 msgid "Loading : " msgstr "Caricamento : " @@ -3985,51 +4203,212 @@ msgstr "Il file di lock '%s' ha un proprietario errato." msgid "Lock file '%s' has incorrect permissions." msgstr "Il file di lock '%s' ha permessi scorretti." -#: ../src/generic/logg.cpp:602 +#: ../src/generic/logg.cpp:590 #, c-format msgid "Log saved to the file '%s'." msgstr "Registro salvato nel file '%s'." #: ../src/richtext/richtextliststylepage.cpp:486 -#: ../src/richtext/richtextbulletspage.cpp:284 +#: ../src/richtext/richtextbulletspage.cpp:286 msgid "Lower case letters" msgstr "Lettere minuscole" #: ../src/richtext/richtextliststylepage.cpp:488 -#: ../src/richtext/richtextbulletspage.cpp:286 +#: ../src/richtext/richtextbulletspage.cpp:288 msgid "Lower case roman numerals" msgstr "Numeri romani minuscoli" -#: ../src/gtk/mdi.cpp:413 ../src/gtk1/mdi.cpp:462 +#: ../src/gtk/mdi.cpp:431 +#: ../src/gtk1/mdi.cpp:432 msgid "MDI child" msgstr "Figlio MDI" #: ../src/common/accelcmn.cpp:67 msgid "MENU" -msgstr "" +msgstr "MENU" #: ../src/msw/helpchm.cpp:57 -msgid "" -"MS HTML Help functions are unavailable because the MS HTML Help library is " -"not installed on this machine. Please install it." -msgstr "" -"Funzionalità MS HTML Help non disponibili perchè la relativa libreria non è " -"installata su questo computer. Si prega di installarla." +msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it." +msgstr "Funzionalità MS HTML Help non disponibili perchè la relativa libreria non è installata su questo computer. Si prega di installarla." -#: ../src/univ/themes/win32.cpp:3740 +#: ../src/univ/themes/win32.cpp:3778 msgid "Ma&ximize" msgstr "&Ingrandisci" +#: ../src/common/fmapbase.cpp:204 +msgid "MacArabic" +msgstr "Numeri arabi Mac" + +#: ../src/common/fmapbase.cpp:223 +msgid "MacArmenian" +msgstr "Mac armeno" + +#: ../src/common/fmapbase.cpp:212 +msgid "MacBengali" +msgstr "Mac bengali" + +#: ../src/common/fmapbase.cpp:218 +msgid "MacBurmese" +msgstr "Mac burmese" + +#: ../src/common/fmapbase.cpp:237 +msgid "MacCeltic" +msgstr "Mac celtico" + +#: ../src/common/fmapbase.cpp:228 +msgid "MacCentralEurRoman" +msgstr "Mac Europa centrale roman" + +#: ../src/common/fmapbase.cpp:224 +msgid "MacChineseSimp" +msgstr "Mac cinese simplificato" + +#: ../src/common/fmapbase.cpp:202 +msgid "MacChineseTrad" +msgstr "Mac cinese tradizionale" + +#: ../src/common/fmapbase.cpp:234 +msgid "MacCroatian" +msgstr "Mac croato" + +#: ../src/common/fmapbase.cpp:207 +msgid "MacCyrillic" +msgstr "Mac cirilico" + +#: ../src/common/fmapbase.cpp:208 +msgid "MacDevanagari" +msgstr "Mac devangari" + +#: ../src/common/fmapbase.cpp:232 +msgid "MacDingbats" +msgstr "Mac Dingbats" + +#: ../src/common/fmapbase.cpp:227 +msgid "MacEthiopic" +msgstr "Mac etiopico" + +#: ../src/common/fmapbase.cpp:230 +msgid "MacExtArabic" +msgstr "Mac arabico esteso" + +#: ../src/common/fmapbase.cpp:238 +msgid "MacGaelic" +msgstr "Mac gaelico" + +#: ../src/common/fmapbase.cpp:222 +msgid "MacGeorgian" +msgstr "Mac georgiano" + +#: ../src/common/fmapbase.cpp:206 +msgid "MacGreek" +msgstr "Mac greco" + +#: ../src/common/fmapbase.cpp:210 +msgid "MacGujarati" +msgstr "Mac gujarati" + +#: ../src/common/fmapbase.cpp:209 +msgid "MacGurmukhi" +msgstr "Mac gurmukhi" + +#: ../src/common/fmapbase.cpp:205 +msgid "MacHebrew" +msgstr "Mac ebraico" + +#: ../src/common/fmapbase.cpp:235 +msgid "MacIcelandic" +msgstr "Ma islandese" + +#: ../src/common/fmapbase.cpp:201 +msgid "MacJapanese" +msgstr "Mac giapponese" + +#: ../src/common/fmapbase.cpp:215 +msgid "MacKannada" +msgstr "Mac kannadia" + +#: ../src/common/fmapbase.cpp:239 +msgid "MacKeyboardGlyphs" +msgstr "Mac tastiera glyphs" + +#: ../src/common/fmapbase.cpp:219 +msgid "MacKhmer" +msgstr "Mac khmer" + +#: ../src/common/fmapbase.cpp:203 +msgid "MacKorean" +msgstr "mac coreano" + +#: ../src/common/fmapbase.cpp:221 +msgid "MacLaotian" +msgstr "Mac loatiano" + +#: ../src/common/fmapbase.cpp:216 +msgid "MacMalayalam" +msgstr "Mac malayalam" + +#: ../src/common/fmapbase.cpp:226 +msgid "MacMongolian" +msgstr "Mac mongolo" + +#: ../src/common/fmapbase.cpp:211 +msgid "MacOriya" +msgstr "Mac oriya" + +#: ../src/common/fmapbase.cpp:200 +msgid "MacRoman" +msgstr "Mac Roman" + +#: ../src/common/fmapbase.cpp:236 +msgid "MacRomanian" +msgstr "Mac Romanian" + +#: ../src/common/fmapbase.cpp:217 +msgid "MacSinhalese" +msgstr "Mac Sinhalese" + +#: ../src/common/fmapbase.cpp:231 +msgid "MacSymbol" +msgstr "mac Symbol" + +#: ../src/common/fmapbase.cpp:213 +msgid "MacTamil" +msgstr "Mac tamil" + +#: ../src/common/fmapbase.cpp:214 +msgid "MacTelugu" +msgstr "Mac telegu" + +#: ../src/common/fmapbase.cpp:220 +msgid "MacThai" +msgstr "Mac tailandese" + +#: ../src/common/fmapbase.cpp:225 +msgid "MacTibetan" +msgstr "Mac tibetano" + +#: ../src/common/fmapbase.cpp:233 +msgid "MacTurkish" +msgstr "Mac turco" + +#: ../src/common/fmapbase.cpp:229 +msgid "MacVietnamese" +msgstr "Mac vietnamita" + +#: ../src/propgrid/advprops.cpp:2012 +msgid "Make a selection:" +msgstr "Effettua una selezione" + #: ../src/generic/fdrepdlg.cpp:148 msgid "Match case" msgstr "&Maiuscole/minuscole" -#: ../src/common/fs_mem.cpp:168 +#: ../src/common/fs_mem.cpp:176 #, c-format msgid "Memory VFS already contains file '%s'!" -msgstr "La memoria VFS contiene già il file '%s'!" +msgstr "La memoria VFS contiene già il file '%s'!" -#: ../src/msw/frame.cpp:415 +#: ../src/msw/frame.cpp:425 msgid "Menu" msgstr "Menu" @@ -4037,25 +4416,24 @@ msgstr "Menu" msgid "Metal theme" msgstr "Tema metallico" -#: ../src/univ/themes/win32.cpp:3738 +#: ../src/univ/themes/win32.cpp:3776 msgid "Mi&nimize" msgstr "Riduci a &icona" -#: ../src/mgl/app.cpp:163 +#: ../src/mgl/app.cpp:114 #, c-format msgid "Mode %ix%i-%i not available." -msgstr "Modalità video %ix%i-%i non disponibile." +msgstr "Modalità video %ix%i-%i non disponibile." -#: ../src/mac/carbon/dataview.cpp:1412 -#, fuzzy +#: ../src/osx/dataview_osx.cpp:594 msgid "Model pointer not initialized." -msgstr "Impossibile inizializzare il display" +msgstr "Puntatore modello non inzializzato" #: ../src/generic/fontdlgg.cpp:326 msgid "Modern" msgstr "Modern" -#: ../src/generic/filectrlg.cpp:461 +#: ../src/generic/filectrlg.cpp:456 msgid "Modified" msgstr "Modificato" @@ -4068,19 +4446,19 @@ msgstr "Inizializzazione del modulo \"%s\" fallita" msgid "Monarch Envelope, 3 7/8 x 7 1/2 in" msgstr "Busta Monarch, 3 7/8 x 7 1/2 pollici" -#: ../src/generic/editlbox.cpp:276 +#: ../src/generic/editlbox.cpp:277 msgid "Move down" msgstr "Sposta verso il basso" -#: ../src/generic/editlbox.cpp:275 +#: ../src/generic/editlbox.cpp:276 msgid "Move up" msgstr "Sposta verso il basso" #: ../src/common/accelcmn.cpp:80 msgid "NUM_LOCK" -msgstr "" +msgstr "BLOCCO_NUMERICO" -#: ../src/generic/filectrlg.cpp:458 +#: ../src/generic/filectrlg.cpp:453 msgid "Name" msgstr "Nome" @@ -4100,10 +4478,10 @@ msgstr "Nuovo stile di ¶grafo..." #: ../src/richtext/richtextstyledlg.cpp:573 #: ../src/richtext/richtextstyledlg.cpp:616 #: ../src/richtext/richtextstyledlg.cpp:621 -#: ../src/richtext/richtextstyledlg.cpp:770 -#: ../src/richtext/richtextstyledlg.cpp:775 -#: ../src/richtext/richtextstyledlg.cpp:843 -#: ../src/richtext/richtextstyledlg.cpp:851 +#: ../src/richtext/richtextstyledlg.cpp:771 +#: ../src/richtext/richtextstyledlg.cpp:776 +#: ../src/richtext/richtextstyledlg.cpp:844 +#: ../src/richtext/richtextstyledlg.cpp:852 msgid "New Style" msgstr "Nuovo stile" @@ -4111,52 +4489,55 @@ msgstr "Nuovo stile" msgid "New directory" msgstr "Crea cartella" -#: ../src/generic/editlbox.cpp:273 +#: ../src/generic/editlbox.cpp:274 msgid "New item" msgstr "Nuova elemento" -#: ../src/generic/filectrlg.cpp:652 ../src/generic/filectrlg.cpp:661 -#: ../src/generic/dirdlgg.cpp:327 ../src/generic/dirdlgg.cpp:337 +#: ../src/generic/dirdlgg.cpp:327 +#: ../src/generic/dirdlgg.cpp:337 +#: ../src/generic/filectrlg.cpp:647 +#: ../src/generic/filectrlg.cpp:656 msgid "NewName" msgstr "NuovoNome" -#: ../src/generic/tipdlg.cpp:303 +#: ../src/generic/tipdlg.cpp:306 msgid "Next" msgstr "Successivo" -#: ../src/html/helpwnd.cpp:675 +#: ../src/html/helpwnd.cpp:676 msgid "Next page" msgstr "Pagina successiva" -#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:36 +#: ../src/motif/msgdlg.cpp:194 msgid "No" msgstr "No" -#: ../src/generic/animateg.cpp:152 +#: ../src/generic/animateg.cpp:151 #, c-format msgid "No animation handler for type %ld defined." msgstr "Gestore non disponibile per il formato di immagine %ld." -#: ../src/dfb/bitmap.cpp:540 ../src/dfb/bitmap.cpp:574 -#, fuzzy, c-format +#: ../src/dfb/bitmap.cpp:643 +#: ../src/dfb/bitmap.cpp:677 +#, c-format msgid "No bitmap handler for type %d defined." -msgstr "Funzionalità non disponibili per il formato di immagine %d." +msgstr "Nessun gestore bitmap definito per il tipo %d." -#: ../src/mac/carbon/databrow.cpp:1116 +#: ../src/osx/carbon/dataview.cpp:1745 msgid "No column existing." -msgstr "" +msgstr "Nesssuna colonna esistente." -#: ../src/mac/carbon/databrow.cpp:1013 -msgid "No column for the specified column index existing." -msgstr "" +#: ../src/osx/carbon/dataview.cpp:1635 +msgid "No column for the specified column existing." +msgstr "Nessuna colonna per la colonna esistente specificata." -#: ../src/mac/carbon/databrow.cpp:768 +#: ../src/osx/carbon/dataview.cpp:1384 msgid "No column for the specified column position existing." -msgstr "" +msgstr "Nessuna colonna per la posizione esistente specificata." -#: ../src/common/utilscmn.cpp:1146 +#: ../src/common/utilscmn.cpp:985 msgid "No default application configured for HTML files." -msgstr "" +msgstr "Nessuna applicazione predefinita configurata per i file HTML." #: ../src/generic/helpext.cpp:451 msgid "No entries found." @@ -4167,13 +4548,11 @@ msgstr "Voci non trovate." msgid "" "No font for displaying text in encoding '%s' found,\n" "but an alternative encoding '%s' is available.\n" -"Do you want to use this encoding (otherwise you will have to choose another " -"one)?" +"Do you want to use this encoding (otherwise you will have to choose another one)?" msgstr "" "Impossibile trovare un tipo di carattere per la codifica '%s',\n" -"ma è disponibile la codifica alternativa '%s'.\n" -"Si desidera utilizzare tale codifica (altrimenti sarà necessario sceglierne " -"una differente)?" +"ma è disponibile la codifica alternativa '%s'.\n" +"Si desidera utilizzare tale codifica (altrimenti sarà necessario sceglierne una differente)?" #: ../src/common/fontmap.cpp:424 #, c-format @@ -4184,62 +4563,61 @@ msgid "" msgstr "" "Impossibile trovare un tipo di carattere per la codifica del testo '%s'.\n" "Si desidera scegliere un carattere da utilizzare per questa codifica\n" -"(altrimenti il testo con tale codifica non verrà visualizzato correttamente)?" +"(altrimenti il testo con tale codifica non verrà visualizzato correttamente)?" -#: ../src/xrc/xmlres.cpp:739 -#, c-format -msgid "No handler found for XML node '%s', class '%s'!" -msgstr "Impossibile trovare l'handler per il nodo XML '%s', classe '%s'!" - -#: ../src/generic/animateg.cpp:144 +#: ../src/generic/animateg.cpp:143 msgid "No handler found for animation type." msgstr "Gestore non disponibile per questo formato di animazione." -#: ../src/common/image.cpp:2177 ../src/common/image.cpp:2224 +#: ../src/common/image.cpp:2322 +#: ../src/common/image.cpp:2399 msgid "No handler found for image type." -msgstr "Funzionalità non disponibili per questo formato di immagine." +msgstr "Funzionalità non disponibili per questo formato di immagine." -#: ../src/common/image.cpp:2278 +#: ../src/common/image.cpp:2461 #, c-format msgid "No image handler for type %d defined." -msgstr "Funzionalità non disponibili per il formato di immagine %d." +msgstr "Funzionalità non disponibili per il formato di immagine %d." -#: ../src/common/image.cpp:2185 ../src/common/image.cpp:2233 +#: ../src/common/image.cpp:2330 +#: ../src/common/image.cpp:2408 #, c-format msgid "No image handler for type %ld defined." msgstr "Gestore non disponibile per il formato di immagine %ld." -#: ../src/common/image.cpp:2257 ../src/common/image.cpp:2293 +#: ../src/common/image.cpp:2431 +#: ../src/common/image.cpp:2475 #, c-format msgid "No image handler for type %s defined." -msgstr "Funzionalità non disponibili per il formato di immagine %s." +msgstr "Funzionalità non disponibili per il formato di immagine %s." -#: ../src/html/htmlhelp.cpp:436 ../src/html/htmlhelp.cpp:441 -#: ../src/html/helpwnd.cpp:876 +#: ../src/html/helpwnd.cpp:871 msgid "No matching page found yet" msgstr "Pagina corrispondente non ancora trovata" -#: ../src/mac/carbon/dataview.cpp:1051 ../src/mac/carbon/dataview.cpp:1171 +#: ../src/osx/dataview_osx.cpp:381 msgid "No model associated with control." -msgstr "" +msgstr "Nessun modello associato con il controllo." -#: ../src/mac/carbon/databrow.cpp:1015 ../src/mac/carbon/databrow.cpp:1118 +#: ../src/osx/carbon/dataview.cpp:1637 +#: ../src/osx/carbon/dataview.cpp:1747 msgid "No renderer or invalid renderer type specified for custom data column." -msgstr "" +msgstr "Nessuna o renderizzazione o tipo renderizzazione specificata non valida per i dati personali colonna." -#: ../src/mac/carbon/databrow.cpp:769 +#: ../src/osx/carbon/dataview.cpp:1385 msgid "No renderer specified for column." -msgstr "" +msgstr "Nessuna renderizzazione specificata per la colonna." #: ../src/unix/sound.cpp:82 msgid "No sound" msgstr "Nessun suono" -#: ../src/common/image.cpp:1849 ../src/common/image.cpp:1890 +#: ../src/common/image.cpp:1987 +#: ../src/common/image.cpp:2028 msgid "No unused colour in image being masked." msgstr "Nessun colore inutilizzato nell'immagine da mascherare." -#: ../src/common/image.cpp:2742 +#: ../src/common/image.cpp:2937 msgid "No unused colour in image." msgstr "Nessun colore inutilizzato nell'immagine." @@ -4248,14 +4626,15 @@ msgstr "Nessun colore inutilizzato nell'immagine." msgid "No valid mappings found in the file \"%s\"." msgstr "Il file \"%s\" non contiene mappature valide." -#: ../src/common/fmapbase.cpp:117 +#: ../src/common/fmapbase.cpp:158 msgid "Nordic (ISO-8859-10)" msgstr "Nordico (ISO-8859-10)" +#: ../src/generic/fontdlgg.cpp:330 +#: ../src/generic/fontdlgg.cpp:333 #: ../src/richtext/richtextindentspage.cpp:245 #: ../src/richtext/richtextindentspage.cpp:255 -#: ../src/richtext/richtextindentspage.cpp:256 ../src/generic/fontdlgg.cpp:330 -#: ../src/generic/fontdlgg.cpp:333 +#: ../src/richtext/richtextindentspage.cpp:256 msgid "Normal" msgstr "Normale" @@ -4263,11 +4642,21 @@ msgstr "Normale" msgid "Normal face
and underlined. " msgstr "Normale
e sottolineato. " -#: ../src/html/helpwnd.cpp:1216 +#: ../src/html/helpwnd.cpp:1213 msgid "Normal font:" msgstr "Carattere normale:" -#: ../src/richtext/richtextfontpage.cpp:271 +#: ../src/propgrid/props.cpp:791 +#, c-format +msgid "Not %s" +msgstr "Non %s" + +#: ../include/wx/filename.h:552 +#: ../include/wx/filename.h:557 +msgid "Not available" +msgstr "Non disponibile" + +#: ../src/richtext/richtextfontpage.cpp:288 msgid "Not underlined" msgstr "Non sottolineato" @@ -4275,18 +4664,23 @@ msgstr "Non sottolineato" msgid "Note, 8 1/2 x 11 in" msgstr "Nota, 8 1/2 x 11 pollici" -#: ../src/generic/notifmsgg.cpp:101 -#, fuzzy +#: ../src/generic/notifmsgg.cpp:105 msgid "Notice" -msgstr "&Note:" +msgstr "Nota" + +#: ../src/osx/carbon/dataview.cpp:903 +msgid "Number of columns could not be determined." +msgstr "Numero non determinato di colonne." #: ../src/richtext/richtextliststylepage.cpp:489 -#: ../src/richtext/richtextbulletspage.cpp:287 +#: ../src/richtext/richtextbulletspage.cpp:289 msgid "Numbered outline" msgstr "Numeri gerarchici" -#: ../src/richtext/richtextstyledlg.cpp:282 ../src/gtk1/fontdlg.cpp:139 -#: ../src/msw/dialog.cpp:180 ../src/mac/carbon/msgdlg.cpp:37 +#: ../src/richtext/richtextstyledlg.cpp:282 +#: ../src/msw/msgdlg.cpp:473 +#: ../src/msw/dialog.cpp:178 +#: ../src/gtk1/fontdlg.cpp:139 msgid "OK" msgstr "OK" @@ -4294,111 +4688,119 @@ msgstr "OK" msgid "Objects must have an id attribute" msgstr "L'oggetto deve avere un ID ed un attributo" -#: ../src/common/docview.cpp:1298 ../src/common/docview.cpp:1624 -#: ../src/common/docview.cpp:1664 +#: ../src/common/docview.cpp:1631 +#: ../src/common/docview.cpp:1673 msgid "Open File" -msgstr "Apri File" +msgstr "Apri file" -#: ../src/html/helpwnd.cpp:683 ../src/html/helpwnd.cpp:1557 +#: ../src/html/helpwnd.cpp:682 +#: ../src/html/helpwnd.cpp:1561 msgid "Open HTML document" msgstr "Apri un documento HTML" -#: ../src/generic/dbgrptg.cpp:159 +#: ../src/generic/dbgrptg.cpp:160 #, c-format msgid "Open file \"%s\"" msgstr "Apri il file \"%s\"" -#: ../src/mac/carbon/glcanvas.cpp:48 +#: ../src/osx/carbon/glcanvas.cpp:49 #, c-format msgid "OpenGL function \"%s\" failed: %s (error %d)" -msgstr "" +msgstr "Funzioen OpenGL \"%s\" fallita: %s (errore %d)" -#: ../src/generic/filectrlg.cpp:676 ../src/generic/filectrlg.cpp:820 -#: ../src/generic/dirdlgg.cpp:353 ../src/generic/dirctrlg.cpp:732 +#: ../src/generic/dirctrlg.cpp:750 +#: ../src/generic/dirdlgg.cpp:353 +#: ../src/generic/filectrlg.cpp:671 +#: ../src/generic/filectrlg.cpp:815 msgid "Operation not permitted." msgstr "Operazione non permessa." -#: ../src/common/cmdline.cpp:771 +#: ../src/common/cmdline.cpp:829 #, c-format msgid "Option '%s' requires a value." msgstr "L'opzione '%s' richiede un valore." -#: ../src/common/cmdline.cpp:854 +#: ../src/common/cmdline.cpp:912 #, c-format msgid "Option '%s': '%s' cannot be converted to a date." msgstr "Opzione '%s': impossibile convertire '%s' in una data." -#: ../src/generic/prntdlgg.cpp:623 ../src/generic/dirdlgg.cpp:188 +#: ../src/generic/dirdlgg.cpp:188 +#: ../src/generic/prntdlgg.cpp:624 msgid "Options" msgstr "Opzioni" -#: ../src/generic/prntdlgg.cpp:620 ../src/generic/prntdlgg.cpp:874 +#: ../src/generic/prntdlgg.cpp:621 +#: ../src/generic/prntdlgg.cpp:875 msgid "Orientation" msgstr "Orientamento" #: ../src/common/windowid.cpp:215 msgid "Out of window IDs. Recommend shutting down application." -msgstr "" +msgstr "ID fuori della finestra. Si raccomanda la chiusura dell'applicazione." -#: ../src/mac/carbon/dataview.cpp:376 -#, fuzzy +#: ../src/osx/dataview_osx.cpp:121 +#: ../src/osx/dataview_osx.cpp:202 msgid "Owner not initialized." -msgstr "Impossibile inizializzare il display" +msgstr "Proprietario non inizializzato" #: ../src/common/accelcmn.cpp:83 msgid "PAGEDOWN" -msgstr "" +msgstr "PAGINAGIU" #: ../src/common/accelcmn.cpp:82 msgid "PAGEUP" -msgstr "" +msgstr "PAGINASU" #: ../src/common/accelcmn.cpp:68 msgid "PAUSE" -msgstr "" +msgstr "PAUSA" -#: ../src/common/imagpcx.cpp:456 ../src/common/imagpcx.cpp:479 +#: ../src/common/imagpcx.cpp:458 +#: ../src/common/imagpcx.cpp:481 msgid "PCX: couldn't allocate memory" msgstr "PCX: Impossibile allocare la memoria." -#: ../src/common/imagpcx.cpp:455 +#: ../src/common/imagpcx.cpp:457 msgid "PCX: image format unsupported" msgstr "PCX: formato non supportato" -#: ../src/common/imagpcx.cpp:478 +#: ../src/common/imagpcx.cpp:480 msgid "PCX: invalid image" msgstr "PCX: Immagine non valida." -#: ../src/common/imagpcx.cpp:442 +#: ../src/common/imagpcx.cpp:443 msgid "PCX: this is not a PCX file." -msgstr "PCX: questo non è un file PCX." +msgstr "PCX: questo non è un file PCX." -#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:480 +#: ../src/common/imagpcx.cpp:460 +#: ../src/common/imagpcx.cpp:482 msgid "PCX: unknown error !!!" msgstr "PCX: errore sconosciuto!!!" -#: ../src/common/imagpcx.cpp:457 +#: ../src/common/imagpcx.cpp:459 msgid "PCX: version number too low" msgstr "PCX: numero di versione troppo piccolo" #: ../src/common/accelcmn.cpp:54 msgid "PGDN" -msgstr "" +msgstr "PAGGIU" #: ../src/common/accelcmn.cpp:53 msgid "PGUP" -msgstr "" +msgstr "PAGSU" -#: ../src/common/imagpnm.cpp:88 +#: ../src/common/imagpnm.cpp:92 msgid "PNM: Couldn't allocate memory." msgstr "PNM: Impossibile allocare la memoria." -#: ../src/common/imagpnm.cpp:72 +#: ../src/common/imagpnm.cpp:74 msgid "PNM: File format is not recognized." msgstr "PNM: Formato del file sconosciuto." -#: ../src/common/imagpnm.cpp:106 ../src/common/imagpnm.cpp:125 -#: ../src/common/imagpnm.cpp:144 +#: ../src/common/imagpnm.cpp:113 +#: ../src/common/imagpnm.cpp:135 +#: ../src/common/imagpnm.cpp:157 msgid "PNM: File seems truncated." msgstr "PNM: Il file sembra troncato." @@ -4508,23 +4910,24 @@ msgstr "Busta Rep. Pop. Cinese #9 Ruotata 324 x 229 mm" #: ../src/common/accelcmn.cpp:71 msgid "PRINT" -msgstr "" +msgstr "STAMPA" -#: ../src/common/prntbase.cpp:1569 +#: ../src/common/prntbase.cpp:1617 #, c-format msgid "Page %d" msgstr "Pagina %d" -#: ../src/common/prntbase.cpp:1567 +#: ../src/common/prntbase.cpp:1615 #, c-format msgid "Page %d of %d" msgstr "Pagina %d di %d" -#: ../src/generic/prntdlgg.cpp:833 +#: ../src/generic/prntdlgg.cpp:834 msgid "Page Setup" msgstr "Impostazioni della pagina" -#: ../src/common/prntbase.cpp:465 ../src/gtk/gnome/gprint.cpp:706 +#: ../src/common/prntbase.cpp:465 +#: ../src/gtk/gnome/gprint.cpp:706 msgid "Page setup" msgstr "Impostazioni della pagina" @@ -4532,52 +4935,57 @@ msgstr "Impostazioni della pagina" msgid "Pages" msgstr "Pagine" -#: ../src/generic/prntdlgg.cpp:806 ../src/generic/prntdlgg.cpp:860 -#: ../src/generic/prntdlgg.cpp:1062 +#: ../src/generic/prntdlgg.cpp:807 +#: ../src/generic/prntdlgg.cpp:861 +#: ../src/generic/prntdlgg.cpp:1063 msgid "Paper Size" msgstr "Dimensione del foglio" -#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:847 -#: ../src/generic/prntdlgg.cpp:1057 +#: ../src/generic/prntdlgg.cpp:608 +#: ../src/generic/prntdlgg.cpp:848 +#: ../src/generic/prntdlgg.cpp:1058 msgid "Paper size" msgstr "Dimensione del foglio" -#: ../src/richtext/richtextstyles.cpp:839 +#: ../src/richtext/richtextstyles.cpp:905 msgid "Paragraph styles" msgstr "Stili di paragrafo" -#: ../src/mac/carbon/dataview.cpp:375 -#, fuzzy +#: ../src/osx/dataview_osx.cpp:201 msgid "Passed item is invalid." -msgstr "'%s' non valida" +msgstr "Elemento passato non valido." #: ../src/common/xtistrm.cpp:421 msgid "Passing a already registered object to SetObject" -msgstr "Passato un oggetto già registrato a SetObject" +msgstr "Passato un oggetto già registrato a SetObject" #: ../src/common/xtistrm.cpp:639 msgid "Passing a already registered object to SetObjectName" -msgstr "Passato un oggetto già registrato a SetObjectName" +msgstr "Passato un oggetto già registrato a SetObjectName" -#: ../src/common/xtistrm.cpp:432 ../src/common/xtistrm.cpp:652 +#: ../src/common/xtistrm.cpp:432 +msgid "Passing an unknown object to GetObject" +msgstr "Passato un oggetto sconosciuto a GetObject" + +#: ../src/common/xtistrm.cpp:652 msgid "Passing an unkown object to GetObject" msgstr "Passato un oggetto sconosciuto a GetObject" -#: ../src/richtext/richtextctrl.cpp:2234 -#: ../src/stc/scintilla/src/ScintillaBase.cxx:427 +#: ../src/richtext/richtextctrl.cpp:2472 +#: ../src/stc/scintilla/src/ScintillaBase.cxx:457 msgid "Paste" msgstr "Incolla" -#: ../src/common/stockitem.cpp:207 +#: ../src/common/stockitem.cpp:264 msgid "Paste selection" msgstr "Incolla la selezione" #: ../src/richtext/richtextliststylepage.cpp:221 -#: ../src/richtext/richtextbulletspage.cpp:170 +#: ../src/richtext/richtextbulletspage.cpp:169 msgid "Peri&od" msgstr "Punt&o" -#: ../src/generic/filectrlg.cpp:464 +#: ../src/generic/filectrlg.cpp:459 msgid "Permissions" msgstr "Permessi" @@ -4589,19 +4997,19 @@ msgstr "Creazione della pipe fallita" msgid "Please choose a valid font." msgstr "Per favore scegliere un carattere valido." -#: ../src/gtk/filedlg.cpp:66 +#: ../src/gtk/filedlg.cpp:68 msgid "Please choose an existing file." msgstr "Per favore scegliere un file esistente." -#: ../src/html/helpwnd.cpp:819 +#: ../src/html/helpwnd.cpp:814 msgid "Please choose the page to display:" msgstr "Per favore scegliere la pagina da visualizzare." -#: ../src/msw/dialup.cpp:792 +#: ../src/msw/dialup.cpp:793 msgid "Please choose which ISP do you want to connect to" msgstr "Per favore scegliere l'ISP a cui connettersi" -#: ../src/msw/listctrl.cpp:434 +#: ../src/msw/listctrl.cpp:443 #, c-format msgid "" "Please install a newer version of comctl32.dll\n" @@ -4610,58 +5018,92 @@ msgid "" msgstr "" "Si prega di installare una versione aggiornata di comctl32.dll\n" "(richiesta versione 4.70 o sucessiva, installata %d.%02d)\n" -"oppure il programma non funzionerà correttamente" +"oppure il programma non funzionerà correttamente" + +#: ../src/common/headerctrlcmn.cpp:59 +msgid "Please select the columns to show and define their order:" +msgstr "Seelzionare le colonne da visualizzare e il loro ordine:" #: ../src/common/prntbase.cpp:327 msgid "Please wait while printing\n" msgstr "Stampa in corso\n" -#: ../src/mac/carbon/databrow.cpp:621 ../src/mac/carbon/databrow.cpp:671 -#: ../src/mac/carbon/databrow.cpp:765 ../src/mac/carbon/databrow.cpp:788 -#: ../src/mac/carbon/databrow.cpp:805 ../src/mac/carbon/databrow.cpp:822 -#: ../src/mac/carbon/databrow.cpp:1009 ../src/mac/carbon/databrow.cpp:1114 +#: ../src/propgrid/advprops.cpp:631 +msgid "Point Size" +msgstr "Dimensione corpo" + +#: ../src/osx/carbon/dataview.cpp:1239 +#: ../src/osx/carbon/dataview.cpp:1290 +#: ../src/osx/carbon/dataview.cpp:1381 +#: ../src/osx/carbon/dataview.cpp:1404 +#: ../src/osx/carbon/dataview.cpp:1421 +#: ../src/osx/carbon/dataview.cpp:1438 +#: ../src/osx/carbon/dataview.cpp:1631 +#: ../src/osx/carbon/dataview.cpp:1740 +#: ../src/osx/carbon/dataview.cpp:1782 +#: ../src/osx/carbon/dataview.cpp:1832 +#: ../src/osx/carbon/dataview.cpp:1955 msgid "Pointer to data view control not set correctly." -msgstr "" +msgstr "Puntataore all controllo vista dati non impostato correttamente." -#: ../src/mac/carbon/databrow.cpp:622 ../src/mac/carbon/databrow.cpp:680 -#: ../src/mac/carbon/databrow.cpp:766 ../src/mac/carbon/databrow.cpp:823 -#: ../src/mac/carbon/databrow.cpp:1010 +#: ../src/osx/dataview_osx.cpp:91 +msgid "Pointer to dataview control must not be NULL" +msgstr "Il puntatore al controllo vista dati non può essere NULL." + +#: ../src/osx/carbon/dataview.cpp:1240 +#: ../src/osx/carbon/dataview.cpp:1299 +#: ../src/osx/carbon/dataview.cpp:1382 +#: ../src/osx/carbon/dataview.cpp:1439 +#: ../src/osx/carbon/dataview.cpp:1632 +#: ../src/osx/carbon/dataview.cpp:1741 +#: ../src/osx/carbon/dataview.cpp:1783 +#: ../src/osx/carbon/dataview.cpp:1833 +#: ../src/osx/carbon/dataview.cpp:1956 msgid "Pointer to model not set correctly." -msgstr "" +msgstr "Puntatore al modello non impostato correttamente." -#: ../src/generic/prntdlgg.cpp:617 ../src/generic/prntdlgg.cpp:872 +#: ../src/osx/dataview_osx.cpp:352 +#: ../src/osx/dataview_osx.cpp:378 +msgid "Pointer to native control must not be NULL." +msgstr "il puntatore al controllo nativo non può essere NULL." + +#: ../src/generic/prntdlgg.cpp:618 +#: ../src/generic/prntdlgg.cpp:873 msgid "Portrait" msgstr "Verticale" -#: ../src/generic/prntdlgg.cpp:305 +#: ../src/generic/prntdlgg.cpp:304 msgid "PostScript file" msgstr "File PostScript" -#: ../src/html/htmlhelp.cpp:509 -msgid "Preparing help window..." -msgstr "Preparazione della finestra di aiuto in corso..." - -#: ../src/html/helpwnd.cpp:1233 ../src/generic/fontdlgg.cpp:457 -#: ../src/mac/carbon/fontdlg.cpp:552 +#: ../src/generic/fontdlgg.cpp:457 +#: ../src/osx/carbon/fontdlg.cpp:564 +#: ../src/html/helpwnd.cpp:1230 msgid "Preview:" msgstr "Anteprima:" -#: ../src/html/helpwnd.cpp:672 +#: ../src/html/helpwnd.cpp:675 msgid "Previous page" msgstr "Pagina precedente" -#: ../src/common/prntbase.cpp:407 ../src/gtk/gnome/gprint.cpp:537 -#: ../src/gtk/gnome/gprint.cpp:549 ../src/gtk/print.cpp:598 -#: ../src/gtk/print.cpp:611 ../src/generic/prntdlgg.cpp:149 +#: ../src/generic/prntdlgg.cpp:149 #: ../src/generic/prntdlgg.cpp:163 +#: ../src/common/prntbase.cpp:407 +#: ../src/gtk/print.cpp:573 +#: ../src/gtk/print.cpp:586 +#: ../src/gtk/gnome/gprint.cpp:537 +#: ../src/gtk/gnome/gprint.cpp:549 msgid "Print" msgstr "Stampa" -#: ../src/common/docview.cpp:1061 +#: ../include/wx/prntbase.h:379 +#: ../src/common/docview.cpp:1146 msgid "Print Preview" msgstr "Anteprima di stampa" -#: ../src/common/prntbase.cpp:1521 ../src/common/prntbase.cpp:1547 +#: ../src/common/prntbase.cpp:1558 +#: ../src/common/prntbase.cpp:1600 +#: ../src/common/prntbase.cpp:1608 msgid "Print Preview Failure" msgstr "Errore durante l'anteprima di stampa" @@ -4669,27 +5111,31 @@ msgstr "Errore durante l'anteprima di stampa" msgid "Print Range" msgstr "Intervallo da stampare" -#: ../src/generic/prntdlgg.cpp:454 +#: ../src/generic/prntdlgg.cpp:455 msgid "Print Setup" msgstr "Impostazioni di stampa" -#: ../src/generic/prntdlgg.cpp:626 +#: ../src/generic/prntdlgg.cpp:627 msgid "Print in colour" msgstr "Stampa a colori" -#: ../src/common/stockitem.cpp:144 +#: ../src/common/stockitem.cpp:171 msgid "Print previe&w" msgstr "Ante&prima di stampa" -#: ../src/gtk/gnome/gprint.cpp:947 +#: ../src/gtk/gnome/gprint.cpp:938 msgid "Print preview" msgstr "Anteprima di stampa" -#: ../src/generic/prntdlgg.cpp:635 +#: ../src/common/docview.cpp:1140 +msgid "Print preview creation failed." +msgstr "Creazione anteprima di stampa fallita." + +#: ../src/generic/prntdlgg.cpp:636 msgid "Print spooling" msgstr "Coda di stampa" -#: ../src/html/helpwnd.cpp:689 +#: ../src/html/helpwnd.cpp:686 msgid "Print this page" msgstr "Stampa questa pagina" @@ -4697,11 +5143,11 @@ msgstr "Stampa questa pagina" msgid "Print to File" msgstr "Stampa su file" -#: ../src/generic/prntdlgg.cpp:498 +#: ../src/generic/prntdlgg.cpp:499 msgid "Printer" msgstr "Stampante" -#: ../src/generic/prntdlgg.cpp:638 +#: ../src/generic/prntdlgg.cpp:639 msgid "Printer command:" msgstr "Comando stampante:" @@ -4709,11 +5155,11 @@ msgstr "Comando stampante:" msgid "Printer options" msgstr "Opzioni stampante" -#: ../src/generic/prntdlgg.cpp:650 +#: ../src/generic/prntdlgg.cpp:651 msgid "Printer options:" msgstr "Opzioni stampante:" -#: ../src/generic/prntdlgg.cpp:921 +#: ../src/generic/prntdlgg.cpp:922 msgid "Printer..." msgstr "Stampante..." @@ -4721,7 +5167,12 @@ msgstr "Stampante..." msgid "Printer:" msgstr "Stampante:" -#: ../src/common/prntbase.cpp:324 ../src/common/prntbase.cpp:545 +#: ../src/html/htmprint.cpp:278 +msgid "Printing" +msgstr "Stampa..." + +#: ../src/common/prntbase.cpp:324 +#: ../src/common/prntbase.cpp:546 msgid "Printing " msgstr "Stampa in corso" @@ -4729,52 +5180,55 @@ msgstr "Stampa in corso" msgid "Printing Error" msgstr "Errore durante la stampa" -#: ../src/generic/printps.cpp:204 +#: ../src/generic/printps.cpp:202 #, c-format msgid "Printing page %d..." msgstr "Stampa della pagina %d..." -#: ../src/generic/printps.cpp:164 +#: ../src/generic/printps.cpp:162 msgid "Printing..." msgstr "Stampa in corso..." -#: ../src/common/debugrpt.cpp:552 +#: ../include/wx/docview.h:932 +#: ../include/wx/prntbase.h:247 +msgid "Printout" +msgstr "Stampa" + +#: ../src/common/debugrpt.cpp:554 #, c-format -msgid "" -"Processing debug report has failed, leaving the files in \"%s\" directory." -msgstr "" -"L'elaborazione della segnalazione di errore è fallita, i file sono " -"memorizzati nella cartella \"%s\"." +msgid "Processing debug report has failed, leaving the files in \"%s\" directory." +msgstr "L'elaborazione della segnalazione di errore è fallita, i file sono memorizzati nella cartella \"%s\"." -#: ../src/common/log.cpp:699 -msgid "Program aborted." -msgstr "Programma terminato." - -#: ../src/mac/carbon/dataview.cpp:670 +#: ../src/osx/carbon/dataview.cpp:2429 msgid "Progress renderer cannot render value type; value type: " -msgstr "" +msgstr "Progresso renderizzazione non può renderizzare tipo valore; tipo valore:" + +#: ../src/propgrid/manager.cpp:238 +msgid "Property" +msgstr "Proprietà" #: ../src/common/paper.cpp:114 msgid "Quarto, 215 x 275 mm" msgstr "Quarto, 215 x 275 mm" -#: ../src/generic/logg.cpp:1089 +#: ../src/generic/logg.cpp:1037 msgid "Question" msgstr "Domanda" -#: ../src/common/stockitem.cpp:208 +#: ../src/common/stockitem.cpp:265 msgid "Quit this program" msgstr "Esci dal programma" #: ../src/common/accelcmn.cpp:52 msgid "RETURN" -msgstr "" +msgstr "RITORNO" #: ../src/common/accelcmn.cpp:56 msgid "RIGHT" -msgstr "" +msgstr "DESTRA" -#: ../src/common/ffile.cpp:126 ../src/common/ffile.cpp:145 +#: ../src/common/ffile.cpp:114 +#: ../src/common/ffile.cpp:133 #, c-format msgid "Read error on file '%s'" msgstr "Errore di lettura nel file '%s'" @@ -4783,54 +5237,46 @@ msgstr "Errore di lettura nel file '%s'" msgid "Ready" msgstr "Pronto" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:423 -#, fuzzy +#: ../src/stc/scintilla/src/ScintillaBase.cxx:453 msgid "Redo" -msgstr "&Ripeti" +msgstr "Ripeti" -#: ../src/common/stockitem.cpp:209 +#: ../src/common/stockitem.cpp:266 msgid "Redo last action" msgstr "Ripristina l'ultima azione" -#: ../src/xrc/xmlres.cpp:710 -#, c-format -msgid "Referenced object node with ref=\"%s\" not found!" -msgstr "Impossibile trovare il nodo oggetto referenziaro con ref=\"%s\"." - -#: ../src/common/stockitem.cpp:148 +#: ../src/common/stockitem.cpp:175 msgid "Refresh" msgstr "Aggiorna" -#: ../src/msw/registry.cpp:571 +#: ../src/msw/registry.cpp:583 #, c-format msgid "Registry key '%s' already exists." -msgstr "Chiave '%s' del registro di sistema già presente." +msgstr "Chiave '%s' del registro di sistema già presente." -#: ../src/msw/registry.cpp:540 +#: ../src/msw/registry.cpp:552 #, c-format msgid "Registry key '%s' does not exist, cannot rename it." -msgstr "" -"Chiave '%s' del registro di sistema non esistente, impossibile rinominarla." +msgstr "Chiave '%s' del registro di sistema non esistente, impossibile rinominarla." -#: ../src/msw/registry.cpp:672 +#: ../src/msw/registry.cpp:684 #, c-format msgid "" "Registry key '%s' is needed for normal system operation,\n" "deleting it will leave your system in unusable state:\n" "operation aborted." msgstr "" -"Chiave '%s' del registro di sistema necessaria per un corretto funzionamento " -"del sistema, la cancellazione renderebbe\n" +"Chiave '%s' del registro di sistema necessaria per un corretto funzionamento del sistema, la cancellazione renderebbe\n" "il sistema inutilizzabile:\n" "operazione abbandonata." -#: ../src/msw/registry.cpp:466 +#: ../src/msw/registry.cpp:478 #, c-format msgid "Registry value '%s' already exists." -msgstr "Valore '%s' del registro di sistema già presente." +msgstr "Valore '%s' del registro di sistema già presente." -#: ../src/richtext/richtextfontpage.cpp:265 -#: ../src/richtext/richtextfontpage.cpp:268 +#: ../src/richtext/richtextfontpage.cpp:282 +#: ../src/richtext/richtextfontpage.cpp:285 msgid "Regular" msgstr "Normale" @@ -4838,40 +5284,37 @@ msgstr "Normale" msgid "Relevant entries:" msgstr "Voci pertinenti:" -#: ../src/generic/progdlgg.cpp:214 -#, fuzzy +#: ../src/generic/progdlgg.cpp:209 msgid "Remaining time:" msgstr "Tempo rimanente : " -#: ../src/common/stockitem.cpp:149 +#: ../src/common/stockitem.cpp:176 +#: ../src/propgrid/props.cpp:2164 msgid "Remove" msgstr "Rimuovi" -#: ../src/html/helpwnd.cpp:426 +#: ../src/html/helpwnd.cpp:438 msgid "Remove current page from bookmarks" msgstr "Rimuovi la pagina corrente dai segnalibri" #: ../src/common/rendcmn.cpp:195 #, c-format msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded." -msgstr "" -"Il renderer \"%s\" ha versione %d.%d che non è compatibile, quindi non è " -"stato caricato." +msgstr "Il renderer \"%s\" ha versione %d.%d che non è compatibile, quindi non è stato caricato." -#: ../src/mac/carbon/databrow.cpp:775 -#, fuzzy +#: ../src/osx/carbon/dataview.cpp:1391 msgid "Rendering failed." -msgstr "Creazione del timer fallita." +msgstr "Renderizzazione fallita." -#: ../src/richtext/richtextbuffer.cpp:2847 +#: ../src/richtext/richtextbuffer.cpp:2900 msgid "Renumber List" msgstr "Rinumera la lista" -#: ../src/common/stockitem.cpp:123 +#: ../src/common/stockitem.cpp:177 msgid "Rep&lace" msgstr "&Sostituisci" -#: ../src/richtext/richtextctrl.cpp:2375 +#: ../src/richtext/richtextctrl.cpp:2617 msgid "Replace" msgstr "Sostituisci" @@ -4879,7 +5322,7 @@ msgstr "Sostituisci" msgid "Replace &all" msgstr "Sostituisci t&utto" -#: ../src/common/stockitem.cpp:206 +#: ../src/common/stockitem.cpp:263 msgid "Replace selection" msgstr "Sostituisci la selezione" @@ -4887,27 +5330,32 @@ msgstr "Sostituisci la selezione" msgid "Replace with:" msgstr "Sostituisci con:" -#: ../src/xrc/xmlres.cpp:530 -msgid "Resource files must have same version number!" -msgstr "I file di risorsa devono avere la stessa versione!" +#: ../src/common/valtext.cpp:152 +msgid "Required information entry is empty." +msgstr "Campo informazioni richieste vuoto. " -#: ../src/common/stockitem.cpp:150 +#: ../src/common/translation.cpp:1726 +#, c-format +msgid "Resource '%s' is not a valid message catalog." +msgstr "La risorsa '%s' non è un catalogo di messaggi valido." + +#: ../src/common/stockitem.cpp:178 msgid "Revert to Saved" msgstr "Ritorna alla versione salvata" #: ../src/richtext/richtextliststylepage.cpp:250 -#: ../src/richtext/richtextbulletspage.cpp:199 +#: ../src/richtext/richtextbulletspage.cpp:198 msgid "Right" msgstr "Destra" -#: ../src/generic/prntdlgg.cpp:897 +#: ../src/generic/prntdlgg.cpp:898 msgid "Right margin (mm):" msgstr "Margine destro (mm):" -#: ../src/richtext/richtextliststylepage.cpp:336 -#: ../src/richtext/richtextliststylepage.cpp:338 #: ../src/richtext/richtextindentspage.cpp:158 #: ../src/richtext/richtextindentspage.cpp:160 +#: ../src/richtext/richtextliststylepage.cpp:336 +#: ../src/richtext/richtextliststylepage.cpp:338 msgid "Right-align text." msgstr "Allinea a destra" @@ -4916,68 +5364,69 @@ msgid "Roman" msgstr "Roman" #: ../src/richtext/richtextliststylepage.cpp:298 -#: ../src/richtext/richtextbulletspage.cpp:250 +#: ../src/richtext/richtextbulletspage.cpp:249 msgid "S&tandard bullet name:" msgstr "Nome di una puntatura s&tandard:" #: ../src/common/accelcmn.cpp:81 msgid "SCROLL_LOCK" -msgstr "" +msgstr "BLOCCO_SCORRIMENTO" #: ../src/common/accelcmn.cpp:70 msgid "SELECT" -msgstr "" +msgstr "SELEZIONA" #: ../src/common/accelcmn.cpp:76 msgid "SEPARATOR" -msgstr "" +msgstr "SEPARATORE" -#: ../src/common/fmapbase.cpp:155 +#: ../src/common/fmapbase.cpp:196 msgid "SHIFT-JIS" msgstr "SHIFT-JIS" #: ../src/common/accelcmn.cpp:73 msgid "SNAPSHOT" -msgstr "" +msgstr "CATTURA" #: ../src/common/accelcmn.cpp:61 msgid "SPACE" -msgstr "" +msgstr "SPAZIO" -#: ../src/common/accelcmn.cpp:250 ../src/common/accelcmn.cpp:307 +#: ../src/common/accelcmn.cpp:250 +#: ../src/common/accelcmn.cpp:307 msgid "SPECIAL" -msgstr "" +msgstr "SPECIALE" #: ../src/common/accelcmn.cpp:77 msgid "SUBTRACT" -msgstr "" +msgstr "SOTTRATTO" -#: ../src/common/sizer.cpp:2426 +#: ../src/common/sizer.cpp:2566 msgid "Save" msgstr "Salva" -#: ../src/common/fldlgcmn.cpp:284 +#: ../src/common/fldlgcmn.cpp:318 #, c-format msgid "Save %s file" msgstr "Salvare il file %s" -#: ../src/common/stockitem.cpp:152 +#: ../src/common/stockitem.cpp:180 msgid "Save &As..." msgstr "Salva con n&ome..." -#: ../src/common/docview.cpp:305 +#: ../src/common/docview.cpp:315 msgid "Save As" -msgstr "Salva con Nome" +msgstr "Salva come" -#: ../src/common/stockitem.cpp:212 +#: ../src/common/stockitem.cpp:269 msgid "Save current document" msgstr "Salvare il documento corrente" -#: ../src/common/stockitem.cpp:213 +#: ../src/common/stockitem.cpp:270 msgid "Save current document with a different filename" msgstr "Salva il documento con un nome differente" -#: ../src/generic/logg.cpp:535 +#: ../src/generic/logg.cpp:524 msgid "Save log contents to file" msgstr "Salva il registro su file" @@ -4985,17 +5434,15 @@ msgstr "Salva il registro su file" msgid "Script" msgstr "Script" -#: ../src/html/htmlhelp.cpp:610 ../src/html/helpwnd.cpp:534 -#: ../src/html/helpwnd.cpp:549 ../src/generic/srchctlg.cpp:362 +#: ../src/generic/srchctlg.cpp:362 +#: ../src/html/helpwnd.cpp:546 +#: ../src/html/helpwnd.cpp:561 msgid "Search" msgstr "Cerca" -#: ../src/html/helpwnd.cpp:536 -msgid "" -"Search contents of help book(s) for all occurences of the text you typed " -"above" -msgstr "" -"Cerca nel sommario del/dei libro/i di aiuto il testo immesso quì sopra." +#: ../src/html/helpwnd.cpp:548 +msgid "Search contents of help book(s) for all occurrences of the text you typed above" +msgstr "Cerca i contenuti nelle Guida(e) per tutte le occorrenze del testo digitato di seguito" #: ../src/generic/fdrepdlg.cpp:161 msgid "Search direction" @@ -5005,69 +5452,63 @@ msgstr "Direzione" msgid "Search for:" msgstr "Trova:" -#: ../src/html/helpwnd.cpp:1065 +#: ../src/html/helpwnd.cpp:1060 msgid "Search in all books" msgstr "Cerca in tutti i libri" -#: ../src/html/htmlhelp.cpp:593 -msgid "Search!" -msgstr "Cerca!" - -#: ../src/html/htmlhelp.cpp:383 ../src/html/htmlhelp.cpp:441 -#: ../src/html/helpwnd.cpp:875 +#: ../src/html/helpwnd.cpp:870 msgid "Searching..." msgstr "Ricerca in corso..." -#: ../src/generic/dirctrlg.cpp:593 +#: ../src/generic/dirctrlg.cpp:597 msgid "Sections" msgstr "Sezioni" -#: ../src/common/ffile.cpp:231 +#: ../src/common/ffile.cpp:219 #, c-format msgid "Seek error on file '%s'" msgstr "Errore durante la seek nel file '%s'" -#: ../src/common/ffile.cpp:221 +#: ../src/common/ffile.cpp:209 #, c-format msgid "Seek error on file '%s' (large files not supported by stdio)" -msgstr "" -"Errore durante la seek nel file '%s' (stdio non supporta file di queste " -"dimensioni))" +msgstr "Errore durante la seek nel file '%s' (stdio non supporta file di queste dimensioni))" -#: ../src/common/stockitem.cpp:153 ../src/richtext/richtextctrl.cpp:2600 -#: ../src/msw/textctrl.cpp:2156 ../src/mac/carbon/textctrl.cpp:1069 +#: ../src/richtext/richtextctrl.cpp:301 +#: ../src/osx/textctrl_osx.cpp:592 +#: ../src/common/stockitem.cpp:181 +#: ../src/msw/textctrl.cpp:2179 msgid "Select &All" msgstr "&Seleziona tutto" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:430 -#, fuzzy +#: ../src/stc/scintilla/src/ScintillaBase.cxx:460 msgid "Select All" -msgstr "&Seleziona tutto" +msgstr "Seleziona tutto" -#: ../src/common/docview.cpp:1744 +#: ../src/common/docview.cpp:1753 msgid "Select a document template" msgstr "Scegliere un modello di documento" -#: ../src/common/docview.cpp:1821 +#: ../src/common/docview.cpp:1827 msgid "Select a document view" msgstr "Scegliere una visualizzazione del documento" -#: ../src/richtext/richtextfontpage.cpp:192 -#: ../src/richtext/richtextfontpage.cpp:194 +#: ../src/richtext/richtextfontpage.cpp:195 +#: ../src/richtext/richtextfontpage.cpp:197 msgid "Select regular or bold." msgstr "Seleziona tra normale e grassetto." -#: ../src/richtext/richtextfontpage.cpp:179 -#: ../src/richtext/richtextfontpage.cpp:181 +#: ../src/richtext/richtextfontpage.cpp:182 +#: ../src/richtext/richtextfontpage.cpp:184 msgid "Select regular or italic style." msgstr "Seleziona tra normale e corsivo." -#: ../src/richtext/richtextfontpage.cpp:205 -#: ../src/richtext/richtextfontpage.cpp:207 +#: ../src/richtext/richtextfontpage.cpp:208 +#: ../src/richtext/richtextfontpage.cpp:210 msgid "Select underlining or no underlining." msgstr "Seleziona sottolineato/non sottolineato" -#: ../src/motif/filedlg.cpp:220 +#: ../src/motif/filedlg.cpp:219 msgid "Selection" msgstr "Selezione" @@ -5076,40 +5517,44 @@ msgstr "Selezione" msgid "Selects the list level to edit." msgstr "Seleziona il livello da modificare." -#: ../src/common/cmdline.cpp:790 +#: ../src/common/cmdline.cpp:848 #, c-format msgid "Separator expected after the option '%s'." msgstr "Atteso separatore dopo l'opzione '%s'." +#: ../src/common/filename.cpp:2461 +msgid "Setting directory access times is not supported under this OS version" +msgstr "Impostazione accesso temporizzato all cartella non è supportato da questo sistema operativo." + #: ../src/generic/prntdlgg.cpp:194 msgid "Setup..." msgstr "Configurazione..." -#: ../src/msw/dialup.cpp:566 +#: ../src/msw/dialup.cpp:567 msgid "Several active dialup connections found, choosing one randomly." -msgstr "Trovate più connessioni attive, ne viene scelta una a caso." +msgstr "Trovate più connessioni attive, ne viene scelta una a caso." #: ../src/common/accelcmn.cpp:298 -msgid "Shift-" -msgstr "Maiusc-" +msgid "Shift+" +msgstr "Maiusc+" #: ../src/generic/dirdlgg.cpp:171 msgid "Show &hidden directories" msgstr "Visualizza le &cartelle nascoste" -#: ../src/generic/filectrlg.cpp:998 +#: ../src/generic/filectrlg.cpp:993 msgid "Show &hidden files" msgstr "Visualizza i &file nascosti" -#: ../src/common/stockitem.cpp:202 +#: ../src/common/stockitem.cpp:259 msgid "Show about dialog" msgstr "Visualizza la finestra di informazioni sul programma" -#: ../src/html/helpwnd.cpp:488 +#: ../src/html/helpwnd.cpp:500 msgid "Show all" msgstr "Visualizza tutto" -#: ../src/html/helpwnd.cpp:499 +#: ../src/html/helpwnd.cpp:511 msgid "Show all items in index" msgstr "Visualizza tutti le voci dell'indice" @@ -5117,62 +5562,65 @@ msgstr "Visualizza tutti le voci dell'indice" msgid "Show hidden directories" msgstr "Visualizza le cartelle nascoste" -#: ../src/html/htmlhelp.cpp:538 ../src/html/helpwnd.cpp:656 +#: ../src/html/helpwnd.cpp:669 msgid "Show/hide navigation panel" msgstr "Visualizza/nascondi la barra di navigazione" -#: ../src/richtext/richtextsymboldlg.cpp:414 -#: ../src/richtext/richtextsymboldlg.cpp:416 +#: ../src/richtext/richtextsymboldlg.cpp:415 +#: ../src/richtext/richtextsymboldlg.cpp:417 msgid "Shows a Unicode subset." msgstr "Visualizza un sottoinsieme di Unicode." #: ../src/richtext/richtextliststylepage.cpp:474 #: ../src/richtext/richtextliststylepage.cpp:476 -#: ../src/richtext/richtextbulletspage.cpp:274 -#: ../src/richtext/richtextbulletspage.cpp:276 +#: ../src/richtext/richtextbulletspage.cpp:273 +#: ../src/richtext/richtextbulletspage.cpp:275 msgid "Shows a preview of the bullet settings." msgstr "Visualizza l'anteprima delle impostazioni di puntatura." -#: ../src/richtext/richtextfontpage.cpp:256 -#: ../src/richtext/richtextfontpage.cpp:258 +#: ../src/richtext/richtextfontpage.cpp:273 +#: ../src/richtext/richtextfontpage.cpp:275 msgid "Shows a preview of the font settings." msgstr "Visualizza l'anteprima delle impostazioni del font." -#: ../src/mac/carbon/fontdlg.cpp:556 ../src/mac/carbon/fontdlg.cpp:558 +#: ../src/osx/carbon/fontdlg.cpp:568 +#: ../src/osx/carbon/fontdlg.cpp:570 msgid "Shows a preview of the font." msgstr "Visualizza l'anteprima del font." -#: ../src/richtext/richtextindentspage.cpp:327 -#: ../src/richtext/richtextindentspage.cpp:329 +#: ../src/richtext/richtextindentspage.cpp:335 +#: ../src/richtext/richtextindentspage.cpp:337 msgid "Shows a preview of the paragraph settings." msgstr "Visualizza l'anteprima delle impostazioni di paragrafo." -#: ../src/generic/fontdlgg.cpp:462 ../src/generic/fontdlgg.cpp:464 +#: ../src/generic/fontdlgg.cpp:462 +#: ../src/generic/fontdlgg.cpp:464 msgid "Shows the font preview." msgstr "Visualizza l'anteprima del font" -#: ../src/univ/themes/mono.cpp:509 +#: ../src/univ/themes/mono.cpp:517 msgid "Simple monochrome theme" msgstr "Tema monocromatico" +#: ../src/richtext/richtextindentspage.cpp:314 +#: ../src/richtext/richtextindentspage.cpp:325 +#: ../src/richtext/richtextindentspage.cpp:326 #: ../src/richtext/richtextliststylepage.cpp:459 #: ../src/richtext/richtextliststylepage.cpp:462 #: ../src/richtext/richtextliststylepage.cpp:463 -#: ../src/richtext/richtextindentspage.cpp:314 -#: ../src/richtext/richtextindentspage.cpp:317 -#: ../src/richtext/richtextindentspage.cpp:318 msgid "Single" msgstr "Singola" -#: ../src/generic/filectrlg.cpp:459 +#: ../src/generic/filectrlg.cpp:454 msgid "Size" msgstr "Dimensione" -#: ../src/mac/carbon/fontdlg.cpp:501 +#: ../src/osx/carbon/fontdlg.cpp:513 msgid "Size:" msgstr "Dimensione:" -#: ../src/generic/progdlgg.cpp:226 ../src/generic/progdlgg.cpp:611 +#: ../src/generic/progdlgg.cpp:221 +#: ../src/generic/progdlgg.cpp:686 msgid "Skip" msgstr "Salta" @@ -5180,35 +5628,23 @@ msgstr "Salta" msgid "Slant" msgstr "Slant" -#: ../src/common/docview.cpp:597 -msgid "Sorry, could not open this file for saving." -msgstr "Spiacente, impossibile aprire il file per salvare." - -#: ../src/common/docview.cpp:633 ../src/common/docview.cpp:1643 +#: ../src/common/docview.cpp:1649 msgid "Sorry, could not open this file." msgstr "Spiacente, impossibile aprire il file." -#: ../src/common/docview.cpp:604 -msgid "Sorry, could not save this file." -msgstr "Spiacente, impossibile salvare il file." - -#: ../src/common/prntbase.cpp:1521 +#: ../src/common/prntbase.cpp:1600 +#: ../src/common/prntbase.cpp:1608 msgid "Sorry, not enough memory to create a preview." msgstr "Spiacente, memoria insufficente per la creazione di un'anteprima." -#: ../src/common/docview.cpp:1057 -msgid "Sorry, print preview needs a printer to be installed." -msgstr "Spiacente, l'anteprima di stampa richiede una stampante installata." - #: ../src/richtext/richtextstyledlg.cpp:573 #: ../src/richtext/richtextstyledlg.cpp:621 -#: ../src/richtext/richtextstyledlg.cpp:775 -#: ../src/richtext/richtextstyledlg.cpp:851 +#: ../src/richtext/richtextstyledlg.cpp:776 +#: ../src/richtext/richtextstyledlg.cpp:852 msgid "Sorry, that name is taken. Please choose another." -msgstr "" -"Spiacente, il nome è già in uso, si prega di sceglierne uno differente." +msgstr "Spiacente, il nome è già in uso, si prega di sceglierne uno differente." -#: ../src/common/docview.cpp:1297 ../src/common/docview.cpp:1663 +#: ../src/common/docview.cpp:1672 msgid "Sorry, the format for this file is unknown." msgstr "Spiacente, formato del file sconosciuto." @@ -5226,7 +5662,7 @@ msgid "Spacing" msgstr "Spaziatura" #: ../src/richtext/richtextliststylepage.cpp:492 -#: ../src/richtext/richtextbulletspage.cpp:290 +#: ../src/richtext/richtextbulletspage.cpp:292 msgid "Standard" msgstr "Standard" @@ -5238,10 +5674,6 @@ msgstr "Statement, 5 1/2 x 8 1/2 pollici" msgid "Status:" msgstr "Stato:" -#: ../src/generic/logg.cpp:652 -msgid "Status: " -msgstr "Stato: " - #: ../src/common/xtistrm.cpp:249 msgid "Streaming delegates for not already streamed objects not yet supported" msgstr "Streaming con oggetti non stream non ancora supportato" @@ -5252,6 +5684,7 @@ msgid "String To Colour : Incorrect colour specification : %s" msgstr "Specifica di colore '%s' non valida" #: ../src/richtext/richtextformatdlg.cpp:269 +#: ../src/propgrid/advprops.cpp:647 msgid "Style" msgstr "Stile" @@ -5259,25 +5692,17 @@ msgstr "Stile" msgid "Style Organiser" msgstr "Gestore degli stili" -#: ../src/mac/carbon/fontdlg.cpp:510 +#: ../src/osx/carbon/fontdlg.cpp:522 msgid "Style:" msgstr "Stile:" -#: ../src/xrc/xmlres.cpp:813 -#, c-format -msgid "Subclass '%s' not found for resource '%s', not subclassing!" -msgstr "" -"Sottoclasse '%s' non trovata per la risorsa '%s', subclassing non eseguito!" - -#: ../src/richtext/richtextfontpage.cpp:246 -#, fuzzy +#: ../src/richtext/richtextfontpage.cpp:263 msgid "Subscrip&t" -msgstr "Script" +msgstr "&Pedice" -#: ../src/richtext/richtextfontpage.cpp:239 -#, fuzzy +#: ../src/richtext/richtextfontpage.cpp:256 msgid "Supe&rscript" -msgstr "Script" +msgstr "&Apice" #: ../src/common/paper.cpp:152 msgid "SuperA/SuperA/A4 227 x 356 mm" @@ -5292,52 +5717,45 @@ msgid "Swiss" msgstr "Svizzero" #: ../src/richtext/richtextliststylepage.cpp:490 -#: ../src/richtext/richtextbulletspage.cpp:288 +#: ../src/richtext/richtextbulletspage.cpp:290 msgid "Symbol" msgstr "Simbolo" #: ../src/richtext/richtextliststylepage.cpp:287 -#: ../src/richtext/richtextbulletspage.cpp:238 +#: ../src/richtext/richtextbulletspage.cpp:237 msgid "Symbol &font:" msgstr "Font del simbolo:" -#: ../include/wx/richtext/richtextsymboldlg.h:46 -msgid "Symbols" -msgstr "Simboli" - #: ../src/common/accelcmn.cpp:62 msgid "TAB" -msgstr "" +msgstr "TAB" -#: ../src/common/imagtiff.cpp:93 -msgid "TIFF library error." -msgstr "Errore della libreria TIFF." - -#: ../src/common/imagtiff.cpp:77 -msgid "TIFF library warning." -msgstr "messaggio di avviso della libreria TIFF." - -#: ../src/common/imagtiff.cpp:309 ../src/common/imagtiff.cpp:320 -#: ../src/common/imagtiff.cpp:519 +#: ../src/common/imagtiff.cpp:327 +#: ../src/common/imagtiff.cpp:340 +#: ../src/common/imagtiff.cpp:548 msgid "TIFF: Couldn't allocate memory." msgstr "TIFF: Impossibile allocare la memoria." -#: ../src/common/imagtiff.cpp:272 +#: ../src/common/imagtiff.cpp:274 msgid "TIFF: Error loading image." msgstr "TIFF: Errore nel caricamento dell'immagine." -#: ../src/common/imagtiff.cpp:334 +#: ../src/common/imagtiff.cpp:356 msgid "TIFF: Error reading image." msgstr "TIFF: Errore durante la lettura dell'immagine." -#: ../src/common/imagtiff.cpp:439 +#: ../src/common/imagtiff.cpp:466 msgid "TIFF: Error saving image." msgstr "TIFF: Errore nel salvataggio dell'immagine." -#: ../src/common/imagtiff.cpp:565 +#: ../src/common/imagtiff.cpp:596 msgid "TIFF: Error writing image." msgstr "TIFF: Errore durante la scrittura dell'immagine." +#: ../src/common/imagtiff.cpp:313 +msgid "TIFF: Image size is abnormally big." +msgstr "TIFF: dimensione immaggine esageratamenet grande." + #: ../src/common/paper.cpp:147 msgid "Tabloid Extra 11.69 x 18 in" msgstr "Tabloid Extra 11,69 x 18 pollici" @@ -5354,30 +5772,30 @@ msgstr "Tabulazioni" msgid "Teletype" msgstr "Teletype" -#: ../src/common/docview.cpp:1745 +#: ../src/common/docview.cpp:1754 msgid "Templates" msgstr "Modelli" -#: ../src/mac/carbon/dataview.cpp:531 +#: ../src/osx/carbon/dataview.cpp:2330 msgid "Text renderer cannot render value; value type: " -msgstr "" +msgstr "Renderizzatore testo non può renderizzare il valore; tipo valore:" -#: ../src/common/fmapbase.cpp:118 +#: ../src/common/fmapbase.cpp:159 msgid "Thai (ISO-8859-11)" msgstr "Thai (ISO-8859-11)" -#: ../src/common/ftp.cpp:706 +#: ../src/common/ftp.cpp:620 msgid "The FTP server doesn't support passive mode." -msgstr "Il server FTP non supporta la modalità passiva di trasfrimento" +msgstr "Il server FTP non supporta la modalità passiva di trasfrimento" -#: ../src/common/ftp.cpp:694 +#: ../src/common/ftp.cpp:606 msgid "The FTP server doesn't support the PORT command." msgstr "Il server FTP non supporta il comando PORT." #: ../src/richtext/richtextliststylepage.cpp:214 #: ../src/richtext/richtextliststylepage.cpp:216 -#: ../src/richtext/richtextbulletspage.cpp:162 -#: ../src/richtext/richtextbulletspage.cpp:164 +#: ../src/richtext/richtextbulletspage.cpp:161 +#: ../src/richtext/richtextbulletspage.cpp:163 msgid "The available bullet styles." msgstr "Tipi di puntatura disponibili." @@ -5390,15 +5808,15 @@ msgstr "Gli stili disponibili." #: ../src/richtext/richtextliststylepage.cpp:255 #: ../src/richtext/richtextliststylepage.cpp:274 #: ../src/richtext/richtextliststylepage.cpp:276 -#: ../src/richtext/richtextbulletspage.cpp:202 -#: ../src/richtext/richtextbulletspage.cpp:204 -#: ../src/richtext/richtextbulletspage.cpp:225 -#: ../src/richtext/richtextbulletspage.cpp:227 +#: ../src/richtext/richtextbulletspage.cpp:201 +#: ../src/richtext/richtextbulletspage.cpp:203 +#: ../src/richtext/richtextbulletspage.cpp:224 +#: ../src/richtext/richtextbulletspage.cpp:226 msgid "The bullet character." msgstr "Il carattere di puntatura" -#: ../src/richtext/richtextsymboldlg.cpp:436 -#: ../src/richtext/richtextsymboldlg.cpp:438 +#: ../src/richtext/richtextsymboldlg.cpp:437 +#: ../src/richtext/richtextsymboldlg.cpp:439 msgid "The character code." msgstr "Il codice del carattere." @@ -5409,15 +5827,23 @@ msgid "" "another charset to replace it with or choose\n" "[Cancel] if it cannot be replaced" msgstr "" -"Il set di caratteri '%s' è sconosciuto. È possibile sceglierne\n" +"Il set di caratteri '%s' è sconosciuto. È possibile sceglierne\n" "un altro in sostituzione oppure scegliere [Annulla]\n" -"se non può essere sostituito." +"se non può essere sostituito." #: ../src/msw/ole/dataobj.cpp:162 #, c-format msgid "The clipboard format '%d' doesn't exist." msgstr "Il formato '%d' degli appunti non esiste." +#: ../src/common/dobjcmn.cpp:125 +msgid "The data format for the GET-direction of the to be added data object already exists" +msgstr "Il formato dati per la direzione-GET dell'oggetto dati aggiunto esiste già" + +#: ../src/common/dobjcmn.cpp:133 +msgid "The data format for the SET-direction of the to be added data object already exists" +msgstr "Il formato dati per la direzione-SET dell'oggetto dati aggiunto esiste già" + #: ../src/richtext/richtextstylepage.cpp:127 #: ../src/richtext/richtextstylepage.cpp:129 msgid "The default style for the next paragraph." @@ -5432,144 +5858,154 @@ msgstr "" "La cartella '%s' non esiste.\n" "Crearla adesso?" -#: ../src/common/docview.cpp:2012 +#: ../src/html/htmprint.cpp:272 #, c-format msgid "" -"The file '%s' couldn't be opened.\n" -"It has been removed from the most recently used files list." +"The document \"%s\" doesn't fit on the page horizontally and will be truncated if printed.\n" +"\n" +"Would you like to proceed with printing it nevertheless?" msgstr "" -"Il file '%s' non può essere aperto.\n" -"È stato rimosso dalla lista dei file aperti di recente." +"Il documento \"%s\" non è adattato alla pagina orizzontalmente e verrà troncato in fase di stampa.\n" +"\n" +"Procedere comunue con la stampa?" -#: ../src/common/docview.cpp:2022 +#: ../src/common/docview.cpp:1929 #, c-format -msgid "" -"The file '%s' doesn't exist and couldn't be opened.\n" -"It has been removed from the most recently used files list." -msgstr "" -"Il file '%s' non esiste e non può essere aperto.\n" -"È stato rimosso dalla lista dei file aperti di recente." +msgid "The file '%s' couldn't be opened." +msgstr "Il file '%s' non può essere aperto." + +#: ../src/common/docview.cpp:1933 +#, c-format +msgid "The file '%s' doesn't exist and couldn't be opened." +msgstr "Il file '%s' non esiste e non può essere aperto." -#: ../src/richtext/richtextliststylepage.cpp:397 -#: ../src/richtext/richtextliststylepage.cpp:399 #: ../src/richtext/richtextindentspage.cpp:224 #: ../src/richtext/richtextindentspage.cpp:226 +#: ../src/richtext/richtextliststylepage.cpp:397 +#: ../src/richtext/richtextliststylepage.cpp:399 msgid "The first line indent." msgstr "Il rientro della prima riga." -#: ../src/gtk/utilsgtk.cpp:508 +#: ../src/gtk/utilsgtk.cpp:492 msgid "The following standard GTK+ options are also supported:\n" -msgstr "" +msgstr "Sono inoltre supportate le seguenti opzioni standard GTK+:\n" -#: ../src/generic/fontdlgg.cpp:416 ../src/generic/fontdlgg.cpp:418 +#: ../src/generic/fontdlgg.cpp:416 +#: ../src/generic/fontdlgg.cpp:418 msgid "The font colour." msgstr "Il colore del carattere" -#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379 +#: ../src/generic/fontdlgg.cpp:377 +#: ../src/generic/fontdlgg.cpp:379 msgid "The font family." msgstr "La famiglia di caratteri" -#: ../src/richtext/richtextsymboldlg.cpp:398 -#: ../src/richtext/richtextsymboldlg.cpp:400 +#: ../src/richtext/richtextsymboldlg.cpp:399 +#: ../src/richtext/richtextsymboldlg.cpp:401 msgid "The font from which to take the symbol." msgstr "Il font da cui prendere il simbolo." -#: ../src/generic/fontdlgg.cpp:429 ../src/generic/fontdlgg.cpp:431 -#: ../src/generic/fontdlgg.cpp:436 ../src/generic/fontdlgg.cpp:438 +#: ../src/generic/fontdlgg.cpp:429 +#: ../src/generic/fontdlgg.cpp:431 +#: ../src/generic/fontdlgg.cpp:436 +#: ../src/generic/fontdlgg.cpp:438 msgid "The font point size." msgstr "Il corpo del font" -#: ../src/mac/carbon/fontdlg.cpp:505 ../src/mac/carbon/fontdlg.cpp:507 +#: ../src/osx/carbon/fontdlg.cpp:517 +#: ../src/osx/carbon/fontdlg.cpp:519 msgid "The font size in points." msgstr "La dimensione in punti del font." -#: ../src/generic/fontdlgg.cpp:388 ../src/generic/fontdlgg.cpp:390 +#: ../src/generic/fontdlgg.cpp:388 +#: ../src/generic/fontdlgg.cpp:390 msgid "The font style." msgstr "Lo stile del carattere" -#: ../src/generic/fontdlgg.cpp:399 ../src/generic/fontdlgg.cpp:401 +#: ../src/generic/fontdlgg.cpp:399 +#: ../src/generic/fontdlgg.cpp:401 msgid "The font weight." msgstr "Il peso del carattere" -#: ../src/richtext/richtextliststylepage.cpp:386 -#: ../src/richtext/richtextliststylepage.cpp:388 +#: ../src/common/docview.cpp:1335 +#, c-format +msgid "The format of file '%s' couldn't be determined." +msgstr "Impossibile determinare il formato del file '%s'." + #: ../src/richtext/richtextindentspage.cpp:212 #: ../src/richtext/richtextindentspage.cpp:214 +#: ../src/richtext/richtextliststylepage.cpp:386 +#: ../src/richtext/richtextliststylepage.cpp:388 msgid "The left indent." msgstr "Il rientro dal margine sinistro." +#: ../src/richtext/richtextindentspage.cpp:327 +#: ../src/richtext/richtextindentspage.cpp:329 #: ../src/richtext/richtextliststylepage.cpp:464 #: ../src/richtext/richtextliststylepage.cpp:466 -#: ../src/richtext/richtextindentspage.cpp:319 -#: ../src/richtext/richtextindentspage.cpp:321 msgid "The line spacing." msgstr "L'interlinea" -#: ../src/richtext/richtextbulletspage.cpp:266 -#: ../src/richtext/richtextbulletspage.cpp:268 +#: ../src/richtext/richtextbulletspage.cpp:265 +#: ../src/richtext/richtextbulletspage.cpp:267 msgid "The list item number." msgstr "Il numero della voce della lista." #: ../src/richtext/richtextindentspage.cpp:257 #: ../src/richtext/richtextindentspage.cpp:259 -#, fuzzy msgid "The outline level." -msgstr "Le anteprime degli stili." +msgstr "Livello contorni." -#: ../src/common/filename.cpp:1254 +#: ../src/common/filename.cpp:1441 #, c-format msgid "The path '%s' contains too many \"..\"!" msgstr "Il percorso '%s' contiene troppi \"..\"!" -#: ../src/common/log.cpp:501 +#: ../src/common/log.cpp:219 #, c-format msgid "The previous message repeated once." -msgid_plural "The previous message repeated %lu times." -msgstr[0] "" -msgstr[1] "" +msgstr "Il messaggio precedente è stato ripetuto una volta." -#: ../src/gtk/print.cpp:891 ../src/gtk/print.cpp:1079 +#: ../src/gtk/print.cpp:863 +#: ../src/gtk/print.cpp:1048 msgid "The print dialog returned an error." -msgstr "" +msgstr "La finestra di dialogo stampa ha ritornato un errore." -#: ../src/richtext/richtextsymboldlg.cpp:455 -#: ../src/richtext/richtextsymboldlg.cpp:457 +#: ../src/richtext/richtextsymboldlg.cpp:456 +#: ../src/richtext/richtextsymboldlg.cpp:458 msgid "The range to show." msgstr "Intervallo da visualizzare." -#: ../src/generic/dbgrptg.cpp:318 +#: ../src/generic/dbgrptg.cpp:319 msgid "" -"The report contains the files listed below. If any of these files contain " -"private information,\n" +"The report contains the files listed below. If any of these files contain private information,\n" "please uncheck them and they will be removed from the report.\n" msgstr "" -"La segnalazione contiene i file elencati. Se qualcuno di questi file " -"contenesse informazioni\n" -"private, si prega di rimuovere il segno di spunta per prevenirne " -"l'inclusione nella segnalazione.\n" +"La segnalazione contiene i file elencati. Se qualcuno di questi file contenesse informazioni\n" +"private, si prega di rimuovere il segno di spunta per prevenirne l'inclusione nella segnalazione.\n" -#: ../src/common/cmdline.cpp:955 +#: ../src/common/cmdline.cpp:1013 #, c-format msgid "The required parameter '%s' was not specified." -msgstr "Il parametro '%s' è obbligatorio." +msgstr "Il parametro '%s' è obbligatorio." -#: ../src/richtext/richtextliststylepage.cpp:408 -#: ../src/richtext/richtextliststylepage.cpp:410 #: ../src/richtext/richtextindentspage.cpp:236 #: ../src/richtext/richtextindentspage.cpp:238 +#: ../src/richtext/richtextliststylepage.cpp:408 +#: ../src/richtext/richtextliststylepage.cpp:410 msgid "The right indent." msgstr "Rientro da destra." +#: ../src/richtext/richtextindentspage.cpp:304 #: ../src/richtext/richtextliststylepage.cpp:448 #: ../src/richtext/richtextliststylepage.cpp:450 -#: ../src/richtext/richtextindentspage.cpp:304 msgid "The spacing after the paragraph." msgstr "Spazio dopo il paragrafo." -#: ../src/richtext/richtextliststylepage.cpp:437 -#: ../src/richtext/richtextliststylepage.cpp:439 #: ../src/richtext/richtextindentspage.cpp:291 #: ../src/richtext/richtextindentspage.cpp:293 +#: ../src/richtext/richtextliststylepage.cpp:437 +#: ../src/richtext/richtextliststylepage.cpp:439 msgid "The spacing before the paragraph." msgstr "Spazio prima del paragrafo." @@ -5597,109 +6033,94 @@ msgstr "Il punto di tabulazione." msgid "The tab positions." msgstr "I punti di tabulazione." -#: ../src/common/textcmn.cpp:760 ../src/richtext/richtextctrl.cpp:1918 +#: ../src/richtext/richtextctrl.cpp:2154 msgid "The text couldn't be saved." -msgstr "Il testo non può essere salvato." +msgstr "Il testo non può essere salvato." -#: ../src/common/cmdline.cpp:933 +#: ../src/common/cmdline.cpp:991 #, c-format msgid "The value for the option '%s' must be specified." msgstr "L'opzione '%s' richiede un parametro." -#: ../src/msw/dialup.cpp:455 -#, fuzzy, c-format -msgid "" -"The version of remote access service (RAS) installed on this machine is too " -"old, please upgrade (the following required function is missing: %s)." -msgstr "" -"La versione del servizio di Accesso Remoto (RAS) installata è troppo " -"vecchia. Si prega di aggiornarla (la funzione %s è assente)." +#: ../src/msw/dialup.cpp:456 +#, c-format +msgid "The version of remote access service (RAS) installed on this machine is too old, please upgrade (the following required function is missing: %s)." +msgstr "La versione del servizio di Accesso Remoto (RAS) installata è troppo vecchia. Aggiornarla (la funzione richiesta %s è assente)." -#: ../src/gtk/print.cpp:921 +#: ../src/gtk/print.cpp:893 msgid "The wxGtkPrinterDC cannot be used." -msgstr "" +msgstr "wxGtkPrinterDC non puòe ssere usato." -#: ../src/mac/carbon/databrow.cpp:682 +#: ../src/osx/carbon/dataview.cpp:1301 msgid "There is no column or renderer for the specified column index." -msgstr "" +msgstr "Non ci sono colonne o renderizzatori per l'indice collonen specificato." -#: ../src/richtext/richtextprint.cpp:575 ../src/html/htmprint.cpp:610 -msgid "" -"There was a problem during page setup: you may need to set a default printer." -msgstr "" -"Si è verificato un problema: potrebbe essere necessario impostare una " -"stampante predefinita." +#: ../src/richtext/richtextprint.cpp:575 +#: ../src/html/htmprint.cpp:743 +msgid "There was a problem during page setup: you may need to set a default printer." +msgstr "Si è verificato un problema: potrebbe essere necessario impostare una stampante predefinita." + +#: ../src/html/htmprint.cpp:256 +msgid "This document doesn't fit on the page horizontally and will be truncated when it is printed." +msgstr "Il documento non è adattato alla pagina in orizzontale e verrà troncato in fase di stampa." #: ../src/msw/datecontrols.cpp:60 -#, fuzzy -msgid "" -"This system doesn't support date controls, please upgrade your version of " -"comctl32.dll" -msgstr "" -"Il sistema non supporta la finestra di scelta delle date, si prega di " -"aggiornare la libreria comctl32.dll" +msgid "This system doesn't support date controls, please upgrade your version of comctl32.dll" +msgstr "Il sistema non supporta il controllo della data, aggiornare la libreria comctl32.dll" -#: ../src/msw/thread.cpp:1247 -msgid "" -"Thread module initialization failed: cannot store value in thread local " -"storage" -msgstr "" -"Inizializzazione del modulo dei thread fallita: impossibile memorizzare un " -"valore nella memoria locale del thread" +#: ../src/msw/thread.cpp:1264 +msgid "Thread module initialization failed: cannot store value in thread local storage" +msgstr "Inizializzazione modulo dei thread fallita: impossibile memorizzare un valore nella memoria locale del thread" -#: ../src/unix/threadpsx.cpp:1686 +#: ../src/unix/threadpsx.cpp:1694 msgid "Thread module initialization failed: failed to create thread key" -msgstr "" -"Inizializzazione del modulo dei thread fallita: errore nella creazione della " -"chiave dei thread" +msgstr "Inizializzazione del modulo dei thread fallita: errore nella creazione della chiave dei thread" -#: ../src/msw/thread.cpp:1235 -msgid "" -"Thread module initialization failed: impossible to allocate index in thread " -"local storage" -msgstr "" -"Inizializzazione del modulo dei thread fallita: impossibile allocare " -"l'indice nella memoria locale del thread" +#: ../src/msw/thread.cpp:1252 +msgid "Thread module initialization failed: impossible to allocate index in thread local storage" +msgstr "Inizializzazione del modulo dei thread fallita: impossibile allocare l'indice nella memoria locale del thread" -#: ../src/unix/threadpsx.cpp:1200 +#: ../src/unix/threadpsx.cpp:1205 msgid "Thread priority setting is ignored." -msgstr "Priorità del thread ignorata." +msgstr "Priorità del thread ignorata." -#: ../src/msw/mdi.cpp:168 +#: ../src/msw/mdi.cpp:165 msgid "Tile &Horizontally" msgstr "Affianca orizzontalmente" -#: ../src/msw/mdi.cpp:169 +#: ../src/msw/mdi.cpp:166 msgid "Tile &Vertically" msgstr "Affianca verticalmente" -#: ../src/common/ftp.cpp:633 +#: ../src/common/ftp.cpp:201 msgid "Timeout while waiting for FTP server to connect, try passive mode." -msgstr "" -"Tempo di attesa eccessivo durante l'attesa per la connessione del server " -"FTP, si prega di provare la modalità assiva." +msgstr "Tempo di attesa eccessivo durante l'attesa per la connessione del server FTP, si prega di provare la modalità assiva." -#: ../src/os2/timer.cpp:100 ../src/msw/timer.cpp:93 +#: ../src/os2/timer.cpp:100 msgid "Timer creation failed." msgstr "Creazione del timer fallita." -#: ../src/generic/tipdlg.cpp:218 +#: ../src/generic/tipdlg.cpp:221 msgid "Tip of the Day" msgstr "Suggerimento del giorno" -#: ../src/generic/tipdlg.cpp:153 +#: ../src/generic/tipdlg.cpp:155 msgid "Tips not available, sorry!" msgstr "Spiacente, suggerimenti non disponibili!" -#: ../src/generic/prntdlgg.cpp:249 +#: ../src/osx/dataview_osx.cpp:168 +msgid "To be deleted item is invalid." +msgstr "L'elemento ad eliminare non è valido" + +#: ../src/generic/prntdlgg.cpp:248 msgid "To:" msgstr "Per:" -#: ../src/mac/carbon/dataview.cpp:648 +#: ../src/osx/carbon/dataview.cpp:2408 msgid "Toggle renderer cannot render value; value type: " -msgstr "" +msgstr "Toogle rendere non puoò renderizzare valore; tipo valore:" -#: ../src/richtext/richtextbuffer.cpp:5473 +#: ../src/richtext/richtextbuffer.cpp:5666 msgid "Too many EndStyle calls!" msgstr "Troppe chiamate a EndStyle!" @@ -5707,7 +6128,7 @@ msgstr "Troppe chiamate a EndStyle!" msgid "Too many colours in PNG, the image may be slightly blurred." msgstr "Troppi colori nell'immagine PNG, potrebbe essere leggermente sfuocata." -#: ../src/generic/prntdlgg.cpp:886 +#: ../src/generic/prntdlgg.cpp:887 msgid "Top margin (mm):" msgstr "Margine superiore (mm):" @@ -5715,141 +6136,244 @@ msgstr "Margine superiore (mm):" msgid "Translations by " msgstr "Tradotto da" -#: ../src/generic/aboutdlgg.cpp:154 -#, fuzzy +#: ../src/generic/aboutdlgg.cpp:189 msgid "Translators" -msgstr "Tradotto da" +msgstr "Traduttori" -#: ../src/common/fs_mem.cpp:220 +#: ../src/propgrid/propgrid.cpp:173 +msgid "True" +msgstr "vero" + +#: ../src/common/fs_mem.cpp:232 #, c-format msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!" -msgstr "" -"Tentata la rimozione del file '%s' dalla memoria VFS, ma il file non è " -"caricato!" +msgstr "Tentata la rimozione del file '%s' dalla memoria VFS, ma il file non è caricato!" -#: ../src/common/sckaddr.cpp:144 ../src/common/sckaddr.cpp:252 -msgid "Trying to solve a NULL hostname: giving up" -msgstr "Abbandonata la tentata risoluzione di un nome di host NULL" - -#: ../src/common/fmapbase.cpp:116 +#: ../src/common/fmapbase.cpp:157 msgid "Turkish (ISO-8859-9)" msgstr "Turco (ISO-8859-9)" -#: ../src/generic/filectrlg.cpp:460 +#: ../src/generic/filectrlg.cpp:455 msgid "Type" msgstr "Tipo" -#: ../src/richtext/richtextfontpage.cpp:138 -#: ../src/richtext/richtextfontpage.cpp:140 +#: ../src/richtext/richtextfontpage.cpp:141 +#: ../src/richtext/richtextfontpage.cpp:143 msgid "Type a font name." msgstr "Digita un nome di font" -#: ../src/richtext/richtextfontpage.cpp:156 -#: ../src/richtext/richtextfontpage.cpp:158 +#: ../src/richtext/richtextfontpage.cpp:159 +#: ../src/richtext/richtextfontpage.cpp:161 msgid "Type a size in points." msgstr "Digita la dimensione in punti." -#: ../src/common/xtixml.cpp:348 ../src/common/xtixml.cpp:495 +#: ../src/common/xtixml.cpp:348 +#: ../src/common/xtixml.cpp:495 #: ../src/common/xtistrm.cpp:277 msgid "Type must have enum - long conversion" msgstr "Tipo deve avere enumeratore - convertito a long" +#: ../src/propgrid/propgridiface.cpp:383 +#, c-format +msgid "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT \"%s\"." +msgstr "Tipo operazione \"%s\" fallita: etichetta proprietà: \"%s\" è del tipo \"%s\", NON \"%s\"." + #: ../src/common/accelcmn.cpp:57 msgid "UP" -msgstr "" +msgstr "SU" #: ../src/common/paper.cpp:135 msgid "US Std Fanfold, 14 7/8 x 11 in" msgstr "US Std Fanfold, 14 7/8 x 11 pollici" -#: ../src/common/fmapbase.cpp:153 +#: ../src/common/fmapbase.cpp:194 msgid "US-ASCII" msgstr "ASCII" -#: ../src/gtk/app.cpp:494 +#: ../src/unix/fswatcher_inotify.cpp:111 +msgid "Unable to add inotify watch" +msgstr "Impossibile aggiungere monitor inotify" + +#: ../src/unix/fswatcher_kqueue.cpp:138 +msgid "Unable to add kqueue watch" +msgstr "Impossibile aggiungere montor kqueue" + +#: ../include/wx/msw/private/fswatcher.h:144 +msgid "Unable to associate handle with I/O completion port" +msgstr "impossibile associare gestore completamento porta I/O." + +#: ../include/wx/msw/private/fswatcher.h:127 +msgid "Unable to close I/O completion port handle" +msgstr "Impossibile chiudere gestore porta completamento I/O" + +#: ../src/unix/fswatcher_inotify.cpp:99 +msgid "Unable to close inotify instance" +msgstr "Impossibile chiudere istanza inotify" + +#: ../include/wx/unix/private/fswatcher_kqueue.h:75 +#, c-format +msgid "Unable to close path '%s'" +msgstr "Impossibile chiudere percorso '%s'" + +#: ../include/wx/msw/private/fswatcher.h:49 +#, c-format +msgid "Unable to close the handle for '%s'" +msgstr "Impossibile chiudere gestore di '%s'" + +#: ../include/wx/msw/private/fswatcher.h:200 +msgid "Unable to create I/O completion port" +msgstr "Impossibile creare porta completamento I/O" + +#: ../src/msw/fswatcher.cpp:85 +msgid "Unable to create IOCP worker thread" +msgstr "Impossibile creare thread attività IOCP" + +#: ../src/unix/fswatcher_inotify.cpp:75 +msgid "Unable to create inotify instance" +msgstr "Impossibile creare istanza inotify" + +#: ../src/unix/fswatcher_kqueue.cpp:98 +msgid "Unable to create kqueue instance" +msgstr "Impossibile creare istanza kqueue" + +#: ../include/wx/msw/private/fswatcher.h:189 +msgid "Unable to dequeue completion packet" +msgstr "Impossibile eliminare dalla coda pachetto completamento." + +#: ../src/unix/fswatcher_kqueue.cpp:188 +msgid "Unable to get events from kqueue" +msgstr "Impossibile ottenere eventi da kqueue" + +#: ../src/osx/carbon/dataview.cpp:1861 +msgid "Unable to handle native drag&drop data" +msgstr "Impossibile gestire dati drag&drop nativo " + +#: ../src/gtk/app.cpp:421 msgid "Unable to initialize GTK+, is DISPLAY set properly?" -msgstr "" +msgstr "Impossibile inzializzare GTK+, DISPLAY impostato correttamente?" -#: ../src/gtk/app.cpp:330 -#, fuzzy +#: ../src/gtk/app.cpp:272 msgid "Unable to initialize Hildon program" -msgstr "Impossibile inizializzare OpenGL" +msgstr "Impossibile inizializzare programma Hildon" -#: ../src/html/htmlwin.cpp:534 +#: ../include/wx/unix/private/fswatcher_kqueue.h:58 +#, c-format +msgid "Unable to open path '%s'" +msgstr "Impossibile aprire percorso '%s'" + +#: ../src/html/htmlwin.cpp:558 #, c-format msgid "Unable to open requested HTML document: %s" msgstr "Impossibile aprire il documento HTML richiesto: %s" #: ../src/unix/sound.cpp:369 msgid "Unable to play sound asynchronously." -msgstr "Impossibile riprodurre il suono in modalità asincrona." +msgstr "Impossibile riprodurre il suono in modalità asincrona." -#: ../src/common/stockitem.cpp:155 +#: ../include/wx/msw/private/fswatcher.h:167 +msgid "Unable to post completion status" +msgstr "Impossibiile comunicare stato completamento " + +#: ../src/unix/fswatcher_inotify.cpp:331 +msgid "Unable to read from inotify descriptor" +msgstr "impossibile leggere dal descrittore inotify" + +#: ../src/unix/fswatcher_inotify.cpp:134 +msgid "Unable to remove inotify watch" +msgstr "Impossibile rimuovere controllo inotify" + +#: ../src/unix/fswatcher_kqueue.cpp:156 +msgid "Unable to remove kqueue watch" +msgstr "Impossibile rimuoveer controllo kqueue" + +#: ../src/msw/fswatcher.cpp:146 +#, c-format +msgid "Unable to set up watch for '%s'" +msgstr "Impossibile impostare controllo per '%s'" + +#: ../src/msw/fswatcher.cpp:92 +msgid "Unable to start IOCP worker thread" +msgstr "Impossibile avviare thread attività IOCP" + +#: ../src/common/stockitem.cpp:190 msgid "Undelete" msgstr "Annulla elimina" -#: ../src/richtext/richtextfontpage.cpp:272 -#: ../src/richtext/richtextfontpage.cpp:344 -#: ../src/richtext/richtextfontpage.cpp:588 ../src/mac/carbon/fontdlg.cpp:532 +#: ../src/richtext/richtextfontpage.cpp:289 +#: ../src/richtext/richtextfontpage.cpp:361 +#: ../src/richtext/richtextfontpage.cpp:622 +#: ../src/osx/carbon/fontdlg.cpp:544 +#: ../src/propgrid/advprops.cpp:655 msgid "Underlined" msgstr "Sottolineato" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:422 -#, fuzzy +#: ../src/stc/scintilla/src/ScintillaBase.cxx:452 msgid "Undo" -msgstr "&Annulla" +msgstr "Annulla" -#: ../src/common/stockitem.cpp:210 +#: ../src/common/stockitem.cpp:267 msgid "Undo last action" msgstr "Annulla l'ultima azione" -#: ../src/common/cmdline.cpp:738 +#: ../src/common/cmdline.cpp:796 #, c-format msgid "Unexpected characters following option '%s'." msgstr "Caratteri non attesi dopo l'opzione '%s'." -#: ../src/common/cmdline.cpp:896 +#: ../src/common/cmdline.cpp:954 #, c-format msgid "Unexpected parameter '%s'" msgstr "Parametro '%s' non atteso" -#: ../src/richtext/richtextsymboldlg.cpp:452 +#: ../include/wx/msw/private/fswatcher.h:150 +msgid "Unexpectedly new I/O completion port was created" +msgstr "Una nuova inaspettata porta completamento I/O è stata creata" + +#: ../src/msw/fswatcher.cpp:71 +msgid "Ungraceful worker thread termination" +msgstr "Chiusra del thread inaspettata" + +#: ../src/richtext/richtextsymboldlg.cpp:453 +#: ../src/richtext/richtextsymboldlg.cpp:454 +#: ../src/richtext/richtextsymboldlg.cpp:455 msgid "Unicode" msgstr "Unicode" -#: ../src/common/fmapbase.cpp:142 ../src/common/fmapbase.cpp:148 +#: ../src/common/fmapbase.cpp:183 +#: ../src/common/fmapbase.cpp:189 msgid "Unicode 16 bit (UTF-16)" msgstr "Unicode 16 bit (UTF-16)" -#: ../src/common/fmapbase.cpp:147 +#: ../src/common/fmapbase.cpp:188 msgid "Unicode 16 bit Big Endian (UTF-16BE)" msgstr "Unicode 16 bit Big Endian (UTF-16BE)" -#: ../src/common/fmapbase.cpp:143 +#: ../src/common/fmapbase.cpp:184 msgid "Unicode 16 bit Little Endian (UTF-16LE)" msgstr "Unicode 16 bit Little Endian (UTF-16LE)" -#: ../src/common/fmapbase.cpp:144 ../src/common/fmapbase.cpp:150 +#: ../src/common/fmapbase.cpp:185 +#: ../src/common/fmapbase.cpp:191 msgid "Unicode 32 bit (UTF-32)" msgstr "Unicode 32 bit (UTF-32)" -#: ../src/common/fmapbase.cpp:149 +#: ../src/common/fmapbase.cpp:190 msgid "Unicode 32 bit Big Endian (UTF-32BE)" msgstr "Unicode 32 bit Big Endian (UTF-32BE)" -#: ../src/common/fmapbase.cpp:145 +#: ../src/common/fmapbase.cpp:186 msgid "Unicode 32 bit Little Endian (UTF-32LE)" msgstr "Unicode 32 bit Little Endian (UTF-32LE)" -#: ../src/common/fmapbase.cpp:139 +#: ../src/common/fmapbase.cpp:180 msgid "Unicode 7 bit (UTF-7)" msgstr "Unicode 7 bit (UTF-7)" -#: ../src/common/fmapbase.cpp:140 +#: ../src/common/fmapbase.cpp:181 msgid "Unicode 8 bit (UTF-8)" msgstr "Unicode 8 bit (UTF-8)" -#: ../src/generic/progdlgg.cpp:597 +#: ../src/generic/progdlgg.cpp:672 msgid "Unknown" msgstr "Sconosciuta" @@ -5863,95 +6387,137 @@ msgid "Unknown Object passed to GetObjectClassInfo" msgstr "Oggetto non conosciuto passato a GetObjectClassInfo" #: ../src/common/xtixml.cpp:321 -#, fuzzy, c-format +#, c-format msgid "Unknown Property %s" -msgstr "Proprietà %s sconosciuta" +msgstr "Proprietà %s sconosciuta" -#: ../src/common/imagtiff.cpp:379 +#: ../src/common/imagtiff.cpp:402 #, c-format msgid "Unknown TIFF resolution unit %d ignored" -msgstr "" +msgstr "Unità %d ignorata risoluzione TIFF sconosciuta " + +#: ../src/osx/carbon/dataview.cpp:1936 +msgid "Unknown data format" +msgstr "Formato dati sconosciuto" #: ../src/unix/dlunix.cpp:335 msgid "Unknown dynamic library error" msgstr "Errore sconosciuto nella libreria dinamica" -#: ../src/common/fmapbase.cpp:675 +#: ../src/common/fmapbase.cpp:802 #, c-format msgid "Unknown encoding (%d)" msgstr "Codifica sconosciuta (%d)" -#: ../src/common/cmdline.cpp:643 +#: ../src/common/cmdline.cpp:697 #, c-format msgid "Unknown long option '%s'" msgstr "Opzione lunga '%s' sconosciuta" -#: ../src/common/cmdline.cpp:653 ../src/common/cmdline.cpp:675 +#: ../src/common/cmdline.cpp:707 +#: ../src/common/cmdline.cpp:729 #, c-format msgid "Unknown option '%s'" msgstr "Opzione '%s' sconosciuta" -#: ../src/xrc/xmlres.cpp:890 -msgid "Unknown style flag " -msgstr "Stile sconosciuto " - #: ../src/common/mimecmn.cpp:225 #, c-format msgid "Unmatched '{' in an entry for mime type %s." msgstr "'{' spaiata in una voce per il tipo MIME %s." -#: ../src/common/cmdproc.cpp:257 ../src/common/cmdproc.cpp:283 -#: ../src/common/cmdproc.cpp:303 +#: ../src/common/cmdproc.cpp:261 +#: ../src/common/cmdproc.cpp:287 +#: ../src/common/cmdproc.cpp:307 msgid "Unnamed command" msgstr "Comando privo di nome" -#: ../src/msw/clipbrd.cpp:267 ../src/msw/clipbrd.cpp:439 +#: ../src/propgrid/propgrid.cpp:391 +msgid "Unspecified" +msgstr "Non specificato" + +#: ../src/msw/clipbrd.cpp:269 +#: ../src/msw/clipbrd.cpp:441 msgid "Unsupported clipboard format." msgstr "Formato degli appunti non supportato." -#: ../src/common/appcmn.cpp:237 +#: ../src/common/appcmn.cpp:230 #, c-format msgid "Unsupported theme '%s'." msgstr "Tema '%s' non supportato." #: ../src/generic/fdrepdlg.cpp:153 +#: ../src/propgrid/props.cpp:2167 msgid "Up" msgstr "&Su" +#: ../src/propgrid/props.cpp:2161 +msgid "Update" +msgstr "Aggiorna" + #: ../src/richtext/richtextliststylepage.cpp:485 -#: ../src/richtext/richtextbulletspage.cpp:283 +#: ../src/richtext/richtextbulletspage.cpp:285 msgid "Upper case letters" msgstr "Lettere maiuscole" #: ../src/richtext/richtextliststylepage.cpp:487 -#: ../src/richtext/richtextbulletspage.cpp:285 +#: ../src/richtext/richtextbulletspage.cpp:287 msgid "Upper case roman numerals" msgstr "Numeri romani maiuscoli" -#: ../src/common/cmdline.cpp:1027 +#: ../src/common/cmdline.cpp:1085 #, c-format msgid "Usage: %s" msgstr "Utilizzo: %s" -#: ../src/richtext/richtextliststylepage.cpp:357 -#: ../src/richtext/richtextliststylepage.cpp:359 #: ../src/richtext/richtextindentspage.cpp:179 #: ../src/richtext/richtextindentspage.cpp:181 +#: ../src/richtext/richtextliststylepage.cpp:357 +#: ../src/richtext/richtextliststylepage.cpp:359 msgid "Use the current alignment setting." msgstr "Utilizza le impostazioni di allineamento correnti." -#: ../src/mac/carbon/dataview.cpp:860 ../src/mac/carbon/dataview.cpp:890 +#: ../src/osx/carbon/dataview.cpp:2613 +#: ../src/osx/carbon/dataview.cpp:2678 msgid "Valid pointer to native data view control does not exist" -msgstr "" +msgstr "Non esiste un puntatore valido al controllo vista dati nativi" -#: ../src/common/valtext.cpp:196 +#: ../src/common/valtext.cpp:165 msgid "Validation conflict" msgstr "Conflitto durante la validazione" -#: ../src/msw/aboutdlg.cpp:54 ../src/mac/carbon/aboutdlg.cpp:74 -#, fuzzy, c-format -msgid "Version %s" -msgstr " Versione " +#: ../src/propgrid/manager.cpp:239 +msgid "Value" +msgstr "Valore" + +#: ../src/propgrid/props.cpp:685 +#, c-format +msgid "Value must be %f or higher" +msgstr "Il valore deve essere %f o superiore" + +#: ../src/propgrid/props.cpp:702 +#, c-format +msgid "Value must be %f or less" +msgstr "Il valore deve essere %f o inferiore" + +#: ../src/propgrid/props.cpp:292 +#: ../src/propgrid/props.cpp:308 +#, c-format +msgid "Value must be %lld or higher" +msgstr "Il valore deve essere %lld o superiore" + +#: ../src/propgrid/props.cpp:493 +#, c-format +msgid "Value must be %llu or higher" +msgstr "Il valore deve essere %llu o superiore" + +#: ../src/propgrid/props.cpp:505 +#, c-format +msgid "Value must be %llu or less" +msgstr "Il valore deve essere %llu o inferiore" + +#: ../src/generic/aboutdlgg.cpp:129 +msgid "Version " +msgstr "Versione " #: ../src/generic/filedlgg.cpp:218 msgid "View files as a detailed view" @@ -5961,44 +6527,49 @@ msgstr "Vedi i file - dettagli" msgid "View files as a list view" msgstr "Vedi i file - lista" -#: ../src/common/docview.cpp:1822 +#: ../src/common/docview.cpp:1828 msgid "Views" msgstr "Visualizzazioni" #: ../src/common/accelcmn.cpp:107 msgid "WINDOWS_LEFT" -msgstr "" +msgstr "FINESTRA_SINISTRA" #: ../src/common/accelcmn.cpp:109 msgid "WINDOWS_MENU" -msgstr "" +msgstr "MENU_FINESTRA" #: ../src/common/accelcmn.cpp:108 msgid "WINDOWS_RIGHT" -msgstr "" +msgstr "FINESTRA_DESTRA" -#: ../src/unix/epolldispatcher.cpp:177 -#, fuzzy, c-format +#: ../src/unix/epolldispatcher.cpp:214 +#, c-format msgid "Waiting for IO on epoll descriptor %d failed" -msgstr "Attesa della fine del sottoprocesso fallita" +msgstr "Attesa IO descrittore epoll %d fallita" -#: ../src/common/docview.cpp:478 ../src/html/htmprint.cpp:380 +#: ../src/html/htmprint.cpp:509 msgid "Warning" msgstr "Avviso" -#: ../src/common/log.cpp:713 +#: ../src/common/log.cpp:408 msgid "Warning: " msgstr "Avviso:" -#: ../src/common/fmapbase.cpp:108 +#: ../src/propgrid/advprops.cpp:651 +msgid "Weight" +msgstr "Peso" + +#: ../src/common/fmapbase.cpp:149 msgid "Western European (ISO-8859-1)" msgstr "Europeo Occidentale (ISO-8859-1)" -#: ../src/common/fmapbase.cpp:122 +#: ../src/common/fmapbase.cpp:163 msgid "Western European with Euro (ISO-8859-15)" msgstr "Europeo Occidentale con Euro (ISO-8859-15)" -#: ../src/generic/fontdlgg.cpp:448 ../src/generic/fontdlgg.cpp:450 +#: ../src/generic/fontdlgg.cpp:448 +#: ../src/generic/fontdlgg.cpp:450 msgid "Whether the font is underlined." msgstr "Sottolineato" @@ -6006,191 +6577,177 @@ msgstr "Sottolineato" msgid "Whole word" msgstr "Parola intera" -#: ../src/html/helpwnd.cpp:533 +#: ../src/html/helpwnd.cpp:545 msgid "Whole words only" msgstr "Solo parole intere" -#: ../src/univ/themes/win32.cpp:1059 +#: ../src/univ/themes/win32.cpp:1105 msgid "Win32 theme" msgstr "Tema Win32" -#: ../src/msw/utils.cpp:1090 +#: ../src/msw/utils.cpp:1202 msgid "Win32s on Windows 3.1" msgstr "Win32s su Windows 3.1" -#: ../src/msw/utils.cpp:1139 +#: ../src/msw/utils.cpp:1252 #, c-format msgid "Windows 2000 (build %lu" msgstr "Windows 2000 (build %lu" -#: ../src/msw/utils.cpp:1104 +#: ../src/msw/utils.cpp:1216 msgid "Windows 95" msgstr "Windows 95" -#: ../src/msw/utils.cpp:1100 +#: ../src/msw/utils.cpp:1212 msgid "Windows 95 OSR2" msgstr "Windows 95 OSR2" -#: ../src/msw/utils.cpp:1115 +#: ../src/msw/utils.cpp:1227 msgid "Windows 98" msgstr "Windows 98" -#: ../src/msw/utils.cpp:1111 +#: ../src/msw/utils.cpp:1223 msgid "Windows 98 SE" msgstr "Windows 98 SE" -#: ../src/msw/utils.cpp:1122 +#: ../src/msw/utils.cpp:1234 #, c-format msgid "Windows 9x (%d.%d)" msgstr "Windows 9x (%d.%d)" -#: ../src/common/fmapbase.cpp:136 +#: ../src/common/fmapbase.cpp:177 msgid "Windows Arabic (CP 1256)" msgstr "Windows Arabo (CP 1256)" -#: ../src/common/fmapbase.cpp:137 +#: ../src/common/fmapbase.cpp:178 msgid "Windows Baltic (CP 1257)" msgstr "Windows Baltico (CP 1257)" -#: ../src/msw/utils.cpp:1084 +#: ../src/msw/utils.cpp:1196 #, c-format msgid "Windows CE (%d.%d)" msgstr "Windows CE (%d.%d)" -#: ../src/common/fmapbase.cpp:130 +#: ../src/common/fmapbase.cpp:171 msgid "Windows Central European (CP 1250)" msgstr "Windows Europeo Centrale (CP 1250)" -#: ../src/common/fmapbase.cpp:127 +#: ../src/common/fmapbase.cpp:168 msgid "Windows Chinese Simplified (CP 936)" msgstr "Windows Cinese Semplificato (CP 936)" -#: ../src/common/fmapbase.cpp:129 +#: ../src/common/fmapbase.cpp:170 msgid "Windows Chinese Traditional (CP 950)" msgstr "Windows Cinese Tradizionale (CP 950)" -#: ../src/common/fmapbase.cpp:131 +#: ../src/common/fmapbase.cpp:172 msgid "Windows Cyrillic (CP 1251)" msgstr "Windows Cirillico (CP 1251)" -#: ../src/common/fmapbase.cpp:133 +#: ../src/common/fmapbase.cpp:174 msgid "Windows Greek (CP 1253)" msgstr "Windows Greco (CP 1253)" -#: ../src/common/fmapbase.cpp:135 +#: ../src/common/fmapbase.cpp:176 msgid "Windows Hebrew (CP 1255)" msgstr "Windows Ebraico (CP 1255)" -#: ../src/common/fmapbase.cpp:126 +#: ../src/common/fmapbase.cpp:167 msgid "Windows Japanese (CP 932)" msgstr "Windows Giapponese (CP 932)" -#: ../src/common/fmapbase.cpp:128 +#: ../src/common/fmapbase.cpp:169 msgid "Windows Korean (CP 949)" msgstr "Windows Coreano (CP 949)" -#: ../src/msw/utils.cpp:1119 +#: ../src/msw/utils.cpp:1231 msgid "Windows ME" msgstr "Windows ME" -#: ../src/msw/utils.cpp:1154 +#: ../src/msw/utils.cpp:1286 #, c-format msgid "Windows NT %lu.%lu (build %lu" msgstr "Windows NT %lu.%lu (build %lu" -#: ../src/msw/utils.cpp:1147 +#: ../src/msw/utils.cpp:1262 #, c-format msgid "Windows Server 2003 (build %lu" msgstr "Windows Sever 2003 (build %lu" -#: ../src/common/fmapbase.cpp:125 +#: ../src/common/fmapbase.cpp:166 msgid "Windows Thai (CP 874)" msgstr "Windows Tailandese (CP 874)" -#: ../src/common/fmapbase.cpp:134 +#: ../src/common/fmapbase.cpp:175 msgid "Windows Turkish (CP 1254)" msgstr "Windows Turco (CP 1254)" -#: ../src/common/fmapbase.cpp:132 +#: ../src/msw/utils.cpp:1278 +#, c-format +msgid "Windows Vista (build %lu" +msgstr "Windows Vista (build %lu" + +#: ../src/common/fmapbase.cpp:173 msgid "Windows Western European (CP 1252)" msgstr "Windows Europeo Occidentale (CP 1252)" -#: ../src/msw/utils.cpp:1143 +#: ../src/msw/utils.cpp:1269 #, c-format msgid "Windows XP (build %lu" msgstr "Windows XP (build %lu" -#: ../src/common/fmapbase.cpp:138 +#: ../src/common/fmapbase.cpp:179 msgid "Windows/DOS OEM (CP 437)" msgstr "Windows/DOS OEM (CP 437)" -#: ../src/common/ffile.cpp:159 +#: ../src/common/ffile.cpp:147 #, c-format msgid "Write error on file '%s'" msgstr "Errore di scrittura nel file '%s'" -#: ../src/xml/xml.cpp:733 +#: ../src/xml/xml.cpp:745 #, c-format msgid "XML parsing error: '%s' at line %d" msgstr "Errore durante il parsing XML: '%s' alla riga '%d'" -#: ../src/common/xpmdecod.cpp:798 +#: ../src/common/xpmdecod.cpp:797 msgid "XPM: Malformed pixel data!" msgstr "XPM: Dati dei pixel malformati" -#: ../src/common/xpmdecod.cpp:707 +#: ../src/common/xpmdecod.cpp:706 #, c-format msgid "XPM: incorrect colour description in line %d" msgstr "XPM: Definizione di colore scorretta alla riga %d" -#: ../src/common/xpmdecod.cpp:682 +#: ../src/common/xpmdecod.cpp:681 msgid "XPM: incorrect header format!" msgstr "XPM: errore nel formato dell'intestazione!" -#: ../src/common/xpmdecod.cpp:718 ../src/common/xpmdecod.cpp:727 +#: ../src/common/xpmdecod.cpp:717 +#: ../src/common/xpmdecod.cpp:726 #, c-format msgid "XPM: malformed colour definition '%s' at line %d!" msgstr "XPM: Definizione di colore '%s' malformata alla riga %d!" -#: ../src/common/xpmdecod.cpp:757 -#, fuzzy +#: ../src/common/xpmdecod.cpp:756 msgid "XPM: no colors left to use for mask!" -msgstr "XPM: errore nel formato dell'intestazione!" +msgstr "XPM: nessun colore restante da usare per la amschera!" -#: ../src/common/xpmdecod.cpp:784 +#: ../src/common/xpmdecod.cpp:783 #, c-format msgid "XPM: truncated image data at line %d!" msgstr "XPM: i dati dell'immagine sono troncati alla riga %d!" -#: ../src/xrc/xmlres.cpp:634 -#, c-format -msgid "XRC resource '%s' (class '%s') not found!" -msgstr "Risorsa XRC '%s' (classe '%s') non trovata!" - -#: ../src/xrc/xmlres.cpp:1181 ../src/xrc/xmlres.cpp:1193 -#, c-format -msgid "XRC resource: Cannot create animation from '%s'." -msgstr "Risorsa XRC: Impossibile creare un'animazione a partire da '%s'." - -#: ../src/xrc/xmlres.cpp:1149 ../src/xrc/xmlres.cpp:1161 -#, c-format -msgid "XRC resource: Cannot create bitmap from '%s'." -msgstr "Risorsa XRC: Impossibile creare una bitmap a partire da '%s'." - -#: ../src/xrc/xmlres.cpp:1107 -#, fuzzy, c-format -msgid "XRC resource: Incorrect colour specification '%s' for attribute '%s'." -msgstr "Risorsa XRC: Specifica di colore '%s' errata per la proprietà '%s'.'" - -#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:35 +#: ../src/motif/msgdlg.cpp:194 msgid "Yes" msgstr "Si" -#: ../src/mac/carbon/overlay.cpp:158 +#: ../src/osx/carbon/overlay.cpp:156 msgid "You cannot Clear an overlay that is not inited" msgstr "Impossibile richiamare Clear su un overlay non inizializzato" -#: ../src/dfb/overlay.cpp:62 ../src/mac/carbon/overlay.cpp:110 +#: ../src/osx/carbon/overlay.cpp:108 +#: ../src/dfb/overlay.cpp:62 msgid "You cannot Init an overlay twice" msgstr "Impossibile richiamare Init due volte sullo stesso overlay" @@ -6198,44 +6755,38 @@ msgstr "Impossibile richiamare Init due volte sullo stesso overlay" msgid "You cannot add a new directory to this section." msgstr "Impossibile aggiungere una nuova cartella a questa sezione." -#: ../src/common/stockitem.cpp:162 +#: ../src/common/stockitem.cpp:198 msgid "Zoom &In" msgstr "&Ingrandisci" -#: ../src/common/stockitem.cpp:163 +#: ../src/common/stockitem.cpp:199 msgid "Zoom &Out" msgstr "&Rimpicciolisci" -#: ../src/common/stockitem.cpp:161 +#: ../src/common/stockitem.cpp:197 msgid "Zoom to &Fit" msgstr "&Adatta alla finestra" -#: ../src/common/docview.cpp:2174 -msgid "[EMPTY]" -msgstr "[VUOTO]" - #: ../src/msw/dde.cpp:1142 msgid "a DDEML application has created a prolonged race condition." msgstr "un'applicazione DDEML ha creato una 'race condition' prolungata." #: ../src/msw/dde.cpp:1130 msgid "" -"a DDEML function was called without first calling the DdeInitialize " -"function,\n" +"a DDEML function was called without first calling the DdeInitialize function,\n" "or an invalid instance identifier\n" "was passed to a DDEML function." msgstr "" -"una funzione DDEML è stata richiamata senza prima richiamare DdeInitialize, " -"oppure è stato passato ad una funzione DDEML\n" +"una funzione DDEML è stata richiamata senza prima richiamare DdeInitialize, oppure è stato passato ad una funzione DDEML\n" "un identificatore di istanza non valido." #: ../src/msw/dde.cpp:1148 msgid "a client's attempt to establish a conversation has failed." -msgstr "un tentativo di un client di stabilire una connessione è fallito." +msgstr "un tentativo di un client di stabilire una connessione è fallito." #: ../src/msw/dde.cpp:1145 msgid "a memory allocation failed." -msgstr "un'allocazione di memoria è fallita." +msgstr "un'allocazione di memoria è fallita." #: ../src/msw/dde.cpp:1139 msgid "a parameter failed to be validated by the DDEML." @@ -6243,29 +6794,23 @@ msgstr "un parametro ha fallito la validazione da parte del DDEML." #: ../src/msw/dde.cpp:1121 msgid "a request for a synchronous advise transaction has timed out." -msgstr "" -"una richiesta di transazione sincrona (advise) ha superato il tempo massimo." +msgstr "una richiesta di transazione sincrona (advise) ha superato il tempo massimo." #: ../src/msw/dde.cpp:1127 msgid "a request for a synchronous data transaction has timed out." -msgstr "" -"una richiesta di transazione sincrona (data) ha superato il tempo massimo." +msgstr "una richiesta di transazione sincrona (data) ha superato il tempo massimo." #: ../src/msw/dde.cpp:1136 msgid "a request for a synchronous execute transaction has timed out." -msgstr "" -"una richiesta di transazione sincrona (execute) ha superato il tempo massimo." +msgstr "una richiesta di transazione sincrona (execute) ha superato il tempo massimo." #: ../src/msw/dde.cpp:1154 msgid "a request for a synchronous poke transaction has timed out." -msgstr "" -"una richiesta di transazione sincrona (poke) ha superato il tempo massimo." +msgstr "una richiesta di transazione sincrona (poke) ha superato il tempo massimo." #: ../src/msw/dde.cpp:1169 msgid "a request to end an advise transaction has timed out." -msgstr "" -"una richiesta di terminazione di transazione (advise) ha superato il tempo " -"massimo." +msgstr "una richiesta di terminazione di transazione (advise) ha superato il tempo massimo." #: ../src/msw/dde.cpp:1163 msgid "" @@ -6273,13 +6818,13 @@ msgid "" "that was terminated by the client, or the server\n" "terminated before completing a transaction." msgstr "" -"una transazione server è stata tentata su di una conversazione\n" -"già terminata dal client, oppure il server\n" -"è terminato prima di portare a termine la transazione." +"una transazione server è stata tentata su di una conversazione\n" +"già terminata dal client, oppure il server\n" +"è terminato prima di portare a termine la transazione." #: ../src/msw/dde.cpp:1151 msgid "a transaction failed." -msgstr "una transazione è fallita." +msgstr "una transazione è fallita." #: ../src/common/accelcmn.cpp:179 msgid "alt" @@ -6299,11 +6844,11 @@ msgstr "" #: ../src/msw/dde.cpp:1157 msgid "an internal call to the PostMessage function has failed. " -msgstr "una chiamata interna alla funzione PostMessage è fallita." +msgstr "una chiamata interna alla funzione PostMessage è fallita." #: ../src/msw/dde.cpp:1166 msgid "an internal error has occurred in the DDEML." -msgstr "è avvenuto un errore interno nel DDEML." +msgstr "è avvenuto un errore interno nel DDEML." #: ../src/msw/dde.cpp:1172 msgid "" @@ -6311,16 +6856,15 @@ msgid "" "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n" "the transaction identifier for that callback is no longer valid." msgstr "" -"è stato fornito un identificatore di transazione non valido ad una funzione " -"DDEML.\n" -"Una volta che l'applicazione è uscita da una callback XTYP_XACT_COMPLETE,\n" -"l'identificatore di transazione per questa callback non è più valido." +"è stato fornito un identificatore di transazione non valido ad una funzione DDEML.\n" +"Una volta che l'applicazione è uscita da una callback XTYP_XACT_COMPLETE,\n" +"l'identificatore di transazione per questa callback non è più valido." -#: ../src/common/zipstrm.cpp:1272 +#: ../src/common/zipstrm.cpp:1273 msgid "assuming this is a multi-part zip concatenated" -msgstr "si assume queste siano più parti di un archivio ZIP concatenate" +msgstr "si assume queste siano più parti di un archivio ZIP concatenate" -#: ../src/common/fileconf.cpp:1871 +#: ../src/common/fileconf.cpp:1878 #, c-format msgid "attempt to change immutable key '%s' ignored." msgstr "tentativo di modificare la chiave non modificabile '%s' ignorato." @@ -6333,24 +6877,23 @@ msgstr "funzione di libreria richiamata con argomento errato" msgid "bad signature" msgstr "firma errata" -#: ../src/common/zipstrm.cpp:1714 +#: ../src/common/zipstrm.cpp:1716 msgid "bad zipfile offset to entry" msgstr "offset scorretto per il file nell'archivio ZIP" -#: ../src/common/ftp.cpp:382 +#: ../src/common/ftp.cpp:405 msgid "binary" msgstr "binario" -#: ../src/common/fontcmn.cpp:697 +#: ../src/common/fontcmn.cpp:848 msgid "bold" msgstr "grassetto" -#: ../src/os2/iniconf.cpp:458 +#: ../src/os2/iniconf.cpp:464 msgid "buffer is too small for Windows directory." -msgstr "" -"l'area di memoria temporanea è troppo piccola per la cartella di Windows" +msgstr "l'area di memoria temporanea è troppo piccola per la cartella di Windows" -#: ../src/common/ffile.cpp:92 +#: ../src/common/ffile.cpp:80 #, c-format msgid "can't close file '%s'" msgstr "impossibile chiudere il file '%s'" @@ -6360,7 +6903,7 @@ msgstr "impossibile chiudere il file '%s'" msgid "can't close file descriptor %d" msgstr "impossibile chiudere il descrittore di file %d" -#: ../src/common/file.cpp:537 +#: ../src/common/file.cpp:560 #, c-format msgid "can't commit changes to file '%s'" msgstr "impossibile applicare i cambiamenti al file '%s'" @@ -6370,69 +6913,67 @@ msgstr "impossibile applicare i cambiamenti al file '%s'" msgid "can't create file '%s'" msgstr "impossibile creare il file '%s'" -#: ../src/common/fileconf.cpp:1170 +#: ../src/common/fileconf.cpp:1177 #, c-format msgid "can't delete user configuration file '%s'" msgstr "impossibile eliminare il file di configurazione utente '%s'" -#: ../src/common/file.cpp:443 +#: ../src/common/file.cpp:463 #, c-format msgid "can't determine if the end of file is reached on descriptor %d" -msgstr "" -"impossibile determinare se il descrittore di file %d ha raggiunto la fine " -"del file" +msgstr "impossibile determinare se il descrittore di file %d ha raggiunto la fine del file" -#: ../src/msdos/utilsdos.cpp:310 ../src/msdos/utilsdos.cpp:469 +#: ../src/msdos/utilsdos.cpp:311 +#: ../src/msdos/utilsdos.cpp:474 #, c-format msgid "can't execute '%s'" msgstr "impossibile eseguire '%s'" -#: ../src/common/zipstrm.cpp:1489 +#: ../src/common/zipstrm.cpp:1491 msgid "can't find central directory in zip" msgstr "impossibile trovare il catalogo all'interno del file ZIP" -#: ../src/common/file.cpp:413 +#: ../src/common/file.cpp:433 #, c-format msgid "can't find length of file on file descriptor %d" msgstr "impossibile determinare la dimensione del file del descritore %d" -#: ../src/msw/utils.cpp:393 +#: ../src/msw/utils.cpp:373 msgid "can't find user's HOME, using current directory." -msgstr "" -"impossibile trovare la HOME dell'utente, viene impiegata la cartella " -"corrente." +msgstr "impossibile trovare la HOME dell'utente, viene impiegata la cartella corrente." -#: ../src/common/file.cpp:329 +#: ../src/common/file.cpp:334 #, c-format msgid "can't flush file descriptor %d" msgstr "impossibile forzare la scrittura su disco del descrittore di file %d" -#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:199 +#: ../src/common/file.cpp:390 +#: ../src/msw/wince/filefnwce.cpp:199 #, c-format msgid "can't get seek position on file descriptor %d" -msgstr "" -"impossibile determinare la posizione corrente del descrittore di file %d" +msgstr "impossibile determinare la posizione corrente del descrittore di file %d" #: ../src/common/fontmap.cpp:323 msgid "can't load any font, aborting" msgstr "impossibile caricare un qualunque tipo di carattere, abbandono" -#: ../src/common/file.cpp:247 ../src/common/ffile.cpp:76 +#: ../src/common/file.cpp:247 +#: ../src/common/ffile.cpp:64 #, c-format msgid "can't open file '%s'" msgstr "impossibile aprire il file '%s'" -#: ../src/common/fileconf.cpp:357 +#: ../src/common/fileconf.cpp:352 #, c-format msgid "can't open global configuration file '%s'." msgstr "impossibile aprire il file globale di configurazione '%s'." -#: ../src/common/fileconf.cpp:373 +#: ../src/common/fileconf.cpp:368 #, c-format msgid "can't open user configuration file '%s'." msgstr "impossibile aprire il file di configurazione utente '%s'." -#: ../src/common/fileconf.cpp:1011 +#: ../src/common/fileconf.cpp:1018 msgid "can't open user configuration file." msgstr "impossibile aprire il file di configurazione utente." @@ -6449,22 +6990,23 @@ msgstr "impossibile reinizializzare il flusso di decompressione zlib." msgid "can't read from file descriptor %d" msgstr "impossibile leggere dal descrittore di file %d" -#: ../src/common/file.cpp:532 +#: ../src/common/file.cpp:555 #, c-format msgid "can't remove file '%s'" msgstr "impossibile eliminare il file '%s'" -#: ../src/common/file.cpp:548 +#: ../src/common/file.cpp:572 #, c-format msgid "can't remove temporary file '%s'" msgstr "impossibile eliminare il file temporaneo '%s'" -#: ../src/common/file.cpp:371 ../src/msw/wince/filefnwce.cpp:185 +#: ../src/common/file.cpp:376 +#: ../src/msw/wince/filefnwce.cpp:185 #, c-format msgid "can't seek on file descriptor %d" msgstr "impossibile eseguire una seek sul descrittore di file %d" -#: ../src/common/textfile.cpp:275 +#: ../src/common/textfile.cpp:300 #, c-format msgid "can't write buffer '%s' to disk." msgstr "Impossibile scrivere su disco il buffer '%s'." @@ -6474,20 +7016,15 @@ msgstr "Impossibile scrivere su disco il buffer '%s'." msgid "can't write to file descriptor %d" msgstr "impossibile scrivere sul descrittore di file %d" -#: ../src/common/fileconf.cpp:1025 +#: ../src/common/fileconf.cpp:1032 msgid "can't write user configuration file." msgstr "impossibile scrivere il file di configurazione utente." -#: ../src/common/intl.cpp:1226 -#, c-format -msgid "catalog file for domain '%s' not found." -msgstr "file di catalogo non trovato per il dominio '%s'." - #: ../src/html/chm.cpp:346 msgid "checksum error" msgstr "errore nel codice di controllo" -#: ../src/common/tarstrm.cpp:819 +#: ../src/common/tarstrm.cpp:821 msgid "checksum failure reading tar header block" msgstr "checksum errato durante la lettura dell'intestazione del file TAR" @@ -6497,13 +7034,13 @@ msgstr "errore di compressione" #: ../src/common/regex.cpp:240 msgid "conversion to 8-bit encoding failed" -msgstr "la conversione in una codifica ad 8 bit è fallita" +msgstr "la conversione in una codifica ad 8 bit è fallita" #: ../src/common/accelcmn.cpp:177 msgid "ctrl" msgstr "ctrl" -#: ../src/common/cmdline.cpp:1182 +#: ../src/common/cmdline.cpp:1250 msgid "date" msgstr "data" @@ -6511,7 +7048,8 @@ msgstr "data" msgid "decompression error" msgstr "errore di decompressione" -#: ../src/common/fmapbase.cpp:685 +#: ../src/richtext/richtextstyles.cpp:635 +#: ../src/common/fmapbase.cpp:812 msgid "default" msgstr "predefinito" @@ -6519,41 +7057,36 @@ msgstr "predefinito" msgid "delegate has no type info" msgstr "Delegato non type info" -#: ../src/common/cmdline.cpp:1178 +#: ../src/common/cmdline.cpp:1246 msgid "double" -msgstr "" +msgstr "doppio" -#: ../src/common/debugrpt.cpp:530 +#: ../src/common/debugrpt.cpp:532 msgid "dump of the process state (binary)" msgstr "immagine dello stato del programma (binario)" -#: ../src/common/datetime.cpp:4009 +#: ../src/common/datetimefmt.cpp:1781 msgid "eighteenth" msgstr "diciotto" -#: ../src/common/datetime.cpp:3999 +#: ../src/common/datetimefmt.cpp:1771 msgid "eighth" msgstr "otto" -#: ../src/common/datetime.cpp:4002 +#: ../src/common/datetimefmt.cpp:1774 msgid "eleventh" msgstr "undici" -#: ../src/common/strconv.cpp:2981 -#, c-format -msgid "encoding %i" -msgstr "codifica %i" - -#: ../src/common/fileconf.cpp:1857 +#: ../src/common/fileconf.cpp:1864 #, c-format msgid "entry '%s' appears more than once in group '%s'" -msgstr "la voce '%s' è presente più volte nel gruppo '%s'" +msgstr "la voce '%s' è presente più volte nel gruppo '%s'" #: ../src/html/chm.cpp:344 msgid "error in data format" msgstr "errore nel formato dei dati" -#: ../src/msdos/utilsdos.cpp:410 +#: ../src/msdos/utilsdos.cpp:413 #, c-format msgid "error opening '%s'" msgstr "errore nell'apertura di '%s'" @@ -6562,63 +7095,62 @@ msgstr "errore nell'apertura di '%s'" msgid "error opening file" msgstr "errore nell'apertura file" -#: ../src/common/zipstrm.cpp:1575 +#: ../src/common/zipstrm.cpp:1577 msgid "error reading zip central directory" msgstr "errore durante la lettura del catalogo del file ZIP" -#: ../src/common/zipstrm.cpp:1666 +#: ../src/common/zipstrm.cpp:1668 msgid "error reading zip local header" msgstr "errore durante la lettura dell'intestazione ZIP locale" -#: ../src/common/zipstrm.cpp:2389 +#: ../src/common/zipstrm.cpp:2397 #, c-format msgid "error writing zip entry '%s': bad crc or length" msgstr "errore durante la scrittura del file '%s': CRC o lunghezza errati" -#: ../src/common/ffile.cpp:181 +#: ../src/common/ffile.cpp:169 #, c-format msgid "failed to flush the file '%s'" msgstr "impossibile forzare la scrittura su disco del file '%s'" -#: ../src/common/datetime.cpp:4006 +#: ../src/common/datetimefmt.cpp:1778 msgid "fifteenth" msgstr "quindici" -#: ../src/common/datetime.cpp:3996 +#: ../src/common/datetimefmt.cpp:1768 msgid "fifth" msgstr "cinque" -#: ../src/common/fileconf.cpp:613 +#: ../src/common/fileconf.cpp:611 #, c-format msgid "file '%s', line %d: '%s' ignored after group header." msgstr "file '%s', riga %d: '%s' ignorato dopo l'inizio di un gruppo." -#: ../src/common/fileconf.cpp:642 +#: ../src/common/fileconf.cpp:640 #, c-format msgid "file '%s', line %d: '=' expected." msgstr "file '%s', riga %d: atteso '='." -#: ../src/common/fileconf.cpp:665 +#: ../src/common/fileconf.cpp:663 #, c-format msgid "file '%s', line %d: key '%s' was first found at line %d." -msgstr "file '%s', riga %d: la chiave '%s' è già stata trovata alla riga %d." +msgstr "file '%s', riga %d: la chiave '%s' è già stata trovata alla riga %d." -#: ../src/common/fileconf.cpp:655 +#: ../src/common/fileconf.cpp:653 #, c-format msgid "file '%s', line %d: value for immutable key '%s' ignored." -msgstr "" -"file '%s', riga %d: valore per la chiave non configurabile '%s' ignorato." +msgstr "file '%s', riga %d: valore per la chiave non configurabile '%s' ignorato." -#: ../src/common/fileconf.cpp:577 +#: ../src/common/fileconf.cpp:575 #, c-format msgid "file '%s': unexpected character %c at line %d." msgstr "file '%s': carattere %c non atteso alla riga %d." -#: ../src/richtext/richtextbuffer.cpp:5847 +#: ../src/richtext/richtextbuffer.cpp:6041 msgid "files" msgstr "file" -#: ../src/common/datetime.cpp:3992 +#: ../src/common/datetimefmt.cpp:1764 msgid "first" msgstr "primo" @@ -6626,25 +7158,25 @@ msgstr "primo" msgid "font size" msgstr "corpo" -#: ../src/common/datetime.cpp:4005 +#: ../src/common/datetimefmt.cpp:1777 msgid "fourteenth" msgstr "quattordici" -#: ../src/common/datetime.cpp:3995 +#: ../src/common/datetimefmt.cpp:1767 msgid "fourth" msgstr "quattro" -#: ../src/common/appbase.cpp:491 +#: ../src/common/appbase.cpp:680 msgid "generate verbose log messages" msgstr "genera messaggi del registro dettagliati" -#: ../src/richtext/richtextbuffer.cpp:7194 -#: ../src/richtext/richtextbuffer.cpp:7234 -#: ../src/richtext/richtextbuffer.cpp:7305 +#: ../src/richtext/richtextbuffer.cpp:7469 +#: ../src/richtext/richtextbuffer.cpp:7506 +#: ../src/richtext/richtextbuffer.cpp:7574 msgid "image" msgstr "immagine" -#: ../src/common/tarstrm.cpp:796 +#: ../src/common/tarstrm.cpp:797 msgid "incomplete header block in tar" msgstr "blocco di intestazione errato nel file tar" @@ -6652,53 +7184,44 @@ msgstr "blocco di intestazione errato nel file tar" msgid "incorrect event handler string, missing dot" msgstr "Event handler si stringa non corretto, manca punto" -#: ../src/common/tarstrm.cpp:1373 +#: ../src/common/tarstrm.cpp:1382 msgid "incorrect size given for tar entry" msgstr "valore della dimensione errato per una voce del file TAR" -#: ../src/common/tarstrm.cpp:992 +#: ../src/common/tarstrm.cpp:994 msgid "invalid data in extended tar header" msgstr "dati errati nell'intestazione estesa del file TAR" -#: ../src/generic/logg.cpp:1103 +#: ../src/generic/logg.cpp:1051 msgid "invalid message box return value" msgstr "il riquadro di dialogo ha ritornato un valore non valido" -#: ../src/common/zipstrm.cpp:1444 +#: ../src/common/zipstrm.cpp:1446 msgid "invalid zip file" msgstr "file ZIP non valido" -#: ../src/common/fontcmn.cpp:702 +#: ../src/common/fontcmn.cpp:853 msgid "italic" msgstr "corsivo" -#: ../src/common/fontcmn.cpp:692 +#: ../src/common/fontcmn.cpp:843 msgid "light" msgstr "leggero" -#: ../src/common/intl.cpp:1645 +#: ../src/common/intl.cpp:297 #, c-format msgid "locale '%s' cannot be set." -msgstr "impossibile selezionare le impostazioni locali '%s'." +msgstr "impossibile impostare '%s' locale." -#: ../src/common/intl.cpp:1210 -#, c-format -msgid "looking for catalog '%s' in path '%s'." -msgstr "ricerca del catalogo '%s' nel percorso '%s'." - -#: ../src/mac/carbon/dataview.cpp:1048 ../src/mac/carbon/dataview.cpp:1168 -msgid "m_peer is not or incorrectly initialized" -msgstr "" - -#: ../src/common/datetime.cpp:4164 +#: ../src/common/datetimefmt.cpp:1917 msgid "midnight" msgstr "mezzanotte" -#: ../src/common/datetime.cpp:4010 +#: ../src/common/datetimefmt.cpp:1782 msgid "nineteenth" msgstr "diciannove" -#: ../src/common/datetime.cpp:4000 +#: ../src/common/datetimefmt.cpp:1772 msgid "ninth" msgstr "nove" @@ -6710,36 +7233,41 @@ msgstr "nessun errore DDE." msgid "no error" msgstr "nessun errore" -#: ../src/dfb/fontmgr.cpp:178 +#: ../src/dfb/fontmgr.cpp:175 #, c-format msgid "no fonts found in %s, using builtin font" -msgstr "" +msgstr "Nessuna font trovata in %s., uso font integrata" -#: ../src/html/htmlhelp.cpp:201 ../src/html/helpdata.cpp:648 +#: ../src/html/helpdata.cpp:642 msgid "noname" msgstr "senzanome" -#: ../src/common/datetime.cpp:4163 +#: ../src/common/datetimefmt.cpp:1916 msgid "noon" msgstr "mezzogiorno" -#: ../src/gtk/print.cpp:1165 ../src/gtk/print.cpp:1269 -msgid "not implemented" -msgstr "" +#: ../src/richtext/richtextstyles.cpp:634 +msgid "normal" +msgstr "normale" -#: ../src/common/cmdline.cpp:1174 +#: ../src/gtk/print.cpp:1158 +#: ../src/gtk/print.cpp:1263 +msgid "not implemented" +msgstr "non implementato" + +#: ../src/common/cmdline.cpp:1242 msgid "num" msgstr "num" #: ../src/common/xtixml.cpp:255 msgid "objects cannot have XML Text Nodes" -msgstr "L'oggetto non può avere nodi XML Text" +msgstr "L'oggetto non può avere nodi XML Text" #: ../src/html/chm.cpp:340 msgid "out of memory" msgstr "memoria insufficiente" -#: ../src/common/debugrpt.cpp:506 +#: ../src/common/debugrpt.cpp:508 msgid "process context description" msgstr "descrizione del contesto del programma" @@ -6747,12 +7275,12 @@ msgstr "descrizione del contesto del programma" msgid "read error" msgstr "errore di lettura" -#: ../src/common/zipstrm.cpp:1878 +#: ../src/common/zipstrm.cpp:1883 #, c-format msgid "reading zip stream (entry %s): bad crc" msgstr "CRC errato durante la lettura del file %s dal file ZIP" -#: ../src/common/zipstrm.cpp:1875 +#: ../src/common/zipstrm.cpp:1878 #, c-format msgid "reading zip stream (entry %s): bad length" msgstr "lunghezza errata durante la lettura del file %s dal file ZIP" @@ -6761,7 +7289,7 @@ msgstr "lunghezza errata durante la lettura del file %s dal file ZIP" msgid "reentrancy problem." msgstr "problema di rientranza." -#: ../src/common/datetime.cpp:3993 +#: ../src/common/datetimefmt.cpp:1765 msgid "second" msgstr "due" @@ -6769,11 +7297,11 @@ msgstr "due" msgid "seek error" msgstr "errore nel riposizionamento" -#: ../src/common/datetime.cpp:4008 +#: ../src/common/datetimefmt.cpp:1780 msgid "seventeenth" msgstr "diciassette" -#: ../src/common/datetime.cpp:3998 +#: ../src/common/datetimefmt.cpp:1770 msgid "seventh" msgstr "sette" @@ -6781,101 +7309,116 @@ msgstr "sette" msgid "shift" msgstr "shift" -#: ../src/common/appbase.cpp:481 +#: ../src/common/appbase.cpp:670 msgid "show this help message" msgstr "mostra questo messaggio di aiuto" -#: ../src/common/datetime.cpp:4007 +#: ../src/common/datetimefmt.cpp:1779 msgid "sixteenth" msgstr "sedici" -#: ../src/common/datetime.cpp:3997 +#: ../src/common/datetimefmt.cpp:1769 msgid "sixth" msgstr "sei" -#: ../src/common/appcmn.cpp:215 +#: ../src/common/appcmn.cpp:208 msgid "specify display mode to use (e.g. 640x480-16)" -msgstr "specifica la modalità video da utilizzare (es. 640x480-16)" +msgstr "specifica la modalità video da utilizzare (es. 640x480-16)" -#: ../src/common/appcmn.cpp:201 +#: ../src/common/appcmn.cpp:194 msgid "specify the theme to use" msgstr "specifica il tema da utilizzare" -#: ../src/common/zipstrm.cpp:1781 -msgid "stored file length not in Zip header" -msgstr "la lunghezza del file non è memorizzata nell'intestazione del file ZIP" +#: ../src/richtext/richtextbuffer.cpp:6502 +msgid "standard/circle" +msgstr "Standard/cerchio" -#: ../src/common/cmdline.cpp:1170 +#: ../src/richtext/richtextbuffer.cpp:6504 +msgid "standard/diamond" +msgstr "standard/diamante" + +#: ../src/richtext/richtextbuffer.cpp:6503 +msgid "standard/square" +msgstr "Standard/quadrato" + +#: ../src/richtext/richtextbuffer.cpp:6505 +msgid "standard/triangle" +msgstr "standard/triangolo" + +#: ../src/common/zipstrm.cpp:1783 +msgid "stored file length not in Zip header" +msgstr "la lunghezza del file non è memorizzata nell'intestazione del file ZIP" + +#: ../src/common/cmdline.cpp:1238 msgid "str" msgstr "str" -#: ../src/common/tarstrm.cpp:1002 ../src/common/tarstrm.cpp:1024 -#: ../src/common/tarstrm.cpp:1499 ../src/common/tarstrm.cpp:1521 +#: ../src/common/tarstrm.cpp:1004 +#: ../src/common/tarstrm.cpp:1026 +#: ../src/common/tarstrm.cpp:1508 +#: ../src/common/tarstrm.cpp:1530 msgid "tar entry not open" msgstr "voce del file TAR non aperta" -#: ../src/common/datetime.cpp:4001 +#: ../src/common/datetimefmt.cpp:1773 msgid "tenth" msgstr "dieci" #: ../src/msw/dde.cpp:1124 msgid "the response to the transaction caused the DDE_FBUSY bit to be set." -msgstr "" -"la risposta alla transazione ha causato l'impostazione del bit DDE_FBUSY." +msgstr "la risposta alla transazione ha causato l'impostazione del bit DDE_FBUSY." -#: ../src/common/datetime.cpp:3994 +#: ../src/common/datetimefmt.cpp:1766 msgid "third" msgstr "tre" -#: ../src/common/datetime.cpp:4004 +#: ../src/common/datetimefmt.cpp:1776 msgid "thirteenth" msgstr "tredici" -#: ../src/common/imagtiff.cpp:73 ../src/common/imagtiff.cpp:89 -#, c-format -msgid "tiff module: %s" -msgstr "modulo tiff: %s" - -#: ../src/common/datetime.cpp:3813 +#: ../src/common/datetimefmt.cpp:1571 msgid "today" msgstr "oggi" -#: ../src/common/datetime.cpp:3815 +#: ../src/common/datetimefmt.cpp:1573 msgid "tomorrow" msgstr "domani" -#: ../src/common/fileconf.cpp:1968 +#: ../src/common/fileconf.cpp:1975 #, c-format msgid "trailing backslash ignored in '%s'" -msgstr "" +msgstr "Barra retroversa finale ignorata in '%s'" -#: ../src/gtk/aboutdlg.cpp:190 +#: ../src/gtk/aboutdlg.cpp:198 msgid "translator-credits" -msgstr "" +msgstr "ringraziamenti-traduttore" -#: ../src/common/datetime.cpp:4003 +#: ../src/common/datetimefmt.cpp:1775 msgid "twelfth" msgstr "dodici" -#: ../src/common/datetime.cpp:4011 +#: ../src/common/datetimefmt.cpp:1783 msgid "twentieth" msgstr "venti" -#: ../src/common/fontcmn.cpp:603 ../src/common/fontcmn.cpp:688 +#: ../src/common/fontcmn.cpp:668 +#: ../src/common/fontcmn.cpp:839 msgid "underlined" msgstr "sottolineato" -#: ../src/common/fileconf.cpp:2003 +#: ../src/common/fileconf.cpp:2010 #, c-format msgid "unexpected \" at position %d in '%s'." msgstr "\" non atteso alla posizione %d in '%s'." -#: ../src/common/tarstrm.cpp:1043 +#: ../src/common/tarstrm.cpp:1046 msgid "unexpected end of file" msgstr "fine del file non attesa" -#: ../src/common/tarstrm.cpp:372 ../src/common/tarstrm.cpp:395 -#: ../src/common/tarstrm.cpp:426 ../src/generic/progdlgg.cpp:294 +#: ../src/generic/progdlgg.cpp:289 +#: ../src/common/tarstrm.cpp:372 +#: ../src/common/tarstrm.cpp:395 +#: ../src/common/tarstrm.cpp:426 msgid "unknown" msgstr "sconosciuto" @@ -6884,11 +7427,12 @@ msgstr "sconosciuto" msgid "unknown class %s" msgstr "classe %s sconosciuta" -#: ../src/common/regex.cpp:262 ../src/html/chm.cpp:352 +#: ../src/common/regex.cpp:262 +#: ../src/html/chm.cpp:352 msgid "unknown error" msgstr "errore sconosciuto" -#: ../src/msw/dialup.cpp:493 +#: ../src/msw/dialup.cpp:494 #, c-format msgid "unknown error (error code %08x)." msgstr "errore sconosciuto (codice %08x)." @@ -6897,25 +7441,26 @@ msgstr "errore sconosciuto (codice %08x)." msgid "unknown seek origin" msgstr "origine della seek sconosciuta" -#: ../src/common/fmapbase.cpp:699 +#: ../src/common/fmapbase.cpp:826 #, c-format msgid "unknown-%d" msgstr "sconosciuto-%d" -#: ../src/common/docview.cpp:450 +#: ../src/common/docview.cpp:459 msgid "unnamed" msgstr "senzanome" -#: ../src/common/docview.cpp:1446 +#: ../src/common/docview.cpp:1482 #, c-format msgid "unnamed%d" msgstr "senzanome%d" -#: ../src/common/zipstrm.cpp:1795 ../src/common/zipstrm.cpp:2177 +#: ../src/common/zipstrm.cpp:1797 +#: ../src/common/zipstrm.cpp:2185 msgid "unsupported Zip compression method" msgstr "metodo di compressione non supportato per il file ZIP" -#: ../src/common/intl.cpp:1232 +#: ../src/common/translation.cpp:1691 #, c-format msgid "using catalog '%s' from '%s'." msgstr "utilizzato catalogo '%s' in '%s'." @@ -6924,62 +7469,55 @@ msgstr "utilizzato catalogo '%s' in '%s'." msgid "write error" msgstr "errore di scrittura" -#: ../src/common/stopwatch.cpp:277 +#: ../src/common/stopwatch.cpp:268 msgid "wxGetTimeOfDay failed." msgstr "wxGetTimeOfDay fallita." -#: ../src/gtk/print.cpp:952 +#: ../src/gtk/print.cpp:921 msgid "wxPrintout::GetPageInfo gives a null maxPage." -msgstr "" - -#: ../include/wx/richtext/richtextfontpage.h:38 -msgid "wxRichTextFontPage" -msgstr "" +msgstr "wxPrintout::GetPageInfo ottiene un maxPage nullo." #: ../src/html/search.cpp:49 msgid "wxSearchEngine::LookFor must be called before scanning!" -msgstr "" +msgstr "wxSearchEngine::LookFor deve essere chiamato prima della scansione!" -#: ../src/common/socket.cpp:432 ../src/common/socket.cpp:486 -msgid "wxSocket: invalid signature in ReadMsg." -msgstr "wxSocket: signature non valida in ReadMsg." - -#: ../src/common/socket.cpp:1013 -msgid "wxSocket: unknown event!." -msgstr "wxSocket: evento sconosciuto!." - -#: ../src/mac/carbon/databrow.cpp:646 +#: ../src/osx/carbon/dataview.cpp:1264 msgid "wxWidget control pointer is not a data view pointer" -msgstr "" +msgstr "Puntatore controllo wxWidget non è un puntatore vista dati" -#: ../src/motif/app.cpp:248 +#: ../src/osx/carbon/dataview.cpp:908 +msgid "wxWidget's control not initialized." +msgstr "Controllo wxWidget non inizializzato." + +#: ../src/motif/app.cpp:246 #, c-format msgid "wxWidgets could not open display for '%s': exiting." -msgstr "wxWidgets non può aprire il display per '%s': abbandona." +msgstr "wxWidgets non può aprire il display per '%s': abbandona." -#: ../src/x11/app.cpp:167 +#: ../src/x11/app.cpp:165 msgid "wxWidgets could not open display. Exiting." -msgstr "wxWidgets non può aprire il display. Abbandona." +msgstr "wxWidgets non può aprire il display. Abbandona." -#: ../src/richtext/richtextsymboldlg.cpp:427 +#: ../src/richtext/richtextsymboldlg.cpp:428 msgid "xxxx" msgstr "xxxx" -#: ../src/common/datetime.cpp:3814 +#: ../src/common/datetimefmt.cpp:1572 msgid "yesterday" msgstr "ieri" -#: ../src/common/zstream.cpp:233 ../src/common/zstream.cpp:401 +#: ../src/common/zstream.cpp:235 +#: ../src/common/zstream.cpp:413 #, c-format msgid "zlib error %d" msgstr "errore zlib %d" -#: ../src/common/prntbase.cpp:1137 +#: ../src/common/prntbase.cpp:1158 msgid "|<<" msgstr "|<<" #: ../src/richtext/richtextliststylepage.cpp:498 -#: ../src/richtext/richtextbulletspage.cpp:296 +#: ../src/richtext/richtextbulletspage.cpp:298 msgid "~" msgstr "~" @@ -6992,11 +7530,26 @@ msgstr "~" #~ msgid "#define %s must be an integer." #~ msgstr "La #define %s deve essere un intero." +#~ msgid "%.*f GB" +#~ msgstr "%.*f GB" + +#~ msgid "%.*f MB" +#~ msgstr "%.*f MB" + +#~ msgid "%.*f TB" +#~ msgstr "%.*f TB" + +#~ msgid "%.*f kB" +#~ msgstr "%.*f KiB" + +#~ msgid "%s message" +#~ msgstr "%s: messaggio" + #~ msgid "%s not a bitmap resource specification." -#~ msgstr "%s non è la specifica di una risorsa bitmap." +#~ msgstr "%s non è la specifica di una risorsa bitmap." #~ msgid "%s not an icon resource specification." -#~ msgstr "%s non è la specifica di una risorsa icona." +#~ msgstr "%s non è la specifica di una risorsa icona." #~ msgid "%s: ill-formed resource file syntax." #~ msgstr "%s: sintassi errata nel file di risorsa." @@ -7010,12 +7563,6 @@ msgstr "~" #~ msgid "&Print" #~ msgstr "&Stampa" -#~ msgid "*** A debug report has been generated\n" -#~ msgstr "*** Generata segnalazione di errore\n" - -#~ msgid "*** It can be found in \"%s\"\n" -#~ msgstr "*** Salvata in \"%s\"\n" - #~ msgid "" #~ ", expected static, #include or #define\n" #~ "while parsing resource." @@ -7029,9 +7576,39 @@ msgstr "~" #~ msgid "AddToPropertyCollection called w/o valid adder" #~ msgstr "AddToPropertyCollection chiamata senza 'valid adder'" +#~ msgid "Archive doesnt contain #SYSTEM file" +#~ msgstr "L'archivio non contiene il file #SYSTEM" + #~ msgid "Bitmap resource specification %s not found." #~ msgstr "Specifica della risorsa di tipo bitmap %s non trovata." +#~ msgid "Cannot convert dialog units: dialog unknown." +#~ msgstr "" +#~ "Impossibile convertire le unità di misura del riquadro di dialogo: " +#~ "riguadro di dialogo sconosciuto." + +#~ msgid "Cannot convert from the charset '%s'!" +#~ msgstr "Impossibile convertire il set di caratteri '%s'!" + +#~ msgid "Cannot find container for unknown control '%s'." +#~ msgstr "" +#~ "Impossibile trovare il contenitore per il controllo sconosciuto '%s'." + +#~ msgid "Cannot find font node '%s'." +#~ msgstr "Impossibile trovare il nodo di tipo font '%s'." + +#~ msgid "Cannot parse coordinates from '%s'." +#~ msgstr "Formato scorretto nella specifica di coordinate '%s'." + +#~ msgid "Cannot parse dimension from '%s'." +#~ msgstr "Formato scorretto nella specifica di dimensione '%s'." + +#~ msgid "Cannot wait for thread termination." +#~ msgstr "Impossibile attendere la fine del thread." + +#~ msgid "Cant create the thread event queue" +#~ msgstr "Impossibile creare la coda di eventi per il thread" + #~ msgid "Closes the dialog without inserting a symbol." #~ msgstr "Chiude la finestra di dialogo senza inserire il simbolo." @@ -7052,6 +7629,9 @@ msgstr "~" #~ "intero (non nullo)\n" #~ " o fornire #define (vedere il manuale per avvertimenti)" +#~ msgid "Could not unlock mutex" +#~ msgstr "Impossibile rilasciare un mutex" + #~ msgid "Couldn't end the context on the overlay window" #~ msgstr "Impossibile finalizzare il contesto della finestra di overlay" @@ -7064,6 +7644,9 @@ msgstr "~" #~ msgid "Expected 'char' while parsing resource." #~ msgstr "Atteso 'char' durante l'analisi della risorsa." +#~ msgid "Failed to %s dialup connection: %s" +#~ msgstr "Impossibile %s la connessione: %s" + #~ msgid "" #~ "Failed to find XBM resource %s.\n" #~ "Forgot to use wxResourceLoadBitmapData?" @@ -7091,8 +7674,14 @@ msgstr "~" #~ msgid "Failed to load shared library '%s' Error '%s'" #~ msgstr "Impossibile caricare la libreria dinamica '%s' Errore '%s'" -#~ msgid "Formatting" -#~ msgstr "Formattazione" +#~ msgid "Failed to register OpenGL window class." +#~ msgstr "Impossibile inizializzare la window class OpenGL." + +#~ msgid "Fatal error" +#~ msgstr "Errore Fatale" + +#~ msgid "Fatal error: " +#~ msgstr "Errore fatale: " #~ msgid "Found " #~ msgstr "Trovato" @@ -7121,36 +7710,92 @@ msgstr "~" #~ msgid "Inserts the chosen symbol." #~ msgstr "Inserisce il simbolo scelto" +#~ msgid "Invalid XRC resource '%s': doesn't have root node 'resource'." +#~ msgstr "" +#~ "Risorsa XRC '%s' non valida: il nodo radice deve essere di tipo " +#~ "'resource'." + #~ msgid "Long Conversions not supported" #~ msgstr "Long conversion non supportata" -#~ msgid "No XBM facility available!" -#~ msgstr "Funzionalità XBM non disponibili!" - #~ msgid "No XPM icon facility available!" -#~ msgstr "Funzionalità per icone XPM non disponibili!" +#~ msgstr "Funzionalità per icone XPM non disponibili!" + +#~ msgid "No handler found for XML node '%s', class '%s'!" +#~ msgstr "Impossibile trovare l'handler per il nodo XML '%s', classe '%s'!" #~ msgid "Option '%s' requires a value, '=' expected." #~ msgstr "L'opzione '%s' richiede un valore, atteso '='." +#~ msgid "Program aborted." +#~ msgstr "Programma terminato." + +#~ msgid "Referenced object node with ref=\"%s\" not found!" +#~ msgstr "Impossibile trovare il nodo oggetto referenziaro con ref=\"%s\"." + +#~ msgid "Resource files must have same version number!" +#~ msgstr "I file di risorsa devono avere la stessa versione!" + +#~ msgid "Select a file" +#~ msgstr "Scegliere un file" + #~ msgid "Select all" #~ msgstr "Seleziona tutto" #~ msgid "SetProperty called w/o valid setter" #~ msgstr "SetProperty chiamata senza un 'valid setter'" +#~ msgid "Sorry, could not open this file for saving." +#~ msgstr "Spiacente, impossibile aprire il file per salvare." + +#~ msgid "Sorry, could not save this file." +#~ msgstr "Spiacente, impossibile salvare il file." + +#~ msgid "" +#~ "Sorry, docking is not supported for ports other than wxMSW, wxMac and " +#~ "wxGTK" +#~ msgstr "" +#~ "Mi dispiace ma docking non è supportato per le porte tranne che per " +#~ "wxMSW, wxMac e wxGTK" + +#~ msgid "Sorry, print preview needs a printer to be installed." +#~ msgstr "Spiacente, l'anteprima di stampa richiede una stampante installata." + +#~ msgid "Status: " +#~ msgstr "Stato: " + #~ msgid "String conversions not supported" #~ msgstr "Conversione a stringa non supportata" -#~ msgid "Unable to create TextEncodingConverter" -#~ msgstr "Impossibile creare TextEncodingConverter" +#~ msgid "Subclass '%s' not found for resource '%s', not subclassing!" +#~ msgstr "" +#~ "Sottoclasse '%s' non trovata per la risorsa '%s', subclassing non " +#~ "eseguito!" + +#~ msgid "Symbols" +#~ msgstr "Simboli" + +#~ msgid "TIFF library error." +#~ msgstr "Errore della libreria TIFF." + +#~ msgid "TIFF library warning." +#~ msgstr "messaggio di avviso della libreria TIFF." + +#~ msgid "Trying to solve a NULL hostname: giving up" +#~ msgstr "Abbandonata la tentata risoluzione di un nome di host NULL" #~ msgid "Unexpected end of file while parsing resource." #~ msgstr "Fine del file durante l'analisi delle risorse." +#~ msgid "Unknown style flag " +#~ msgstr "Stile sconosciuto " + #~ msgid "Unrecognized style %s while parsing resource." #~ msgstr "Stile %s sconosciuto durante l'analisi delle risorse." +#~ msgid "Version %s" +#~ msgstr "Versione %s" + #~ msgid "Video Output" #~ msgstr "Uscita video" @@ -7158,6 +7803,28 @@ msgstr "~" #~ msgstr "" #~ "Avviso: tentata la rimozione di un handler di tag HTML da uno stack vuoto." +#~ msgid "XRC resource '%s' (class '%s') not found!" +#~ msgstr "Risorsa XRC '%s' (classe '%s') non trovata!" + +#~ msgid "XRC resource: Cannot create animation from '%s'." +#~ msgstr "Risorsa XRC: Impossibile creare un'animazione a partire da '%s'." + +#~ msgid "XRC resource: Cannot create bitmap from '%s'." +#~ msgstr "Risorsa XRC: Impossibile creare una bitmap a partire da '%s'." + +#~ msgid "XRC resource: Incorrect colour specification '%s' for property '%s'." +#~ msgstr "" +#~ "Risorsa XRC: Specifica di colore '%s' errata per la proprietà '%s'.'" + +#~ msgid "[EMPTY]" +#~ msgstr "[VUOTO]" + +#~ msgid "catalog file for domain '%s' not found." +#~ msgstr "file di catalogo non trovato per il dominio '%s'." + +#~ msgid "encoding %i" +#~ msgstr "codifica %i" + #~ msgid "establish" #~ msgstr "stabilire" @@ -7167,6 +7834,9 @@ msgstr "~" #~ msgid "invalid eof() return value." #~ msgstr "valore di ritorno di eof() non valido." +#~ msgid "looking for catalog '%s' in path '%s'." +#~ msgstr "ricerca del catalogo '%s' nel percorso '%s'." + #~ msgid "reading" #~ msgstr "lettura" @@ -7178,3 +7848,18 @@ msgstr "~" #~ msgid "wxRichTextBulletsPage" #~ msgstr "Puntatura e numerazione" + +#~ msgid "wxRichTextFontPage" +#~ msgstr "wxRichTextFontPage" + +#~ msgid "wxRichTextListStylePage" +#~ msgstr "wxRichTextListStylePage" + +#~ msgid "wxRichTextStylePage" +#~ msgstr "wxRichTextStylePage" + +#~ msgid "wxSocket: invalid signature in ReadMsg." +#~ msgstr "wxSocket: signature non valida in ReadMsg." + +#~ msgid "wxSocket: unknown event!." +#~ msgstr "wxSocket: evento sconosciuto!." diff --git a/locale/vi.po b/locale/vi.po index ec25c7291c..6318ae4fe4 100644 --- a/locale/vi.po +++ b/locale/vi.po @@ -1,12 +1,13 @@ # Trasnlation for Vietnamese. -# First translator Trần Ngá»c Quân , 2008. +# This file is distributed under the same license as the wxWidgets package. +# First translator Trần Ngá»c Quân , 2008-2011. # msgid "" msgstr "" -"Project-Id-Version: wxstd-2.8.10\n" +"Project-Id-Version: wxstd-2.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-24 09:31+0200\n" -"PO-Revision-Date: 2009-08-13 09:24+0700\n" +"POT-Creation-Date: 2010-05-31 16:38+0200\n" +"PO-Revision-Date: 2011-06-02 08:28+0700\n" "Last-Translator: Trần Ngá»c Quân \n" "Language-Team: Trần Ngá»c Quân \n" "MIME-Version: 1.0\n" @@ -17,7 +18,7 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=2; plural=1;\n" -#: ../src/common/debugrpt.cpp:578 +#: ../src/common/debugrpt.cpp:580 msgid "" "\n" "Please send this report to the program maintainer, thank you!\n" @@ -25,39 +26,44 @@ msgstr "" "\n" "Xin hãy gá»­i bản báo cáo này tá»›i ngÆ°á»i duy trì chÆ°Æ¡ng trình, xin cảm Æ¡n!\n" +#: ../src/palmos/utils.cpp:265 #: ../src/richtext/richtextstyledlg.cpp:202 #: ../src/richtext/richtextstyledlg.cpp:214 -#: ../src/palmos/utils.cpp:265 msgid " " msgstr " " -#: ../src/generic/dbgrptg.cpp:322 +#: ../src/generic/dbgrptg.cpp:323 msgid " Thank you and we're sorry for the inconvenience!\n" msgstr " Xin cảm Æ¡n và chúng tôi lấy làm tiếc vá» sá»± bất tiện này!\n" -#: ../src/common/log.cpp:411 +#: ../src/common/log.cpp:355 #, c-format msgid " (error %ld: %s)" msgstr " (lá»—i %ld: %s)" -#: ../src/common/docview.cpp:1464 +#: ../src/common/imagtiff.cpp:79 +#, c-format +msgid " (in module \"%s\")" +msgstr " (trong mô-Ä‘un \"%s\")" + +#: ../src/common/docview.cpp:1500 msgid " - " msgstr " - " #: ../src/richtext/richtextprint.cpp:549 -#: ../src/html/htmprint.cpp:579 +#: ../src/html/htmprint.cpp:712 msgid " Preview" -msgstr "Xem trÆ°á»›c" +msgstr " Xem trÆ°á»›c" -#: ../src/common/fontcmn.cpp:620 +#: ../src/common/fontcmn.cpp:685 msgid " bold" msgstr " đậm" -#: ../src/common/fontcmn.cpp:636 +#: ../src/common/fontcmn.cpp:701 msgid " italic" msgstr " nghiêng" -#: ../src/common/fontcmn.cpp:616 +#: ../src/common/fontcmn.cpp:681 msgid " light" msgstr " ánh sáng" @@ -81,93 +87,63 @@ msgstr "#14 Envelope, 5 x 11 1/2 in" msgid "#9 Envelope, 3 7/8 x 8 7/8 in" msgstr "#9 Envelope, 3 7/8 x 8 7/8 in" -#: ../src/common/filename.cpp:2368 -#, c-format -msgid "%.*f GB" -msgstr "%.*f GB" - -#: ../src/common/filename.cpp:2366 -#, c-format -msgid "%.*f MB" -msgstr "%.*f MB" - -#: ../src/common/filename.cpp:2370 -#, c-format -msgid "%.*f TB" -msgstr "%.*f TB" - -#: ../src/common/filename.cpp:2364 -#, c-format -msgid "%.*f kB" -msgstr "%.*f kB" - -#: ../src/html/helpwnd.cpp:1047 -#: ../src/html/helpwnd.cpp:1049 -#: ../src/html/helpwnd.cpp:1681 -#: ../src/html/helpwnd.cpp:1719 +#: ../src/html/helpwnd.cpp:1042 +#: ../src/html/helpwnd.cpp:1044 +#: ../src/html/helpwnd.cpp:1685 +#: ../src/html/helpwnd.cpp:1723 #, c-format msgid "%i of %i" msgstr "%i của %i" -#: ../src/generic/filectrlg.cpp:314 +#: ../src/generic/filectrlg.cpp:309 #, c-format msgid "%ld byte" msgid_plural "%ld bytes" msgstr[0] "%ld byte" msgstr[1] "%ld bytes" -#: ../src/gtk/print.cpp:677 +#: ../src/gtk/print.cpp:652 #, c-format msgid "%s" msgstr "%s" -#: ../src/common/cmdline.cpp:922 +#: ../src/common/cmdline.cpp:980 #, c-format msgid "%s (or %s)" msgstr "%s (hoặc %s)" -#: ../src/common/filename.cpp:2362 -#, c-format -msgid "%s B" -msgstr "%s B" - -#: ../src/generic/logg.cpp:285 +#: ../src/generic/logg.cpp:239 #, c-format msgid "%s Error" msgstr "%s Lá»—i" -#: ../src/generic/logg.cpp:293 +#: ../src/generic/logg.cpp:251 #, c-format msgid "%s Information" msgstr "%s Thông tin" -#: ../src/generic/logg.cpp:289 +#: ../src/generic/logg.cpp:243 #, c-format msgid "%s Warning" msgstr "%s Cảnh báo" -#: ../src/common/tarstrm.cpp:1311 +#: ../src/common/tarstrm.cpp:1320 #, c-format msgid "%s did not fit the tar header for entry '%s'" msgstr "%s không vừa khá»›p vá»›i phần đầu tar cho mục vào '%s'" -#: ../src/common/fldlgcmn.cpp:96 +#: ../src/common/fldlgcmn.cpp:97 #, c-format msgid "%s files (%s)|%s" msgstr "%s tệp tin (%s)|%s" -#: ../src/common/msgout.cpp:209 -#, c-format -msgid "%s message" -msgstr "%s thông Ä‘iệp" - -#: ../src/common/stockitem.cpp:110 -#: ../src/html/helpfrm.cpp:130 -#: ../src/html/helpfrm.cpp:132 +#: ../src/common/stockitem.cpp:128 +#: ../src/html/helpfrm.cpp:142 +#: ../src/html/helpfrm.cpp:144 msgid "&About..." msgstr "&Thông tin thêm..." -#: ../src/common/stockitem.cpp:160 +#: ../src/common/stockitem.cpp:196 msgid "&Actual Size" msgstr "&Kích thÆ°á»›c Thật" @@ -175,12 +151,12 @@ msgstr "&Kích thÆ°á»›c Thật" msgid "&After a paragraph:" msgstr "S&au má»™t Ä‘oạn văn:" -#: ../src/richtext/richtextliststylepage.cpp:318 #: ../src/richtext/richtextindentspage.cpp:138 +#: ../src/richtext/richtextliststylepage.cpp:318 msgid "&Alignment" msgstr "C&anh hàng" -#: ../src/common/stockitem.cpp:112 +#: ../src/common/stockitem.cpp:130 msgid "&Apply" msgstr "Chấ&p nhận" @@ -188,11 +164,15 @@ msgstr "Chấ&p nhận" msgid "&Apply Style" msgstr "Ã&p dụng Kiểu Dáng" -#: ../src/msw/mdi.cpp:171 +#: ../src/msw/mdi.cpp:168 msgid "&Arrange Icons" msgstr "Xắp xế&p Biểu Tượng" -#: ../src/common/stockitem.cpp:124 +#: ../src/common/stockitem.cpp:184 +msgid "&Ascending" +msgstr "&Tăng dần" + +#: ../src/common/stockitem.cpp:131 msgid "&Back" msgstr "&Quay lại :" @@ -204,66 +184,90 @@ msgstr "&Trên cÆ¡ sở:" msgid "&Before a paragraph:" msgstr "T&rÆ°á»›c má»™t Ä‘oạn văn:" -#: ../src/common/stockitem.cpp:113 +#: ../src/richtext/richtextfontpage.cpp:230 +msgid "&Bg colour:" +msgstr "Màu &ná»n" + +#: ../src/common/stockitem.cpp:132 msgid "&Bold" msgstr "Äậ&m" +#: ../src/common/stockitem.cpp:133 +msgid "&Bottom" +msgstr "&DÆ°á»›i:" + #: ../src/richtext/richtextliststylepage.cpp:209 -#: ../src/richtext/richtextbulletspage.cpp:157 +#: ../src/richtext/richtextbulletspage.cpp:156 msgid "&Bullet style:" msgstr "Kiểu dáng &Bullet:" -#: ../src/common/stockitem.cpp:114 +#: ../src/common/stockitem.cpp:135 +msgid "&CD-Rom" +msgstr "&CD-Rom" + +#: ../src/generic/wizard.cpp:439 #: ../src/generic/fontdlgg.cpp:472 #: ../src/generic/fontdlgg.cpp:491 -#: ../src/generic/wizard.cpp:458 -#: ../src/mac/carbon/fontdlg.cpp:564 +#: ../src/osx/carbon/fontdlg.cpp:576 +#: ../src/common/stockitem.cpp:134 msgid "&Cancel" msgstr "&Hủy bá»" -#: ../src/msw/mdi.cpp:167 +#: ../src/msw/mdi.cpp:164 msgid "&Cascade" msgstr "&Kiểu xếp chồng" -#: ../src/richtext/richtextsymboldlg.cpp:432 +#: ../src/richtext/richtextsymboldlg.cpp:433 msgid "&Character code:" msgstr "&Mã ký tá»±:" -#: ../src/common/stockitem.cpp:115 +#: ../src/common/stockitem.cpp:136 msgid "&Clear" msgstr "&Xóa" -#: ../src/common/prntbase.cpp:1115 -#: ../src/common/stockitem.cpp:116 -#: ../src/html/helpfrm.cpp:127 -#: ../src/generic/logg.cpp:539 +#: ../src/generic/logg.cpp:528 +#: ../src/common/stockitem.cpp:137 +#: ../src/common/prntbase.cpp:1136 +#: ../src/html/helpfrm.cpp:139 msgid "&Close" msgstr "Äó&ng" -#: ../src/richtext/richtextfontpage.cpp:213 +#: ../src/common/stockitem.cpp:182 +msgid "&Color" +msgstr "&Màu" + +#: ../src/richtext/richtextfontpage.cpp:218 msgid "&Colour:" msgstr "&Màu sắc:" -#: ../src/common/stockitem.cpp:117 -#: ../src/richtext/richtextctrl.cpp:2596 -#: ../src/msw/textctrl.cpp:2152 -#: ../src/mac/carbon/textctrl.cpp:1065 +#: ../src/common/stockitem.cpp:138 +msgid "&Convert" +msgstr "&Chuyển đổi" + +#: ../src/richtext/richtextctrl.cpp:297 +#: ../src/osx/textctrl_osx.cpp:588 +#: ../src/common/stockitem.cpp:139 +#: ../src/msw/textctrl.cpp:2175 msgid "&Copy" msgstr "&Sao chép" -#: ../src/generic/hyperlinkg.cpp:150 +#: ../src/generic/hyperlinkg.cpp:151 msgid "&Copy URL" msgstr "&Sao chép URL" -#: ../src/generic/dbgrptg.cpp:330 +#: ../src/common/headerctrlcmn.cpp:307 +msgid "&Customize..." +msgstr "&Cá nhân hóa..." + +#: ../src/generic/dbgrptg.cpp:331 msgid "&Debug report preview:" msgstr "Xem thá»­ &báo cáo lá»—i:" -#: ../src/common/stockitem.cpp:119 -#: ../src/richtext/richtextctrl.cpp:2598 -#: ../src/richtext/richtexttabspage.cpp:142 -#: ../src/msw/textctrl.cpp:2154 -#: ../src/mac/carbon/textctrl.cpp:1067 +#: ../src/richtext/richtexttabspage.cpp:141 +#: ../src/richtext/richtextctrl.cpp:299 +#: ../src/osx/textctrl_osx.cpp:590 +#: ../src/common/stockitem.cpp:141 +#: ../src/msw/textctrl.cpp:2177 msgid "&Delete" msgstr "&Xóa" @@ -271,15 +275,19 @@ msgstr "&Xóa" msgid "&Delete Style..." msgstr "&Xóa Kiểu Dáng..." -#: ../src/generic/logg.cpp:750 +#: ../src/common/stockitem.cpp:185 +msgid "&Descending" +msgstr "&Giảm dần" + +#: ../src/generic/logg.cpp:695 msgid "&Details" msgstr "&Chi tiết" -#: ../src/common/stockitem.cpp:125 +#: ../src/common/stockitem.cpp:142 msgid "&Down" msgstr "X&uống" -#: ../src/common/stockitem.cpp:120 +#: ../src/common/stockitem.cpp:143 msgid "&Edit" msgstr "&Hiệu chỉnh" @@ -287,19 +295,35 @@ msgstr "&Hiệu chỉnh" msgid "&Edit Style..." msgstr "&Hiệu Chỉnh Kiểu Dáng..." -#: ../src/common/stockitem.cpp:122 -#: ../src/html/helpfrm.cpp:134 +#: ../src/common/stockitem.cpp:144 +msgid "&Execute" +msgstr "&Thi hành" + +#: ../src/common/stockitem.cpp:146 +#: ../src/html/helpfrm.cpp:146 msgid "&File" msgstr "&Chính" -#: ../src/common/stockitem.cpp:121 +#: ../src/common/stockitem.cpp:147 msgid "&Find" msgstr "&Tìm" -#: ../src/generic/wizard.cpp:660 +#: ../src/generic/wizard.cpp:630 msgid "&Finish" msgstr "&Hoàn tất" +#: ../src/common/stockitem.cpp:148 +msgid "&First" +msgstr "Äầ&u tiên" + +#: ../src/common/stockitem.cpp:149 +msgid "&Floppy" +msgstr "ÄÄ©a &má»m" + +#: ../src/common/stockitem.cpp:183 +msgid "&Font" +msgstr "&Phông chữ" + #: ../src/generic/fontdlgg.cpp:373 msgid "&Font family:" msgstr "Há» &phông chữ:" @@ -308,65 +332,80 @@ msgstr "Há» &phông chữ:" msgid "&Font for Level..." msgstr "&Phông chữ cho Mức..." -#: ../src/richtext/richtextsymboldlg.cpp:393 -#: ../src/richtext/richtextfontpage.cpp:134 +#: ../src/richtext/richtextfontpage.cpp:137 +#: ../src/richtext/richtextsymboldlg.cpp:394 msgid "&Font:" msgstr "&Phông chữ:" -#: ../src/common/stockitem.cpp:126 +#: ../src/common/stockitem.cpp:150 msgid "&Forward" msgstr "&Tiếp tá»›i" -#: ../src/richtext/richtextsymboldlg.cpp:444 +#: ../src/richtext/richtextsymboldlg.cpp:445 msgid "&From:" msgstr "&Từ:" -#: ../src/common/prntbase.cpp:1161 +#: ../src/common/prntbase.cpp:1182 msgid "&Goto..." msgstr "Nhả&y tá»›i..." -#: ../src/common/stockitem.cpp:128 -#: ../src/html/helpfrm.cpp:135 -#: ../src/generic/wizard.cpp:454 -#: ../src/generic/wizard.cpp:461 -#: ../src/mac/carbon/menu.cpp:772 +#: ../src/common/stockitem.cpp:151 +msgid "&Harddisk" +msgstr "ÄÄ©a &cứng" + +#: ../src/generic/wizard.cpp:442 +#: ../src/osx/menu_osx.cpp:637 +#: ../src/common/stockitem.cpp:152 +#: ../src/html/helpfrm.cpp:147 msgid "&Help" msgstr "Trợ &giúp" -#: ../src/common/stockitem.cpp:129 +#: ../src/common/stockitem.cpp:153 msgid "&Home" msgstr "&Home" -#: ../src/richtext/richtextliststylepage.cpp:371 #: ../src/richtext/richtextindentspage.cpp:194 +#: ../src/richtext/richtextliststylepage.cpp:371 msgid "&Indentation (tenths of a mm)" msgstr "Thụt lá» dòng đầu(má»—&i mÆ°á»i mm)" -#: ../src/richtext/richtextliststylepage.cpp:355 #: ../src/richtext/richtextindentspage.cpp:177 +#: ../src/richtext/richtextliststylepage.cpp:355 msgid "&Indeterminate" msgstr "&Vô định" -#: ../src/common/stockitem.cpp:131 +#: ../src/common/stockitem.cpp:155 msgid "&Index" msgstr "&Chỉ mục" -#: ../src/common/stockitem.cpp:132 +#: ../src/common/stockitem.cpp:156 +msgid "&Info" +msgstr "&Thông tin" + +#: ../src/common/stockitem.cpp:157 msgid "&Italic" msgstr "Ngh&iêng" -#: ../src/richtext/richtextliststylepage.cpp:341 +#: ../src/common/stockitem.cpp:158 +msgid "&Jump to" +msgstr "&Nhảy tá»›i" + #: ../src/richtext/richtextindentspage.cpp:163 +#: ../src/richtext/richtextliststylepage.cpp:341 msgid "&Justified" msgstr "Căn chỉn&h" -#: ../src/richtext/richtextliststylepage.cpp:327 +#: ../src/common/stockitem.cpp:163 +msgid "&Last" +msgstr "&Cuối" + #: ../src/richtext/richtextindentspage.cpp:149 +#: ../src/richtext/richtextliststylepage.cpp:327 msgid "&Left" msgstr "&Bên trái" -#: ../src/richtext/richtextliststylepage.cpp:380 #: ../src/richtext/richtextindentspage.cpp:205 +#: ../src/richtext/richtextliststylepage.cpp:380 msgid "&Left:" msgstr "&Bên trái:" @@ -374,31 +413,35 @@ msgstr "&Bên trái:" msgid "&List level:" msgstr "&Mức danh sách:" -#: ../src/generic/logg.cpp:540 +#: ../src/generic/logg.cpp:529 msgid "&Log" msgstr "Tệp ti&n ghi thông tin" -#: ../src/univ/themes/win32.cpp:3734 +#: ../src/univ/themes/win32.cpp:3772 msgid "&Move" msgstr "Di chuyể&n" -#: ../src/common/stockitem.cpp:137 -#: ../src/richtext/richtexttabspage.cpp:136 +#: ../src/common/stockitem.cpp:164 +msgid "&Network" +msgstr "Mạ&ng" + +#: ../src/richtext/richtexttabspage.cpp:135 +#: ../src/common/stockitem.cpp:165 msgid "&New" msgstr "Tạo &má»›i" #: ../src/aui/tabmdi.cpp:108 -#: ../src/generic/mdig.cpp:118 -#: ../src/msw/mdi.cpp:172 +#: ../src/generic/mdig.cpp:105 +#: ../src/msw/mdi.cpp:169 msgid "&Next" msgstr "Tiếp &theo" -#: ../src/generic/wizard.cpp:457 -#: ../src/generic/wizard.cpp:658 +#: ../src/generic/wizard.cpp:438 +#: ../src/generic/wizard.cpp:630 msgid "&Next >" msgstr "Tiếp &theo >" -#: ../src/generic/tipdlg.cpp:274 +#: ../src/generic/tipdlg.cpp:277 msgid "&Next Tip" msgstr "Mẹo kế &tiếp" @@ -406,27 +449,29 @@ msgstr "Mẹo kế &tiếp" msgid "&Next style:" msgstr "Kiểu dáng kế &tiếp:" -#: ../src/common/stockitem.cpp:138 +#: ../src/common/stockitem.cpp:166 +#: ../src/msw/msgdlg.cpp:461 msgid "&No" msgstr "&Không" -#: ../src/generic/dbgrptg.cpp:352 +#: ../src/generic/dbgrptg.cpp:353 msgid "&Notes:" msgstr "Ghi c&hú:" -#: ../src/richtext/richtextbulletspage.cpp:262 +#: ../src/richtext/richtextbulletspage.cpp:261 msgid "&Number:" msgstr "&Số:" -#: ../src/common/stockitem.cpp:139 #: ../src/generic/fontdlgg.cpp:477 #: ../src/generic/fontdlgg.cpp:484 -#: ../src/mac/carbon/fontdlg.cpp:570 +#: ../src/osx/carbon/fontdlg.cpp:582 +#: ../src/common/stockitem.cpp:167 msgid "&OK" msgstr "&Äồng ý" -#: ../src/common/stockitem.cpp:140 -#: ../src/html/helpfrm.cpp:125 +#: ../src/generic/dbgrptg.cpp:339 +#: ../src/common/stockitem.cpp:168 +#: ../src/html/helpfrm.cpp:137 msgid "&Open..." msgstr "&Mở..." @@ -434,10 +479,10 @@ msgstr "&Mở..." msgid "&Outline level:" msgstr "Mức Ä‘Æ°á»ng ba&o:" -#: ../src/common/stockitem.cpp:141 -#: ../src/richtext/richtextctrl.cpp:2597 -#: ../src/msw/textctrl.cpp:2153 -#: ../src/mac/carbon/textctrl.cpp:1066 +#: ../src/richtext/richtextctrl.cpp:298 +#: ../src/osx/textctrl_osx.cpp:589 +#: ../src/common/stockitem.cpp:169 +#: ../src/msw/textctrl.cpp:2176 msgid "&Paste" msgstr "&Dán" @@ -449,40 +494,40 @@ msgstr "&Kích thÆ°á»›c Ä‘iểm:" msgid "&Position (tenths of a mm):" msgstr "&Vị trí (má»—i 10mm):" -#: ../src/common/stockitem.cpp:142 +#: ../src/common/stockitem.cpp:170 msgid "&Preferences" msgstr "&Sở thích riêng" #: ../src/aui/tabmdi.cpp:109 -#: ../src/generic/mdig.cpp:119 -#: ../src/msw/mdi.cpp:173 +#: ../src/generic/mdig.cpp:106 +#: ../src/msw/mdi.cpp:170 msgid "&Previous" msgstr "&TrÆ°á»›c" -#: ../src/common/prntbase.cpp:1120 -#: ../src/common/stockitem.cpp:143 +#: ../src/common/stockitem.cpp:172 +#: ../src/common/prntbase.cpp:1141 msgid "&Print..." msgstr "&In..." -#: ../src/common/stockitem.cpp:145 +#: ../src/common/stockitem.cpp:173 msgid "&Properties" msgstr "&Thuá»™c tính" -#: ../src/common/stockitem.cpp:146 +#: ../src/common/stockitem.cpp:145 msgid "&Quit" msgstr "T&hoát" -#: ../src/common/cmdproc.cpp:288 -#: ../src/common/cmdproc.cpp:295 -#: ../src/common/stockitem.cpp:147 -#: ../src/richtext/richtextctrl.cpp:2593 -#: ../src/msw/textctrl.cpp:2149 -#: ../src/mac/carbon/textctrl.cpp:1062 +#: ../src/richtext/richtextctrl.cpp:294 +#: ../src/osx/textctrl_osx.cpp:585 +#: ../src/common/stockitem.cpp:174 +#: ../src/common/cmdproc.cpp:292 +#: ../src/common/cmdproc.cpp:299 +#: ../src/msw/textctrl.cpp:2172 msgid "&Redo" msgstr "&Redo" -#: ../src/common/cmdproc.cpp:284 -#: ../src/common/cmdproc.cpp:304 +#: ../src/common/cmdproc.cpp:288 +#: ../src/common/cmdproc.cpp:308 msgid "&Redo " msgstr "&Redo " @@ -492,65 +537,70 @@ msgstr "Äổ&i tên Kiểu Dáng..." #: ../src/generic/fdrepdlg.cpp:180 msgid "&Replace" -msgstr "Th&ay thế " +msgstr "Th&ay thế" #: ../src/richtext/richtextstyledlg.cpp:273 msgid "&Restart numbering" msgstr "&Khởi Ä‘á»™ng lại sá»± đánh số" -#: ../src/univ/themes/win32.cpp:3733 +#: ../src/univ/themes/win32.cpp:3771 msgid "&Restore" msgstr "&Phục hồi lại" -#: ../src/richtext/richtextliststylepage.cpp:334 #: ../src/richtext/richtextindentspage.cpp:156 +#: ../src/richtext/richtextliststylepage.cpp:334 msgid "&Right" msgstr "&Phải" -#: ../src/richtext/richtextliststylepage.cpp:402 #: ../src/richtext/richtextindentspage.cpp:229 +#: ../src/richtext/richtextliststylepage.cpp:402 msgid "&Right:" msgstr "&Phải:" -#: ../src/common/stockitem.cpp:151 +#: ../src/common/stockitem.cpp:179 msgid "&Save" msgstr "&Ghi lại" -#: ../src/generic/logg.cpp:535 +#: ../src/generic/logg.cpp:524 msgid "&Save..." msgstr "&Ghi lại..." -#: ../src/generic/tipdlg.cpp:268 +#: ../src/generic/tipdlg.cpp:271 msgid "&Show tips at startup" msgstr "&Hiện hÆ°á»›ng dẫn nhá» lúc má»›i mở" -#: ../src/univ/themes/win32.cpp:3736 +#: ../src/univ/themes/win32.cpp:3774 msgid "&Size" msgstr "&Kích thÆ°á»›c" -#: ../src/richtext/richtextfontpage.cpp:152 +#: ../src/richtext/richtextfontpage.cpp:155 msgid "&Size:" msgstr "&Kích thÆ°á»›c:" -#: ../src/generic/progdlgg.cpp:246 +#: ../src/generic/progdlgg.cpp:241 msgid "&Skip" msgstr "Giữ &nguyên" -#: ../src/richtext/richtextliststylepage.cpp:422 #: ../src/richtext/richtextindentspage.cpp:272 +#: ../src/richtext/richtextliststylepage.cpp:422 msgid "&Spacing (tenths of a mm)" msgstr "&Khoảng cách chữ (má»—i 10mm)" -#: ../src/common/stockitem.cpp:154 +#: ../src/common/stockitem.cpp:186 +msgid "&Spell Check" +msgstr "&Kiểm tra chính tả" + +#: ../src/common/stockitem.cpp:187 msgid "&Stop" msgstr "&Dừng" -#: ../src/richtext/richtextfontpage.cpp:225 +#: ../src/richtext/richtextfontpage.cpp:242 +#: ../src/common/stockitem.cpp:188 msgid "&Strikethrough" msgstr "Gạch giữ&a" -#: ../src/richtext/richtextstylepage.cpp:103 #: ../src/generic/fontdlgg.cpp:384 +#: ../src/richtext/richtextstylepage.cpp:103 msgid "&Style:" msgstr "&Kiểu dáng:" @@ -558,44 +608,52 @@ msgstr "&Kiểu dáng:" msgid "&Styles:" msgstr "&Kiểu dáng:" -#: ../src/richtext/richtextsymboldlg.cpp:406 +#: ../src/richtext/richtextsymboldlg.cpp:407 msgid "&Subset:" msgstr "Tập c&on:" #: ../src/richtext/richtextliststylepage.cpp:267 -#: ../src/richtext/richtextbulletspage.cpp:217 +#: ../src/richtext/richtextbulletspage.cpp:219 msgid "&Symbol:" msgstr "Ký hiệu đặc &biệt:" -#: ../src/common/stockitem.cpp:156 +#: ../src/common/stockitem.cpp:189 +msgid "&Top" +msgstr "&Trên" + #: ../src/generic/fontdlgg.cpp:446 +#: ../src/common/stockitem.cpp:191 msgid "&Underline" msgstr "&Gạch chân" -#: ../src/richtext/richtextfontpage.cpp:200 +#: ../src/richtext/richtextfontpage.cpp:203 msgid "&Underlining:" msgstr "&Gạch chân:" -#: ../src/common/cmdproc.cpp:266 -#: ../src/common/stockitem.cpp:157 -#: ../src/richtext/richtextctrl.cpp:2592 -#: ../src/msw/textctrl.cpp:2148 -#: ../src/mac/carbon/textctrl.cpp:1061 +#: ../src/richtext/richtextctrl.cpp:293 +#: ../src/osx/textctrl_osx.cpp:584 +#: ../src/common/stockitem.cpp:192 +#: ../src/common/cmdproc.cpp:270 +#: ../src/msw/textctrl.cpp:2171 msgid "&Undo" msgstr "&Undo" -#: ../src/common/cmdproc.cpp:260 +#: ../src/common/cmdproc.cpp:264 msgid "&Undo " msgstr "&Undo " -#: ../src/common/stockitem.cpp:158 +#: ../src/common/stockitem.cpp:193 msgid "&Unindent" msgstr "&Không thụt lá»" -#: ../src/common/stockitem.cpp:127 +#: ../src/common/stockitem.cpp:194 msgid "&Up" msgstr "&Lên" +#: ../src/generic/dbgrptg.cpp:337 +msgid "&View..." +msgstr "&Trình bày..." + #: ../src/generic/fontdlgg.cpp:395 msgid "&Weight:" msgstr "Äá»™ đậ&m:" @@ -603,39 +661,43 @@ msgstr "Äá»™ đậ&m:" #: ../src/aui/tabmdi.cpp:301 #: ../src/aui/tabmdi.cpp:317 #: ../src/aui/tabmdi.cpp:319 -#: ../src/generic/mdig.cpp:298 -#: ../src/generic/mdig.cpp:314 -#: ../src/generic/mdig.cpp:318 -#: ../src/msw/mdi.cpp:1429 -#: ../src/msw/mdi.cpp:1437 -#: ../src/msw/mdi.cpp:1467 +#: ../src/generic/mdig.cpp:299 +#: ../src/generic/mdig.cpp:315 +#: ../src/generic/mdig.cpp:319 +#: ../src/msw/mdi.cpp:70 msgid "&Window" msgstr "&Cá»­a sổ" -#: ../src/common/stockitem.cpp:159 +#: ../src/common/stockitem.cpp:195 +#: ../src/msw/msgdlg.cpp:461 msgid "&Yes" msgstr "Äồn&g ý" -#: ../src/common/config.cpp:482 +#: ../src/common/fontcmn.cpp:718 +msgid "'" +msgstr "'" + +#: ../src/common/config.cpp:524 #: ../src/msw/regconf.cpp:259 #, c-format msgid "'%s' has extra '..', ignored." msgstr "'%s' có thêm '..', bá» qua." -#: ../src/common/valtext.cpp:147 -#: ../src/common/valtext.cpp:177 -#: ../src/common/valtext.cpp:183 +#: ../src/common/valtext.cpp:240 +#: ../src/common/valtext.cpp:242 +#: ../src/common/valtext.cpp:244 +#: ../src/common/valtext.cpp:246 #, c-format msgid "'%s' is invalid" msgstr "'%s' không hợp lệ" -#: ../src/common/cmdline.cpp:820 -#: ../src/common/cmdline.cpp:838 +#: ../src/common/cmdline.cpp:878 +#: ../src/common/cmdline.cpp:896 #, c-format msgid "'%s' is not a correct numeric value for option '%s'." msgstr "'%s' không phải là má»™t giá trị bằng số đúng cho tùy chá»n '%s'." -#: ../src/common/intl.cpp:1283 +#: ../src/common/translation.cpp:924 #, c-format msgid "'%s' is not a valid message catalog." msgstr "'%s' không phải là catalog thông Ä‘iệp hợp lệ." @@ -645,72 +707,80 @@ msgstr "'%s' không phải là catalog thông Ä‘iệp hợp lệ." msgid "'%s' is probably a binary buffer." msgstr "'%s' chắc chắn là má»™t bá»™ đệm nhị phân." -#: ../src/common/valtext.cpp:172 +#: ../src/common/valtext.cpp:238 #, c-format msgid "'%s' should be numeric." msgstr "'%s' có thể thuá»™c kiểu số." -#: ../src/common/valtext.cpp:154 +#: ../src/common/valtext.cpp:230 #, c-format msgid "'%s' should only contain ASCII characters." msgstr "'%s' chỉ nên chứa chữ cái trong bảng mã ASCII." -#: ../src/common/valtext.cpp:160 +#: ../src/common/valtext.cpp:232 #, c-format msgid "'%s' should only contain alphabetic characters." msgstr "'%s' chỉ nên chứa ký tá»± trong bảng chữ cái." -#: ../src/common/valtext.cpp:166 +#: ../src/common/valtext.cpp:234 #, c-format msgid "'%s' should only contain alphabetic or numeric characters." msgstr "'%s' chỉ nên chứa ký tá»± trong bảng chữ cái hay chữ số." +#: ../src/common/valtext.cpp:236 +#, c-format +msgid "'%s' should only contain digits." +msgstr "'%s' chỉ có thể chứa các chữ số." + #: ../src/richtext/richtextliststylepage.cpp:228 -#: ../src/richtext/richtextbulletspage.cpp:177 +#: ../src/richtext/richtextbulletspage.cpp:176 msgid "(*)" msgstr "(*)" -#: ../src/html/htmlhelp.cpp:638 -#: ../src/html/helpwnd.cpp:982 +#: ../src/html/helpwnd.cpp:977 msgid "(Help)" msgstr "(Trợ giúp)" #: ../src/richtext/richtextliststylepage.cpp:483 -#: ../src/richtext/richtextbulletspage.cpp:281 +#: ../src/richtext/richtextbulletspage.cpp:283 msgid "(None)" msgstr "(Không)" -#: ../src/richtext/richtextsymboldlg.cpp:493 +#: ../src/richtext/richtextsymboldlg.cpp:494 msgid "(Normal text)" msgstr "(Chữ thÆ°á»ng)" -#: ../src/html/helpwnd.cpp:412 -#: ../src/html/helpwnd.cpp:1118 -#: ../src/html/helpwnd.cpp:1746 +#: ../src/html/helpwnd.cpp:424 +#: ../src/html/helpwnd.cpp:1114 +#: ../src/html/helpwnd.cpp:1750 msgid "(bookmarks)" msgstr "(Dấu sách)" -#: ../src/richtext/richtextformatdlg.cpp:630 +#: ../src/richtext/richtextformatdlg.cpp:629 msgid "(none)" msgstr "(không)" #: ../src/richtext/richtextliststylepage.cpp:494 -#: ../src/richtext/richtextbulletspage.cpp:292 +#: ../src/richtext/richtextbulletspage.cpp:294 msgid "*" msgstr "*" #: ../src/richtext/richtextliststylepage.cpp:235 -#: ../src/richtext/richtextbulletspage.cpp:184 +#: ../src/richtext/richtextbulletspage.cpp:183 msgid "*)" msgstr "*)" #: ../src/richtext/richtextliststylepage.cpp:497 -#: ../src/richtext/richtextbulletspage.cpp:295 +#: ../src/richtext/richtextbulletspage.cpp:297 msgid "+" msgstr "+" +#: ../src/msw/utils.cpp:1299 +msgid ", 64-bit edition" +msgstr ", bản 64-bit" + #: ../src/richtext/richtextliststylepage.cpp:495 -#: ../src/richtext/richtextbulletspage.cpp:293 +#: ../src/richtext/richtextbulletspage.cpp:295 msgid "-" msgstr "-" @@ -718,11 +788,43 @@ msgstr "-" msgid "1" msgstr "1" -#: ../src/richtext/richtextliststylepage.cpp:460 #: ../src/richtext/richtextindentspage.cpp:315 +msgid "1.1" +msgstr "1.1" + +#: ../src/richtext/richtextindentspage.cpp:316 +msgid "1.2" +msgstr "1.2" + +#: ../src/richtext/richtextindentspage.cpp:317 +msgid "1.3" +msgstr "1.3" + +#: ../src/richtext/richtextindentspage.cpp:318 +msgid "1.4" +msgstr "1.4" + +#: ../src/richtext/richtextindentspage.cpp:319 +#: ../src/richtext/richtextliststylepage.cpp:460 msgid "1.5" msgstr "1.5" +#: ../src/richtext/richtextindentspage.cpp:320 +msgid "1.6" +msgstr "1.6" + +#: ../src/richtext/richtextindentspage.cpp:321 +msgid "1.7" +msgstr "1.7" + +#: ../src/richtext/richtextindentspage.cpp:322 +msgid "1.8" +msgstr "1.8" + +#: ../src/richtext/richtextindentspage.cpp:323 +msgid "1.9" +msgstr "1.9" + #: ../src/common/paper.cpp:142 msgid "10 x 11 in" msgstr "10 x 11 in" @@ -743,9 +845,9 @@ msgstr "12 x 11 in" msgid "15 x 11 in" msgstr "15 x 11 in" -#: ../src/richtext/richtextliststylepage.cpp:461 #: ../src/richtext/richtextindentspage.cpp:247 -#: ../src/richtext/richtextindentspage.cpp:316 +#: ../src/richtext/richtextindentspage.cpp:324 +#: ../src/richtext/richtextliststylepage.cpp:461 msgid "2" msgstr "2" @@ -785,7 +887,7 @@ msgstr "9" msgid "9 x 11 in" msgstr "9 x 11 in" -#: ../src/html/htmprint.cpp:303 +#: ../src/html/htmprint.cpp:432 msgid ": file does not exist!" msgstr ": tệp tin chÆ°a tồn tại!" @@ -797,66 +899,66 @@ msgstr ": không rõ bá»™ ký tá»±" msgid ": unknown encoding" msgstr ":không hiểu mã hóa" -#: ../src/generic/wizard.cpp:463 +#: ../src/generic/wizard.cpp:444 msgid "< &Back" msgstr "< &Quay lại" -#: ../src/common/prntbase.cpp:1143 +#: ../src/common/prntbase.cpp:1164 msgid "<<" msgstr "<<" -#: ../src/mac/carbon/fontdlg.cpp:584 -#: ../src/mac/carbon/fontdlg.cpp:791 -#: ../src/mac/carbon/fontdlg.cpp:811 +#: ../src/osx/carbon/fontdlg.cpp:596 +#: ../src/osx/carbon/fontdlg.cpp:803 +#: ../src/osx/carbon/fontdlg.cpp:823 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:585 -#: ../src/mac/carbon/fontdlg.cpp:793 -#: ../src/mac/carbon/fontdlg.cpp:813 +#: ../src/osx/carbon/fontdlg.cpp:597 +#: ../src/osx/carbon/fontdlg.cpp:805 +#: ../src/osx/carbon/fontdlg.cpp:825 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:583 -#: ../src/mac/carbon/fontdlg.cpp:789 -#: ../src/mac/carbon/fontdlg.cpp:809 +#: ../src/osx/carbon/fontdlg.cpp:595 +#: ../src/osx/carbon/fontdlg.cpp:801 +#: ../src/osx/carbon/fontdlg.cpp:821 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:586 -#: ../src/mac/carbon/fontdlg.cpp:795 -#: ../src/mac/carbon/fontdlg.cpp:815 +#: ../src/osx/carbon/fontdlg.cpp:598 +#: ../src/osx/carbon/fontdlg.cpp:807 +#: ../src/osx/carbon/fontdlg.cpp:827 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:587 -#: ../src/mac/carbon/fontdlg.cpp:800 -#: ../src/mac/carbon/fontdlg.cpp:819 +#: ../src/osx/carbon/fontdlg.cpp:599 +#: ../src/osx/carbon/fontdlg.cpp:812 +#: ../src/osx/carbon/fontdlg.cpp:831 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:588 -#: ../src/mac/carbon/fontdlg.cpp:797 -#: ../src/mac/carbon/fontdlg.cpp:817 +#: ../src/osx/carbon/fontdlg.cpp:600 +#: ../src/osx/carbon/fontdlg.cpp:809 +#: ../src/osx/carbon/fontdlg.cpp:829 msgid "" msgstr "" -#: ../src/mac/carbon/fontdlg.cpp:582 +#: ../src/osx/carbon/fontdlg.cpp:594 msgid "" msgstr "" -#: ../src/generic/filectrlg.cpp:285 -#: ../src/generic/filectrlg.cpp:308 +#: ../src/generic/filectrlg.cpp:280 +#: ../src/generic/filectrlg.cpp:303 msgid "" msgstr "" -#: ../src/generic/filectrlg.cpp:289 -#: ../src/generic/filectrlg.cpp:312 +#: ../src/generic/filectrlg.cpp:284 +#: ../src/generic/filectrlg.cpp:307 msgid "" msgstr "" -#: ../src/generic/filectrlg.cpp:287 -#: ../src/generic/filectrlg.cpp:310 +#: ../src/generic/filectrlg.cpp:282 +#: ../src/generic/filectrlg.cpp:305 msgid "" msgstr "" @@ -877,37 +979,45 @@ msgid "Italic face. " msgstr "Chữ nghiêng. " #: ../src/richtext/richtextliststylepage.cpp:496 -#: ../src/richtext/richtextbulletspage.cpp:294 +#: ../src/richtext/richtextbulletspage.cpp:296 msgid ">" msgstr ">" -#: ../src/common/prntbase.cpp:1149 +#: ../src/common/prntbase.cpp:1170 msgid ">>" msgstr ">>" -#: ../src/common/prntbase.cpp:1155 +#: ../src/common/prntbase.cpp:1176 msgid ">>|" msgstr ">>|" -#: ../src/generic/dbgrptg.cpp:314 +#: ../src/generic/dbgrptg.cpp:315 msgid "A debug report has been generated in the directory\n" msgstr "Má»™t báo cáo lá»—i đã được tạo ra trong thÆ° mục\n" -#: ../src/common/debugrpt.cpp:565 +#: ../src/common/debugrpt.cpp:567 msgid "A debug report has been generated. It can be found in" msgstr "Má»™t báo cáo lá»—i đã được tạo ra. Nó có thể tìm thấy trong" #: ../src/common/xtixml.cpp:406 msgid "A non empty collection must consist of 'element' nodes" -msgstr "Má»™t tập hợp không trống rá»—ng phải gồm có những nút 'phần tá»­' " +msgstr "Má»™t tập hợp không trống rá»—ng phải gồm có những nút 'phần tá»­'" #: ../src/richtext/richtextliststylepage.cpp:303 #: ../src/richtext/richtextliststylepage.cpp:305 -#: ../src/richtext/richtextbulletspage.cpp:255 -#: ../src/richtext/richtextbulletspage.cpp:257 +#: ../src/richtext/richtextbulletspage.cpp:254 +#: ../src/richtext/richtextbulletspage.cpp:256 msgid "A standard bullet name." msgstr "Má»™t tên bullet tiêu chuẩn." +#: ../src/common/paper.cpp:219 +msgid "A0 sheet, 841 x 1189 mm" +msgstr "A0 sheet, 841 x 1189 mm" + +#: ../src/common/paper.cpp:220 +msgid "A1 sheet, 594 x 841 mm" +msgstr "A1 sheet, 594 x 841 mm" + #: ../src/common/paper.cpp:161 msgid "A2 420 x 594 mm" msgstr "A2 420 x 594 mm" @@ -980,9 +1090,9 @@ msgstr "A6 105 x 148 mm" msgid "A6 Rotated 148 x 105 mm" msgstr "A6 Rotated 148 x 105 mm" -#: ../src/richtext/richtextformatdlg.cpp:426 #: ../src/generic/fontdlgg.cpp:85 -#: ../src/mac/carbon/fontdlg.cpp:315 +#: ../src/richtext/richtextformatdlg.cpp:426 +#: ../src/osx/carbon/fontdlg.cpp:327 msgid "ABCDEFGabcdefg12345" msgstr "ABCDEFGabcdefg12345" @@ -990,27 +1100,26 @@ msgstr "ABCDEFGabcdefg12345" msgid "ADD" msgstr "THÊM" -#: ../src/common/ftp.cpp:382 -#: ../src/richtext/richtextsymboldlg.cpp:451 -#: ../src/richtext/richtextsymboldlg.cpp:453 -#: ../src/richtext/richtextsymboldlg.cpp:454 +#: ../src/richtext/richtextsymboldlg.cpp:452 +#: ../src/common/ftp.cpp:405 msgid "ASCII" msgstr "ASCII" -#: ../src/generic/aboutdlgg.cpp:106 +#: ../src/generic/aboutdlgg.cpp:141 msgid "About " -msgstr "Thông tin thêm" +msgstr "Thông tin thêm " #: ../src/msw/aboutdlg.cpp:65 #, c-format msgid "About %s" msgstr "Giá»›i thiệu %s" -#: ../src/common/stockitem.cpp:111 +#: ../src/common/stockitem.cpp:129 +#: ../src/propgrid/props.cpp:2133 msgid "Add" msgstr "Thêm" -#: ../src/html/helpwnd.cpp:425 +#: ../src/html/helpwnd.cpp:437 msgid "Add current page to bookmarks" msgstr "Thêm trang hiện thá»i vào dấu sách" @@ -1018,24 +1127,32 @@ msgstr "Thêm trang hiện thá»i vào dấu sách" msgid "Add to custom colours" msgstr "Thêm vào màu ngÆ°á»i dùng" -#: ../src/mac/carbon/dataview.cpp:220 +#: ../src/osx/dataview_osx.cpp:99 msgid "Added item is invalid." msgstr "Thêm mục tin là không hợp lệ." -#: ../src/html/helpctrl.cpp:139 +#: ../src/html/helpctrl.cpp:140 #, c-format msgid "Adding book %s" msgstr "Thêm sách %s" +#: ../src/osx/carbon/dataview.cpp:1891 +msgid "Adding flavor TEXT failed" +msgstr "Việc thêm flavor TEXT gặp lá»—i" + +#: ../src/osx/carbon/dataview.cpp:1912 +msgid "Adding flavor utxt failed" +msgstr "Việc thêm flavor utxt gặp lá»—i" + #: ../src/richtext/richtextliststylepage.cpp:442 msgid "After a paragraph:" msgstr "Sau má»™t Ä‘oạn văn:" -#: ../src/common/stockitem.cpp:135 +#: ../src/common/stockitem.cpp:161 msgid "Align Left" msgstr "Canh lá» Trái" -#: ../src/common/stockitem.cpp:136 +#: ../src/common/stockitem.cpp:162 msgid "Align Right" msgstr "Canh lá» Phải" @@ -1043,78 +1160,80 @@ msgstr "Canh lá» Phải" msgid "All" msgstr "Tất cả" -#: ../src/common/fldlgcmn.cpp:79 -#: ../src/generic/filectrlg.cpp:1198 +#: ../src/generic/filectrlg.cpp:1195 +#: ../src/common/fldlgcmn.cpp:80 #, c-format msgid "All files (%s)|%s" msgstr "Má»i tập tin (%s)|%s" -#: ../include/wx/defs.h:2582 +#: ../include/wx/defs.h:2658 msgid "All files (*)|*" msgstr "Má»i tập tin (*)|*" -#: ../src/html/helpwnd.cpp:1556 +#: ../src/html/helpwnd.cpp:1560 msgid "All files (*.*)|*" msgstr "Má»i tập tin (*.*)|*" -#: ../include/wx/defs.h:2579 +#: ../include/wx/defs.h:2655 +#: ../src/propgrid/props.cpp:1609 +#: ../src/propgrid/props.cpp:1638 msgid "All files (*.*)|*.*" msgstr "Má»i tập tin (*.*)|*.*" -#: ../src/richtext/richtextstyles.cpp:838 +#: ../src/richtext/richtextstyles.cpp:904 msgid "All styles" msgstr "Má»i kiểu dáng" +#: ../src/propgrid/manager.cpp:1506 +msgid "Alphabetic Mode" +msgstr "Chế Ä‘á»™ Bảng chữ cái" + #: ../src/common/xtistrm.cpp:381 msgid "Already Registered Object passed to SetObjectClassInfo" -msgstr "Already Registered Object được chuyển cho SetObjectClassInfo " +msgstr "Already Registered Object được chuyển cho SetObjectClassInfo" #: ../src/unix/dialup.cpp:356 msgid "Already dialling ISP." msgstr "Sẵn sàng quay số tá»›i nhà cung cấp dịch vụ Internet ISP." #: ../src/common/accelcmn.cpp:294 -msgid "Alt-" -msgstr "Alt-" +msgid "Alt+" +msgstr "Alt+" -#: ../src/common/debugrpt.cpp:568 +#: ../src/common/debugrpt.cpp:570 msgid "And includes the following files:\n" msgstr "Và bao gồm các tệp tin sau đây:\n" -#: ../src/generic/animateg.cpp:164 +#: ../src/generic/animateg.cpp:163 #, c-format msgid "Animation file is not of type %ld." msgstr "Tệp tin hoạt hình thì không phải thuá»™c kiểu %ld." -#: ../src/generic/logg.cpp:1087 +#: ../src/generic/logg.cpp:1035 #, c-format msgid "Append log to file '%s' (choosing [No] will overwrite it)?" msgstr "Nối thêm nhật ký vào tệp tin '%s' (chá»n [No] sẽ ghi đè lên nó)?" #: ../src/richtext/richtextliststylepage.cpp:484 -#: ../src/richtext/richtextbulletspage.cpp:282 +#: ../src/richtext/richtextbulletspage.cpp:284 msgid "Arabic" msgstr "Arabic" -#: ../src/common/fmapbase.cpp:113 +#: ../src/common/fmapbase.cpp:154 msgid "Arabic (ISO-8859-6)" msgstr "Arabic (ISO-8859-6)" -#: ../src/html/chm.cpp:564 -msgid "Archive doesnt contain #SYSTEM file" -msgstr "Phần lÆ°u trữ không chứa tệp tin hệ thống #SYSTEM" - -#: ../src/generic/aboutdlgg.cpp:150 +#: ../src/generic/aboutdlgg.cpp:185 msgid "Artists" msgstr "Nghệ sÄ©" -#: ../src/generic/filectrlg.cpp:467 +#: ../src/generic/filectrlg.cpp:462 msgid "Attributes" msgstr "Thuá»™c tính" #: ../src/richtext/richtextliststylepage.cpp:293 -#: ../src/richtext/richtextbulletspage.cpp:243 -#: ../src/richtext/richtextbulletspage.cpp:245 +#: ../src/richtext/richtextbulletspage.cpp:242 +#: ../src/richtext/richtextbulletspage.cpp:244 msgid "Available fonts." msgstr "Phông chữ sẵn có." @@ -1170,48 +1289,49 @@ msgstr "B6 Envelope, 176 x 125 mm" msgid "BACK" msgstr "QUAY LẠI" -#: ../src/common/fmapbase.cpp:154 +#: ../src/common/fmapbase.cpp:195 msgid "BIG5" msgstr "BIG5" -#: ../src/common/imagbmp.cpp:499 -#: ../src/common/imagbmp.cpp:515 +#: ../src/common/imagbmp.cpp:514 +#: ../src/common/imagbmp.cpp:536 +#: ../src/common/imagbmp.cpp:551 msgid "BMP: Couldn't allocate memory." msgstr "BMP: Không thể cấp phát bá»™ nhá»›." -#: ../src/common/imagbmp.cpp:86 +#: ../src/common/imagbmp.cpp:88 msgid "BMP: Couldn't save invalid image." msgstr "BMP: Không thể ghi ảnh không hợp lệ." -#: ../src/common/imagbmp.cpp:320 +#: ../src/common/imagbmp.cpp:329 msgid "BMP: Couldn't write RGB color map." msgstr "BMP: Không thể ghi bản đồ màu RGB." -#: ../src/common/imagbmp.cpp:453 +#: ../src/common/imagbmp.cpp:464 msgid "BMP: Couldn't write data." msgstr "BMP: Không thể ghi dữ liệu." -#: ../src/common/imagbmp.cpp:225 +#: ../src/common/imagbmp.cpp:230 msgid "BMP: Couldn't write the file (Bitmap) header." msgstr "BMP: Không thể ghi phần đầu tệp tin (Bitmap)." -#: ../src/common/imagbmp.cpp:246 +#: ../src/common/imagbmp.cpp:253 msgid "BMP: Couldn't write the file (BitmapInfo) header." msgstr "BMP: Không thể ghi phần đầu tệp tin (BitmapInfo)." -#: ../src/common/imagbmp.cpp:120 +#: ../src/common/imagbmp.cpp:124 msgid "BMP: wxImage doesn't have own wxPalette." msgstr "BMP: wxImage không có quyá»n sở hữu wxPalette." -#: ../src/mac/carbon/fontdlg.cpp:382 +#: ../src/osx/carbon/fontdlg.cpp:394 msgid "Background colour" msgstr "Màu ná»n" -#: ../src/common/fmapbase.cpp:120 +#: ../src/common/fmapbase.cpp:161 msgid "Baltic (ISO-8859-13)" msgstr "Baltic (ISO-8859-13)" -#: ../src/common/fmapbase.cpp:111 +#: ../src/common/fmapbase.cpp:152 msgid "Baltic (old) (ISO-8859-4)" msgstr "Baltic (cÅ©) (ISO-8859-4)" @@ -1220,23 +1340,23 @@ msgid "Before a paragraph:" msgstr "Phía trÆ°á»›c Ä‘oạn văn:" #: ../src/richtext/richtextliststylepage.cpp:491 -#: ../src/richtext/richtextbulletspage.cpp:289 +#: ../src/richtext/richtextbulletspage.cpp:291 msgid "Bitmap" msgstr "Ảnh mảng bitmap" -#: ../src/mac/carbon/dataview.cpp:575 +#: ../src/osx/carbon/dataview.cpp:2353 msgid "Bitmap renderer cannot render value; value type: " msgstr "Bá»™ đáp ứng ảnh bitmap không thể trả vá» giá trị; kiểu giá trị: " -#: ../src/richtext/richtextfontpage.cpp:269 -#: ../src/richtext/richtextfontpage.cpp:331 -#: ../src/richtext/richtextfontpage.cpp:577 #: ../src/generic/fontdlgg.cpp:335 -#: ../src/mac/carbon/fontdlg.cpp:516 +#: ../src/richtext/richtextfontpage.cpp:286 +#: ../src/richtext/richtextfontpage.cpp:348 +#: ../src/richtext/richtextfontpage.cpp:611 +#: ../src/osx/carbon/fontdlg.cpp:528 msgid "Bold" msgstr "Äậm" -#: ../src/generic/prntdlgg.cpp:898 +#: ../src/generic/prntdlgg.cpp:899 msgid "Bottom margin (mm):" msgstr "Lá» dÆ°á»›i chân (mm):" @@ -1246,7 +1366,7 @@ msgid "Browse" msgstr "Tìm duyệt" #: ../src/richtext/richtextliststylepage.cpp:244 -#: ../src/richtext/richtextbulletspage.cpp:193 +#: ../src/richtext/richtextbulletspage.cpp:192 msgid "Bullet &Alignment:" msgstr "&Căn lá» Bullet:" @@ -1262,7 +1382,7 @@ msgstr "Bullets" msgid "C sheet, 17 x 22 in" msgstr "C sheet, 17 x 22 in" -#: ../src/generic/logg.cpp:537 +#: ../src/generic/logg.cpp:526 msgid "C&lear" msgstr "&Xóa tất cả" @@ -1298,8 +1418,8 @@ msgstr "HỦY BỎ" msgid "CAPITAL" msgstr "CHá»® VIẾT HOA" -#: ../src/html/chm.cpp:797 -#: ../src/html/chm.cpp:854 +#: ../src/html/chm.cpp:814 +#: ../src/html/chm.cpp:871 msgid "CHM handler currently supports only local files!" msgstr "CHM handler hiện tại chỉ há»— trợ các tệp tin ná»™i bá»™!" @@ -1311,130 +1431,128 @@ msgstr "XÓA" msgid "COMMAND" msgstr "LỆNH" -#: ../src/richtext/richtextfontpage.cpp:232 +#: ../src/richtext/richtextfontpage.cpp:249 msgid "Ca&pitals" msgstr "Chữ viết &hoa" #: ../src/os2/thread.cpp:117 msgid "Cannot create mutex." -msgstr "Không thể tạo mutex." +msgstr "không thể tạo mutex" -#: ../src/common/filefn.cpp:1421 +#: ../src/common/filefn.cpp:1359 #, c-format msgid "Cannot enumerate files '%s'" msgstr "Không thể liệt kê các tệp tin '%s'" -#: ../src/unix/dir.cpp:228 -#: ../src/msw/dir.cpp:204 +#: ../src/msw/dir.cpp:212 #, c-format msgid "Cannot enumerate files in directory '%s'" msgstr "Không thể đếm các tệp tin trong thÆ° mục '%s'" -#: ../src/os2/thread.cpp:526 +#: ../src/os2/thread.cpp:528 #, c-format msgid "Cannot resume thread %lu" msgstr "Không thể phục hồi tuyến trình %lu" -#: ../src/msw/thread.cpp:873 +#: ../src/msw/thread.cpp:895 #, c-format msgid "Cannot resume thread %x" msgstr "Không thể phục hồi tuyến trình %x" -#: ../src/msw/thread.cpp:526 +#: ../src/msw/thread.cpp:548 msgid "Cannot start thread: error writing TLS." -msgstr "Không thể bắt đầu tuyến trình: lá»—i ghi TLS." +msgstr "Không thể khởi Ä‘á»™ng tuyến trình: lá»—i ghi TLS." -#: ../src/os2/thread.cpp:512 +#: ../src/os2/thread.cpp:514 #, c-format msgid "Cannot suspend thread %lu" msgstr "Không thể đình chỉ tuyến trình %lu" -#: ../src/msw/thread.cpp:858 +#: ../src/msw/thread.cpp:880 #, c-format msgid "Cannot suspend thread %x" msgstr "Không thể đình chỉ tuyến trình %x" -#: ../src/msw/thread.cpp:781 +#: ../src/msw/thread.cpp:803 msgid "Cannot wait for thread termination" -msgstr "Không thể chá» tuyến trình kết thúc" +msgstr "Không thể chá» tuyến trình thiết bị cuối" -#: ../src/common/cmdproc.cpp:262 +#: ../src/common/cmdproc.cpp:266 msgid "Can't &Undo " msgstr "Không thể &Undo" -#: ../src/common/image.cpp:2648 +#: ../src/common/image.cpp:2843 #, c-format msgid "Can't check image format of file '%s': file does not exist." msgstr "Không thể kiểm tra định dạng tệp tin ảnh '%s': tệp tin không tồn tại." -#: ../src/msw/registry.cpp:451 +#: ../src/msw/registry.cpp:463 #, c-format msgid "Can't close registry key '%s'" msgstr "Không thể đóng khóa đăng ký '%s'" -#: ../src/msw/registry.cpp:529 +#: ../src/msw/registry.cpp:541 #, c-format msgid "Can't copy values of unsupported type %d." msgstr "Không thể sao chép giá trị của kiểu không được há»— trợ %d." -#: ../src/msw/registry.cpp:432 +#: ../src/msw/registry.cpp:444 #, c-format msgid "Can't create registry key '%s'" msgstr "Không thể tạo má»™t khóa đăng ký '%s'" -#: ../src/os2/thread.cpp:493 -#: ../src/msw/thread.cpp:652 -#: ../src/mac/carbon/mpthread.cpp:906 +#: ../src/msw/thread.cpp:674 +#: ../src/os2/thread.cpp:495 msgid "Can't create thread" msgstr "Không thể tạo tuyến trình" -#: ../src/msw/window.cpp:3717 +#: ../src/msw/window.cpp:3745 #, c-format msgid "Can't create window of class %s" msgstr "Không thể tạo cá»­a sổ của lá»›p %s" -#: ../src/msw/registry.cpp:705 +#: ../src/msw/registry.cpp:717 #, c-format msgid "Can't delete key '%s'" msgstr "Không thể xóa khóa '%s'" -#: ../src/os2/iniconf.cpp:466 -#: ../src/msw/iniconf.cpp:453 +#: ../src/msw/iniconf.cpp:459 +#: ../src/os2/iniconf.cpp:472 #, c-format msgid "Can't delete the INI file '%s'" msgstr "Không thể xóa tệp tin INI '%s'" -#: ../src/msw/registry.cpp:733 +#: ../src/msw/registry.cpp:745 #, c-format msgid "Can't delete value '%s' from key '%s'" msgstr "Không thể xóa giá trị '%s' từ khóa '%s'" -#: ../src/msw/registry.cpp:1090 +#: ../src/msw/registry.cpp:1102 #, c-format msgid "Can't enumerate subkeys of key '%s'" msgstr "Không thể liệt kê khóa phụ từ khóa '%s'" -#: ../src/msw/registry.cpp:1045 +#: ../src/msw/registry.cpp:1057 #, c-format msgid "Can't enumerate values of key '%s'" msgstr "Không thể liệt kê các giá trị của khóa '%s'" -#: ../src/msw/registry.cpp:1308 +#: ../src/msw/registry.cpp:1320 #, c-format msgid "Can't export value of unsupported type %d." msgstr "Không thể xuất ra giá trị của kiểu không được há»— trợ %d." -#: ../src/common/ffile.cpp:247 +#: ../src/common/ffile.cpp:235 #, c-format msgid "Can't find current position in file '%s'" msgstr "Không thể tìm được vị trí hiện hành trong tệp tin '%s'" -#: ../src/msw/registry.cpp:360 +#: ../src/msw/registry.cpp:372 #, c-format msgid "Can't get info about registry key '%s'" msgstr "Không thể nhận được thông tin vá» khóa đăng ký '%s'" -#: ../src/common/zstream.cpp:318 +#: ../src/common/zstream.cpp:330 msgid "Can't initialize zlib deflate stream." msgstr "Không thể khởi tạo zlib deflate stream." @@ -1442,122 +1560,100 @@ msgstr "Không thể khởi tạo zlib deflate stream." msgid "Can't initialize zlib inflate stream." msgstr "Không thể khởi tạo zlib inflate stream." -#: ../src/common/image.cpp:2029 -#: ../src/common/image.cpp:2051 +#: ../src/common/image.cpp:2175 +#: ../src/common/image.cpp:2197 #, c-format msgid "Can't load image from file '%s': file does not exist." msgstr "Không thể tải ảnh từ tệp tin '%s': tệp tin không tồn tại." -#: ../src/msw/registry.cpp:396 +#: ../src/msw/registry.cpp:408 #, c-format msgid "Can't open registry key '%s'" msgstr "Không thể mở khóa đăng ký '%s'" -#: ../src/common/zstream.cpp:234 +#: ../src/common/zstream.cpp:236 #, c-format msgid "Can't read from inflate stream: %s" msgstr "Không thể Ä‘á»c từ inflate stream: %s" -#: ../src/common/zstream.cpp:227 +#: ../src/common/zstream.cpp:228 msgid "Can't read inflate stream: unexpected EOF in underlying stream." msgstr "Không thể Ä‘á»c inflate stream: không mong chá» kết thúc tập tin EOF nằm ở dÆ°á»›i dòng dữ liệu." -#: ../src/msw/registry.cpp:977 +#: ../src/msw/registry.cpp:989 #, c-format msgid "Can't read value of '%s'" msgstr "Không thể Ä‘á»c giá trị của '%s'" -#: ../src/msw/registry.cpp:806 -#: ../src/msw/registry.cpp:838 -#: ../src/msw/registry.cpp:900 +#: ../src/msw/registry.cpp:818 +#: ../src/msw/registry.cpp:850 +#: ../src/msw/registry.cpp:912 #, c-format msgid "Can't read value of key '%s'" msgstr "Không thể Ä‘á»c giá trị của khóa '%s'" -#: ../src/common/image.cpp:2072 +#: ../src/common/image.cpp:2214 #, c-format msgid "Can't save image to file '%s': unknown extension." msgstr "Không thể ghi ảnh ra tệp tin '%s': không hiểu phần mở rá»™ng." -#: ../src/generic/logg.cpp:599 -#: ../src/generic/logg.cpp:1049 +#: ../src/generic/logg.cpp:587 +#: ../src/generic/logg.cpp:997 msgid "Can't save log contents to file." msgstr "Không thể ghi ná»™i dung nhật ký ra tệp tin." -#: ../src/os2/thread.cpp:476 -#: ../src/msw/thread.cpp:608 +#: ../src/msw/thread.cpp:630 +#: ../src/os2/thread.cpp:478 msgid "Can't set thread priority" msgstr "Không thể đặt mức Æ°u tiên tuyến trình" -#: ../src/msw/registry.cpp:824 -#: ../src/msw/registry.cpp:868 -#: ../src/msw/registry.cpp:994 +#: ../src/msw/registry.cpp:836 +#: ../src/msw/registry.cpp:880 +#: ../src/msw/registry.cpp:1006 #, c-format msgid "Can't set value of '%s'" msgstr "Không thể đặt giá trị của '%s'" -#: ../src/common/zstream.cpp:402 +#: ../src/common/zstream.cpp:414 #, c-format msgid "Can't write to deflate stream: %s" msgstr "Không thể ghi vào deflate stream: %s" -#: ../src/richtext/richtextstyledlg.cpp:289 -#: ../src/gtk1/fontdlg.cpp:145 -#: ../src/html/htmlhelp.cpp:434 #: ../src/generic/dirdlgg.cpp:108 +#: ../src/richtext/richtextstyledlg.cpp:289 +#: ../src/msw/msgdlg.cpp:473 +#: ../src/gtk1/fontdlg.cpp:145 #: ../src/motif/msgdlg.cpp:194 -#: ../src/mac/carbon/msgdlg.cpp:38 msgid "Cancel" msgstr "Hủy bá»" -#: ../src/xrc/xmlres.cpp:1297 -#: ../src/xrc/xmlres.cpp:1345 -msgid "Cannot convert dialog units: dialog unknown." -msgstr "Không thể chuyển đổi Ä‘Æ¡n vị há»™p thoại: há»™p thoại chÆ°a được biết." - -#: ../src/common/strconv.cpp:2975 -#, c-format -msgid "Cannot convert from the charset '%s'!" -msgstr "Không thể chuyển đổi từ bá»™ ký tá»± '%s'!" - -#: ../src/mac/carbon/dataview.cpp:1056 -#: ../src/mac/carbon/dataview.cpp:1176 +#: ../src/osx/carbon/dataview.cpp:896 msgid "Cannot create new column's ID. Probably max. number of columns reached." -msgstr "Không thể tạo má»›i chỉ số ID của cá»™t. Hầu nhÆ° chắc chắn trị số lá»›n nhất của cá»™t đã được dùng. " +msgstr "Không thể tạo má»›i chỉ số ID của cá»™t. Hầu nhÆ° chắc chắn trị số lá»›n nhất của cá»™t đã được dùng." -#: ../src/msw/dialup.cpp:545 +#: ../src/msw/dialup.cpp:546 #, c-format msgid "Cannot find active dialup connection: %s" msgstr "Không thể tìm thấy kết nối quay số Ä‘ang hoạt Ä‘á»™ng: %s" -#: ../src/xrc/xmlres.cpp:371 -#, c-format -msgid "Cannot find container for unknown control '%s'." -msgstr "Không tìm thấy container cho Ä‘iá»u khiển không rõ '%s'." - -#: ../src/xrc/xmlres.cpp:1380 -#, c-format -msgid "Cannot find font node '%s'." -msgstr "Không thể tìm thấy nút phông chữ '%s'." - -#: ../src/msw/dialup.cpp:856 +#: ../src/msw/dialup.cpp:857 msgid "Cannot find the location of address book file" msgstr "Không tìm thấy vị trí trong tệp tin sổ địa chỉ" -#: ../src/unix/threadpsx.cpp:1192 +#: ../src/unix/threadpsx.cpp:1197 #, c-format msgid "Cannot get priority range for scheduling policy %d." msgstr "Không thể nhận vùng Æ°u tiên cho việc tạo lập chính sách %d." -#: ../src/unix/utilsunx.cpp:842 +#: ../src/unix/utilsunx.cpp:779 msgid "Cannot get the hostname" msgstr "Không thể lấy được tên máy chủ" -#: ../src/unix/utilsunx.cpp:878 +#: ../src/unix/utilsunx.cpp:815 msgid "Cannot get the official hostname" msgstr "Không lấy được tên máy chủ văn phòng" -#: ../src/msw/dialup.cpp:953 +#: ../src/msw/dialup.cpp:958 msgid "Cannot hang up - no active dialup connection." msgstr "Không thể gác máy - không có kết nối quay số nào Ä‘ang hoạt Ä‘á»™ng." @@ -1565,7 +1661,7 @@ msgstr "Không thể gác máy - không có kết nối quay số nào Ä‘ang ho msgid "Cannot initialize OLE" msgstr "Không thể khởi tạo OLE" -#: ../src/mgl/app.cpp:279 +#: ../src/mgl/app.cpp:229 msgid "Cannot initialize SciTech MGL!" msgstr "Không thể khởi tạo SciTech MGL!" @@ -1573,12 +1669,21 @@ msgstr "Không thể khởi tạo SciTech MGL!" msgid "Cannot initialize display." msgstr "Không thể khá»i tạo bá»™ hiển thị." -#: ../src/msw/volume.cpp:614 +#: ../src/common/socket.cpp:844 +msgid "Cannot initialize sockets" +msgstr "Không thể khởi tạo socket" + +#: ../src/msw/volume.cpp:619 #, c-format msgid "Cannot load icon from '%s'." msgstr "Không thể tải biểu tượng từ '%s'." -#: ../src/xrc/xmlres.cpp:504 +#: ../src/xrc/xmlres.cpp:264 +#, c-format +msgid "Cannot load resources from '%s'." +msgstr "Không thể tải tài nguyên từ '%s'." + +#: ../src/xrc/xmlres.cpp:599 #, c-format msgid "Cannot load resources from file '%s'." msgstr "Không thể tải tài nguyên từ tệp tin '%s'." @@ -1588,7 +1693,7 @@ msgstr "Không thể tải tài nguyên từ tệp tin '%s'." msgid "Cannot open HTML document: %s" msgstr "Không thể mở tài liệu HTML: %s" -#: ../src/html/helpdata.cpp:658 +#: ../src/html/helpdata.cpp:652 #, c-format msgid "Cannot open HTML help book: %s" msgstr "Không thể mở sách trợ giúp dạng HTML: %s" @@ -1598,7 +1703,7 @@ msgstr "Không thể mở sách trợ giúp dạng HTML: %s" msgid "Cannot open contents file: %s" msgstr "Không thể mở tập tin ná»™i dung: %s" -#: ../src/xrc/xmlres.cpp:469 +#: ../src/xrc/xmlres.cpp:564 #, c-format msgid "Cannot open file '%s'." msgstr "Không thể mở tập tin %s." @@ -1612,143 +1717,124 @@ msgstr "Không thể mở tập tin cho việc in dạng PostScript!" msgid "Cannot open index file: %s" msgstr "Không thể mở tập tin chỉ mục: %s" -#: ../src/common/intl.cpp:1337 -#, c-format -msgid "Cannot parse Plural-Forms:'%s'" -msgstr "Không thể phân tách Dạng-Số-Nhiá»u: '%s'" - -#: ../src/xrc/xmlres.cpp:1281 -#, c-format -msgid "Cannot parse coordinates from '%s'." -msgstr "Không thể phân tách hệ tá»a Ä‘á»™ từ '%s'." - -#: ../src/xrc/xmlres.cpp:1329 -#, c-format -msgid "Cannot parse dimension from '%s'." -msgstr "Không thể phân tách kích thÆ°á»›c từ '%s'." - -#: ../src/html/helpwnd.cpp:1540 +#: ../src/html/helpwnd.cpp:1541 msgid "Cannot print empty page." msgstr "Không thể in má»™t trang rá»—ng." -#: ../src/msw/volume.cpp:504 +#: ../src/msw/volume.cpp:508 #, c-format msgid "Cannot read typename from '%s'!" msgstr "Không thể Ä‘á»c kiểu tên từ '%s'!" -#: ../src/unix/threadpsx.cpp:1173 +#: ../src/unix/threadpsx.cpp:1178 msgid "Cannot retrieve thread scheduling policy." msgstr "Không thể khôi phục chính sách tạo lập tác vụ tuyến trình." -#: ../src/common/intl.cpp:1907 +#: ../src/common/intl.cpp:546 #, c-format msgid "Cannot set locale to language \"%s\"." -msgstr "Không thể đặt ngôn ngữ \"%s\"." +msgstr "Không thể đặt ngôn ngữ \"%s\"." -#: ../src/unix/threadpsx.cpp:797 +#: ../src/unix/threadpsx.cpp:819 msgid "Cannot start thread: error writing TLS" msgstr "Không thể khởi Ä‘á»™ng tuyến trình: lá»—i ghi TLS." -#: ../src/mac/carbon/mpthread.cpp:972 -msgid "Cannot wait for thread termination." -msgstr "Không thể chá» tuyến trình kết thúc." - -#: ../src/mac/carbon/mpthread.cpp:888 -msgid "Cant create the thread event queue" -msgstr "Không thể tạo hàng đợi sá»± kiện tuyến trình" - -#: ../src/html/helpwnd.cpp:532 +#: ../src/html/helpwnd.cpp:544 msgid "Case sensitive" msgstr "Phân biệt chữ HOA/thÆ°á»ng" -#: ../src/common/fmapbase.cpp:121 +#: ../src/propgrid/manager.cpp:1505 +msgid "Categorized Mode" +msgstr "Chế Ä‘á»™ Cá nhân hóa" + +#: ../src/common/fmapbase.cpp:162 msgid "Celtic (ISO-8859-14)" msgstr "Celtic (ISO-8859-14)" -#: ../src/richtext/richtextliststylepage.cpp:348 #: ../src/richtext/richtextindentspage.cpp:170 +#: ../src/richtext/richtextliststylepage.cpp:348 msgid "Cen&tred" msgstr "&Trung tâm" -#: ../src/common/stockitem.cpp:133 +#: ../src/common/stockitem.cpp:159 msgid "Centered" msgstr "Trung tâm" -#: ../src/common/fmapbase.cpp:109 +#: ../src/common/fmapbase.cpp:150 msgid "Central European (ISO-8859-2)" msgstr "Central European (ISO-8859-2)" #: ../src/richtext/richtextliststylepage.cpp:249 -#: ../src/richtext/richtextbulletspage.cpp:198 +#: ../src/richtext/richtextbulletspage.cpp:197 msgid "Centre" msgstr "Chính giữa" -#: ../src/richtext/richtextliststylepage.cpp:350 -#: ../src/richtext/richtextliststylepage.cpp:352 #: ../src/richtext/richtextindentspage.cpp:172 #: ../src/richtext/richtextindentspage.cpp:174 +#: ../src/richtext/richtextliststylepage.cpp:350 +#: ../src/richtext/richtextliststylepage.cpp:352 msgid "Centre text." msgstr "Chữ ở chính giữa." #: ../src/richtext/richtextliststylepage.cpp:279 -#: ../src/richtext/richtextbulletspage.cpp:230 +#: ../src/richtext/richtextbulletspage.cpp:229 msgid "Ch&oose..." msgstr "&Chá»n lá»±a..." -#: ../src/richtext/richtextbuffer.cpp:2685 +#: ../src/richtext/richtextbuffer.cpp:2738 msgid "Change List Style" msgstr "Thay Äổi Kiểu Dáng List" -#: ../src/richtext/richtextbuffer.cpp:1721 +#: ../src/richtext/richtextbuffer.cpp:1733 msgid "Change Style" msgstr "Thay đổi Kiểu Dáng" -#: ../src/mac/carbon/dataview.cpp:251 +#: ../src/osx/dataview_osx.cpp:120 msgid "Changed item is invalid." msgstr "Thay đổi mục tin không hợp lệ." -#: ../src/common/fileconf.cpp:378 +#: ../src/common/fileconf.cpp:373 #, c-format msgid "Changes won't be saved to avoid overwriting the existing file \"%s\"" msgstr "Các thay đổi không thể ghi lại mà không ghi đè lên tệp tin đã tồn tại \"%s\"" -#: ../src/richtext/richtextstyles.cpp:840 +#: ../src/richtext/richtextstyles.cpp:906 msgid "Character styles" msgstr "Kiểu dáng ký tá»±" #: ../src/richtext/richtextliststylepage.cpp:223 #: ../src/richtext/richtextliststylepage.cpp:225 -#: ../src/richtext/richtextbulletspage.cpp:172 -#: ../src/richtext/richtextbulletspage.cpp:174 +#: ../src/richtext/richtextbulletspage.cpp:171 +#: ../src/richtext/richtextbulletspage.cpp:173 msgid "Check to add a period after the bullet." msgstr "Kiểm tra để thêm má»™t dấu chấm sau bullet." #: ../src/richtext/richtextliststylepage.cpp:237 #: ../src/richtext/richtextliststylepage.cpp:239 -#: ../src/richtext/richtextbulletspage.cpp:186 -#: ../src/richtext/richtextbulletspage.cpp:188 +#: ../src/richtext/richtextbulletspage.cpp:185 +#: ../src/richtext/richtextbulletspage.cpp:187 msgid "Check to add a right parenthesis." msgstr "Äánh đấu kiểm để thêm dấu mở ngoặc Ä‘Æ¡n." #: ../src/richtext/richtextliststylepage.cpp:230 #: ../src/richtext/richtextliststylepage.cpp:232 -#: ../src/richtext/richtextbulletspage.cpp:179 -#: ../src/richtext/richtextbulletspage.cpp:181 +#: ../src/richtext/richtextbulletspage.cpp:178 +#: ../src/richtext/richtextbulletspage.cpp:180 msgid "Check to enclose the bullet in parentheses." msgstr "Kiểm tra để bao bullet bằng dấu ngoặc Ä‘Æ¡n." -#: ../src/mac/carbon/fontdlg.cpp:518 -#: ../src/mac/carbon/fontdlg.cpp:520 +#: ../src/osx/carbon/fontdlg.cpp:530 +#: ../src/osx/carbon/fontdlg.cpp:532 msgid "Check to make the font bold." msgstr "Äánh đấu kiểm để làm cho phông chữ đậm." -#: ../src/mac/carbon/fontdlg.cpp:525 -#: ../src/mac/carbon/fontdlg.cpp:527 +#: ../src/osx/carbon/fontdlg.cpp:537 +#: ../src/osx/carbon/fontdlg.cpp:539 msgid "Check to make the font italic." msgstr "Äánh đấu kiểm để làm cho phông chữ nghiêng." -#: ../src/mac/carbon/fontdlg.cpp:534 -#: ../src/mac/carbon/fontdlg.cpp:536 +#: ../src/osx/carbon/fontdlg.cpp:546 +#: ../src/osx/carbon/fontdlg.cpp:548 msgid "Check to make the font underlined." msgstr "Äánh đấu kiểm để làm cho phông chữ có gạch chân." @@ -1757,36 +1843,45 @@ msgstr "Äánh đấu kiểm để làm cho phông chữ có gạch chân." msgid "Check to restart numbering." msgstr "Äánh đấu kiểm để bắt đầu đánh số." -#: ../src/richtext/richtextfontpage.cpp:227 -#: ../src/richtext/richtextfontpage.cpp:229 +#: ../src/richtext/richtextfontpage.cpp:244 +#: ../src/richtext/richtextfontpage.cpp:246 msgid "Check to show a line through the text." msgstr "Äánh dấu kiểm để chữ bị gạch ngang." -#: ../src/richtext/richtextfontpage.cpp:234 -#: ../src/richtext/richtextfontpage.cpp:236 +#: ../src/richtext/richtextfontpage.cpp:251 +#: ../src/richtext/richtextfontpage.cpp:253 msgid "Check to show the text in capitals." msgstr "Äánh dấu kiểm để chữ được viết hoa." -#: ../src/richtext/richtextfontpage.cpp:248 -#: ../src/richtext/richtextfontpage.cpp:250 +#: ../src/richtext/richtextfontpage.cpp:265 +#: ../src/richtext/richtextfontpage.cpp:267 msgid "Check to show the text in subscript." msgstr "Äánh dấu kiểm để chữ thụt xuống." -#: ../src/richtext/richtextfontpage.cpp:241 -#: ../src/richtext/richtextfontpage.cpp:243 +#: ../src/richtext/richtextfontpage.cpp:258 +#: ../src/richtext/richtextfontpage.cpp:260 msgid "Check to show the text in superscript." msgstr "Äánh dấu kiểm để chữ đẩy lên." -#: ../src/msw/dialup.cpp:791 +#: ../src/msw/dialup.cpp:792 msgid "Choose ISP to dial" msgstr "Chá»n nhà cung cấp dịch vụ Internet ISP để quay số" -#: ../src/gtk/colordlg.cpp:52 -#: ../src/generic/colrdlgg.cpp:144 +#: ../src/propgrid/props.cpp:1547 +msgid "Choose a directory:" +msgstr "Chá»n thÆ° mục:" + +#: ../src/propgrid/props.cpp:1606 +msgid "Choose a file" +msgstr "Chá»n má»™t tệp tin" + #: ../src/palmos/colordlg.cpp:74 +#: ../src/generic/colrdlgg.cpp:144 +#: ../src/gtk/colordlg.cpp:60 msgid "Choose colour" msgstr "Chá»n màu" +#: ../src/generic/fontpickerg.cpp:51 #: ../src/gtk/fontdlg.cpp:99 #: ../src/gtk1/fontdlg.cpp:126 msgid "Choose font" @@ -1798,11 +1893,11 @@ msgid "Circular dependency involving module \"%s\" detected." msgstr "Circular dependency đòi há»i phải tìm được mô Ä‘un \"%s\"." #: ../src/aui/tabmdi.cpp:105 -#: ../src/generic/mdig.cpp:115 +#: ../src/generic/mdig.cpp:102 msgid "Cl&ose" msgstr "Äón&g" -#: ../src/generic/logg.cpp:537 +#: ../src/generic/logg.cpp:526 msgid "Clear the log contents" msgstr "Xóa ná»™i dung nhật ký thông tin" @@ -1813,13 +1908,13 @@ msgstr "Bấm vào để chấp nhận kiểu dáng đã chá»n." #: ../src/richtext/richtextliststylepage.cpp:280 #: ../src/richtext/richtextliststylepage.cpp:282 -#: ../src/richtext/richtextbulletspage.cpp:231 -#: ../src/richtext/richtextbulletspage.cpp:233 +#: ../src/richtext/richtextbulletspage.cpp:230 +#: ../src/richtext/richtextbulletspage.cpp:232 msgid "Click to browse for a symbol." msgstr "Bấm chá»n để tìm duyệt ký tá»± đặc biệt." -#: ../src/mac/carbon/fontdlg.cpp:565 -#: ../src/mac/carbon/fontdlg.cpp:567 +#: ../src/osx/carbon/fontdlg.cpp:577 +#: ../src/osx/carbon/fontdlg.cpp:579 msgid "Click to cancel changes to the font." msgstr "Bấm vào để hủy thay đổi phông chữ." @@ -1833,13 +1928,18 @@ msgstr "Bấm vào để hủy việc chá»n phông chữ." msgid "Click to cancel this window." msgstr "Bấm vào để hủy cá»­a sổ này." -#: ../src/mac/carbon/fontdlg.cpp:546 -#: ../src/mac/carbon/fontdlg.cpp:548 +#: ../src/osx/carbon/fontdlg.cpp:558 +#: ../src/osx/carbon/fontdlg.cpp:560 msgid "Click to change the font colour." msgstr "Bấm vào để thay đổi màu sắc phông chữ." -#: ../src/richtext/richtextfontpage.cpp:217 -#: ../src/richtext/richtextfontpage.cpp:219 +#: ../src/richtext/richtextfontpage.cpp:234 +#: ../src/richtext/richtextfontpage.cpp:236 +msgid "Click to change the text background colour." +msgstr "Bấm vào để thay đổi màu ná»n của chữ." + +#: ../src/richtext/richtextfontpage.cpp:222 +#: ../src/richtext/richtextfontpage.cpp:224 msgid "Click to change the text colour." msgstr "Bấm vào để thay đổi màu của chữ." @@ -1853,8 +1953,8 @@ msgstr "Bấm vào để chá»n phông chữ cho mức này." msgid "Click to close this window." msgstr "Bấm vào để đóng cá»­a sổ này." -#: ../src/mac/carbon/fontdlg.cpp:572 -#: ../src/mac/carbon/fontdlg.cpp:574 +#: ../src/osx/carbon/fontdlg.cpp:584 +#: ../src/osx/carbon/fontdlg.cpp:586 msgid "Click to confirm changes to the font." msgstr "Bấm vào để xác nhận thay đổi phông chữ." @@ -1885,13 +1985,13 @@ msgstr "Bấm vào để tạo kiểu dáng danh sách má»›i." msgid "Click to create a new paragraph style." msgstr "Bấm vào để tạo má»™t kiểu dáng Ä‘oạn văn má»›i." -#: ../src/richtext/richtexttabspage.cpp:137 -#: ../src/richtext/richtexttabspage.cpp:139 +#: ../src/richtext/richtexttabspage.cpp:136 +#: ../src/richtext/richtexttabspage.cpp:138 msgid "Click to create a new tab position." msgstr "Bấm vào để tạo má»™t vị trí tab má»›i." -#: ../src/richtext/richtexttabspage.cpp:149 -#: ../src/richtext/richtexttabspage.cpp:151 +#: ../src/richtext/richtexttabspage.cpp:148 +#: ../src/richtext/richtexttabspage.cpp:150 msgid "Click to delete all tab positions." msgstr "Bấm vào để xóa tất cả vị trí tab." @@ -1900,8 +2000,8 @@ msgstr "Bấm vào để xóa tất cả vị trí tab." msgid "Click to delete the selected style." msgstr "Bấm vào để xóa kiểu dáng đã chá»n." -#: ../src/richtext/richtexttabspage.cpp:143 -#: ../src/richtext/richtexttabspage.cpp:145 +#: ../src/richtext/richtexttabspage.cpp:142 +#: ../src/richtext/richtexttabspage.cpp:144 msgid "Click to delete the selected tab position." msgstr "Bấm vào để xóa các vị trí tab đã chá»n." @@ -1915,196 +2015,197 @@ msgstr "Bấm vào để biên tập kiểu dáng đã chá»n." msgid "Click to rename the selected style." msgstr "Bấm vào để đổi tên kiểu dáng đã chá»n." +#: ../src/generic/dbgrptg.cpp:94 +#: ../src/generic/progdlgg.cpp:717 +#: ../src/generic/progdlgg.cpp:722 #: ../src/richtext/richtextstyledlg.cpp:263 -#: ../src/richtext/richtextsymboldlg.cpp:474 +#: ../src/richtext/richtextsymboldlg.cpp:475 #: ../src/html/helpdlg.cpp:91 -#: ../src/generic/dbgrptg.cpp:93 -#: ../src/generic/progdlgg.cpp:642 -#: ../src/generic/progdlgg.cpp:647 msgid "Close" msgstr "Äóng" -#: ../src/univ/themes/win32.cpp:3742 +#: ../src/univ/themes/win32.cpp:3780 msgid "Close\tAlt-F4" msgstr "Äóng lại\tAlt-F4" #: ../src/aui/tabmdi.cpp:106 -#: ../src/generic/mdig.cpp:116 +#: ../src/generic/mdig.cpp:103 msgid "Close All" msgstr "Äóng hết" -#: ../src/common/stockitem.cpp:211 +#: ../src/common/stockitem.cpp:268 msgid "Close current document" msgstr "Äóng tài liệu hiện thá»i" -#: ../src/generic/logg.cpp:539 +#: ../src/generic/logg.cpp:528 msgid "Close this window" msgstr "Äóng cá»­a sổ này" -#: ../src/richtext/richtextformatdlg.cpp:524 +#: ../src/richtext/richtextformatdlg.cpp:523 msgid "Colour" msgstr "Màu sắc" -#: ../src/msw/colordlg.cpp:155 +#: ../src/msw/colordlg.cpp:156 #, c-format msgid "Colour selection dialog failed with error %0lx." msgstr "Há»™p thoại chá»n màu gặp lá»—i %0lx." -#: ../src/mac/carbon/fontdlg.cpp:542 +#: ../src/osx/carbon/fontdlg.cpp:554 msgid "Colour:" msgstr "Màu sắc:" -#: ../src/mac/carbon/dataview.cpp:1064 -#: ../src/mac/carbon/dataview.cpp:1184 +#: ../src/osx/dataview_osx.cpp:406 +msgid "Column could not be added to native control." +msgstr "Cá»™t không thể chèn thêm vào má»™t Ä‘iá»u khiển cÆ¡ bản" + +#: ../src/osx/carbon/dataview.cpp:901 msgid "Column could not be added." msgstr "Cá»™t không thể chèn thêm" -#: ../src/mac/carbon/dataview.cpp:1063 -#: ../src/mac/carbon/dataview.cpp:1183 +#: ../src/osx/carbon/dataview.cpp:900 msgid "Column description could not be initialized." msgstr "Phần miêu tả cá»™t không thể được khởi tạo." -#: ../src/mac/carbon/dataview.cpp:1050 -#: ../src/mac/carbon/dataview.cpp:1170 +#: ../src/osx/dataview_osx.cpp:380 msgid "Column does not have a renderer." msgstr "Cá»™t không có bá»™ xá»­ lý." -#: ../src/mac/carbon/databrow.cpp:883 -#: ../src/mac/carbon/databrow.cpp:904 +#: ../src/osx/carbon/dataview.cpp:1499 +#: ../src/osx/carbon/dataview.cpp:1520 msgid "Column index not found." msgstr "Chỉ mục cá»™t không thấy." -#: ../src/mac/carbon/dataview.cpp:1049 -#: ../src/mac/carbon/dataview.cpp:1169 +#: ../src/osx/dataview_osx.cpp:379 msgid "Column pointer must not be NULL." msgstr "Con trá» cá»™t phải khác NULL." -#: ../src/mac/carbon/databrow.cpp:959 +#: ../src/osx/carbon/dataview.cpp:1575 msgid "Column width could not be determined" msgstr "Chiá»u rá»™ng cá»™t không thể được định rõ" -#: ../src/mac/carbon/dataview.cpp:1067 -#: ../src/mac/carbon/dataview.cpp:1187 +#: ../src/osx/carbon/dataview.cpp:902 msgid "Column width could not be set." msgstr "Chiá»u rá»™ng cá»™t không thể đặt được." -#: ../src/mac/carbon/dataview.cpp:1053 -#: ../src/mac/carbon/dataview.cpp:1173 +#: ../src/osx/dataview_osx.cpp:383 msgid "Column's model column has no equivalent in the associated model." msgstr "Mô hình của cá»™t phải không tÆ°Æ¡ng Ä‘Æ°Æ¡ng vá»›i mô hình liên quan." -#: ../src/common/init.cpp:189 +#: ../src/common/init.cpp:185 #, c-format msgid "Command line argument %d couldn't be converted to Unicode and will be ignored." msgstr "Tham số dòng lệnh %d không thể chuyển đổi sang Unicode và sẽ bị bá» qua." -#: ../src/html/helpwnd.cpp:1554 -msgid "Compressed HTML Help file (*.chm)|*.chm|" -msgstr "Nén tệp tin Trợ Giúp dạng HTML (*.chm)|*.chm|" +#: ../src/msw/fontdlg.cpp:118 +#, c-format +msgid "Common dialog failed with error code %0lx." +msgstr "Há»™p thoại dùng chung gặp lá»—i %0lx." -#: ../src/generic/dirctrlg.cpp:591 +#: ../src/html/helpwnd.cpp:1558 +msgid "Compressed HTML Help file (*.chm)|*.chm|" +msgstr "Nén tệp tin Trợ Giúp dạng HTML (*.chm)|*.chm|" + +#: ../src/generic/dirctrlg.cpp:595 msgid "Computer" msgstr "ThÆ° mục Computer" -#: ../src/common/fileconf.cpp:959 +#: ../src/common/fileconf.cpp:966 #, c-format msgid "Config entry name cannot start with '%c'." -msgstr "Tên mục tin cấu hình không thể bắt đầu bằng '%c'. " +msgstr "Tên mục tin cấu hình không thể bắt đầu bằng '%c'." -#: ../src/gtk/filedlg.cpp:55 +#: ../src/gtk/filedlg.cpp:56 msgid "Confirm" msgstr "Xác nhận" -#: ../src/msw/mimetype.cpp:706 +#: ../src/msw/mimetype.cpp:715 msgid "Confirm registry update" msgstr "Xác nhận cập nhật đăng ký" -#: ../src/html/htmlwin.cpp:517 +#: ../src/html/htmlwin.cpp:541 msgid "Connecting..." msgstr "Äang kết nối..." -#: ../src/html/htmlhelp.cpp:565 -#: ../src/html/helpwnd.cpp:468 +#: ../src/html/helpwnd.cpp:480 msgid "Contents" msgstr "Ná»™i dung" -#: ../src/mac/carbon/dataview.cpp:377 -msgid "Control is wrongly initialized." -msgstr "Äiá»u khiển khởi tạo sai." - -#: ../src/common/strconv.cpp:2003 +#: ../src/common/strconv.cpp:2241 #, c-format msgid "Conversion to charset '%s' doesn't work." msgstr "Việc chuyển đổi bá»™ ký tá»± thành '%s' không làm việc." -#: ../src/html/htmlwin.cpp:941 +#: ../src/html/htmlwin.cpp:1054 #, c-format msgid "Copied to clipboard:\"%s\"" msgstr "Äã sao chép vào clipboard:\"%s\"" -#: ../src/generic/prntdlgg.cpp:254 +#: ../src/generic/prntdlgg.cpp:253 msgid "Copies:" msgstr "Bản sao:" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:426 +#: ../src/stc/scintilla/src/ScintillaBase.cxx:456 msgid "Copy" msgstr "Chép" -#: ../src/common/stockitem.cpp:203 +#: ../src/common/stockitem.cpp:260 msgid "Copy selection" msgstr "Chép vùng chá»n" -#: ../src/mac/carbon/dataview.cpp:1061 -#: ../src/mac/carbon/dataview.cpp:1181 +#: ../src/osx/dataview_osx.cpp:415 msgid "Could not add column to internal structures." msgstr "Không thể thêm cá»™t vào cấu trúc ná»™i tại." -#: ../src/html/chm.cpp:703 +#: ../src/html/chm.cpp:717 #, c-format msgid "Could not create temporary file '%s'" -msgstr "Không thể tạo tập tin tạm thá»i '%s'" +msgstr "Không thể tạo tập tin tạm thá»i '%s'" -#: ../src/mac/carbon/databrow.cpp:628 -#: ../src/mac/carbon/databrow.cpp:1011 +#: ../src/osx/carbon/dataview.cpp:1246 +#: ../src/osx/carbon/dataview.cpp:1633 msgid "Could not determine column index." msgstr "Không thể định rõ chỉ mục của cá»™t." -#: ../src/mac/carbon/dataview.cpp:1145 +#: ../src/osx/carbon/dataview.cpp:877 msgid "Could not determine column's position" msgstr "Không thể xác định rõ vị trí của cá»™t" -#: ../src/mac/carbon/dataview.cpp:1253 +#: ../src/osx/carbon/dataview.cpp:844 +msgid "Could not determine number of columns." +msgstr "Không thể định rõ số các cá»™t." + +#: ../src/osx/carbon/dataview.cpp:976 msgid "Could not determine number of items" msgstr "Không thể định rõ số các mục tin" #: ../src/html/chm.cpp:274 #, c-format msgid "Could not extract %s into %s: %s" -msgstr "Không thể rút trích %s vào trong %s: %s " +msgstr "Không thể rút trích %s vào trong %s: %s" -#: ../src/generic/tabg.cpp:1051 +#: ../src/generic/tabg.cpp:1049 msgid "Could not find tab for id" msgstr "Không thể tìm thấy tab cho id" -#: ../src/mac/carbon/dataview.cpp:739 -#: ../src/mac/carbon/dataview.cpp:776 -#: ../src/mac/carbon/dataview.cpp:814 -#: ../src/mac/carbon/dataview.cpp:837 -#: ../src/mac/carbon/dataview.cpp:948 +#: ../src/osx/carbon/dataview.cpp:2511 +#: ../src/osx/carbon/dataview.cpp:2546 +#: ../src/osx/carbon/dataview.cpp:2570 +#: ../src/osx/carbon/dataview.cpp:2591 +#: ../src/osx/carbon/dataview.cpp:2728 msgid "Could not get header description." msgstr "Không thể lấy phần mô tả phần đầu." -#: ../src/mac/carbon/dataview.cpp:1335 -#: ../src/mac/carbon/dataview.cpp:1395 +#: ../src/osx/carbon/dataview.cpp:1135 +#: ../src/osx/carbon/dataview.cpp:1161 msgid "Could not get items." msgstr "Không thể lấy các mục tin." -#: ../src/mac/carbon/dataview.cpp:861 -#: ../src/mac/carbon/dataview.cpp:891 +#: ../src/osx/carbon/dataview.cpp:2614 +#: ../src/osx/carbon/dataview.cpp:2679 msgid "Could not get property flags." msgstr "Không thể lấy thuá»™c tính của các cá»." -#: ../src/mac/carbon/databrow.cpp:504 +#: ../src/osx/carbon/dataview.cpp:727 msgid "Could not get selected items." msgstr "Không thể lấy mục tin đã chá»n." @@ -2113,86 +2214,81 @@ msgstr "Không thể lấy mục tin đã chá»n." msgid "Could not locate file '%s'." msgstr "Không thể cấp phát tệp tin '%s'." -#: ../src/mac/carbon/dataview.cpp:1090 +#: ../src/osx/carbon/dataview.cpp:846 msgid "Could not remove column." msgstr "Không thể gỡ bá» cá»™t." -#: ../src/mac/carbon/databrow.cpp:425 +#: ../src/osx/carbon/dataview.cpp:643 msgid "Could not retrieve number of items" msgstr "Không thể lấy số mục tin." -#: ../src/mac/carbon/dataview.cpp:755 +#: ../src/osx/carbon/dataview.cpp:2527 msgid "Could not set alignment." msgstr "Không thể đặt sá»± căn chỉnh." -#: ../src/mac/carbon/dataview.cpp:969 +#: ../src/osx/carbon/dataview.cpp:2748 msgid "Could not set column width." msgstr "Không thể đặt Ä‘á»™ rá»™ng cá»™t." -#: ../src/mac/carbon/dataview.cpp:950 +#: ../src/osx/carbon/dataview.cpp:2730 msgid "Could not set header description." msgstr "Không thể đặt phần mô tả phần đầu." -#: ../src/mac/carbon/dataview.cpp:785 +#: ../src/osx/carbon/dataview.cpp:2551 msgid "Could not set icon." msgstr "Không thể đặt biểu tượng." -#: ../src/mac/carbon/dataview.cpp:816 +#: ../src/osx/carbon/dataview.cpp:2572 msgid "Could not set maximum width." msgstr "Không thể đặt Ä‘á»™ rá»™ng cá»™t tối Ä‘a." -#: ../src/mac/carbon/dataview.cpp:839 +#: ../src/osx/carbon/dataview.cpp:2593 msgid "Could not set minimum width." msgstr "Không thể đặt Ä‘á»™ rá»™ng cá»™t tối thiểu." -#: ../src/mac/carbon/dataview.cpp:866 -#: ../src/mac/carbon/dataview.cpp:896 +#: ../src/osx/carbon/dataview.cpp:2619 +#: ../src/osx/carbon/dataview.cpp:2684 msgid "Could not set property flags." msgstr "Không thể đặt thuá»™c tính của các cá»." -#: ../src/common/prntbase.cpp:1547 +#: ../src/common/prntbase.cpp:1558 msgid "Could not start document preview." msgstr "Không thể bắt đầu việc xem thá»­ tài liệu." -#: ../src/gtk/gnome/gprint.cpp:925 -#: ../src/gtk/print.cpp:1042 -#: ../src/generic/printps.cpp:181 -#: ../src/msw/printwin.cpp:233 +#: ../src/generic/printps.cpp:179 +#: ../src/msw/printwin.cpp:205 +#: ../src/gtk/print.cpp:1011 +#: ../src/gtk/gnome/gprint.cpp:916 msgid "Could not start printing." msgstr "Không thể bắt đầu in." -#: ../src/common/wincmn.cpp:1621 +#: ../src/common/wincmn.cpp:1786 msgid "Could not transfer data to window" msgstr "Không thể truyá»n dữ liệu tá»›i cá»­a sổ" -#: ../src/mac/carbon/mpthread.cpp:222 -#: ../src/mac/carbon/mpthread.cpp:301 -msgid "Could not unlock mutex" -msgstr "Không thể bá» khóa mutex" - -#: ../src/os2/thread.cpp:159 +#: ../src/os2/thread.cpp:161 msgid "Couldn't acquire a mutex lock" msgstr "Không thể có được khóa mutex" +#: ../src/msw/imaglist.cpp:147 +#: ../src/msw/imaglist.cpp:165 +#: ../src/msw/imaglist.cpp:177 #: ../src/msw/dragimag.cpp:156 #: ../src/msw/dragimag.cpp:195 -#: ../src/msw/imaglist.cpp:149 -#: ../src/msw/imaglist.cpp:167 -#: ../src/msw/imaglist.cpp:179 msgid "Couldn't add an image to the image list." msgstr "Không thể thêm ảnh vào trong danh sách ảnh." +#: ../src/msw/timer.cpp:139 #: ../src/os2/timer.cpp:114 -#: ../src/msw/timer.cpp:83 msgid "Couldn't create a timer" msgstr "Không tạo được má»™t timer" #: ../src/mgl/cursor.cpp:132 -#: ../src/mgl/cursor.cpp:163 +#: ../src/mgl/cursor.cpp:153 msgid "Couldn't create cursor." msgstr "Không tạo được con trá» chuá»™t." -#: ../src/mac/carbon/overlay.cpp:125 +#: ../src/osx/carbon/overlay.cpp:123 msgid "Couldn't create the overlay window" msgstr "Không tạo được cá»­a sổ overlay" @@ -2201,19 +2297,19 @@ msgstr "Không tạo được cá»­a sổ overlay" msgid "Couldn't find symbol '%s' in a dynamic library" msgstr "Không thể tìm thấy ký tá»± đặc biệt '%s' trong thÆ° viện liên kết Ä‘á»™ng" -#: ../src/gtk/print.cpp:2055 +#: ../src/gtk/print.cpp:1957 msgid "Couldn't get hatch style from wxBrush." msgstr "Không thể lấy kiểu dáng hatch từ wxBrush." -#: ../src/msw/thread.cpp:899 +#: ../src/msw/thread.cpp:921 msgid "Couldn't get the current thread pointer" msgstr "Không thể lấy con trá» tuyến trình hiện hành" -#: ../src/mac/carbon/overlay.cpp:132 +#: ../src/osx/carbon/overlay.cpp:130 msgid "Couldn't init the context on the overlay window" msgstr "Không thể khởi tạo context trên cá»­a sổ overlay" -#: ../src/common/imagpng.cpp:615 +#: ../src/common/imagpng.cpp:614 msgid "Couldn't load a PNG image - file is corrupted or not enough memory." msgstr "Không thể tải ảnh PNG- tệp tin bị há»ng hay không đủ bá»™ nhá»›." @@ -2222,7 +2318,7 @@ msgstr "Không thể tải ảnh PNG- tệp tin bị há»ng hay không đủ b msgid "Couldn't load sound data from '%s'." msgstr "Không thể tải dữ liệu âm thanh từ '%s'." -#: ../src/unix/sound_sdl.cpp:228 +#: ../src/unix/sound_sdl.cpp:226 #, c-format msgid "Couldn't open audio: %s" msgstr "Không mở âm thanh: %s" @@ -2232,22 +2328,22 @@ msgstr "Không mở âm thanh: %s" msgid "Couldn't register clipboard format '%s'." msgstr "Không thể đăng ký định dạng clipboard '%s'." -#: ../src/os2/thread.cpp:176 +#: ../src/os2/thread.cpp:178 msgid "Couldn't release a mutex" msgstr "Không thể giải phóng mutex" -#: ../src/msw/listctrl.cpp:802 +#: ../src/msw/listctrl.cpp:828 #, c-format msgid "Couldn't retrieve information about list control item %d." msgstr "Không thể phục hồi thông tin vá» Ä‘iá»u khiển danh sách mục tin %d." -#: ../src/common/imagpng.cpp:664 -#: ../src/common/imagpng.cpp:673 -#: ../src/common/imagpng.cpp:681 +#: ../src/common/imagpng.cpp:665 +#: ../src/common/imagpng.cpp:676 +#: ../src/common/imagpng.cpp:686 msgid "Couldn't save PNG image." msgstr "Không thể ghi lại ảnh PNG." -#: ../src/msw/thread.cpp:669 +#: ../src/msw/thread.cpp:691 msgid "Couldn't terminate thread" msgstr "Không thể chấm dứt tuyến trình" @@ -2259,39 +2355,43 @@ msgstr "Tạo Tham Số không tìm thấy trong khai báo Tham Số RTTI" msgid "Create directory" msgstr "Tạo thÆ° mục" -#: ../src/generic/dirdlgg.cpp:132 #: ../src/generic/filedlgg.cpp:230 +#: ../src/generic/dirdlgg.cpp:132 msgid "Create new directory" msgstr "Tạo thÆ° mục má»›i" #: ../src/common/accelcmn.cpp:296 -msgid "Ctrl-" -msgstr "Ctrl-" +msgid "Ctrl+" +msgstr "Ctrl+" -#: ../src/common/stockitem.cpp:118 -#: ../src/richtext/richtextctrl.cpp:2595 -#: ../src/msw/textctrl.cpp:2151 -#: ../src/mac/carbon/textctrl.cpp:1064 +#: ../src/richtext/richtextctrl.cpp:296 +#: ../src/osx/textctrl_osx.cpp:587 +#: ../src/common/stockitem.cpp:140 +#: ../src/msw/textctrl.cpp:2174 msgid "Cu&t" msgstr "Cắ&t" -#: ../src/generic/filectrlg.cpp:951 +#: ../src/generic/filectrlg.cpp:946 msgid "Current directory:" msgstr "ThÆ° mục hiện thá»i:" -#: ../src/gtk/print.cpp:756 +#: ../src/gtk/print.cpp:731 msgid "Custom size" msgstr "Cỡ riêng" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:425 +#: ../src/common/headerctrlcmn.cpp:60 +msgid "Customize Columns" +msgstr "Tùy Chỉnh Số Cá»™t" + +#: ../src/stc/scintilla/src/ScintillaBase.cxx:455 msgid "Cut" msgstr "Cắt" -#: ../src/common/stockitem.cpp:204 +#: ../src/common/stockitem.cpp:261 msgid "Cut selection" msgstr "Cắt vùng chá»n" -#: ../src/common/fmapbase.cpp:112 +#: ../src/common/fmapbase.cpp:153 msgid "Cyrillic (ISO-8859-5)" msgstr "Cyrillic (ISO-8859-5)" @@ -2315,23 +2415,23 @@ msgstr "DEL" msgid "DELETE" msgstr "DELETE" -#: ../src/common/imagbmp.cpp:944 +#: ../src/common/imagbmp.cpp:1019 msgid "DIB Header: Encoding doesn't match bitdepth." msgstr "Phần đầu DIB: Bá»™ giải mã không khá»›p vá»›i Ä‘á»™ sâu bit." -#: ../src/common/imagbmp.cpp:905 +#: ../src/common/imagbmp.cpp:974 msgid "DIB Header: Image height > 32767 pixels for file." msgstr "Phần đầu DIB: Äá»™ cao ảnh > 32767 Ä‘iểm ảnh cho tệp tin." -#: ../src/common/imagbmp.cpp:899 +#: ../src/common/imagbmp.cpp:966 msgid "DIB Header: Image width > 32767 pixels for file." msgstr "Phần đầu DIB: Äá»™ rá»™ng ảnh > 32767 Ä‘iểm ảnh cho tệp tin." -#: ../src/common/imagbmp.cpp:919 +#: ../src/common/imagbmp.cpp:990 msgid "DIB Header: Unknown bitdepth in file." msgstr "Phần đầu DIB: Không rõ Ä‘á»™ sâu bit trong tệp tin." -#: ../src/common/imagbmp.cpp:929 +#: ../src/common/imagbmp.cpp:1002 msgid "DIB Header: Unknown encoding in file." msgstr "Phần Äầu DIB: Không hiểu bá»™ giải mã trong tệp tin." @@ -2347,24 +2447,24 @@ msgstr "DL Envelope, 110 x 220 mm" msgid "DOWN" msgstr "DOWN" -#: ../src/mac/carbon/dataview.cpp:345 -msgid "Data view control is not correctly initialized" -msgstr "Äiá»u khiển hiển thị dữ liệu không được khởi tạo má»™t cách đúng đắn." +#: ../src/osx/carbon/dataview.cpp:1879 +msgid "Data object has invalid data format" +msgstr "Äối tượng dữ liệu không đúng định dạng" -#: ../src/mac/carbon/dataview.cpp:694 +#: ../src/osx/carbon/dataview.cpp:2448 msgid "Date renderer cannot render value; value type: " -msgstr "Bá»™ đáp ứng Ngày tháng không trả vá» giá trị; giá trị kiểu:" +msgstr "Bá»™ đáp ứng Ngày tháng không trả vá» giá trị; giá trị kiểu: " -#: ../src/generic/dbgrptg.cpp:296 +#: ../src/generic/dbgrptg.cpp:297 #, c-format msgid "Debug report \"%s\"" -msgstr "Báo cáo lá»—i \"%s\"" +msgstr "Báo cáo lá»—i \"%s\"" #: ../src/common/debugrpt.cpp:209 msgid "Debug report couldn't be created." msgstr "Báo cáo gỡ lá»—i không thể được tạo ra." -#: ../src/common/debugrpt.cpp:545 +#: ../src/common/debugrpt.cpp:547 msgid "Debug report generation has failed." msgstr "Việc tạo ra bản báo cáo lá»—i gặp lá»—i." @@ -2372,45 +2472,46 @@ msgstr "Việc tạo ra bản báo cáo lá»—i gặp lá»—i." msgid "Decorative" msgstr "Trang trí" -#: ../src/common/fmapbase.cpp:661 +#: ../src/common/fmapbase.cpp:788 msgid "Default encoding" msgstr "Bá»™ mã mặc định" -#: ../src/dfb/fontmgr.cpp:184 +#: ../src/dfb/fontmgr.cpp:181 msgid "Default font" msgstr "Phông chữ mặc định" -#: ../src/generic/prntdlgg.cpp:515 +#: ../src/generic/prntdlgg.cpp:516 msgid "Default printer" msgstr "Máy in mặc định" -#: ../src/richtext/richtextbuffer.cpp:5343 -#: ../src/stc/scintilla/src/ScintillaBase.cxx:428 +#: ../src/richtext/richtextbuffer.cpp:5538 +#: ../src/stc/scintilla/src/ScintillaBase.cxx:458 msgid "Delete" msgstr "Xóa bá»" -#: ../src/richtext/richtexttabspage.cpp:148 +#: ../src/richtext/richtexttabspage.cpp:147 msgid "Delete A&ll" msgstr "Xó&a Tất" -#: ../src/richtext/richtextstyledlg.cpp:734 +#: ../src/richtext/richtextstyledlg.cpp:735 msgid "Delete Style" msgstr "Xóa Kiểu Dáng" -#: ../src/richtext/richtextctrl.cpp:639 -#: ../src/richtext/richtextctrl.cpp:687 +#: ../src/richtext/richtextctrl.cpp:794 +#: ../src/richtext/richtextctrl.cpp:898 +#: ../src/richtext/richtextctrl.cpp:947 msgid "Delete Text" msgstr "Xóa Chữ" -#: ../src/generic/editlbox.cpp:274 +#: ../src/generic/editlbox.cpp:275 msgid "Delete item" msgstr "Xóa bá» mục tin" -#: ../src/common/stockitem.cpp:205 +#: ../src/common/stockitem.cpp:262 msgid "Delete selection" msgstr "Xóa bá» vùng chá»n" -#: ../src/richtext/richtextstyledlg.cpp:734 +#: ../src/richtext/richtextstyledlg.cpp:735 #, c-format msgid "Delete style %s?" msgstr "Xóa kiểu dáng %s?" @@ -2425,23 +2526,23 @@ msgstr "Xóa tệp tin khóa cÅ© '%s'." msgid "Dependency \"%s\" of module \"%s\" doesn't exist." msgstr "Phần phụ thuá»™c \"%s\" của mô Ä‘un \"%s\" chÆ°a tồn tại." -#: ../src/generic/dirctrlg.cpp:660 +#: ../src/generic/dirctrlg.cpp:677 msgid "Desktop" msgstr "ThÆ° mục Desktop" #: ../src/generic/aboutdlgg.cpp:71 msgid "Developed by " -msgstr "Äược phát triển bởi" +msgstr "Äược phát triển bởi " -#: ../src/generic/aboutdlgg.cpp:142 +#: ../src/generic/aboutdlgg.cpp:177 msgid "Developers" msgstr "Những ngÆ°á»i phát triển" -#: ../src/msw/dialup.cpp:396 +#: ../src/msw/dialup.cpp:397 msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it." msgstr "Hàm quay số không sẵn sàng bởi vì dịch vụ truy cập từ xa (RAS) chÆ°a được cài trong máy này. Xin hãy cài nó vào." -#: ../src/generic/tipdlg.cpp:228 +#: ../src/generic/tipdlg.cpp:231 msgid "Did you know..." msgstr "Bạn có biết..." @@ -2450,41 +2551,50 @@ msgstr "Bạn có biết..." msgid "DirectFB error %d occured." msgstr "Lá»—i DirectFB %d xảy ra." -#: ../src/motif/filedlg.cpp:219 +#: ../src/motif/filedlg.cpp:218 msgid "Directories" msgstr "ThÆ° mục" -#: ../src/common/filefn.cpp:1290 +#: ../src/common/filefn.cpp:1265 #, c-format msgid "Directory '%s' couldn't be created" msgstr "ThÆ° mục '%s' không thể được tạo" +#: ../src/common/filefn.cpp:1289 +#, c-format +msgid "Directory '%s' couldn't be deleted" +msgstr "ThÆ° mục '%s' không thể xóa được" + #: ../src/mgl/dirmgl.cpp:211 #, c-format msgid "Directory '%s' doesn't exist!" -msgstr "ThÆ° mục '%s' chÆ°a tồn tại!" +msgstr "ThÆ° mục '%s' chÆ°a tồn tại!" #: ../src/generic/dirdlgg.cpp:234 msgid "Directory does not exist" msgstr "ThÆ° mục chÆ°a tồn tại" -#: ../src/generic/filectrlg.cpp:1405 +#: ../src/generic/filectrlg.cpp:1402 msgid "Directory doesn't exist." msgstr "ThÆ° mục chÆ°a tồn tại." -#: ../src/html/helpwnd.cpp:498 +#: ../src/common/docview.cpp:407 +msgid "Discard changes and reload the last saved version?" +msgstr "Không dùng những thay đổi này và tải lại dữ liệu đã lÆ°u lần trÆ°á»›c?" + +#: ../src/html/helpwnd.cpp:510 msgid "Display all index items that contain given substring. Search is case insensitive." msgstr "Hiện tất cả chỉ số mục tin mà có chứa chuá»—i con định sẵn. Tìm kiếm phân biệt Hoa/thÆ°á»ng." -#: ../src/html/helpwnd.cpp:695 +#: ../src/html/helpwnd.cpp:690 msgid "Display options dialog" msgstr "Hiển thị há»™p thoại tùy chá»n" -#: ../src/html/helpwnd.cpp:325 +#: ../src/html/helpwnd.cpp:329 msgid "Displays help as you browse the books on the left." msgstr "Hiện phần trợ giúp nhÆ° là má»™t trình duyệt sách trên phần bên trái." -#: ../src/msw/mimetype.cpp:699 +#: ../src/msw/mimetype.cpp:708 msgid "" "Do you want to overwrite the command used to %s files with extension \"%s\" ?\n" "Current value is \n" @@ -2498,29 +2608,29 @@ msgstr "" "Giá trị má»›i là \n" "%s %1" -#: ../src/common/docview.cpp:481 +#: ../src/common/docview.cpp:483 #, c-format -msgid "Do you want to save changes to document %s?" -msgstr "Bạn có muốn ghi lại các thay đổi vá»›i tài liệu %s không?" +msgid "Do you want to save changes to %s?" +msgstr "Bạn có muốn ghi lại các thay đổi vá»›i %s không?" #: ../src/generic/aboutdlgg.cpp:74 msgid "Documentation by " -msgstr "Viết bởi" +msgstr "Viết bởi " -#: ../src/generic/aboutdlgg.cpp:146 +#: ../src/generic/aboutdlgg.cpp:181 msgid "Documentation writers" msgstr "Những ngÆ°á»i viết tài liệu" -#: ../src/common/sizer.cpp:2428 +#: ../src/common/sizer.cpp:2568 msgid "Don't Save" msgstr "Không Ghi Lại" -#: ../src/html/htmlwin.cpp:583 #: ../src/msw/frame.cpp:195 +#: ../src/html/htmlwin.cpp:608 msgid "Done" msgstr "Hoàn tất" -#: ../src/generic/progdlgg.cpp:408 +#: ../src/generic/progdlgg.cpp:406 msgid "Done." msgstr "Hoàn tất." @@ -2534,6 +2644,7 @@ msgid "Doubly used id : %d" msgstr "Chỉ số id ngÆ°á»i dùng kép: %d" #: ../src/generic/fdrepdlg.cpp:153 +#: ../src/propgrid/props.cpp:2170 msgid "Down" msgstr "Xuống" @@ -2549,6 +2660,10 @@ msgstr "END" msgid "ENTER" msgstr "ENTER" +#: ../src/unix/fswatcher_inotify.cpp:336 +msgid "EOF while reading from inotify descriptor" +msgstr "Việc Ä‘á»c inotify gặp lá»—i EOF" + #: ../src/common/accelcmn.cpp:63 msgid "ESC" msgstr "ESC" @@ -2561,11 +2676,11 @@ msgstr "ESCAPE" msgid "EXECUTE" msgstr "THI HÀNH" -#: ../src/generic/editlbox.cpp:272 +#: ../src/generic/editlbox.cpp:273 msgid "Edit item" msgstr "Biên tập mục tin" -#: ../src/generic/progdlgg.cpp:198 +#: ../src/generic/progdlgg.cpp:195 msgid "Elapsed time:" msgstr "Thá»i gian đã trôi qua:" @@ -2573,24 +2688,24 @@ msgstr "Thá»i gian đã trôi qua:" msgid "Enter a character style name" msgstr "Nhập vào tên kiểu dáng ký tá»±" -#: ../src/richtext/richtextstyledlg.cpp:770 +#: ../src/richtext/richtextstyledlg.cpp:771 msgid "Enter a list style name" msgstr "Nhập vào tên kiểu dáng danh sách" -#: ../src/richtext/richtextstyledlg.cpp:843 +#: ../src/richtext/richtextstyledlg.cpp:844 msgid "Enter a new style name" msgstr "Nhập vào tên kiểu dáng danh sách má»›i" -#: ../src/common/prntbase.cpp:1086 +#: ../src/common/prntbase.cpp:1107 #, c-format msgid "Enter a page number between %d and %d:" -msgstr "Nhập vào số trang nằm giữa %d và %d: " +msgstr "Nhập vào số trang nằm giữa %d và %d:" #: ../src/richtext/richtextstyledlg.cpp:616 msgid "Enter a paragraph style name" msgstr "Nhập vào tên kiểu dáng Ä‘oạn văn" -#: ../src/generic/dbgrptg.cpp:170 +#: ../src/generic/dbgrptg.cpp:171 #, c-format msgid "Enter command to open file \"%s\":" msgstr "Nhập vào lệnh mở tệp tin \"%s\":" @@ -2603,71 +2718,80 @@ msgstr "Các mục tin tìm thấy" msgid "Envelope Invite 220 x 220 mm" msgstr "Envelope Invite 220 x 220 mm" -#: ../src/common/config.cpp:433 +#: ../src/common/config.cpp:474 #, c-format msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'." msgstr "Sá»± mở rá»™ng các biến môi trÆ°á»ng gặp lá»—i: mất '%c' tại vị trí %u trong '%s'." -#: ../src/gtk/filedlg.cpp:67 -#: ../src/gtk1/fontdlg.cpp:75 -#: ../src/generic/filectrlg.cpp:676 -#: ../src/generic/filectrlg.cpp:790 -#: ../src/generic/filectrlg.cpp:804 -#: ../src/generic/filectrlg.cpp:820 -#: ../src/generic/filectrlg.cpp:1374 -#: ../src/generic/filectrlg.cpp:1405 -#: ../src/generic/dirdlgg.cpp:353 -#: ../src/generic/dirctrlg.cpp:703 #: ../src/generic/dirctrlg.cpp:721 -#: ../src/generic/dirctrlg.cpp:732 +#: ../src/generic/dirctrlg.cpp:739 +#: ../src/generic/dirctrlg.cpp:750 +#: ../src/generic/dirdlgg.cpp:353 +#: ../src/generic/filectrlg.cpp:671 +#: ../src/generic/filectrlg.cpp:785 +#: ../src/generic/filectrlg.cpp:799 +#: ../src/generic/filectrlg.cpp:815 +#: ../src/generic/filectrlg.cpp:1371 +#: ../src/generic/filectrlg.cpp:1402 +#: ../src/gtk/filedlg.cpp:69 +#: ../src/gtk1/fontdlg.cpp:75 msgid "Error" msgstr "Lá»—i" -#: ../src/unix/epolldispatcher.cpp:101 +#: ../src/unix/epolldispatcher.cpp:104 msgid "Error closing epoll descriptor" msgstr "Lá»—i khi đóng phần mô tả epoll" +#: ../src/unix/fswatcher_kqueue.cpp:115 +msgid "Error closing kqueue instance" +msgstr "Lá»—i khi đóng kqueue" + #: ../src/generic/dirdlgg.cpp:252 msgid "Error creating directory" msgstr "Lá»—i tạo thÆ° mục" -#: ../src/common/imagbmp.cpp:953 +#: ../src/common/imagbmp.cpp:1030 msgid "Error in reading image DIB." msgstr "Lá»—i trong việc Ä‘á»c ảnh DIB." -#: ../src/common/fileconf.cpp:459 +#: ../src/propgrid/propgrid.cpp:6444 +#, c-format +msgid "Error in resource: %s" +msgstr "Lá»—i trong tài nguyên: %s" + +#: ../src/common/fileconf.cpp:454 msgid "Error reading config options." msgstr "Lá»—i trong việc Ä‘á»c các tùy chá»n cấu hình." -#: ../src/common/fileconf.cpp:1058 +#: ../src/common/fileconf.cpp:1065 msgid "Error saving user configuration data." msgstr "Lá»—i ghi lại dữ liệu cấu hình ngÆ°á»i dùng." -#: ../src/gtk/print.cpp:677 +#: ../src/gtk/print.cpp:652 msgid "Error while printing: " -msgstr "Lá»—i trong khi in:" +msgstr "Lá»—i trong khi in: " -#: ../src/mac/carbon/mpthread.cpp:477 -msgid "Error while waiting on semaphore" -msgstr "Lá»—i khi chá» cá» hiệu" - -#: ../src/common/log.cpp:709 +#: ../src/common/log.cpp:404 msgid "Error: " msgstr "Lá»—i: " -#: ../src/common/fmapbase.cpp:110 +#: ../src/common/fmapbase.cpp:151 msgid "Esperanto (ISO-8859-3)" msgstr "Esperanto (ISO-8859-3)" -#: ../src/generic/progdlgg.cpp:206 +#: ../src/generic/progdlgg.cpp:202 msgid "Estimated time:" msgstr "Thá»i gian Æ°á»›c tính:" -#: ../src/generic/dbgrptg.cpp:230 +#: ../src/unix/fswatcher_inotify.cpp:416 +msgid "Event queue overflowed" +msgstr "Hàng đợi sá»± kiện bị tràn" + +#: ../src/generic/dbgrptg.cpp:231 msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||" msgstr "Tệp tin thá»±c thi (*.exe)|*.exe|All files (*.*)|*.*||" -#: ../src/msw/utilsexc.cpp:838 +#: ../src/msw/utilsexc.cpp:848 #, c-format msgid "Execution of command '%s' failed" msgstr "Thi hành lệnh '%s' gặp lá»—i" @@ -2681,16 +2805,16 @@ msgstr "Thi hành lệnh '%s' gặp lá»—i vá»›i lá»—i: %ul" msgid "Executive, 7 1/4 x 10 1/2 in" msgstr "Executive, 7 1/4 x 10 1/2 in" -#: ../src/msw/registry.cpp:1159 +#: ../src/msw/registry.cpp:1171 #, c-format msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten." msgstr "Sá»± xuất khóa đăng ký: tệp tin \"%s\" đã tồn tại và không thể ghi đè lên." -#: ../src/common/fmapbase.cpp:152 +#: ../src/common/fmapbase.cpp:193 msgid "Extended Unix Codepage for Japanese (EUC-JP)" msgstr "Extended Unix Codepage for Japanese (EUC-JP)" -#: ../src/html/chm.cpp:710 +#: ../src/html/chm.cpp:724 #, c-format msgid "Extraction of '%s' into '%s' failed." msgstr "Rút trích '%s' vào '%s' gặp lá»—i." @@ -2700,25 +2824,29 @@ msgstr "Rút trích '%s' vào '%s' gặp lá»—i." msgid "F" msgstr "F" +#: ../src/propgrid/advprops.cpp:640 +msgid "Face Name" +msgstr "Tên Mặt" + #: ../src/unix/snglinst.cpp:270 msgid "Failed to access lock file." msgstr "Truy cập tệp tin khóa gặp lá»—i." -#: ../src/unix/epolldispatcher.cpp:114 +#: ../src/unix/epolldispatcher.cpp:117 #, c-format msgid "Failed to add descriptor %d to epoll descriptor %d" msgstr "Khi thêm phần mô tả %d vào phần mô tả epoll %d gặp lá»—i" -#: ../src/common/glcmn.cpp:82 +#: ../src/msw/dib.cpp:561 +#, c-format +msgid "Failed to allocate %luKb of memory for bitmap data." +msgstr "Việc cấp phát %luKb bá»™ nhá»› cho dữ liệu ảnh bitmap gặp lá»—i." + +#: ../src/common/glcmn.cpp:88 msgid "Failed to allocate colour for OpenGL" msgstr "Cấp phát màu cho OpenGL gặp lá»—i" -#: ../src/msw/dib.cpp:567 -#, c-format -msgid "Failed to allocated %luKb of memory for bitmap data." -msgstr "Việc cấp phát %luKb bá»™ nhá»› cho dữ liệu ảnh bitmap gặp lá»—i." - -#: ../src/unix/displayx11.cpp:234 +#: ../src/unix/displayx11.cpp:289 msgid "Failed to change video mode" msgstr "Thay đổi chế Ä‘á»™ video gặp lá»—i" @@ -2727,7 +2855,7 @@ msgstr "Thay đổi chế Ä‘á»™ video gặp lá»—i" msgid "Failed to clean up debug report directory \"%s\"" msgstr "Việc xóa sạch thÆ° mục báo cáo lá»—i \"%s\" gặp lá»—i" -#: ../src/common/filename.cpp:196 +#: ../src/common/filename.cpp:223 msgid "Failed to close file handle" msgstr "Äóng handle tệp tin gặp lá»—i" @@ -2736,7 +2864,7 @@ msgstr "Äóng handle tệp tin gặp lá»—i" msgid "Failed to close lock file '%s'" msgstr "Äóng tập tin khóa '%s' gặp lá»—i" -#: ../src/msw/clipbrd.cpp:113 +#: ../src/msw/clipbrd.cpp:115 msgid "Failed to close the clipboard." msgstr "Äóng clipboard gặp lá»—i." @@ -2745,40 +2873,39 @@ msgstr "Äóng clipboard gặp lá»—i." msgid "Failed to close the display \"%s\"" msgstr "Äóng bá»™ hiển thị \"%s\" gặp lá»—i" -#: ../src/gtk/utilsgtk.cpp:293 -#, c-format -msgid "Failed to connect to session manager: %s" -msgstr "Kết nối tá»›i quản lý session gặp lá»—i: %s" - -#: ../src/msw/dialup.cpp:825 +#: ../src/msw/dialup.cpp:826 msgid "Failed to connect: missing username/password." msgstr "Kết nối lá»—i: không có tên ngÆ°á»i dùng/mật khẩu." -#: ../src/msw/dialup.cpp:771 +#: ../src/msw/dialup.cpp:772 msgid "Failed to connect: no ISP to dial." msgstr "Kết nối lá»—i: không có nhà cung cấp dịch vụ Internet ISP để quay số." -#: ../src/common/textfile.cpp:177 +#: ../src/common/textfile.cpp:201 #, c-format msgid "Failed to convert file \"%s\" to Unicode." msgstr "Chuyển đổi tệp tin \"%s\" sang Unicode gặp lá»—i." -#: ../src/msw/registry.cpp:637 +#: ../src/generic/logg.cpp:977 +msgid "Failed to copy dialog contents to the clipboard." +msgstr "Sao chép ná»™i dung từ há»™p thoại vào bá»™ nhá»› clipboard gặp lá»—i." + +#: ../src/msw/registry.cpp:649 #, c-format msgid "Failed to copy registry value '%s'" msgstr "Sao chép giá trị đăng ký '%s' gặp lá»—i" -#: ../src/msw/registry.cpp:646 +#: ../src/msw/registry.cpp:658 #, c-format msgid "Failed to copy the contents of registry key '%s' to '%s'." msgstr "Sao chép ná»™i dung khóa đăng ký '%s' tá»›i '%s' gặp lá»—i." -#: ../src/common/filefn.cpp:1095 +#: ../src/common/filefn.cpp:1067 #, c-format msgid "Failed to copy the file '%s' to '%s'" msgstr "Sao chép tệp tin từ '%s' sang '%s' gặp lá»—i" -#: ../src/msw/registry.cpp:624 +#: ../src/msw/registry.cpp:636 #, c-format msgid "Failed to copy the registry subkey '%s' to '%s'." msgstr "Sao chép khóa đăng ký phụ '%s' tá»›i '%s' gặp lá»—i." @@ -2787,19 +2914,19 @@ msgstr "Sao chép khóa đăng ký phụ '%s' tá»›i '%s' gặp lá»—i." msgid "Failed to create DDE string" msgstr "Tạo chuá»—i DDE gặp lá»—i" -#: ../src/msw/mdi.cpp:470 +#: ../src/msw/mdi.cpp:570 msgid "Failed to create MDI parent frame." msgstr "Tạo khung cá»­a sổ cha MDI gặp lá»—i." -#: ../src/msw/statusbar.cpp:115 +#: ../src/msw/statusbar.cpp:144 msgid "Failed to create a status bar." msgstr "Tạo thanh trạng thái gặp lá»—i." -#: ../src/common/filename.cpp:859 +#: ../src/common/filename.cpp:988 msgid "Failed to create a temporary file name" msgstr "Tạo tên tập tin tạm gặp lá»—i" -#: ../src/msw/utilsexc.cpp:272 +#: ../src/msw/utilsexc.cpp:273 msgid "Failed to create an anonymous pipe" msgstr "Tạo anonymous pipe gặp lá»—i" @@ -2826,11 +2953,11 @@ msgstr "" "Tạo thÆ° mục '%s' gặp lá»—i\n" "(bạn có quyá»n yêu cầu không?)" -#: ../src/unix/epolldispatcher.cpp:82 +#: ../src/unix/epolldispatcher.cpp:85 msgid "Failed to create epoll descriptor" msgstr "Tạo phần mô tả epoll gặp lá»—i" -#: ../src/msw/mimetype.cpp:190 +#: ../src/msw/mimetype.cpp:199 #, c-format msgid "Failed to create registry entry for '%s' files." msgstr "Tạo mục đăng ký cho '%s' tệp tin gặp lá»—i." @@ -2840,20 +2967,20 @@ msgstr "Tạo mục đăng ký cho '%s' tệp tin gặp lá»—i." msgid "Failed to create the standard find/replace dialog (error code %d)" msgstr "Tạo há»™p thoại tìm/thay thế tiêu chuẩn gặp lá»—i (mã lá»—i %d)" -#: ../src/unix/evtloopunix.cpp:52 +#: ../src/unix/evtloopunix.cpp:87 msgid "Failed to create wake up pipe used by event loop." msgstr "Tạo wake up pipe sá»­ dụng cho vòng lặp sá»± kiện gặp lá»—i." -#: ../src/html/winpars.cpp:704 +#: ../src/html/winpars.cpp:738 #, c-format msgid "Failed to display HTML document in %s encoding" msgstr "Hiển thị tài liệu HTML trong bá»™ mã %s gặp lá»—i" -#: ../src/msw/clipbrd.cpp:125 +#: ../src/msw/clipbrd.cpp:127 msgid "Failed to empty the clipboard." msgstr "Làm rá»—ng clipboard gặp lá»—i." -#: ../src/unix/displayx11.cpp:211 +#: ../src/unix/displayx11.cpp:266 msgid "Failed to enumerate video modes" msgstr "Äếm các chế Ä‘á»™ video gặp lá»—i" @@ -2861,42 +2988,42 @@ msgstr "Äếm các chế Ä‘á»™ video gặp lá»—i" msgid "Failed to establish an advise loop with DDE server" msgstr "Thiết lập má»™t vòng lặp advise máy chủ DDE gặp lá»—i" -#: ../src/msw/dialup.cpp:657 -#: ../src/msw/dialup.cpp:889 +#: ../src/msw/dialup.cpp:658 +#: ../src/msw/dialup.cpp:893 #, c-format msgid "Failed to establish dialup connection: %s" msgstr "Thiết lập kết nối quay số gặp lá»—i: %s" -#: ../src/unix/utilsunx.cpp:549 -#: ../src/unix/utilsunx.cpp:563 +#: ../src/unix/utilsunx.cpp:506 +#: ../src/unix/utilsunx.cpp:520 #, c-format msgid "Failed to execute '%s'\n" msgstr "Thá»±c thi '%s' gặp lá»—i\n" -#: ../src/common/debugrpt.cpp:672 +#: ../src/common/debugrpt.cpp:698 msgid "Failed to execute curl, please install it in PATH." msgstr "Thá»±c thi curl gặp lá»—i, xin thiết đặt nó trong ÄƯỜNG DẪN." -#: ../src/common/regex.cpp:433 -#: ../src/common/regex.cpp:481 +#: ../src/common/regex.cpp:435 +#: ../src/common/regex.cpp:483 #, c-format msgid "Failed to find match for regular expression: %s" msgstr "Việc tìm khá»›p vá»›i biểu thức thông thÆ°á»ng gặp lá»—i: %s" -#: ../src/msw/dialup.cpp:723 +#: ../src/msw/dialup.cpp:724 #, c-format msgid "Failed to get ISP names: %s" msgstr "Lấy tên của nhà cung cấp dịch vụ Internet ISP gặp lá»—i: %s" -#: ../src/msw/clipbrd.cpp:743 +#: ../src/msw/clipbrd.cpp:745 msgid "Failed to get data from the clipboard" msgstr "Lấy dữ liệu từ clipboard gặp lá»—i" -#: ../src/common/stopwatch.cpp:219 +#: ../src/common/stopwatch.cpp:210 msgid "Failed to get the local system time" msgstr "Lấy thá»i gian từ hệ thống gặp lá»—i" -#: ../src/common/filefn.cpp:1544 +#: ../src/common/filefn.cpp:1482 msgid "Failed to get the working directory" msgstr "Lấy thÆ° mục Ä‘ang làm việc gặp lá»—i" @@ -2908,16 +3035,16 @@ msgstr "Khởi tạo GUI gặp lá»—i: không có built-in giao diện hiển th msgid "Failed to initialize MS HTML Help." msgstr "Khởi tạo Trợ Giúp MS HTML gặp lá»—i." -#: ../src/msw/glcanvas.cpp:662 +#: ../src/msw/glcanvas.cpp:882 msgid "Failed to initialize OpenGL" msgstr "Khởi tạo OpenGL gặp lá»—i." -#: ../src/msw/dialup.cpp:886 +#: ../src/msw/dialup.cpp:888 #, c-format msgid "Failed to initiate dialup connection: %s" msgstr "Khởi tạo kết nối quay số gặp lá»—i: %s" -#: ../src/gtk/textctrl.cpp:1027 +#: ../src/gtk/textctrl.cpp:1072 msgid "Failed to insert text in the control." msgstr "Chèn chữ vào Ä‘iá»u khiển gặp lá»—i." @@ -2926,63 +3053,78 @@ msgstr "Chèn chữ vào Ä‘iá»u khiển gặp lá»—i." msgid "Failed to inspect the lock file '%s'" msgstr "Kiểm tra tệp tin khóa '%s' gặp lá»—i" -#: ../src/unix/appunix.cpp:89 +#: ../src/unix/appunix.cpp:90 msgid "Failed to install signal handler" msgstr "Cài đặt bá»™ Ä‘iá»u khiển tín hiệu gặp lá»—i" -#: ../src/unix/threadpsx.cpp:979 +#: ../src/unix/threadpsx.cpp:1001 msgid "Failed to join a thread, potential memory leak detected - please restart the program" msgstr "Gia nhập tuyến trình gặp lá»—i, đã phát hiện lá»— thủng bá»™ nhá»› tiá»m tàng - xin hãy khởi Ä‘á»™ng lại chÆ°Æ¡ng trình" -#: ../src/msw/utils.cpp:735 +#: ../src/msw/utils.cpp:734 #, c-format msgid "Failed to kill process %d" msgstr "Loại bá» quá trình %d gặp lá»—i" -#: ../src/common/iconbndl.cpp:127 +#: ../src/common/iconbndl.cpp:173 #, c-format -msgid "Failed to load image %d from file '%s'." -msgstr "Tải ảnh %d từ tệp tin '%s' gặp lá»—i." +msgid "Failed to load image %%d from file '%s'." +msgstr "Tải ảnh %%d từ tệp tin '%s' gặp lá»—i." -#: ../src/msw/enhmeta.cpp:97 +#: ../src/common/iconbndl.cpp:181 +#, c-format +msgid "Failed to load image %d from stream." +msgstr "Lá»—i khi tải ảnh %d từ dòng dữ liệu." + +#: ../src/msw/enhmeta.cpp:98 #, c-format msgid "Failed to load metafile from file \"%s\"." msgstr "Tải metafile từ tệp tin \"%s\" gặp lá»—i." -#: ../src/msw/volume.cpp:324 +#: ../src/msw/volume.cpp:328 msgid "Failed to load mpr.dll." msgstr "Tải thÆ° viện mpr.dll gặp lá»—i." +#: ../src/msw/utils.cpp:1102 +#, c-format +msgid "Failed to load resource \"%s\"." +msgstr "Lá»—i khi tải tài nguyên \"%s\"." + #: ../src/common/dynlib.cpp:105 #, c-format msgid "Failed to load shared library '%s'" msgstr "Tải thÆ° viện chia sẻ %s gặp lá»—i" +#: ../src/msw/utils.cpp:1109 +#, c-format +msgid "Failed to lock resource \"%s\"." +msgstr "Lá»—i khi khóa tài nguyên \"%s\"." + #: ../src/unix/snglinst.cpp:199 #, c-format msgid "Failed to lock the lock file '%s'" msgstr "Khóa tập tin khóa %s gặp lá»—i" -#: ../src/unix/epolldispatcher.cpp:134 +#: ../src/unix/epolldispatcher.cpp:137 #, c-format msgid "Failed to modify descriptor %d in epoll descriptor %d" msgstr "Chỉnh sá»­a phần mô tả %d trong phần mô tả epoll %d gặp lá»—i" -#: ../src/common/filename.cpp:2206 +#: ../src/common/filename.cpp:2510 #, c-format msgid "Failed to modify file times for '%s'" msgstr "Chỉnh sá»­a thá»i gian tệp tin '%s' gặp lá»—i" -#: ../src/common/selectdispatcher.cpp:234 +#: ../src/common/selectdispatcher.cpp:253 msgid "Failed to monitor I/O channels" msgstr "Kênh vào ra màn hình gặp lá»—i" -#: ../src/common/filename.cpp:182 +#: ../src/common/filename.cpp:206 #, c-format msgid "Failed to open '%s' for reading" msgstr "Mở '%s' để Ä‘á»c gặp lá»—i" -#: ../src/common/filename.cpp:185 +#: ../src/common/filename.cpp:211 #, c-format msgid "Failed to open '%s' for writing" msgstr "Mở '%s' để ghi gặp lá»—i" @@ -2992,25 +3134,35 @@ msgstr "Mở '%s' để ghi gặp lá»—i" msgid "Failed to open CHM archive '%s'." msgstr "Mở CHM để lÆ°u giữ '%s' gặp lá»—i." -#: ../src/common/utilscmn.cpp:1150 +#: ../src/common/utilscmn.cpp:1071 #, c-format msgid "Failed to open URL \"%s\" in default browser." msgstr "Mở URL \"%s\" trong trình duyệt mặc định gặp lá»—i." +#: ../include/wx/msw/private/fswatcher.h:93 +#, c-format +msgid "Failed to open directory \"%s\" for monitoring." +msgstr "Lá»—i khi mở thÆ° mục \"%s\" để theo dõi." + #: ../src/x11/utils.cpp:226 #, c-format msgid "Failed to open display \"%s\"." msgstr "Mở bá»™ hiển thị \"%s\" gặp lá»—i." -#: ../src/common/filename.cpp:894 +#: ../src/common/filename.cpp:1023 msgid "Failed to open temporary file." msgstr "Mở tập tin tạm thá»i gặp lá»—i." -#: ../src/msw/clipbrd.cpp:93 +#: ../src/msw/clipbrd.cpp:94 msgid "Failed to open the clipboard." msgstr "Mở clipboard gặp lá»—i." -#: ../src/msw/clipbrd.cpp:643 +#: ../src/common/translation.cpp:1008 +#, c-format +msgid "Failed to parse Plural-Forms: '%s'" +msgstr "Lá»—i khi phân tích dạng thức số nhiá»u: '%s'" + +#: ../src/msw/clipbrd.cpp:645 msgid "Failed to put data on the clipboard" msgstr "Äặt dữ liệu vào clipboard gặp lá»—i" @@ -3018,19 +3170,28 @@ msgstr "Äặt dữ liệu vào clipboard gặp lá»—i" msgid "Failed to read PID from lock file." msgstr "Äá»c PID từ tệp tin khóa gặp lá»—i." -#: ../src/common/fileconf.cpp:470 +#: ../src/common/fileconf.cpp:465 msgid "Failed to read config options." msgstr "Äá»c cấu hình tùy chá»n gặp lá»—i." -#: ../src/unix/evtloopunix.cpp:104 +#: ../src/common/docview.cpp:630 +#, c-format +msgid "Failed to read document from the file \"%s\"." +msgstr "Lá»—i Ä‘á»c từ tập tin \"%s\" gặp lá»—i." + +#: ../src/dfb/evtloop.cpp:99 +msgid "Failed to read event from DirectFB pipe" +msgstr "Äá»c từ ống dẫn DirectFB gặp lá»—i" + +#: ../src/unix/evtloopunix.cpp:139 msgid "Failed to read from wake-up pipe" msgstr "Äá»c từ ống dẫn wake-up gặp lá»—i" -#: ../src/unix/utilsunx.cpp:635 +#: ../src/unix/utilsunx.cpp:572 msgid "Failed to redirect child process input/output" msgstr "Chuyển hÆ°á»›ng quá trình kết nhập/kết xuất của tiến trình con gặp lá»—i" -#: ../src/msw/utilsexc.cpp:724 +#: ../src/msw/utilsexc.cpp:734 msgid "Failed to redirect the child process IO" msgstr "Chuyển hÆ°á»›ng vào xá»­ lý IO con gặp lá»—i" @@ -3039,10 +3200,6 @@ msgstr "Chuyển hÆ°á»›ng vào xá»­ lý IO con gặp lá»—i" msgid "Failed to register DDE server '%s'" msgstr "Äăng ký máy chủ DDE '%s' gặp lá»—i." -#: ../src/msw/glcanvas.cpp:270 -msgid "Failed to register OpenGL window class." -msgstr "Äăng ký má»™t lá»›p cá»­a sổ OpenGL gặp lá»—i." - #: ../src/common/fontmap.cpp:243 #, c-format msgid "Failed to remember the encoding for the charset '%s'." @@ -3063,39 +3220,44 @@ msgstr "Gỡ bá» tệp tin khóa '%s' gặp lá»—i" msgid "Failed to remove stale lock file '%s'." msgstr "Gỡ bá» tệp tin khóa cÅ© '%s' gặp lá»—i." -#: ../src/msw/registry.cpp:474 +#: ../src/msw/registry.cpp:486 #, c-format msgid "Failed to rename registry value '%s' to '%s'." msgstr "Äổi tên giá trị đăng ký '%s' thành '%s' gặp lá»—i." -#: ../src/common/filefn.cpp:1208 +#: ../src/common/filefn.cpp:1180 #, c-format msgid "Failed to rename the file '%s' to '%s' because the destination file already exists." msgstr "Äổi tên tệp tin '%s' thành '%s' gặp lá»—i bởi vì tệp tin đích đã tồn tại rồi." -#: ../src/msw/registry.cpp:579 +#: ../src/msw/registry.cpp:591 #, c-format msgid "Failed to rename the registry key '%s' to '%s'." msgstr "Äổi tên khóa đăng ký '%s' thành '%s' gặp lá»—i." -#: ../src/msw/clipbrd.cpp:497 +#: ../src/msw/clipbrd.cpp:499 msgid "Failed to retrieve data from the clipboard." msgstr "Khôi phục dữ liệu từ clipboard gặp lá»—i." -#: ../src/common/filename.cpp:2300 +#: ../src/common/filename.cpp:2604 #, c-format msgid "Failed to retrieve file times for '%s'" msgstr "Khôi phục thá»i gian tệp tin cho '%s' gặp lá»—i" -#: ../src/msw/dialup.cpp:490 +#: ../src/msw/dialup.cpp:491 msgid "Failed to retrieve text of RAS error message" msgstr "Khôi phục chữ của thông Ä‘iệp lá»—i RAS gặp lá»—i" -#: ../src/msw/clipbrd.cpp:780 +#: ../src/msw/clipbrd.cpp:782 msgid "Failed to retrieve the supported clipboard formats" msgstr "Khôi phục định dạng clipboard được há»— trợ gặp lá»—i" -#: ../src/msw/dib.cpp:345 +#: ../src/common/docview.cpp:601 +#, c-format +msgid "Failed to save document to the file \"%s\"." +msgstr "Gặp lá»—i khi ghi tài liệu vào tệp tin \"%s\"." + +#: ../src/msw/dib.cpp:339 #, c-format msgid "Failed to save the bitmap image to file \"%s\"." msgstr "Ghi ảnh bitmap thành tệp tin \"%s\" gặp lá»—i." @@ -3104,12 +3266,12 @@ msgstr "Ghi ảnh bitmap thành tệp tin \"%s\" gặp lá»—i." msgid "Failed to send DDE advise notification" msgstr "Gá»­i thông báo DDE advise gặp lá»—i" -#: ../src/common/ftp.cpp:381 +#: ../src/common/ftp.cpp:404 #, c-format msgid "Failed to set FTP transfer mode to %s." msgstr "Äặt chế Ä‘á»™ truyá»n FTP thành %s gặp lá»—i." -#: ../src/msw/clipbrd.cpp:373 +#: ../src/msw/clipbrd.cpp:375 msgid "Failed to set clipboard data." msgstr "Äặt dữ liệu clipboard gặp lá»—i." @@ -3118,31 +3280,34 @@ msgstr "Äặt dữ liệu clipboard gặp lá»—i." msgid "Failed to set permissions on lock file '%s'" msgstr "Äặt quyá»n trên tệp tin khóa '%s' gặp lá»—i" -#: ../src/common/file.cpp:509 +#: ../src/common/file.cpp:532 msgid "Failed to set temporary file permissions" msgstr "Äặt quyá»n cho tệp tin tạm gặp lá»—i" -#: ../src/gtk/textctrl.cpp:969 +#: ../src/gtk/textctrl.cpp:1013 msgid "Failed to set text in the text control." msgstr "Gán văn bản vào Ä‘iá»u khiển văn bản gặp lá»—i." -#: ../src/unix/threadpsx.cpp:1317 -#: ../src/unix/threadpsx.cpp:1327 +#: ../src/unix/threadpsx.cpp:1322 +#: ../src/unix/threadpsx.cpp:1332 #, c-format msgid "Failed to set thread priority %d." msgstr "Äặt mức Æ°u tiên tuyến trình %d gặp lá»—i." -#: ../src/common/fs_mem.cpp:256 +#: ../src/common/fs_mem.cpp:266 #, c-format msgid "Failed to store image '%s' to memory VFS!" msgstr "LÆ°u trữ ảnh '%s' vào bá»™ nhá»› VFS gặp lá»—i!" -#: ../src/unix/evtloopunix.cpp:61 +#: ../src/dfb/evtloop.cpp:171 +msgid "Failed to switch DirectFB pipe to non-blocking mode" +msgstr "Chuyển sang chế Ä‘á»™ từ Ä‘Æ°á»ng ống DirectFB sang chế Ä‘á»™ non-blocking gặp lá»—i" + +#: ../src/unix/evtloopunix.cpp:96 msgid "Failed to switch wake up pipe to non-blocking mode" msgstr "Chuyển sang chế Ä‘á»™ từ wake up pipe sang non-blocking gặp lá»—i" -#: ../src/unix/threadpsx.cpp:1500 -#: ../src/mac/carbon/mpthread.cpp:1268 +#: ../src/unix/threadpsx.cpp:1510 msgid "Failed to terminate a thread." msgstr "Chấm dứt má»™t tuyến trình gặp lá»—i." @@ -3150,12 +3315,12 @@ msgstr "Chấm dứt má»™t tuyến trình gặp lá»—i." msgid "Failed to terminate the advise loop with DDE server" msgstr "Chấm dứt vòng lặp advise vá»›i máy chủ DDE gặp lá»—i" -#: ../src/msw/dialup.cpp:963 +#: ../src/msw/dialup.cpp:968 #, c-format msgid "Failed to terminate the dialup connection: %s" msgstr "Chấm dứt kết nối quay số gặp lá»—i: %s" -#: ../src/common/filename.cpp:2221 +#: ../src/common/filename.cpp:2525 #, c-format msgid "Failed to touch the file '%s'" msgstr "Mở tệp tin '%s' gặp lá»—i" @@ -3170,16 +3335,16 @@ msgstr "Không khóa tệp tin khóa '%s' gặp lá»—i" msgid "Failed to unregister DDE server '%s'" msgstr "Việc bỠđăng ký máy chủ DDE '%s' gặp lá»—i" -#: ../src/unix/epolldispatcher.cpp:153 +#: ../src/unix/epolldispatcher.cpp:156 #, c-format msgid "Failed to unregister descriptor %d from epoll descriptor %d" msgstr "BỠđăng ký phần mô tả %d từ phần mô tả epoll %d gặp lá»—i." -#: ../src/common/fileconf.cpp:1031 +#: ../src/common/fileconf.cpp:1038 msgid "Failed to update user configuration file." msgstr "Cập nhật tệp tin cấu hình gặp lá»—i." -#: ../src/common/debugrpt.cpp:685 +#: ../src/common/debugrpt.cpp:711 #, c-format msgid "Failed to upload the debug report (error code %d)." msgstr "Tải lên báo cáo lá»—i gặp lá»—i (mã lá»—i %d)." @@ -3189,29 +3354,39 @@ msgstr "Tải lên báo cáo lá»—i gặp lá»—i (mã lá»—i %d)." msgid "Failed to write to lock file '%s'" msgstr "Ghi vào tệp tin khóa '%s' gặp lá»—i" -#: ../src/generic/logg.cpp:424 -msgid "Fatal error" -msgstr "Lá»—i nghiêm trá»ng" +#: ../src/propgrid/propgrid.cpp:172 +msgid "False" +msgstr "Sai" -#: ../src/common/log.cpp:698 -msgid "Fatal error: " -msgstr "Lá»—i nghiêm trá»ng:" +#: ../src/propgrid/advprops.cpp:658 +msgid "Family" +msgstr "Há» :" #: ../src/msw/wince/filedlgwce.cpp:119 msgid "File" msgstr "Tệp tin" -#: ../src/mgl/bitmap.cpp:409 +#: ../src/common/docview.cpp:618 +#, c-format +msgid "File \"%s\" could not be opened for reading." +msgstr "Tệp tin \"%s\" không thể mở để Ä‘á»c." + +#: ../src/common/docview.cpp:595 +#, c-format +msgid "File \"%s\" could not be opened for writing." +msgstr "Tệp tin \"%s\" không thể mở để ghi." + +#: ../src/mgl/bitmap.cpp:439 #, c-format msgid "File %s does not exist." msgstr "Tệp tin %s chÆ°a tồn tại." -#: ../src/gtk/filedlg.cpp:52 +#: ../src/gtk/filedlg.cpp:53 #, c-format msgid "File '%s' already exists, do you really want to overwrite it?" msgstr "Tệp tin '%s' đã tồn tại. Bạn có muốn ghi đè lên nó không?" -#: ../src/os2/filedlg.cpp:307 +#: ../src/os2/filedlg.cpp:308 #, c-format msgid "" "File '%s' already exists.\n" @@ -3220,39 +3395,47 @@ msgstr "" "Tệp tin '%s' đã tồn tại. \n" "Bạn có muốn thay thế nó không?" -#: ../src/common/textcmn.cpp:724 -#: ../src/richtext/richtextctrl.cpp:1901 +#: ../src/richtext/richtextctrl.cpp:2137 +#: ../src/common/textcmn.cpp:775 msgid "File couldn't be loaded." msgstr "Không thể tải tệp tin lên." -#: ../src/common/docview.cpp:587 -#: ../src/common/docview.cpp:1641 +#: ../src/msw/filedlg.cpp:355 +#, c-format +msgid "File dialog failed with error code %0lx." +msgstr "Há»™p thoại chá»n tệp tin bị lá»—i %0lx." + +#: ../src/common/docview.cpp:1647 msgid "File error" msgstr "Lá»—i tệp tin" -#: ../src/generic/filectrlg.cpp:804 -#: ../src/generic/dirctrlg.cpp:721 +#: ../src/generic/dirctrlg.cpp:739 +#: ../src/generic/filectrlg.cpp:799 msgid "File name exists already." msgstr "Tên tệp tin đã tồn tại rồi." -#: ../src/motif/filedlg.cpp:220 +#: ../src/unix/fswatcher_inotify.cpp:414 +msgid "File system containing watched object was unmounted" +msgstr "Hệ thống tệp tin chứa đối tượng theo dõi chÆ°a được gắn vào" + +#: ../src/motif/filedlg.cpp:219 msgid "Files" msgstr "Tập tin" -#: ../src/common/filefn.cpp:1835 +#: ../src/common/filefn.cpp:1775 #, c-format msgid "Files (%s)" msgstr "Tập tin (%s)" -#: ../src/motif/filedlg.cpp:218 +#: ../src/motif/filedlg.cpp:217 msgid "Filter" msgstr "Bá»™ lá»c" -#: ../src/html/helpwnd.cpp:486 +#: ../src/html/helpwnd.cpp:498 msgid "Find" msgstr "Tìm" -#: ../src/html/helpwnd.cpp:1217 +#: ../src/html/helpwnd.cpp:1214 msgid "Fixed font:" msgstr "Phông chữ cố định:" @@ -3265,32 +3448,32 @@ msgid "Folio, 8 1/2 x 13 in" msgstr "Folio, 8 1/2 x 13 in" #: ../src/richtext/richtextformatdlg.cpp:275 -#: ../src/mac/carbon/fontdlg.cpp:449 +#: ../src/osx/carbon/fontdlg.cpp:461 msgid "Font" msgstr "Phông chữ" -#: ../src/richtext/richtextfontpage.cpp:187 +#: ../src/richtext/richtextfontpage.cpp:190 msgid "Font &weight:" msgstr "Äá»™ đậm phông &chữ" -#: ../src/html/helpwnd.cpp:1218 +#: ../src/html/helpwnd.cpp:1215 msgid "Font size:" msgstr "Cỡ phông chữ:" -#: ../src/richtext/richtextfontpage.cpp:174 +#: ../src/richtext/richtextfontpage.cpp:177 msgid "Font st&yle:" msgstr "Kiể&u dáng phông chữ:" -#: ../src/mac/carbon/fontdlg.cpp:491 +#: ../src/osx/carbon/fontdlg.cpp:503 msgid "Font:" msgstr "Phông chữ :" -#: ../src/dfb/fontmgr.cpp:202 +#: ../src/dfb/fontmgr.cpp:199 #, c-format msgid "Fonts index file %s disappeared while loading fonts." msgstr "Tệp tin chỉ số phông chữ %s bị mất khi Ä‘ang tải lên." -#: ../src/unix/utilsunx.cpp:582 +#: ../src/unix/utilsunx.cpp:539 msgid "Fork failed" msgstr "Lá»—i Fork" @@ -3298,17 +3481,16 @@ msgstr "Lá»—i Fork" msgid "Forward hrefs are not supported" msgstr "Liên kết tiến tá»›i chÆ°a được há»— trợ" -#: ../src/html/htmlhelp.cpp:460 -#: ../src/html/helpwnd.cpp:893 +#: ../src/html/helpwnd.cpp:888 #, c-format msgid "Found %i matches" msgstr "Tìm thấy %i cái khá»›p" -#: ../src/generic/prntdlgg.cpp:245 +#: ../src/generic/prntdlgg.cpp:244 msgid "From:" msgstr "Từ :" -#: ../src/common/fmapbase.cpp:156 +#: ../src/common/fmapbase.cpp:197 msgid "GB-2312" msgstr "GB-2312" @@ -3348,28 +3530,20 @@ msgstr "German Legal Fanfold, 8 1/2 x 13 in" msgid "German Std Fanfold, 8 1/2 x 12 in" msgstr "German Std Fanfold, 8 1/2 x 12 in" -#: ../src/html/helpwnd.cpp:661 +#: ../src/html/helpwnd.cpp:671 msgid "Go back" msgstr "Quay lui má»™t trang" -#: ../src/html/htmlhelp.cpp:541 -msgid "Go back to the previous HTML page" -msgstr "Quay lại trang HTML liá»n trÆ°á»›c" - -#: ../src/html/helpwnd.cpp:664 +#: ../src/html/helpwnd.cpp:672 msgid "Go forward" msgstr "Äi tiếp má»™t trang" -#: ../src/html/htmlhelp.cpp:543 -msgid "Go forward to the next HTML page" -msgstr "Tiến tá»›i trang HTML tiếp theo" - -#: ../src/html/helpwnd.cpp:669 +#: ../src/html/helpwnd.cpp:674 msgid "Go one level up in document hierarchy" msgstr "Tăng má»™t cấp trong thứ bậc tài liệu" -#: ../src/generic/dirdlgg.cpp:137 #: ../src/generic/filedlgg.cpp:225 +#: ../src/generic/dirdlgg.cpp:137 msgid "Go to home directory" msgstr "Chuyển sang thÆ° mục gốc(home)" @@ -3377,20 +3551,20 @@ msgstr "Chuyển sang thÆ° mục gốc(home)" msgid "Go to parent directory" msgstr "Chuyển sang thÆ° mục cha" -#: ../src/common/prntbase.cpp:1091 +#: ../src/common/prntbase.cpp:1112 msgid "Goto Page" msgstr "Nhảy tá»›i Trang" #: ../src/generic/aboutdlgg.cpp:77 msgid "Graphics art by " -msgstr "Äồ há»a bởi" +msgstr "Äồ há»a bởi " -#: ../src/common/fmapbase.cpp:114 +#: ../src/common/fmapbase.cpp:155 msgid "Greek (ISO-8859-7)" msgstr "Greek (ISO-8859-7)" #: ../src/common/zstream.cpp:142 -#: ../src/common/zstream.cpp:290 +#: ../src/common/zstream.cpp:302 msgid "Gzip not supported by this version of zlib" msgstr "Gzip không được há»— trợ bởi phiên bản này của zlib" @@ -3402,38 +3576,33 @@ msgstr "TRỢ GIÚP" msgid "HOME" msgstr "HOME" -#: ../src/html/helpwnd.cpp:1552 +#: ../src/html/helpwnd.cpp:1556 msgid "HTML Help Project (*.hhp)|*.hhp|" msgstr "HTML ÄỠán Trợ giúp (*.hhp)|*.hhp|" -#: ../src/html/htmlwin.cpp:630 +#: ../src/html/htmlwin.cpp:656 #, c-format msgid "HTML anchor %s does not exist." msgstr "Äiểm neo HTML %s không tồn tại." -#: ../src/html/helpwnd.cpp:1550 +#: ../src/html/helpwnd.cpp:1554 msgid "HTML files (*.html;*.htm)|*.html;*.htm|" msgstr "Tệp tin HTML (*.html;*.htm)|*.html;*.htm|" -#: ../src/html/htmprint.cpp:379 +#: ../src/html/htmprint.cpp:508 msgid "HTML pagination algorithm generated more than the allowed maximum number of pages and it can't continue any longer!" msgstr "Thuật toán chia trang HTML tạo ra nhiá»u hÆ¡n số tối Ä‘a trang được phép và nó không thể tiếp tục được nữa!" -#: ../src/common/fmapbase.cpp:115 +#: ../src/common/fmapbase.cpp:156 msgid "Hebrew (ISO-8859-8)" msgstr "Hebrew (ISO-8859-8)" #: ../src/html/helpdlg.cpp:67 -#: ../src/html/helpfrm.cpp:104 +#: ../src/html/helpfrm.cpp:116 msgid "Help" msgstr "Trợ giúp" -#: ../src/html/htmlhelp.cpp:87 -#, c-format -msgid "Help : %s" -msgstr "Trợ giúp : %s" - -#: ../src/html/helpwnd.cpp:1211 +#: ../src/html/helpwnd.cpp:1208 msgid "Help Browser Options" msgstr "Các tùy chá»n Duyệt Trợ Giúp" @@ -3446,11 +3615,11 @@ msgstr "Chỉ Mục Trợ Giúp" msgid "Help Printing" msgstr "Trợ Giúp In Ấn" -#: ../src/html/helpwnd.cpp:820 +#: ../src/html/helpwnd.cpp:815 msgid "Help Topics" msgstr "Trợ Giúp Theo Chủ Äá»..." -#: ../src/html/helpwnd.cpp:1551 +#: ../src/html/helpwnd.cpp:1555 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|" msgstr "Sách trợ giúp (*.htb)|*.htb|Sách trợ giúp (*.zip)|*.zip|" @@ -3464,62 +3633,66 @@ msgstr "Không tìm thấy thÆ° mục trợ giúp \"%s\"." msgid "Help file \"%s\" not found." msgstr "Tệp tin trợ giúp \"%s\" không tìm thấy." -#: ../src/html/helpctrl.cpp:51 +#: ../src/html/helpctrl.cpp:53 #, c-format msgid "Help: %s" msgstr "Trợ giúp: %s" +#: ../src/generic/infobar.cpp:139 +msgid "Hide this notification message." +msgstr "Tắt phần thông báo." + #: ../src/generic/dirdlgg.cpp:99 msgid "Home" msgstr "ThÆ° mục Home" -#: ../src/generic/dirctrlg.cpp:658 +#: ../src/generic/dirctrlg.cpp:675 msgid "Home directory" msgstr "ThÆ° mục Home" -#: ../include/wx/filefn.h:146 +#: ../include/wx/filefn.h:191 msgid "I64" msgstr "I64" -#: ../src/common/imagbmp.cpp:966 +#: ../src/common/imagbmp.cpp:1045 msgid "ICO: Error in reading mask DIB." msgstr "ICO: Lá»—i trong việc Ä‘á»c mặt nạ DIB." -#: ../src/common/imagbmp.cpp:1076 -#: ../src/common/imagbmp.cpp:1135 -#: ../src/common/imagbmp.cpp:1144 -#: ../src/common/imagbmp.cpp:1155 -#: ../src/common/imagbmp.cpp:1199 -#: ../src/common/imagbmp.cpp:1209 -#: ../src/common/imagbmp.cpp:1218 +#: ../src/common/imagbmp.cpp:1161 +#: ../src/common/imagbmp.cpp:1222 +#: ../src/common/imagbmp.cpp:1233 +#: ../src/common/imagbmp.cpp:1246 +#: ../src/common/imagbmp.cpp:1292 +#: ../src/common/imagbmp.cpp:1304 +#: ../src/common/imagbmp.cpp:1315 msgid "ICO: Error writing the image file!" msgstr "ICO: Lá»—i khi Ä‘ang ghi tệp tin ảnh!" -#: ../src/common/imagbmp.cpp:1044 +#: ../src/common/imagbmp.cpp:1125 msgid "ICO: Image too tall for an icon." msgstr "ICO: Ảnh quá cao đối vá»›i biểu tượng." -#: ../src/common/imagbmp.cpp:1050 +#: ../src/common/imagbmp.cpp:1133 msgid "ICO: Image too wide for an icon." msgstr "ICO: Ảnh quá rá»™ng đối vá»›i biểu tượng." -#: ../src/common/imagbmp.cpp:1283 +#: ../src/common/imagbmp.cpp:1385 msgid "ICO: Invalid icon index." msgstr "ICO: Chỉ mục biểu tượng không hợp lệ." -#: ../src/common/imagiff.cpp:758 +#: ../src/common/imagiff.cpp:766 msgid "IFF: data stream seems to be truncated." msgstr "IFF: dòng dữ liệu dÆ°á»ng nhÆ° bị cắt xén." -#: ../src/common/imagiff.cpp:742 +#: ../src/common/imagiff.cpp:750 msgid "IFF: error in IFF image format." msgstr "IFF: lá»—i trong định dạng ảnh IFF." -#: ../src/common/imagiff.cpp:745 +#: ../src/common/imagiff.cpp:753 msgid "IFF: not enough memory." msgstr "IFF: không có đủ bá»™ nhá»›." -#: ../src/common/imagiff.cpp:748 +#: ../src/common/imagiff.cpp:756 msgid "IFF: unknown error!!!" msgstr "IFF: lá»—i không rõ!!!" @@ -3531,23 +3704,27 @@ msgstr "INS" msgid "INSERT" msgstr "CHÈN" -#: ../src/common/fmapbase.cpp:157 +#: ../src/common/fmapbase.cpp:198 msgid "ISO-2022-JP" msgstr "ISO-2022-JP" -#: ../src/mac/carbon/dataview.cpp:609 +#: ../src/osx/carbon/dataview.cpp:2377 msgid "Icon & text renderer cannot render value; value type: " -msgstr "Bá»™ đáp ứng Biểu tượng & text không trả vá» giá trị; giá trị kiểu:" +msgstr "Bá»™ đáp ứng Biểu tượng & text không trả vá» giá trị; giá trị kiểu: " -#: ../src/generic/dbgrptg.cpp:354 +#: ../src/html/htmprint.cpp:283 +msgid "If possible, try changing the layout parameters to make the printout more narrow." +msgstr "Nếu có thể, hay thá»­ thay đổi cách bố trí các tham số để mà in ra nhiá»u mÅ©i tên hÆ¡n." + +#: ../src/generic/dbgrptg.cpp:355 msgid "" "If you have any additional information pertaining to this bug\n" "report, please enter it here and it will be joined to it:" msgstr "" "Nếu bạn có thêm thông tin liên quan vá» lá»—i báo cáo này,\n" -"xin hãy nhập chúng vào đây và nó sẽ nối thêm vào nó: " +"xin hãy nhập chúng vào đây và nó sẽ nối thêm vào nó:" -#: ../src/generic/dbgrptg.cpp:320 +#: ../src/generic/dbgrptg.cpp:321 msgid "" "If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n" "but be warned that it may hinder improving the program, so if\n" @@ -3557,7 +3734,7 @@ msgstr "" "nhÆ°ng xin cảnh báo rằng nó có thể gây cản trở việc phát triển chÆ°Æ¡ng trình, do đó\n" "nếu có thể xin hãy tiếp tục việc báo cáo vá»›i chúng tôi.\n" -#: ../src/msw/registry.cpp:1324 +#: ../src/msw/registry.cpp:1336 #, c-format msgid "Ignoring value \"%s\" of the key \"%s\"." msgstr "Bá» qua giá trị \"%s\" của khóa \"%s\"." @@ -3566,54 +3743,59 @@ msgstr "Bá» qua giá trị \"%s\" của khóa \"%s\"." msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source" msgstr "Illegal Object Class (Non-wxEvtHandler) as Event Source" -#: ../src/generic/filectrlg.cpp:790 -#: ../src/generic/dirctrlg.cpp:703 +#: ../src/generic/dirctrlg.cpp:721 +#: ../src/generic/filectrlg.cpp:785 msgid "Illegal directory name." msgstr "Tên thÆ° mục không hợp lệ." -#: ../src/generic/filectrlg.cpp:1373 +#: ../src/generic/filectrlg.cpp:1370 msgid "Illegal file specification." msgstr "Chi tiết tệp tin không hợp lệ." -#: ../src/common/image.cpp:1841 +#: ../src/common/image.cpp:1979 msgid "Image and mask have different sizes." -msgstr "Ảnh và mặt nạ có sá»± khác biệt kích thÆ°á»›c." +msgstr "Ảnh và mặt nạ có sá»± khác biệt kích thÆ°á»›c." -#: ../src/common/image.cpp:2195 -#: ../src/common/image.cpp:2240 +#: ../src/common/image.cpp:2340 +#: ../src/common/image.cpp:2414 #, c-format msgid "Image file is not of type %ld." msgstr "Tệp tin ảnh không thuá»™c kiểu %ld." -#: ../src/common/image.cpp:2264 +#: ../src/common/image.cpp:2437 #, c-format msgid "Image file is not of type %s." msgstr "Tệp tin ảnh không thuá»™c kiểu %s." -#: ../src/msw/textctrl.cpp:464 +#: ../src/msw/textctrl.cpp:466 msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll" msgstr "Không thể nào khởi tạo Ä‘iá»u khiển văn bản (rich edit), Ä‘ang sá»­ dụng Ä‘iá»u khiển văn bản Ä‘Æ¡n giản để thay thế. Xin hãy cài lại riched32.dll" -#: ../src/unix/utilsunx.cpp:314 +#: ../src/unix/utilsunx.cpp:322 msgid "Impossible to get child process input" msgstr "Không thể lấy đầu vào của tiến trình con" -#: ../src/common/filefn.cpp:1114 +#: ../src/common/filefn.cpp:1086 #, c-format msgid "Impossible to get permissions for file '%s'" msgstr "Không thể nào lấy được quyá»n cho tệp tin '%s'" -#: ../src/common/filefn.cpp:1128 +#: ../src/common/filefn.cpp:1100 #, c-format msgid "Impossible to overwrite the file '%s'" msgstr "Không thể xảy ra việc ghi đè lên tệp tin '%s'" -#: ../src/common/filefn.cpp:1182 +#: ../src/common/filefn.cpp:1154 #, c-format msgid "Impossible to set permissions for the file '%s'" msgstr "Không thể nào đặt được quyá»n cho tệp tin '%s'" -#: ../src/common/stockitem.cpp:130 +#: ../src/common/gifdecod.cpp:776 +#, c-format +msgid "Incorrect GIF frame size (%u, %d) for the frame #%u" +msgstr "Frame của ảnh GIF (%u, %d) cho frame #%u không đúng" + +#: ../src/common/stockitem.cpp:154 msgid "Indent" msgstr "Thụt lá»" @@ -3621,33 +3803,32 @@ msgstr "Thụt lá»" msgid "Indents && Spacing" msgstr "Thụt lá» && Khoảng Trắng" -#: ../src/html/htmlhelp.cpp:578 -#: ../src/html/helpwnd.cpp:511 +#: ../src/html/helpwnd.cpp:523 msgid "Index" msgstr "Chỉ mục" -#: ../src/common/fmapbase.cpp:119 +#: ../src/common/fmapbase.cpp:160 msgid "Indian (ISO-8859-12)" msgstr "Indian (ISO-8859-12)" -#: ../src/common/init.cpp:248 +#: ../src/common/init.cpp:262 msgid "Initialization failed in post init, aborting." msgstr "Khởi tạo lá»—i trong việc post init, Ä‘ang bãi bá»." -#: ../src/richtext/richtextsymboldlg.cpp:470 +#: ../src/richtext/richtextsymboldlg.cpp:471 msgid "Insert" msgstr "Chèn" -#: ../src/richtext/richtextbuffer.cpp:5244 -#: ../src/richtext/richtextbuffer.cpp:6024 +#: ../src/richtext/richtextbuffer.cpp:5428 +#: ../src/richtext/richtextbuffer.cpp:6218 msgid "Insert Image" msgstr "Chèn Ảnh" -#: ../src/richtext/richtextbuffer.cpp:5105 -#: ../src/richtext/richtextbuffer.cpp:5139 -#: ../src/richtext/richtextbuffer.cpp:5177 -#: ../src/richtext/richtextctrl.cpp:600 -#: ../src/richtext/richtextctrl.cpp:867 +#: ../src/richtext/richtextctrl.cpp:857 +#: ../src/richtext/richtextctrl.cpp:1051 +#: ../src/richtext/richtextbuffer.cpp:5274 +#: ../src/richtext/richtextbuffer.cpp:5317 +#: ../src/richtext/richtextbuffer.cpp:5355 msgid "Insert Text" msgstr "Chèn Chữ" @@ -3655,30 +3836,26 @@ msgstr "Chèn Chữ" msgid "Internal error, illegal wxCustomTypeInfo" msgstr "Lá»—i ná»™i bá»™, wxCustomTypeInfo không hợp lệ" -#: ../src/gtk/app.cpp:484 +#: ../src/gtk/app.cpp:411 #, c-format msgid "Invalid GTK+ command line option, use \"%s --help\"" -msgstr "Tùy chá»n dòng lệnh GTK+ không hợp lệ, sá»­ dụng \"%s --help\"" +msgstr "Tùy chá»n dòng lệnh GTK+ không hợp lệ, sá»­ dụng \"%s --help\"" -#: ../src/common/imagtiff.cpp:280 +#: ../src/common/imagtiff.cpp:284 msgid "Invalid TIFF image index." msgstr "Chỉ mục ảnh TIFF không hợp lệ." -#: ../src/xrc/xmlres.cpp:511 -#, c-format -msgid "Invalid XRC resource '%s': doesn't have root node 'resource'." -msgstr "Tài nguyên XRC '%s' không hợp lệ: không có nút gốc 'resource'." - -#: ../src/mac/carbon/databrow.cpp:1112 +#: ../src/osx/carbon/dataview.cpp:1743 +#: ../src/osx/carbon/dataview.cpp:1835 msgid "Invalid data view item" msgstr "Dữ liệu hiển thị mục tin không hợp lệ" -#: ../src/common/appcmn.cpp:254 +#: ../src/common/appcmn.cpp:247 #, c-format msgid "Invalid display mode specification '%s'." msgstr "Chi tiết chế Ä‘á»™ hiển thị '%s' không hợp lệ." -#: ../src/x11/app.cpp:124 +#: ../src/x11/app.cpp:122 #, c-format msgid "Invalid geometry specification '%s'" msgstr "Chi tiết hình há»c '%s' không hợp lệ" @@ -3688,6 +3865,10 @@ msgstr "Chi tiết hình há»c '%s' không hợp lệ" msgid "Invalid lock file '%s'." msgstr "Tệp tin khóa '%s' không hợp lệ." +#: ../src/common/translation.cpp:949 +msgid "Invalid message catalog." +msgstr "Catalog không hợp lệ." + #: ../src/common/xtistrm.cpp:361 #: ../src/common/xtistrm.cpp:376 msgid "Invalid or Null Object ID passed to GetObjectClassInfo" @@ -3697,16 +3878,20 @@ msgstr "Không hợp lệ hay Null Object ID được chuyển tá»›i GetObjectCl msgid "Invalid or Null Object ID passed to HasObjectClassInfo" msgstr "Không hợp lệ hay Null Object ID được chuyển tá»›i HasObjectClassInfo" -#: ../src/common/regex.cpp:312 +#: ../src/common/regex.cpp:314 #, c-format msgid "Invalid regular expression '%s': %s" msgstr "Biểu thức thông thÆ°á»ng '%s' không hợp lệ: %s" -#: ../src/richtext/richtextfontpage.cpp:266 -#: ../src/richtext/richtextfontpage.cpp:318 -#: ../src/richtext/richtextfontpage.cpp:566 +#: ../src/common/docview.cpp:1944 +msgid "It has been removed from the most recently used files list." +msgstr "Nó đã bị gỡ bá» từ ngÆ°á»i dùng gần đây nhất." + #: ../src/generic/fontdlgg.cpp:331 -#: ../src/mac/carbon/fontdlg.cpp:523 +#: ../src/richtext/richtextfontpage.cpp:283 +#: ../src/richtext/richtextfontpage.cpp:335 +#: ../src/richtext/richtextfontpage.cpp:600 +#: ../src/osx/carbon/fontdlg.cpp:535 msgid "Italic" msgstr "Nghiêng" @@ -3714,11 +3899,11 @@ msgstr "Nghiêng" msgid "Italy Envelope, 110 x 230 mm" msgstr "Italy Envelope, 110 x 230 mm" -#: ../src/common/imagjpeg.cpp:251 +#: ../src/common/imagjpeg.cpp:255 msgid "JPEG: Couldn't load - file is probably corrupted." msgstr "JPEG: Không thể tải - tệp tin hầu nhÆ° chắc chắn đã sai há»ng." -#: ../src/common/imagjpeg.cpp:410 +#: ../src/common/imagjpeg.cpp:427 msgid "JPEG: Couldn't save image." msgstr "JPEG: Không thể ghi lại ảnh." @@ -3774,22 +3959,22 @@ msgstr "BÆ°u Thiếp Kiểu Nhật Bản 100 x 148 mm" msgid "Japanese Postcard Rotated 148 x 100 mm" msgstr "BÆ°u Thiếp Kiểu Nhật Bản Äã Xoay lại 148 x 100 mm" -#: ../src/common/stockitem.cpp:134 +#: ../src/common/stockitem.cpp:160 msgid "Justified" msgstr "Xắp xếp chữ" -#: ../src/richtext/richtextliststylepage.cpp:343 -#: ../src/richtext/richtextliststylepage.cpp:345 #: ../src/richtext/richtextindentspage.cpp:165 #: ../src/richtext/richtextindentspage.cpp:167 +#: ../src/richtext/richtextliststylepage.cpp:343 +#: ../src/richtext/richtextliststylepage.cpp:345 msgid "Justify text left and right." msgstr "Xắp xếp chữ canh lá» trái và phải." -#: ../src/common/fmapbase.cpp:123 +#: ../src/common/fmapbase.cpp:164 msgid "KOI8-R" msgstr "KOI8-R" -#: ../src/common/fmapbase.cpp:124 +#: ../src/common/fmapbase.cpp:165 msgid "KOI8-U" msgstr "KOI8-U" @@ -3898,8 +4083,8 @@ msgstr "Khoảng cách &dòng:" msgid "LEFT" msgstr "LEFT" -#: ../src/generic/prntdlgg.cpp:618 -#: ../src/generic/prntdlgg.cpp:873 +#: ../src/generic/prntdlgg.cpp:619 +#: ../src/generic/prntdlgg.cpp:874 msgid "Landscape" msgstr "Nằm ngang" @@ -3910,25 +4095,25 @@ msgstr "Ledger, 17 x 11 in" #: ../src/richtext/richtextliststylepage.cpp:248 #: ../src/richtext/richtextliststylepage.cpp:251 #: ../src/richtext/richtextliststylepage.cpp:252 -#: ../src/richtext/richtextbulletspage.cpp:197 +#: ../src/richtext/richtextbulletspage.cpp:196 +#: ../src/richtext/richtextbulletspage.cpp:199 #: ../src/richtext/richtextbulletspage.cpp:200 -#: ../src/richtext/richtextbulletspage.cpp:201 msgid "Left" msgstr "Trái" -#: ../src/richtext/richtextliststylepage.cpp:391 #: ../src/richtext/richtextindentspage.cpp:217 +#: ../src/richtext/richtextliststylepage.cpp:391 msgid "Left (&first line):" msgstr "&Bên trái (dòng đầu):" -#: ../src/generic/prntdlgg.cpp:885 +#: ../src/generic/prntdlgg.cpp:886 msgid "Left margin (mm):" msgstr "Lá» trái (mm):" -#: ../src/richtext/richtextliststylepage.cpp:329 -#: ../src/richtext/richtextliststylepage.cpp:331 #: ../src/richtext/richtextindentspage.cpp:151 #: ../src/richtext/richtextindentspage.cpp:153 +#: ../src/richtext/richtextliststylepage.cpp:329 +#: ../src/richtext/richtextliststylepage.cpp:331 msgid "Left-align text." msgstr "Canh lá» cạnh bên trái chữ." @@ -3968,7 +4153,7 @@ msgstr "Letter Transverse 8 1/2 x 11 in" msgid "Letter, 8 1/2 x 11 in" msgstr "Letter, 8 1/2 x 11 in" -#: ../src/generic/aboutdlgg.cpp:139 +#: ../src/generic/aboutdlgg.cpp:174 msgid "License" msgstr "Giấy phép" @@ -3985,7 +4170,7 @@ msgstr "Dòng %lu của tệp tin ánh xạ \"%s\" có cú pháp không hợp l msgid "Line spacing:" msgstr "Khoảng cách dòng:" -#: ../src/html/chm.cpp:820 +#: ../src/html/chm.cpp:837 msgid "Link contained '//', converted to absolute link." msgstr "Liên kết có chứa '//', đã chuyển đổi sang liên kết đúng đắn." @@ -3993,26 +4178,26 @@ msgstr "Liên kết có chứa '//', đã chuyển đổi sang liên kết đún msgid "List Style" msgstr "Danh Sách Kiểu Dáng" -#: ../src/richtext/richtextstyles.cpp:841 +#: ../src/richtext/richtextstyles.cpp:907 msgid "List styles" msgstr "Danh sách kiểu dáng" -#: ../src/richtext/richtextfontpage.cpp:163 -#: ../src/richtext/richtextfontpage.cpp:165 +#: ../src/richtext/richtextfontpage.cpp:166 +#: ../src/richtext/richtextfontpage.cpp:168 msgid "Lists font sizes in points." msgstr "Danh sách kích thÆ°á»›c phông chữ bằng Ä‘Æ¡n vị point (72 point xấp xỉ bằng má»™t inch)." -#: ../src/richtext/richtextfontpage.cpp:144 -#: ../src/richtext/richtextfontpage.cpp:146 +#: ../src/richtext/richtextfontpage.cpp:147 +#: ../src/richtext/richtextfontpage.cpp:149 msgid "Lists the available fonts." msgstr "Danh sách phông chữ sẵn có." -#: ../src/common/fldlgcmn.cpp:282 +#: ../src/common/fldlgcmn.cpp:316 #, c-format msgid "Load %s file" msgstr "Tải %s tập tin" -#: ../src/html/htmlwin.cpp:548 +#: ../src/html/htmlwin.cpp:572 msgid "Loading : " msgstr "Äang tải :" @@ -4026,23 +4211,23 @@ msgstr "Tập tin khóa '%s' có chủ sở hữu không đúng." msgid "Lock file '%s' has incorrect permissions." msgstr "Tập tin khóa '%s' có quyá»n không đúng." -#: ../src/generic/logg.cpp:602 +#: ../src/generic/logg.cpp:590 #, c-format msgid "Log saved to the file '%s'." msgstr "Ghi nhật ký thông tin vào tập tin '%s'." #: ../src/richtext/richtextliststylepage.cpp:486 -#: ../src/richtext/richtextbulletspage.cpp:284 +#: ../src/richtext/richtextbulletspage.cpp:286 msgid "Lower case letters" msgstr "Chữ thÆ°á»ng" #: ../src/richtext/richtextliststylepage.cpp:488 -#: ../src/richtext/richtextbulletspage.cpp:286 +#: ../src/richtext/richtextbulletspage.cpp:288 msgid "Lower case roman numerals" msgstr "Chữ số La Mã thÆ°á»ng" -#: ../src/gtk/mdi.cpp:413 -#: ../src/gtk1/mdi.cpp:462 +#: ../src/gtk/mdi.cpp:431 +#: ../src/gtk1/mdi.cpp:432 msgid "MDI child" msgstr "cá»­a sổ MDI con" @@ -4054,20 +4239,184 @@ msgstr "TRÃŒNH ÄÆ N" msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it." msgstr "Hàm MS HTML Help không sẵn sàng bởi vì thÆ° viện MS HTML Help không được cài đặt trong máy này. Xin hãy cài nó vào." -#: ../src/univ/themes/win32.cpp:3740 +#: ../src/univ/themes/win32.cpp:3778 msgid "Ma&ximize" msgstr "Tối Ä‘&a" +#: ../src/common/fmapbase.cpp:204 +msgid "MacArabic" +msgstr "Arabic" + +#: ../src/common/fmapbase.cpp:223 +msgid "MacArmenian" +msgstr "MacArmenian" + +#: ../src/common/fmapbase.cpp:212 +msgid "MacBengali" +msgstr "MacBengali" + +#: ../src/common/fmapbase.cpp:218 +msgid "MacBurmese" +msgstr "MacBurmese" + +#: ../src/common/fmapbase.cpp:237 +msgid "MacCeltic" +msgstr "MacCeltic" + +#: ../src/common/fmapbase.cpp:228 +msgid "MacCentralEurRoman" +msgstr "MacCentralEurRoman" + +#: ../src/common/fmapbase.cpp:224 +msgid "MacChineseSimp" +msgstr "MacChineseSimp" + +#: ../src/common/fmapbase.cpp:202 +msgid "MacChineseTrad" +msgstr "MacChineseTrad" + +#: ../src/common/fmapbase.cpp:234 +msgid "MacCroatian" +msgstr "MacCroatian" + +#: ../src/common/fmapbase.cpp:207 +msgid "MacCyrillic" +msgstr "MacCyrillic" + +#: ../src/common/fmapbase.cpp:208 +msgid "MacDevanagari" +msgstr "MacDevanagari" + +#: ../src/common/fmapbase.cpp:232 +msgid "MacDingbats" +msgstr "MacDingbats" + +#: ../src/common/fmapbase.cpp:227 +msgid "MacEthiopic" +msgstr "MacEthiopic" + +#: ../src/common/fmapbase.cpp:230 +msgid "MacExtArabic" +msgstr "MacExtArabic" + +#: ../src/common/fmapbase.cpp:238 +msgid "MacGaelic" +msgstr "MacGaelic" + +#: ../src/common/fmapbase.cpp:222 +msgid "MacGeorgian" +msgstr "MacGeorgian" + +#: ../src/common/fmapbase.cpp:206 +msgid "MacGreek" +msgstr "MacGreek" + +#: ../src/common/fmapbase.cpp:210 +msgid "MacGujarati" +msgstr "MacGujarati" + +#: ../src/common/fmapbase.cpp:209 +msgid "MacGurmukhi" +msgstr "MacGurmukhi" + +#: ../src/common/fmapbase.cpp:205 +msgid "MacHebrew" +msgstr "MacHebrew" + +#: ../src/common/fmapbase.cpp:235 +msgid "MacIcelandic" +msgstr "MacIcelandic" + +#: ../src/common/fmapbase.cpp:201 +msgid "MacJapanese" +msgstr "MacJapanese" + +#: ../src/common/fmapbase.cpp:215 +msgid "MacKannada" +msgstr "MacKannada" + +#: ../src/common/fmapbase.cpp:239 +msgid "MacKeyboardGlyphs" +msgstr "MacKeyboardGlyphs" + +#: ../src/common/fmapbase.cpp:219 +msgid "MacKhmer" +msgstr "MacKhmer" + +#: ../src/common/fmapbase.cpp:203 +msgid "MacKorean" +msgstr "MacKorean" + +#: ../src/common/fmapbase.cpp:221 +msgid "MacLaotian" +msgstr "MacLaotian" + +#: ../src/common/fmapbase.cpp:216 +msgid "MacMalayalam" +msgstr "MacMalayalam" + +#: ../src/common/fmapbase.cpp:226 +msgid "MacMongolian" +msgstr "MacMongolian" + +#: ../src/common/fmapbase.cpp:211 +msgid "MacOriya" +msgstr "MacOriya" + +#: ../src/common/fmapbase.cpp:200 +msgid "MacRoman" +msgstr "MacRoman" + +#: ../src/common/fmapbase.cpp:236 +msgid "MacRomanian" +msgstr "MacRomanian" + +#: ../src/common/fmapbase.cpp:217 +msgid "MacSinhalese" +msgstr "MacSinhalese" + +#: ../src/common/fmapbase.cpp:231 +msgid "MacSymbol" +msgstr "MacSymbol" + +#: ../src/common/fmapbase.cpp:213 +msgid "MacTamil" +msgstr "MacTamil" + +#: ../src/common/fmapbase.cpp:214 +msgid "MacTelugu" +msgstr "MacTelugu" + +#: ../src/common/fmapbase.cpp:220 +msgid "MacThai" +msgstr "MacThai" + +#: ../src/common/fmapbase.cpp:225 +msgid "MacTibetan" +msgstr "MacTibetan" + +#: ../src/common/fmapbase.cpp:233 +msgid "MacTurkish" +msgstr "MacTurkish" + +#: ../src/common/fmapbase.cpp:229 +msgid "MacVietnamese" +msgstr "MacVietnamese" + +#: ../src/propgrid/advprops.cpp:2012 +msgid "Make a selection:" +msgstr "Làm vá»›i vùng chá»n:" + #: ../src/generic/fdrepdlg.cpp:148 msgid "Match case" msgstr "Phân biệt chữ hoa/thÆ°á»ng" -#: ../src/common/fs_mem.cpp:168 +#: ../src/common/fs_mem.cpp:176 #, c-format msgid "Memory VFS already contains file '%s'!" msgstr "Bá»™ nhá»› VFS đã chứa tệp tin '%s' rồi!" -#: ../src/msw/frame.cpp:415 +#: ../src/msw/frame.cpp:425 msgid "Menu" msgstr "Trình Ä‘Æ¡n" @@ -4075,16 +4424,16 @@ msgstr "Trình Ä‘Æ¡n" msgid "Metal theme" msgstr "Chủ Ä‘á» giống kim loại" -#: ../src/univ/themes/win32.cpp:3738 +#: ../src/univ/themes/win32.cpp:3776 msgid "Mi&nimize" msgstr "&Nhá» nhất" -#: ../src/mgl/app.cpp:163 +#: ../src/mgl/app.cpp:114 #, c-format msgid "Mode %ix%i-%i not available." msgstr "Chế Ä‘á»™ %ix%i-%i không sẵn sàng." -#: ../src/mac/carbon/dataview.cpp:1412 +#: ../src/osx/dataview_osx.cpp:594 msgid "Model pointer not initialized." msgstr "Mô hình con trá» không thể khởi tạo." @@ -4092,7 +4441,7 @@ msgstr "Mô hình con trá» không thể khởi tạo." msgid "Modern" msgstr "Hiện đại" -#: ../src/generic/filectrlg.cpp:461 +#: ../src/generic/filectrlg.cpp:456 msgid "Modified" msgstr "Äã chỉnh sá»­a" @@ -4105,11 +4454,11 @@ msgstr "Sá»± khởi tạo mô-Ä‘un \"%s\" gặp lá»—i" msgid "Monarch Envelope, 3 7/8 x 7 1/2 in" msgstr "Monarch Envelope, 3 7/8 x 7 1/2 in" -#: ../src/generic/editlbox.cpp:276 +#: ../src/generic/editlbox.cpp:277 msgid "Move down" msgstr "Di chuyển xuống" -#: ../src/generic/editlbox.cpp:275 +#: ../src/generic/editlbox.cpp:276 msgid "Move up" msgstr "Di chuyển lên" @@ -4117,7 +4466,7 @@ msgstr "Di chuyển lên" msgid "NUM_LOCK" msgstr "NUM_LOCK" -#: ../src/generic/filectrlg.cpp:458 +#: ../src/generic/filectrlg.cpp:453 msgid "Name" msgstr "Tên" @@ -4137,10 +4486,10 @@ msgstr "Kiểu Dáng Ä&oạn má»›i..." #: ../src/richtext/richtextstyledlg.cpp:573 #: ../src/richtext/richtextstyledlg.cpp:616 #: ../src/richtext/richtextstyledlg.cpp:621 -#: ../src/richtext/richtextstyledlg.cpp:770 -#: ../src/richtext/richtextstyledlg.cpp:775 -#: ../src/richtext/richtextstyledlg.cpp:843 -#: ../src/richtext/richtextstyledlg.cpp:851 +#: ../src/richtext/richtextstyledlg.cpp:771 +#: ../src/richtext/richtextstyledlg.cpp:776 +#: ../src/richtext/richtextstyledlg.cpp:844 +#: ../src/richtext/richtextstyledlg.cpp:852 msgid "New Style" msgstr "Kiểu dáng Má»›i" @@ -4148,54 +4497,53 @@ msgstr "Kiểu dáng Má»›i" msgid "New directory" msgstr "ThÆ° mục má»›i" -#: ../src/generic/editlbox.cpp:273 +#: ../src/generic/editlbox.cpp:274 msgid "New item" msgstr "Mục tin má»›i" -#: ../src/generic/filectrlg.cpp:652 -#: ../src/generic/filectrlg.cpp:661 #: ../src/generic/dirdlgg.cpp:327 #: ../src/generic/dirdlgg.cpp:337 +#: ../src/generic/filectrlg.cpp:647 +#: ../src/generic/filectrlg.cpp:656 msgid "NewName" msgstr "TênMá»›i" -#: ../src/generic/tipdlg.cpp:303 +#: ../src/generic/tipdlg.cpp:306 msgid "Next" msgstr "Tiếp theo" -#: ../src/html/helpwnd.cpp:675 +#: ../src/html/helpwnd.cpp:676 msgid "Next page" msgstr "Trang tiếp theo" #: ../src/motif/msgdlg.cpp:194 -#: ../src/mac/carbon/msgdlg.cpp:36 msgid "No" msgstr "Không" -#: ../src/generic/animateg.cpp:152 +#: ../src/generic/animateg.cpp:151 #, c-format msgid "No animation handler for type %ld defined." msgstr "Không có bá»™ Ä‘iá»u khiển hoạt hình cho kiểu %ld đã định nghÄ©a." -#: ../src/dfb/bitmap.cpp:540 -#: ../src/dfb/bitmap.cpp:574 +#: ../src/dfb/bitmap.cpp:643 +#: ../src/dfb/bitmap.cpp:677 #, c-format msgid "No bitmap handler for type %d defined." msgstr "Không có bá»™ Ä‘iá»u khiển ảnh cho kiểu %d được định nghÄ©a." -#: ../src/mac/carbon/databrow.cpp:1116 +#: ../src/osx/carbon/dataview.cpp:1745 msgid "No column existing." msgstr "ChÆ°a có cá»™t nào tồn tại." -#: ../src/mac/carbon/databrow.cpp:1013 -msgid "No column for the specified column index existing." -msgstr "Không cá»™t nào cho chỉ số cá»™t đã tồn tại theo danh nghÄ©a." +#: ../src/osx/carbon/dataview.cpp:1635 +msgid "No column for the specified column existing." +msgstr "Không cá»™t nào đã tạo cho vị trí cá»™t đã chỉ ra." -#: ../src/mac/carbon/databrow.cpp:768 +#: ../src/osx/carbon/dataview.cpp:1384 msgid "No column for the specified column position existing." msgstr "Không cá»™t nào cho vị trí cá»™t đã tồn tại theo danh nghÄ©a." -#: ../src/common/utilscmn.cpp:1146 +#: ../src/common/utilscmn.cpp:985 msgid "No default application configured for HTML files." msgstr "Không có ứng dụng mặc định được cấu hình tệp tin HTML." @@ -4225,54 +4573,46 @@ msgstr "" "Bạn có muốn chá»n má»™t phông chữ sá»­ dụng cho bá»™ mã này không\n" "(nếu không chữ vá»›i bá»™ mã này sẽ hiện lên không chính xác)?" -#: ../src/xrc/xmlres.cpp:739 -#, c-format -msgid "No handler found for XML node '%s', class '%s'!" -msgstr "Không tìm thấy handler XML cho nút '%s', lá»›p '%s'!" - -#: ../src/generic/animateg.cpp:144 +#: ../src/generic/animateg.cpp:143 msgid "No handler found for animation type." msgstr "Không có phần Ä‘iá»u khiển cho kiểu hoạt hình." -#: ../src/common/image.cpp:2177 -#: ../src/common/image.cpp:2224 +#: ../src/common/image.cpp:2322 +#: ../src/common/image.cpp:2399 msgid "No handler found for image type." msgstr "Không có phần Ä‘iá»u khiển cho kiểu ảnh này." -#: ../src/common/image.cpp:2278 +#: ../src/common/image.cpp:2461 #, c-format msgid "No image handler for type %d defined." msgstr "Không có bá»™ Ä‘iá»u khiển ảnh cho kiểu %d được định nghÄ©a." -#: ../src/common/image.cpp:2185 -#: ../src/common/image.cpp:2233 +#: ../src/common/image.cpp:2330 +#: ../src/common/image.cpp:2408 #, c-format msgid "No image handler for type %ld defined." msgstr "Không có bá»™ Ä‘iá»u khiển ảnh cho kiểu %ld đã định nghÄ©a." -#: ../src/common/image.cpp:2257 -#: ../src/common/image.cpp:2293 +#: ../src/common/image.cpp:2431 +#: ../src/common/image.cpp:2475 #, c-format msgid "No image handler for type %s defined." msgstr "Không có bá»™ Ä‘iá»u khiển ảnh cho kiểu %s được định nghÄ©a." -#: ../src/html/htmlhelp.cpp:436 -#: ../src/html/htmlhelp.cpp:441 -#: ../src/html/helpwnd.cpp:876 +#: ../src/html/helpwnd.cpp:871 msgid "No matching page found yet" msgstr "Không tìm thấy trang phù hợp" -#: ../src/mac/carbon/dataview.cpp:1051 -#: ../src/mac/carbon/dataview.cpp:1171 +#: ../src/osx/dataview_osx.cpp:381 msgid "No model associated with control." msgstr "Không có mô hình liên kết vá»›i Ä‘iá»u khiển này." -#: ../src/mac/carbon/databrow.cpp:1015 -#: ../src/mac/carbon/databrow.cpp:1118 +#: ../src/osx/carbon/dataview.cpp:1637 +#: ../src/osx/carbon/dataview.cpp:1747 msgid "No renderer or invalid renderer type specified for custom data column." msgstr "Không có renderer hoặc kiểu renderer không hợp lệ chỉ định cho kiểu cá»™t dữ liệu tùy chỉnh." -#: ../src/mac/carbon/databrow.cpp:769 +#: ../src/osx/carbon/dataview.cpp:1385 msgid "No renderer specified for column." msgstr "Không có renderer định rõ cho cá»™t." @@ -4280,12 +4620,12 @@ msgstr "Không có renderer định rõ cho cá»™t." msgid "No sound" msgstr "Không có âm thanh" -#: ../src/common/image.cpp:1849 -#: ../src/common/image.cpp:1890 +#: ../src/common/image.cpp:1987 +#: ../src/common/image.cpp:2028 msgid "No unused colour in image being masked." msgstr "Không có màu không dùng đến trong mặt nạ ảnh này." -#: ../src/common/image.cpp:2742 +#: ../src/common/image.cpp:2937 msgid "No unused colour in image." msgstr "Không có màu không dùng trong ảnh." @@ -4294,15 +4634,15 @@ msgstr "Không có màu không dùng trong ảnh." msgid "No valid mappings found in the file \"%s\"." msgstr "Không có ánh xạ hợp lệ nào được tìm thấy trong tệp tin \"%s\"." -#: ../src/common/fmapbase.cpp:117 +#: ../src/common/fmapbase.cpp:158 msgid "Nordic (ISO-8859-10)" msgstr "Nordic (ISO-8859-10)" +#: ../src/generic/fontdlgg.cpp:330 +#: ../src/generic/fontdlgg.cpp:333 #: ../src/richtext/richtextindentspage.cpp:245 #: ../src/richtext/richtextindentspage.cpp:255 #: ../src/richtext/richtextindentspage.cpp:256 -#: ../src/generic/fontdlgg.cpp:330 -#: ../src/generic/fontdlgg.cpp:333 msgid "Normal" msgstr "Bình thÆ°á»ng" @@ -4310,11 +4650,21 @@ msgstr "Bình thÆ°á»ng" msgid "Normal face
and underlined. " msgstr "Bình thÆ°á»ng
và gạch chân. " -#: ../src/html/helpwnd.cpp:1216 +#: ../src/html/helpwnd.cpp:1213 msgid "Normal font:" msgstr "Phông chữ thÆ°á»ng:" -#: ../src/richtext/richtextfontpage.cpp:271 +#: ../src/propgrid/props.cpp:791 +#, c-format +msgid "Not %s" +msgstr "Không %s" + +#: ../include/wx/filename.h:552 +#: ../include/wx/filename.h:557 +msgid "Not available" +msgstr "Không sẵn sàng" + +#: ../src/richtext/richtextfontpage.cpp:288 msgid "Not underlined" msgstr "Không gạch chân" @@ -4322,19 +4672,23 @@ msgstr "Không gạch chân" msgid "Note, 8 1/2 x 11 in" msgstr "Note, 8 1/2 x 11 in" -#: ../src/generic/notifmsgg.cpp:101 +#: ../src/generic/notifmsgg.cpp:105 msgid "Notice" msgstr "Chú ý" +#: ../src/osx/carbon/dataview.cpp:903 +msgid "Number of columns could not be determined." +msgstr "Số cá»™t không thể định rõ." + #: ../src/richtext/richtextliststylepage.cpp:489 -#: ../src/richtext/richtextbulletspage.cpp:287 +#: ../src/richtext/richtextbulletspage.cpp:289 msgid "Numbered outline" msgstr "Số Ä‘Æ°á»ng bao" #: ../src/richtext/richtextstyledlg.cpp:282 +#: ../src/msw/msgdlg.cpp:473 +#: ../src/msw/dialog.cpp:178 #: ../src/gtk1/fontdlg.cpp:139 -#: ../src/msw/dialog.cpp:180 -#: ../src/mac/carbon/msgdlg.cpp:37 msgid "OK" msgstr "Äồng ý" @@ -4342,51 +4696,50 @@ msgstr "Äồng ý" msgid "Objects must have an id attribute" msgstr "Äối tượng phải có giá trị thuá»™c tính id" -#: ../src/common/docview.cpp:1298 -#: ../src/common/docview.cpp:1624 -#: ../src/common/docview.cpp:1664 +#: ../src/common/docview.cpp:1631 +#: ../src/common/docview.cpp:1673 msgid "Open File" msgstr "Mở tập tin" -#: ../src/html/helpwnd.cpp:683 -#: ../src/html/helpwnd.cpp:1557 +#: ../src/html/helpwnd.cpp:682 +#: ../src/html/helpwnd.cpp:1561 msgid "Open HTML document" msgstr "Mở tài liệu định dạng HTML" -#: ../src/generic/dbgrptg.cpp:159 +#: ../src/generic/dbgrptg.cpp:160 #, c-format msgid "Open file \"%s\"" msgstr "Mở tệp tin \"%s\"" -#: ../src/mac/carbon/glcanvas.cpp:48 +#: ../src/osx/carbon/glcanvas.cpp:49 #, c-format msgid "OpenGL function \"%s\" failed: %s (error %d)" msgstr "Hàm \"%s\" của OpenGL bị lá»—i: %s (lá»—i %d)" -#: ../src/generic/filectrlg.cpp:676 -#: ../src/generic/filectrlg.cpp:820 +#: ../src/generic/dirctrlg.cpp:750 #: ../src/generic/dirdlgg.cpp:353 -#: ../src/generic/dirctrlg.cpp:732 +#: ../src/generic/filectrlg.cpp:671 +#: ../src/generic/filectrlg.cpp:815 msgid "Operation not permitted." msgstr "Thao tác không được phép." -#: ../src/common/cmdline.cpp:771 +#: ../src/common/cmdline.cpp:829 #, c-format msgid "Option '%s' requires a value." msgstr "Tùy chá»n '%s' yêu cầu má»™t giá trị." -#: ../src/common/cmdline.cpp:854 +#: ../src/common/cmdline.cpp:912 #, c-format msgid "Option '%s': '%s' cannot be converted to a date." msgstr "Tùy chá»n '%s': '%s' không thể chuyển thành dạng ngày tháng." -#: ../src/generic/prntdlgg.cpp:623 #: ../src/generic/dirdlgg.cpp:188 +#: ../src/generic/prntdlgg.cpp:624 msgid "Options" msgstr "Tùy chá»n" -#: ../src/generic/prntdlgg.cpp:620 -#: ../src/generic/prntdlgg.cpp:874 +#: ../src/generic/prntdlgg.cpp:621 +#: ../src/generic/prntdlgg.cpp:875 msgid "Orientation" msgstr "HÆ°á»›ng" @@ -4394,7 +4747,8 @@ msgstr "HÆ°á»›ng" msgid "Out of window IDs. Recommend shutting down application." msgstr "Thiếu chỉ số cá»­a sổ IDs. Äá» nghị đóng ứng dụng." -#: ../src/mac/carbon/dataview.cpp:376 +#: ../src/osx/dataview_osx.cpp:121 +#: ../src/osx/dataview_osx.cpp:202 msgid "Owner not initialized." msgstr "Chủ sở hữu không khởi tạo." @@ -4410,29 +4764,29 @@ msgstr "PAGEUP" msgid "PAUSE" msgstr "PAUSE" -#: ../src/common/imagpcx.cpp:456 -#: ../src/common/imagpcx.cpp:479 +#: ../src/common/imagpcx.cpp:458 +#: ../src/common/imagpcx.cpp:481 msgid "PCX: couldn't allocate memory" msgstr "PCX: không thể cấp phát bá»™ nhá»›" -#: ../src/common/imagpcx.cpp:455 +#: ../src/common/imagpcx.cpp:457 msgid "PCX: image format unsupported" msgstr "PCX: không há»— trợ định dạng ảnh" -#: ../src/common/imagpcx.cpp:478 +#: ../src/common/imagpcx.cpp:480 msgid "PCX: invalid image" msgstr "PCX: ảnh không hợp lệ" -#: ../src/common/imagpcx.cpp:442 +#: ../src/common/imagpcx.cpp:443 msgid "PCX: this is not a PCX file." msgstr "PCX: cái này không phải là tập tin PCX." -#: ../src/common/imagpcx.cpp:458 -#: ../src/common/imagpcx.cpp:480 +#: ../src/common/imagpcx.cpp:460 +#: ../src/common/imagpcx.cpp:482 msgid "PCX: unknown error !!!" msgstr "PCX: lá»—i không rõ!!!" -#: ../src/common/imagpcx.cpp:457 +#: ../src/common/imagpcx.cpp:459 msgid "PCX: version number too low" msgstr "PCX: phiên bản quá thấp" @@ -4444,17 +4798,17 @@ msgstr "PGDN" msgid "PGUP" msgstr "PGUP" -#: ../src/common/imagpnm.cpp:88 +#: ../src/common/imagpnm.cpp:92 msgid "PNM: Couldn't allocate memory." msgstr "PNM: Không thể cấp phát bá»™ nhá»›." -#: ../src/common/imagpnm.cpp:72 +#: ../src/common/imagpnm.cpp:74 msgid "PNM: File format is not recognized." msgstr "PNM: Äịnh dạng tệp tin không được thừa nhận." -#: ../src/common/imagpnm.cpp:106 -#: ../src/common/imagpnm.cpp:125 -#: ../src/common/imagpnm.cpp:144 +#: ../src/common/imagpnm.cpp:113 +#: ../src/common/imagpnm.cpp:135 +#: ../src/common/imagpnm.cpp:157 msgid "PNM: File seems truncated." msgstr "PNM: Tệp tin dÆ°á»ng nhÆ° đã bị cắt xén." @@ -4566,17 +4920,17 @@ msgstr "PRC Envelope #9 Rotated 324 x 229 mm" msgid "PRINT" msgstr "IN" -#: ../src/common/prntbase.cpp:1569 +#: ../src/common/prntbase.cpp:1617 #, c-format msgid "Page %d" msgstr "Trang %d" -#: ../src/common/prntbase.cpp:1567 +#: ../src/common/prntbase.cpp:1615 #, c-format msgid "Page %d of %d" msgstr "Trang %d của %d" -#: ../src/generic/prntdlgg.cpp:833 +#: ../src/generic/prntdlgg.cpp:834 msgid "Page Setup" msgstr "Thiết lập trang" @@ -4589,23 +4943,23 @@ msgstr "Thiết lập trang" msgid "Pages" msgstr "Trang" -#: ../src/generic/prntdlgg.cpp:806 -#: ../src/generic/prntdlgg.cpp:860 -#: ../src/generic/prntdlgg.cpp:1062 +#: ../src/generic/prntdlgg.cpp:807 +#: ../src/generic/prntdlgg.cpp:861 +#: ../src/generic/prntdlgg.cpp:1063 msgid "Paper Size" msgstr "Cỡ giấy" -#: ../src/generic/prntdlgg.cpp:607 -#: ../src/generic/prntdlgg.cpp:847 -#: ../src/generic/prntdlgg.cpp:1057 +#: ../src/generic/prntdlgg.cpp:608 +#: ../src/generic/prntdlgg.cpp:848 +#: ../src/generic/prntdlgg.cpp:1058 msgid "Paper size" msgstr "Cỡ giấy" -#: ../src/richtext/richtextstyles.cpp:839 +#: ../src/richtext/richtextstyles.cpp:905 msgid "Paragraph styles" msgstr "Kiểu Ä‘oạn văn" -#: ../src/mac/carbon/dataview.cpp:375 +#: ../src/osx/dataview_osx.cpp:201 msgid "Passed item is invalid." msgstr "Mục tin chuyển tá»›i không hợp lệ." @@ -4618,25 +4972,28 @@ msgid "Passing a already registered object to SetObjectName" msgstr "Chuyển qua má»™t đối tượng đã được đăng ký rồi để SetObjectName" #: ../src/common/xtistrm.cpp:432 +msgid "Passing an unknown object to GetObject" +msgstr "Chuyển má»™t đối tượng không hợp lệ cho SetObject" + #: ../src/common/xtistrm.cpp:652 msgid "Passing an unkown object to GetObject" msgstr "Chuyển qua má»™t đối tượng không rõ để SetObject" -#: ../src/richtext/richtextctrl.cpp:2234 -#: ../src/stc/scintilla/src/ScintillaBase.cxx:427 +#: ../src/richtext/richtextctrl.cpp:2472 +#: ../src/stc/scintilla/src/ScintillaBase.cxx:457 msgid "Paste" msgstr "Dán" -#: ../src/common/stockitem.cpp:207 +#: ../src/common/stockitem.cpp:264 msgid "Paste selection" msgstr "Dán vùng chá»n" #: ../src/richtext/richtextliststylepage.cpp:221 -#: ../src/richtext/richtextbulletspage.cpp:170 +#: ../src/richtext/richtextbulletspage.cpp:169 msgid "Peri&od" msgstr "Dấu chấ&m" -#: ../src/generic/filectrlg.cpp:464 +#: ../src/generic/filectrlg.cpp:459 msgid "Permissions" msgstr "Các quyá»n" @@ -4648,19 +5005,19 @@ msgstr "Việc tạo Ä‘Æ°á»ng ống gặp lá»—i" msgid "Please choose a valid font." msgstr "Hãy chá»n má»™t phông chữ hợp lệ." -#: ../src/gtk/filedlg.cpp:66 +#: ../src/gtk/filedlg.cpp:68 msgid "Please choose an existing file." msgstr "Xin hãy chá»n má»™t tệp tin đã tồn tại." -#: ../src/html/helpwnd.cpp:819 +#: ../src/html/helpwnd.cpp:814 msgid "Please choose the page to display:" msgstr "Xin hãy chá»n trang bạn muốn hiển thị:" -#: ../src/msw/dialup.cpp:792 +#: ../src/msw/dialup.cpp:793 msgid "Please choose which ISP do you want to connect to" msgstr "Xin hãy chá»n nhà cung cấp dịch vụ Internet ISP mà bạn muốn kết nối tá»›i" -#: ../src/msw/listctrl.cpp:434 +#: ../src/msw/listctrl.cpp:443 #, c-format msgid "" "Please install a newer version of comctl32.dll\n" @@ -4671,68 +5028,90 @@ msgstr "" "(ít nhất yêu cầu phiên bản 4.70 nhÆ°ng bạn phải có %d.%02d)\n" "nếu không chÆ°Æ¡ng trình sẽ không làm việc đúng." +#: ../src/common/headerctrlcmn.cpp:59 +msgid "Please select the columns to show and define their order:" +msgstr "Xin hãy chá»n các cá»™t sẽ hiển thị và xác định thứ tá»± của chúng:" + #: ../src/common/prntbase.cpp:327 msgid "Please wait while printing\n" msgstr "Xin hãy đợi khi Ä‘ang in\n" -#: ../src/mac/carbon/databrow.cpp:621 -#: ../src/mac/carbon/databrow.cpp:671 -#: ../src/mac/carbon/databrow.cpp:765 -#: ../src/mac/carbon/databrow.cpp:788 -#: ../src/mac/carbon/databrow.cpp:805 -#: ../src/mac/carbon/databrow.cpp:822 -#: ../src/mac/carbon/databrow.cpp:1009 -#: ../src/mac/carbon/databrow.cpp:1114 +#: ../src/propgrid/advprops.cpp:631 +msgid "Point Size" +msgstr "&Kích thÆ°á»›c Phông chữ:" + +#: ../src/osx/carbon/dataview.cpp:1239 +#: ../src/osx/carbon/dataview.cpp:1290 +#: ../src/osx/carbon/dataview.cpp:1381 +#: ../src/osx/carbon/dataview.cpp:1404 +#: ../src/osx/carbon/dataview.cpp:1421 +#: ../src/osx/carbon/dataview.cpp:1438 +#: ../src/osx/carbon/dataview.cpp:1631 +#: ../src/osx/carbon/dataview.cpp:1740 +#: ../src/osx/carbon/dataview.cpp:1782 +#: ../src/osx/carbon/dataview.cpp:1832 +#: ../src/osx/carbon/dataview.cpp:1955 msgid "Pointer to data view control not set correctly." msgstr "Con trá» tá»›i Ä‘iá»u khiển hiển thị dữ liệu không được đặt má»™t cách chính xác." -#: ../src/mac/carbon/databrow.cpp:622 -#: ../src/mac/carbon/databrow.cpp:680 -#: ../src/mac/carbon/databrow.cpp:766 -#: ../src/mac/carbon/databrow.cpp:823 -#: ../src/mac/carbon/databrow.cpp:1010 +#: ../src/osx/dataview_osx.cpp:91 +msgid "Pointer to dataview control must not be NULL" +msgstr "Con trá» tá»›i Ä‘iá»u khiển hiển thị dữ liệu không được đặt bằng NULL." + +#: ../src/osx/carbon/dataview.cpp:1240 +#: ../src/osx/carbon/dataview.cpp:1299 +#: ../src/osx/carbon/dataview.cpp:1382 +#: ../src/osx/carbon/dataview.cpp:1439 +#: ../src/osx/carbon/dataview.cpp:1632 +#: ../src/osx/carbon/dataview.cpp:1741 +#: ../src/osx/carbon/dataview.cpp:1783 +#: ../src/osx/carbon/dataview.cpp:1833 +#: ../src/osx/carbon/dataview.cpp:1956 msgid "Pointer to model not set correctly." msgstr "Con trá» tá»›i mô hình không được đặt má»™t cách chính xác." -#: ../src/generic/prntdlgg.cpp:617 -#: ../src/generic/prntdlgg.cpp:872 +#: ../src/osx/dataview_osx.cpp:352 +#: ../src/osx/dataview_osx.cpp:378 +msgid "Pointer to native control must not be NULL." +msgstr "Con trá» tá»›i Ä‘iá»u khiển native không được đặt bằng NULL." + +#: ../src/generic/prntdlgg.cpp:618 +#: ../src/generic/prntdlgg.cpp:873 msgid "Portrait" msgstr "Thẳng đứng" -#: ../src/generic/prntdlgg.cpp:305 +#: ../src/generic/prntdlgg.cpp:304 msgid "PostScript file" msgstr "tệp tin PostScript" -#: ../src/html/htmlhelp.cpp:509 -msgid "Preparing help window..." -msgstr "Äang chuẩn bị cá»­a sổ trợ giúp..." - -#: ../src/html/helpwnd.cpp:1233 #: ../src/generic/fontdlgg.cpp:457 -#: ../src/mac/carbon/fontdlg.cpp:552 +#: ../src/osx/carbon/fontdlg.cpp:564 +#: ../src/html/helpwnd.cpp:1230 msgid "Preview:" msgstr "Xem trÆ°á»›c:" -#: ../src/html/helpwnd.cpp:672 +#: ../src/html/helpwnd.cpp:675 msgid "Previous page" msgstr "Trang trÆ°á»›c" -#: ../src/common/prntbase.cpp:407 -#: ../src/gtk/gnome/gprint.cpp:537 -#: ../src/gtk/gnome/gprint.cpp:549 -#: ../src/gtk/print.cpp:598 -#: ../src/gtk/print.cpp:611 #: ../src/generic/prntdlgg.cpp:149 #: ../src/generic/prntdlgg.cpp:163 +#: ../src/common/prntbase.cpp:407 +#: ../src/gtk/print.cpp:573 +#: ../src/gtk/print.cpp:586 +#: ../src/gtk/gnome/gprint.cpp:537 +#: ../src/gtk/gnome/gprint.cpp:549 msgid "Print" msgstr "In" -#: ../src/common/docview.cpp:1061 +#: ../include/wx/prntbase.h:379 +#: ../src/common/docview.cpp:1146 msgid "Print Preview" msgstr "Mô Phá»ng Bản In" -#: ../src/common/prntbase.cpp:1521 -#: ../src/common/prntbase.cpp:1547 +#: ../src/common/prntbase.cpp:1558 +#: ../src/common/prntbase.cpp:1600 +#: ../src/common/prntbase.cpp:1608 msgid "Print Preview Failure" msgstr "Mô Phá»ng Bản In Bị Lá»—i" @@ -4740,27 +5119,31 @@ msgstr "Mô Phá»ng Bản In Bị Lá»—i" msgid "Print Range" msgstr "Vùng cần in" -#: ../src/generic/prntdlgg.cpp:454 +#: ../src/generic/prntdlgg.cpp:455 msgid "Print Setup" msgstr "Cài Äặt In" -#: ../src/generic/prntdlgg.cpp:626 +#: ../src/generic/prntdlgg.cpp:627 msgid "Print in colour" msgstr "In màu" -#: ../src/common/stockitem.cpp:144 +#: ../src/common/stockitem.cpp:171 msgid "Print previe&w" msgstr "&Mô phá»ng bản in" -#: ../src/gtk/gnome/gprint.cpp:947 +#: ../src/gtk/gnome/gprint.cpp:938 msgid "Print preview" msgstr "Mô phá»ng bản in" -#: ../src/generic/prntdlgg.cpp:635 +#: ../src/common/docview.cpp:1140 +msgid "Print preview creation failed." +msgstr "Tạo bản xem thá»­ khi in gặp lá»—i." + +#: ../src/generic/prntdlgg.cpp:636 msgid "Print spooling" msgstr "In vào bá»™ nhá»›" -#: ../src/html/helpwnd.cpp:689 +#: ../src/html/helpwnd.cpp:686 msgid "Print this page" msgstr "In ra trang này" @@ -4768,11 +5151,11 @@ msgstr "In ra trang này" msgid "Print to File" msgstr "In ra Tệp Tin" -#: ../src/generic/prntdlgg.cpp:498 +#: ../src/generic/prntdlgg.cpp:499 msgid "Printer" msgstr "Máy in" -#: ../src/generic/prntdlgg.cpp:638 +#: ../src/generic/prntdlgg.cpp:639 msgid "Printer command:" msgstr "Lệnh in:" @@ -4780,11 +5163,11 @@ msgstr "Lệnh in:" msgid "Printer options" msgstr "Tùy chá»n vá» máy in" -#: ../src/generic/prntdlgg.cpp:650 +#: ../src/generic/prntdlgg.cpp:651 msgid "Printer options:" msgstr "Tùy chá»n vá» máy in:" -#: ../src/generic/prntdlgg.cpp:921 +#: ../src/generic/prntdlgg.cpp:922 msgid "Printer..." msgstr "Máy in..." @@ -4792,46 +5175,55 @@ msgstr "Máy in..." msgid "Printer:" msgstr "Máy in:" +#: ../src/html/htmprint.cpp:278 +msgid "Printing" +msgstr "In ấn" + #: ../src/common/prntbase.cpp:324 -#: ../src/common/prntbase.cpp:545 +#: ../src/common/prntbase.cpp:546 msgid "Printing " -msgstr "Äang in" +msgstr "Äang in " #: ../src/common/prntbase.cpp:341 msgid "Printing Error" msgstr "Lá»—i In" -#: ../src/generic/printps.cpp:204 +#: ../src/generic/printps.cpp:202 #, c-format msgid "Printing page %d..." msgstr "Äang in trang %d..." -#: ../src/generic/printps.cpp:164 +#: ../src/generic/printps.cpp:162 msgid "Printing..." msgstr "Äang in..." -#: ../src/common/debugrpt.cpp:552 +#: ../include/wx/docview.h:932 +#: ../include/wx/prntbase.h:247 +msgid "Printout" +msgstr "Dữ liệu in" + +#: ../src/common/debugrpt.cpp:554 #, c-format msgid "Processing debug report has failed, leaving the files in \"%s\" directory." msgstr "Sá»± tạo báo cáo gỡ lá»—i bị lá»—i, tệp tin xuất ra trong thÆ° mục \"%s\"." -#: ../src/common/log.cpp:699 -msgid "Program aborted." -msgstr "ChÆ°Æ¡ng trình bị bãi bá»." - -#: ../src/mac/carbon/dataview.cpp:670 +#: ../src/osx/carbon/dataview.cpp:2429 msgid "Progress renderer cannot render value type; value type: " -msgstr "Tiến trình renderer không thể trả vá» kiểu giá trị loại; kiểu giá trị:" +msgstr "Tiến trình renderer không thể trả vá» kiểu giá trị loại; kiểu giá trị: " + +#: ../src/propgrid/manager.cpp:238 +msgid "Property" +msgstr "Thuá»™c tính" #: ../src/common/paper.cpp:114 msgid "Quarto, 215 x 275 mm" msgstr "Quarto, 215 x 275 mm" -#: ../src/generic/logg.cpp:1089 +#: ../src/generic/logg.cpp:1037 msgid "Question" msgstr "Câu há»i" -#: ../src/common/stockitem.cpp:208 +#: ../src/common/stockitem.cpp:265 msgid "Quit this program" msgstr "Thoát khá»i chÆ°Æ¡ng trình này" @@ -4843,8 +5235,8 @@ msgstr "RETURN" msgid "RIGHT" msgstr "RIGHT" -#: ../src/common/ffile.cpp:126 -#: ../src/common/ffile.cpp:145 +#: ../src/common/ffile.cpp:114 +#: ../src/common/ffile.cpp:133 #, c-format msgid "Read error on file '%s'" msgstr "Lá»—i Ä‘á»c trong tập tin '%s'" @@ -4853,34 +5245,29 @@ msgstr "Lá»—i Ä‘á»c trong tập tin '%s'" msgid "Ready" msgstr "Sẵn sàng" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:423 +#: ../src/stc/scintilla/src/ScintillaBase.cxx:453 msgid "Redo" msgstr "Redo" -#: ../src/common/stockitem.cpp:209 +#: ../src/common/stockitem.cpp:266 msgid "Redo last action" msgstr "Redo bÆ°á»›c cuối cùng" -#: ../src/xrc/xmlres.cpp:710 -#, c-format -msgid "Referenced object node with ref=\"%s\" not found!" -msgstr "Nốt đối tượng có liên quan đến ref=\"%s\" không tìm thấy!" - -#: ../src/common/stockitem.cpp:148 +#: ../src/common/stockitem.cpp:175 msgid "Refresh" msgstr "Làm tÆ°Æ¡i lại" -#: ../src/msw/registry.cpp:571 +#: ../src/msw/registry.cpp:583 #, c-format msgid "Registry key '%s' already exists." msgstr "Khóa đăng ký '%s' đã tồn tại rồi." -#: ../src/msw/registry.cpp:540 +#: ../src/msw/registry.cpp:552 #, c-format msgid "Registry key '%s' does not exist, cannot rename it." msgstr "Khóa đăng ký '%s' chÆ°a tồn tại, không thể đổi tên được." -#: ../src/msw/registry.cpp:672 +#: ../src/msw/registry.cpp:684 #, c-format msgid "" "Registry key '%s' is needed for normal system operation,\n" @@ -4891,13 +5278,13 @@ msgstr "" "việc xóa nó sẽ làm cho hệ thống của bạn rÆ¡i vào trạng thái không ổn định:\n" "thao tác đã bị hủy bá»." -#: ../src/msw/registry.cpp:466 +#: ../src/msw/registry.cpp:478 #, c-format msgid "Registry value '%s' already exists." msgstr "Giá trị đăng ký '%s' đã tồn tại rồi." -#: ../src/richtext/richtextfontpage.cpp:265 -#: ../src/richtext/richtextfontpage.cpp:268 +#: ../src/richtext/richtextfontpage.cpp:282 +#: ../src/richtext/richtextfontpage.cpp:285 msgid "Regular" msgstr "Thông thÆ°á»ng" @@ -4905,15 +5292,16 @@ msgstr "Thông thÆ°á»ng" msgid "Relevant entries:" msgstr "Các Ä‘á» mục tin hợp:" -#: ../src/generic/progdlgg.cpp:214 +#: ../src/generic/progdlgg.cpp:209 msgid "Remaining time:" msgstr "Thá»i gian còn lại:" -#: ../src/common/stockitem.cpp:149 +#: ../src/common/stockitem.cpp:176 +#: ../src/propgrid/props.cpp:2164 msgid "Remove" msgstr "Gỡ bá»" -#: ../src/html/helpwnd.cpp:426 +#: ../src/html/helpwnd.cpp:438 msgid "Remove current page from bookmarks" msgstr "Gỡ bá» trang hiện hành từ dấu sách" @@ -4922,19 +5310,19 @@ msgstr "Gỡ bá» trang hiện hành từ dấu sách" msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded." msgstr "Renderer \"% s\" đã không tÆ°Æ¡ng thích vá»›i phiên bản% d.% d và không thể được nạp." -#: ../src/mac/carbon/databrow.cpp:775 +#: ../src/osx/carbon/dataview.cpp:1391 msgid "Rendering failed." msgstr "Rendering gặp lá»—i." -#: ../src/richtext/richtextbuffer.cpp:2847 +#: ../src/richtext/richtextbuffer.cpp:2900 msgid "Renumber List" msgstr "Äánh số lại List" -#: ../src/common/stockitem.cpp:123 +#: ../src/common/stockitem.cpp:177 msgid "Rep&lace" msgstr "Tha&y thế" -#: ../src/richtext/richtextctrl.cpp:2375 +#: ../src/richtext/richtextctrl.cpp:2617 msgid "Replace" msgstr "Thay thế" @@ -4942,7 +5330,7 @@ msgstr "Thay thế" msgid "Replace &all" msgstr "Th&ay thế tất cả" -#: ../src/common/stockitem.cpp:206 +#: ../src/common/stockitem.cpp:263 msgid "Replace selection" msgstr "Thay thế vùng chá»n hiện thá»i" @@ -4950,27 +5338,32 @@ msgstr "Thay thế vùng chá»n hiện thá»i" msgid "Replace with:" msgstr "Thay thế bằng:" -#: ../src/xrc/xmlres.cpp:530 -msgid "Resource files must have same version number!" -msgstr "Tệp tin tài nguyên phải có cùng số phiên bản!" +#: ../src/common/valtext.cpp:152 +msgid "Required information entry is empty." +msgstr "Mục thông tin đã yêu cầu bị rá»—ng." -#: ../src/common/stockitem.cpp:150 +#: ../src/common/translation.cpp:1726 +#, c-format +msgid "Resource '%s' is not a valid message catalog." +msgstr "Tài nguyên '%s' không đúng định dạng." + +#: ../src/common/stockitem.cpp:178 msgid "Revert to Saved" msgstr "Hoàn nguyên để Ghi Lại" #: ../src/richtext/richtextliststylepage.cpp:250 -#: ../src/richtext/richtextbulletspage.cpp:199 +#: ../src/richtext/richtextbulletspage.cpp:198 msgid "Right" msgstr "Phải" -#: ../src/generic/prntdlgg.cpp:897 +#: ../src/generic/prntdlgg.cpp:898 msgid "Right margin (mm):" msgstr "Lá» phải (mm):" -#: ../src/richtext/richtextliststylepage.cpp:336 -#: ../src/richtext/richtextliststylepage.cpp:338 #: ../src/richtext/richtextindentspage.cpp:158 #: ../src/richtext/richtextindentspage.cpp:160 +#: ../src/richtext/richtextliststylepage.cpp:336 +#: ../src/richtext/richtextliststylepage.cpp:338 msgid "Right-align text." msgstr "Canh lá» chữ phải." @@ -4979,7 +5372,7 @@ msgid "Roman" msgstr "Roman" #: ../src/richtext/richtextliststylepage.cpp:298 -#: ../src/richtext/richtextbulletspage.cpp:250 +#: ../src/richtext/richtextbulletspage.cpp:249 msgid "S&tandard bullet name:" msgstr "&Tên bullet tiêu chuẩn:" @@ -4995,7 +5388,7 @@ msgstr "SELECT" msgid "SEPARATOR" msgstr "SEPARATOR" -#: ../src/common/fmapbase.cpp:155 +#: ../src/common/fmapbase.cpp:196 msgid "SHIFT-JIS" msgstr "SHIFT-JIS" @@ -5016,32 +5409,32 @@ msgstr "SPECIAL" msgid "SUBTRACT" msgstr "SUBTRACT" -#: ../src/common/sizer.cpp:2426 +#: ../src/common/sizer.cpp:2566 msgid "Save" msgstr "Ghi lại" -#: ../src/common/fldlgcmn.cpp:284 +#: ../src/common/fldlgcmn.cpp:318 #, c-format msgid "Save %s file" msgstr "Ghi lại %s tệp tin" -#: ../src/common/stockitem.cpp:152 +#: ../src/common/stockitem.cpp:180 msgid "Save &As..." msgstr "&Ghi Lại Bằng Tên Má»›i..." -#: ../src/common/docview.cpp:305 +#: ../src/common/docview.cpp:315 msgid "Save As" msgstr "Ghi Lại Bằng Tên Má»›i" -#: ../src/common/stockitem.cpp:212 +#: ../src/common/stockitem.cpp:269 msgid "Save current document" msgstr "Ghi lại tài liệu hiện hành" -#: ../src/common/stockitem.cpp:213 +#: ../src/common/stockitem.cpp:270 msgid "Save current document with a different filename" msgstr "Ghi lại tài liệu hiện hành vá»›i má»™t cái tên khác" -#: ../src/generic/logg.cpp:535 +#: ../src/generic/logg.cpp:524 msgid "Save log contents to file" msgstr "Ghi lại ná»™i dung nhật ký vào tập tin" @@ -5049,15 +5442,14 @@ msgstr "Ghi lại ná»™i dung nhật ký vào tập tin" msgid "Script" msgstr "Script" -#: ../src/html/htmlhelp.cpp:610 -#: ../src/html/helpwnd.cpp:534 -#: ../src/html/helpwnd.cpp:549 #: ../src/generic/srchctlg.cpp:362 +#: ../src/html/helpwnd.cpp:546 +#: ../src/html/helpwnd.cpp:561 msgid "Search" msgstr "Tìm kiếm" -#: ../src/html/helpwnd.cpp:536 -msgid "Search contents of help book(s) for all occurences of the text you typed above" +#: ../src/html/helpwnd.cpp:548 +msgid "Search contents of help book(s) for all occurrences of the text you typed above" msgstr "Tìm kiếm ná»™i dung của cuốn sách trợ giúp cho tất cả các lần xuất hiện của chữ bạn đã gõ ở trên" #: ../src/generic/fdrepdlg.cpp:161 @@ -5068,69 +5460,63 @@ msgstr "HÆ°á»›ng tìm kiếm" msgid "Search for:" msgstr "Tìm kiếm cho:" -#: ../src/html/helpwnd.cpp:1065 +#: ../src/html/helpwnd.cpp:1060 msgid "Search in all books" msgstr "Tìm trong tất cả các sách" -#: ../src/html/htmlhelp.cpp:593 -msgid "Search!" -msgstr "Tìm kiếm!" - -#: ../src/html/htmlhelp.cpp:383 -#: ../src/html/htmlhelp.cpp:441 -#: ../src/html/helpwnd.cpp:875 +#: ../src/html/helpwnd.cpp:870 msgid "Searching..." msgstr "Äang tìm kiếm..." -#: ../src/generic/dirctrlg.cpp:593 +#: ../src/generic/dirctrlg.cpp:597 msgid "Sections" msgstr "Vùng chá»n" -#: ../src/common/ffile.cpp:231 +#: ../src/common/ffile.cpp:219 #, c-format msgid "Seek error on file '%s'" msgstr "Tìm kiếm lá»—i trong tập tin '%s'" -#: ../src/common/ffile.cpp:221 +#: ../src/common/ffile.cpp:209 #, c-format msgid "Seek error on file '%s' (large files not supported by stdio)" msgstr "Tìm kiếm trên tệp tin '%s' gặp lá»—i (tệp tin có kích thÆ°á»›c lá»›n không được há»— trợ bởi stdio)" -#: ../src/common/stockitem.cpp:153 -#: ../src/richtext/richtextctrl.cpp:2600 -#: ../src/msw/textctrl.cpp:2156 -#: ../src/mac/carbon/textctrl.cpp:1069 +#: ../src/richtext/richtextctrl.cpp:301 +#: ../src/osx/textctrl_osx.cpp:592 +#: ../src/common/stockitem.cpp:181 +#: ../src/msw/textctrl.cpp:2179 msgid "Select &All" msgstr "Chá»n &Hết" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:430 +#: ../src/stc/scintilla/src/ScintillaBase.cxx:460 msgid "Select All" msgstr "Chá»n Hết" -#: ../src/common/docview.cpp:1744 +#: ../src/common/docview.cpp:1753 msgid "Select a document template" msgstr "Chá»n má»™t tài liệu tạm thá»i" -#: ../src/common/docview.cpp:1821 +#: ../src/common/docview.cpp:1827 msgid "Select a document view" msgstr "Chá»n má»™t bá»™ hiển thị tài liệu" -#: ../src/richtext/richtextfontpage.cpp:192 -#: ../src/richtext/richtextfontpage.cpp:194 +#: ../src/richtext/richtextfontpage.cpp:195 +#: ../src/richtext/richtextfontpage.cpp:197 msgid "Select regular or bold." msgstr "Chá»n kiểu thÆ°á»ng hay đậm." -#: ../src/richtext/richtextfontpage.cpp:179 -#: ../src/richtext/richtextfontpage.cpp:181 +#: ../src/richtext/richtextfontpage.cpp:182 +#: ../src/richtext/richtextfontpage.cpp:184 msgid "Select regular or italic style." msgstr "Chá»n kiểu dáng thông thÆ°á»ng hay nghiêng." -#: ../src/richtext/richtextfontpage.cpp:205 -#: ../src/richtext/richtextfontpage.cpp:207 +#: ../src/richtext/richtextfontpage.cpp:208 +#: ../src/richtext/richtextfontpage.cpp:210 msgid "Select underlining or no underlining." msgstr "Chá»n có gạch dÆ°á»›i hay không có gạch dÆ°á»›i." -#: ../src/motif/filedlg.cpp:220 +#: ../src/motif/filedlg.cpp:219 msgid "Selection" msgstr "Vùng chá»n" @@ -5139,40 +5525,44 @@ msgstr "Vùng chá»n" msgid "Selects the list level to edit." msgstr "Chá»n mức danh sách muốn chỉnh sá»­a." -#: ../src/common/cmdline.cpp:790 +#: ../src/common/cmdline.cpp:848 #, c-format msgid "Separator expected after the option '%s'." msgstr "Mong đợi dấu phân cách sau tùy chá»n '%s'." +#: ../src/common/filename.cpp:2461 +msgid "Setting directory access times is not supported under this OS version" +msgstr "Cài đặt vá» thá»i gian truy cập thÆ° mục không được há»— trợ trong phiên bản hệ Ä‘iá»u hành này" + #: ../src/generic/prntdlgg.cpp:194 msgid "Setup..." msgstr "Cài đặt..." -#: ../src/msw/dialup.cpp:566 +#: ../src/msw/dialup.cpp:567 msgid "Several active dialup connections found, choosing one randomly." msgstr "Tìm thấy nhiá»u kết nối quay số Ä‘ang hoạt Ä‘á»™ng, Ä‘ang chá»n má»™t cái ngẫu nhiên." #: ../src/common/accelcmn.cpp:298 -msgid "Shift-" -msgstr "Shift-" +msgid "Shift+" +msgstr "Shift+" #: ../src/generic/dirdlgg.cpp:171 msgid "Show &hidden directories" msgstr "&Hiện thÆ° mục ẩn" -#: ../src/generic/filectrlg.cpp:998 +#: ../src/generic/filectrlg.cpp:993 msgid "Show &hidden files" msgstr "&Hiện tệp tin ẩn" -#: ../src/common/stockitem.cpp:202 +#: ../src/common/stockitem.cpp:259 msgid "Show about dialog" msgstr "Hiển thị há»™p thoại thông tin thêm" -#: ../src/html/helpwnd.cpp:488 +#: ../src/html/helpwnd.cpp:500 msgid "Show all" msgstr "Hiện tất" -#: ../src/html/helpwnd.cpp:499 +#: ../src/html/helpwnd.cpp:511 msgid "Show all items in index" msgstr "Hiển thị tất cả các mục tin trong mục lục" @@ -5180,35 +5570,34 @@ msgstr "Hiển thị tất cả các mục tin trong mục lục" msgid "Show hidden directories" msgstr "Hiện thÆ° mục ẩn" -#: ../src/html/htmlhelp.cpp:538 -#: ../src/html/helpwnd.cpp:656 +#: ../src/html/helpwnd.cpp:669 msgid "Show/hide navigation panel" msgstr "Hiện/ẩn bản Ä‘iá»u hÆ°á»›ng" -#: ../src/richtext/richtextsymboldlg.cpp:414 -#: ../src/richtext/richtextsymboldlg.cpp:416 +#: ../src/richtext/richtextsymboldlg.cpp:415 +#: ../src/richtext/richtextsymboldlg.cpp:417 msgid "Shows a Unicode subset." msgstr "Hiển thị tập con của bá»™ mã Unicode." #: ../src/richtext/richtextliststylepage.cpp:474 #: ../src/richtext/richtextliststylepage.cpp:476 -#: ../src/richtext/richtextbulletspage.cpp:274 -#: ../src/richtext/richtextbulletspage.cpp:276 +#: ../src/richtext/richtextbulletspage.cpp:273 +#: ../src/richtext/richtextbulletspage.cpp:275 msgid "Shows a preview of the bullet settings." msgstr "Xem thá»­ các cài đặt vá» bullet." -#: ../src/richtext/richtextfontpage.cpp:256 -#: ../src/richtext/richtextfontpage.cpp:258 +#: ../src/richtext/richtextfontpage.cpp:273 +#: ../src/richtext/richtextfontpage.cpp:275 msgid "Shows a preview of the font settings." msgstr "Xem thá»­ các cài đặt vá» phông chữ." -#: ../src/mac/carbon/fontdlg.cpp:556 -#: ../src/mac/carbon/fontdlg.cpp:558 +#: ../src/osx/carbon/fontdlg.cpp:568 +#: ../src/osx/carbon/fontdlg.cpp:570 msgid "Shows a preview of the font." msgstr "Xem thá»­ phông chữ." -#: ../src/richtext/richtextindentspage.cpp:327 -#: ../src/richtext/richtextindentspage.cpp:329 +#: ../src/richtext/richtextindentspage.cpp:335 +#: ../src/richtext/richtextindentspage.cpp:337 msgid "Shows a preview of the paragraph settings." msgstr "Xem thá»­ cài đặt vá» Ä‘oạn văn." @@ -5217,29 +5606,29 @@ msgstr "Xem thá»­ cài đặt vá» Ä‘oạn văn." msgid "Shows the font preview." msgstr "Hiện bá»™ xem thá»­ phông chữ." -#: ../src/univ/themes/mono.cpp:509 +#: ../src/univ/themes/mono.cpp:517 msgid "Simple monochrome theme" msgstr "Theme màu Ä‘Æ¡n sắc Ä‘Æ¡n giản" +#: ../src/richtext/richtextindentspage.cpp:314 +#: ../src/richtext/richtextindentspage.cpp:325 +#: ../src/richtext/richtextindentspage.cpp:326 #: ../src/richtext/richtextliststylepage.cpp:459 #: ../src/richtext/richtextliststylepage.cpp:462 #: ../src/richtext/richtextliststylepage.cpp:463 -#: ../src/richtext/richtextindentspage.cpp:314 -#: ../src/richtext/richtextindentspage.cpp:317 -#: ../src/richtext/richtextindentspage.cpp:318 msgid "Single" msgstr "ÄÆ¡n" -#: ../src/generic/filectrlg.cpp:459 +#: ../src/generic/filectrlg.cpp:454 msgid "Size" msgstr "Kích thÆ°á»›c" -#: ../src/mac/carbon/fontdlg.cpp:501 +#: ../src/osx/carbon/fontdlg.cpp:513 msgid "Size:" msgstr "Kích thÆ°á»›c:" -#: ../src/generic/progdlgg.cpp:226 -#: ../src/generic/progdlgg.cpp:611 +#: ../src/generic/progdlgg.cpp:221 +#: ../src/generic/progdlgg.cpp:686 msgid "Skip" msgstr "Bá» qua" @@ -5247,36 +5636,23 @@ msgstr "Bá» qua" msgid "Slant" msgstr "Nghiêng" -#: ../src/common/docview.cpp:597 -msgid "Sorry, could not open this file for saving." -msgstr "Rất tiếc, không thể mở tệp tin này để ghi." - -#: ../src/common/docview.cpp:633 -#: ../src/common/docview.cpp:1643 +#: ../src/common/docview.cpp:1649 msgid "Sorry, could not open this file." msgstr "Xin lá»—i, không thể mở tập tin này." -#: ../src/common/docview.cpp:604 -msgid "Sorry, could not save this file." -msgstr "Rất tiếc, không thể ghi lại tệp tin này." - -#: ../src/common/prntbase.cpp:1521 +#: ../src/common/prntbase.cpp:1600 +#: ../src/common/prntbase.cpp:1608 msgid "Sorry, not enough memory to create a preview." msgstr "Rất tiếc, không đủ bá»™ nhá»› để tạo lập việc xem thá»­." -#: ../src/common/docview.cpp:1057 -msgid "Sorry, print preview needs a printer to be installed." -msgstr "Rất tiếc, việc mô phá»ng bản in cần má»™t máy in đã được cài đặt." - #: ../src/richtext/richtextstyledlg.cpp:573 #: ../src/richtext/richtextstyledlg.cpp:621 -#: ../src/richtext/richtextstyledlg.cpp:775 -#: ../src/richtext/richtextstyledlg.cpp:851 +#: ../src/richtext/richtextstyledlg.cpp:776 +#: ../src/richtext/richtextstyledlg.cpp:852 msgid "Sorry, that name is taken. Please choose another." msgstr "Rất tiếc, tên đó đã được dùng. Xin hãy chá»n má»™t cái khác." -#: ../src/common/docview.cpp:1297 -#: ../src/common/docview.cpp:1663 +#: ../src/common/docview.cpp:1672 msgid "Sorry, the format for this file is unknown." msgstr "Rất tiếc, định dạng tệp tin này không hiểu." @@ -5294,7 +5670,7 @@ msgid "Spacing" msgstr "Khoảng cách" #: ../src/richtext/richtextliststylepage.cpp:492 -#: ../src/richtext/richtextbulletspage.cpp:290 +#: ../src/richtext/richtextbulletspage.cpp:292 msgid "Standard" msgstr "Tiêu chuẩn" @@ -5306,10 +5682,6 @@ msgstr "Statement, 5 1/2 x 8 1/2 in" msgid "Status:" msgstr "Tình trạng:" -#: ../src/generic/logg.cpp:652 -msgid "Status: " -msgstr "Tình trạng:" - #: ../src/common/xtistrm.cpp:249 msgid "Streaming delegates for not already streamed objects not yet supported" msgstr "Äại diện Streaming cho đối tượng streamed vẫn chÆ°a được há»— trợ" @@ -5320,6 +5692,7 @@ msgid "String To Colour : Incorrect colour specification : %s" msgstr "Màu từ Xâu chữ : Äặc tả màu không chính xác : %s" #: ../src/richtext/richtextformatdlg.cpp:269 +#: ../src/propgrid/advprops.cpp:647 msgid "Style" msgstr "Kiểu dáng" @@ -5327,20 +5700,15 @@ msgstr "Kiểu dáng" msgid "Style Organiser" msgstr "Kiểu dáng Bá»™ Tổ Chức" -#: ../src/mac/carbon/fontdlg.cpp:510 +#: ../src/osx/carbon/fontdlg.cpp:522 msgid "Style:" msgstr "Kiểu dáng" -#: ../src/xrc/xmlres.cpp:813 -#, c-format -msgid "Subclass '%s' not found for resource '%s', not subclassing!" -msgstr "Lá»›p con '%s' không được tìm thấy cho tài nguyên '%s', không có lá»›p con!" - -#: ../src/richtext/richtextfontpage.cpp:246 +#: ../src/richtext/richtextfontpage.cpp:263 msgid "Subscrip&t" msgstr "Chỉ số dÆ°á»›i &dòng" -#: ../src/richtext/richtextfontpage.cpp:239 +#: ../src/richtext/richtextfontpage.cpp:256 msgid "Supe&rscript" msgstr "Chỉ số t&rên dòng" @@ -5357,53 +5725,45 @@ msgid "Swiss" msgstr "Swiss" #: ../src/richtext/richtextliststylepage.cpp:490 -#: ../src/richtext/richtextbulletspage.cpp:288 +#: ../src/richtext/richtextbulletspage.cpp:290 msgid "Symbol" msgstr "Ký hiệu đặc biệt" #: ../src/richtext/richtextliststylepage.cpp:287 -#: ../src/richtext/richtextbulletspage.cpp:238 +#: ../src/richtext/richtextbulletspage.cpp:237 msgid "Symbol &font:" msgstr "&Phông chữ ký tá»± đặc biệt:" -#: ../include/wx/richtext/richtextsymboldlg.h:46 -msgid "Symbols" -msgstr "Ký tá»± đặc biệt" - #: ../src/common/accelcmn.cpp:62 msgid "TAB" msgstr "TAB" -#: ../src/common/imagtiff.cpp:93 -msgid "TIFF library error." -msgstr "ThÆ° viện TIFF bị lá»—i." - -#: ../src/common/imagtiff.cpp:77 -msgid "TIFF library warning." -msgstr "Cảnh giác vá»›i thÆ° viện TIFF." - -#: ../src/common/imagtiff.cpp:309 -#: ../src/common/imagtiff.cpp:320 -#: ../src/common/imagtiff.cpp:519 +#: ../src/common/imagtiff.cpp:327 +#: ../src/common/imagtiff.cpp:340 +#: ../src/common/imagtiff.cpp:548 msgid "TIFF: Couldn't allocate memory." msgstr "TIFF: Không thể cấp phát bá»™ nhá»›." -#: ../src/common/imagtiff.cpp:272 +#: ../src/common/imagtiff.cpp:274 msgid "TIFF: Error loading image." msgstr "TIFF: Lá»—i tải ảnh." -#: ../src/common/imagtiff.cpp:334 +#: ../src/common/imagtiff.cpp:356 msgid "TIFF: Error reading image." msgstr "TIFF: Lá»—i trong khi Ä‘á»c tập tin ảnh." -#: ../src/common/imagtiff.cpp:439 +#: ../src/common/imagtiff.cpp:466 msgid "TIFF: Error saving image." msgstr "TIFF: Gặp lá»—i khi ghi tập tin ảnh." -#: ../src/common/imagtiff.cpp:565 +#: ../src/common/imagtiff.cpp:596 msgid "TIFF: Error writing image." msgstr "TIFF: Gặp lá»—i khi ghi tập tin ảnh." +#: ../src/common/imagtiff.cpp:313 +msgid "TIFF: Image size is abnormally big." +msgstr "TIFF: Kích cỡ ảnh thÆ°á»ng lá»›n." + #: ../src/common/paper.cpp:147 msgid "Tabloid Extra 11.69 x 18 in" msgstr "Tabloid Extra 11.69 x 18 in" @@ -5420,30 +5780,30 @@ msgstr "Tabs" msgid "Teletype" msgstr "Dạng Teletype" -#: ../src/common/docview.cpp:1745 +#: ../src/common/docview.cpp:1754 msgid "Templates" msgstr "Biểu mẫu" -#: ../src/mac/carbon/dataview.cpp:531 +#: ../src/osx/carbon/dataview.cpp:2330 msgid "Text renderer cannot render value; value type: " -msgstr "Text renderer không trả vá» giá trị; giá trị kiểu:" +msgstr "Text renderer không trả vá» giá trị; giá trị kiểu: " -#: ../src/common/fmapbase.cpp:118 +#: ../src/common/fmapbase.cpp:159 msgid "Thai (ISO-8859-11)" msgstr "Thai (ISO-8859-11)" -#: ../src/common/ftp.cpp:706 +#: ../src/common/ftp.cpp:620 msgid "The FTP server doesn't support passive mode." msgstr "Máy chủ FTP không há»— trợ chế Ä‘á»™ tích cá»±c." -#: ../src/common/ftp.cpp:694 +#: ../src/common/ftp.cpp:606 msgid "The FTP server doesn't support the PORT command." msgstr "Máy chủ FTP không há»— trợ lệnh PORT." #: ../src/richtext/richtextliststylepage.cpp:214 #: ../src/richtext/richtextliststylepage.cpp:216 -#: ../src/richtext/richtextbulletspage.cpp:162 -#: ../src/richtext/richtextbulletspage.cpp:164 +#: ../src/richtext/richtextbulletspage.cpp:161 +#: ../src/richtext/richtextbulletspage.cpp:163 msgid "The available bullet styles." msgstr "Các kiểu dáng bullet sẵn có." @@ -5456,15 +5816,15 @@ msgstr "Các kiểu dáng sẵn có." #: ../src/richtext/richtextliststylepage.cpp:255 #: ../src/richtext/richtextliststylepage.cpp:274 #: ../src/richtext/richtextliststylepage.cpp:276 -#: ../src/richtext/richtextbulletspage.cpp:202 -#: ../src/richtext/richtextbulletspage.cpp:204 -#: ../src/richtext/richtextbulletspage.cpp:225 -#: ../src/richtext/richtextbulletspage.cpp:227 +#: ../src/richtext/richtextbulletspage.cpp:201 +#: ../src/richtext/richtextbulletspage.cpp:203 +#: ../src/richtext/richtextbulletspage.cpp:224 +#: ../src/richtext/richtextbulletspage.cpp:226 msgid "The bullet character." msgstr "Ký tá»± dùng vá»›i bullet." -#: ../src/richtext/richtextsymboldlg.cpp:436 -#: ../src/richtext/richtextsymboldlg.cpp:438 +#: ../src/richtext/richtextsymboldlg.cpp:437 +#: ../src/richtext/richtextsymboldlg.cpp:439 msgid "The character code." msgstr "Mã ký tá»±." @@ -5484,6 +5844,14 @@ msgstr "" msgid "The clipboard format '%d' doesn't exist." msgstr "Äịnh dạng clipboard '%d' chÆ°a tồn tại." +#: ../src/common/dobjcmn.cpp:125 +msgid "The data format for the GET-direction of the to be added data object already exists" +msgstr "Äịnh dạng dữ liệu cho bá»™ Ä‘iá»u hÆ°á»›ng GET của đối tượng dữ liệu được thêm vào đã có rồi" + +#: ../src/common/dobjcmn.cpp:133 +msgid "The data format for the SET-direction of the to be added data object already exists" +msgstr "Äịnh dạng dữ liệu cho bá»™ Ä‘iá»u hÆ°á»›ng SET của đối tượng dữ liệu được thêm vào đã có rồi" + #: ../src/richtext/richtextstylepage.cpp:127 #: ../src/richtext/richtextstylepage.cpp:129 msgid "The default style for the next paragraph." @@ -5498,32 +5866,35 @@ msgstr "" "ThÆ° mục '%s' chÆ°a tồn tại\n" "Có tạo bây giá» không?" -#: ../src/common/docview.cpp:2012 +#: ../src/html/htmprint.cpp:272 #, c-format msgid "" -"The file '%s' couldn't be opened.\n" -"It has been removed from the most recently used files list." +"The document \"%s\" doesn't fit on the page horizontally and will be truncated if printed.\n" +"\n" +"Would you like to proceed with printing it nevertheless?" msgstr "" -"Tệp tin '%s' không thể mở.\n" -"Nó đã bị gỡ bá» từ ngÆ°á»i dùng gần đây nhất." +"Tài liệu \"%s\" không vừa khá»›p vá»›i khổ giấy theo chiá»u ngang và sẽ bị cắt cụt Ä‘i khi nếu được in.\n" +"\n" +"Bạn có thá»±c sá»± muốn in nó không?" -#: ../src/common/docview.cpp:2022 +#: ../src/common/docview.cpp:1929 #, c-format -msgid "" -"The file '%s' doesn't exist and couldn't be opened.\n" -"It has been removed from the most recently used files list." -msgstr "" -"Tệp tin '%s' chÆ°a tồn tại và không thể mở.\n" -"Nó đã bị gỡ bá» từ ngÆ°á»i dùng gần đây nhất." +msgid "The file '%s' couldn't be opened." +msgstr "Tệp tin '%s' không thể mở." + +#: ../src/common/docview.cpp:1933 +#, c-format +msgid "The file '%s' doesn't exist and couldn't be opened." +msgstr "Tệp tin '%s' chÆ°a tồn tại và không thể mở." -#: ../src/richtext/richtextliststylepage.cpp:397 -#: ../src/richtext/richtextliststylepage.cpp:399 #: ../src/richtext/richtextindentspage.cpp:224 #: ../src/richtext/richtextindentspage.cpp:226 +#: ../src/richtext/richtextliststylepage.cpp:397 +#: ../src/richtext/richtextliststylepage.cpp:399 msgid "The first line indent." msgstr "Thụt lá» dòng đầu tiên." -#: ../src/gtk/utilsgtk.cpp:508 +#: ../src/gtk/utilsgtk.cpp:492 msgid "The following standard GTK+ options are also supported:\n" msgstr "Các tùy chá»n GTK+ tiêu chuẩn sau đây Ä‘á»u được há»— trợ:\n" @@ -5537,8 +5908,8 @@ msgstr "Màu phông chữ." msgid "The font family." msgstr "Há» phông chữ." -#: ../src/richtext/richtextsymboldlg.cpp:398 -#: ../src/richtext/richtextsymboldlg.cpp:400 +#: ../src/richtext/richtextsymboldlg.cpp:399 +#: ../src/richtext/richtextsymboldlg.cpp:401 msgid "The font from which to take the symbol." msgstr "Phông chữ từ đó đã lấy ký tá»± đặc biệt." @@ -5549,8 +5920,8 @@ msgstr "Phông chữ từ đó đã lấy ký tá»± đặc biệt." msgid "The font point size." msgstr "Cỡ phông chữ theo Ä‘Æ¡n vị point." -#: ../src/mac/carbon/fontdlg.cpp:505 -#: ../src/mac/carbon/fontdlg.cpp:507 +#: ../src/osx/carbon/fontdlg.cpp:517 +#: ../src/osx/carbon/fontdlg.cpp:519 msgid "The font size in points." msgstr "Cỡ phông chữ theo Ä‘Æ¡n vị point." @@ -5564,22 +5935,27 @@ msgstr "Kiểu phông chữ." msgid "The font weight." msgstr "Äá»™ đậm phông chữ." -#: ../src/richtext/richtextliststylepage.cpp:386 -#: ../src/richtext/richtextliststylepage.cpp:388 +#: ../src/common/docview.cpp:1335 +#, c-format +msgid "The format of file '%s' couldn't be determined." +msgstr "Äịnh dạng của tệp tin '%s' không phân tách đúng định dạng." + #: ../src/richtext/richtextindentspage.cpp:212 #: ../src/richtext/richtextindentspage.cpp:214 +#: ../src/richtext/richtextliststylepage.cpp:386 +#: ../src/richtext/richtextliststylepage.cpp:388 msgid "The left indent." msgstr "Thụt lá» trái." +#: ../src/richtext/richtextindentspage.cpp:327 +#: ../src/richtext/richtextindentspage.cpp:329 #: ../src/richtext/richtextliststylepage.cpp:464 #: ../src/richtext/richtextliststylepage.cpp:466 -#: ../src/richtext/richtextindentspage.cpp:319 -#: ../src/richtext/richtextindentspage.cpp:321 msgid "The line spacing." msgstr "Chỉnh khoảng cách dòng." -#: ../src/richtext/richtextbulletspage.cpp:266 -#: ../src/richtext/richtextbulletspage.cpp:268 +#: ../src/richtext/richtextbulletspage.cpp:265 +#: ../src/richtext/richtextbulletspage.cpp:267 msgid "The list item number." msgstr "Số mẩu tin của danh sách." @@ -5588,29 +5964,29 @@ msgstr "Số mẩu tin của danh sách." msgid "The outline level." msgstr "Mức Ä‘Æ°á»ng bao." -#: ../src/common/filename.cpp:1254 +#: ../src/common/filename.cpp:1441 #, c-format msgid "The path '%s' contains too many \"..\"!" msgstr "ÄÆ°á»ng dẫn '%s' chứa quá nhiá»u \"..\"!" -#: ../src/common/log.cpp:501 +#: ../src/common/log.cpp:219 #, c-format msgid "The previous message repeated once." msgid_plural "The previous message repeated %lu times." msgstr[0] "Thông Ä‘iệp liá»n trÆ°á»›c lặp má»™t lần." msgstr[1] "Thông Ä‘iệp liá»n trÆ°á»›c lặp %lu lần." -#: ../src/gtk/print.cpp:891 -#: ../src/gtk/print.cpp:1079 +#: ../src/gtk/print.cpp:863 +#: ../src/gtk/print.cpp:1048 msgid "The print dialog returned an error." msgstr "Há»™p thoại in trả vá» má»™t lá»—i." -#: ../src/richtext/richtextsymboldlg.cpp:455 -#: ../src/richtext/richtextsymboldlg.cpp:457 +#: ../src/richtext/richtextsymboldlg.cpp:456 +#: ../src/richtext/richtextsymboldlg.cpp:458 msgid "The range to show." msgstr "Chá»n vùng cần hiện." -#: ../src/generic/dbgrptg.cpp:318 +#: ../src/generic/dbgrptg.cpp:319 msgid "" "The report contains the files listed below. If any of these files contain private information,\n" "please uncheck them and they will be removed from the report.\n" @@ -5618,28 +5994,28 @@ msgstr "" "Bản báo cáo này chứa danh sách tệp tin bên dÆ°á»›i. Nếu bất kỳ tệp tin nào chứa thông tin cá nhân,\n" "xin hãy bá» dấu kiểm và chúng sẽ được gỡ bá» khá»i báo cáo.\n" -#: ../src/common/cmdline.cpp:955 +#: ../src/common/cmdline.cpp:1013 #, c-format msgid "The required parameter '%s' was not specified." msgstr "Tham số yêu cầu '%s' đã không được định rõ." -#: ../src/richtext/richtextliststylepage.cpp:408 -#: ../src/richtext/richtextliststylepage.cpp:410 #: ../src/richtext/richtextindentspage.cpp:236 #: ../src/richtext/richtextindentspage.cpp:238 +#: ../src/richtext/richtextliststylepage.cpp:408 +#: ../src/richtext/richtextliststylepage.cpp:410 msgid "The right indent." msgstr "Thụt lá» phải." +#: ../src/richtext/richtextindentspage.cpp:304 #: ../src/richtext/richtextliststylepage.cpp:448 #: ../src/richtext/richtextliststylepage.cpp:450 -#: ../src/richtext/richtextindentspage.cpp:304 msgid "The spacing after the paragraph." msgstr "Khoảng trắng sau má»™t Ä‘oạn văn." -#: ../src/richtext/richtextliststylepage.cpp:437 -#: ../src/richtext/richtextliststylepage.cpp:439 #: ../src/richtext/richtextindentspage.cpp:291 #: ../src/richtext/richtextindentspage.cpp:293 +#: ../src/richtext/richtextliststylepage.cpp:437 +#: ../src/richtext/richtextliststylepage.cpp:439 msgid "The spacing before the paragraph." msgstr "Khoảng trắng trÆ°á»›c má»™t Ä‘oạn văn." @@ -5667,88 +6043,94 @@ msgstr "Vị trí tab." msgid "The tab positions." msgstr "Vị trí tab." -#: ../src/common/textcmn.cpp:760 -#: ../src/richtext/richtextctrl.cpp:1918 +#: ../src/richtext/richtextctrl.cpp:2154 msgid "The text couldn't be saved." msgstr "Dữ liệu dạng chữ không thể được ghi lại." -#: ../src/common/cmdline.cpp:933 +#: ../src/common/cmdline.cpp:991 #, c-format msgid "The value for the option '%s' must be specified." msgstr "Giá trị cho tùy chá»n '%s' phải được định rõ." -#: ../src/msw/dialup.cpp:455 +#: ../src/msw/dialup.cpp:456 #, c-format msgid "The version of remote access service (RAS) installed on this machine is too old, please upgrade (the following required function is missing: %s)." msgstr "Phiên bản của chÆ°Æ¡ng trình truy cập dữ liệu từ xa (RAS) được cài đặt trong máy này đã quá cÅ©, xin hãy cập nhật (hàm yêu cầu sau đây bị thiếu: %s)." -#: ../src/gtk/print.cpp:921 +#: ../src/gtk/print.cpp:893 msgid "The wxGtkPrinterDC cannot be used." msgstr "Hàm wxGtkPrinterDC không thể sá»­ dụng." -#: ../src/mac/carbon/databrow.cpp:682 +#: ../src/osx/carbon/dataview.cpp:1301 msgid "There is no column or renderer for the specified column index." msgstr "Không có cá»™t hay bá»™ xá»­ lý nào cho chỉ số cá»™t đã định sẵn." #: ../src/richtext/richtextprint.cpp:575 -#: ../src/html/htmprint.cpp:610 +#: ../src/html/htmprint.cpp:743 msgid "There was a problem during page setup: you may need to set a default printer." msgstr "Có trục trặc xảy ra khi cài đặt kiểu giấy: có lẽ bạn cần phải đặt má»™t máy in mặc định." +#: ../src/html/htmprint.cpp:256 +msgid "This document doesn't fit on the page horizontally and will be truncated when it is printed." +msgstr "Tài liệu này không vừa khá»›p theo chiá»u ngang của giấy và sẽ bị cắt cụt Ä‘i khi được in." + #: ../src/msw/datecontrols.cpp:60 msgid "This system doesn't support date controls, please upgrade your version of comctl32.dll" msgstr "Hệ thống không há»— trợ Ä‘iá»u khiển ngày tháng, xin hãy cập nhật phiên bản má»›i của comctl32.dll" -#: ../src/msw/thread.cpp:1247 +#: ../src/msw/thread.cpp:1264 msgid "Thread module initialization failed: cannot store value in thread local storage" msgstr "Khởi tạo mô Ä‘un tuyến trình gặp lá»—i: không thể lÆ°u giá trị trong phần lÆ°u trữ ná»™i bá»™ tuyến trình" -#: ../src/unix/threadpsx.cpp:1686 +#: ../src/unix/threadpsx.cpp:1694 msgid "Thread module initialization failed: failed to create thread key" msgstr "Khởi tạo mô Ä‘un tuyến trình gặp lá»—i: lá»—i tạo khóa tuyến trình" -#: ../src/msw/thread.cpp:1235 +#: ../src/msw/thread.cpp:1252 msgid "Thread module initialization failed: impossible to allocate index in thread local storage" msgstr "Khởi tạo mô Ä‘un tuyến trình gặp lá»—i: không thể cấp phát chỉ số trong phần lÆ°u trữ ná»™i bá»™ tuyến trình" -#: ../src/unix/threadpsx.cpp:1200 +#: ../src/unix/threadpsx.cpp:1205 msgid "Thread priority setting is ignored." msgstr "Cài đặt quyá»n Æ°u tiên tuyến trình bị bá» qua." -#: ../src/msw/mdi.cpp:168 +#: ../src/msw/mdi.cpp:165 msgid "Tile &Horizontally" msgstr "Xếp Ká» Nhau Theo C&hiá»u Ngang" -#: ../src/msw/mdi.cpp:169 +#: ../src/msw/mdi.cpp:166 msgid "Tile &Vertically" msgstr "Xếp &Ká» Nhau Theo Chiá»u Äứng" -#: ../src/common/ftp.cpp:633 +#: ../src/common/ftp.cpp:201 msgid "Timeout while waiting for FTP server to connect, try passive mode." msgstr "Lá»—i quá thá»i gian khi chá» kết nối vá»›i máy chủ FTP, hãy thá»­ chế Ä‘á»™ thụ Ä‘á»™ng." #: ../src/os2/timer.cpp:100 -#: ../src/msw/timer.cpp:93 msgid "Timer creation failed." msgstr "Tạo lập bá»™ định thá»i Timer gặp lá»—i." -#: ../src/generic/tipdlg.cpp:218 +#: ../src/generic/tipdlg.cpp:221 msgid "Tip of the Day" msgstr "Mẹo Nhá»" -#: ../src/generic/tipdlg.cpp:153 +#: ../src/generic/tipdlg.cpp:155 msgid "Tips not available, sorry!" msgstr "Các mẹo nhá» vẫn chÆ°a có, thành thật xin lá»—i!" -#: ../src/generic/prntdlgg.cpp:249 +#: ../src/osx/dataview_osx.cpp:168 +msgid "To be deleted item is invalid." +msgstr "Xóa mục tin là không hợp lệ." + +#: ../src/generic/prntdlgg.cpp:248 msgid "To:" msgstr "Äến:" -#: ../src/mac/carbon/dataview.cpp:648 +#: ../src/osx/carbon/dataview.cpp:2408 msgid "Toggle renderer cannot render value; value type: " -msgstr "Toggle renderer không trả vá» giá trị; giá trị kiểu:" +msgstr "Toggle renderer không trả vá» giá trị; giá trị kiểu: " -#: ../src/richtext/richtextbuffer.cpp:5473 +#: ../src/richtext/richtextbuffer.cpp:5666 msgid "Too many EndStyle calls!" msgstr "Quá nhiá»u cú gá»i EndStyle!" @@ -5756,43 +6138,42 @@ msgstr "Quá nhiá»u cú gá»i EndStyle!" msgid "Too many colours in PNG, the image may be slightly blurred." msgstr "Quá nhiá»u màu trong PNG, ảnh có thể hÆ¡i nhòe." -#: ../src/generic/prntdlgg.cpp:886 +#: ../src/generic/prntdlgg.cpp:887 msgid "Top margin (mm):" msgstr "Äể lá» trên (mm):" #: ../src/generic/aboutdlgg.cpp:80 msgid "Translations by " -msgstr "Dịch bởi" +msgstr "Dịch bởi " -#: ../src/generic/aboutdlgg.cpp:154 +#: ../src/generic/aboutdlgg.cpp:189 msgid "Translators" msgstr "NgÆ°á»i dịch" -#: ../src/common/fs_mem.cpp:220 +#: ../src/propgrid/propgrid.cpp:173 +msgid "True" +msgstr "Äúng" + +#: ../src/common/fs_mem.cpp:232 #, c-format msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!" msgstr "Cố gắng gỡ bá» tệp tin '%s' từ bá»™ nhá»› VFS, nhÆ°ng nó chÆ°a được tải lên!" -#: ../src/common/sckaddr.cpp:144 -#: ../src/common/sckaddr.cpp:252 -msgid "Trying to solve a NULL hostname: giving up" -msgstr "Äang cố gắng giải quyết má»™t tên máy chủ Rá»–NG: Ä‘Æ°a lên" - -#: ../src/common/fmapbase.cpp:116 +#: ../src/common/fmapbase.cpp:157 msgid "Turkish (ISO-8859-9)" msgstr "Thổ NhÄ© Kỳ (ISO-8859-9)" -#: ../src/generic/filectrlg.cpp:460 +#: ../src/generic/filectrlg.cpp:455 msgid "Type" msgstr "Kiểu" -#: ../src/richtext/richtextfontpage.cpp:138 -#: ../src/richtext/richtextfontpage.cpp:140 +#: ../src/richtext/richtextfontpage.cpp:141 +#: ../src/richtext/richtextfontpage.cpp:143 msgid "Type a font name." msgstr "Gõ má»™t tên phông chữ." -#: ../src/richtext/richtextfontpage.cpp:156 -#: ../src/richtext/richtextfontpage.cpp:158 +#: ../src/richtext/richtextfontpage.cpp:159 +#: ../src/richtext/richtextfontpage.cpp:161 msgid "Type a size in points." msgstr "Kích thÆ°á»›c phông chữ theo points." @@ -5802,6 +6183,11 @@ msgstr "Kích thÆ°á»›c phông chữ theo points." msgid "Type must have enum - long conversion" msgstr "Kiểu phải ở dạng enum - long chuyển đổi" +#: ../src/propgrid/propgridiface.cpp:383 +#, c-format +msgid "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT \"%s\"." +msgstr "Toán tá»­ kiểu \"%s\" gặp lá»—i: Tên thuá»™c tính \"%s\" là kiểu \"%s\", KHÔNG PHẢI \"%s\"." + #: ../src/common/accelcmn.cpp:57 msgid "UP" msgstr "UP" @@ -5810,19 +6196,82 @@ msgstr "UP" msgid "US Std Fanfold, 14 7/8 x 11 in" msgstr "US Std Fanfold, 14 7/8 x 11 in" -#: ../src/common/fmapbase.cpp:153 +#: ../src/common/fmapbase.cpp:194 msgid "US-ASCII" msgstr "US-ASCII" -#: ../src/gtk/app.cpp:494 +#: ../src/unix/fswatcher_inotify.cpp:111 +msgid "Unable to add inotify watch" +msgstr "Không thể đóng bá»™ theo dõi inotify" + +#: ../src/unix/fswatcher_kqueue.cpp:138 +msgid "Unable to add kqueue watch" +msgstr "Không thể tạo bá»™ theo dõi kqueue" + +#: ../include/wx/msw/private/fswatcher.h:144 +msgid "Unable to associate handle with I/O completion port" +msgstr "Không thể kết giao" + +#: ../include/wx/msw/private/fswatcher.h:127 +msgid "Unable to close I/O completion port handle" +msgstr "Không thể đóng handle cổng Vào/Ra" + +#: ../src/unix/fswatcher_inotify.cpp:99 +msgid "Unable to close inotify instance" +msgstr "Không thể đóng inotify" + +#: ../include/wx/unix/private/fswatcher_kqueue.h:75 +#, c-format +msgid "Unable to close path '%s'" +msgstr "Không thể đóng Ä‘Æ°á»ng dẫn '%s'" + +#: ../include/wx/msw/private/fswatcher.h:49 +#, c-format +msgid "Unable to close the handle for '%s'" +msgstr "Không thể đóng thẻ quản handle cho '%s'" + +#: ../include/wx/msw/private/fswatcher.h:200 +msgid "Unable to create I/O completion port" +msgstr "Không thể tạo handle cổng Vào/Ra" + +#: ../src/msw/fswatcher.cpp:85 +msgid "Unable to create IOCP worker thread" +msgstr "Không thể tạo tuyến làm việc IOCP được" + +#: ../src/unix/fswatcher_inotify.cpp:75 +msgid "Unable to create inotify instance" +msgstr "Không thể tạo inotify được" + +#: ../src/unix/fswatcher_kqueue.cpp:98 +msgid "Unable to create kqueue instance" +msgstr "Không thể tạo kqueue được" + +#: ../include/wx/msw/private/fswatcher.h:189 +msgid "Unable to dequeue completion packet" +msgstr "Không thể tạo rút ra từ hàng đợi" + +#: ../src/unix/fswatcher_kqueue.cpp:188 +msgid "Unable to get events from kqueue" +msgstr "Không thể lấy các sá»± kiện từ kqueue" + +#: ../src/osx/carbon/dataview.cpp:1861 +msgid "Unable to handle native drag&drop data" +msgstr "Không thể kéo&thả dữ liệu được" + +#: ../src/gtk/app.cpp:421 msgid "Unable to initialize GTK+, is DISPLAY set properly?" msgstr "Không thể khởi tạo GTK+, BỘ HIỂN THỊ đã cài đặt các thuá»™c tính hay chÆ°a?" -#: ../src/gtk/app.cpp:330 +#: ../src/gtk/app.cpp:272 msgid "Unable to initialize Hildon program" msgstr "Không thể khởi tạo chÆ°Æ¡ng trình Hildon" -#: ../src/html/htmlwin.cpp:534 +#: ../include/wx/unix/private/fswatcher_kqueue.h:58 +#, c-format +msgid "Unable to open path '%s'" +msgstr "Không thể mở Ä‘Æ°á»ng dẫn '%s'" + +#: ../src/html/htmlwin.cpp:558 #, c-format msgid "Unable to open requested HTML document: %s" msgstr "Không thể mở tài liệu HTML đã yêu cầu: %s" @@ -5831,74 +6280,110 @@ msgstr "Không thể mở tài liệu HTML đã yêu cầu: %s" msgid "Unable to play sound asynchronously." msgstr "Không thể chạy Ä‘oạn âm thanh dị bá»™." -#: ../src/common/stockitem.cpp:155 +#: ../include/wx/msw/private/fswatcher.h:167 +msgid "Unable to post completion status" +msgstr "Không thể gá»­i hoàn thiện trạng thái" + +#: ../src/unix/fswatcher_inotify.cpp:331 +msgid "Unable to read from inotify descriptor" +msgstr "Không Ä‘á»c được phần mô tả của inotify" + +#: ../src/unix/fswatcher_inotify.cpp:134 +msgid "Unable to remove inotify watch" +msgstr "Không thể gỡ bá» bá»™ theo dõi inotify" + +#: ../src/unix/fswatcher_kqueue.cpp:156 +msgid "Unable to remove kqueue watch" +msgstr "Không thể gỡ bá» bá»™ theo dõi kqueue" + +#: ../src/msw/fswatcher.cpp:146 +#, c-format +msgid "Unable to set up watch for '%s'" +msgstr "Không thể cài đặt cá»­a sổ theo dõi cho '%s'" + +#: ../src/msw/fswatcher.cpp:92 +msgid "Unable to start IOCP worker thread" +msgstr "Không thể khởi tạo tuyến trình làm việc IOCP" + +#: ../src/common/stockitem.cpp:190 msgid "Undelete" msgstr "Không thể xóa" -#: ../src/richtext/richtextfontpage.cpp:272 -#: ../src/richtext/richtextfontpage.cpp:344 -#: ../src/richtext/richtextfontpage.cpp:588 -#: ../src/mac/carbon/fontdlg.cpp:532 +#: ../src/richtext/richtextfontpage.cpp:289 +#: ../src/richtext/richtextfontpage.cpp:361 +#: ../src/richtext/richtextfontpage.cpp:622 +#: ../src/osx/carbon/fontdlg.cpp:544 +#: ../src/propgrid/advprops.cpp:655 msgid "Underlined" msgstr "Gạch dÆ°á»›i" -#: ../src/stc/scintilla/src/ScintillaBase.cxx:422 +#: ../src/stc/scintilla/src/ScintillaBase.cxx:452 msgid "Undo" msgstr "Undo" -#: ../src/common/stockitem.cpp:210 +#: ../src/common/stockitem.cpp:267 msgid "Undo last action" msgstr "Undo thao tác cuối cùng" -#: ../src/common/cmdline.cpp:738 +#: ../src/common/cmdline.cpp:796 #, c-format msgid "Unexpected characters following option '%s'." msgstr "Không mong đợi ký tá»± Ä‘i sau tùy chá»n '%s'." -#: ../src/common/cmdline.cpp:896 +#: ../src/common/cmdline.cpp:954 #, c-format msgid "Unexpected parameter '%s'" msgstr "Tham số không mong đợi '%s'" -#: ../src/richtext/richtextsymboldlg.cpp:452 +#: ../include/wx/msw/private/fswatcher.h:150 +msgid "Unexpectedly new I/O completion port was created" +msgstr "Má»™t cổng I/O bất ngỠđã được tạo ra" + +#: ../src/msw/fswatcher.cpp:71 +msgid "Ungraceful worker thread termination" +msgstr "Sá»± kết thúc má»™t tuyến trình công việc không đúng đắn" + +#: ../src/richtext/richtextsymboldlg.cpp:453 +#: ../src/richtext/richtextsymboldlg.cpp:454 +#: ../src/richtext/richtextsymboldlg.cpp:455 msgid "Unicode" msgstr "Unicode" -#: ../src/common/fmapbase.cpp:142 -#: ../src/common/fmapbase.cpp:148 +#: ../src/common/fmapbase.cpp:183 +#: ../src/common/fmapbase.cpp:189 msgid "Unicode 16 bit (UTF-16)" msgstr "Unicode 16 bit (UTF-16)" -#: ../src/common/fmapbase.cpp:147 +#: ../src/common/fmapbase.cpp:188 msgid "Unicode 16 bit Big Endian (UTF-16BE)" msgstr "Unicode 16 bit Big Endian (UTF-16BE)" -#: ../src/common/fmapbase.cpp:143 +#: ../src/common/fmapbase.cpp:184 msgid "Unicode 16 bit Little Endian (UTF-16LE)" msgstr "Unicode 16 bit Little Endian (UTF-16LE)" -#: ../src/common/fmapbase.cpp:144 -#: ../src/common/fmapbase.cpp:150 +#: ../src/common/fmapbase.cpp:185 +#: ../src/common/fmapbase.cpp:191 msgid "Unicode 32 bit (UTF-32)" msgstr "Unicode 32 bit (UTF-32)" -#: ../src/common/fmapbase.cpp:149 +#: ../src/common/fmapbase.cpp:190 msgid "Unicode 32 bit Big Endian (UTF-32BE)" msgstr "Unicode 32 bit Big Endian (UTF-32BE)" -#: ../src/common/fmapbase.cpp:145 +#: ../src/common/fmapbase.cpp:186 msgid "Unicode 32 bit Little Endian (UTF-32LE)" msgstr "Unicode 32 bit Little Endian (UTF-32LE)" -#: ../src/common/fmapbase.cpp:139 +#: ../src/common/fmapbase.cpp:180 msgid "Unicode 7 bit (UTF-7)" msgstr "Unicode 7 bit (UTF-7)" -#: ../src/common/fmapbase.cpp:140 +#: ../src/common/fmapbase.cpp:181 msgid "Unicode 8 bit (UTF-8)" msgstr "Unicode 8 bit (UTF-8)" -#: ../src/generic/progdlgg.cpp:597 +#: ../src/generic/progdlgg.cpp:672 msgid "Unknown" msgstr "Không hiểu" @@ -5916,96 +6401,133 @@ msgstr "Äối Tượng không rõ được truyá»n tá»›i GetObjectClassInfo" msgid "Unknown Property %s" msgstr "Không Rõ Thuá»™c Tính %s" -#: ../src/common/imagtiff.cpp:379 +#: ../src/common/imagtiff.cpp:402 #, c-format msgid "Unknown TIFF resolution unit %d ignored" msgstr "Không hiểu Ä‘Æ¡n vị Ä‘á»™ phân giải TIFF %d bá» qua" +#: ../src/osx/carbon/dataview.cpp:1936 +msgid "Unknown data format" +msgstr "Äịnh dạng dữ liệu chÆ°a rõ" + #: ../src/unix/dlunix.cpp:335 msgid "Unknown dynamic library error" msgstr "Không rõ lá»—i thÆ° viện liên kết Ä‘á»™ng" -#: ../src/common/fmapbase.cpp:675 +#: ../src/common/fmapbase.cpp:802 #, c-format msgid "Unknown encoding (%d)" msgstr "Không rõ bá»™ giải mã (%d)" -#: ../src/common/cmdline.cpp:643 +#: ../src/common/cmdline.cpp:697 #, c-format msgid "Unknown long option '%s'" msgstr "Không rõ tùy chá»n dài '%s'" -#: ../src/common/cmdline.cpp:653 -#: ../src/common/cmdline.cpp:675 +#: ../src/common/cmdline.cpp:707 +#: ../src/common/cmdline.cpp:729 #, c-format msgid "Unknown option '%s'" msgstr "Không biết tùy chá»n %s" -#: ../src/xrc/xmlres.cpp:890 -msgid "Unknown style flag " -msgstr "Không rõ kiểu cá»" - #: ../src/common/mimecmn.cpp:225 #, c-format msgid "Unmatched '{' in an entry for mime type %s." msgstr "Không khá»›p '{' trong má»™t mục từ cho kiểu diá»…n tả %s." -#: ../src/common/cmdproc.cpp:257 -#: ../src/common/cmdproc.cpp:283 -#: ../src/common/cmdproc.cpp:303 +#: ../src/common/cmdproc.cpp:261 +#: ../src/common/cmdproc.cpp:287 +#: ../src/common/cmdproc.cpp:307 msgid "Unnamed command" msgstr "Câu lệnh vô danh" -#: ../src/msw/clipbrd.cpp:267 -#: ../src/msw/clipbrd.cpp:439 +#: ../src/propgrid/propgrid.cpp:391 +msgid "Unspecified" +msgstr "ChÆ°a định danh" + +#: ../src/msw/clipbrd.cpp:269 +#: ../src/msw/clipbrd.cpp:441 msgid "Unsupported clipboard format." msgstr "Dạng thức clipboard không được há»— trợ." -#: ../src/common/appcmn.cpp:237 +#: ../src/common/appcmn.cpp:230 #, c-format msgid "Unsupported theme '%s'." msgstr "Theme '%s' không được há»— trợ." #: ../src/generic/fdrepdlg.cpp:153 +#: ../src/propgrid/props.cpp:2167 msgid "Up" msgstr "Lên" +#: ../src/propgrid/props.cpp:2161 +msgid "Update" +msgstr "Cập nhật" + #: ../src/richtext/richtextliststylepage.cpp:485 -#: ../src/richtext/richtextbulletspage.cpp:283 +#: ../src/richtext/richtextbulletspage.cpp:285 msgid "Upper case letters" msgstr "Chuyển thành chữ hoa" #: ../src/richtext/richtextliststylepage.cpp:487 -#: ../src/richtext/richtextbulletspage.cpp:285 +#: ../src/richtext/richtextbulletspage.cpp:287 msgid "Upper case roman numerals" msgstr "Äổi thành chữ số La Mã in hoa" -#: ../src/common/cmdline.cpp:1027 +#: ../src/common/cmdline.cpp:1085 #, c-format msgid "Usage: %s" msgstr "Cách sá»­ dụng: %s" -#: ../src/richtext/richtextliststylepage.cpp:357 -#: ../src/richtext/richtextliststylepage.cpp:359 #: ../src/richtext/richtextindentspage.cpp:179 #: ../src/richtext/richtextindentspage.cpp:181 +#: ../src/richtext/richtextliststylepage.cpp:357 +#: ../src/richtext/richtextliststylepage.cpp:359 msgid "Use the current alignment setting." msgstr "Sá»­ dụng cài đặt vá» căn chỉnh hiện hành." -#: ../src/mac/carbon/dataview.cpp:860 -#: ../src/mac/carbon/dataview.cpp:890 +#: ../src/osx/carbon/dataview.cpp:2613 +#: ../src/osx/carbon/dataview.cpp:2678 msgid "Valid pointer to native data view control does not exist" msgstr "Con trá» hợp lệ cho Ä‘iá»u khiển hiển thị dữ liệu ná»™i tại chÆ°a tồn tại" -#: ../src/common/valtext.cpp:196 +#: ../src/common/valtext.cpp:165 msgid "Validation conflict" msgstr "Bá»™ xác định tính hợp lệ bị xung Ä‘á»™t" -#: ../src/msw/aboutdlg.cpp:54 -#: ../src/mac/carbon/aboutdlg.cpp:74 +#: ../src/propgrid/manager.cpp:239 +msgid "Value" +msgstr "Giá trị" + +#: ../src/propgrid/props.cpp:685 #, c-format -msgid "Version %s" -msgstr "Phiên bản %s" +msgid "Value must be %f or higher" +msgstr "Giá trị phải là %f hay lá»›n hÆ¡n" + +#: ../src/propgrid/props.cpp:702 +#, c-format +msgid "Value must be %f or less" +msgstr "Giá trị phải là %f hay nhá» hÆ¡n" + +#: ../src/propgrid/props.cpp:292 +#: ../src/propgrid/props.cpp:308 +#, c-format +msgid "Value must be %lld or higher" +msgstr "Giá trị phải là %lld hay lá»›n hÆ¡n" + +#: ../src/propgrid/props.cpp:493 +#, c-format +msgid "Value must be %llu or higher" +msgstr "Giá trị phải là %llu hay nhá» hÆ¡n" + +#: ../src/propgrid/props.cpp:505 +#, c-format +msgid "Value must be %llu or less" +msgstr "Giá trị phải là %llu hay nhá» hÆ¡n" + +#: ../src/generic/aboutdlgg.cpp:129 +msgid "Version " +msgstr "Phiên bản " #: ../src/generic/filedlgg.cpp:218 msgid "View files as a detailed view" @@ -6015,7 +6537,7 @@ msgstr "Hiển thị tệp tin dạng chi tiết" msgid "View files as a list view" msgstr "Hiển thị tệp tin bằng kiểu danh sách liệt kê" -#: ../src/common/docview.cpp:1822 +#: ../src/common/docview.cpp:1828 msgid "Views" msgstr "Trình bày" @@ -6031,25 +6553,28 @@ msgstr "WINDOWS_MENU" msgid "WINDOWS_RIGHT" msgstr "WINDOWS_RIGHT" -#: ../src/unix/epolldispatcher.cpp:177 +#: ../src/unix/epolldispatcher.cpp:214 #, c-format msgid "Waiting for IO on epoll descriptor %d failed" msgstr "Äợi IO trên phần mô tả epoll %d gặp lá»—i" -#: ../src/common/docview.cpp:478 -#: ../src/html/htmprint.cpp:380 +#: ../src/html/htmprint.cpp:509 msgid "Warning" msgstr "Cảnh báo" -#: ../src/common/log.cpp:713 +#: ../src/common/log.cpp:408 msgid "Warning: " -msgstr "Cảnh báo : " +msgstr "Cảnh báo: " -#: ../src/common/fmapbase.cpp:108 +#: ../src/propgrid/advprops.cpp:651 +msgid "Weight" +msgstr "Äá»™ rá»™ng" + +#: ../src/common/fmapbase.cpp:149 msgid "Western European (ISO-8859-1)" msgstr "Western European (ISO-8859-1)" -#: ../src/common/fmapbase.cpp:122 +#: ../src/common/fmapbase.cpp:163 msgid "Western European with Euro (ISO-8859-15)" msgstr "Western European with Euro (ISO-8859-15)" @@ -6062,195 +6587,177 @@ msgstr "Không biết phông chữ có gạch chân hay không." msgid "Whole word" msgstr "Tất cả các từ" -#: ../src/html/helpwnd.cpp:533 +#: ../src/html/helpwnd.cpp:545 msgid "Whole words only" msgstr "Toàn bá»™ các từ" -#: ../src/univ/themes/win32.cpp:1059 +#: ../src/univ/themes/win32.cpp:1105 msgid "Win32 theme" msgstr "kiểu Win32" -#: ../src/msw/utils.cpp:1090 +#: ../src/msw/utils.cpp:1202 msgid "Win32s on Windows 3.1" msgstr "Win32s trên Windows 3.1" -#: ../src/msw/utils.cpp:1139 +#: ../src/msw/utils.cpp:1252 #, c-format msgid "Windows 2000 (build %lu" msgstr "Windows 2000 (build %lu" -#: ../src/msw/utils.cpp:1104 +#: ../src/msw/utils.cpp:1216 msgid "Windows 95" msgstr "Windows 95" -#: ../src/msw/utils.cpp:1100 +#: ../src/msw/utils.cpp:1212 msgid "Windows 95 OSR2" msgstr "Windows 95 OSR2" -#: ../src/msw/utils.cpp:1115 +#: ../src/msw/utils.cpp:1227 msgid "Windows 98" msgstr "Windows 98" -#: ../src/msw/utils.cpp:1111 +#: ../src/msw/utils.cpp:1223 msgid "Windows 98 SE" msgstr "Windows 98 SE" -#: ../src/msw/utils.cpp:1122 +#: ../src/msw/utils.cpp:1234 #, c-format msgid "Windows 9x (%d.%d)" msgstr "Windows 9x (%d.%d)" -#: ../src/common/fmapbase.cpp:136 +#: ../src/common/fmapbase.cpp:177 msgid "Windows Arabic (CP 1256)" msgstr "Windows Ả Rập (CP 1256)" -#: ../src/common/fmapbase.cpp:137 +#: ../src/common/fmapbase.cpp:178 msgid "Windows Baltic (CP 1257)" msgstr "Windows Baltic (CP 1257)" -#: ../src/msw/utils.cpp:1084 +#: ../src/msw/utils.cpp:1196 #, c-format msgid "Windows CE (%d.%d)" msgstr "Windows CE (%d.%d)" -#: ../src/common/fmapbase.cpp:130 +#: ../src/common/fmapbase.cpp:171 msgid "Windows Central European (CP 1250)" msgstr "Windows Central European (CP 1250)" -#: ../src/common/fmapbase.cpp:127 +#: ../src/common/fmapbase.cpp:168 msgid "Windows Chinese Simplified (CP 936)" msgstr "Windows Trung Quốc Hiện Äại (CP 936)" -#: ../src/common/fmapbase.cpp:129 +#: ../src/common/fmapbase.cpp:170 msgid "Windows Chinese Traditional (CP 950)" msgstr "Windows Trung Quốc Cổ Äiển (CP 950)" -#: ../src/common/fmapbase.cpp:131 +#: ../src/common/fmapbase.cpp:172 msgid "Windows Cyrillic (CP 1251)" msgstr "Windows Cyrillic (CP 1251)" -#: ../src/common/fmapbase.cpp:133 +#: ../src/common/fmapbase.cpp:174 msgid "Windows Greek (CP 1253)" msgstr "Windows Hi Lạp (CP 1253)" -#: ../src/common/fmapbase.cpp:135 +#: ../src/common/fmapbase.cpp:176 msgid "Windows Hebrew (CP 1255)" msgstr "Windows Hebrew (CP 1255)" -#: ../src/common/fmapbase.cpp:126 +#: ../src/common/fmapbase.cpp:167 msgid "Windows Japanese (CP 932)" msgstr "Windows Tiếng Nhật (CP 932)" -#: ../src/common/fmapbase.cpp:128 +#: ../src/common/fmapbase.cpp:169 msgid "Windows Korean (CP 949)" msgstr "Windows Tiếng Hàn (CP 949)" -#: ../src/msw/utils.cpp:1119 +#: ../src/msw/utils.cpp:1231 msgid "Windows ME" msgstr "Windows ME" -#: ../src/msw/utils.cpp:1154 +#: ../src/msw/utils.cpp:1286 #, c-format msgid "Windows NT %lu.%lu (build %lu" msgstr "Windows NT %lu.%lu (build %lu" -#: ../src/msw/utils.cpp:1147 +#: ../src/msw/utils.cpp:1262 #, c-format msgid "Windows Server 2003 (build %lu" msgstr "Windows Server 2003 (build %lu" -#: ../src/common/fmapbase.cpp:125 +#: ../src/common/fmapbase.cpp:166 msgid "Windows Thai (CP 874)" msgstr "Windows Thái Lan(CP 874)" -#: ../src/common/fmapbase.cpp:134 +#: ../src/common/fmapbase.cpp:175 msgid "Windows Turkish (CP 1254)" msgstr "Windows Thổ NhÄ© Kỳ (CP 1254)" -#: ../src/common/fmapbase.cpp:132 +#: ../src/msw/utils.cpp:1278 +#, c-format +msgid "Windows Vista (build %lu" +msgstr "Windows Vista (build %lu" + +#: ../src/common/fmapbase.cpp:173 msgid "Windows Western European (CP 1252)" msgstr "Windows Trung Âu (CP 1252)" -#: ../src/msw/utils.cpp:1143 +#: ../src/msw/utils.cpp:1269 #, c-format msgid "Windows XP (build %lu" msgstr "Windows XP (build %lu" -#: ../src/common/fmapbase.cpp:138 +#: ../src/common/fmapbase.cpp:179 msgid "Windows/DOS OEM (CP 437)" msgstr "Windows/DOS OEM (CP 437)" -#: ../src/common/ffile.cpp:159 +#: ../src/common/ffile.cpp:147 #, c-format msgid "Write error on file '%s'" msgstr "Lá»—i ghi trên tập tin '%s'" -#: ../src/xml/xml.cpp:733 +#: ../src/xml/xml.cpp:745 #, c-format msgid "XML parsing error: '%s' at line %d" msgstr "Gặp lá»—i khi phân tách XML: '%s' trên dòng %d" -#: ../src/common/xpmdecod.cpp:798 +#: ../src/common/xpmdecod.cpp:797 msgid "XPM: Malformed pixel data!" msgstr "XPM: Dữ liệu Ä‘iểm ảnh của ảnh bị há»ng!" -#: ../src/common/xpmdecod.cpp:707 +#: ../src/common/xpmdecod.cpp:706 #, c-format msgid "XPM: incorrect colour description in line %d" msgstr "XPM: phần mô tả màu sắc không đúng tại dòng %d" -#: ../src/common/xpmdecod.cpp:682 +#: ../src/common/xpmdecod.cpp:681 msgid "XPM: incorrect header format!" msgstr "XPM: định dạng phần đầu không đúng!" -#: ../src/common/xpmdecod.cpp:718 -#: ../src/common/xpmdecod.cpp:727 +#: ../src/common/xpmdecod.cpp:717 +#: ../src/common/xpmdecod.cpp:726 #, c-format msgid "XPM: malformed colour definition '%s' at line %d!" msgstr "XPM: định nghÄ©a màu sắc dị hình '%s' tại dòng %d!" -#: ../src/common/xpmdecod.cpp:757 +#: ../src/common/xpmdecod.cpp:756 msgid "XPM: no colors left to use for mask!" msgstr "XPM: không tìm thấy màu sá»­ dụng cho mặt nạ!" -#: ../src/common/xpmdecod.cpp:784 +#: ../src/common/xpmdecod.cpp:783 #, c-format msgid "XPM: truncated image data at line %d!" msgstr "XPM: dữ liệu bị cắt xén ảnh tại dòng %d!" -#: ../src/xrc/xmlres.cpp:634 -#, c-format -msgid "XRC resource '%s' (class '%s') not found!" -msgstr "Tài nguyên XRC '%s' (lá»›p '%s') không tìm thấy!" - -#: ../src/xrc/xmlres.cpp:1181 -#: ../src/xrc/xmlres.cpp:1193 -#, c-format -msgid "XRC resource: Cannot create animation from '%s'." -msgstr "Tài nguyên XRC: Không thể tạo hoạt hình từ '%s'." - -#: ../src/xrc/xmlres.cpp:1149 -#: ../src/xrc/xmlres.cpp:1161 -#, c-format -msgid "XRC resource: Cannot create bitmap from '%s'." -msgstr "Tài nguyên XRC: Không thể tạo ảnh bitmap từ '%s'." - -#: ../src/xrc/xmlres.cpp:1107 -#, c-format -msgid "XRC resource: Incorrect colour specification '%s' for attribute '%s'." -msgstr "Tài nguyên XRC: Sá»± định màu '%s' không chính xác cho thuá»™c tính '%s'." - #: ../src/motif/msgdlg.cpp:194 -#: ../src/mac/carbon/msgdlg.cpp:35 msgid "Yes" msgstr "Äồng ý" -#: ../src/mac/carbon/overlay.cpp:158 +#: ../src/osx/carbon/overlay.cpp:156 msgid "You cannot Clear an overlay that is not inited" msgstr "Bạn không thể Xóa má»™t overlay mà nó chÆ°a được khởi tạo" +#: ../src/osx/carbon/overlay.cpp:108 #: ../src/dfb/overlay.cpp:62 -#: ../src/mac/carbon/overlay.cpp:110 msgid "You cannot Init an overlay twice" msgstr "Bạn không thể khởi tạo overlay lần nữa" @@ -6258,22 +6765,18 @@ msgstr "Bạn không thể khởi tạo overlay lần nữa" msgid "You cannot add a new directory to this section." msgstr "Bạn không thể thêm má»™t thÆ° mục má»›i vào section này." -#: ../src/common/stockitem.cpp:162 +#: ../src/common/stockitem.cpp:198 msgid "Zoom &In" msgstr "Phóng T&o" -#: ../src/common/stockitem.cpp:163 +#: ../src/common/stockitem.cpp:199 msgid "Zoom &Out" msgstr "Th&u Nhá»" -#: ../src/common/stockitem.cpp:161 +#: ../src/common/stockitem.cpp:197 msgid "Zoom to &Fit" msgstr "Vừa &Khít Cá»­a Sổ" -#: ../src/common/docview.cpp:2174 -msgid "[EMPTY]" -msgstr "[EMPTY]" - #: ../src/msw/dde.cpp:1142 msgid "a DDEML application has created a prolonged race condition." msgstr "má»™t ứng dụng DDEML đã tạo ra má»™t loại Ä‘iá»u kiện nối dài." @@ -6368,11 +6871,11 @@ msgstr "" "Má»™t khi ứng dụng trả vá» từ má»™t XTYP_XACT_COMPLETE callback,\n" "bá»™ nhận dạng chuyển tác cho callback đó sẽ không còn hợp lệ." -#: ../src/common/zipstrm.cpp:1272 +#: ../src/common/zipstrm.cpp:1273 msgid "assuming this is a multi-part zip concatenated" -msgstr "xác nhận rằng đây là các phần móc nối của tệp tin zip " +msgstr "xác nhận rằng đây là các phần móc nối của tệp tin zip" -#: ../src/common/fileconf.cpp:1871 +#: ../src/common/fileconf.cpp:1878 #, c-format msgid "attempt to change immutable key '%s' ignored." msgstr "cố gắng đổi khóa bất biến '%s' bị bá» qua." @@ -6385,23 +6888,23 @@ msgstr "tham số sai tá»›i hàm thÆ° viện" msgid "bad signature" msgstr "chữ ký sai" -#: ../src/common/zipstrm.cpp:1714 +#: ../src/common/zipstrm.cpp:1716 msgid "bad zipfile offset to entry" msgstr "Ä‘oạn offset tệp tin zipfile há»ng được ghi vào" -#: ../src/common/ftp.cpp:382 +#: ../src/common/ftp.cpp:405 msgid "binary" msgstr "nhị phân" -#: ../src/common/fontcmn.cpp:697 +#: ../src/common/fontcmn.cpp:848 msgid "bold" msgstr "đậm" -#: ../src/os2/iniconf.cpp:458 +#: ../src/os2/iniconf.cpp:464 msgid "buffer is too small for Windows directory." msgstr "bá»™ đệm quá nhá» cho thÆ° mục Windows." -#: ../src/common/ffile.cpp:92 +#: ../src/common/ffile.cpp:80 #, c-format msgid "can't close file '%s'" msgstr "không thể đóng tập tin '%s'" @@ -6411,7 +6914,7 @@ msgstr "không thể đóng tập tin '%s'" msgid "can't close file descriptor %d" msgstr "không thể đóng phần mô tả tệp tin %d" -#: ../src/common/file.cpp:537 +#: ../src/common/file.cpp:560 #, c-format msgid "can't commit changes to file '%s'" msgstr "không thể chuyển các thay đổi tá»›i tệp tin '%s'" @@ -6421,41 +6924,41 @@ msgstr "không thể chuyển các thay đổi tá»›i tệp tin '%s'" msgid "can't create file '%s'" msgstr "không thể tạo tập tin '%s'" -#: ../src/common/fileconf.cpp:1170 +#: ../src/common/fileconf.cpp:1177 #, c-format msgid "can't delete user configuration file '%s'" msgstr "không thể xóa tệp tin cấu hình '%s' của ngÆ°á»i dùng" -#: ../src/common/file.cpp:443 +#: ../src/common/file.cpp:463 #, c-format msgid "can't determine if the end of file is reached on descriptor %d" msgstr "không thể kết thúc nếu kết thúc tệp tin nằm trên phần mô tả %d" -#: ../src/msdos/utilsdos.cpp:310 -#: ../src/msdos/utilsdos.cpp:469 +#: ../src/msdos/utilsdos.cpp:311 +#: ../src/msdos/utilsdos.cpp:474 #, c-format msgid "can't execute '%s'" msgstr "không thể thá»±c hiện '%s'" -#: ../src/common/zipstrm.cpp:1489 +#: ../src/common/zipstrm.cpp:1491 msgid "can't find central directory in zip" msgstr "không thể tìm thấy thÆ° mục trung tâm trong zip" -#: ../src/common/file.cpp:413 +#: ../src/common/file.cpp:433 #, c-format msgid "can't find length of file on file descriptor %d" msgstr "không thể tìm thấy Ä‘á»™ dài của tệp tin trên phần mô tả tệp tin %d" -#: ../src/msw/utils.cpp:393 +#: ../src/msw/utils.cpp:373 msgid "can't find user's HOME, using current directory." msgstr "không thể tìm thấy thÆ° mục HOME của ngÆ°á»i dùng, sá»­ dụng thÆ° mục hiện hành." -#: ../src/common/file.cpp:329 +#: ../src/common/file.cpp:334 #, c-format msgid "can't flush file descriptor %d" msgstr "không thể vào thẳng phần mô tả tệp tin %d" -#: ../src/common/file.cpp:385 +#: ../src/common/file.cpp:390 #: ../src/msw/wince/filefnwce.cpp:199 #, c-format msgid "can't get seek position on file descriptor %d" @@ -6466,22 +6969,22 @@ msgid "can't load any font, aborting" msgstr "không tải được phông chữ nào, bãi bá»" #: ../src/common/file.cpp:247 -#: ../src/common/ffile.cpp:76 +#: ../src/common/ffile.cpp:64 #, c-format msgid "can't open file '%s'" msgstr "không thể mở tập tin '%s'" -#: ../src/common/fileconf.cpp:357 +#: ../src/common/fileconf.cpp:352 #, c-format msgid "can't open global configuration file '%s'." msgstr "không thể mở tập tin cấu hình chung '%s'." -#: ../src/common/fileconf.cpp:373 +#: ../src/common/fileconf.cpp:368 #, c-format msgid "can't open user configuration file '%s'." msgstr "không thể mở tệp tin '%s' cấu hình của ngÆ°á»i dùng." -#: ../src/common/fileconf.cpp:1011 +#: ../src/common/fileconf.cpp:1018 msgid "can't open user configuration file." msgstr "không thể mở tệp tin cấu hình của ngÆ°á»i dùng." @@ -6498,23 +7001,23 @@ msgstr "không thể khởi tạo lại zlib inflate stream" msgid "can't read from file descriptor %d" msgstr "không thể Ä‘á»c từ phần mô tả tệp tin %d" -#: ../src/common/file.cpp:532 +#: ../src/common/file.cpp:555 #, c-format msgid "can't remove file '%s'" msgstr "không thể gỡ bá» tệp tin '%s'" -#: ../src/common/file.cpp:548 +#: ../src/common/file.cpp:572 #, c-format msgid "can't remove temporary file '%s'" msgstr "không thể gỡ bá» tập tin tạm thá»i '%s'" -#: ../src/common/file.cpp:371 +#: ../src/common/file.cpp:376 #: ../src/msw/wince/filefnwce.cpp:185 #, c-format msgid "can't seek on file descriptor %d" msgstr "không thể tìm kiếm trên phần mô tả tệp tin %d" -#: ../src/common/textfile.cpp:275 +#: ../src/common/textfile.cpp:300 #, c-format msgid "can't write buffer '%s' to disk." msgstr "không thể ghi dữ liệu đệm '%s' vào Ä‘Ä©a." @@ -6524,20 +7027,15 @@ msgstr "không thể ghi dữ liệu đệm '%s' vào Ä‘Ä©a." msgid "can't write to file descriptor %d" msgstr "không thể ghi dữ liệu vào phần mô tả tệp tin %d" -#: ../src/common/fileconf.cpp:1025 +#: ../src/common/fileconf.cpp:1032 msgid "can't write user configuration file." msgstr "không thể ghi tệp tin cấu hình của ngÆ°á»i dùng." -#: ../src/common/intl.cpp:1226 -#, c-format -msgid "catalog file for domain '%s' not found." -msgstr "tệp tin catalog cho tên miá»n '%s' không tìm thấy." - #: ../src/html/chm.cpp:346 msgid "checksum error" msgstr "tổng kiểm tra sai" -#: ../src/common/tarstrm.cpp:819 +#: ../src/common/tarstrm.cpp:821 msgid "checksum failure reading tar header block" msgstr "tổng kiểm tra việc Ä‘á»c khối đầu gói tar bị thất bại" @@ -6553,7 +7051,7 @@ msgstr "chuyển đổi sang bá»™ mã 8-bit gặp lá»—i" msgid "ctrl" msgstr "ctrl" -#: ../src/common/cmdline.cpp:1182 +#: ../src/common/cmdline.cpp:1250 msgid "date" msgstr "ngày tháng" @@ -6561,7 +7059,8 @@ msgstr "ngày tháng" msgid "decompression error" msgstr "lá»—i giải nén" -#: ../src/common/fmapbase.cpp:685 +#: ../src/richtext/richtextstyles.cpp:635 +#: ../src/common/fmapbase.cpp:812 msgid "default" msgstr "mặc định" @@ -6569,32 +7068,27 @@ msgstr "mặc định" msgid "delegate has no type info" msgstr "delegate không có thông tin kiểu" -#: ../src/common/cmdline.cpp:1178 +#: ../src/common/cmdline.cpp:1246 msgid "double" msgstr "đôi" -#: ../src/common/debugrpt.cpp:530 +#: ../src/common/debugrpt.cpp:532 msgid "dump of the process state (binary)" msgstr "kết xuất trạng thái qui trình (dạng nhị phân)" -#: ../src/common/datetime.cpp:4009 +#: ../src/common/datetimefmt.cpp:1781 msgid "eighteenth" msgstr "thứ mÆ°á»i tám" -#: ../src/common/datetime.cpp:3999 +#: ../src/common/datetimefmt.cpp:1771 msgid "eighth" msgstr "thứ tám" -#: ../src/common/datetime.cpp:4002 +#: ../src/common/datetimefmt.cpp:1774 msgid "eleventh" msgstr "thứ mÆ°á»i má»™t" -#: ../src/common/strconv.cpp:2981 -#, c-format -msgid "encoding %i" -msgstr "bá»™ mã %i" - -#: ../src/common/fileconf.cpp:1857 +#: ../src/common/fileconf.cpp:1864 #, c-format msgid "entry '%s' appears more than once in group '%s'" msgstr "mục từ '%s' xuất hiện nhiá»u hÆ¡n má»™t lần trong nhóm '%s'" @@ -6603,7 +7097,7 @@ msgstr "mục từ '%s' xuất hiện nhiá»u hÆ¡n má»™t lần trong nhóm '%s'" msgid "error in data format" msgstr "lá»—i định dạng dữ liệu" -#: ../src/msdos/utilsdos.cpp:410 +#: ../src/msdos/utilsdos.cpp:413 #, c-format msgid "error opening '%s'" msgstr "lá»—i khi mở '%s'" @@ -6612,62 +7106,62 @@ msgstr "lá»—i khi mở '%s'" msgid "error opening file" msgstr "lá»—i khi mở tập tin" -#: ../src/common/zipstrm.cpp:1575 +#: ../src/common/zipstrm.cpp:1577 msgid "error reading zip central directory" msgstr "lá»—i Ä‘á»c thÆ° mục trung tâm zip" -#: ../src/common/zipstrm.cpp:1666 +#: ../src/common/zipstrm.cpp:1668 msgid "error reading zip local header" msgstr "lá»—i Ä‘á»c phần đầu ná»™i bá»™ của zip" -#: ../src/common/zipstrm.cpp:2389 +#: ../src/common/zipstrm.cpp:2397 #, c-format msgid "error writing zip entry '%s': bad crc or length" msgstr "lá»—i ghi mục tin zip '%s': kiểm tra crc hay Ä‘á»™ dài há»ng" -#: ../src/common/ffile.cpp:181 +#: ../src/common/ffile.cpp:169 #, c-format msgid "failed to flush the file '%s'" msgstr "làm phẳng tệp tin '%s' gặp lá»—i" -#: ../src/common/datetime.cpp:4006 +#: ../src/common/datetimefmt.cpp:1778 msgid "fifteenth" msgstr "thứ mÆ°á»i lăm" -#: ../src/common/datetime.cpp:3996 +#: ../src/common/datetimefmt.cpp:1768 msgid "fifth" msgstr "thứ năm" -#: ../src/common/fileconf.cpp:613 +#: ../src/common/fileconf.cpp:611 #, c-format msgid "file '%s', line %d: '%s' ignored after group header." -msgstr "tệp tin '%s', dòng %d: '%s' được bá» qua trÆ°á»›c phần đầu nhóm." +msgstr "tệp tin '%s', dòng %d: '%s' được bá» qua trÆ°á»›c phần đầu nhóm." -#: ../src/common/fileconf.cpp:642 +#: ../src/common/fileconf.cpp:640 #, c-format msgid "file '%s', line %d: '=' expected." msgstr "tệp tin '%s', dòng %d: '=' mong đợi." -#: ../src/common/fileconf.cpp:665 +#: ../src/common/fileconf.cpp:663 #, c-format msgid "file '%s', line %d: key '%s' was first found at line %d." msgstr "tệp tin '%s', dòng %d: khóa '%s' được tìm thấy đầu tiên tại dòng %d." -#: ../src/common/fileconf.cpp:655 +#: ../src/common/fileconf.cpp:653 #, c-format msgid "file '%s', line %d: value for immutable key '%s' ignored." msgstr "tệp tin '%s', dòng %d: giá trị khóa bất biến '%s' bị bá» qua." -#: ../src/common/fileconf.cpp:577 +#: ../src/common/fileconf.cpp:575 #, c-format msgid "file '%s': unexpected character %c at line %d." msgstr "tệp tin '%s': không mong ký tá»± %c tại dòng %d." -#: ../src/richtext/richtextbuffer.cpp:5847 +#: ../src/richtext/richtextbuffer.cpp:6041 msgid "files" msgstr "tệp tin" -#: ../src/common/datetime.cpp:3992 +#: ../src/common/datetimefmt.cpp:1764 msgid "first" msgstr "đầu tiên" @@ -6675,25 +7169,25 @@ msgstr "đầu tiên" msgid "font size" msgstr "cỡ phông chữ" -#: ../src/common/datetime.cpp:4005 +#: ../src/common/datetimefmt.cpp:1777 msgid "fourteenth" msgstr "thứ mÆ°á»i bốn" -#: ../src/common/datetime.cpp:3995 +#: ../src/common/datetimefmt.cpp:1767 msgid "fourth" msgstr "thứ tÆ°" -#: ../src/common/appbase.cpp:491 +#: ../src/common/appbase.cpp:680 msgid "generate verbose log messages" msgstr "tạo ra nhật ký thông tin đầy đủ" -#: ../src/richtext/richtextbuffer.cpp:7194 -#: ../src/richtext/richtextbuffer.cpp:7234 -#: ../src/richtext/richtextbuffer.cpp:7305 +#: ../src/richtext/richtextbuffer.cpp:7469 +#: ../src/richtext/richtextbuffer.cpp:7506 +#: ../src/richtext/richtextbuffer.cpp:7574 msgid "image" msgstr "hình ảnh" -#: ../src/common/tarstrm.cpp:796 +#: ../src/common/tarstrm.cpp:797 msgid "incomplete header block in tar" msgstr "không hoàn thành khối đầu trong gói tar" @@ -6701,54 +7195,44 @@ msgstr "không hoàn thành khối đầu trong gói tar" msgid "incorrect event handler string, missing dot" msgstr "xâu chữ bá»™ Ä‘iá»u khiển sá»± kiện không hợp lệ, thiếu dấu chấm" -#: ../src/common/tarstrm.cpp:1373 +#: ../src/common/tarstrm.cpp:1382 msgid "incorrect size given for tar entry" msgstr "kích thÆ°á»›c định sẵn cho mục tin của gói tar không hợp lệ" -#: ../src/common/tarstrm.cpp:992 +#: ../src/common/tarstrm.cpp:994 msgid "invalid data in extended tar header" msgstr "dữ liệu trong phần đầu mở rá»™ng của gói tar không hợp lệ" -#: ../src/generic/logg.cpp:1103 +#: ../src/generic/logg.cpp:1051 msgid "invalid message box return value" msgstr "há»™p thoại thông Ä‘iệp trả vá» giá trị không hợp lệ" -#: ../src/common/zipstrm.cpp:1444 +#: ../src/common/zipstrm.cpp:1446 msgid "invalid zip file" msgstr "tập tin zip không hợp lệ" -#: ../src/common/fontcmn.cpp:702 +#: ../src/common/fontcmn.cpp:853 msgid "italic" msgstr "nghiêng" -#: ../src/common/fontcmn.cpp:692 +#: ../src/common/fontcmn.cpp:843 msgid "light" msgstr "ánh sáng" -#: ../src/common/intl.cpp:1645 +#: ../src/common/intl.cpp:297 #, c-format msgid "locale '%s' cannot be set." -msgstr "vị trí '%s' không thể đặt được." +msgstr "địa phÆ°Æ¡ng '%s' không thể đặt được." -#: ../src/common/intl.cpp:1210 -#, c-format -msgid "looking for catalog '%s' in path '%s'." -msgstr "tìm catalog '%s' trong Ä‘Æ°á»ng dẫn '%s'." - -#: ../src/mac/carbon/dataview.cpp:1048 -#: ../src/mac/carbon/dataview.cpp:1168 -msgid "m_peer is not or incorrectly initialized" -msgstr "khởi tạo m_peer không được hay không chính xác" - -#: ../src/common/datetime.cpp:4164 +#: ../src/common/datetimefmt.cpp:1917 msgid "midnight" msgstr "ná»­a đêm" -#: ../src/common/datetime.cpp:4010 +#: ../src/common/datetimefmt.cpp:1782 msgid "nineteenth" msgstr "thứ mÆ°á»i chín" -#: ../src/common/datetime.cpp:4000 +#: ../src/common/datetimefmt.cpp:1772 msgid "ninth" msgstr "thứ chín" @@ -6760,38 +7244,41 @@ msgstr "không có lá»—i DDE." msgid "no error" msgstr "không lá»—i" -#: ../src/dfb/fontmgr.cpp:178 +#: ../src/dfb/fontmgr.cpp:175 #, c-format msgid "no fonts found in %s, using builtin font" msgstr "không phông chữ nào được tìm thấy trong %s, sá»­ dụng phông dá»±ng sẵn" -#: ../src/html/htmlhelp.cpp:201 -#: ../src/html/helpdata.cpp:648 +#: ../src/html/helpdata.cpp:642 msgid "noname" msgstr "không tên" -#: ../src/common/datetime.cpp:4163 +#: ../src/common/datetimefmt.cpp:1916 msgid "noon" msgstr "buổi trÆ°a" -#: ../src/gtk/print.cpp:1165 -#: ../src/gtk/print.cpp:1269 +#: ../src/richtext/richtextstyles.cpp:634 +msgid "normal" +msgstr "thông thÆ°á»ng" + +#: ../src/gtk/print.cpp:1158 +#: ../src/gtk/print.cpp:1263 msgid "not implemented" msgstr "chÆ°a thi hành đầy đủ." -#: ../src/common/cmdline.cpp:1174 +#: ../src/common/cmdline.cpp:1242 msgid "num" msgstr "num" #: ../src/common/xtixml.cpp:255 msgid "objects cannot have XML Text Nodes" -msgstr "đối tượng không thể có XML Text Nodes" +msgstr "đối tượng không thể có XML Text Nodes" #: ../src/html/chm.cpp:340 msgid "out of memory" msgstr "hết bá»™ nhá»›" -#: ../src/common/debugrpt.cpp:506 +#: ../src/common/debugrpt.cpp:508 msgid "process context description" msgstr "mô tả ngữ cảnh tiến trình" @@ -6799,12 +7286,12 @@ msgstr "mô tả ngữ cảnh tiến trình" msgid "read error" msgstr "lá»—i Ä‘á»c" -#: ../src/common/zipstrm.cpp:1878 +#: ../src/common/zipstrm.cpp:1883 #, c-format msgid "reading zip stream (entry %s): bad crc" msgstr "Ä‘ang Ä‘á»c dòng dữ liệu zip (mục vào %s): kiểm tra Ä‘á»™ dÆ° vòng(crc) há»ng" -#: ../src/common/zipstrm.cpp:1875 +#: ../src/common/zipstrm.cpp:1878 #, c-format msgid "reading zip stream (entry %s): bad length" msgstr "Ä‘ang Ä‘á»c dòng dữ liệu zip (mục vào %s): chiá»u dài lá»—i" @@ -6813,7 +7300,7 @@ msgstr "Ä‘ang Ä‘á»c dòng dữ liệu zip (mục vào %s): chiá»u dài lá»—i" msgid "reentrancy problem." msgstr "trục trặc reentrancy." -#: ../src/common/datetime.cpp:3993 +#: ../src/common/datetimefmt.cpp:1765 msgid "second" msgstr "giây" @@ -6821,11 +7308,11 @@ msgstr "giây" msgid "seek error" msgstr "lá»—i đặt vị trí" -#: ../src/common/datetime.cpp:4008 +#: ../src/common/datetimefmt.cpp:1780 msgid "seventeenth" msgstr "thứ mÆ°á»i bảy" -#: ../src/common/datetime.cpp:3998 +#: ../src/common/datetimefmt.cpp:1770 msgid "seventh" msgstr "thứ bảy" @@ -6833,42 +7320,58 @@ msgstr "thứ bảy" msgid "shift" msgstr "shift" -#: ../src/common/appbase.cpp:481 +#: ../src/common/appbase.cpp:670 msgid "show this help message" msgstr "hiển thị thông tin trợ giúp này" -#: ../src/common/datetime.cpp:4007 +#: ../src/common/datetimefmt.cpp:1779 msgid "sixteenth" msgstr "thứ mÆ°á»i sáu" -#: ../src/common/datetime.cpp:3997 +#: ../src/common/datetimefmt.cpp:1769 msgid "sixth" msgstr "thứ sáu" -#: ../src/common/appcmn.cpp:215 +#: ../src/common/appcmn.cpp:208 msgid "specify display mode to use (e.g. 640x480-16)" msgstr "định rõ chế Ä‘á»™ hiển thị sá»­ dụng (ví dụ 640x480-16)" -#: ../src/common/appcmn.cpp:201 +#: ../src/common/appcmn.cpp:194 msgid "specify the theme to use" msgstr "định rõ theme cần dùng" -#: ../src/common/zipstrm.cpp:1781 +#: ../src/richtext/richtextbuffer.cpp:6502 +msgid "standard/circle" +msgstr "Tiêu chuẩn/ hình tròn" + +#: ../src/richtext/richtextbuffer.cpp:6504 +msgid "standard/diamond" +msgstr "Tiêu chuẩn/Thoi" + +#: ../src/richtext/richtextbuffer.cpp:6503 +msgid "standard/square" +msgstr "Tiêu chuẩn/vuông" + +#: ../src/richtext/richtextbuffer.cpp:6505 +msgid "standard/triangle" +msgstr "Tiêu chuẩn/chữ nhật" + +#: ../src/common/zipstrm.cpp:1783 msgid "stored file length not in Zip header" msgstr "phần lÆ°u giữ Ä‘á»™ dài tệp tin không ở trong phần đầu của Zip" -#: ../src/common/cmdline.cpp:1170 +#: ../src/common/cmdline.cpp:1238 msgid "str" msgstr "str" -#: ../src/common/tarstrm.cpp:1002 -#: ../src/common/tarstrm.cpp:1024 -#: ../src/common/tarstrm.cpp:1499 -#: ../src/common/tarstrm.cpp:1521 +#: ../src/common/tarstrm.cpp:1004 +#: ../src/common/tarstrm.cpp:1026 +#: ../src/common/tarstrm.cpp:1508 +#: ../src/common/tarstrm.cpp:1530 msgid "tar entry not open" msgstr "mục tin tar không mở được" -#: ../src/common/datetime.cpp:4001 +#: ../src/common/datetimefmt.cpp:1773 msgid "tenth" msgstr "thứ mÆ°á»i" @@ -6876,63 +7379,57 @@ msgstr "thứ mÆ°á»i" msgid "the response to the transaction caused the DDE_FBUSY bit to be set." msgstr "đáp ứng chuyển tác này là nguyên nhân bít DDE_FBUSY được đặt." -#: ../src/common/datetime.cpp:3994 +#: ../src/common/datetimefmt.cpp:1766 msgid "third" msgstr "thứ ba" -#: ../src/common/datetime.cpp:4004 +#: ../src/common/datetimefmt.cpp:1776 msgid "thirteenth" msgstr "thứ mÆ°á»i ba" -#: ../src/common/imagtiff.cpp:73 -#: ../src/common/imagtiff.cpp:89 -#, c-format -msgid "tiff module: %s" -msgstr "mô-Ä‘un tiff: %s" - -#: ../src/common/datetime.cpp:3813 +#: ../src/common/datetimefmt.cpp:1571 msgid "today" msgstr "hôm nay" -#: ../src/common/datetime.cpp:3815 +#: ../src/common/datetimefmt.cpp:1573 msgid "tomorrow" msgstr "ngày mai" -#: ../src/common/fileconf.cpp:1968 +#: ../src/common/fileconf.cpp:1975 #, c-format msgid "trailing backslash ignored in '%s'" msgstr "dấu gạch ngược bị bá» qua trong '%s'" -#: ../src/gtk/aboutdlg.cpp:190 +#: ../src/gtk/aboutdlg.cpp:198 msgid "translator-credits" msgstr "ngÆ°á»i dịch-chứng chỉ" -#: ../src/common/datetime.cpp:4003 +#: ../src/common/datetimefmt.cpp:1775 msgid "twelfth" msgstr "thứ mÆ°á»i hai" -#: ../src/common/datetime.cpp:4011 +#: ../src/common/datetimefmt.cpp:1783 msgid "twentieth" msgstr "thứ hai mÆ°Æ¡i" -#: ../src/common/fontcmn.cpp:603 -#: ../src/common/fontcmn.cpp:688 +#: ../src/common/fontcmn.cpp:668 +#: ../src/common/fontcmn.cpp:839 msgid "underlined" msgstr "gạch chân" -#: ../src/common/fileconf.cpp:2003 +#: ../src/common/fileconf.cpp:2010 #, c-format msgid "unexpected \" at position %d in '%s'." msgstr "không mong đợi \" tại vị trí %d trong '%s' ." -#: ../src/common/tarstrm.cpp:1043 +#: ../src/common/tarstrm.cpp:1046 msgid "unexpected end of file" msgstr "kết thúc tập tin Ä‘á»™t xuất" +#: ../src/generic/progdlgg.cpp:289 #: ../src/common/tarstrm.cpp:372 #: ../src/common/tarstrm.cpp:395 #: ../src/common/tarstrm.cpp:426 -#: ../src/generic/progdlgg.cpp:294 msgid "unknown" msgstr "không rõ" @@ -6946,7 +7443,7 @@ msgstr "chÆ°a biết lá»›p %s" msgid "unknown error" msgstr "lá»—i lạ" -#: ../src/msw/dialup.cpp:493 +#: ../src/msw/dialup.cpp:494 #, c-format msgid "unknown error (error code %08x)." msgstr "chÆ°a biết lá»—i (mã sai %08x)." @@ -6955,26 +7452,26 @@ msgstr "chÆ°a biết lá»—i (mã sai %08x)." msgid "unknown seek origin" msgstr "không hiểu tìm kiếm nguồn gốc" -#: ../src/common/fmapbase.cpp:699 +#: ../src/common/fmapbase.cpp:826 #, c-format msgid "unknown-%d" msgstr "không hiểu-%d" -#: ../src/common/docview.cpp:450 +#: ../src/common/docview.cpp:459 msgid "unnamed" msgstr "không tên" -#: ../src/common/docview.cpp:1446 +#: ../src/common/docview.cpp:1482 #, c-format msgid "unnamed%d" msgstr "Không tên%d" -#: ../src/common/zipstrm.cpp:1795 -#: ../src/common/zipstrm.cpp:2177 +#: ../src/common/zipstrm.cpp:1797 +#: ../src/common/zipstrm.cpp:2185 msgid "unsupported Zip compression method" msgstr "không há»— trợ phÆ°Æ¡ng thức nén Zip" -#: ../src/common/intl.cpp:1232 +#: ../src/common/translation.cpp:1691 #, c-format msgid "using catalog '%s' from '%s'." msgstr "sá»­ dụng catalog '%s' từ '%s'." @@ -6983,64 +7480,222 @@ msgstr "sá»­ dụng catalog '%s' từ '%s'." msgid "write error" msgstr "lá»—i ghi tệp tin" -#: ../src/common/stopwatch.cpp:277 +#: ../src/common/stopwatch.cpp:268 msgid "wxGetTimeOfDay failed." msgstr "wxGetTimeOfDay bị lá»—i." -#: ../src/gtk/print.cpp:952 +#: ../src/gtk/print.cpp:921 msgid "wxPrintout::GetPageInfo gives a null maxPage." msgstr "wxPrintout::GetPageInfo trả lại má»™t maxPage rá»—ng." -#: ../include/wx/richtext/richtextfontpage.h:38 -msgid "wxRichTextFontPage" -msgstr "wxRichTextFontPage" - #: ../src/html/search.cpp:49 msgid "wxSearchEngine::LookFor must be called before scanning!" msgstr "wxSearchEngine::LookFor phải được gá»i trÆ°á»›c khi quét!" -#: ../src/common/socket.cpp:432 -#: ../src/common/socket.cpp:486 -msgid "wxSocket: invalid signature in ReadMsg." -msgstr "wxSocket: chữ ký không hợp lệ trong ReadMsg." - -#: ../src/common/socket.cpp:1013 -msgid "wxSocket: unknown event!." -msgstr "wxSocket: không rõ sá»± kiện!." - -#: ../src/mac/carbon/databrow.cpp:646 +#: ../src/osx/carbon/dataview.cpp:1264 msgid "wxWidget control pointer is not a data view pointer" msgstr "Con trá» Ä‘iá»u khiển wxWidget không phải là kiểu con trá» hiển thị dữ liệu" -#: ../src/motif/app.cpp:248 +#: ../src/osx/carbon/dataview.cpp:908 +msgid "wxWidget's control not initialized." +msgstr "Ä‘iểu khiển của wxWidget chÆ°a được khởi tạo." + +#: ../src/motif/app.cpp:246 #, c-format msgid "wxWidgets could not open display for '%s': exiting." msgstr "wxWidgets không thể mở' %s' ra, Ä‘ang thoát ra." -#: ../src/x11/app.cpp:167 +#: ../src/x11/app.cpp:165 msgid "wxWidgets could not open display. Exiting." msgstr "wxWidgets không thể mở bá»™ hiển thị. Äang thoát ra." -#: ../src/richtext/richtextsymboldlg.cpp:427 +#: ../src/richtext/richtextsymboldlg.cpp:428 msgid "xxxx" msgstr "xxxx" -#: ../src/common/datetime.cpp:3814 +#: ../src/common/datetimefmt.cpp:1572 msgid "yesterday" msgstr "hôm qua" -#: ../src/common/zstream.cpp:233 -#: ../src/common/zstream.cpp:401 +#: ../src/common/zstream.cpp:235 +#: ../src/common/zstream.cpp:413 #, c-format msgid "zlib error %d" msgstr "lá»—i zlib %d" -#: ../src/common/prntbase.cpp:1137 +#: ../src/common/prntbase.cpp:1158 msgid "|<<" msgstr "|<<" #: ../src/richtext/richtextliststylepage.cpp:498 -#: ../src/richtext/richtextbulletspage.cpp:296 +#: ../src/richtext/richtextbulletspage.cpp:298 msgid "~" msgstr "~" +#~ msgid "%.*f GB" +#~ msgstr "%.*f GB" + +#~ msgid "%.*f MB" +#~ msgstr "%.*f MB" + +#~ msgid "%.*f TB" +#~ msgstr "%.*f TB" + +#~ msgid "%.*f kB" +#~ msgstr "%.*f kB" + +#~ msgid "%s B" +#~ msgstr "%s B" + +#~ msgid "%s message" +#~ msgstr "%s thông Ä‘iệp" + +#~ msgid "Archive doesnt contain #SYSTEM file" +#~ msgstr "Phần lÆ°u trữ không chứa tệp tin hệ thống #SYSTEM" + +#~ msgid "Cannot convert dialog units: dialog unknown." +#~ msgstr "Không thể chuyển đổi Ä‘Æ¡n vị há»™p thoại: há»™p thoại chÆ°a được biết." + +#~ msgid "Cannot convert from the charset '%s'!" +#~ msgstr "Không thể chuyển đổi từ bá»™ ký tá»± '%s'!" + +#~ msgid "Cannot find container for unknown control '%s'." +#~ msgstr "Không tìm thấy container cho Ä‘iá»u khiển không rõ '%s'." + +#~ msgid "Cannot find font node '%s'." +#~ msgstr "Không thể tìm thấy nút phông chữ '%s'." + +#~ msgid "Cannot parse coordinates from '%s'." +#~ msgstr "Không thể phân tách hệ tá»a Ä‘á»™ từ '%s'." + +#~ msgid "Cannot parse dimension from '%s'." +#~ msgstr "Không thể phân tách kích thÆ°á»›c từ '%s'." + +#~ msgid "Cannot wait for thread termination." +#~ msgstr "Không thể chá» tuyến trình kết thúc." + +#~ msgid "Cant create the thread event queue" +#~ msgstr "Không thể tạo hàng đợi sá»± kiện tuyến trình" + +#~ msgid "Control is wrongly initialized." +#~ msgstr "Äiá»u khiển khởi tạo sai." + +#~ msgid "Could not unlock mutex" +#~ msgstr "Không thể bá» khóa mutex" + +#~ msgid "Data view control is not correctly initialized" +#~ msgstr "Äiá»u khiển hiển thị dữ liệu không được khởi tạo má»™t cách đúng đắn." + +#~ msgid "Error while waiting on semaphore" +#~ msgstr "Lá»—i khi chá» cá» hiệu" + +#~ msgid "Failed to connect to session manager: %s" +#~ msgstr "Kết nối tá»›i quản lý session gặp lá»—i: %s" + +#~ msgid "Failed to register OpenGL window class." +#~ msgstr "Äăng ký má»™t lá»›p cá»­a sổ OpenGL gặp lá»—i." + +#~ msgid "Fatal error" +#~ msgstr "Lá»—i nghiêm trá»ng" + +#~ msgid "Fatal error: " +#~ msgstr "Lá»—i nghiêm trá»ng: " + +#~ msgid "Go back to the previous HTML page" +#~ msgstr "Quay lại trang HTML liá»n trÆ°á»›c" + +#~ msgid "Go forward to the next HTML page" +#~ msgstr "Tiến tá»›i trang HTML tiếp theo" + +#~ msgid "Help : %s" +#~ msgstr "Trợ giúp : %s" + +#~ msgid "Invalid XRC resource '%s': doesn't have root node 'resource'." +#~ msgstr "Tài nguyên XRC '%s' không hợp lệ: không có nút gốc 'resource'." + +#~ msgid "No handler found for XML node '%s', class '%s'!" +#~ msgstr "Không tìm thấy handler XML cho nút '%s', lá»›p '%s'!" + +#~ msgid "Preparing help window..." +#~ msgstr "Äang chuẩn bị cá»­a sổ trợ giúp..." + +#~ msgid "Program aborted." +#~ msgstr "ChÆ°Æ¡ng trình bị bãi bá»." + +#~ msgid "Referenced object node with ref=\"%s\" not found!" +#~ msgstr "Nốt đối tượng có liên quan đến ref=\"%s\" không tìm thấy!" + +#~ msgid "Resource files must have same version number!" +#~ msgstr "Tệp tin tài nguyên phải có cùng số phiên bản!" + +#~ msgid "Search!" +#~ msgstr "Tìm kiếm!" + +#~ msgid "Sorry, could not open this file for saving." +#~ msgstr "Rất tiếc, không thể mở tệp tin này để ghi." + +#~ msgid "Sorry, could not save this file." +#~ msgstr "Rất tiếc, không thể ghi lại tệp tin này." + +#~ msgid "Sorry, print preview needs a printer to be installed." +#~ msgstr "Rất tiếc, việc mô phá»ng bản in cần má»™t máy in đã được cài đặt." + +#~ msgid "Status: " +#~ msgstr "Tình trạng: " + +#~ msgid "Subclass '%s' not found for resource '%s', not subclassing!" +#~ msgstr "" +#~ "Lá»›p con '%s' không được tìm thấy cho tài nguyên '%s', không có lá»›p con!" + +#~ msgid "Symbols" +#~ msgstr "Ký tá»± đặc biệt" + +#~ msgid "TIFF library error." +#~ msgstr "ThÆ° viện TIFF bị lá»—i." + +#~ msgid "TIFF library warning." +#~ msgstr "Cảnh giác vá»›i thÆ° viện TIFF." + +#~ msgid "Trying to solve a NULL hostname: giving up" +#~ msgstr "Äang cố gắng giải quyết má»™t tên máy chủ Rá»–NG: Ä‘Æ°a lên" + +#~ msgid "Unknown style flag " +#~ msgstr "Không rõ kiểu cá» " + +#~ msgid "XRC resource '%s' (class '%s') not found!" +#~ msgstr "Tài nguyên XRC '%s' (lá»›p '%s') không tìm thấy!" + +#~ msgid "XRC resource: Cannot create animation from '%s'." +#~ msgstr "Tài nguyên XRC: Không thể tạo hoạt hình từ '%s'." + +#~ msgid "XRC resource: Cannot create bitmap from '%s'." +#~ msgstr "Tài nguyên XRC: Không thể tạo ảnh bitmap từ '%s'." + +#~ msgid "" +#~ "XRC resource: Incorrect colour specification '%s' for attribute '%s'." +#~ msgstr "" +#~ "Tài nguyên XRC: Sá»± định màu '%s' không chính xác cho thuá»™c tính '%s'." + +#~ msgid "[EMPTY]" +#~ msgstr "[EMPTY]" + +#~ msgid "catalog file for domain '%s' not found." +#~ msgstr "tệp tin catalog cho tên miá»n '%s' không tìm thấy." + +#~ msgid "encoding %i" +#~ msgstr "bá»™ mã %i" + +#~ msgid "looking for catalog '%s' in path '%s'." +#~ msgstr "tìm catalog '%s' trong Ä‘Æ°á»ng dẫn '%s'." + +#~ msgid "m_peer is not or incorrectly initialized" +#~ msgstr "khởi tạo m_peer không được hay không chính xác" + +#~ msgid "wxRichTextFontPage" +#~ msgstr "wxRichTextFontPage" + +#~ msgid "wxSocket: invalid signature in ReadMsg." +#~ msgstr "wxSocket: chữ ký không hợp lệ trong ReadMsg." + +#~ msgid "wxSocket: unknown event!." +#~ msgstr "wxSocket: không rõ sá»± kiện!." diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release index 08564c01c7..2f8ed4ad40 100755 --- a/misc/scripts/inc_release +++ b/misc/scripts/inc_release @@ -83,6 +83,9 @@ done run_sed build/osx/wxvers.xcconfig \ "/DYLIB_.* = /s/$ver_for_sed/$ver_string_new/" +run_sed build/tools/bld_chm_exe.bat \ + "/^SET WXW_VER=/s/$ver_for_sed/$ver_string_new/" + run_sed docs/doxygen/Doxyfile_inc \ "/^PROJECT_NUMBER/s/$ver_for_sed/$ver_string_new/" @@ -101,9 +104,11 @@ run_sed samples/Info.plist \ "/version/s/$ver_for_sed/$ver_string_new/" \ "//s/$ver_for_sed/$ver_string_new/" +run_sed samples/minimal/Info_carbon.plist \ + "//s/$ver_for_sed/$ver_string_new/" +run_sed samples/minimal/Info_cocoa.plist \ + "//s/$ver_for_sed/$ver_string_new/" + run_sed samples/docview/Info.plist \ "/versionon/s/$ver_for_sed/$ver_string_new/" \ "//s/$ver_for_sed/$ver_string_new/" - -run_set src/wxWindows.xcodeproj/project.pbxproj \ - "s/DYLIB_CURRENT_VERSION = $ver_for_sed/DYLIB_CURRENT_VERSION = $ver_string_new/" diff --git a/samples/Info.plist b/samples/Info.plist index 8a19de2aa2..6c4091dfeb 100644 --- a/samples/Info.plist +++ b/samples/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.2, (c) 2005-2010 wxWidgets + $(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,22 +15,22 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 2.9.2, (c) 2005-2010 wxWidgets + 2.9.3, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.2 + 2.9.3 CFBundleSignature ???? CFBundleVersion - 2.9.2 + 2.9.3 CSResourcesFileMapped LSRequiresCarbon NSHumanReadableCopyright - Copyright 2005-2010 wxWidgets + Copyright 2005-2011 wxWidgets diff --git a/samples/access/accesstestW7.xml b/samples/access/accesstestW7.xml deleted file mode 100644 index 29d7cd75b2..0000000000 --- a/samples/access/accesstestW7.xml +++ /dev/null @@ -1,1968 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - wxWin App Release - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7msw\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorPentiumII - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics1 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo0 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0€9 - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppRelease.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel4 - GlobalOptimizer_X86__optforSpeed - - - - Name - MSL_All_x86.lib - Windows - Unknown - Debug - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - wx_x86.lib - Windows - Library - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - accesstest.rc - Windows - Text - Debug - - - Name - accesstest.cpp - Windows - Text - Debug - - - - - Name - wx_x86.lib - Windows - - - Name - MSL_All_x86.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - advapi32.lib - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - accesstest.rc - Windows - - - Name - accesstest.cpp - Windows - - - - - wxWin App Debug - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7mswd\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLstrue - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo1 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0€9ð…9@|ø…9@|ÿGDÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppDebug.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel0 - GlobalOptimizer_X86__optforSpeed - - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - MSL_All_x86_D.lib - Windows - Unknown - Debug - - - Name - wx_x86_d.lib - MacOS - Unknown - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - accesstest.rc - Windows - Text - Debug - - - Name - accesstest.cpp - Windows - Text - Debug - - - - - Name - wx_x86_d.lib - MacOS - - - Name - MSL_All_x86_D.lib - Windows - - - Name - advapi32.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - accesstest.rc - Windows - - - Name - accesstest.cpp - Windows - - - - - - - wxWin App Debug - wxWin App Release - - - - Source - - wxWin App Release - Name - accesstest.rc - Windows - - - wxWin App Release - Name - accesstest.cpp - Windows - - - wx - - wxWin App Release - Name - wx_x86.lib - Windows - - - wxWin App Debug - Name - wx_x86_d.lib - MacOS - - - MSL ANSI Libraries - - wxWin App Release - Name - MSL_All_x86.lib - Windows - - - wxWin App Debug - Name - MSL_All_x86_D.lib - Windows - - - Win32 SDK - - wxWin App Release - Name - advapi32.lib - Windows - - - wxWin App Release - Name - COMCTL32.LIB - MacOS - - - wxWin App Release - Name - COMDLG32.LIB - MacOS - - - wxWin App Release - Name - GDI32.LIB - MacOS - - - wxWin App Release - Name - KERNEL32.LIB - MacOS - - - wxWin App Release - Name - odbc32.lib - Windows - - - wxWin App Release - Name - OLE32.LIB - MacOS - - - wxWin App Release - Name - rpcrt4.lib - Windows - - - wxWin App Release - Name - SHELL32.LIB - MacOS - - - wxWin App Release - Name - USER32.LIB - MacOS - - - wxWin App Release - Name - UUID.LIB - MacOS - - - wxWin App Release - Name - WINSPOOL.LIB - Windows - - - wxWin App Release - Name - WSOCK32.LIB - Windows - - - - - diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp index 413558002f..e2500c0fc5 100644 --- a/samples/animate/anitest.cpp +++ b/samples/animate/anitest.cpp @@ -293,7 +293,7 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) m_animationCtrl->Play(); #else wxFileInputStream stream(filename); - if (!stream.Ok()) + if (!stream.IsOk()) { wxLogError(wxT("Sorry, this animation is not a valid format for wxAnimation.")); return; diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp index 596522bfda..e58377e3da 100644 --- a/samples/artprov/artbrows.cpp +++ b/samples/artprov/artbrows.cpp @@ -34,7 +34,7 @@ { \ int ind; \ wxIcon icon = wxArtProvider::GetIcon(id, client, size); \ - if ( icon.Ok() ) \ + if ( icon.IsOk() ) \ ind = images->Add(icon); \ else \ ind = 0; \ diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index b6bb96102f..08d5d136d9 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -798,7 +798,7 @@ MyFrame::MyFrame(wxWindow* parent, tb2->SetToolBitmapSize(wxSize(16,16)); wxBitmap tb2_bmp1 = wxArtProvider::GetBitmap(wxART_QUESTION, wxART_OTHER, wxSize(16,16)); - tb2->AddTool(ID_SampleItem+6, wxT("Test"), tb2_bmp1); + tb2->AddTool(ID_SampleItem+6, wxT("Disabled"), tb2_bmp1); tb2->AddTool(ID_SampleItem+7, wxT("Test"), tb2_bmp1); tb2->AddTool(ID_SampleItem+8, wxT("Test"), tb2_bmp1); tb2->AddTool(ID_SampleItem+9, wxT("Test"), tb2_bmp1); @@ -811,6 +811,7 @@ MyFrame::MyFrame(wxWindow* parent, tb2->AddTool(ID_SampleItem+14, wxT("Test"), tb2_bmp1); tb2->AddTool(ID_SampleItem+15, wxT("Test"), tb2_bmp1); tb2->SetCustomOverflowItems(prepend_items, append_items); + tb2->EnableTool(ID_SampleItem+6, false); tb2->Realize(); diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index 7496322332..73cf2adf12 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -280,7 +280,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #ifdef __WXGTK20__ EVT_UPDATE_UI(Calendar_Cal_Monday, MyFrame::OnUpdateUIGenericOnly) EVT_UPDATE_UI(Calendar_Cal_Holidays, MyFrame::OnUpdateUIGenericOnly) - EVT_UPDATE_UI(Calendar_Cal_LimitDates, MyFrame::OnUpdateUIGenericOnly) #endif EVT_UPDATE_UI(Calendar_Cal_Special, MyFrame::OnUpdateUIGenericOnly) EVT_UPDATE_UI(Calendar_Cal_SurroundWeeks, MyFrame::OnUpdateUIGenericOnly) diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 89647376ce..fa356714ad 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -103,6 +103,14 @@ int main(int argc, char **argv) break; } + if ( argc == 1 ) + { + // If there were no command-line options supplied, emit a message + // otherwise it's not obvious that the sample ran successfully + wxPrintf("Welcome to the wxWidgets 'console' sample!\n"); + wxPrintf("For more information, run it again with the --help option\n"); + } + // do something useful here return 0; diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 79e9eebecf..8cf794f121 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -721,7 +721,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) for ( size_t n = 0; n < Image_Max; n++ ) { wxBitmap bmp(s_iconNames[n]); - if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) ) + if ( !bmp.IsOk() || (imagelist->Add(bmp) == -1) ) { wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."), s_iconNames[n], n); @@ -957,7 +957,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #if defined(__WXMSW__) || defined(__WXMOTIF__) // test for masked bitmap display bitmap = wxBitmap(wxT("test2.bmp"), wxBITMAP_TYPE_BMP); - if (bitmap.Ok()) + if (bitmap.IsOk()) { bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); @@ -1183,7 +1183,7 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event)) SetThemeEnabled(false); // test panel colour changing and propagation to the subcontrols - if ( s_colOld.Ok() ) + if ( s_colOld.IsOk() ) { SetBackgroundColour(s_colOld); s_colOld = wxNullColour; diff --git a/samples/controls/controlsW7.xml b/samples/controls/controlsW7.xml deleted file mode 100644 index 41c440355b..0000000000 --- a/samples/controls/controlsW7.xml +++ /dev/null @@ -1,1968 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - wxWin App Release - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7msw\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorPentiumII - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics1 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo0 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0¶œð€@|ø€@|€æÍDÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppRelease.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel4 - GlobalOptimizer_X86__optforSpeed - - - - Name - MSL_All_x86.lib - Windows - Unknown - Debug - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - wx_x86.lib - Windows - Library - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - controls.cpp - Windows - Text - Debug - - - Name - controls.rc - Windows - Text - Debug - - - - - Name - wx_x86.lib - Windows - - - Name - MSL_All_x86.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - advapi32.lib - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - controls.cpp - Windows - - - Name - controls.rc - Windows - - - - - wxWin App Debug - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7mswd\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLstrue - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo1 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0¶œð€@|ø€@| - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppDebug.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel0 - GlobalOptimizer_X86__optforSpeed - - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - MSL_All_x86_D.lib - Windows - Unknown - Debug - - - Name - wx_x86_d.lib - MacOS - Unknown - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - controls.cpp - Windows - Text - Debug - - - Name - controls.rc - Windows - Text - Debug - - - - - Name - wx_x86_d.lib - MacOS - - - Name - MSL_All_x86_D.lib - Windows - - - Name - advapi32.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - controls.cpp - Windows - - - Name - controls.rc - Windows - - - - - - - wxWin App Debug - wxWin App Release - - - - Source - - wxWin App Release - Name - controls.cpp - Windows - - - wxWin App Release - Name - controls.rc - Windows - - - wx - - wxWin App Release - Name - wx_x86.lib - Windows - - - wxWin App Debug - Name - wx_x86_d.lib - MacOS - - - MSL ANSI Libraries - - wxWin App Release - Name - MSL_All_x86.lib - Windows - - - wxWin App Debug - Name - MSL_All_x86_D.lib - Windows - - - Win32 SDK - - wxWin App Release - Name - advapi32.lib - Windows - - - wxWin App Release - Name - COMCTL32.LIB - MacOS - - - wxWin App Release - Name - COMDLG32.LIB - MacOS - - - wxWin App Release - Name - GDI32.LIB - MacOS - - - wxWin App Release - Name - KERNEL32.LIB - MacOS - - - wxWin App Release - Name - odbc32.lib - Windows - - - wxWin App Release - Name - OLE32.LIB - MacOS - - - wxWin App Release - Name - rpcrt4.lib - Windows - - - wxWin App Release - Name - SHELL32.LIB - MacOS - - - wxWin App Release - Name - USER32.LIB - MacOS - - - wxWin App Release - Name - UUID.LIB - MacOS - - - wxWin App Release - Name - WINSPOOL.LIB - Windows - - - wxWin App Release - Name - WSOCK32.LIB - Windows - - - - - diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index b9d424622a..f3c8bb2074 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -540,10 +540,10 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l m_music_model = new MyMusicTreeModel; m_ctrl[0]->AssociateModel( m_music_model.get() ); -#if wxUSE_DRAG_AND_DROP +#if wxUSE_DRAG_AND_DROP && wxUSE_UNICODE m_ctrl[0]->EnableDragSource( wxDF_UNICODETEXT ); m_ctrl[0]->EnableDropTarget( wxDF_UNICODETEXT ); -#endif // wxUSE_DRAG_AND_DROP +#endif // wxUSE_DRAG_AND_DROP && wxUSE_UNICODE // column 0 of the view control: @@ -1160,8 +1160,11 @@ void MyFrame::OnAddTreeItem(wxCommandEvent& WXUNUSED(event)) { wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; wxDataViewItem selected = ctrl->GetSelection(); - if (ctrl->IsContainer(selected)) - ctrl->AppendItem( selected, "Item", 0 ); + if (ctrl->IsContainer(selected)) { + wxDataViewItem newitem = ctrl->AppendItem( selected, "Item", 0 ); + ctrl->Select(newitem); + ctrl->StartEditor(newitem, 0); + } } void MyFrame::OnAddTreeContainerItem(wxCommandEvent& WXUNUSED(event)) diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 1c020573f5..335cc16ca2 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -1769,10 +1769,15 @@ void MyFrame::OnStandardButtonsSizerDialog(wxCommandEvent& WXUNUSED(event)) #define ID_CATCH_LISTBOX_DCLICK 100 #define ID_LISTBOX 101 +#define ID_DISABLE_OK 102 +#define ID_DISABLE_CANCEL 103 BEGIN_EVENT_TABLE(TestDefaultActionDialog, wxDialog) EVT_CHECKBOX(ID_CATCH_LISTBOX_DCLICK, TestDefaultActionDialog::OnCatchListBoxDClick) + EVT_CHECKBOX(ID_DISABLE_OK, TestDefaultActionDialog::OnDisableOK) + EVT_CHECKBOX(ID_DISABLE_CANCEL, TestDefaultActionDialog::OnDisableCancel) EVT_LISTBOX_DCLICK(ID_LISTBOX, TestDefaultActionDialog::OnListBoxDClick) + EVT_TEXT_ENTER(wxID_ANY, TestDefaultActionDialog::OnTextEnter) END_EVENT_TABLE() TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) : @@ -1801,6 +1806,9 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) : grid_sizer->Add( new wxTextCtrl( this, -1, "", wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER ), 0, wxALIGN_CENTRE_VERTICAL ); grid_sizer->Add( new wxStaticText( this, -1, "wxTextCtrl with wxTE_PROCESS_ENTER" ), 0, wxALIGN_CENTRE_VERTICAL ); + grid_sizer->Add( new wxCheckBox(this, ID_DISABLE_OK, "Disable \"OK\""), 0, wxALIGN_CENTRE_VERTICAL ); + grid_sizer->Add( new wxCheckBox(this, ID_DISABLE_CANCEL, "Disable \"Cancel\""), 0, wxALIGN_CENTRE_VERTICAL ); + main_sizer->Add( grid_sizer, 0, wxALL, 10 ); wxSizer *button_sizer = CreateSeparatedButtonSizer( wxOK|wxCANCEL ); @@ -1810,6 +1818,16 @@ TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) : SetSizerAndFit( main_sizer ); } +void TestDefaultActionDialog::OnDisableOK(wxCommandEvent& event) +{ + FindWindow(wxID_OK)->Enable(!event.IsChecked()); +} + +void TestDefaultActionDialog::OnDisableCancel(wxCommandEvent& event) +{ + FindWindow(wxID_CANCEL)->Enable(!event.IsChecked()); +} + void TestDefaultActionDialog::OnListBoxDClick(wxCommandEvent& event) { event.Skip( !m_catchListBoxDClick ); @@ -1820,6 +1838,11 @@ void TestDefaultActionDialog::OnCatchListBoxDClick(wxCommandEvent& WXUNUSED(even m_catchListBoxDClick = !m_catchListBoxDClick; } +void TestDefaultActionDialog::OnTextEnter(wxCommandEvent& event) +{ + wxLogMessage("Text \"%s\" entered.", event.GetString()); +} + void MyFrame::OnTestDefaultActionDialog(wxCommandEvent& WXUNUSED(event)) { TestDefaultActionDialog dialog( this ); diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index f70e173606..fbad49919a 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -293,7 +293,10 @@ public: TestDefaultActionDialog( wxWindow *parent ); void OnListBoxDClick(wxCommandEvent& event); + void OnDisableOK(wxCommandEvent& event); + void OnDisableCancel(wxCommandEvent& event); void OnCatchListBoxDClick(wxCommandEvent& event); + void OnTextEnter(wxCommandEvent& event); private: bool m_catchListBoxDClick; diff --git a/samples/dialogs/dialogsW7.xml b/samples/dialogs/dialogsW7.xml deleted file mode 100644 index a1a98fea00..0000000000 --- a/samples/dialogs/dialogsW7.xml +++ /dev/null @@ -1,1969 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - wxWin App Release - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7msw\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorPentiumII - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics1 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo0 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÙÏ8ßÏ@|@ßÏ@|8h6DÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppRelease.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel4 - GlobalOptimizer_X86__optforSpeed - - - - Name - MSL_All_x86.lib - Windows - Unknown - Debug - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - wx_x86.lib - Windows - Library - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - dialogs.cpp - Windows - Text - Debug - - - Name - dialogs.rc - Windows - Text - Debug - - - - - Name - wx_x86.lib - Windows - - - Name - MSL_All_x86.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - advapi32.lib - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - dialogs.cpp - Windows - - - Name - dialogs.rc - Windows - - - - - wxWin App Debug - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7mswd\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLstrue - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo1 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÙÏ(ßÏ@|0ßÏ@|Ð -GDÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppDebug.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel0 - GlobalOptimizer_X86__optforSpeed - - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - MSL_All_x86_D.lib - Windows - Unknown - Debug - - - Name - wx_x86_d.lib - MacOS - Unknown - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - dialogs.cpp - Windows - Text - Debug - - - Name - dialogs.rc - Windows - Text - Debug - - - - - Name - wx_x86_d.lib - MacOS - - - Name - MSL_All_x86_D.lib - Windows - - - Name - advapi32.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - dialogs.cpp - Windows - - - Name - dialogs.rc - Windows - - - - - - - wxWin App Debug - wxWin App Release - - - - Source - - wxWin App Release - Name - dialogs.cpp - Windows - - - wxWin App Release - Name - dialogs.rc - Windows - - - wx - - wxWin App Release - Name - wx_x86.lib - Windows - - - wxWin App Debug - Name - wx_x86_d.lib - MacOS - - - MSL ANSI Libraries - - wxWin App Release - Name - MSL_All_x86.lib - Windows - - - wxWin App Debug - Name - MSL_All_x86_D.lib - Windows - - - Win32 SDK - - wxWin App Release - Name - advapi32.lib - Windows - - - wxWin App Release - Name - COMCTL32.LIB - MacOS - - - wxWin App Release - Name - COMDLG32.LIB - MacOS - - - wxWin App Release - Name - GDI32.LIB - MacOS - - - wxWin App Release - Name - KERNEL32.LIB - MacOS - - - wxWin App Release - Name - odbc32.lib - Windows - - - wxWin App Release - Name - OLE32.LIB - MacOS - - - wxWin App Release - Name - rpcrt4.lib - Windows - - - wxWin App Release - Name - SHELL32.LIB - MacOS - - - wxWin App Release - Name - USER32.LIB - MacOS - - - wxWin App Release - Name - UUID.LIB - MacOS - - - wxWin App Release - Name - WINSPOOL.LIB - Windows - - - wxWin App Release - Name - WSOCK32.LIB - Windows - - - - - diff --git a/samples/dll/my_dll.cpp b/samples/dll/my_dll.cpp index 4b67d6d04e..bfd6ed508f 100644 --- a/samples/dll/my_dll.cpp +++ b/samples/dll/my_dll.cpp @@ -150,10 +150,10 @@ MyDllApp::MyDllApp() Connect(wxEVT_IDLE, wxIdleEventHandler(MyDllApp::OnIdle)); Connect(CMD_SHOW_WINDOW, - wxEVT_COMMAND_THREAD, + wxEVT_THREAD, wxThreadEventHandler(MyDllApp::OnShowWindow)); Connect(CMD_TERMINATE, - wxEVT_COMMAND_THREAD, + wxEVT_THREAD, wxThreadEventHandler(MyDllApp::OnTerminate)); } @@ -288,7 +288,7 @@ void run_wx_gui_from_dll(const char *title) // Send a message to wx thread to show a new frame: wxThreadEvent *event = - new wxThreadEvent(wxEVT_COMMAND_THREAD, CMD_SHOW_WINDOW); + new wxThreadEvent(wxEVT_THREAD, CMD_SHOW_WINDOW); event->SetString(title); wxQueueEvent(wxApp::GetInstance(), event); } @@ -303,7 +303,7 @@ void wx_dll_cleanup() // If wx main thread is running, we need to stop it. To accomplish this, // send a message telling it to terminate the app. wxThreadEvent *event = - new wxThreadEvent(wxEVT_COMMAND_THREAD, CMD_TERMINATE); + new wxThreadEvent(wxEVT_THREAD, CMD_TERMINATE); wxQueueEvent(wxApp::GetInstance(), event); // We must then wait for the thread to actually terminate. diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index c2175a9d4b..7916600905 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -141,7 +141,7 @@ public: { wxPaintDC dc(this); - if ( m_bitmap.Ok() ) + if ( m_bitmap.IsOk() ) { PrepareDC(dc); @@ -177,7 +177,7 @@ public: { wxPaintDC dc(this); - if ( m_metafile.Ok() ) + if ( m_metafile.IsOk() ) { PrepareDC(dc); @@ -1327,7 +1327,7 @@ void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event)) wxBITMAP_TYPE_BMP #endif ); - if (!image.Ok()) + if (!image.IsOk()) { wxLogError( wxT("Invalid image file...") ); return; diff --git a/samples/dnd/dndW7.xml b/samples/dnd/dndW7.xml deleted file mode 100644 index 7e6ab39089..0000000000 --- a/samples/dnd/dndW7.xml +++ /dev/null @@ -1,1968 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - wxWin App Release - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7msw\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorPentiumII - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics1 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo0 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0àHxI@|€I@|8yJDÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppRelease.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel4 - GlobalOptimizer_X86__optforSpeed - - - - Name - MSL_All_x86.lib - Windows - Unknown - Debug - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - wx_x86.lib - Windows - Library - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - dnd.rc - Windows - Text - Debug - - - Name - dnd.cpp - Windows - Text - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - - - Name - wx_x86.lib - Windows - - - Name - MSL_All_x86.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - advapi32.lib - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - dnd.rc - Windows - - - Name - dnd.cpp - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - - - wxWin App Debug - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7mswd\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLstrue - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo1 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0àHhI@|pI@|تHDÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppDebug.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel0 - GlobalOptimizer_X86__optforSpeed - - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - MSL_All_x86_D.lib - Windows - Unknown - Debug - - - Name - wx_x86_d.lib - MacOS - Unknown - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - dnd.rc - Windows - Text - Debug - - - Name - dnd.cpp - Windows - Text - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - - - Name - wx_x86_d.lib - MacOS - - - Name - MSL_All_x86_D.lib - Windows - - - Name - advapi32.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - dnd.rc - Windows - - - Name - dnd.cpp - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - - - - - wxWin App Debug - wxWin App Release - - - - Source - - wxWin App Release - Name - dnd.rc - Windows - - - wxWin App Release - Name - dnd.cpp - Windows - - - wx - - wxWin App Release - Name - wx_x86.lib - Windows - - - wxWin App Debug - Name - wx_x86_d.lib - MacOS - - - MSL ANSI Libraries - - wxWin App Release - Name - MSL_All_x86.lib - Windows - - - wxWin App Debug - Name - MSL_All_x86_D.lib - Windows - - - Win32 SDK - - wxWin App Release - Name - advapi32.lib - Windows - - - wxWin App Release - Name - COMCTL32.LIB - MacOS - - - wxWin App Release - Name - COMDLG32.LIB - MacOS - - - wxWin App Release - Name - GDI32.LIB - MacOS - - - wxWin App Release - Name - KERNEL32.LIB - MacOS - - - wxWin App Release - Name - odbc32.lib - Windows - - - wxWin App Release - Name - OLE32.LIB - MacOS - - - wxWin App Release - Name - rpcrt4.lib - Windows - - - wxWin App Release - Name - SHELL32.LIB - MacOS - - - wxWin App Release - Name - USER32.LIB - MacOS - - - wxWin App Release - Name - UUID.LIB - MacOS - - - wxWin App Release - Name - WINSPOOL.LIB - Windows - - - wxWin App Release - Name - WSOCK32.LIB - Windows - - - - - diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist index 3c1955b7a7..b196d7564f 100644 --- a/samples/docview/Info.plist +++ b/samples/docview/Info.plist @@ -51,7 +51,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.2, (c) 2005-2010 wxWidgets + $(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets CFBundleIconFile doc CFBundleIdentifier @@ -66,22 +66,22 @@ it CFBundleLongVersionString - 2.9.2, (c) 2005-2010 wxWidgets + 2.9.3, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.2 + 2.9.3 CFBundleSignature WXMA CFBundleVersion - 2.9.2 + 2.9.3 CSResourcesFileMapped LSRequiresCarbon NSHumanReadableCopyright - Copyright 2005-2010 wxWidgets + Copyright 2005-2011 wxWidgets diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp index 713a76d569..e093d82ae3 100644 --- a/samples/docview/doc.cpp +++ b/samples/docview/doc.cpp @@ -79,6 +79,16 @@ DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& istream) wxInt32 count = 0; stream >> count; + if ( count < 0 ) + { + wxLogWarning("Drawing document corrupted: invalid segments count."); +#if wxUSE_STD_IOSTREAM + istream.clear(std::ios::badbit); +#else + istream.Reset(wxSTREAM_READ_ERROR); +#endif + return istream; + } for ( int n = 0; n < count; n++ ) { @@ -250,7 +260,7 @@ wxTextCtrl* TextEditDocument::GetTextCtrl() const } // ---------------------------------------------------------------------------- -// ImageDocument and wxImageDetailsDocument implementation +// ImageDocument and ImageDetailsDocument implementation // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument) @@ -260,3 +270,29 @@ bool ImageDocument::DoOpenDocument(const wxString& file) return m_image.LoadFile(file); } +bool ImageDocument::OnOpenDocument(const wxString& filename) +{ + if ( !wxDocument::OnOpenDocument(filename) ) + return false; + + // we don't have a wxDocTemplate for the image details document as it's + // never created by wxWidgets automatically, instead just do it manually + ImageDetailsDocument * const docDetails = new ImageDetailsDocument(this); + docDetails->SetFilename(filename); + + new ImageDetailsView(docDetails); + + return true; +} + +ImageDetailsDocument::ImageDetailsDocument(ImageDocument *parent) + : wxDocument(parent) +{ + const wxImage image = parent->GetImage(); + + m_size.x = image.GetWidth(); + m_size.y = image.GetHeight(); + m_numColours = image.CountColours(); + m_type = image.GetType(); + m_hasAlpha = image.HasAlpha(); +} diff --git a/samples/docview/doc.h b/samples/docview/doc.h index d79f8275de..c654398222 100644 --- a/samples/docview/doc.h +++ b/samples/docview/doc.h @@ -198,14 +198,19 @@ public: }; // ---------------------------------------------------------------------------- -// A document class representing an image +// Image and image details document classes (both are read-only for simplicity) // ---------------------------------------------------------------------------- +// This is a normal document containing an image, just like TextEditDocument +// above contains some text. It can be created from an image file on disk as +// usual. class ImageDocument : public wxDocument { public: ImageDocument() : wxDocument() { } + virtual bool OnOpenDocument(const wxString& file); + wxImage GetImage() const { return m_image; } protected: @@ -218,4 +223,28 @@ private: DECLARE_DYNAMIC_CLASS(ImageDocument) }; +// This is a child document of ImageDocument: this document doesn't +// correspond to any file on disk, it's part of ImageDocument and can't be +// instantiated independently of it. +class ImageDetailsDocument : public wxDocument +{ +public: + ImageDetailsDocument(ImageDocument *parent); + + // accessors for ImageDetailsView + wxSize GetSize() const { return m_size; } + unsigned long GetNumColours() const { return m_numColours; } + wxBitmapType GetType() const { return m_type; } + bool HasAlpha() const { return m_hasAlpha; } + +private: + // some information about the image we choose to show to the user + wxSize m_size; + unsigned long m_numColours; + wxBitmapType m_type; + bool m_hasAlpha; + + wxDECLARE_NO_COPY_CLASS(ImageDetailsDocument); +}; + #endif // _WX_SAMPLES_DOCVIEW_DOC_H_ diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp index 57eeef7c52..287f7876dc 100644 --- a/samples/docview/docview.cpp +++ b/samples/docview/docview.cpp @@ -55,6 +55,7 @@ #include "view.h" #include "wx/cmdline.h" +#include "wx/config.h" #ifdef __WXMAC__ #include "wx/filename.h" @@ -150,7 +151,10 @@ bool MyApp::OnInit() ::wxInitAllImageHandlers(); - SetAppName("DocView Sample"); + // Fill in the application information fields before creating wxConfig. + SetVendorName("wxWidgets"); + SetAppName("wx_docview_sample"); + SetAppDisplayName("wxWidgets DocView Sample"); //// Create a document manager wxDocManager *docManager = new wxDocManager; @@ -217,6 +221,10 @@ bool MyApp::OnInit() // A nice touch: a history of files visited. Use this menu. docManager->FileHistoryUseMenu(menuFile); +#if wxUSE_CONFIG + docManager->FileHistoryLoad(*wxConfig::Get()); +#endif // wxUSE_CONFIG + if ( m_mode == Mode_Single ) { @@ -236,7 +244,11 @@ bool MyApp::OnInit() int MyApp::OnExit() { - delete wxDocManager::GetDocumentManager(); + wxDocManager * const manager = wxDocManager::GetDocumentManager(); +#if wxUSE_CONFIG + manager->FileHistorySave(*wxConfig::Get()); +#endif // wxUSE_CONFIG + delete manager; return wxApp::OnExit(); } diff --git a/samples/docview/docviewW7.xml b/samples/docview/docviewW7.xml deleted file mode 100644 index bf65343afa..0000000000 --- a/samples/docview/docviewW7.xml +++ /dev/null @@ -1,2028 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - wxWin App Release - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7msw\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorPentiumII - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics1 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo0 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0àIè¯J@|ð¯J@|ЁJDÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppRelease.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel4 - GlobalOptimizer_X86__optforSpeed - - - - Name - MSL_All_x86.lib - Windows - Unknown - Debug - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - wx_x86.lib - Windows - Library - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - docview.cpp - Windows - Text - Debug - - - Name - doc.cpp - Windows - Text - Debug - - - Name - docview.rc - Windows - Text - Debug - - - Name - view.cpp - Windows - Text - Debug - - - - - Name - wx_x86.lib - Windows - - - Name - MSL_All_x86.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - advapi32.lib - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - docview.cpp - Windows - - - Name - doc.cpp - Windows - - - Name - docview.rc - Windows - - - Name - view.cpp - Windows - - - - - wxWin App Debug - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7mswd\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLstrue - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo1 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0àIدJ@|à¯J@|•KDÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppDebug.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel0 - GlobalOptimizer_X86__optforSpeed - - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - MSL_All_x86_D.lib - Windows - Unknown - Debug - - - Name - wx_x86_d.lib - MacOS - Unknown - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - docview.cpp - Windows - Text - Debug - - - Name - doc.cpp - Windows - Text - Debug - - - Name - docview.rc - Windows - Text - Debug - - - Name - view.cpp - Windows - Text - Debug - - - - - Name - wx_x86_d.lib - MacOS - - - Name - MSL_All_x86_D.lib - Windows - - - Name - advapi32.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - docview.cpp - Windows - - - Name - doc.cpp - Windows - - - Name - docview.rc - Windows - - - Name - view.cpp - Windows - - - - - - - wxWin App Debug - wxWin App Release - - - - Source - - wxWin App Release - Name - docview.cpp - Windows - - - wxWin App Release - Name - doc.cpp - Windows - - - wxWin App Release - Name - docview.rc - Windows - - - wxWin App Release - Name - view.cpp - Windows - - - wx - - wxWin App Release - Name - wx_x86.lib - Windows - - - wxWin App Debug - Name - wx_x86_d.lib - MacOS - - - MSL ANSI Libraries - - wxWin App Release - Name - MSL_All_x86.lib - Windows - - - wxWin App Debug - Name - MSL_All_x86_D.lib - Windows - - - Win32 SDK - - wxWin App Release - Name - advapi32.lib - Windows - - - wxWin App Release - Name - COMCTL32.LIB - MacOS - - - wxWin App Release - Name - COMDLG32.LIB - MacOS - - - wxWin App Release - Name - GDI32.LIB - MacOS - - - wxWin App Release - Name - KERNEL32.LIB - MacOS - - - wxWin App Release - Name - odbc32.lib - Windows - - - wxWin App Release - Name - OLE32.LIB - MacOS - - - wxWin App Release - Name - rpcrt4.lib - Windows - - - wxWin App Release - Name - SHELL32.LIB - MacOS - - - wxWin App Release - Name - USER32.LIB - MacOS - - - wxWin App Release - Name - UUID.LIB - MacOS - - - wxWin App Release - Name - WINSPOOL.LIB - Windows - - - wxWin App Release - Name - WSOCK32.LIB - Windows - - - - - diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp index bfc5af2e91..555368aa7b 100644 --- a/samples/docview/view.cpp +++ b/samples/docview/view.cpp @@ -53,6 +53,7 @@ bool DrawingView::OnCreate(wxDocument *doc, long flags) wxFrame* frame = app.CreateChildFrame(this, true); wxASSERT(frame == GetFrame()); m_canvas = new MyCanvas(this); + frame->Show(); } else // single document mode { @@ -64,7 +65,6 @@ bool DrawingView::OnCreate(wxDocument *doc, long flags) doc->GetCommandProcessor()->SetEditMenu(app.GetMainWindowEditMenu()); doc->GetCommandProcessor()->Initialize(); } - GetFrame()->Show(); return true; } @@ -362,3 +362,76 @@ bool ImageView::OnClose(bool deleteWindow) return true; } +// ---------------------------------------------------------------------------- +// ImageDetailsView +// ---------------------------------------------------------------------------- + +ImageDetailsView::ImageDetailsView(ImageDetailsDocument *doc) + : wxView() +{ + SetDocument(doc); + + m_frame = wxGetApp().CreateChildFrame(this, false); + m_frame->SetTitle("Image Details"); + + wxPanel * const panel = new wxPanel(m_frame); + wxFlexGridSizer * const sizer = new wxFlexGridSizer(2, wxSize(5, 5)); + const wxSizerFlags + flags = wxSizerFlags().Align(wxALIGN_CENTRE_VERTICAL).Border(); + + sizer->Add(new wxStaticText(panel, wxID_ANY, "Image &file:"), flags); + sizer->Add(new wxStaticText(panel, wxID_ANY, doc->GetFilename()), flags); + + sizer->Add(new wxStaticText(panel, wxID_ANY, "Image &type:"), flags); + wxString typeStr; + switch ( doc->GetType() ) + { + case wxBITMAP_TYPE_PNG: + typeStr = "PNG"; + break; + + case wxBITMAP_TYPE_JPEG: + typeStr = "JPEG"; + break; + + default: + typeStr = "Unknown"; + } + sizer->Add(new wxStaticText(panel, wxID_ANY, typeStr), flags); + + sizer->Add(new wxStaticText(panel, wxID_ANY, "Image &size:"), flags); + wxSize size = doc->GetSize(); + sizer->Add(new wxStaticText(panel, wxID_ANY, + wxString::Format("%d*%d", size.x, size.y)), + flags); + + sizer->Add(new wxStaticText(panel, wxID_ANY, "Number of unique &colours:"), + flags); + sizer->Add(new wxStaticText(panel, wxID_ANY, + wxString::Format("%lu", doc->GetNumColours())), + flags); + + sizer->Add(new wxStaticText(panel, wxID_ANY, "Uses &alpha:"), flags); + sizer->Add(new wxStaticText(panel, wxID_ANY, + doc->HasAlpha() ? "Yes" : "No"), flags); + + panel->SetSizer(sizer); + m_frame->SetClientSize(panel->GetBestSize()); + m_frame->Show(true); +} + +void ImageDetailsView::OnDraw(wxDC * WXUNUSED(dc)) +{ + // nothing to do here, we use controls to show our information +} + +bool ImageDetailsView::OnClose(bool deleteWindow) +{ + if ( wxGetApp().GetMode() != MyApp::Mode_Single && deleteWindow ) + { + delete m_frame; + m_frame = NULL; + } + + return true; +} diff --git a/samples/docview/view.h b/samples/docview/view.h index 8bbc37c2ba..3ba84d8847 100644 --- a/samples/docview/view.h +++ b/samples/docview/view.h @@ -148,4 +148,22 @@ private: DECLARE_DYNAMIC_CLASS(ImageView) }; +// ---------------------------------------------------------------------------- +// ImageDetailsView +// ---------------------------------------------------------------------------- + +class ImageDetailsView : public wxView +{ +public: + ImageDetailsView(ImageDetailsDocument *doc); + + virtual void OnDraw(wxDC *dc); + virtual bool OnClose(bool deleteWindow); + +private: + wxFrame *m_frame; + + wxDECLARE_NO_COPY_CLASS(ImageDetailsView); +}; + #endif // _WX_SAMPLES_DOCVIEW_VIEW_H_ diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp index db5c14b430..c3364c7a0a 100644 --- a/samples/dragimag/dragimag.cpp +++ b/samples/dragimag/dragimag.cpp @@ -87,7 +87,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) void MyCanvas::OnEraseBackground(wxEraseEvent& event) { - if (wxGetApp().GetBackgroundBitmap().Ok()) + if (wxGetApp().GetBackgroundBitmap().IsOk()) { wxSize sz = GetClientSize(); wxRect rect(0, 0, sz.x, sz.y); @@ -468,7 +468,7 @@ bool DragShape::HitTest(const wxPoint& pt) const bool DragShape::Draw(wxDC& dc, bool highlight) { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { wxMemoryDC memDC; memDC.SelectObject(m_bitmap); @@ -498,7 +498,7 @@ bool MyDragImage::UpdateBackingFromWindow(wxDC& WXUNUSED(windowDC), wxMemoryDC& { destDC.SetClippingRegion(destRect); - if (wxGetApp().GetBackgroundBitmap().Ok()) + if (wxGetApp().GetBackgroundBitmap().IsOk()) wxGetApp().TileBitmap(destRect, destDC, wxGetApp().GetBackgroundBitmap()); m_canvas->DrawShapes(destDC); diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 3a4e689552..bf1a09c7ed 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -37,6 +37,7 @@ #include "wx/overlay.h" #include "wx/graphics.h" #include "wx/filename.h" +#include "wx/metafile.h" #define TEST_CAIRO_EVERYWHERE 0 @@ -101,6 +102,8 @@ public: #if wxUSE_GRAPHICS_CONTEXT void OnGraphicContext(wxCommandEvent& event); #endif + void OnCopy(wxCommandEvent& event); + void OnSave(wxCommandEvent& event); void OnShow(wxCommandEvent &event); void OnOption(wxCommandEvent &event); @@ -146,6 +149,7 @@ public: #if wxUSE_GRAPHICS_CONTEXT void UseGraphicContext(bool use) { m_useContext = use; Refresh(); } #endif + void Draw(wxDC& dc); protected: enum DrawMode @@ -224,6 +228,8 @@ enum #if wxUSE_GRAPHICS_CONTEXT File_GraphicContext, #endif + File_Copy, + File_Save, MenuOption_First, @@ -359,6 +365,9 @@ bool MyApp::OnInit() // still continue, the sample can be used without images too if they're // missing for whatever reason } +#if wxUSE_LIBPNG + wxImage::AddHandler( new wxPNGHandler ); +#endif return true; } @@ -580,7 +589,7 @@ void MyCanvas::DrawDefault(wxDC& dc) // rectangle above) //dc.SetBrush( *wxTRANSPARENT_BRUSH ); - if (m_smile_bmp.Ok()) + if (m_smile_bmp.IsOk()) dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, true); dc.SetBrush( *wxBLACK_BRUSH ); @@ -1468,7 +1477,7 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime) dc.SetBrush( *wxGREY_BRUSH ); dc.DrawRectangle( x, y, 310, 310 ); - if (m_smile_bmp.Ok()) + if (m_smile_bmp.IsOk()) { dc.DrawBitmap( m_smile_bmp, x + 150, y + 150, true ); dc.DrawBitmap( m_smile_bmp, x + 130, y + 10, true ); @@ -1478,21 +1487,47 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime) } } -#if TEST_CAIRO_EVERYWHERE -extern wxGraphicsRenderer* gCairoRenderer; -#endif - void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) { wxPaintDC pdc(this); + Draw(pdc); +} +void MyCanvas::Draw(wxDC& pdc) +{ #if wxUSE_GRAPHICS_CONTEXT -#if TEST_CAIRO_EVERYWHERE wxGCDC gdc; - gdc.SetGraphicsContext( gCairoRenderer->CreateContext( pdc ) ); + wxGraphicsRenderer* const renderer = wxGraphicsRenderer:: +#if TEST_CAIRO_EVERYWHERE + GetCairoRenderer() #else - wxGCDC gdc( pdc ) ; + GetDefaultRenderer() #endif + ; + + wxGraphicsContext* context; + if ( wxPaintDC *paintdc = wxDynamicCast(&pdc, wxPaintDC) ) + { + context = renderer->CreateContext(*paintdc); + } + else if ( wxMemoryDC *memdc = wxDynamicCast(&pdc, wxMemoryDC) ) + { + context = renderer->CreateContext(*memdc); + } +#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH) + else if ( wxMetafileDC *metadc = wxDynamicCast(&pdc, wxMetafileDC) ) + { + context = renderer->CreateContext(*metadc); + } +#endif + else + { + wxFAIL_MSG( "Unknown wxDC kind" ); + return; + } + + gdc.SetGraphicsContext(context); + wxDC &dc = m_useContext ? (wxDC&) gdc : (wxDC&) pdc ; #else wxDC &dc = pdc ; @@ -1503,15 +1538,15 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) m_owner->PrepareDC(dc); dc.SetBackgroundMode( m_owner->m_backgroundMode ); - if ( m_owner->m_backgroundBrush.Ok() ) + if ( m_owner->m_backgroundBrush.IsOk() ) dc.SetBackground( m_owner->m_backgroundBrush ); - if ( m_owner->m_colourForeground.Ok() ) + if ( m_owner->m_colourForeground.IsOk() ) dc.SetTextForeground( m_owner->m_colourForeground ); - if ( m_owner->m_colourBackground.Ok() ) + if ( m_owner->m_colourBackground.IsOk() ) dc.SetTextBackground( m_owner->m_colourBackground ); if ( m_owner->m_textureBackground) { - if ( ! m_owner->m_backgroundBrush.Ok() ) { + if ( ! m_owner->m_backgroundBrush.IsOk() ) { wxColour clr(0,128,0); wxBrush b(clr, wxSOLID); dc.SetBackground(b); @@ -1691,6 +1726,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if wxUSE_GRAPHICS_CONTEXT EVT_MENU (File_GraphicContext, MyFrame::OnGraphicContext) #endif + EVT_MENU (File_Copy, MyFrame::OnCopy) + EVT_MENU (File_Save, MyFrame::OnSave) EVT_MENU_RANGE(MenuShow_First, MenuShow_Last, MyFrame::OnShow) @@ -1719,7 +1756,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #if wxUSE_GRAPHICS_CONTEXT menuFile->Append(File_ShowAlpha, wxT("&Alpha screen\tF10")); #endif - menuFile->Append(File_ShowSplines, wxT("&Splines screen\tF11")); + menuFile->Append(File_ShowSplines, wxT("Spl&ines screen\tF11")); menuFile->Append(File_ShowGradients, wxT("&Gradients screen\tF12")); #if wxUSE_GRAPHICS_CONTEXT menuFile->Append(File_ShowGraphics, wxT("&Graphics screen")); @@ -1730,6 +1767,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuFile->AppendCheckItem(File_GraphicContext, wxT("&Use GraphicContext\tCtrl-Y"), wxT("Use GraphicContext")); #endif menuFile->AppendSeparator(); +#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH) + menuFile->Append(File_Copy, wxT("Copy to clipboard")); +#endif + menuFile->Append(File_Save, wxT("&Save...\tCtrl-S"), wxT("Save drawing to file")); + menuFile->AppendSeparator(); menuFile->Append(File_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog")); menuFile->AppendSeparator(); menuFile->Append(File_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); @@ -1836,6 +1878,38 @@ void MyFrame::OnGraphicContext(wxCommandEvent& event) } #endif +void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event)) +{ +#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH) + wxMetafileDC dc; + if (!dc.IsOk()) + return; + m_canvas->Draw(dc); + wxMetafile *mf = dc.Close(); + if (!mf) + return; + mf->SetClipboard(); + delete mf; +#endif +} + +void MyFrame::OnSave(wxCommandEvent& WXUNUSED(event)) +{ + wxFileDialog dlg(this, wxT("Save as bitmap"), wxT(""), wxT(""), +#if wxUSE_LIBPNG + wxT("PNG image (*.png)|*.png;*.PNG|") +#endif + wxT("Bitmap image (*.bmp)|*.bmp;*.BMP"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT); + if (dlg.ShowModal() == wxID_OK) + { + wxBitmap bmp(500, 800); + wxMemoryDC mdc(bmp); + m_canvas->Draw(mdc); + bmp.ConvertToImage().SaveFile(dlg.GetPath()); + } +} + void MyFrame::OnShow(wxCommandEvent& event) { m_canvas->ToShow(event.GetId()); @@ -1916,7 +1990,7 @@ void MyFrame::OnOption(wxCommandEvent& event) case Colour_Background: { wxColour col = SelectColour(); - if ( col.Ok() ) + if ( col.IsOk() ) { m_backgroundBrush.SetColour(col); } diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp index 6fe2ff9dd5..07aa3b0b3e 100644 --- a/samples/exec/exec.cpp +++ b/samples/exec/exec.cpp @@ -503,7 +503,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) m_lbox = new wxListBox(this, wxID_ANY); wxFont font(12, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); - if ( font.Ok() ) + if ( font.IsOk() ) m_lbox->SetFont(font); #if wxUSE_STATUSBAR @@ -1470,8 +1470,8 @@ void MyPipeFrame::DoGetFromStream(wxTextCtrl *text, wxInputStream& in) { while ( in.CanRead() ) { - wxChar buffer[4096]; - buffer[in.Read(buffer, WXSIZEOF(buffer) - 1).LastRead()] = wxT('\0'); + char buffer[4096]; + buffer[in.Read(buffer, WXSIZEOF(buffer) - 1).LastRead()] = '\0'; text->AppendText(buffer); } diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 0bd4df1c5b..fce11afd27 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -553,7 +553,7 @@ void MyFrame::OnSetNativeDesc(wxCommandEvent& WXUNUSED(event)) wxFont font; font.SetNativeFontInfo(fontInfo); - if ( !font.Ok() ) + if ( !font.IsOk() ) { wxLogError(wxT("Font info string \"%s\" is invalid."), fontInfo.c_str()); @@ -576,12 +576,12 @@ void MyFrame::OnSetNativeUserDesc(wxCommandEvent& WXUNUSED(event)) wxFont font; if (font.SetNativeFontInfoUserDesc(fontUserInfo)) { - wxASSERT_MSG(font.Ok(), wxT("The font should now be valid")); + wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid")); DoChangeFont(font); } else { - wxASSERT_MSG(!font.Ok(), wxT("The font should now be invalid")); + wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid")); wxMessageBox(wxT("Error trying to create a font with such description...")); } } @@ -608,12 +608,12 @@ void MyFrame::OnSetFaceName(wxCommandEvent& WXUNUSED(event)) wxFont font(GetCanvas()->GetTextFont()); if (font.SetFaceName(newFaceName)) // change facename only { - wxASSERT_MSG(font.Ok(), wxT("The font should now be valid")); + wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid")); DoChangeFont(font); } else { - wxASSERT_MSG(!font.Ok(), wxT("The font should now be invalid")); + wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid")); wxMessageBox(wxT("There is no font with such face name..."), wxT("Invalid face name"), wxOK|wxICON_ERROR, this); } @@ -806,12 +806,12 @@ void MyFrame::OnwxSystemSettingsFont(wxCommandEvent& event) void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col) { m_canvas->SetTextFont(font); - if ( col.Ok() ) + if ( col.IsOk() ) m_canvas->SetColour(col); m_canvas->Refresh(); m_textctrl->SetFont(font); - if ( col.Ok() ) + if ( col.IsOk() ) m_textctrl->SetForegroundColour(col); // update the state of the bold/italic/underlined menu items @@ -968,7 +968,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false /* !underlined */, wxEmptyString /* facename */, fontenc); - if ( font.Ok() ) + if ( font.IsOk() ) { DoChangeFont(font); } @@ -1047,7 +1047,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawText(fontInfo, x, y); y += hLine; - if ( m_font.Ok() ) + if ( m_font.IsOk() ) { const wxNativeFontInfo *info = m_font.GetNativeFontInfo(); if ( info ) diff --git a/samples/fswatcher/fswatcher.cpp b/samples/fswatcher/fswatcher.cpp index 8e4132192e..96f724b050 100644 --- a/samples/fswatcher/fswatcher.cpp +++ b/samples/fswatcher/fswatcher.cpp @@ -32,7 +32,9 @@ public: MyFrame(const wxString& title); virtual ~MyFrame(); - void AddDirectory(const wxString& dir); + // Add an entry of the specified type asking the user for the filename if + // the one passed to this function is empty. + void AddEntry(wxFSWPathType type, wxString filename = wxString()); bool CreateWatcherIfNecessary(); @@ -47,6 +49,7 @@ private: void OnAbout(wxCommandEvent& event); void OnAdd(wxCommandEvent& event); + void OnAddTree(wxCommandEvent& event); void OnRemove(wxCommandEvent& event); void OnFileSystemEvent(wxFileSystemWatcherEvent& event); @@ -87,7 +90,7 @@ public: if ( m_frame->CreateWatcherIfNecessary() ) { if ( !m_dirToWatch.empty() ) - m_frame->AddDirectory(m_dirToWatch); + m_frame->AddEntry(wxFSWPath_Dir, m_dirToWatch); } } @@ -144,7 +147,8 @@ MyFrame::MyFrame(const wxString& title) MENU_ID_WATCH = 101, BTN_ID_ADD = 200, - BTN_ID_REMOVE = 201, + BTN_ID_ADD_TREE, + BTN_ID_REMOVE }; // ================================================================ @@ -194,9 +198,11 @@ MyFrame::MyFrame(const wxString& title) // buttons wxButton* buttonAdd = new wxButton(panel, BTN_ID_ADD, "&Add"); + wxButton* buttonAddTree = new wxButton(panel, BTN_ID_ADD_TREE, "Add &tree"); wxButton* buttonRemove = new wxButton(panel, BTN_ID_REMOVE, "&Remove"); wxSizer *btnSizer = new wxGridSizer(2); btnSizer->Add(buttonAdd, wxSizerFlags().Center().Border(wxALL)); + btnSizer->Add(buttonAddTree, wxSizerFlags().Center().Border(wxALL)); btnSizer->Add(buttonRemove, wxSizerFlags().Center().Border(wxALL)); // and put it all together @@ -253,6 +259,8 @@ MyFrame::MyFrame(const wxString& title) // buttons Connect(BTN_ID_ADD, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MyFrame::OnAdd)); + Connect(BTN_ID_ADD_TREE, wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(MyFrame::OnAddTree)); Connect(BTN_ID_REMOVE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MyFrame::OnRemove)); @@ -318,29 +326,54 @@ void MyFrame::OnWatch(wxCommandEvent& event) void MyFrame::OnAdd(wxCommandEvent& WXUNUSED(event)) { - wxCHECK_RET(m_watcher, "Watcher not initialized"); - - // TODO account for adding the files as well - const wxString& dir = wxDirSelector("Choose a folder to watch", "", - wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); - if ( dir.empty() ) - return; - - AddDirectory(dir); + AddEntry(wxFSWPath_Dir); } -void MyFrame::AddDirectory(const wxString& dir) +void MyFrame::OnAddTree(wxCommandEvent& WXUNUSED(event)) { - wxLogDebug("Adding directory: '%s'", dir); + AddEntry(wxFSWPath_Tree); +} - if (!m_watcher->Add(wxFileName::DirName(dir), wxFSW_EVENT_ALL)) +void MyFrame::AddEntry(wxFSWPathType type, wxString filename) +{ + if ( filename.empty() ) { - wxLogError("Error adding '%s' to watched paths", dir); + // TODO account for adding the files as well + filename = wxDirSelector("Choose a folder to watch", "", + wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); + if ( filename.empty() ) + return; } - else + + wxCHECK_RET(m_watcher, "Watcher not initialized"); + + wxLogDebug("Adding %s: '%s'", + filename, + type == wxFSWPath_Dir ? "directory" : "directory tree"); + + bool ok = false; + switch ( type ) { - m_filesList->InsertItem(m_filesList->GetItemCount(), dir); + case wxFSWPath_Dir: + ok = m_watcher->Add(wxFileName::DirName(filename)); + break; + + case wxFSWPath_Tree: + ok = m_watcher->AddTree(wxFileName::DirName(filename)); + break; + + case wxFSWPath_File: + case wxFSWPath_None: + wxFAIL_MSG( "Unexpected path type." ); } + + if (!ok) + { + wxLogError("Error adding '%s' to watched paths", filename); + return; + } + + m_filesList->InsertItem(m_filesList->GetItemCount(), filename); } void MyFrame::OnRemove(wxCommandEvent& WXUNUSED(event)) diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp index 4b2353dec6..93b1d95155 100644 --- a/samples/grid/griddemo.cpp +++ b/samples/grid/griddemo.cpp @@ -702,7 +702,7 @@ void GridFrame::SetLabelTextColour( wxCommandEvent& WXUNUSED(ev) ) void GridFrame::SetLabelFont( wxCommandEvent& WXUNUSED(ev) ) { wxFont font = wxGetFontFromUser(this); - if ( font.Ok() ) + if ( font.IsOk() ) { grid->SetLabelFont(font); } @@ -945,7 +945,7 @@ void GridFrame::SelectRowsOrCols( wxCommandEvent& WXUNUSED(ev) ) void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) ) { wxColour col = wxGetColourFromUser(this); - if ( col.Ok() ) + if ( col.IsOk() ) { grid->SetDefaultCellTextColour(col); grid->Refresh(); @@ -955,7 +955,7 @@ void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) ) void GridFrame::SetCellBgColour( wxCommandEvent& WXUNUSED(ev) ) { wxColour col = wxGetColourFromUser(this); - if ( col.Ok() ) + if ( col.IsOk() ) { // Check the new Refresh function by passing it a rectangle // which exactly fits the grid. diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp index 091a1d77aa..6ffdb33017 100644 --- a/samples/htlbox/htlbox.cpp +++ b/samples/htlbox/htlbox.cpp @@ -449,7 +449,7 @@ void MyFrame::OnGetItemRect(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_hlbox->GetBackgroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) { m_hlbox->SetBackgroundColour(col); m_hlbox->Refresh(); @@ -463,7 +463,7 @@ void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSetSelBgCol(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_hlbox->GetSelectionBackground()); - if ( col.Ok() ) + if ( col.IsOk() ) { m_hlbox->SetSelectionBackground(col); m_hlbox->Refresh(); diff --git a/samples/image/canvas.cpp b/samples/image/canvas.cpp index 5b98dcf07b..3bff81316f 100644 --- a/samples/image/canvas.cpp +++ b/samples/image/canvas.cpp @@ -272,7 +272,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, smile_height, 1 ); // demonstrates XPM automatically using the mask when saving - if ( m_bmpSmileXpm.Ok() ) + if ( m_bmpSmileXpm.IsOk() ) m_bmpSmileXpm.SaveFile(wxT("saved.xpm"), wxBITMAP_TYPE_XPM); #if wxUSE_ICO_CUR @@ -389,7 +389,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) PrepareDC( dc ); dc.DrawText( wxT("Loaded image"), 30, 10 ); - if (my_square.Ok()) + if (my_square.IsOk()) dc.DrawBitmap( my_square, 30, 30 ); dc.DrawText( wxT("Drawn directly"), 150, 10 ); @@ -399,11 +399,11 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetBrush( *wxWHITE_BRUSH ); dc.DrawRectangle( 170, 50, 60, 60 ); - if (my_anti.Ok()) + if (my_anti.IsOk()) dc.DrawBitmap( my_anti, 280, 30 ); dc.DrawText( wxT("PNG handler"), 30, 135 ); - if (my_horse_png.Ok()) + if (my_horse_png.IsOk()) { dc.DrawBitmap( my_horse_png, 30, 150 ); wxRect rect(0,0,100,100); @@ -413,55 +413,55 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) } dc.DrawText( wxT("JPEG handler"), 30, 365 ); - if (my_horse_jpeg.Ok()) + if (my_horse_jpeg.IsOk()) dc.DrawBitmap( my_horse_jpeg, 30, 380 ); dc.DrawText( wxT("Green rotated to red"), 280, 365 ); - if (colorized_horse_jpeg.Ok()) + if (colorized_horse_jpeg.IsOk()) dc.DrawBitmap( colorized_horse_jpeg, 280, 380 ); dc.DrawText( wxT("CMYK JPEG image"), 530, 365 ); - if (my_cmyk_jpeg.Ok()) + if (my_cmyk_jpeg.IsOk()) dc.DrawBitmap( my_cmyk_jpeg, 530, 380 ); dc.DrawText( wxT("GIF handler"), 30, 595 ); - if (my_horse_gif.Ok()) + if (my_horse_gif.IsOk()) dc.DrawBitmap( my_horse_gif, 30, 610 ); dc.DrawText( wxT("PCX handler"), 30, 825 ); - if (my_horse_pcx.Ok()) + if (my_horse_pcx.IsOk()) dc.DrawBitmap( my_horse_pcx, 30, 840 ); dc.DrawText( wxT("BMP handler"), 30, 1055 ); - if (my_horse_bmp.Ok()) + if (my_horse_bmp.IsOk()) dc.DrawBitmap( my_horse_bmp, 30, 1070 ); dc.DrawText( wxT("BMP read from memory"), 280, 1055 ); - if (my_horse_bmp2.Ok()) + if (my_horse_bmp2.IsOk()) dc.DrawBitmap( my_horse_bmp2, 280, 1070 ); dc.DrawText( wxT("PNM handler"), 30, 1285 ); - if (my_horse_pnm.Ok()) + if (my_horse_pnm.IsOk()) dc.DrawBitmap( my_horse_pnm, 30, 1300 ); dc.DrawText( wxT("PNM handler (ascii grey)"), 280, 1285 ); - if (my_horse_asciigrey_pnm.Ok()) + if (my_horse_asciigrey_pnm.IsOk()) dc.DrawBitmap( my_horse_asciigrey_pnm, 280, 1300 ); dc.DrawText( wxT("PNM handler (raw grey)"), 530, 1285 ); - if (my_horse_rawgrey_pnm.Ok()) + if (my_horse_rawgrey_pnm.IsOk()) dc.DrawBitmap( my_horse_rawgrey_pnm, 530, 1300 ); dc.DrawText( wxT("TIFF handler"), 30, 1515 ); - if (my_horse_tiff.Ok()) + if (my_horse_tiff.IsOk()) dc.DrawBitmap( my_horse_tiff, 30, 1530 ); dc.DrawText( wxT("TGA handler"), 30, 1745 ); - if (my_horse_tga.Ok()) + if (my_horse_tga.IsOk()) dc.DrawBitmap( my_horse_tga, 30, 1760 ); dc.DrawText( wxT("XPM handler"), 30, 1975 ); - if (my_horse_xpm.Ok()) + if (my_horse_xpm.IsOk()) dc.DrawBitmap( my_horse_xpm, 30, 2000 ); // toucans @@ -501,7 +501,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawBitmap(my_toucan_blur, x, y+15, true); } - if (my_smile_xbm.Ok()) + if (my_smile_xbm.IsOk()) { int x = 300, y = 1800; @@ -543,7 +543,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) memdc.DrawLine( 5, 42, 50, 42 ); memdc.SelectObject( wxNullBitmap ); - if (mono.Ok()) + if (mono.IsOk()) { int x = 300, y = 1900; @@ -572,20 +572,20 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawRectangle( 20, 2220, 560, 68 ); dc.DrawText(wxT("XPM bitmap"), 30, 2230 ); - if ( m_bmpSmileXpm.Ok() ) + if ( m_bmpSmileXpm.IsOk() ) dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, true); dc.DrawText(wxT("XPM icon"), 110, 2230 ); - if ( m_iconSmileXpm.Ok() ) + if ( m_iconSmileXpm.IsOk() ) dc.DrawIcon(m_iconSmileXpm, 110, 2250); // testing icon -> bitmap conversion wxBitmap to_blit( m_iconSmileXpm ); - if (to_blit.Ok()) + if (to_blit.IsOk()) { dc.DrawText( wxT("SubBitmap"), 170, 2230 ); wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) ); - if (sub.Ok()) + if (sub.IsOk()) dc.DrawBitmap( sub, 170, 2250, true ); dc.DrawText( wxT("Enlarged"), 250, 2230 ); @@ -607,19 +607,19 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) } dc.DrawText( wxT("ICO handler (1st image)"), 30, 2290 ); - if (my_horse_ico32.Ok()) + if (my_horse_ico32.IsOk()) dc.DrawBitmap( my_horse_ico32, 30, 2330, true ); dc.DrawText( wxT("ICO handler (2nd image)"), 230, 2290 ); - if (my_horse_ico16.Ok()) + if (my_horse_ico16.IsOk()) dc.DrawBitmap( my_horse_ico16, 230, 2330, true ); dc.DrawText( wxT("ICO handler (best image)"), 430, 2290 ); - if (my_horse_ico.Ok()) + if (my_horse_ico.IsOk()) dc.DrawBitmap( my_horse_ico, 430, 2330, true ); dc.DrawText( wxT("CUR handler"), 30, 2390 ); - if (my_horse_cur.Ok()) + if (my_horse_cur.IsOk()) { dc.DrawBitmap( my_horse_cur, 30, 2420, true ); dc.SetPen (*wxRED_PEN); @@ -630,7 +630,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawText( wxT("ANI handler"), 230, 2390 ); for ( int i=0; i < m_ani_images; i++ ) { - if (my_horse_ani[i].Ok()) + if (my_horse_ani[i].IsOk()) { dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true ); } diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 9ba854ebe6..7fa9637561 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -407,7 +407,7 @@ private: wxImage img(m_bitmap.ConvertToImage()); img = img.Rotate(angle, wxPoint(img.GetWidth() / 2, img.GetHeight() / 2)); - if ( !img.Ok() ) + if ( !img.IsOk() ) { wxLogWarning(wxT("Rotation failed")); return; diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index dc715e643b..0536b20076 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -70,13 +70,13 @@ const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] = static const int NUM_ICONS = 9; int wxCALLBACK -MyCompareFunction(long item1, long item2, wxIntPtr WXUNUSED(sortData)) +MyCompareFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr WXUNUSED(sortData)) { // inverse the order if (item1 < item2) - return -1; - if (item1 > item2) return 1; + if (item1 > item2) + return -1; return 0; } diff --git a/samples/minimal/Info_carbon.plist b/samples/minimal/Info_carbon.plist new file mode 100644 index 0000000000..46cabbc52f --- /dev/null +++ b/samples/minimal/Info_carbon.plist @@ -0,0 +1,39 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + $(PRODUCT_NAME) + CFBundleGetInfoString + $(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets + CFBundleIconFile + wxmac.icns + CFBundleIdentifier + org.wxwidgets.samples.$(PRODUCT_NAME) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLocalizations + + de + en + fr + it + + CFBundleLongVersionString + 2.9.3, (c) 2005-2011 wxWidgets + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 2.9.3 + CFBundleSignature + ???? + CFBundleVersion + 2.9.3 + NSHumanReadableCopyright + Copyright 2005-2011 wxWidgets + + diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist new file mode 100644 index 0000000000..46cabbc52f --- /dev/null +++ b/samples/minimal/Info_cocoa.plist @@ -0,0 +1,39 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + $(PRODUCT_NAME) + CFBundleGetInfoString + $(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets + CFBundleIconFile + wxmac.icns + CFBundleIdentifier + org.wxwidgets.samples.$(PRODUCT_NAME) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLocalizations + + de + en + fr + it + + CFBundleLongVersionString + 2.9.3, (c) 2005-2011 wxWidgets + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 2.9.3 + CFBundleSignature + ???? + CFBundleVersion + 2.9.3 + NSHumanReadableCopyright + Copyright 2005-2011 wxWidgets + + diff --git a/samples/minimal/Info_iphone.plist b/samples/minimal/Info_iphone.plist new file mode 100644 index 0000000000..b7c3d6a16e --- /dev/null +++ b/samples/minimal/Info_iphone.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + + CFBundleIdentifier + com.yourcompany.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + NSMainNibFile + + + diff --git a/samples/minimal/minimal.xcode/project.pbxproj b/samples/minimal/minimal.xcode/project.pbxproj deleted file mode 100644 index f7140f2138..0000000000 --- a/samples/minimal/minimal.xcode/project.pbxproj +++ /dev/null @@ -1,825 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 39; - objects = { - 05952DFCFFF02D1B11CA0E50 = { - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; - ZERO_LINK = YES; - }; - isa = PBXBuildStyle; - name = Development; - }; - 05952DFDFFF02D1B11CA0E50 = { - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - ZERO_LINK = NO; - }; - isa = PBXBuildStyle; - name = Deployment; - }; -//050 -//051 -//052 -//053 -//054 -//190 -//191 -//192 -//193 -//194 - 195DF8C9FE9D4F0611CA2CBB = { - children = ( - 4086D0F0063BBC5B00D4CD53, - 4086D100063BBC5C00D4CD53, - 4086D110063BBC5C00D4CD53, - 4086D120063BBC5C00D4CD53, - ); - isa = PBXGroup; - name = Products; - refType = 4; - sourceTree = ""; - }; -//190 -//191 -//192 -//193 -//194 -//200 -//201 -//202 -//203 -//204 - 20286C28FDCF999611CA2CEA = { - buildSettings = { - }; - buildStyles = ( - 05952DFCFFF02D1B11CA0E50, - 05952DFDFFF02D1B11CA0E50, - ); - hasScannedForEncodings = 1; - isa = PBXProject; - mainGroup = 20286C29FDCF999611CA2CEA; - projectDirPath = ""; - targets = ( - 4086D0E2063BBC5B00D4CD53, - 4086D0F2063BBC5B00D4CD53, - 4086D102063BBC5C00D4CD53, - 4086D112063BBC5C00D4CD53, - 405DD1B0063CD57F00F579EE, - ); - }; - 20286C29FDCF999611CA2CEA = { - children = ( - 20286C2AFDCF999611CA2CEA, - 20286C2CFDCF999611CA2CEA, - 20286C32FDCF999611CA2CEA, - 195DF8C9FE9D4F0611CA2CBB, - 4086D0EF063BBC5B00D4CD53, - ); - isa = PBXGroup; - name = "¬´PROJECTNAME»"; - path = ""; - refType = 4; - sourceTree = ""; - }; - 20286C2AFDCF999611CA2CEA = { - children = ( - F591E05701FCC5DE01000133, - ); - isa = PBXGroup; - name = Sources; - path = ""; - refType = 4; - sourceTree = ""; - }; - 20286C2CFDCF999611CA2CEA = { - children = ( - F5F5A69A02CDB0E101000133, - ); - isa = PBXGroup; - name = Resources; - path = ""; - refType = 4; - sourceTree = ""; - }; - 20286C32FDCF999611CA2CEA = { - children = ( - F5F5A69602CDB02701000133, - F5A0C6B502CF7C9601000133, - CA89578E04D706FC00000080, - CA89596C04D79FED00000080, - 20286C33FDCF999611CA2CEA, - CA60173504D423C000000080, - 40B6DFF2063CD7B000442FB3, - ); - isa = PBXGroup; - name = "External Frameworks and Libraries"; - path = ""; - refType = 4; - sourceTree = ""; - }; - 20286C33FDCF999611CA2CEA = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Carbon.framework; - path = /System/Library/Frameworks/Carbon.framework; - refType = 0; - sourceTree = ""; - }; -//200 -//201 -//202 -//203 -//204 -//400 -//401 -//402 -//403 -//404 - 405DD1B0063CD57F00F579EE = { - buildPhases = ( - ); - buildSettings = { - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = "Build All"; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - }; - dependencies = ( - 405DD1C2063CD5B500F579EE, - 405DD1C4063CD5B500F579EE, - 405DD1C6063CD5B500F579EE, - 405DD1C8063CD5B500F579EE, - ); - isa = PBXAggregateTarget; - name = "Build All"; - productName = "Build All"; - }; - 405DD1C1063CD5B500F579EE = { - containerPortal = 20286C28FDCF999611CA2CEA; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = 4086D0E2063BBC5B00D4CD53; - remoteInfo = StaticDebug; - }; - 405DD1C2063CD5B500F579EE = { - isa = PBXTargetDependency; - target = 4086D0E2063BBC5B00D4CD53; - targetProxy = 405DD1C1063CD5B500F579EE; - }; - 405DD1C3063CD5B500F579EE = { - containerPortal = 20286C28FDCF999611CA2CEA; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = 4086D0F2063BBC5B00D4CD53; - remoteInfo = StaticRelease; - }; - 405DD1C4063CD5B500F579EE = { - isa = PBXTargetDependency; - target = 4086D0F2063BBC5B00D4CD53; - targetProxy = 405DD1C3063CD5B500F579EE; - }; - 405DD1C5063CD5B500F579EE = { - containerPortal = 20286C28FDCF999611CA2CEA; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = 4086D102063BBC5C00D4CD53; - remoteInfo = DynamicDebug; - }; - 405DD1C6063CD5B500F579EE = { - isa = PBXTargetDependency; - target = 4086D102063BBC5C00D4CD53; - targetProxy = 405DD1C5063CD5B500F579EE; - }; - 405DD1C7063CD5B500F579EE = { - containerPortal = 20286C28FDCF999611CA2CEA; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = 4086D112063BBC5C00D4CD53; - remoteInfo = DynamicRelease; - }; - 405DD1C8063CD5B500F579EE = { - isa = PBXTargetDependency; - target = 4086D112063BBC5C00D4CD53; - targetProxy = 405DD1C7063CD5B500F579EE; - }; - 4086D0E2063BBC5B00D4CD53 = { - buildPhases = ( - 4086D0E3063BBC5B00D4CD53, - 4086D0E4063BBC5B00D4CD53, - 4086D0E6063BBC5B00D4CD53, - 4086D0E8063BBC5B00D4CD53, - 4086D0ED063BBC5B00D4CD53, - ); - buildRules = ( - ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; - GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ __WXMAC__ _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1"; - HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxStaticDebug.build/DerivedSources/include ../../src/build/include ../../include . - /usr/include"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ../../src/build; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_RESMERGERFLAGS = "-srcIs DF"; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = minimalStaticDebug; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - WRAPPER_EXTENSION = app; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = StaticDebug; - productInstallPath = "$(HOME)/Applications"; - productName = minimalStaticDebug; - productReference = 4086D0F0063BBC5B00D4CD53; - productType = "com.apple.product-type.application"; - }; - 4086D0E3063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0E4063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D0E5063BBC5B00D4CD53, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0E5063BBC5B00D4CD53 = { - fileRef = F5F5A69A02CDB0E101000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0E6063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D0E7063BBC5B00D4CD53, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0E7063BBC5B00D4CD53 = { - fileRef = F591E05701FCC5DE01000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0E8063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D0E9063BBC5B00D4CD53, - 4086D0EB063BBC5B00D4CD53, - 4086D0EC063BBC5B00D4CD53, - 40B6DFF3063CD7B000442FB3, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0E9063BBC5B00D4CD53 = { - fileRef = 20286C33FDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0EB063BBC5B00D4CD53 = { - fileRef = F5F5A69602CDB02701000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0EC063BBC5B00D4CD53 = { - fileRef = CA60173504D423C000000080; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0ED063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXRezBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0EF063BBC5B00D4CD53 = { - isa = PBXFileReference; - lastKnownFileType = text.xml; - path = Info.plist; - refType = 4; - sourceTree = ""; - }; - 4086D0F0063BBC5B00D4CD53 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = minimalStaticDebug.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4086D0F2063BBC5B00D4CD53 = { - buildPhases = ( - 4086D0F3063BBC5B00D4CD53, - 4086D0F4063BBC5B00D4CD53, - 4086D0F6063BBC5B00D4CD53, - 4086D0F8063BBC5B00D4CD53, - 4086D0FD063BBC5B00D4CD53, - ); - buildRules = ( - ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; - GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXMAC__ _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1"; - HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxStaticRelease.build/DerivedSources/include ../../include ../../src/build/include . - /usr/include"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ../../src/build; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_RESMERGERFLAGS = "-srcIs DF"; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = minimalStaticRelease; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - WRAPPER_EXTENSION = app; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = StaticRelease; - productInstallPath = "$(HOME)/Applications"; - productName = minimalStaticDebug; - productReference = 4086D100063BBC5C00D4CD53; - productType = "com.apple.product-type.application"; - }; - 4086D0F3063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0F4063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D0F5063BBC5B00D4CD53, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0F5063BBC5B00D4CD53 = { - fileRef = F5F5A69A02CDB0E101000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0F6063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D0F7063BBC5B00D4CD53, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0F7063BBC5B00D4CD53 = { - fileRef = F591E05701FCC5DE01000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0F8063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D0F9063BBC5B00D4CD53, - 4086D0FB063BBC5B00D4CD53, - 4086D0FC063BBC5B00D4CD53, - 40B6DFF4063CD7B000442FB3, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D0F9063BBC5B00D4CD53 = { - fileRef = 20286C33FDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0FB063BBC5B00D4CD53 = { - fileRef = F5A0C6B502CF7C9601000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0FC063BBC5B00D4CD53 = { - fileRef = CA60173504D423C000000080; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D0FD063BBC5B00D4CD53 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXRezBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D100063BBC5C00D4CD53 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = minimalStaticRelease.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4086D102063BBC5C00D4CD53 = { - buildPhases = ( - 40ADC58D081629DD0009DA36, - 4086D103063BBC5C00D4CD53, - 4086D104063BBC5C00D4CD53, - 4086D106063BBC5C00D4CD53, - 4086D108063BBC5C00D4CD53, - 4086D10D063BBC5C00D4CD53, - ); - buildRules = ( - ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; - GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ WXUSINGDLL __WXMAC__ _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1"; - HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxDynamicDebug.build/DerivedSources/include ../../include ../../src/build/include . - /usr/include"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ../../src/build; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_RESMERGERFLAGS = "-srcIs DF"; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = minimalDynamicDebug; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - WRAPPER_EXTENSION = app; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = DynamicDebug; - productInstallPath = "$(HOME)/Applications"; - productName = minimalDynamicDebug; - productReference = 4086D110063BBC5C00D4CD53; - productType = "com.apple.product-type.application"; - }; - 4086D103063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D104063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D105063BBC5C00D4CD53, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D105063BBC5C00D4CD53 = { - fileRef = F5F5A69A02CDB0E101000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D106063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D107063BBC5C00D4CD53, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D107063BBC5C00D4CD53 = { - fileRef = F591E05701FCC5DE01000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D108063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D109063BBC5C00D4CD53, - 4086D10B063BBC5C00D4CD53, - 4086D10C063BBC5C00D4CD53, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D109063BBC5C00D4CD53 = { - fileRef = 20286C33FDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D10B063BBC5C00D4CD53 = { - fileRef = CA60173504D423C000000080; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D10C063BBC5C00D4CD53 = { - fileRef = CA89578E04D706FC00000080; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D10D063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXRezBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D110063BBC5C00D4CD53 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = minimalDynamicDebug.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4086D112063BBC5C00D4CD53 = { - buildPhases = ( - 40ADC6C508163A7C0009DA36, - 4086D113063BBC5C00D4CD53, - 4086D114063BBC5C00D4CD53, - 4086D116063BBC5C00D4CD53, - 4086D118063BBC5C00D4CD53, - 4086D11D063BBC5C00D4CD53, - ); - buildRules = ( - ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; - GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA WXUSINGDLL __WXMAC__ _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1"; - HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxDynamicRelease.build/DerivedSources/include ../../include ../../src/build/include . - /usr/include"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ../../src/build; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_RESMERGERFLAGS = "-srcIs DF"; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = minimalDynamicRelease; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - WRAPPER_EXTENSION = app; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = DynamicRelease; - productInstallPath = "$(HOME)/Applications"; - productName = minimalDynamicRelease; - productReference = 4086D120063BBC5C00D4CD53; - productType = "com.apple.product-type.application"; - }; - 4086D113063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D114063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D115063BBC5C00D4CD53, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D115063BBC5C00D4CD53 = { - fileRef = F5F5A69A02CDB0E101000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D116063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D117063BBC5C00D4CD53, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D117063BBC5C00D4CD53 = { - fileRef = F591E05701FCC5DE01000133; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D118063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - 4086D119063BBC5C00D4CD53, - 4086D11B063BBC5C00D4CD53, - 4086D11C063BBC5C00D4CD53, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D119063BBC5C00D4CD53 = { - fileRef = 20286C33FDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D11B063BBC5C00D4CD53 = { - fileRef = CA60173504D423C000000080; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D11C063BBC5C00D4CD53 = { - fileRef = CA89596C04D79FED00000080; - isa = PBXBuildFile; - settings = { - }; - }; - 4086D11D063BBC5C00D4CD53 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXRezBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D120063BBC5C00D4CD53 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = minimalDynamicRelease.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 40ADC58D081629DD0009DA36 = { - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 40ADC58E081629E80009DA36, - ); - isa = PBXCopyFilesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 40ADC58E081629E80009DA36 = { - fileRef = CA89578E04D706FC00000080; - isa = PBXBuildFile; - settings = { - }; - }; - 40ADC6C508163A7C0009DA36 = { - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 40ADC6C608163A8B0009DA36, - ); - isa = PBXCopyFilesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 40ADC6C608163A8B0009DA36 = { - fileRef = CA89596C04D79FED00000080; - isa = PBXBuildFile; - settings = { - }; - }; - 40B6DFF2063CD7B000442FB3 = { - isa = PBXFileReference; - lastKnownFileType = "compiled.mach-o.dylib"; - name = libiconv.dylib; - path = /usr/lib/libiconv.dylib; - refType = 0; - sourceTree = ""; - }; - 40B6DFF3063CD7B000442FB3 = { - fileRef = 40B6DFF2063CD7B000442FB3; - isa = PBXBuildFile; - settings = { - }; - }; - 40B6DFF4063CD7B000442FB3 = { - fileRef = 40B6DFF2063CD7B000442FB3; - isa = PBXBuildFile; - settings = { - }; - }; -//400 -//401 -//402 -//403 -//404 -//CA0 -//CA1 -//CA2 -//CA3 -//CA4 - CA60173504D423C000000080 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = System.framework; - path = /System/Library/Frameworks/System.framework; - refType = 0; - sourceTree = ""; - }; - CA89578E04D706FC00000080 = { - explicitFileType = "compiled.mach-o.dylib"; - isa = PBXFileReference; - name = libwx_macd.dylib; - path = ../../src/build/libwx_macd.dylib; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - CA89596C04D79FED00000080 = { - isa = PBXFileReference; - lastKnownFileType = "compiled.mach-o.dylib"; - name = libwx_mac.dylib; - path = ../../src/build/libwx_mac.dylib; - refType = 2; - sourceTree = SOURCE_ROOT; - }; -//CA0 -//CA1 -//CA2 -//CA3 -//CA4 -//F50 -//F51 -//F52 -//F53 -//F54 - F591E05701FCC5DE01000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = minimal.cpp; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - F5A0C6B502CF7C9601000133 = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = libwx_mac.a; - path = ../../src/build/libwx_mac.a; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - F5F5A69602CDB02701000133 = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = libwx_macd.a; - path = ../../src/build/libwx_macd.a; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - F5F5A69A02CDB0E101000133 = { - isa = PBXFileReference; - lastKnownFileType = image.icns; - name = wxmac.icns; - path = ../../src/mac/wxmac.icns; - refType = 2; - sourceTree = SOURCE_ROOT; - }; - }; - rootObject = 20286C28FDCF999611CA2CEA; -} diff --git a/samples/minimal/minimal.xcodeproj/project.pbxproj b/samples/minimal/minimal.xcodeproj/project.pbxproj deleted file mode 100644 index c7372d6f08..0000000000 --- a/samples/minimal/minimal.xcodeproj/project.pbxproj +++ /dev/null @@ -1,672 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXAggregateTarget section */ - 405DD1B0063CD57F00F579EE /* Build All */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 1842CAB008565A280032BCF7 /* Build configuration list for PBXAggregateTarget "Build All" */; - buildPhases = ( - ); - dependencies = ( - 405DD1C2063CD5B500F579EE /* PBXTargetDependency */, - 405DD1C6063CD5B500F579EE /* PBXTargetDependency */, - ); - name = "Build All"; - productName = "Build All"; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 1842CAFB085664390032BCF7 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF7085664390032BCF7 /* AGL.framework */; }; - 1842CAFC085664390032BCF7 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF8085664390032BCF7 /* IOKit.framework */; }; - 1842CAFD085664390032BCF7 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF9085664390032BCF7 /* OpenGL.framework */; }; - 1842CAFE085664390032BCF7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAFA085664390032BCF7 /* WebKit.framework */; }; - 1842CAFF085664390032BCF7 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF7085664390032BCF7 /* AGL.framework */; }; - 1842CB00085664390032BCF7 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF8085664390032BCF7 /* IOKit.framework */; }; - 1842CB01085664390032BCF7 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF9085664390032BCF7 /* OpenGL.framework */; }; - 1842CB02085664390032BCF7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAFA085664390032BCF7 /* WebKit.framework */; }; - 403608C909953BFD00700A19 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F591E05701FCC5DE01000133 /* minimal.cpp */; }; - 403E7B8B0CFC0C8F0098D2DB /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 403E7B8A0CFC0C8F0098D2DB /* QuickTime.framework */; }; - 403E7B8C0CFC0C900098D2DB /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 403E7B8A0CFC0C8F0098D2DB /* QuickTime.framework */; }; - 407C6AC00A899DD50056252A /* libwx_mac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017230A3067FE00AC9076 /* libwx_mac.dylib */; }; - 4086D0E5063BBC5B00D4CD53 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = F5F5A69A02CDB0E101000133 /* wxmac.icns */; }; - 4086D0E9063BBC5B00D4CD53 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; - 4086D0EC063BBC5B00D4CD53 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA60173504D423C000000080 /* System.framework */; }; - 4086D105063BBC5C00D4CD53 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = F5F5A69A02CDB0E101000133 /* wxmac.icns */; }; - 4086D107063BBC5C00D4CD53 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F591E05701FCC5DE01000133 /* minimal.cpp */; }; - 4086D109063BBC5C00D4CD53 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; - 4086D10B063BBC5C00D4CD53 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA60173504D423C000000080 /* System.framework */; }; - 409F03A10977B97B00D1030F /* libwx_mac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 409F039A0977B96200D1030F /* libwx_mac_static.a */; }; - 40F017470A306CAD00AC9076 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017460A306CAD00AC9076 /* AppKit.framework */; }; - 40F017480A306CAD00AC9076 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017460A306CAD00AC9076 /* AppKit.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 405DD1C1063CD5B500F579EE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 20286C28FDCF999611CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4086D0E2063BBC5B00D4CD53; - remoteInfo = StaticDebug; - }; - 405DD1C5063CD5B500F579EE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 20286C28FDCF999611CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4086D102063BBC5C00D4CD53; - remoteInfo = DynamicDebug; - }; - 409F03990977B96200D1030F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 409F03930977B96200D1030F /* wxWindows.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4086C8CB063AB30000D4CD53; - remoteInfo = static; - }; - 40F017220A3067FE00AC9076 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 409F03930977B96200D1030F /* wxWindows.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4086CBE1063AB30000D4CD53; - remoteInfo = dynamic; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 40A03F7108653C5C000E0339 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 1842CAF7085664390032BCF7 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = ""; }; - 1842CAF8085664390032BCF7 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - 1842CAF9085664390032BCF7 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; - 1842CAFA085664390032BCF7 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; - 1864B4F208566CAB00E32E9B /* minimalDynamic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimalDynamic.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 1864B4F408566CAB00E32E9B /* minimal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - 403E7B8A0CFC0C8F0098D2DB /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; - 409F03930977B96200D1030F /* wxWindows.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxWindows.xcodeproj; path = ../../src/wxWindows.xcodeproj; sourceTree = SOURCE_ROOT; }; - 40F017460A306CAD00AC9076 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - CA60173504D423C000000080 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = ""; }; - F591E05701FCC5DE01000133 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = SOURCE_ROOT; }; - F5F5A69A02CDB0E101000133 /* wxmac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wxmac.icns; path = ../../src/mac/wxmac.icns; sourceTree = SOURCE_ROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 4086D0E8063BBC5B00D4CD53 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 409F03A10977B97B00D1030F /* libwx_mac_static.a in Frameworks */, - 4086D0E9063BBC5B00D4CD53 /* Carbon.framework in Frameworks */, - 4086D0EC063BBC5B00D4CD53 /* System.framework in Frameworks */, - 1842CAFB085664390032BCF7 /* AGL.framework in Frameworks */, - 1842CAFC085664390032BCF7 /* IOKit.framework in Frameworks */, - 1842CAFD085664390032BCF7 /* OpenGL.framework in Frameworks */, - 1842CAFE085664390032BCF7 /* WebKit.framework in Frameworks */, - 40F017470A306CAD00AC9076 /* AppKit.framework in Frameworks */, - 403E7B8B0CFC0C8F0098D2DB /* QuickTime.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D108063BBC5C00D4CD53 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 407C6AC00A899DD50056252A /* libwx_mac.dylib in Frameworks */, - 4086D109063BBC5C00D4CD53 /* Carbon.framework in Frameworks */, - 4086D10B063BBC5C00D4CD53 /* System.framework in Frameworks */, - 1842CAFF085664390032BCF7 /* AGL.framework in Frameworks */, - 1842CB00085664390032BCF7 /* IOKit.framework in Frameworks */, - 1842CB01085664390032BCF7 /* OpenGL.framework in Frameworks */, - 1842CB02085664390032BCF7 /* WebKit.framework in Frameworks */, - 40F017480A306CAD00AC9076 /* AppKit.framework in Frameworks */, - 403E7B8C0CFC0C900098D2DB /* QuickTime.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 1864B4F608566CB300E32E9B /* Products */ = { - isa = PBXGroup; - children = ( - 1864B4F208566CAB00E32E9B /* minimalDynamic.app */, - 1864B4F408566CAB00E32E9B /* minimal.app */, - ); - name = Products; - sourceTree = ""; - }; - 20286C29FDCF999611CA2CEA /* ¬´PROJECTNAME» */ = { - isa = PBXGroup; - children = ( - 409F03930977B96200D1030F /* wxWindows.xcodeproj */, - 20286C2AFDCF999611CA2CEA /* Sources */, - 20286C2CFDCF999611CA2CEA /* Resources */, - 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */, - 1864B4F608566CB300E32E9B /* Products */, - ); - name = "¬´PROJECTNAME»"; - sourceTree = ""; - }; - 20286C2AFDCF999611CA2CEA /* Sources */ = { - isa = PBXGroup; - children = ( - F591E05701FCC5DE01000133 /* minimal.cpp */, - ); - name = Sources; - sourceTree = ""; - }; - 20286C2CFDCF999611CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - F5F5A69A02CDB0E101000133 /* wxmac.icns */, - ); - name = Resources; - sourceTree = ""; - }; - 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - 403E7B8A0CFC0C8F0098D2DB /* QuickTime.framework */, - 40F017460A306CAD00AC9076 /* AppKit.framework */, - 20286C33FDCF999611CA2CEA /* Carbon.framework */, - CA60173504D423C000000080 /* System.framework */, - 1842CAF7085664390032BCF7 /* AGL.framework */, - 1842CAF8085664390032BCF7 /* IOKit.framework */, - 1842CAF9085664390032BCF7 /* OpenGL.framework */, - 1842CAFA085664390032BCF7 /* WebKit.framework */, - ); - name = "External Frameworks and Libraries"; - sourceTree = ""; - }; - 409F03940977B96200D1030F /* Products */ = { - isa = PBXGroup; - children = ( - 409F039A0977B96200D1030F /* libwx_mac_static.a */, - 40F017230A3067FE00AC9076 /* libwx_mac.dylib */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 4086D0E3063BBC5B00D4CD53 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D103063BBC5C00D4CD53 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 4086D0E2063BBC5B00D4CD53 /* static */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1842CAA008565A280032BCF7 /* Build configuration list for PBXNativeTarget "static" */; - buildPhases = ( - 4086D0E3063BBC5B00D4CD53 /* Headers */, - 4086D0E4063BBC5B00D4CD53 /* Resources */, - 4086D0E6063BBC5B00D4CD53 /* Sources */, - 4086D0E8063BBC5B00D4CD53 /* Frameworks */, - 4086D0ED063BBC5B00D4CD53 /* Rez */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = static; - productInstallPath = "$(HOME)/Applications"; - productName = minimalStaticDebug; - productReference = 1864B4F408566CAB00E32E9B /* minimal.app */; - productType = "com.apple.product-type.application"; - }; - 4086D102063BBC5C00D4CD53 /* dynamic */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1842CAA808565A280032BCF7 /* Build configuration list for PBXNativeTarget "dynamic" */; - buildPhases = ( - 4086D103063BBC5C00D4CD53 /* Headers */, - 4086D104063BBC5C00D4CD53 /* Resources */, - 4086D106063BBC5C00D4CD53 /* Sources */, - 4086D108063BBC5C00D4CD53 /* Frameworks */, - 4086D10D063BBC5C00D4CD53 /* Rez */, - 40A03F7108653C5C000E0339 /* CopyFiles */, - 40A0CE7F0875719100810086 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = dynamic; - productInstallPath = "$(HOME)/Applications"; - productName = minimalDynamicDebug; - productReference = 1864B4F208566CAB00E32E9B /* minimalDynamic.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 20286C28FDCF999611CA2CEA /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 1842CAB408565A280032BCF7 /* Build configuration list for PBXProject "minimal" */; - hasScannedForEncodings = 1; - mainGroup = 20286C29FDCF999611CA2CEA /* ¬´PROJECTNAME» */; - productRefGroup = 20286C29FDCF999611CA2CEA /* ¬´PROJECTNAME» */; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 409F03940977B96200D1030F /* Products */; - ProjectRef = 409F03930977B96200D1030F /* wxWindows.xcodeproj */; - }, - ); - targets = ( - 4086D0E2063BBC5B00D4CD53 /* static */, - 4086D102063BBC5C00D4CD53 /* dynamic */, - 405DD1B0063CD57F00F579EE /* Build All */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - 409F039A0977B96200D1030F /* libwx_mac_static.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libwx_mac_static.a; - remoteRef = 409F03990977B96200D1030F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 40F017230A3067FE00AC9076 /* libwx_mac.dylib */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - path = libwx_mac.dylib; - remoteRef = 40F017220A3067FE00AC9076 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXResourcesBuildPhase section */ - 4086D0E4063BBC5B00D4CD53 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4086D0E5063BBC5B00D4CD53 /* wxmac.icns in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D104063BBC5C00D4CD53 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4086D105063BBC5C00D4CD53 /* wxmac.icns in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXRezBuildPhase section */ - 4086D0ED063BBC5B00D4CD53 /* Rez */ = { - isa = PBXRezBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D10D063BBC5C00D4CD53 /* Rez */ = { - isa = PBXRezBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXRezBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 40A0CE7F0875719100810086 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "mkdir $TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH\ncp ../../src/build/$BUILD_STYLE/libwx_mac.dylib $TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 4086D0E6063BBC5B00D4CD53 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 403608C909953BFD00700A19 /* minimal.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4086D106063BBC5C00D4CD53 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4086D107063BBC5C00D4CD53 /* minimal.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 405DD1C2063CD5B500F579EE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4086D0E2063BBC5B00D4CD53 /* static */; - targetProxy = 405DD1C1063CD5B500F579EE /* PBXContainerItemProxy */; - }; - 405DD1C6063CD5B500F579EE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4086D102063BBC5C00D4CD53 /* dynamic */; - targetProxy = 405DD1C5063CD5B500F579EE /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 1842CAA108565A280032BCF7 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - NO_GCC_PRAGMA, - __WXMAC__, - "wxUSE_BASE=1", - "_FILE_OFFSET_BITS=64", - _LARGE_FILES, - "__WXMAC_XCODE__=1", - "WX_PRECOMP=1", - MACOS_CLASSIC, - "__WXDEBUG__=1", - ); - INFOPLIST_FILE = ../Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../src/build/Development"; - OTHER_LDFLAGS = ( - "-liconv", - "-lz", - ); - UNSTRIPPED_PRODUCT = ""; - USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include ."; - USE_SEPARATE_HEADERMAPS = YES; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = NO; - }; - name = Development; - }; - 1842CAA208565A280032BCF7 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - NO_GCC_PRAGMA, - __WXMAC__, - "wxUSE_BASE=1", - "_FILE_OFFSET_BITS=64", - _LARGE_FILES, - "__WXMAC_XCODE__=1", - "WX_PRECOMP=1", - MACOS_CLASSIC, - ); - INFOPLIST_FILE = ../Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../src/build/Deployment"; - OTHER_LDFLAGS = ( - "-liconv", - "-lz", - ); - UNSTRIPPED_PRODUCT = ""; - USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include ."; - USE_SEPARATE_HEADERMAPS = YES; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Deployment; - }; - 1842CAA908565A280032BCF7 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(NATIVE_ARCH)"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - NO_GCC_PRAGMA, - "wxUSE_BASE=1", - "__WXDEBUG__=1", - MACOS_CLASSIC, - WXUSINGDLL, - __WXMAC__, - "_FILE_OFFSET_BITS=64", - _LARGE_FILES, - "__WXMAC_XCODE__=1", - "WX_PRECOMP=1", - ); - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../src/build/Development", - "$(SRCROOT)/../../src/build/Deployment", - ); - OTHER_LDFLAGS = ( - "-liconv", - "-lz", - ); - PRODUCT_NAME = "$(PRODUCT_NAME)Dynamic"; - USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include ."; - USE_SEPARATE_HEADERMAPS = YES; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = NO; - wxDylib = ../../src/build/Development/libwx_macd.dylib; - }; - name = Development; - }; - 1842CAAA08565A280032BCF7 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - NO_GCC_PRAGMA, - "wxUSE_BASE=1", - WXUSINGDLL, - __WXMAC__, - "_FILE_OFFSET_BITS=64", - _LARGE_FILES, - "__WXMAC_XCODE__=1", - "WX_PRECOMP=1", - MACOS_CLASSIC, - ); - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../src/build/Deployment", - "$(SRCROOT)/../../src/build/Development", - ); - OTHER_LDFLAGS = ( - "-liconv", - "-lz", - ); - PRODUCT_NAME = "$(PRODUCT_NAME)Dynamic"; - USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include ."; - USE_SEPARATE_HEADERMAPS = YES; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = NO; - wxDylib = ../../src/build/Deployment/libwx_mac.dylib; - }; - name = Deployment; - }; - 1842CAB108565A280032BCF7 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = "Build All"; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = YES; - }; - name = Development; - }; - 1842CAB208565A280032BCF7 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = "Build All"; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = NO; - }; - name = Deployment; - }; - 1842CAB508565A280032BCF7 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = __WXDEBUG__; - GCC_VERSION_i386 = 4.0; - GCC_VERSION_ppc = 4.0; - INFOPLIST_FILE = ../Info.plist; - LIBRARY_SEARCH_PATHS = ../../src/; - MACOSX_DEPLOYMENT_TARGET = 10.4; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - PRODUCT_NAME = minimal; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - ZERO_LINK = YES; - }; - name = Development; - }; - 1842CAB608565A280032BCF7 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ( - ppc, - i386, - ); - COPY_PHASE_STRIP = YES; - DynamicLibName = libwx_mac.dylib; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = s; - GCC_VERSION_i386 = 4.0; - GCC_VERSION_ppc = 4.0; - INFOPLIST_FILE = ../Info.plist; - LIBRARY_SEARCH_PATHS = ../../src/build/Deployment; - MACOSX_DEPLOYMENT_TARGET = 10.4; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - PRODUCT_NAME = minimal; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - ZERO_LINK = NO; - }; - name = Deployment; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1842CAA008565A280032BCF7 /* Build configuration list for PBXNativeTarget "static" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1842CAA108565A280032BCF7 /* Development */, - 1842CAA208565A280032BCF7 /* Deployment */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; - }; - 1842CAA808565A280032BCF7 /* Build configuration list for PBXNativeTarget "dynamic" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1842CAA908565A280032BCF7 /* Development */, - 1842CAAA08565A280032BCF7 /* Deployment */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; - }; - 1842CAB008565A280032BCF7 /* Build configuration list for PBXAggregateTarget "Build All" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1842CAB108565A280032BCF7 /* Development */, - 1842CAB208565A280032BCF7 /* Deployment */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; - }; - 1842CAB408565A280032BCF7 /* Build configuration list for PBXProject "minimal" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1842CAB508565A280032BCF7 /* Development */, - 1842CAB608565A280032BCF7 /* Deployment */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; - }; -/* End XCConfigurationList section */ - }; - rootObject = 20286C28FDCF999611CA2CEA /* Project object */; -} diff --git a/samples/minimal/minimalW7.xml b/samples/minimal/minimalW7.xml deleted file mode 100644 index 6d34bdeb4c..0000000000 --- a/samples/minimal/minimalW7.xml +++ /dev/null @@ -1,1968 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - wxWin App Release - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7msw\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorPentiumII - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics1 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo0 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0€9 - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppRelease.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel4 - GlobalOptimizer_X86__optforSpeed - - - - Name - MSL_All_x86.lib - Windows - Unknown - Debug - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - wx_x86.lib - Windows - Library - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - minimal.rc - Windows - Text - Debug - - - Name - minimal.cpp - Windows - Text - Debug - - - - - Name - wx_x86.lib - Windows - - - Name - MSL_All_x86.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - advapi32.lib - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - minimal.rc - Windows - - - Name - minimal.cpp - Windows - - - - - wxWin App Debug - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path:MSL: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib\cw7mswd\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\include - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path..\..\lib - PathFormatWindows - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Libraries: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:Win32-x86 Support:Headers:Win32 SDK: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerWin32 x86 Linker - PreLinker - PostLinker - TargetnamewxWin App Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.def - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ x86 - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.rc - CompilerMW WinRC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.res - CompilerWinRes Import - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerLib Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.obj - CompilerObj Import x86 - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - - - LogSystemMessagestrue - AutoTargetDLLstrue - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_machinecodelisting0 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_syminfo0 - MWCodeGen_X86_codeviewinfo1 - MWCodeGen_X86_extinst_cmov_fcomi0 - MWCodeGen_X86_extinst_sse0 - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showSourcefalse - PDisasmX86_showHextrue - PDisasmX86_showRelocationtrue - PDisasmX86_showCommentsfalse - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showDatatrue - PDisasmX86_showRawfalse - PDisasmX86_verbosefalse - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0€9ð…9@|ø…9@|ÿGDÎ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Depricated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype542132570 - MWJava_Output_fcreator1348097869 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_useVM1 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - MWJava_Proj_useJCVM1 - MWJava_Proj_aidData - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path: - PathFormatMacOS - PathRootProject - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeLPPA - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWProject_X86_typeApplication - MWProject_X86_outfileAppDebug.exe - MWProject_X86_baseaddress4194304 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWProject_X86_importlib - Resource Flattener Panel - 0100000000000000000000000000000000000000000000000000000000000000 - 0000074F75742E62696E00000000000000000000000000000000000000000000 - 0000 - - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWWinRC_prefixname - - - GlobalOptimizer_X86__optimizationlevelLevel0 - GlobalOptimizer_X86__optforSpeed - - - - Name - COMDLG32.LIB - MacOS - Text - Debug - - - Name - GDI32.LIB - MacOS - Text - Debug - - - Name - KERNEL32.LIB - MacOS - Text - Debug - - - Name - USER32.LIB - MacOS - Text - Debug - - - Name - COMCTL32.LIB - MacOS - Text - Debug - - - Name - SHELL32.LIB - MacOS - Text - Debug - - - Name - OLE32.LIB - MacOS - Text - Debug - - - Name - UUID.LIB - MacOS - Text - Debug - - - Name - MSL_All_x86_D.lib - Windows - Unknown - Debug - - - Name - wx_x86_d.lib - MacOS - Unknown - Debug - - - Name - WINSPOOL.LIB - Windows - Library - Debug - - - Name - advapi32.lib - Windows - Library - Debug - - - Name - WSOCK32.LIB - Windows - Library - Debug - - - Name - rpcrt4.lib - Windows - Library - Debug - - - Name - odbc32.lib - Windows - Library - Debug - - - Name - minimal.rc - Windows - Text - Debug - - - Name - minimal.cpp - Windows - Text - Debug - - - - - Name - wx_x86_d.lib - MacOS - - - Name - MSL_All_x86_D.lib - Windows - - - Name - advapi32.lib - Windows - - - Name - COMDLG32.LIB - MacOS - - - Name - GDI32.LIB - MacOS - - - Name - KERNEL32.LIB - MacOS - - - Name - USER32.LIB - MacOS - - - Name - COMCTL32.LIB - MacOS - - - Name - SHELL32.LIB - MacOS - - - Name - OLE32.LIB - MacOS - - - Name - UUID.LIB - MacOS - - - Name - WINSPOOL.LIB - Windows - - - Name - WSOCK32.LIB - Windows - - - Name - rpcrt4.lib - Windows - - - Name - odbc32.lib - Windows - - - Name - minimal.rc - Windows - - - Name - minimal.cpp - Windows - - - - - - - wxWin App Debug - wxWin App Release - - - - Source - - wxWin App Release - Name - minimal.rc - Windows - - - wxWin App Release - Name - minimal.cpp - Windows - - - wx - - wxWin App Release - Name - wx_x86.lib - Windows - - - wxWin App Debug - Name - wx_x86_d.lib - MacOS - - - MSL ANSI Libraries - - wxWin App Release - Name - MSL_All_x86.lib - Windows - - - wxWin App Debug - Name - MSL_All_x86_D.lib - Windows - - - Win32 SDK - - wxWin App Release - Name - advapi32.lib - Windows - - - wxWin App Release - Name - COMCTL32.LIB - MacOS - - - wxWin App Release - Name - COMDLG32.LIB - MacOS - - - wxWin App Release - Name - GDI32.LIB - MacOS - - - wxWin App Release - Name - KERNEL32.LIB - MacOS - - - wxWin App Release - Name - odbc32.lib - Windows - - - wxWin App Release - Name - OLE32.LIB - MacOS - - - wxWin App Release - Name - rpcrt4.lib - Windows - - - wxWin App Release - Name - SHELL32.LIB - MacOS - - - wxWin App Release - Name - USER32.LIB - MacOS - - - wxWin App Release - Name - UUID.LIB - MacOS - - - wxWin App Release - Name - WINSPOOL.LIB - Windows - - - wxWin App Release - Name - WSOCK32.LIB - Windows - - - - - diff --git a/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj b/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..8c956f8f4f --- /dev/null +++ b/samples/minimal/minimal_carbon.xcodeproj/project.pbxproj @@ -0,0 +1,345 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 45; + objects = { + +/* Begin PBXBuildFile section */ + 405B1A9910EF228C00676938 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 405B1A9810EF228C00676938 /* minimal.cpp */; }; + 405B1AC310EF253300676938 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 405B1A9810EF228C00676938 /* minimal.cpp */; }; + 40E3518B10EF314A0029DC34 /* libwx_osx_carbon_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40E3518410EF30F90029DC34 /* libwx_osx_carbon_static.a */; }; + 40E3518C10EF31550029DC34 /* libwx_osx_carbon.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 40E3518210EF30F90029DC34 /* libwx_osx_carbon.dylib */; }; + 40E3519010EF320E0029DC34 /* libwx_osx_carbon.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 40E3518210EF30F90029DC34 /* libwx_osx_carbon.dylib */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 40E3518110EF30F90029DC34 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D2AAC0C705546C1D00DB518D; + remoteInfo = dynamic; + }; + 40E3518310EF30F90029DC34 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 404BEE6110EC83280080E2B8; + remoteInfo = static; + }; + 40E3518710EF31300029DC34 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 363401F972C53D8EBD3D4BD9; + remoteInfo = dynamic; + }; + 40E3518910EF313A0029DC34 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BAB02EC06578349A9171CCAC; + remoteInfo = static; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 405B1A9410EF209B00676938 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 40E3519010EF320E0029DC34 /* libwx_osx_carbon.dylib in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 405B1A9810EF228C00676938 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = ""; }; + 405B1ACB10EF253300676938 /* minimal_carbon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_carbon.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 4073593F1370888D0077DE1B /* Info_carbon.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_carbon.plist; sourceTree = ""; }; + 40A9683713B281D700B0D0DD /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = ../../build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; }; + 40A9683813B281D700B0D0DD /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = ../../build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; }; + 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxcarbon.xcodeproj; path = ../../build/osx/wxcarbon.xcodeproj; sourceTree = SOURCE_ROOT; }; + 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxcarbon.xcconfig; path = ../../build/osx/wxcarbon.xcconfig; sourceTree = SOURCE_ROOT; }; + 8D1107320486CEB800E47090 /* minimal_carbon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_carbon.app; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 405B1AC410EF253300676938 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 40E3518B10EF314A0029DC34 /* libwx_osx_carbon_static.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8D11072E0486CEB800E47090 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 40E3518C10EF31550029DC34 /* libwx_osx_carbon.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D1107320486CEB800E47090 /* minimal_carbon.app */, + 405B1ACB10EF253300676938 /* minimal_carbon.app */, + ); + name = Products; + sourceTree = ""; + }; + 29B97314FDCFA39411CA2CEA /* minimal_cocoa */ = { + isa = PBXGroup; + children = ( + 4073593F1370888D0077DE1B /* Info_carbon.plist */, + 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */, + 40A9683713B281D700B0D0DD /* wxdebug.xcconfig */, + 40A9683813B281D700B0D0DD /* wxrelease.xcconfig */, + 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */, + 405B1A9710EF227D00676938 /* src */, + 19C28FACFE9D520D11CA2CBB /* Products */, + ); + name = minimal_cocoa; + sourceTree = ""; + }; + 405B1A9710EF227D00676938 /* src */ = { + isa = PBXGroup; + children = ( + 405B1A9810EF228C00676938 /* minimal.cpp */, + ); + name = src; + sourceTree = ""; + }; + 40E3517D10EF30F90029DC34 /* Products */ = { + isa = PBXGroup; + children = ( + 40E3518210EF30F90029DC34 /* libwx_osx_carbon.dylib */, + 40E3518410EF30F90029DC34 /* libwx_osx_carbon_static.a */, + ); + name = Products; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 405B1ABF10EF253300676938 /* static */ = { + isa = PBXNativeTarget; + buildConfigurationList = 405B1AC810EF253300676938 /* Build configuration list for PBXNativeTarget "static" */; + buildPhases = ( + 405B1AC210EF253300676938 /* Sources */, + 405B1AC410EF253300676938 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 40E3518A10EF313A0029DC34 /* PBXTargetDependency */, + ); + name = static; + productInstallPath = "$(HOME)/Applications"; + productName = minimal_cocoa; + productReference = 405B1ACB10EF253300676938 /* minimal_carbon.app */; + productType = "com.apple.product-type.application"; + }; + 8D1107260486CEB800E47090 /* dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dynamic" */; + buildPhases = ( + 8D11072C0486CEB800E47090 /* Sources */, + 8D11072E0486CEB800E47090 /* Frameworks */, + 405B1A9410EF209B00676938 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 40E3518810EF31300029DC34 /* PBXTargetDependency */, + ); + name = dynamic; + productInstallPath = "$(HOME)/Applications"; + productName = minimal_cocoa; + productReference = 8D1107320486CEB800E47090 /* minimal_carbon.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_carbon" */; + compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* minimal_cocoa */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 40E3517D10EF30F90029DC34 /* Products */; + ProjectRef = 40E3517C10EF30F90029DC34 /* wxcarbon.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + 8D1107260486CEB800E47090 /* dynamic */, + 405B1ABF10EF253300676938 /* static */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 40E3518210EF30F90029DC34 /* libwx_osx_carbon.dylib */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.dylib"; + path = libwx_osx_carbon.dylib; + remoteRef = 40E3518110EF30F90029DC34 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 40E3518410EF30F90029DC34 /* libwx_osx_carbon_static.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libwx_osx_carbon_static.a; + remoteRef = 40E3518310EF30F90029DC34 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXSourcesBuildPhase section */ + 405B1AC210EF253300676938 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 405B1AC310EF253300676938 /* minimal.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8D11072C0486CEB800E47090 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 405B1A9910EF228C00676938 /* minimal.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 40E3518810EF31300029DC34 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = dynamic; + targetProxy = 40E3518710EF31300029DC34 /* PBXContainerItemProxy */; + }; + 40E3518A10EF313A0029DC34 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = static; + targetProxy = 40E3518910EF313A0029DC34 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 405B1AC910EF253300676938 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */; + buildSettings = { + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lz", + ); + PRODUCT_NAME = minimal_carbon; + }; + name = Debug; + }; + 405B1ACA10EF253300676938 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */; + buildSettings = { + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lz", + ); + PRODUCT_NAME = minimal_carbon; + }; + name = Release; + }; + C01FCF4B08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */; + buildSettings = { + PRODUCT_NAME = minimal_carbon; + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Debug; + }; + C01FCF4C08A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 40E3518610EF31130029DC34 /* wxcarbon.xcconfig */; + buildSettings = { + PRODUCT_NAME = minimal_carbon; + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Release; + }; + C01FCF4F08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 40A9683713B281D700B0D0DD /* wxdebug.xcconfig */; + buildSettings = { + INFOPLIST_FILE = Info_carbon.plist; + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Debug; + }; + C01FCF5008A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = Info_carbon.plist; + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 405B1AC810EF253300676938 /* Build configuration list for PBXNativeTarget "static" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 405B1AC910EF253300676938 /* Debug */, + 405B1ACA10EF253300676938 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dynamic" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4B08A954540054247B /* Debug */, + C01FCF4C08A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_carbon" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4F08A954540054247B /* Debug */, + C01FCF5008A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; +} diff --git a/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj b/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..8e82bff46c --- /dev/null +++ b/samples/minimal/minimal_cocoa.xcodeproj/project.pbxproj @@ -0,0 +1,347 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 45; + objects = { + +/* Begin PBXBuildFile section */ + 405B1AE010EF25D200676938 /* libwx_osx_cocoa_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 405B1A8C10EF202100676938 /* libwx_osx_cocoa_static.a */; }; + 407A75B413B0FE67006BC2D5 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A75B313B0FE67006BC2D5 /* minimal.cpp */; }; + 407A75B513B0FE67006BC2D5 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A75B313B0FE67006BC2D5 /* minimal.cpp */; }; + 40AC73361325727300982A5C /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */; }; + 40AC73371325728400982A5C /* libwx_osx_cocoa.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 405B1A8910EF202100676938 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D2AAC0C705546C1D00DB518D; + remoteInfo = dynamic; + }; + 405B1A8B10EF202100676938 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 404BEE6110EC83280080E2B8; + remoteInfo = static; + }; + 405B1A9010EF207D00676938 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 363401F972C53D8EBD3D4BD9; + remoteInfo = dynamic; + }; + 405B1ADD10EF25B100676938 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BAB02EC06578349A9171CCAC; + remoteInfo = static; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 405B1A9410EF209B00676938 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 40AC73371325728400982A5C /* libwx_osx_cocoa.dylib in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxcocoa.xcodeproj; path = ../../build/osx/wxcocoa.xcodeproj; sourceTree = SOURCE_ROOT; }; + 405B1ACB10EF253300676938 /* minimal_cocoa.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_cocoa.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 40735927137088070077DE1B /* Info_cocoa.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_cocoa.plist; sourceTree = ""; }; + 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxcocoa.xcconfig; path = ../../build/osx/wxcocoa.xcconfig; sourceTree = SOURCE_ROOT; }; + 407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = ../../build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; }; + 407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = ../../build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; }; + 407A75B313B0FE67006BC2D5 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = ""; }; + 8D1107320486CEB800E47090 /* minimal_cocoa.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_cocoa.app; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 405B1AC410EF253300676938 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 405B1AE010EF25D200676938 /* libwx_osx_cocoa_static.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8D11072E0486CEB800E47090 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 40AC73361325727300982A5C /* libwx_osx_cocoa.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D1107320486CEB800E47090 /* minimal_cocoa.app */, + 405B1ACB10EF253300676938 /* minimal_cocoa.app */, + ); + name = Products; + sourceTree = ""; + }; + 29B97314FDCFA39411CA2CEA /* minimal_cocoa */ = { + isa = PBXGroup; + children = ( + 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */, + 407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */, + 407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */, + 40735927137088070077DE1B /* Info_cocoa.plist */, + 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */, + 405B1A9710EF227D00676938 /* src */, + 19C28FACFE9D520D11CA2CBB /* Products */, + ); + name = minimal_cocoa; + sourceTree = ""; + }; + 405B1A8510EF202100676938 /* Products */ = { + isa = PBXGroup; + children = ( + 405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */, + 405B1A8C10EF202100676938 /* libwx_osx_cocoa_static.a */, + ); + name = Products; + sourceTree = ""; + }; + 405B1A9710EF227D00676938 /* src */ = { + isa = PBXGroup; + children = ( + 407A75B313B0FE67006BC2D5 /* minimal.cpp */, + ); + name = src; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 405B1ABF10EF253300676938 /* static */ = { + isa = PBXNativeTarget; + buildConfigurationList = 405B1AC810EF253300676938 /* Build configuration list for PBXNativeTarget "static" */; + buildPhases = ( + 405B1AC210EF253300676938 /* Sources */, + 405B1AC410EF253300676938 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 405B1ADE10EF25B100676938 /* PBXTargetDependency */, + ); + name = static; + productInstallPath = "$(HOME)/Applications"; + productName = minimal_cocoa; + productReference = 405B1ACB10EF253300676938 /* minimal_cocoa.app */; + productType = "com.apple.product-type.application"; + }; + 8D1107260486CEB800E47090 /* dynamic */ = { + isa = PBXNativeTarget; + buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dynamic" */; + buildPhases = ( + 8D11072C0486CEB800E47090 /* Sources */, + 8D11072E0486CEB800E47090 /* Frameworks */, + 405B1A9410EF209B00676938 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 405B1A9110EF207D00676938 /* PBXTargetDependency */, + ); + name = dynamic; + productInstallPath = "$(HOME)/Applications"; + productName = minimal_cocoa; + productReference = 8D1107320486CEB800E47090 /* minimal_cocoa.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_cocoa" */; + compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* minimal_cocoa */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 405B1A8510EF202100676938 /* Products */; + ProjectRef = 405B1A8410EF202100676938 /* wxcocoa.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + 8D1107260486CEB800E47090 /* dynamic */, + 405B1ABF10EF253300676938 /* static */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.dylib"; + path = libwx_osx_cocoa.dylib; + remoteRef = 405B1A8910EF202100676938 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 405B1A8C10EF202100676938 /* libwx_osx_cocoa_static.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libwx_osx_cocoa_static.a; + remoteRef = 405B1A8B10EF202100676938 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXSourcesBuildPhase section */ + 405B1AC210EF253300676938 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 407A75B413B0FE67006BC2D5 /* minimal.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8D11072C0486CEB800E47090 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 407A75B513B0FE67006BC2D5 /* minimal.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 405B1A9110EF207D00676938 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = dynamic; + targetProxy = 405B1A9010EF207D00676938 /* PBXContainerItemProxy */; + }; + 405B1ADE10EF25B100676938 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = static; + targetProxy = 405B1ADD10EF25B100676938 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 405B1AC910EF253300676938 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */; + buildSettings = { + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lz", + ); + PRODUCT_NAME = minimal_cocoa; + }; + name = Debug; + }; + 405B1ACA10EF253300676938 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */; + buildSettings = { + OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", + "-lz", + ); + PRODUCT_NAME = minimal_cocoa; + }; + name = Release; + }; + C01FCF4B08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */; + buildSettings = { + PRODUCT_NAME = minimal_cocoa; + USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include"; + }; + name = Debug; + }; + C01FCF4C08A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + PRODUCT_NAME = minimal_cocoa; + USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include"; + }; + name = Release; + }; + C01FCF4F08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */; + buildSettings = { + INFOPLIST_FILE = Info_cocoa.plist; + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Debug; + }; + C01FCF5008A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */; + buildSettings = { + INFOPLIST_FILE = Info_cocoa.plist; + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 405B1AC810EF253300676938 /* Build configuration list for PBXNativeTarget "static" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 405B1AC910EF253300676938 /* Debug */, + 405B1ACA10EF253300676938 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "dynamic" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4B08A954540054247B /* Debug */, + C01FCF4C08A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_cocoa" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4F08A954540054247B /* Debug */, + C01FCF5008A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; +} diff --git a/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj b/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj new file mode 100755 index 0000000000..11380e78f5 --- /dev/null +++ b/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj @@ -0,0 +1,260 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 45; + objects = { + +/* Begin PBXBuildFile section */ + 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; + 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; + 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; + 407A98E11370835D00E92356 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A98E01370835D00E92356 /* minimal.cpp */; }; + 407EE18312F04CD500D0F171 /* libwx_osx_iphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */; }; + 407EE18A12F04CF900D0F171 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 407EE18912F04CF900D0F171 /* AudioToolbox.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 4074F5E812ED969C00693A3F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B4DEA098A05736AE94F01926; + remoteInfo = static; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 1D6058910D05DD3D006BFB54 /* minimal_iphone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_iphone.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxiphone.xcodeproj; path = ../../build/osx/wxiPhone.xcodeproj; sourceTree = SOURCE_ROOT; }; + 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxiphone.xcconfig; path = ../../build/osx/wxiphone.xcconfig; sourceTree = SOURCE_ROOT; }; + 407A98E01370835D00E92356 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = ""; }; + 407A98FA137084FB00E92356 /* Info_iphone.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_iphone.plist; sourceTree = ""; }; + 407EE18912F04CF900D0F171 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + 409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = ../../build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; }; + 409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = ../../build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, + 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, + 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */, + 407EE18312F04CD500D0F171 /* libwx_osx_iphone.a in Frameworks */, + 407EE18A12F04CF900D0F171 /* AudioToolbox.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 1D6058910D05DD3D006BFB54 /* minimal_iphone.app */, + ); + name = Products; + sourceTree = ""; + }; + 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { + isa = PBXGroup; + children = ( + 407A98FA137084FB00E92356 /* Info_iphone.plist */, + 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */, + 409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */, + 409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */, + 404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */, + 404BECD110EBDC6F0080E2B8 /* src */, + 29B97317FDCFA39411CA2CEA /* Resources */, + 29B97323FDCFA39411CA2CEA /* Frameworks */, + 19C28FACFE9D520D11CA2CBB /* Products */, + ); + name = CustomTemplate; + sourceTree = ""; + }; + 29B97317FDCFA39411CA2CEA /* Resources */ = { + isa = PBXGroup; + children = ( + ); + name = Resources; + sourceTree = ""; + }; + 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, + 1D30AB110D05D00D00671497 /* Foundation.framework */, + 288765FC0DF74451002DB57D /* CoreGraphics.framework */, + 407EE18912F04CF900D0F171 /* AudioToolbox.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 404BECC610EBDB420080E2B8 /* Products */ = { + isa = PBXGroup; + children = ( + 4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */, + ); + name = Products; + sourceTree = ""; + }; + 404BECD110EBDC6F0080E2B8 /* src */ = { + isa = PBXGroup; + children = ( + 407A98E01370835D00E92356 /* minimal.cpp */, + ); + name = src; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 1D6058900D05DD3D006BFB54 /* static */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "static" */; + buildPhases = ( + 1D60588D0D05DD3D006BFB54 /* Resources */, + 1D60588E0D05DD3D006BFB54 /* Sources */, + 1D60588F0D05DD3D006BFB54 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = static; + productName = minimal_iphone; + productReference = 1D6058910D05DD3D006BFB54 /* minimal_iphone.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_iphone" */; + compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 404BECC610EBDB420080E2B8 /* Products */; + ProjectRef = 404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + 1D6058900D05DD3D006BFB54 /* static */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libwx_osx_iphone.a; + remoteRef = 4074F5E812ED969C00693A3F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + 1D60588D0D05DD3D006BFB54 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 1D60588E0D05DD3D006BFB54 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 407A98E11370835D00E92356 /* minimal.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 1D6058940D05DD3E006BFB54 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */; + buildSettings = { + PRODUCT_NAME = minimal_iphone; + }; + name = Debug; + }; + 1D6058950D05DD3E006BFB54 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */; + buildSettings = { + PRODUCT_NAME = minimal_iphone; + }; + name = Release; + }; + C01FCF4F08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + INFOPLIST_FILE = Info_iphone.plist; + PROVISIONING_PROFILE = ""; + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Debug; + }; + C01FCF5008A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Distribution"; + INFOPLIST_FILE = Info_iphone.plist; + PROVISIONING_PROFILE = ""; + WXROOT = "$(PROJECT_DIR)/../.."; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "static" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1D6058940D05DD3E006BFB54 /* Debug */, + 1D6058950D05DD3E006BFB54 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_iphone" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4F08A954540054247B /* Debug */, + C01FCF5008A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; +} diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp index 2138a85c26..707b48c424 100644 --- a/samples/opengl/isosurf/isosurf.cpp +++ b/samples/opengl/isosurf/isosurf.cpp @@ -57,7 +57,7 @@ bool MyApp::OnInit() return false; // Create the main frame window - MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample")); + new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample")); return true; } diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp index aa01dc0ccb..a50f6dfd4d 100644 --- a/samples/opengl/penguin/penguin.cpp +++ b/samples/opengl/penguin/penguin.cpp @@ -223,7 +223,7 @@ void TestGLCanvas::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) void TestGLCanvas::LoadDXF(const wxString& filename) { wxFileInputStream stream(filename); - if (stream.Ok()) + if (stream.IsOk()) #if wxUSE_ZLIB { if (filename.Right(3).Lower() == wxT(".gz")) diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp index 14f6545912..b2528ed397 100644 --- a/samples/printing/printing.cpp +++ b/samples/printing/printing.cpp @@ -410,7 +410,7 @@ void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event)) wxPreviewFrame *frame = new wxPreviewFrame(preview, this, wxT("Demo Print Preview"), wxPoint(100, 100), wxSize(600, 650)); frame->Centre(wxBOTH); - frame->Initialize(m_previewModality); + frame->InitializeWithModality(m_previewModality); frame->Show(); } diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index 4d36f39bfe..afd52d9cb7 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -711,7 +711,7 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event ) if ( name == wxT("Font") ) { wxFont font = wxANY_AS(value, wxFont); - wxASSERT( font.Ok() ); + wxASSERT( font.IsOk() ); m_pPropGridManager->SetFont( font ); } diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp index cc68db21f6..61438b7488 100644 --- a/samples/propgrid/sampleprops.cpp +++ b/samples/propgrid/sampleprops.cpp @@ -60,7 +60,7 @@ wxFontDataProperty::wxFontDataProperty( const wxString& label, const wxString& n // Fix value. fontData.SetChosenFont(value.GetInitialFont()); - if ( !fontData.GetColour().Ok() ) + if ( !fontData.GetColour().IsOk() ) fontData.SetColour(*wxBLACK); // Set initial value - should be done in a simpler way like this @@ -113,7 +113,7 @@ void wxFontDataProperty::OnSetValue() fontData << m_value_wxFontData; wxFont font = fontData.GetChosenFont(); - if ( !font.Ok() ) + if ( !font.IsOk() ) font = wxFont(10,wxSWISS,wxNORMAL,wxNORMAL); m_value = WXVARIANT(font); diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index d6fe0d2fd1..d432334cb5 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -88,12 +88,14 @@ public: return wxColour(); } - virtual wxString ColourToString( const wxColour& col, int index ) const + virtual wxString ColourToString( const wxColour& col, + int index, + int argFlags = 0 ) const { if ( index == (int)(m_choices.GetCount()-1) ) return wxT(""); - return wxColourProperty::ColourToString(col, index); + return wxColourProperty::ColourToString(col, index, argFlags); } virtual int GetCustomColourIndex() const diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp index 6868d5a6f4..ef733e27b6 100644 --- a/samples/richtext/richtext.cpp +++ b/samples/richtext/richtext.cpp @@ -1248,7 +1248,7 @@ void MyFrame::OnFont(wxCommandEvent& WXUNUSED(event)) fontData = dialog.GetFontData(); attr.SetFlags(wxTEXT_ATTR_FONT); attr.SetFont(fontData.GetChosenFont()); - if (attr.GetFont().Ok()) + if (attr.GetFont().IsOk()) { m_richTextCtrl->SetStyle(range, attr); } @@ -1589,7 +1589,7 @@ void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event)) m_richTextCtrl->GetStyle(m_richTextCtrl->GetInsertionPoint(), attr); wxString currentFontName; - if (attr.HasFont() && attr.GetFont().Ok()) + if (attr.HasFont() && attr.GetFont().IsOk()) currentFontName = attr.GetFont().GetFaceName(); // Don't set the initial font in the dialog (so the user is choosing diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp index 0d4c8de9f1..ac856e80a2 100644 --- a/samples/sockets/baseserver.cpp +++ b/samples/sockets/baseserver.cpp @@ -315,7 +315,7 @@ bool Server::OnInit() m_listeningSocket->SetEventHandler(*this); m_listeningSocket->SetNotify(wxSOCKET_CONNECTION_FLAG); m_listeningSocket->Notify(true); - if (!m_listeningSocket->Ok()) + if (!m_listeningSocket->IsOk()) { wxLogError("Cannot bind listening socket"); return false; diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp index a57137cbed..853fb4b278 100644 --- a/samples/sockets/server.cpp +++ b/samples/sockets/server.cpp @@ -217,8 +217,8 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY, // Create the socket m_server = new wxSocketServer(addr); - // We use Ok() here to see if the server is really listening - if (! m_server->Ok()) + // We use IsOk() here to see if the server is really listening + if (! m_server->IsOk()) { wxLogMessage("Could not listen at the specified port !"); return; diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp index de0654b1dc..93fbb7f708 100644 --- a/samples/splash/splash.cpp +++ b/samples/splash/splash.cpp @@ -137,7 +137,7 @@ bool MyApp::OnInit() bitmap = wxBitmap(mobile_xpm); bool ok = frame->m_isPda - ? bitmap.Ok() + ? bitmap.IsOk() : bitmap.LoadFile(wxT("splash.png"), wxBITMAP_TYPE_PNG); if (ok) @@ -218,7 +218,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) if (m_isPda) bitmap = wxBitmap(mobile_xpm); bool ok = m_isPda - ? bitmap.Ok() + ? bitmap.IsOk() : bitmap.LoadFile(wxT("splash.png"), wxBITMAP_TYPE_PNG); if (ok) diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index 069008b544..93eb644522 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -430,7 +430,7 @@ void AppFrame::OnPrintPreview (wxCommandEvent &WXUNUSED(event)) { new wxPrintPreview (new EditPrint (m_edit), new EditPrint (m_edit), &printDialogData); - if (!preview->Ok()) { + if (!preview->IsOk()) { delete preview; wxMessageBox (_("There was a problem with previewing.\n\ Perhaps your current printer is not correctly?"), diff --git a/samples/text/text.cpp b/samples/text/text.cpp index 6de6576370..6c3ddf400a 100644 --- a/samples/text/text.cpp +++ b/samples/text/text.cpp @@ -733,10 +733,27 @@ static wxString GetMouseEventDesc(const wxMouseEvent& ev) dbl = ev.RightDClick(); up = ev.RightUp(); } + else if ( ev.Aux1Down() || ev.Aux1Up() || ev.Aux1DClick() ) + { + button = wxT("Aux1"); + dbl = ev.Aux1DClick(); + up = ev.Aux1Up(); + } + else if ( ev.Aux2Down() || ev.Aux2Up() || ev.Aux2DClick() ) + { + button = wxT("Aux2"); + dbl = ev.Aux2DClick(); + up = ev.Aux2Up(); + } + else if ( ev.GetWheelRotation() ) + { + return wxString::Format("Wheel rotation %+d", ev.GetWheelRotation()); + } else { return wxT("Unknown mouse event"); } + wxASSERT(!(dbl && up)); return wxString::Format(wxT("%s mouse button %s"), button.c_str(), @@ -780,6 +797,8 @@ void MyTextCtrl::OnMouseEvent(wxMouseEvent& ev) << GetChar( ev.LeftIsDown(), wxT('1') ) << GetChar( ev.MiddleIsDown(), wxT('2') ) << GetChar( ev.RightIsDown(), wxT('3') ) + << GetChar( ev.Aux1IsDown(), wxT('x') ) + << GetChar( ev.Aux2IsDown(), wxT('X') ) << GetChar( ev.ControlDown(), wxT('C') ) << GetChar( ev.AltDown(), wxT('A') ) << GetChar( ev.ShiftDown(), wxT('S') ) @@ -1848,7 +1867,7 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) { wxString msg; wxString facename(wxT("unknown")); - if (attr.GetFont().Ok()) + if (attr.GetFont().IsOk()) { facename = attr.GetFont().GetFaceName(); } diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp index cb3f8aef59..6b0903cb82 100644 --- a/samples/thread/thread.cpp +++ b/samples/thread/thread.cpp @@ -969,7 +969,7 @@ wxThread::ExitCode MyWorkerThread::Entry() if ( TestDestroy() ) return NULL; - wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT ); + wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT ); event.SetInt( 50 ); wxQueueEvent( m_frame, event.Clone() ); @@ -984,7 +984,7 @@ wxThread::ExitCode MyWorkerThread::Entry() break; // create any type of command event here - wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT ); + wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT ); event.SetInt( m_count ); // send in a thread-safe way @@ -993,7 +993,7 @@ wxThread::ExitCode MyWorkerThread::Entry() wxMilliSleep(200); } - wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT ); + wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT ); event.SetInt(-1); // that's all wxQueueEvent( m_frame, event.Clone() ); #endif @@ -1043,7 +1043,7 @@ wxThread::ExitCode MyGUIThread::Entry() wxMutexGuiLeave(); // notify the dialog that another piece of our masterpiece is complete: - wxThreadEvent event( wxEVT_COMMAND_THREAD, GUITHREAD_EVENT ); + wxThreadEvent event( wxEVT_THREAD, GUITHREAD_EVENT ); event.SetInt(i+1); wxQueueEvent( m_dlg, event.Clone() ); diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 180ac7ccd4..6f8327a911 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -494,7 +494,7 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar) { // create a tool with a custom bitmap for testing wxImage img(m_pathBmp); - if ( img.Ok() ) + if ( img.IsOk() ) { if ( img.GetWidth() > w && img.GetHeight() > h ) img = img.GetSubImage(wxRect(0, 0, w, h)); diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 96a72c2940..8bfb579636 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -901,14 +901,14 @@ void MyFrame::OnSelectLast(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetForegroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) m_treeCtrl->SetForegroundColour(col); } void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetBackgroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) m_treeCtrl->SetBackgroundColour(col); } diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp index 5de17c9b84..d65f82c259 100644 --- a/samples/widgets/bmpcombobox.cpp +++ b/samples/widgets/bmpcombobox.cpp @@ -712,10 +712,10 @@ void BitmapComboBoxWidgetsPage::LoadWidgetImages( wxArrayString* strings, wxImag #if wxUSE_IMAGE wxASSERT(fn.FileExists()); wxImage image(fn.GetFullPath()); - wxASSERT(image.Ok()); + wxASSERT(image.IsOk()); RescaleImage(image, foundSize.x, foundSize.y); wxBitmap bmp(image); - wxASSERT( bmp.Ok() ); + wxASSERT( bmp.IsOk() ); #else wxBitmap bmp(wxNullBitmap); #endif @@ -842,7 +842,7 @@ wxBitmap BitmapComboBoxWidgetsPage::LoadBitmap(const wxString& filepath) } wxImage image(filepath); - if ( image.Ok() ) + if ( image.IsOk() ) { // Rescale very large images int ow = image.GetWidth(); diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index 8bebe83b7f..07523bf543 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -134,7 +134,8 @@ protected: #if wxUSE_MARKUP *m_chkUseMarkup, #endif // wxUSE_MARKUP - *m_chkDefault; + *m_chkDefault, + *m_chkUseBitmapClass; // more checkboxes for wxBitmapButton only wxCheckBox *m_chkUsePressed, @@ -216,6 +217,7 @@ ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book, m_chkUseMarkup = #endif // wxUSE_MARKUP m_chkDefault = + m_chkUseBitmapClass = m_chkUsePressed = m_chkUseFocused = m_chkUseCurrent = @@ -252,6 +254,10 @@ void ButtonWidgetsPage::CreateContent() #endif // wxUSE_MARKUP m_chkDefault = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Default")); + m_chkUseBitmapClass = CreateCheckBoxAndAddToSizer(sizerLeft, + "Use wxBitmapButton"); + m_chkUseBitmapClass->SetValue(true); + sizerLeft->AddSpacer(5); wxSizer *sizerUseLabels = @@ -363,6 +369,7 @@ void ButtonWidgetsPage::Reset() #if wxUSE_MARKUP m_chkUseMarkup->SetValue(false); #endif // wxUSE_MARKUP + m_chkUseBitmapClass->SetValue(true); m_chkUsePressed->SetValue(true); m_chkUseFocused->SetValue(true); @@ -449,8 +456,17 @@ void ButtonWidgetsPage::CreateButton() { showsBitmap = true; - wxBitmapButton *bbtn = new wxBitmapButton(this, ButtonPage_Button, - CreateBitmap(wxT("normal"))); + wxButton *bbtn; + if ( m_chkUseBitmapClass->GetValue() ) + { + bbtn = new wxBitmapButton(this, ButtonPage_Button, + CreateBitmap(wxT("normal"))); + } + else + { + bbtn = new wxButton(this, ButtonPage_Button); + bbtn->SetBitmapLabel(CreateBitmap(wxT("normal"))); + } if ( m_chkUsePressed->GetValue() ) bbtn->SetBitmapPressed(CreateBitmap(wxT("pushed"))); if ( m_chkUseFocused->GetValue() ) @@ -510,6 +526,8 @@ void ButtonWidgetsPage::CreateButton() m_button->SetBitmapDisabled(wxArtProvider::GetIcon(wxART_MISSING_IMAGE, wxART_BUTTON)); } + m_chkUseBitmapClass->Enable(showsBitmap); + m_chkUsePressed->Enable(showsBitmap); m_chkUseFocused->Enable(showsBitmap); m_chkUseCurrent->Enable(showsBitmap); diff --git a/samples/widgets/hyperlnk.cpp b/samples/widgets/hyperlnk.cpp index 8c13a68575..437dc9d5c2 100644 --- a/samples/widgets/hyperlnk.cpp +++ b/samples/widgets/hyperlnk.cpp @@ -93,6 +93,7 @@ protected: void OnButtonReset(wxCommandEvent& event); void OnAlignment(wxCommandEvent& event); + void OnGeneric(wxCommandEvent& event); // reset the control parameters void Reset(); @@ -105,8 +106,8 @@ protected: // ------------ // the checkbox itself and the sizer it is in - wxHyperlinkCtrl *m_hyperlink; - wxHyperlinkCtrl *m_hyperlinkLong; + wxGenericHyperlinkCtrl *m_hyperlink; + wxGenericHyperlinkCtrl *m_hyperlinkLong; wxTextCtrl *m_label; wxTextCtrl *m_url; @@ -118,6 +119,7 @@ protected: wxTextCtrl *m_textLabel; wxRadioBox *m_radioAlignMode; + wxCheckBox *m_checkGeneric; private: DECLARE_EVENT_TABLE() @@ -134,6 +136,7 @@ BEGIN_EVENT_TABLE(HyperlinkWidgetsPage, WidgetsPage) EVT_BUTTON(HyperlinkPage_SetURL, HyperlinkWidgetsPage::OnButtonSetURL) EVT_RADIOBOX(wxID_ANY, HyperlinkWidgetsPage::OnAlignment) + EVT_CHECKBOX(wxID_ANY, HyperlinkWidgetsPage::OnGeneric) END_EVENT_TABLE() // ============================================================================ @@ -181,7 +184,9 @@ void HyperlinkWidgetsPage::CreateContent() // wxHL_DEFAULT_STYLE contains wxHL_ALIGN_CENTRE sizerLeft->Add(m_radioAlignMode, 0, wxALL|wxGROW, 5); - + m_checkGeneric = new wxCheckBox(this, wxID_ANY, wxT("Use generic version"), + wxDefaultPosition, wxDefaultSize); + sizerLeft->Add(m_checkGeneric, 0, wxALL|wxGROW, 5); // right pane wxSizer *szHyperlinkLong = new wxBoxSizer(wxVERTICAL); @@ -189,10 +194,20 @@ void HyperlinkWidgetsPage::CreateContent() m_visit = new wxStaticText(this, wxID_ANY, wxT("Visit ")); - m_hyperlink = new wxHyperlinkCtrl(this, - HyperlinkPage_Ctrl, - wxT("wxWidgets website"), - wxT("www.wxwidgets.org")); + if (m_checkGeneric->IsChecked()) + { + m_hyperlink = new wxGenericHyperlinkCtrl(this, + HyperlinkPage_Ctrl, + wxT("wxWidgets website"), + wxT("www.wxwidgets.org")); + } + else + { + m_hyperlink = new wxHyperlinkCtrl(this, + HyperlinkPage_Ctrl, + wxT("wxWidgets website"), + wxT("www.wxwidgets.org")); + } m_fun = new wxStaticText(this, wxID_ANY, wxT(" for fun!")); @@ -203,10 +218,20 @@ void HyperlinkWidgetsPage::CreateContent() szHyperlink->Add(0, 0, 1, wxCENTRE); szHyperlink->SetMinSize(150, 0); - m_hyperlinkLong = new wxHyperlinkCtrl(this, - wxID_ANY, - wxT("This is a long hyperlink"), - wxT("www.wxwidgets.org")); + if (m_checkGeneric->IsChecked()) + { + m_hyperlinkLong = new wxGenericHyperlinkCtrl(this, + wxID_ANY, + wxT("This is a long hyperlink"), + wxT("www.wxwidgets.org")); + } + else + { + m_hyperlinkLong = new wxHyperlinkCtrl(this, + wxID_ANY, + wxT("This is a long hyperlink"), + wxT("www.wxwidgets.org")); + } szHyperlinkLong->Add(0, 0, 1, wxCENTRE); szHyperlinkLong->Add(szHyperlink, 0, wxCENTRE|wxGROW); @@ -236,10 +261,21 @@ void HyperlinkWidgetsPage::CreateHyperlink() const wxString label = m_hyperlink->GetLabel(); const wxString url = m_hyperlink->GetURL(); - wxHyperlinkCtrl *hyp = new wxHyperlinkCtrl(this, - HyperlinkPage_Ctrl, - label, - url); + wxGenericHyperlinkCtrl *hyp; + if (m_checkGeneric->IsChecked()) + { + hyp = new wxGenericHyperlinkCtrl(this, + HyperlinkPage_Ctrl, + label, + url); + } + else + { + hyp = new wxHyperlinkCtrl(this, + HyperlinkPage_Ctrl, + label, + url); + } // update sizer's child window GetSizer()->Replace(m_hyperlink, hyp, true); @@ -255,13 +291,28 @@ void HyperlinkWidgetsPage::CreateHyperlink() void HyperlinkWidgetsPage::CreateHyperlinkLong(long style) { style = (wxHL_DEFAULT_STYLE & ~wxHL_ALIGN_CENTRE)|style; - wxHyperlinkCtrl *hyp = new wxHyperlinkCtrl(this, - wxID_ANY, - wxT("This is a long hyperlink"), - wxT("www.wxwidgets.org"), - wxDefaultPosition, - wxDefaultSize, - style); + + wxGenericHyperlinkCtrl *hyp; + if (m_checkGeneric->IsChecked()) + { + hyp = new wxGenericHyperlinkCtrl(this, + wxID_ANY, + wxT("This is a long hyperlink"), + wxT("www.wxwidgets.org"), + wxDefaultPosition, + wxDefaultSize, + style); + } + else + { + hyp = new wxHyperlinkCtrl(this, + wxID_ANY, + wxT("This is a long hyperlink"), + wxT("www.wxwidgets.org"), + wxDefaultPosition, + wxDefaultSize, + style); + } // update sizer's child window GetSizer()->Replace(m_hyperlinkLong, hyp, true); @@ -323,4 +374,10 @@ void HyperlinkWidgetsPage::OnAlignment(wxCommandEvent& WXUNUSED(event)) CreateHyperlinkLong(addstyle); } +void HyperlinkWidgetsPage::OnGeneric(wxCommandEvent& event) +{ + CreateHyperlink(); + OnAlignment(event); +} + #endif // wxUSE_HYPERLINKCTRL diff --git a/samples/widgets/statbmp.cpp b/samples/widgets/statbmp.cpp index c5f1a1f09b..6449d23ef9 100644 --- a/samples/widgets/statbmp.cpp +++ b/samples/widgets/statbmp.cpp @@ -122,7 +122,7 @@ void StatBmpWidgetsPage::RecreateWidget() return; wxImage image(filepath); - if (! image.Ok() ) + if (! image.IsOk() ) { wxLogMessage("Reading image from file '%s' failed.", filepath.c_str()); return; diff --git a/samples/widgets/toggle.cpp b/samples/widgets/toggle.cpp index b568226580..9c3dc354bc 100644 --- a/samples/widgets/toggle.cpp +++ b/samples/widgets/toggle.cpp @@ -32,11 +32,17 @@ // for all others, include the necessary headers #ifndef WX_PRECOMP - #include "wx/sizer.h" + #include "wx/button.h" + #include "wx/checkbox.h" + #include "wx/radiobox.h" #include "wx/statbox.h" #include "wx/textctrl.h" #endif +#include "wx/artprov.h" +#include "wx/sizer.h" +#include "wx/dcmemory.h" + #include "icons/toggle.xpm" // ---------------------------------------------------------------------------- @@ -51,6 +57,29 @@ enum TogglePage_Picker }; +// radio boxes +enum +{ + ToggleImagePos_Left, + ToggleImagePos_Right, + ToggleImagePos_Top, + ToggleImagePos_Bottom +}; + +enum +{ + ToggleHAlign_Left, + ToggleHAlign_Centre, + ToggleHAlign_Right +}; + +enum +{ + ToggleVAlign_Top, + ToggleVAlign_Centre, + ToggleVAlign_Bottom +}; + // ---------------------------------------------------------------------------- // CheckBoxWidgetsPage // ---------------------------------------------------------------------------- @@ -68,6 +97,9 @@ public: virtual void CreateContent(); protected: + // event handlers + void OnCheckOrRadioBox(wxCommandEvent& event); + // event handlers void OnButtonReset(wxCommandEvent& event); void OnButtonChangeLabel(wxCommandEvent& event); @@ -78,11 +110,41 @@ protected: // (re)create the toggle void CreateToggle(); + // helper function: create a bitmap for wxBitmapToggleButton + wxBitmap CreateBitmap(const wxString& label); + // the controls // ------------ +#if wxUSE_MARKUP + wxCheckBox *m_chkUseMarkup; +#endif // wxUSE_MARKUP +#ifdef wxHAS_BITMAPTOGGLEBUTTON + // the check/radio boxes for styles + wxCheckBox *m_chkBitmapOnly, + *m_chkTextAndBitmap, + *m_chkFit, + *m_chkUseBitmapClass; + + // more checkboxes for wxBitmapToggleButton only + wxCheckBox *m_chkUsePressed, + *m_chkUseFocused, + *m_chkUseCurrent, + *m_chkUseDisabled; + + // and an image position choice used if m_chkTextAndBitmap is on + wxRadioBox *m_radioImagePos; + + wxRadioBox *m_radioHAlign, + *m_radioVAlign; +#endif // wxHAS_BITMAPTOGGLEBUTTON + // the checkbox itself and the sizer it is in +#ifdef wxHAS_ANY_BUTTON wxToggleButton *m_toggle; +#else + wxToggleButtonBase *m_toggle; +#endif // wxHAS_ANY_BUTTON wxSizer *m_sizerToggle; // the text entries for command parameters @@ -100,6 +162,9 @@ private: BEGIN_EVENT_TABLE(ToggleWidgetsPage, WidgetsPage) EVT_BUTTON(TogglePage_Reset, ToggleWidgetsPage::OnButtonReset) EVT_BUTTON(TogglePage_ChangeLabel, ToggleWidgetsPage::OnButtonChangeLabel) + + EVT_CHECKBOX(wxID_ANY, ToggleWidgetsPage::OnCheckOrRadioBox) + EVT_RADIOBOX(wxID_ANY, ToggleWidgetsPage::OnCheckOrRadioBox) END_EVENT_TABLE() // ============================================================================ @@ -120,6 +185,29 @@ ToggleWidgetsPage::ToggleWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) :WidgetsPage(book, imaglist, toggle_xpm) { +#if wxUSE_MARKUP + m_chkUseMarkup = (wxCheckBox *)NULL; +#endif // wxUSE_MARKUP +#ifdef wxHAS_BITMAPTOGGLEBUTTON + // init everything + m_chkBitmapOnly = + m_chkTextAndBitmap = + m_chkFit = + m_chkUseBitmapClass = + m_chkUsePressed = + m_chkUseFocused = + m_chkUseCurrent = + m_chkUseDisabled = (wxCheckBox *)NULL; + + m_radioImagePos = + m_radioHAlign = + m_radioVAlign = (wxRadioBox *)NULL; +#endif // wxHAS_BITMAPTOGGLEBUTTON + + m_textLabel = (wxTextCtrl *)NULL; + + m_toggle = (wxToggleButton *)NULL; + m_sizerToggle = (wxSizer *)NULL; } void ToggleWidgetsPage::CreateContent() @@ -127,9 +215,81 @@ void ToggleWidgetsPage::CreateContent() wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); // left pane -// wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("Styles")); + wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("Styles")); -// wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL); + wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL); + +#ifdef wxHAS_BITMAPTOGGLEBUTTON + m_chkBitmapOnly = CreateCheckBoxAndAddToSizer(sizerLeft, "&Bitmap only"); + m_chkTextAndBitmap = CreateCheckBoxAndAddToSizer(sizerLeft, "Text &and bitmap"); + m_chkFit = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Fit exactly")); +#endif // wxHAS_BITMAPTOGGLEBUTTON +#if wxUSE_MARKUP + m_chkUseMarkup = CreateCheckBoxAndAddToSizer(sizerLeft, "Interpret &markup"); +#endif // wxUSE_MARKUP + +#ifdef wxHAS_BITMAPTOGGLEBUTTON + m_chkUseBitmapClass = CreateCheckBoxAndAddToSizer(sizerLeft, + "Use wxBitmapToggleButton"); + m_chkUseBitmapClass->SetValue(true); + + sizerLeft->AddSpacer(5); + + wxSizer *sizerUseLabels = + new wxStaticBoxSizer(wxVERTICAL, this, + "&Use the following bitmaps in addition to the normal one?"); + m_chkUsePressed = CreateCheckBoxAndAddToSizer(sizerUseLabels, + "&Pressed (small help icon)"); + m_chkUseFocused = CreateCheckBoxAndAddToSizer(sizerUseLabels, + "&Focused (small error icon)"); + m_chkUseCurrent = CreateCheckBoxAndAddToSizer(sizerUseLabels, + "&Current (small warning icon)"); + m_chkUseDisabled = CreateCheckBoxAndAddToSizer(sizerUseLabels, + "&Disabled (broken image icon)"); + sizerLeft->Add(sizerUseLabels, wxSizerFlags().Expand().Border()); + + sizerLeft->AddSpacer(10); + + static const wxString dirs[] = + { + "left", "right", "top", "bottom", + }; + m_radioImagePos = new wxRadioBox(this, wxID_ANY, "Image &position", + wxDefaultPosition, wxDefaultSize, + WXSIZEOF(dirs), dirs); + sizerLeft->Add(m_radioImagePos, 0, wxGROW | wxALL, 5); + sizerLeft->AddSpacer(15); + + // should be in sync with enums Toggle[HV]Align! + static const wxString halign[] = + { + wxT("left"), + wxT("centre"), + wxT("right"), + }; + + static const wxString valign[] = + { + wxT("top"), + wxT("centre"), + wxT("bottom"), + }; + + m_radioHAlign = new wxRadioBox(this, wxID_ANY, wxT("&Horz alignment"), + wxDefaultPosition, wxDefaultSize, + WXSIZEOF(halign), halign); + m_radioVAlign = new wxRadioBox(this, wxID_ANY, wxT("&Vert alignment"), + wxDefaultPosition, wxDefaultSize, + WXSIZEOF(valign), valign); + + sizerLeft->Add(m_radioHAlign, 0, wxGROW | wxALL, 5); + sizerLeft->Add(m_radioVAlign, 0, wxGROW | wxALL, 5); +#endif // wxHAS_BITMAPTOGGLEBUTTON + + sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer + + wxButton *btn = new wxButton(this, TogglePage_Reset, wxT("&Reset")); + sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15); // middle pane wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Operations")); @@ -144,48 +304,184 @@ void ToggleWidgetsPage::CreateContent() sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); // right pane - wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL); - - m_toggle = new wxToggleButton(this, TogglePage_Picker, wxT("Toggle Button")); - - sizerRight->Add(0, 0, 1, wxCENTRE); - sizerRight->Add(m_toggle, 1, wxCENTRE); - sizerRight->Add(0, 0, 1, wxCENTRE); - sizerRight->SetMinSize(150, 0); - m_sizerToggle = sizerRight; // save it to modify it later + m_sizerToggle = new wxBoxSizer(wxHORIZONTAL); + m_sizerToggle->SetMinSize(150, 0); // the 3 panes panes compose the window -// sizerTop->Add(sizerLeft, 0, (wxALL & ~wxLEFT), 10); + sizerTop->Add(sizerLeft, 0, (wxALL & ~wxLEFT), 10); sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10); - sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10); + sizerTop->Add(m_sizerToggle, 1, wxGROW | (wxALL & ~wxRIGHT), 10); - // final initializations + // do create the main control Reset(); + CreateToggle(); SetSizer(sizerTop); } void ToggleWidgetsPage::Reset() { - m_toggle->SetValue(false); +#ifdef wxHAS_BITMAPTOGGLEBUTTON + m_chkBitmapOnly->SetValue(false); + m_chkFit->SetValue(true); + m_chkTextAndBitmap->SetValue(false); +#if wxUSE_MARKUP + m_chkUseMarkup->SetValue(false); +#endif // wxUSE_MARKUP + m_chkUseBitmapClass->SetValue(true); + + m_chkUsePressed->SetValue(true); + m_chkUseFocused->SetValue(true); + m_chkUseCurrent->SetValue(true); + m_chkUseDisabled->SetValue(true); + + m_radioImagePos->SetSelection(ToggleImagePos_Left); + m_radioHAlign->SetSelection(ToggleHAlign_Centre); + m_radioVAlign->SetSelection(ToggleVAlign_Centre); +#endif // wxHAS_BITMAPTOGGLEBUTTON + + if ( m_toggle ) + { + m_toggle->SetValue(false); + } } void ToggleWidgetsPage::CreateToggle() { - const bool value = m_toggle->GetValue(); + wxString label; + bool value = false; - size_t count = m_sizerToggle->GetChildren().GetCount(); - for ( size_t n = 0; n < count; n++ ) + if ( m_toggle ) { - m_sizerToggle->Remove(0); + label = m_toggle->GetLabel(); + value = m_toggle->GetValue(); + size_t count = m_sizerToggle->GetChildren().GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + m_sizerToggle->Remove(0); + } + + delete m_toggle; } - delete m_toggle; + if ( label.empty() ) + { + // creating for the first time or recreating a toggle button after bitmap + // button + label = m_textLabel->GetValue(); + } - m_toggle = new wxToggleButton(this, TogglePage_Picker, wxT("Toggle Button")); + int flags = ms_defaultFlags; +#ifdef wxHAS_BITMAPTOGGLEBUTTON + switch ( m_radioHAlign->GetSelection() ) + { + case ToggleHAlign_Left: + flags |= wxBU_LEFT; + break; + default: + wxFAIL_MSG(wxT("unexpected radiobox selection")); + // fall through + + case ToggleHAlign_Centre: + break; + + case ToggleHAlign_Right: + flags |= wxBU_RIGHT; + break; + } + + switch ( m_radioVAlign->GetSelection() ) + { + case ToggleVAlign_Top: + flags |= wxBU_TOP; + break; + + default: + wxFAIL_MSG(wxT("unexpected radiobox selection")); + // fall through + + case ToggleVAlign_Centre: + // centre vertical alignment is the default (no style) + break; + + case ToggleVAlign_Bottom: + flags |= wxBU_BOTTOM; + break; + } +#endif // wxHAS_BITMAPTOGGLEBUTTON + +#ifdef wxHAS_BITMAPTOGGLEBUTTON + bool showsBitmap = false; + if ( m_chkBitmapOnly->GetValue() ) + { + showsBitmap = true; + + wxToggleButton *btgl; + if ( m_chkUseBitmapClass->GetValue() ) + { + btgl = new wxBitmapToggleButton(this, TogglePage_Picker, + CreateBitmap(wxT("normal"))); + } + else + { + btgl = new wxToggleButton(this, TogglePage_Picker, wxT("")); + btgl->SetBitmapLabel(CreateBitmap(wxT("normal"))); + } +#ifdef wxHAS_ANY_BUTTON + if ( m_chkUsePressed->GetValue() ) + btgl->SetBitmapPressed(CreateBitmap(wxT("pushed"))); + if ( m_chkUseFocused->GetValue() ) + btgl->SetBitmapFocus(CreateBitmap(wxT("focused"))); + if ( m_chkUseCurrent->GetValue() ) + btgl->SetBitmapCurrent(CreateBitmap(wxT("hover"))); + if ( m_chkUseDisabled->GetValue() ) + btgl->SetBitmapDisabled(CreateBitmap(wxT("disabled"))); +#endif // wxHAS_ANY_BUTTON + m_toggle = btgl; + } + else // normal button +#endif // wxHAS_BITMAPTOGGLEBUTTON + { + m_toggle = new wxToggleButton(this, TogglePage_Picker, label, + wxDefaultPosition, wxDefaultSize, + flags); + } m_toggle->SetValue(value); +#ifdef wxHAS_BITMAPTOGGLEBUTTON +#ifdef wxHAS_ANY_BUTTON + if ( !showsBitmap && m_chkTextAndBitmap->GetValue() ) + { + showsBitmap = true; + + static const wxDirection positions[] = + { + wxLEFT, wxRIGHT, wxTOP, wxBOTTOM + }; + + m_toggle->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_BUTTON), + positions[m_radioImagePos->GetSelection()]); + + if ( m_chkUsePressed->GetValue() ) + m_toggle->SetBitmapPressed(wxArtProvider::GetIcon(wxART_HELP, wxART_BUTTON)); + if ( m_chkUseFocused->GetValue() ) + m_toggle->SetBitmapFocus(wxArtProvider::GetIcon(wxART_ERROR, wxART_BUTTON)); + if ( m_chkUseCurrent->GetValue() ) + m_toggle->SetBitmapCurrent(wxArtProvider::GetIcon(wxART_WARNING, wxART_BUTTON)); + if ( m_chkUseDisabled->GetValue() ) + m_toggle->SetBitmapDisabled(wxArtProvider::GetIcon(wxART_MISSING_IMAGE, wxART_BUTTON)); + } +#endif // wxHAS_ANY_BUTTON + + m_chkUseBitmapClass->Enable(showsBitmap); + + m_chkUsePressed->Enable(showsBitmap); + m_chkUseFocused->Enable(showsBitmap); + m_chkUseCurrent->Enable(showsBitmap); + m_chkUseDisabled->Enable(showsBitmap); +#endif // wxHAS_BITMAPTOGGLEBUTTON + m_sizerToggle->Add(0, 0, 1, wxCENTRE); m_sizerToggle->Add(m_toggle, 1, wxCENTRE); m_sizerToggle->Add(0, 0, 1, wxCENTRE); @@ -203,9 +499,44 @@ void ToggleWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event)) CreateToggle(); } -void ToggleWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event)) +void ToggleWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event)) { - m_toggle->SetLabel(m_textLabel->GetValue()); + CreateToggle(); } +void ToggleWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event)) +{ + const wxString labelText = m_textLabel->GetValue(); + +#if wxUSE_MARKUP + if ( m_chkUseMarkup->GetValue() ) + m_toggle->SetLabelMarkup(labelText); + else +#endif // wxUSE_MARKUP + m_toggle->SetLabel(labelText); +} + +#ifdef wxHAS_BITMAPTOGGLEBUTTON +// ---------------------------------------------------------------------------- +// bitmap toggle button stuff +// ---------------------------------------------------------------------------- + +wxBitmap ToggleWidgetsPage::CreateBitmap(const wxString& label) +{ + wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this + wxMemoryDC dc; + dc.SelectObject(bmp); + dc.SetBackground(wxBrush(*wxCYAN)); + dc.Clear(); + dc.SetTextForeground(*wxBLACK); + dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n") + wxT("(") + label + wxT(" state)"), + wxArtProvider::GetBitmap(wxART_INFORMATION), + wxRect(10, 10, bmp.GetWidth() - 20, bmp.GetHeight() - 20), + wxALIGN_CENTRE); + + return bmp; +} +#endif // wxHAS_BITMAPTOGGLEBUTTON + #endif // wxUSE_TOGGLEBTN diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index c858d3f753..84943cbff7 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -800,11 +800,11 @@ void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event)) // allow for debugging the default colour the first time this is called WidgetsPage *page = CurrentPage(); - if (!m_colFg.Ok()) + if (!m_colFg.IsOk()) m_colFg = page->GetForegroundColour(); wxColour col = GetColourFromUser(this, m_colFg); - if ( !col.Ok() ) + if ( !col.IsOk() ) return; m_colFg = col; @@ -823,11 +823,11 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) { WidgetsPage *page = CurrentPage(); - if ( !m_colBg.Ok() ) + if ( !m_colBg.IsOk() ) m_colBg = page->GetBackgroundColour(); wxColour col = GetColourFromUser(this, m_colBg); - if ( !col.Ok() ) + if ( !col.IsOk() ) return; m_colBg = col; @@ -845,7 +845,7 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) void WidgetsFrame::OnSetPageBg(wxCommandEvent& WXUNUSED(event)) { wxColour col = GetColourFromUser(this, GetBackgroundColour()); - if ( !col.Ok() ) + if ( !col.IsOk() ) return; CurrentPage()->SetBackgroundColour(col); @@ -857,11 +857,11 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) #if wxUSE_FONTDLG WidgetsPage *page = CurrentPage(); - if (!m_font.Ok()) + if (!m_font.IsOk()) m_font = page->GetFont(); wxFont font = wxGetFontFromUser(this, m_font); - if ( !font.Ok() ) + if ( !font.IsOk() ) return; m_font = font; diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp index 4bc975327f..2a3dfe2cca 100644 --- a/samples/xrc/myframe.cpp +++ b/samples/xrc/myframe.cpp @@ -229,9 +229,9 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) // XRCCTRL wxListCtrl * const list = XRCCTRL(dlg, "controls_listctrl", wxListCtrl); - list->InsertItem(0, "Athos"); list->SetItem(0, 1, "90"); - list->InsertItem(1, "Porthos"); list->SetItem(1, 1, "120"); - list->InsertItem(2, "Aramis"); list->SetItem(2, 1, "80"); + list->InsertItem(0, "Athos", 0); list->SetItem(0, 1, "90", 2); + list->InsertItem(1, "Porthos", 5); list->SetItem(1, 1, "120", 3); + list->InsertItem(2, "Aramis", 1); list->SetItem(2, 1, "80", 4); #endif // wxUSE_LISTCTRL #if wxUSE_TREECTRL diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc index 8a92a50b0b..b50afb8112 100644 --- a/samples/xrc/rc/controls.xrc +++ b/samples/xrc/rc/controls.xrc @@ -511,14 +511,25 @@ lay them out using wxSizers, absolute positioning, everything you like! 220,160 + + 16,16 + + + + + + + Name - 150 + 105 + 0 Weight wxLIST_FORMAT_RIGHT - 50 + 105 + 1 @@ -1136,9 +1147,18 @@ lay them out using wxSizers, absolute positioning, everything you like! 350,280 + + 16,16 + + + + + 0 + 0 + 1 200,180 @@ -1147,10 +1167,13 @@ lay them out using wxSizers, absolute positioning, everything you like! 1 + 1 + 1 2 + 2 200,180 @@ -1159,6 +1182,7 @@ lay them out using wxSizers, absolute positioning, everything you like! 1 + 3 200,180 diff --git a/setup.h.in b/setup.h.in index 456f24fa12..39a678f315 100644 --- a/setup.h.in +++ b/setup.h.in @@ -216,11 +216,7 @@ #define wxUSE_STD_DEFAULT 0 #endif -#if defined(_MSC_VER) && _MSC_VER < 1300 - #define wxUSE_STD_CONTAINERS 0 -#else - #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT -#endif +#define wxUSE_STD_CONTAINERS 0 #define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index cb1903a287..a64ed0cce5 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -69,41 +69,6 @@ const int BUTTON_DROPDOWN_WIDTH = 10; wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, const wxColour& color); -static wxBitmap MakeDisabledBitmap(wxBitmap& bmp) -{ - wxImage image = bmp.ConvertToImage(); - - int mr, mg, mb; - mr = image.GetMaskRed(); - mg = image.GetMaskGreen(); - mb = image.GetMaskBlue(); - - unsigned char* data = image.GetData(); - int width = image.GetWidth(); - int height = image.GetHeight(); - bool has_mask = image.HasMask(); - - for (int y = height-1; y >= 0; --y) - { - for (int x = width-1; x >= 0; --x) - { - data = image.GetData() + (y*(width*3))+(x*3); - unsigned char* r = data; - unsigned char* g = data+1; - unsigned char* b = data+2; - - if (has_mask && *r == mr && *g == mg && *b == mb) - continue; - - *r = wxColour::AlphaBlend(*r, 255, 0.4); - *g = wxColour::AlphaBlend(*g, 255, 0.4); - *b = wxColour::AlphaBlend(*b, 255, 0.4); - } - } - - return wxBitmap(image); -} - static wxColor GetBaseColor() { @@ -362,10 +327,8 @@ void wxAuiDefaultToolBarArt::DrawButton( else bmp = item.GetBitmap(); - if (!bmp.IsOk()) - return; - - dc.DrawBitmap(bmp, bmp_x, bmp_y, true); + if ( bmp.IsOk() ) + dc.DrawBitmap(bmp, bmp_x, bmp_y, true); // set the item's text color based on if it is disabled dc.SetTextForeground(*wxBLACK); @@ -465,6 +428,15 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton( dc.DrawRectangle(button_rect); dc.DrawRectangle(dropdown_rect); } + else if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) + { + // Notice that this branch must come after the hover one to ensure the + // correct appearance when the mouse hovers over a checked item. + dc.SetPen(wxPen(m_highlight_colour)); + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); + dc.DrawRectangle(button_rect); + dc.DrawRectangle(dropdown_rect); + } wxBitmap bmp; wxBitmap dropbmp; @@ -989,10 +961,7 @@ wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, // no disabled bitmap specified, we need to make one if (item.bitmap.IsOk()) { - //wxImage img = item.bitmap.ConvertToImage(); - //wxImage grey_version = img.ConvertToGreyscale(); - //item.disabled_bitmap = wxBitmap(grey_version); - item.disabled_bitmap = MakeDisabledBitmap(item.bitmap); + item.disabled_bitmap = item.bitmap.ConvertToDisabled(); } } m_items.Add(item); @@ -1537,13 +1506,13 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state) if (idx >= 0 && idx < count) { - for (i = idx; i < count; ++i) + for (i = idx + 1; i < count; ++i) { if (m_items[i].kind != wxITEM_RADIO) break; m_items[i].state &= ~wxAUI_BUTTON_STATE_CHECKED; } - for (i = idx; i > 0; i--) + for (i = idx - 1; i >= 0; i--) { if (m_items[i].kind != wxITEM_RADIO) break; @@ -2446,8 +2415,11 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) } else if (item.kind == wxITEM_CHECK) { - // draw a toggle button - m_art->DrawButton(dc, this, item, item_rect); + // draw either a regular or dropdown toggle button + if (!item.dropdown) + m_art->DrawButton(dc, this, item, item_rect); + else + m_art->DrawDropDownButton(dc, this, item, item_rect); } else if (item.kind == wxITEM_RADIO) { diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index d308cdd4dd..0b7dfad98b 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -48,6 +48,7 @@ wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent); +wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent); wxDEFINE_EVENT(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent); @@ -2306,6 +2307,16 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt) void wxAuiTabCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) { + if (m_is_dragging) + { + m_is_dragging = false; + + wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, m_windowId); + evt.SetSelection(GetIdxFromWindow(m_click_tab)); + evt.SetOldSelection(evt.GetSelection()); + evt.SetEventObject(this); + GetEventHandler()->ProcessEvent(evt); + } } void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) @@ -2824,6 +2835,9 @@ BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl) EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, wxAuiNotebook::OnTabEndDrag) + EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, + wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG, + wxAuiNotebook::OnTabCancelDrag) EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebook::OnTabDragMotion) @@ -2846,18 +2860,9 @@ BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl) wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, wxAuiNotebook::OnTabBgDClick) EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKeyNotebook) - -#ifdef wxHAS_NATIVE_TAB_TRAVERSAL - WX_EVENT_TABLE_CONTROL_CONTAINER(wxAuiNotebook) -#else - // Avoid clash with container event handler functions - EVT_SET_FOCUS(wxAuiNotebook::OnFocus) -#endif END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxAuiNotebook, wxControl) - -wxAuiNotebook::wxAuiNotebook() +void wxAuiNotebook::Init() { m_curpage = -1; m_tab_id_counter = wxAuiBaseTabCtrlId; @@ -2867,18 +2872,6 @@ wxAuiNotebook::wxAuiNotebook() m_requested_tabctrl_height = -1; } -wxAuiNotebook::wxAuiNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style) : wxControl(parent, id, pos, size, style) -{ - m_dummy_wnd = NULL; - m_requested_bmp_size = wxDefaultSize; - m_requested_tabctrl_height = -1; - InitNotebook(style); -} - bool wxAuiNotebook::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos, @@ -2897,9 +2890,6 @@ bool wxAuiNotebook::Create(wxWindow* parent, // code called by all constructors void wxAuiNotebook::InitNotebook(long style) { - WX_INIT_CONTROL_CONTAINER(); - // SetCanFocus(false); - SetName(wxT("wxAuiNotebook")); m_curpage = -1; m_tab_id_counter = wxAuiBaseTabCtrlId; @@ -4114,6 +4104,18 @@ void wxAuiNotebook::OnTabEndDrag(wxAuiNotebookEvent& evt) +void wxAuiNotebook::OnTabCancelDrag(wxAuiNotebookEvent& command_evt) +{ + wxAuiNotebookEvent& evt = (wxAuiNotebookEvent&)command_evt; + + m_mgr.HideHint(); + + wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject(); + wxCHECK_RET( src_tabs, _T("no source object?") ); + + src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW)); +} + wxAuiTabCtrl* wxAuiNotebook::GetTabCtrlFromPoint(const wxPoint& pt) { // if we've just removed the last tab from the source diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp index 9fafc9976d..05740acecb 100644 --- a/src/aui/floatpane.cpp +++ b/src/aui/floatpane.cpp @@ -123,7 +123,22 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) SetTitle(pane.caption); - if (pane.floating_size != wxDefaultSize) + // This code is slightly awkward because we need to reset wxRESIZE_BORDER + // before calling SetClientSize() below as doing it after setting the + // client size would actually change it, at least under MSW, where the + // total window size doesn't change and hence, as the borders size changes, + // the client size does change. + // + // So we must call it first but doing it generates a size event and updates + // pane.floating_size from inside it so we must also record its original + // value before doing it. + const bool hasFloatingSize = pane.floating_size != wxDefaultSize; + if (pane.IsFixed()) + { + SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER); + } + + if ( hasFloatingSize ) { SetSize(pane.floating_size); } @@ -144,11 +159,6 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) SetClientSize(size); } - - if (pane.IsFixed()) - { - SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER); - } } wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 40a3a14490..bdb37e182c 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -1589,6 +1589,7 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) input.Replace(wxT("\\|"), wxT("\a")); input.Replace(wxT("\\;"), wxT("\b")); + m_has_maximized = false; while (1) { wxAuiPaneInfo pane; @@ -1631,6 +1632,9 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) LoadPaneInfo(pane_part, pane); + if ( pane.IsMaximized() ) + m_has_maximized = true; + wxAuiPaneInfo& p = GetPane(pane.name); if (!p.IsOk()) { @@ -2889,7 +2893,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, if (pt.x < layer_insert_offset && - pt.x > layer_insert_offset-auiLayerInsertPixels) + pt.x > layer_insert_offset-auiLayerInsertPixels && + pt.y > 0 && + pt.y < cli_size.y) { int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT), GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)), @@ -2905,7 +2911,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, return ProcessDockResult(target, drop); } else if (pt.y < layer_insert_offset && - pt.y > layer_insert_offset-auiLayerInsertPixels) + pt.y > layer_insert_offset-auiLayerInsertPixels && + pt.x > 0 && + pt.x < cli_size.x) { int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP), GetMaxLayer(docks, wxAUI_DOCK_LEFT)), @@ -2921,7 +2929,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, return ProcessDockResult(target, drop); } else if (pt.x >= cli_size.x - layer_insert_offset && - pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels) + pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels && + pt.y > 0 && + pt.y < cli_size.y) { int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT), GetMaxLayer(docks, wxAUI_DOCK_TOP)), @@ -2937,7 +2947,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, return ProcessDockResult(target, drop); } else if (pt.y >= cli_size.y - layer_insert_offset && - pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels) + pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels && + pt.x > 0 && + pt.x < cli_size.x) { int new_layer = wxMax( wxMax( GetMaxLayer(docks, wxAUI_DOCK_BOTTOM), GetMaxLayer(docks, wxAUI_DOCK_LEFT)), @@ -3338,7 +3350,8 @@ void wxAuiManager::ShowHint(const wxRect& rect) wxAuiPaneInfo& pane = m_panes.Item(i); if (pane.IsFloating() && - pane.frame->IsShown()) + pane.frame && + pane.frame->IsShown()) { wxRect rect = pane.frame->GetRect(); #ifdef __WXGTK__ @@ -3429,6 +3442,15 @@ void wxAuiManager::StartPaneDrag(wxWindow* pane_window, m_action_window = pane_window; m_action_offset = offset; m_frame->CaptureMouse(); + + if (pane.frame) + { + wxRect window_rect = pane.frame->GetRect(); + wxRect client_rect = pane.frame->GetClientRect(); + wxPoint client_pt = pane.frame->ClientToScreen(client_rect.GetTopLeft()); + wxPoint origin_pt = client_pt - window_rect.GetTopLeft(); + m_action_offset += origin_pt; + } } @@ -4601,6 +4623,15 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) { if (m_action_window) { + // We can't move the child window so we need to get the frame that + // we want to be really moving. This is probably not the best place + // to do this but at least it fixes the bug (#13177) for now. + if (!m_action_window->IsKindOf(CLASSINFO(wxAuiFloatingFrame))) + { + wxAuiPaneInfo& pane = GetPane(m_action_window); + m_action_window = pane.frame; + } + wxPoint pt = m_frame->ClientToScreen(event.GetPosition()); m_action_window->Move(pt.x - m_action_offset.x, pt.y - m_action_offset.y); diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm index 3ce0eee2a7..16ca2a7847 100644 --- a/src/cocoa/bitmap.mm +++ b/src/cocoa/bitmap.mm @@ -166,7 +166,7 @@ WX_NSBitmapImageRep wxBitmap::GetNSBitmapImageRep() WX_NSImage wxBitmap::GetNSImage(bool useMask) const { - if(!Ok()) + if(!IsOk()) return nil; NSImage *nsimage = [[[NSImage alloc] initWithSize:NSMakeSize(GetWidth(), GetHeight())] autorelease]; @@ -351,7 +351,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) wxImage image; if(!image.LoadFile(filename,type)) return false; - if(!image.Ok()) + if(!image.IsOk()) return false; *this = wxBitmap(image); return true; @@ -428,7 +428,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const { wxAutoNSAutoreleasePool pool; - if(!Ok()) + if(!IsOk()) return wxNullBitmap; NSImage *nsimage = GetNSImage(false); @@ -450,7 +450,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const wxImage wxBitmap::ConvertToImage() const { wxAutoNSAutoreleasePool pool; - if(!Ok()) + if(!IsOk()) return /*wxImage(5,5)*/wxNullImage; NSImage *nsimage = GetNSImage(false /* don't use mask */); wxImage newImage(M_BITMAPDATA->m_width,M_BITMAPDATA->m_height); @@ -476,7 +476,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth) wxAutoNSAutoreleasePool pool; UnRef(); - wxCHECK_MSG(image.Ok(), false, wxT("invalid image")); + wxCHECK_MSG(image.IsOk(), false, wxT("invalid image")); wxCHECK_MSG(depth == -1 || depth == 1, false, wxT("invalid bitmap depth")); m_refData = new wxBitmapRefData(); @@ -511,7 +511,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth) void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { - if(!Ok()) + if(!IsOk()) return NULL; NSBitmapImageRep *bitmapRep = M_BITMAPDATA->m_cocoaNSBitmapImageRep; @@ -657,7 +657,7 @@ static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colou bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { wxAutoNSAutoreleasePool pool; - if(!bitmap.Ok()) + if(!bitmap.IsOk()) return false; int bmpWidth = bitmap.GetWidth(); int bmpHeight = bitmap.GetHeight(); diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm index a631c1302e..2a75f403f9 100644 --- a/src/cocoa/brush.mm +++ b/src/cocoa/brush.mm @@ -202,19 +202,19 @@ void wxBrush::SetStipple(const wxBitmap& stipple) wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->GetColour(); } wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->GetStyle(); } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid brush") ); return M_BRUSHDATA->GetStipple(); } diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index 01df15a010..0f24ba758f 100644 --- a/src/cocoa/dc.mm +++ b/src/cocoa/dc.mm @@ -456,7 +456,7 @@ void wxCocoaDCImpl::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool { wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; - if(!bmp.Ok()) + if(!bmp.IsOk()) return; #if 0 @@ -540,13 +540,13 @@ void wxCocoaDCImpl::DoGetSizeMM( int* width, int* height ) const void wxCocoaDCImpl::SetTextForeground( const wxColour &col ) { -// if (!Ok()) return; +// if (!IsOk()) return; m_textForegroundColour = col; }; void wxCocoaDCImpl::SetTextBackground( const wxColour &col ) { -// if (!Ok()) return; +// if (!IsOk()) return; m_textBackgroundColour = col; }; diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm index 5c74dd212c..c8f1ff94b4 100644 --- a/src/cocoa/dcmemory.mm +++ b/src/cocoa/dcmemory.mm @@ -75,7 +75,7 @@ bool wxMemoryDCImpl::CocoaUnlockFocus() void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) { wxAutoNSAutoreleasePool pool; - if(m_selectedBitmap.Ok()) + if(m_selectedBitmap.IsOk()) { CocoaTakeFocus(); wxASSERT(m_cocoaNSImage); @@ -95,7 +95,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) [m_cocoaNSImage release]; m_cocoaNSImage = nil; m_selectedBitmap = bitmap; - if(m_selectedBitmap.Ok()) + if(m_selectedBitmap.IsOk()) { // Create an offscreen window of the same size m_cocoaNSImage = [[NSImage alloc] @@ -137,7 +137,7 @@ bool wxMemoryDCImpl::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc, int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask) { - if(!m_selectedBitmap.Ok()) + if(!m_selectedBitmap.IsOk()) return false; NSAffineTransform *transform = [NSAffineTransform transform]; diff --git a/src/cocoa/font.mm b/src/cocoa/font.mm index be2717fb1f..abb9ddd09e 100644 --- a/src/cocoa/font.mm +++ b/src/cocoa/font.mm @@ -350,7 +350,7 @@ wxFontEncoding wxFont::GetEncoding() const int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_info.pointSize; } @@ -364,7 +364,7 @@ bool wxFont::GetUnderlined() const wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_info.style; } @@ -375,13 +375,13 @@ wxFontFamily wxFont::DoGetFamily() const wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_info.weight; } const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return &M_FONTDATA->m_info; } diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm index 77a622e4f7..3dc3027c48 100644 --- a/src/cocoa/icon.mm +++ b/src/cocoa/icon.mm @@ -114,7 +114,7 @@ bool wxIcon::CreateFromXpm(const char* const* xpm) { wxBitmap bitmap(xpm); CopyFromBitmap(bitmap); - return Ok(); + return IsOk(); } bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, @@ -122,7 +122,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, { wxBitmap bitmap(filename, type); CopyFromBitmap(bitmap); - return bitmap.Ok(); + return bitmap.IsOk(); } void wxIcon::CopyFromBitmap(const wxBitmap& bitmap) @@ -133,7 +133,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bitmap) M_ICONDATA->m_height = bitmap.GetHeight(); wxAutoNSAutoreleasePool pool; M_ICONDATA->m_cocoaNSImage = [bitmap.GetNSImage(true) retain]; - M_ICONDATA->m_ok = bitmap.Ok(); + M_ICONDATA->m_ok = bitmap.IsOk(); M_ICONDATA->m_numColors = 0; M_ICONDATA->m_quality = 0; } diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm index 11b575fa95..b5d1daa220 100644 --- a/src/cocoa/menuitem.mm +++ b/src/cocoa/menuitem.mm @@ -225,7 +225,7 @@ void wxMenuItem::SetBitmaps(const wxBitmap& bmpChecked, } else { - wxASSERT_MSG(!bmpUnchecked.Ok(),wxT("Normal menu items should only have one bitmap")); + wxASSERT_MSG(!bmpUnchecked.IsOk(),wxT("Normal menu items should only have one bitmap")); [m_cocoaNSMenuItem setImage: bmpChecked.GetNSImage(true)]; } } diff --git a/src/common/anidecod.cpp b/src/common/anidecod.cpp index 9d202672c6..d0d0b6d75b 100644 --- a/src/common/anidecod.cpp +++ b/src/common/anidecod.cpp @@ -127,6 +127,11 @@ bool wxANIDecoder::DoCanRead(wxInputStream& stream) const wxInt32 anih32; memcpy( &anih32, "anih", 4 ); + if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) + { + return false; + } + if ( !stream.Read(&FCC1, 4) ) return false; @@ -220,6 +225,11 @@ bool wxANIDecoder::Load( wxInputStream& stream ) wxInt32 seq32; memcpy( &seq32, "seq ", 4 ); + if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) + { + return false; + } + if ( !stream.Read(&FCC1, 4) ) return false; if ( FCC1 != riff32 ) diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index dac5bd30b7..69c6928528 100644 --- a/src/common/artprov.cpp +++ b/src/common/artprov.cpp @@ -231,12 +231,12 @@ wxArtProvider::~wxArtProvider() node; node = node->GetNext()) { bmp = node->GetData()->CreateBitmap(id, client, size); - if ( bmp.Ok() ) + if ( bmp.IsOk() ) break; } wxSize sizeNeeded = size; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { // no bitmap created -- as a fallback, try if we can find desired // icon in a bundle diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index 49fbe51d33..542247d4ae 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -207,7 +207,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id); #if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) - if (bmp.Ok()) + if (bmp.IsOk()) { // fit into transparent image with desired size hint from the client if (reqSize == wxDefaultSize) diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index bae77c18ce..34bf85608e 100644 --- a/src/common/bmpbase.cpp +++ b/src/common/bmpbase.cpp @@ -156,7 +156,7 @@ wxBitmap::wxBitmap(const char* const* bits) #if wxUSE_IMAGE && wxUSE_XPM wxImage image(bits); - wxCHECK2_MSG(image.Ok(), return, wxT("invalid bitmap data")); + wxCHECK2_MSG(image.IsOk(), return, wxT("invalid bitmap data")); *this = wxBitmap(image); #else diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp index f8be59aabb..4ddc6a5bad 100644 --- a/src/common/btncmn.cpp +++ b/src/common/btncmn.cpp @@ -107,7 +107,7 @@ wxWindow *wxButtonBase::SetDefault() return tlw->SetDefaultItem(this); } -void wxButtonBase::SetBitmapPosition(wxDirection dir) +void wxAnyButtonBase::SetBitmapPosition(wxDirection dir) { wxASSERT_MSG( !(dir & ~wxDIRECTION_MASK), "non-direction flag used" ); wxASSERT_MSG( !!(dir & wxLEFT) + diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp index a42a22900d..ad2ae52e1a 100644 --- a/src/common/cairo.cpp +++ b/src/common/cairo.cpp @@ -41,6 +41,7 @@ wxCairoLibrary::wxCairoLibrary() if ( !m_ok ) return; +#if wxUSE_PANGO m_libPangoCairo.Load("libpangocairo-1.0.so.0"); m_ok = m_libPangoCairo.IsLoaded(); if ( !m_ok ) @@ -48,6 +49,7 @@ wxCairoLibrary::wxCairoLibrary() m_libCairo.Unload(); return; } +#endif m_ok = InitializeMethods(); } @@ -129,8 +131,10 @@ bool wxCairoLibrary::InitializeMethods() wxDL_METHOD_LOAD(m_libCairo, cairo_surface_destroy); wxDL_METHOD_LOAD(m_libCairo, cairo_translate); +#if wxUSE_PANGO wxDL_METHOD_LOAD(m_libPangoCairo, pango_cairo_update_layout); wxDL_METHOD_LOAD(m_libPangoCairo, pango_cairo_show_layout); +#endif return true; } diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp index 1f9622c886..510488dd11 100644 --- a/src/common/clrpickercmn.cpp +++ b/src/common/clrpickercmn.cpp @@ -84,7 +84,7 @@ void wxColourPickerCtrl::SetColour(const wxColour &col) bool wxColourPickerCtrl::SetColour(const wxString &text) { wxColour col(text); // smart wxString->wxColour conversion - if ( !col.Ok() ) + if ( !col.IsOk() ) return false; M_PICKER->SetColour(col); UpdateTextCtrlFromPicker(); @@ -105,7 +105,7 @@ void wxColourPickerCtrl::UpdatePickerFromTextCtrl() // wxString -> wxColour conversion wxColour col(m_text->GetValue()); - if ( !col.Ok() ) + if ( !col.IsOk() ) return; // invalid user input if (M_PICKER->GetColour() != col) diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp index d32958fb93..2952c2d6ae 100644 --- a/src/common/cmdline.cpp +++ b/src/common/cmdline.cpp @@ -106,8 +106,7 @@ struct wxCmdLineOption type = typ; flags = fl; - m_hasVal = false; - m_isNegated = false; + Reset(); } // can't use union easily here, so just store all possible data fields, we @@ -142,12 +141,19 @@ struct wxCmdLineOption { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; } #endif // wxUSE_DATETIME - void SetHasValue(bool hasValue = true) { m_hasVal = hasValue; } + void SetHasValue() { m_hasVal = true; } bool HasValue() const { return m_hasVal; } void SetNegated() { m_isNegated = true; } bool IsNegated() const { return m_isNegated; } + // Reset to the initial state, called before parsing another command line. + void Reset() + { + m_hasVal = + m_isNegated = false; + } + public: wxCmdLineEntryType kind; wxString shortName, @@ -637,8 +643,7 @@ void wxCmdLineParser::Reset() { for ( size_t i = 0; i < m_data->m_options.GetCount(); i++ ) { - wxCmdLineOption& opt = m_data->m_options[i]; - opt.SetHasValue(false); + m_data->m_options[i].Reset(); } } @@ -702,11 +707,45 @@ int wxCmdLineParser::Parse(bool showUsage) if (longOptionsEnabled) { + wxString errorOpt; + optInd = m_data->FindOptionByLongName(name); if ( optInd == wxNOT_FOUND ) { - errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str()) - << wxT('\n'); + // Check if this could be a negatable long option. + if ( name.Last() == '-' ) + { + name.RemoveLast(); + + optInd = m_data->FindOptionByLongName(name); + if ( optInd != wxNOT_FOUND ) + { + if ( !(m_data->m_options[optInd].flags & + wxCMD_LINE_SWITCH_NEGATABLE) ) + { + errorOpt.Printf + ( + _("Option '%s' can't be negated"), + name + ); + optInd = wxNOT_FOUND; + } + } + } + + if ( optInd == wxNOT_FOUND ) + { + if ( errorOpt.empty() ) + { + errorOpt.Printf + ( + _("Unknown long option '%s'"), + name + ); + } + + errorMsg << errorOpt << wxT('\n'); + } } } else diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index e3138fe06b..46c8b1f9d8 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -170,7 +170,7 @@ bool wxPrintData::IsOk() const { m_nativeData->TransferFrom( *this ); - return m_nativeData->Ok(); + return m_nativeData->IsOk(); } // ---------------------------------------------------------------------------- diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp index 7bbb17260f..013b17cee3 100644 --- a/src/common/colourcmn.cpp +++ b/src/common/colourcmn.cpp @@ -177,13 +177,13 @@ bool wxColourBase::FromString(const wxString& str) // because this place can be called from constructor // and 'this' could not be available yet wxColour clr = wxTheColourDatabase->Find(str); - if (clr.Ok()) + if (clr.IsOk()) Set((unsigned char)clr.Red(), (unsigned char)clr.Green(), (unsigned char)clr.Blue()); } - if (Ok()) + if (IsOk()) return true; wxLogDebug(wxT("wxColour::Set - couldn't set to colour string '%s'"), str); diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index 8b2ff1940b..ff3563c2db 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -1172,7 +1172,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) // its platform default or bitmap+pushbutton background is used, but not if // there is vertical size adjustment or horizontal spacing. if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || - (m_bmpNormal.Ok() && m_blankButtonBg) ) && + (m_bmpNormal.IsOk() && m_blankButtonBg) ) && m_btnSpacingX == 0 && m_btnHei <= 0 ) { @@ -1180,7 +1180,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) btnBorder = 0; } else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) && - m_btnSpacingX == 0 && !m_bmpNormal.Ok() ) + m_btnSpacingX == 0 && !m_bmpNormal.IsOk() ) { m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE); btnBorder = 0; @@ -1237,7 +1237,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) // It is larger // OR // button width is set to default and blank button bg is not drawn - if ( m_bmpNormal.Ok() ) + if ( m_bmpNormal.IsOk() ) { int bmpReqWidth = m_bmpNormal.GetWidth(); int bmpReqHeight = m_bmpNormal.GetHeight(); @@ -1259,7 +1259,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth ) { int newY = butHeight+(customBorder*2); SetClientSize(wxDefaultCoord,newY); - if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight ) + if ( m_bmpNormal.IsOk() || m_btnArea.width != butWidth || m_btnArea.height != butHeight ) m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; else m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON; @@ -1368,16 +1368,16 @@ wxSize wxComboCtrlBase::DoGetBestSize() const // TODO: Better method to calculate close-to-native control height. int fhei; - if ( m_font.Ok() ) + if ( m_font.IsOk() ) fhei = (m_font.GetPointSize()*2) + 5; - else if ( wxNORMAL_FONT->Ok() ) + else if ( wxNORMAL_FONT->IsOk() ) fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5; else fhei = sizeText.y + 4; // Need to force height to accomodate bitmap? int btnSizeY = m_btnSize.y; - if ( m_bmpNormal.Ok() && fhei < btnSizeY ) + if ( m_bmpNormal.IsOk() && fhei < btnSizeY ) fhei = btnSizeY; // Control height doesn't depend on border @@ -1702,7 +1702,7 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags ) dc.DrawRectangle(rect); } - if ( !m_bmpNormal.Ok() ) + if ( !m_bmpNormal.IsOk() ) { if ( flags & Button_BitmapOnly ) return; @@ -2564,17 +2564,17 @@ void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal, m_bmpNormal = bmpNormal; m_blankButtonBg = blankButtonBg; - if ( bmpPressed.Ok() ) + if ( bmpPressed.IsOk() ) m_bmpPressed = bmpPressed; else m_bmpPressed = bmpNormal; - if ( bmpHover.Ok() ) + if ( bmpHover.IsOk() ) m_bmpHover = bmpHover; else m_bmpHover = bmpNormal; - if ( bmpDisabled.Ok() ) + if ( bmpDisabled.IsOk() ) m_bmpDisabled = bmpDisabled; else m_bmpDisabled = bmpNormal; diff --git a/src/common/containr.cpp b/src/common/containr.cpp index dd4e892faf..29756da696 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -650,14 +650,26 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) // It might happen that the window got reparented if ( (*childLastFocused)->GetParent() == win ) { - wxLogTrace(TRACE_FOCUS, - wxT("SetFocusToChild() => last child (0x%p)."), - (*childLastFocused)->GetHandle()); + // And it also could have become hidden in the meanwhile, in this + // case focus its parent instead. + while ( !(*childLastFocused)->IsShown() ) + { + *childLastFocused = (*childLastFocused)->GetParent(); + if ( !*childLastFocused ) + break; + } - // not SetFocusFromKbd(): we're restoring focus back to the old - // window and not setting it as the result of a kbd action - (*childLastFocused)->SetFocus(); - return true; + if ( *childLastFocused ) + { + wxLogTrace(TRACE_FOCUS, + wxT("SetFocusToChild() => last child (0x%p)."), + (*childLastFocused)->GetHandle()); + + // not SetFocusFromKbd(): we're restoring focus back to the old + // window and not setting it as the result of a kbd action + (*childLastFocused)->SetFocus(); + return true; + } } else { diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 82bcefd814..1382c3102c 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -588,7 +588,7 @@ wxSize wxStaticBitmapBase::DoGetBestSize() const { wxSize best; wxBitmap bmp = GetBitmap(); - if ( bmp.Ok() ) + if ( bmp.IsOk() ) best = wxSize(bmp.GetWidth(), bmp.GetHeight()); else // this is completely arbitrary diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 8e2469c228..611d3b1d5a 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -763,21 +763,27 @@ bool wxDataViewRendererBase::FinishEditing() DestroyEditControl(); - if (!Validate(value)) - return false; - + bool isValid = Validate(value); unsigned int col = GetOwner()->GetModelColumn(); - dv_ctrl->GetModel()->ChangeValue(value, m_item, col); // Now we should send Editing Done event wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() ); event.SetDataViewColumn( GetOwner() ); event.SetModel( dv_ctrl->GetModel() ); event.SetItem( m_item ); + event.SetValue( value ); + event.SetColumn( col ); + event.SetEditCanceled( !isValid ); event.SetEventObject( dv_ctrl ); dv_ctrl->GetEventHandler()->ProcessEvent( event ); - return true; + if ( isValid && event.IsAllowed() ) + { + dv_ctrl->GetModel()->ChangeValue(value, m_item, col); + return true; + } + + return false; } void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model, @@ -1456,7 +1462,15 @@ bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state ) wxSize wxDataViewSpinRenderer::GetSize() const { - return wxSize(80,16); + wxSize sz = GetTextExtent(wxString::Format("%d", (int)m_data)); + + // Allow some space for the spin buttons, which is approximately the size + // of a scrollbar (and getting pixel-exact value would be complicated). + // Also add some whitespace between the text and the button: + sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + sz.x += GetTextExtent("M").x; + + return sz; } bool wxDataViewSpinRenderer::SetValue( const wxVariant &value ) @@ -1514,7 +1528,18 @@ bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) wxSize wxDataViewChoiceRenderer::GetSize() const { - return wxSize(80,16); + wxSize sz; + + for ( wxArrayString::const_iterator i = m_choices.begin(); i != m_choices.end(); ++i ) + sz.IncTo(GetTextExtent(*i)); + + // Allow some space for the right-side button, which is approximately the + // size of a scrollbar (and getting pixel-exact value would be complicated). + // Also add some whitespace between the text and the button: + sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + sz.x += GetTextExtent("M").x; + + return sz; } bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 02f5ee8a3e..d1e8ddea76 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -1182,7 +1182,7 @@ void wxDC::DrawLabel(const wxString& text, GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine); wxCoord width, height; - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { width = widthText + bitmap.GetWidth(); height = bitmap.GetHeight(); @@ -1224,7 +1224,7 @@ void wxDC::DrawLabel(const wxString& text, wxCoord x0 = x, y0 = y, width0 = width; - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { DrawBitmap(bitmap, x, y, true /* use mask */); diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 42f58a3721..a06cd25382 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -53,27 +53,26 @@ static inline double DegToRad(double deg) return (deg * M_PI) / 180.0; } -static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode *op) +static wxCompositionMode TranslateRasterOp(wxRasterOperationMode function) { switch ( function ) { case wxCOPY: // src // since we are supporting alpha, _OVER is closer to the intention than _SOURCE // since the latter would overwrite even when alpha is not set to opaque - *op = wxCOMPOSITION_OVER; - break; + return wxCOMPOSITION_OVER; + case wxOR: // src OR dst - *op = wxCOMPOSITION_ADD; - break; + return wxCOMPOSITION_ADD; + case wxNO_OP: // dst - *op = wxCOMPOSITION_DEST; // ignore the source - break; + return wxCOMPOSITION_DEST; // ignore the source + case wxCLEAR: // 0 - *op = wxCOMPOSITION_CLEAR;// clear dst - break; + return wxCOMPOSITION_CLEAR;// clear dst + case wxXOR: // src XOR dst - *op = wxCOMPOSITION_XOR; - break; + return wxCOMPOSITION_XOR; case wxAND: // src AND dst case wxAND_INVERT: // (NOT src) AND dst @@ -86,10 +85,10 @@ static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode case wxOR_REVERSE: // src OR (NOT dst) case wxSET: // 1 case wxSRC_INVERT: // NOT src - default: - return false; + break; } - return true; + + return wxCOMPOSITION_INVALID; } //----------------------------------------------------------------------------- @@ -115,6 +114,13 @@ wxGCDC::wxGCDC( const wxPrinterDC& dc) : } #endif +#if defined(__WXMSW__) && wxUSE_ENH_METAFILE +wxGCDC::wxGCDC(const wxEnhMetaFileDC& dc) + : wxDC(new wxGCDCImpl(this, dc)) +{ +} +#endif + wxGCDC::wxGCDC() : wxDC( new wxGCDCImpl( this ) ) { @@ -124,7 +130,7 @@ wxGCDC::~wxGCDC() { } -wxGraphicsContext* wxGCDC::GetGraphicsContext() +wxGraphicsContext* wxGCDC::GetGraphicsContext() const { if (!m_pimpl) return NULL; wxGCDCImpl *gc_impl = (wxGCDCImpl*) m_pimpl; @@ -194,6 +200,15 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) : } #endif +#if defined(__WXMSW__) && wxUSE_ENH_METAFILE +wxGCDCImpl::wxGCDCImpl(wxDC *owner, const wxEnhMetaFileDC& dc) + : wxDCImpl(owner) +{ + Init(); + SetGraphicsContext(wxGraphicsContext::Create(dc)); +} +#endif + void wxGCDCImpl::Init() { m_ok = false; @@ -502,8 +517,8 @@ void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function ) m_logicalFunction = function; - wxCompositionMode mode; - m_logicalFunctionSupported = TranslateRasterOp( function, &mode); + wxCompositionMode mode = TranslateRasterOp( function ); + m_logicalFunctionSupported = mode != wxCOMPOSITION_INVALID; if (m_logicalFunctionSupported) m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode); @@ -874,8 +889,8 @@ bool wxGCDCImpl::DoStretchBlit( if ( logical_func == wxNO_OP ) return true; - wxCompositionMode mode; - if ( !TranslateRasterOp(logical_func, &mode) ) + wxCompositionMode mode = TranslateRasterOp(logical_func); + if ( mode == wxCOMPOSITION_INVALID ) { wxFAIL_MSG( wxT("Blitting is not supported with this logical operation.") ); return false; @@ -958,6 +973,18 @@ void wxGCDCImpl::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y) { + // For compatibility with other ports (notably wxGTK) and because it's + // genuinely useful, we allow passing multiline strings to DrawText(). + // However there is no native OSX function to draw them directly so we + // instead reuse the generic DrawLabel() method to render them. Of course, + // DrawLabel() itself will call back to us but with single line strings + // only so there won't be any infinite recursion here. + if ( str.find('\n') != wxString::npos ) + { + GetOwner()->DrawLabel(str, wxRect(x, y, 0, 0)); + return; + } + wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawText - invalid DC") ); if ( str.empty() ) @@ -1145,4 +1172,21 @@ void wxGCDCImpl::DoDrawCheckMark(wxCoord x, wxCoord y, wxDCImpl::DoDrawCheckMark(x,y,width,height); } +#ifdef __WXMSW__ +wxRect wxGCDCImpl::MSWApplyGDIPlusTransform(const wxRect& r) const +{ + wxGraphicsContext* const gc = GetGraphicsContext(); + wxCHECK_MSG( gc, r, wxT("Invalid wxGCDC") ); + + double x = 0, + y = 0; + gc->GetTransform().TransformPoint(&x, &y); + + wxRect rect(r); + rect.Offset(x, y); + + return rect; +} +#endif // __WXMSW__ + #endif // wxUSE_GRAPHICS_CONTEXT diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp index 1a71c1d51c..9aeb7e9530 100644 --- a/src/common/dcsvg.cpp +++ b/src/common/dcsvg.cpp @@ -46,55 +46,63 @@ inline wxString NumStr(double f) return wxString::FromCDouble(f, 2); } +// Return the colour representation as HTML-like "#rrggbb" string and also +// returns its alpha as opacity number in 0..1 range. +wxString Col2SVG(wxColour c, float *opacity) +{ + if ( c.Alpha() != wxALPHA_OPAQUE ) + { + *opacity = c.Alpha()/255.; + + // Remove the alpha before using GetAsString(wxC2S_HTML_SYNTAX) as it + // doesn't support colours with alpha channel. + c = wxColour(c.GetRGB()); + } + else // No alpha. + { + *opacity = 1.; + } + + return c.GetAsString(wxC2S_HTML_SYNTAX); +} + wxString wxPenString(wxColour c, int style = wxPENSTYLE_SOLID) { - wxString s = wxT("stroke:") + c.GetAsString(wxC2S_HTML_SYNTAX) + wxT("; "); - // Use the color's alpha value (if not opaque) for the opacity. - // Note that a transparent pen will override the alpha value. - if (c.Alpha() != wxALPHA_OPAQUE && style != wxPENSTYLE_TRANSPARENT) + float opacity; + wxString s = wxT("stroke:") + Col2SVG(c, &opacity) + wxT("; "); + + switch ( style ) { - s += wxString::Format(wxT("stroke-opacity:%s; "), NumStr(c.Alpha()/255.)); - } - else - { - switch ( style ) - { - case wxPENSTYLE_SOLID: - s += wxT("stroke-opacity:1.0; "); - break; - case wxPENSTYLE_TRANSPARENT: - s += wxT("stroke-opacity:0.0; "); - break; - default : - wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Pen Style not available")); - } + case wxPENSTYLE_SOLID: + s += wxString::Format(wxT("stroke-opacity:%s; "), NumStr(opacity)); + break; + case wxPENSTYLE_TRANSPARENT: + s += wxT("stroke-opacity:0.0; "); + break; + default : + wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Pen Style not available")); } + return s; } wxString wxBrushString(wxColour c, int style = wxBRUSHSTYLE_SOLID) { - wxString s = wxT("fill:") + c.GetAsString(wxC2S_HTML_SYNTAX) + wxT("; "); - // Use the color's alpha value (if not opaque) for the opacity. - // Note that a transparent brush will override the alpha value. - if (c.Alpha() != wxALPHA_OPAQUE && style != wxBRUSHSTYLE_TRANSPARENT) + float opacity; + wxString s = wxT("fill:") + Col2SVG(c, &opacity) + wxT("; "); + + switch ( style ) { - s += wxString::Format(wxT("fill-opacity:%s; "), NumStr(c.Alpha()/255.)); - } - else - { - switch ( style ) - { - case wxBRUSHSTYLE_SOLID: - s += wxT("fill-opacity:1.0; "); - break; - case wxBRUSHSTYLE_TRANSPARENT: - s += wxT("fill-opacity:0.0; "); - break; - default : - wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Brush Style not available")); - } + case wxBRUSHSTYLE_SOLID: + s += wxString::Format(wxT("fill-opacity:%s; "), NumStr(opacity)); + break; + case wxBRUSHSTYLE_TRANSPARENT: + s += wxT("fill-opacity:0.0; "); + break; + default : + wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Brush Style not available")); } + return s; } @@ -139,7 +147,7 @@ void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, dou ////////////////////code here m_outfile = new wxFileOutputStream(filename); - m_OK = m_outfile->Ok(); + m_OK = m_outfile->IsOk(); if (m_OK) { m_filename = filename; @@ -643,14 +651,14 @@ void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoor { write(s); } - m_OK = m_outfile->Ok() && bPNG_OK; + m_OK = m_outfile->IsOk() && bPNG_OK; } void wxSVGFileDCImpl::write(const wxString &s) { const wxCharBuffer buf = s.utf8_str(); m_outfile->Write(buf, strlen((const char *)buf)); - m_OK = m_outfile->Ok(); + m_OK = m_outfile->IsOk(); } diff --git a/src/common/descrip.mms b/src/common/descrip.mms index b1141822d7..b5fd23aba1 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 21 March 2011 * +# Date : 29 April 2011 * # * #***************************************************************************** .first @@ -222,7 +222,7 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\ statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\ statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\ spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\ - valnum.obj,numformatter.obj,markupparser.obj + valnum.obj,numformatter.obj,markupparser.obj,affinematrix2d.obj OBJECTS_MOTIF=radiocmn.obj,combocmn.obj @@ -425,7 +425,7 @@ SOURCES = \ statboxcmn.cpp,slidercmn.cpp,statlinecmn.cpp,radiobtncmn.cpp,\ bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\ gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\ - colourdata.cpp,fontdata.cpp + colourdata.cpp,fontdata.cpp affinematrix2d.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -700,3 +700,4 @@ fontdata.obj : fontdata.cpp valnum.obj : valnum.cpp numformatter.obj : numformatter.cpp markupparser.obj : markupparser.cpp +affinematrix2d.obj : affinematrix2d.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 680ff2bde4..e4f6bf3bdb 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -122,8 +122,12 @@ wxString FindExtension(const wxString& path) wxDocument::wxDocument(wxDocument *parent) { m_documentModified = false; - m_documentParent = parent; m_documentTemplate = NULL; + + m_documentParent = parent; + if ( parent ) + parent->m_childDocuments.push_back(this); + m_commandProcessor = NULL; m_savedYet = false; } @@ -140,6 +144,9 @@ wxDocument::~wxDocument() if (GetDocumentManager()) GetDocumentManager()->RemoveDocument(this); + if ( m_documentParent ) + m_documentParent->m_childDocuments.remove(this); + // Not safe to do here, since it'll invoke virtual view functions // expecting to see valid derived objects: and by the time we get here, // we've called destructors higher up. @@ -151,6 +158,40 @@ bool wxDocument::Close() if ( !OnSaveModified() ) return false; + // When the parent document closes, its children must be closed as well as + // they can't exist without the parent. + + // As usual, first check if all children can be closed. + DocsList::const_iterator it = m_childDocuments.begin(); + for ( DocsList::const_iterator end = m_childDocuments.end(); it != end; ++it ) + { + if ( !(*it)->OnSaveModified() ) + { + // Leave the parent document opened if a child can't close. + return false; + } + } + + // Now that they all did, do close them: as m_childDocuments is modified as + // we iterate over it, don't use the usual for-style iteration here. + while ( !m_childDocuments.empty() ) + { + wxDocument * const childDoc = m_childDocuments.front(); + + // This will call OnSaveModified() once again but it shouldn't do + // anything as the document was just saved or marked as not needing to + // be saved by the call to OnSaveModified() that returned true above. + if ( !childDoc->Close() ) + { + wxFAIL_MSG( "Closing the child document unexpectedly failed " + "after its OnSaveModified() returned true" ); + } + + // Delete the child document by deleting all its views. + childDoc->DeleteAllViews(); + } + + return OnCloseDocument(); } @@ -231,6 +272,12 @@ void wxDocument::Modify(bool mod) wxDocManager *wxDocument::GetDocumentManager() const { + // For child documents we use the same document manager as the parent, even + // though we don't have our own template (as children are not opened/saved + // directly). + if ( m_documentParent ) + return m_documentParent->GetDocumentManager(); + return m_documentTemplate ? m_documentTemplate->GetDocumentManager() : NULL; } @@ -895,7 +942,7 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler) EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert) EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew) EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave) - EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateDisableIfNoDoc) + EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateFileSaveAs) EVT_UPDATE_UI(wxID_UNDO, wxDocManager::OnUpdateUndo) EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo) @@ -1106,26 +1153,27 @@ void wxDocManager::DoOpenMRUFile(unsigned n) wxString errMsg; // must contain exactly one "%s" if non-empty if ( wxFile::Exists(filename) ) { - // try to open it - if ( CreateDocument(filename, wxDOC_SILENT) ) - return; - - errMsg = _("The file '%s' couldn't be opened."); + // Try to open it but don't give an error if it failed: this could be + // normal, e.g. because the user cancelled opening it, and we don't + // have any useful information to put in the error message anyhow, so + // we assume that in case of an error the appropriate message had been + // already logged. + (void)CreateDocument(filename, wxDOC_SILENT); } else // file doesn't exist { - errMsg = _("The file '%s' doesn't exist and couldn't be opened."); + OnMRUFileNotExist(n, filename); } +} - - wxASSERT_MSG( !errMsg.empty(), "should have an error message" ); - +void wxDocManager::OnMRUFileNotExist(unsigned n, const wxString& filename) +{ // remove the file which we can't open from the MRU list RemoveFileFromHistory(n); // and tell the user about it - wxLogError(errMsg + '\n' + - _("It has been removed from the most recently used files list."), + wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\n" + "It has been removed from the most recently used files list."), filename); } @@ -1181,7 +1229,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event)) preview = new wxPrintPreview(printout, view->OnCreatePrintout(), &printDialogData); - if ( !preview->Ok() ) + if ( !preview->IsOk() ) { delete preview; wxLogError(_("Print preview creation failed.")); @@ -1254,7 +1302,13 @@ void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event) void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event) { wxDocument * const doc = GetCurrentDocument(); - event.Enable( doc && !doc->AlreadySaved() ); + event.Enable( doc && !doc->IsChildDocument() && !doc->AlreadySaved() ); +} + +void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event) +{ + wxDocument * const doc = GetCurrentDocument(); + event.Enable( doc && !doc->IsChildDocument() ); } void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event) diff --git a/src/common/event.cpp b/src/common/event.cpp index fcb917dae8..31e6e6adef 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -62,11 +62,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxThreadEvent, wxEvent) #endif // wxUSE_BASE #if wxUSE_GUI IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxThreadEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent) @@ -155,6 +155,9 @@ const wxEventType wxEVT_NULL = wxNewEventType(); wxDEFINE_EVENT( wxEVT_IDLE, wxIdleEvent ); +// Thread event +wxDEFINE_EVENT( wxEVT_THREAD, wxThreadEvent ); + #endif // wxUSE_BASE #if wxUSE_GUI @@ -312,9 +315,6 @@ wxDEFINE_EVENT( wxEVT_COMMAND_ENTER, wxCommandEvent ); wxDEFINE_EVENT( wxEVT_HELP, wxHelpEvent ); wxDEFINE_EVENT( wxEVT_DETAILED_HELP, wxHelpEvent ); -// Thread event -wxDEFINE_EVENT( wxEVT_COMMAND_THREAD, wxThreadEvent ); - #endif // wxUSE_GUI #if wxUSE_BASE @@ -422,8 +422,6 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) { m_clientData = NULL; m_clientObject = NULL; - m_extraLong = 0; - m_commandInt = 0; m_isCommandEvent = true; // the command events are propagated upwards by default diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index bf6fbc2efe..f94b3f5d91 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -255,7 +255,7 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& #else #error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work #endif - if ( !is->Ok() ) + if ( !is->IsOk() ) { delete is; return NULL; diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 1bc3151fcb..d54521c449 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -29,6 +29,7 @@ #ifndef WX_PRECOMP #include "wx/dc.h" #include "wx/intl.h" + #include "wx/math.h" #include "wx/dcscreen.h" #include "wx/log.h" #include "wx/gdicmn.h" @@ -511,7 +512,7 @@ int wxFontBase::AdjustToSymbolicSize(wxFontSymbolicSize size, int base) WrongFontSizeFactorsSize ); - return factors[size - wxFONTSIZE_XX_SMALL]*base; + return wxRound(factors[size - wxFONTSIZE_XX_SMALL]*base); } wxFont& wxFont::MakeBold() diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp index ff1ed56aee..6718668c01 100644 --- a/src/common/fontpickercmn.cpp +++ b/src/common/fontpickercmn.cpp @@ -137,7 +137,7 @@ void wxFontPickerCtrl::UpdatePickerFromTextCtrl() // string returned by wxFont::GetNativeFontInfoDesc() and not // the user-friendly one returned by wxFont::GetNativeFontInfoUserDesc() wxFont f = String2Font(m_text->GetValue()); - if (!f.Ok()) + if (!f.IsOk()) return; // invalid user input if (M_PICKER->GetSelectedFont() != f) diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 3ad28089e6..e306437de4 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -253,7 +253,7 @@ wxMemoryFSHandler::AddFile(const wxString& filename, return; wxMemoryOutputStream mems; - if ( image.Ok() && image.SaveFile(mems, type) ) + if ( image.IsOk() && image.SaveFile(mems, type) ) { m_Hash[filename] = new wxMemoryFSFile ( diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp index 1f8946be9e..73a608c450 100644 --- a/src/common/fswatchercmn.cpp +++ b/src/common/fswatchercmn.cpp @@ -79,10 +79,30 @@ wxFileSystemWatcherBase::~wxFileSystemWatcherBase() bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events) { - // args validation & consistency checks - if (!path.FileExists() && !path.DirExists()) + wxFSWPathType type = wxFSWPath_None; + if ( path.FileExists() ) + { + type = wxFSWPath_File; + } + else if ( path.DirExists() ) + { + type = wxFSWPath_Dir; + } + else + { + wxLogError(_("Can't monitor non-existent path \"%s\" for changes."), + path.GetFullPath()); return false; + } + return DoAdd(path, events, type); +} + +bool +wxFileSystemWatcherBase::DoAdd(const wxFileName& path, + int events, + wxFSWPathType type) +{ wxString canonical = GetCanonicalPath(path); if (canonical.IsEmpty()) return false; @@ -91,7 +111,7 @@ bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events) wxString::Format("Path '%s' is already watched", canonical)); // adding a path in a platform specific way - wxFSWatchInfo watch(canonical, events); + wxFSWatchInfo watch(canonical, events, type); if ( !m_service->Add(watch) ) return false; diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp index ae77931ca7..d1bc22eeec 100644 --- a/src/common/ftp.cpp +++ b/src/common/ftp.cpp @@ -587,9 +587,9 @@ wxSocketBase *wxFTP::GetActivePort() addrNew.Service(0); // pick an open port number. wxSocketServer *sockSrv = new wxSocketServer(addrNew); - if (!sockSrv->Ok()) + if (!sockSrv->IsOk()) { - // We use Ok() here to see if everything is ok + // We use IsOk() here to see if everything is ok m_lastError = wxPROTO_PROTERR; delete sockSrv; return NULL; diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index b6325e6d15..885ebec144 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -499,7 +499,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& name) static wxColour s_col; s_col = Find(name); - if ( !s_col.Ok() ) + if ( !s_col.IsOk() ) return NULL; return new wxColour(s_col); @@ -780,7 +780,7 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, wxPenStyle wxPen* pen = NULL; wxPen penTmp(colour, width, style); - if (penTmp.Ok()) + if (penTmp.IsOk()) { pen = new wxPen(penTmp); list.Append(pen); @@ -802,7 +802,7 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, wxBrushStyle st wxBrush* brush = NULL; wxBrush brushTmp(colour, style); - if (brushTmp.Ok()) + if (brushTmp.IsOk()) { brush = new wxBrush(brushTmp); list.Append(brush); @@ -872,7 +872,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize, // font not found, create the new one font = NULL; wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding); - if (fontTmp.Ok()) + if (fontTmp.IsOk()) { font = new wxFont(fontTmp); list.Append(font); diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp index 36e8ed276e..cd119826f2 100644 --- a/src/common/gifdecod.cpp +++ b/src/common/gifdecod.cpp @@ -138,7 +138,7 @@ bool wxGIFDecoder::ConvertToImage(unsigned int frame, wxImage *image) const image->Create(sz.GetWidth(), sz.GetHeight()); image->SetType(wxBITMAP_TYPE_GIF); - if (!image->Ok()) + if (!image->IsOk()) return false; pal = GetPalette(frame); diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp index 94c1327432..4d9e2dd144 100644 --- a/src/common/glcmn.cpp +++ b/src/common/glcmn.cpp @@ -66,7 +66,7 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const bool wxGLCanvasBase::SetColour(const wxString& colour) { wxColour col = wxTheColourDatabase->Find(colour); - if ( !col.Ok() ) + if ( !col.IsOk() ) return false; #ifdef wxHAS_OPENGL_ES diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp index 665621e274..8536a68762 100644 --- a/src/common/graphcmn.cpp +++ b/src/common/graphcmn.cpp @@ -595,7 +595,7 @@ void wxGraphicsContext::SetPen( const wxGraphicsPen& pen ) void wxGraphicsContext::SetPen( const wxPen& pen ) { - if ( !pen.Ok() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) + if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) SetPen( wxNullGraphicsPen ); else SetPen( CreatePen( pen ) ); @@ -609,7 +609,7 @@ void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush ) void wxGraphicsContext::SetBrush( const wxBrush& brush ) { - if ( !brush.Ok() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) + if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) SetBrush( wxNullGraphicsBrush ); else SetBrush( CreateBrush( brush ) ); @@ -623,7 +623,7 @@ void wxGraphicsContext::SetFont( const wxGraphicsFont& font ) void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour ) { - if ( font.Ok() ) + if ( font.IsOk() ) SetFont( CreateFont( font, colour ) ); else SetFont( wxNullGraphicsFont ); @@ -665,9 +665,7 @@ wxGraphicsContext::DoDrawFilledText(const wxString &str, // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape SetPen( wxNullGraphicsPen ); - wxGraphicsPath path = CreatePath(); - path.AddRectangle( x , y, width, height ); - FillPath( path ); + DrawRectangle(x , y, width, height); DrawText( str, x ,y); SetBrush( formerBrush ); diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index b59a47864e..186d4df0cc 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -163,7 +163,7 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type) if ( type == wxBITMAP_TYPE_ICON_RESOURCE ) { wxIcon tmp(file, type); - if (tmp.Ok()) + if (tmp.IsOk()) { AddIcon(tmp); return; @@ -245,7 +245,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const { wxIcon icon = GetIcon(size); - if ( icon.Ok() && + if ( icon.IsOk() && (icon.GetWidth() != size.x || icon.GetHeight() != size.y) ) { icon = wxNullIcon; @@ -267,7 +267,7 @@ void wxIconBundle::AddIcon(const wxIcon& icon) for ( size_t i = 0; i < count; ++i ) { wxIcon& tmp = iconArray[i]; - if ( tmp.Ok() && + if ( tmp.IsOk() && tmp.GetWidth() == icon.GetWidth() && tmp.GetHeight() == icon.GetHeight() ) { diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index f691b233e6..631130805c 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -91,7 +91,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, { wxCHECK_MSG( image, false, wxT("invalid pointer in wxBMPHandler::SaveFile") ); - if ( !image->Ok() ) + if ( !image->IsOk() ) { if ( verbose ) { @@ -351,7 +351,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, // pointer to the image data, use quantized if available wxUint8 *data = (wxUint8*) image->GetData(); - if (q_image) if (q_image->Ok()) data = (wxUint8*) q_image->GetData(); + if (q_image) if (q_image->IsOk()) data = (wxUint8*) q_image->GetData(); wxUint8 *buffer = new wxUint8[row_width]; memset(buffer, 0, row_width); @@ -1249,7 +1249,7 @@ bool wxICOHandler::SaveFile(wxImage *image, // wxCountingOutputStream::IsOk() always returns true for now and this // "if" provokes VC++ warnings in optimized build #if 0 - if ( !cStream.Ok() ) + if ( !cStream.IsOk() ) { if ( verbose ) { @@ -1335,6 +1335,11 @@ bool wxICOHandler::SaveFile(wxImage *image, bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, int index) { + if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) + { + return false; + } + return DoLoadFile(image, stream, verbose, index); } @@ -1423,10 +1428,16 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, int wxICOHandler::DoGetImageCount(wxInputStream& stream) { + // It's ok to modify the stream position in this function. + + if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset ) + { + return 0; + } + ICONDIR IconDir; if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir)) - // it's ok to modify the stream position here return 0; return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount); @@ -1492,8 +1503,15 @@ int wxANIHandler::DoGetImageCount(wxInputStream& stream) static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType) { + // It's ok to modify the stream position in this function. + + if ( stream->IsSeekable() && stream->SeekI(0) == wxInvalidOffset ) + { + return false; + } + ICONDIR iconDir; - if ( !stream->Read(&iconDir, sizeof(iconDir)) ) // it's ok to modify the stream position here + if ( !stream->Read(&iconDir, sizeof(iconDir)) ) { return false; } diff --git a/src/common/image.cpp b/src/common/image.cpp index de87a34257..0cb1adf788 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -140,7 +140,7 @@ bool wxImage::Create(const char* const* xpmData) wxXPMDecoder decoder; (*this) = decoder.ReadData(xpmData); - return Ok(); + return IsOk(); #else return false; #endif @@ -258,7 +258,7 @@ wxImage wxImage::MakeEmptyClone(int flags) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxS("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxS("invalid image") ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -293,7 +293,7 @@ wxImage wxImage::Copy() const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); image.m_refData = CloneRefData(m_refData); @@ -307,7 +307,7 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); // can't scale to/from 0 size wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image, @@ -426,7 +426,7 @@ wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); // can't scale to/from 0 size wxCHECK_MSG( (width > 0) && (height > 0), image, @@ -856,7 +856,7 @@ wxImage wxImage::BlurHorizontal(int blurRadius) const { wxImage ret_image(MakeEmptyClone()); - wxCHECK( ret_image.Ok(), ret_image ); + wxCHECK( ret_image.IsOk(), ret_image ); const unsigned char* src_data = M_IMGDATA->m_data; unsigned char* dst_data = ret_image.GetData(); @@ -959,7 +959,7 @@ wxImage wxImage::BlurVertical(int blurRadius) const { wxImage ret_image(MakeEmptyClone()); - wxCHECK( ret_image.Ok(), ret_image ); + wxCHECK( ret_image.IsOk(), ret_image ); const unsigned char* src_data = M_IMGDATA->m_data; unsigned char* dst_data = ret_image.GetData(); @@ -1074,7 +1074,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const { wxImage image(MakeEmptyClone(Clone_SwapOrientation)); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1168,7 +1168,7 @@ wxImage wxImage::Rotate180() const { wxImage image(MakeEmptyClone()); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1221,7 +1221,7 @@ wxImage wxImage::Mirror( bool horizontally ) const { wxImage image(MakeEmptyClone()); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); long height = M_IMGDATA->m_height; long width = M_IMGDATA->m_width; @@ -1298,7 +1298,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) && (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()), @@ -1351,7 +1351,7 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") ); int width = GetWidth(), height = GetHeight(); @@ -1399,8 +1399,8 @@ wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, void wxImage::Paste( const wxImage &image, int x, int y ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); - wxCHECK_RET( image.Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); + wxCHECK_RET( image.IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1503,7 +1503,7 @@ void wxImage::Paste( const wxImage &image, int x, int y ) void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1, unsigned char r2, unsigned char g2, unsigned char b2 ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1534,7 +1534,7 @@ wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double wei { wxImage image(MakeEmptyClone()); - wxCHECK( image.Ok(), image ); + wxCHECK( image.IsOk(), image ); const unsigned char *src = M_IMGDATA->m_data; unsigned char *dest = image.GetData(); @@ -1568,7 +1568,7 @@ wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char { wxImage image; - wxCHECK_MSG( Ok(), image, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), image, wxT("invalid image") ); image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false ); @@ -1631,14 +1631,14 @@ wxImage wxImage::ConvertToDisabled(unsigned char brightness) const int wxImage::GetWidth() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_width; } int wxImage::GetHeight() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_height; } @@ -1662,7 +1662,7 @@ void wxImage::SetType(wxBitmapType type) long wxImage::XYToIndex(int x, int y) const { - if ( Ok() && + if ( IsOk() && x >= 0 && y >= 0 && x < M_IMGDATA->m_width && y < M_IMGDATA->m_height ) { @@ -1688,7 +1688,7 @@ void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned c void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1764,14 +1764,14 @@ bool wxImage::IsOk() const unsigned char *wxImage::GetData() const { - wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") ); return M_IMGDATA->m_data; } void wxImage::SetData( unsigned char *data, bool static_data ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); wxImageRefData *newRefData = new wxImageRefData(); @@ -1872,7 +1872,7 @@ wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b) void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1890,7 +1890,7 @@ void wxImage::SetAlpha( unsigned char *alpha, bool static_data ) unsigned char *wxImage::GetAlpha() const { - wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") ); return M_IMGDATA->m_alpha; } @@ -1948,7 +1948,7 @@ void wxImage::ClearAlpha() void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -1960,7 +1960,7 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b ) bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); if (M_IMGDATA->m_hasMask) { @@ -1978,28 +1978,28 @@ bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned unsigned char wxImage::GetMaskRed() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskRed; } unsigned char wxImage::GetMaskGreen() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskGreen; } unsigned char wxImage::GetMaskBlue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid image") ); return M_IMGDATA->m_maskBlue; } void wxImage::SetMask( bool mask ) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -2008,7 +2008,7 @@ void wxImage::SetMask( bool mask ) bool wxImage::HasMask() const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); return M_IMGDATA->m_hasMask; } @@ -2155,22 +2155,22 @@ bool wxImage::ConvertAlphaToMask(unsigned char mr, bool wxImage::HasPalette() const { - if (!Ok()) + if (!IsOk()) return false; - return M_IMGDATA->m_palette.Ok(); + return M_IMGDATA->m_palette.IsOk(); } const wxPalette& wxImage::GetPalette() const { - wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), wxNullPalette, wxT("invalid image") ); return M_IMGDATA->m_palette; } void wxImage::SetPalette(const wxPalette& palette) { - wxCHECK_RET( Ok(), wxT("invalid image") ); + wxCHECK_RET( IsOk(), wxT("invalid image") ); AllocExclusive(); @@ -2292,7 +2292,7 @@ bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const { #if HAS_FILE_STREAMS - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); @@ -2312,7 +2312,7 @@ bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename), const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const { #if HAS_FILE_STREAMS - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename); @@ -2343,7 +2343,7 @@ int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name), { #if HAS_FILE_STREAMS wxImageFileInputStream stream(name); - if (stream.Ok()) + if (stream.IsOk()) return GetImageCount(stream, type); #endif @@ -2545,7 +2545,7 @@ bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); wxImageHandler *handler = FindHandler(type); if ( !handler ) @@ -2559,7 +2559,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid image") ); wxImageHandler *handler = FindHandlerMime(mimetype); if ( !handler ) diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index b90bd8fb99..52f9cf14c4 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -643,7 +643,7 @@ bool wxGIFHandler_WriteWord(wxOutputStream *stream, wxUint16 word) buf[0] = word & 0xff; buf[1] = (word >> 8) & 0xff; - return wxGIFHandler_Write(stream, &word, sizeof(word)); + return wxGIFHandler_Write(stream, &buf, sizeof(buf)); } bool wxGIFHandler_WriteHeader(wxOutputStream *stream, int width, int height, diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp index bf214b15c8..f71aaf3f7b 100644 --- a/src/common/imagiff.cpp +++ b/src/common/imagiff.cpp @@ -140,7 +140,7 @@ bool wxIFFDecoder::ConvertToImage(wxImage *image) const // create the image image->Create(GetWidth(), GetHeight()); - if (!image->Ok()) + if (!image->IsOk()) return false; unsigned char *pal = GetPalette(); diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 51ba2d1e9c..2a24dce990 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -257,7 +257,7 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos } (cinfo.src->term_source)(&cinfo); jpeg_destroy_decompress(&cinfo); - if (image->Ok()) image->Destroy(); + if (image->IsOk()) image->Destroy(); return false; } @@ -291,7 +291,7 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos jpeg_start_decompress( &cinfo ); image->Create( cinfo.output_width, cinfo.output_height ); - if (!image->Ok()) { + if (!image->IsOk()) { jpeg_finish_decompress( &cinfo ); jpeg_destroy_decompress( &cinfo ); return false; diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp index 09a4612cbf..fdbb60c16d 100644 --- a/src/common/imagpcx.cpp +++ b/src/common/imagpcx.cpp @@ -214,7 +214,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream) image->Create(width, height); - if (!image->Ok()) + if (!image->IsOk()) return wxPCX_MEMERR; if ((p = (unsigned char *) malloc(bytesperline * nplanes)) == NULL) @@ -331,7 +331,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream) // according to PCX specs) and allocate space for one complete // scanline. - if (!image->Ok()) + if (!image->IsOk()) return wxPCX_INVFORMAT; width = image->GetWidth(); diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 5b151d568d..284f5d7171 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -558,7 +558,7 @@ wxPNGHandler::LoadFile(wxImage *image, image->Create((int)width, (int)height, (bool) false /* no need to init pixels */); - if (!image->Ok()) + if (!image->IsOk()) goto error; // initialize all line pointers to NULL to ensure that they can be safely @@ -660,7 +660,7 @@ error: wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory.")); } - if ( image->Ok() ) + if ( image->IsOk() ) { image->Destroy(); } @@ -795,15 +795,13 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos #endif ; - png_color_8 mask; + png_color_8 mask = { 0, 0, 0, 0, 0 }; if (bHasMask) { mask.red = image->GetMaskRed(); mask.green = image->GetMaskGreen(); mask.blue = image->GetMaskBlue(); - mask.alpha = 0; - mask.gray = 0; } PaletteMap palette; diff --git a/src/common/imagtga.cpp b/src/common/imagtga.cpp index 319324ef9a..e7203f3065 100644 --- a/src/common/imagtga.cpp +++ b/src/common/imagtga.cpp @@ -227,7 +227,7 @@ int ReadTGA(wxImage* image, wxInputStream& stream) image->Create(width, height); - if (!image->Ok()) + if (!image->IsOk()) { return wxTGA_MEMERR; } diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 5e69ff9f5b..2501e91f3e 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -344,7 +344,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos } image->Create( (int)w, (int)h ); - if (!image->Ok()) + if (!image->IsOk()) { if (verbose) { diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp index 2850e770e6..de2530e84c 100644 --- a/src/common/imagxpm.cpp +++ b/src/common/imagxpm.cpp @@ -97,7 +97,7 @@ bool wxXPMHandler::LoadFile(wxImage *image, wxXPMDecoder decoder; wxImage img = decoder.ReadFile(stream); - if ( !img.Ok() ) + if ( !img.IsOk() ) return false; *image = img; return true; diff --git a/src/common/list.cpp b/src/common/list.cpp index 8049c945fb..01fb9664bb 100644 --- a/src/common/list.cpp +++ b/src/common/list.cpp @@ -171,22 +171,18 @@ void wxListBase::DoCopy(const wxListBase& list) { case wxKEY_INTEGER: { - long key; for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() ) { - key = node->GetKeyInteger(); - Append(key, node->GetData()); + Append(node->GetKeyInteger(), node->GetData()); } break; } case wxKEY_STRING: { - const wxChar *key; for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() ) { - key = node->GetKeyString(); - Append(key, node->GetData()); + Append(node->GetKeyString(), node->GetData()); } break; } diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index 32f525d673..d53056d9ee 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -597,17 +597,18 @@ wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const // window will be used. void wxMenuBase::UpdateUI(wxEvtHandler* source) { - if (GetInvokingWindow()) + wxWindow * const win = GetWindow(); + if ( win ) { // Don't update menus if the parent // frame is about to get deleted - wxWindow *tlw = wxGetTopLevelParent( GetInvokingWindow() ); + wxWindow *tlw = wxGetTopLevelParent(win); if (tlw && wxPendingDelete.Member(tlw)) return; } - if ( !source && GetInvokingWindow() ) - source = GetInvokingWindow()->GetEventHandler(); + if ( !source && win ) + source = win->GetEventHandler(); if ( !source ) source = GetEventHandler(); if ( !source ) diff --git a/src/common/overlaycmn.cpp b/src/common/overlaycmn.cpp index eeb08b7cdd..f08cb238e5 100644 --- a/src/common/overlaycmn.cpp +++ b/src/common/overlaycmn.cpp @@ -139,7 +139,7 @@ wxOverlayImpl::~wxOverlayImpl() bool wxOverlayImpl::IsOk() { - return m_bmpSaved.Ok() ; + return m_bmpSaved.IsOk() ; } void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height ) diff --git a/src/common/ownerdrwcmn.cpp b/src/common/ownerdrwcmn.cpp index e9163b6829..29e646a163 100644 --- a/src/common/ownerdrwcmn.cpp +++ b/src/common/ownerdrwcmn.cpp @@ -93,11 +93,11 @@ void wxOwnerDrawnBase::GetColourToUse(wxODStatus stat, wxColour& colText, wxColo } else { - colText = m_colText.Ok() ? m_colText + colText = m_colText.IsOk() ? m_colText : wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); } - colBack = m_colBack.Ok() ? m_colBack + colBack = m_colBack.IsOk() ? m_colBack : wxSystemSettings::GetColour(wxSYS_COLOUR_MENU); } } diff --git a/src/common/panelcmn.cpp b/src/common/panelcmn.cpp index a800434b5e..cdc191a7af 100644 --- a/src/common/panelcmn.cpp +++ b/src/common/panelcmn.cpp @@ -85,29 +85,14 @@ wxCONSTRUCTOR_6( wxPanel, wxWindow*, Parent, wxWindowID, Id, \ wxString, Name) -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(wxPanelBase, wxWindow) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanelBase) -END_EVENT_TABLE() - // ============================================================================ // implementation // ============================================================================ -WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanelBase, wxWindow) - // ---------------------------------------------------------------------------- // wxPanelBase creation // ---------------------------------------------------------------------------- -wxPanelBase::wxPanelBase() -{ - WX_INIT_CONTROL_CONTAINER(); -} - bool wxPanelBase::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp index 1d3dbbc30d..797c946876 100644 --- a/src/common/pickerbase.cpp +++ b/src/common/pickerbase.cpp @@ -43,13 +43,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl) -BEGIN_EVENT_TABLE(wxPickerBase, wxControl) - EVT_SIZE(wxPickerBase::OnSize) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxPickerBase) -END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxPickerBase, wxControl) - - // ---------------------------------------------------------------------------- // wxPickerBase // ---------------------------------------------------------------------------- @@ -123,6 +116,16 @@ void wxPickerBase::PostCreation() // associated with it - in that case it defaults to 0 m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5); + // For aesthetic reasons, make sure the picker is at least as high as the + // associated text control and is always at least square. + const wxSize pickerBestSize(m_picker->GetBestSize()); + const wxSize textBestSize( HasTextCtrl() ? m_text->GetBestSize() : wxSize()); + wxSize pickerMinSize; + pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y); + pickerMinSize.x = wxMax(pickerBestSize.x, pickerMinSize.y); + if ( pickerMinSize != pickerBestSize ) + m_picker->SetMinSize(pickerMinSize); + SetSizer(m_sizer); SetInitialSize( GetMinSize() ); @@ -169,11 +172,4 @@ void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &) UpdatePickerFromTextCtrl(); } -void wxPickerBase::OnSize(wxSizeEvent &event) -{ - if (GetAutoLayout()) - Layout(); - event.Skip(); -} - #endif // Any picker in use diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index c9e587b700..4aebfb1b51 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -1667,7 +1667,7 @@ void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) Destroy(); } -void wxPreviewFrame::Initialize(wxPreviewFrameModalityKind kind) +void wxPreviewFrame::InitializeWithModality(wxPreviewFrameModalityKind kind) { #if wxUSE_STATUSBAR CreateStatusBar(); @@ -1989,7 +1989,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum) { m_previewBitmap = new wxBitmap(pageRect.width, pageRect.height); - if (!m_previewBitmap || !m_previewBitmap->Ok()) + if (!m_previewBitmap || !m_previewBitmap->IsOk()) { InvalidatePreviewBitmap(); wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK); @@ -2210,7 +2210,7 @@ int wxPrintPreview::GetMinPage() const bool wxPrintPreview::IsOk() const { - return m_pimpl->Ok(); + return m_pimpl->IsOk(); } void wxPrintPreview::SetOk(bool ok) diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index 57b311ec3a..cbd53cc468 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -1546,7 +1546,7 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE) { - if (!dest.Ok()) + if (!dest.IsOk()) dest.Create(w, h); imgdt = dest.GetData(); diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index 1b87a7d421..cccbd9c891 100644 --- a/src/common/sckfile.cpp +++ b/src/common/sckfile.cpp @@ -45,7 +45,7 @@ wxFileProto::~wxFileProto() wxInputStream *wxFileProto::GetInputStream(const wxString& path) { wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path)); - if ( retval->Ok() ) + if ( retval->IsOk() ) { m_lastError = wxPROTO_NOERR; return retval; diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp index 0f1173baa6..31d1273191 100644 --- a/src/common/sckipc.cpp +++ b/src/common/sckipc.cpp @@ -498,7 +498,7 @@ bool wxTCPServer::Create(const wxString& serverName) delete addr; - if (!m_server->Ok()) + if (!m_server->IsOk()) { m_server->Destroy(); m_server = NULL; @@ -877,7 +877,7 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event) wxSocketBase *sock = server->Accept(); if (!sock) return; - if (!sock->Ok()) + if (!sock->IsOk()) { sock->Destroy(); return; diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp index 117b2f6919..14c7dca8a2 100644 --- a/src/common/sstream.cpp +++ b/src/common/sstream.cpp @@ -146,7 +146,7 @@ size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size) { const char *p = static_cast(buffer); -#if wxUSE_UNICODE_WCHAR +#if wxUSE_UNICODE // the part of the string we have here may be incomplete, i.e. it can stop // in the middle of an UTF-8 character and so converting it would fail; if // this is the case, accumulate the part which we failed to convert until @@ -188,11 +188,10 @@ size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size) // not update m_pos as m_str hasn't changed return size; } -#else // !wxUSE_UNICODE_WCHAR - // no recoding necessary, the data is supposed to already be in UTF-8 (if - // supported) or ASCII otherwise +#else // !wxUSE_UNICODE + // no recoding necessary m_str->append(p, size); -#endif // wxUSE_UNICODE_WCHAR/!wxUSE_UNICODE_WCHAR +#endif // wxUSE_UNICODE/!wxUSE_UNICODE // update position m_pos += size; diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 8fc90a869e..170ad719bd 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -1645,7 +1645,7 @@ wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen, wxUint16 *outBuff = reinterpret_cast(dst); for ( size_t n = 0; n < srcLen; n++ ) { - wxUint16 cc[2]; + wxUint16 cc[2] = { 0 }; const size_t numChars = encode_utf16(*src++, cc); if ( numChars == wxCONV_FAILED ) return wxCONV_FAILED; @@ -1728,7 +1728,7 @@ wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen, wxUint16 *outBuff = reinterpret_cast(dst); for ( const wchar_t *srcEnd = src + srcLen; src < srcEnd; src++ ) { - wxUint16 cc[2]; + wxUint16 cc[2] = { 0 }; const size_t numChars = encode_utf16(*src, cc); if ( numChars == wxCONV_FAILED ) return wxCONV_FAILED; @@ -1812,7 +1812,7 @@ wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen, size_t outLen = 0; for ( size_t n = 0; n < inLen; n++ ) { - wxUint16 cc[2]; + wxUint16 cc[2] = { 0 }; const size_t numChars = encode_utf16(*inBuff++, cc); if ( numChars == wxCONV_FAILED ) return wxCONV_FAILED; @@ -1890,7 +1890,7 @@ wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen, size_t outLen = 0; for ( size_t n = 0; n < inLen; n++, inBuff++ ) { - wxUint16 cc[2]; + wxUint16 cc[2] = { 0 }; const size_t numChars = encode_utf16(wxUINT32_SWAP_ALWAYS(*inBuff), cc); if ( numChars == wxCONV_FAILED ) return wxCONV_FAILED; diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index 8288e947d4..ced3746df2 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -757,7 +757,7 @@ bool wxCreateGreyedImage(const wxImage& in, wxImage& out) { #if wxUSE_IMAGE out = in.ConvertToGreyscale(); - if ( out.Ok() ) + if ( out.IsOk() ) return true; #endif // wxUSE_IMAGE return false; diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index d38b4dfbb0..96f70e5d47 100644 --- a/src/common/textcmn.cpp +++ b/src/common/textcmn.cpp @@ -143,8 +143,8 @@ wxTextAttr::wxTextAttr(const wxColour& colText, { Init(); - if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR; - if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; + if (m_colText.IsOk()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR; + if (m_colBack.IsOk()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; if (alignment != wxTEXT_ALIGNMENT_DEFAULT) m_flags |= wxTEXT_ATTR_ALIGNMENT; @@ -422,7 +422,7 @@ wxFont wxTextAttr::GetFont() const // Get attributes from font. bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags) { - if (!font.Ok()) + if (!font.IsOk()) return false; if (flags & wxTEXT_ATTR_FONT_SIZE) @@ -518,13 +518,13 @@ bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith) destStyle.SetFontFamily(style.GetFontFamily()); } - if (style.GetTextColour().Ok() && style.HasTextColour()) + if (style.GetTextColour().IsOk() && style.HasTextColour()) { if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour())) destStyle.SetTextColour(style.GetTextColour()); } - if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour()) + if (style.GetBackgroundColour().IsOk() && style.HasBackgroundColour()) { if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour())) destStyle.SetBackgroundColour(style.GetBackgroundColour()); @@ -670,30 +670,30 @@ wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr, if (attr.HasFont()) font = attr.GetFont(); - if ( !font.Ok() ) + if ( !font.IsOk() ) { if (attrDef.HasFont()) font = attrDef.GetFont(); - if ( text && !font.Ok() ) + if ( text && !font.IsOk() ) font = text->GetFont(); } wxColour colFg = attr.GetTextColour(); - if ( !colFg.Ok() ) + if ( !colFg.IsOk() ) { colFg = attrDef.GetTextColour(); - if ( text && !colFg.Ok() ) + if ( text && !colFg.IsOk() ) colFg = text->GetForegroundColour(); } wxColour colBg = attr.GetBackgroundColour(); - if ( !colBg.Ok() ) + if ( !colBg.IsOk() ) { colBg = attrDef.GetBackgroundColour(); - if ( text && !colBg.Ok() ) + if ( text && !colBg.IsOk() ) colBg = text->GetBackgroundColour(); } diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp index ceee633abf..1ce788ef1f 100644 --- a/src/common/toplvcmn.cpp +++ b/src/common/toplvcmn.cpp @@ -39,11 +39,8 @@ BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow) EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow) EVT_SIZE(wxTopLevelWindowBase::OnSize) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxTopLevelWindowBase) END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxTopLevelWindowBase, wxWindow) - // ============================================================================ // implementation // ============================================================================ @@ -58,8 +55,6 @@ wxTopLevelWindowBase::wxTopLevelWindowBase() { // Unlike windows, top level windows are created hidden by default. m_isShown = false; - - WX_INIT_CONTROL_CONTAINER(); } wxTopLevelWindowBase::~wxTopLevelWindowBase() @@ -352,7 +347,7 @@ void wxTopLevelWindowBase::SetIcon(const wxIcon& icon) // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't // have any icon), but adding an invalid icon to wxIconBundle is not wxIconBundle icons; - if ( icon.Ok() ) + if ( icon.IsOk() ) icons.AddIcon(icon); SetIcons(icons); diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 15908b65e7..6e9a224e9d 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -1536,7 +1536,7 @@ wxColour wxGetColourFromUser(wxWindow *parent, wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption) { wxFontData data; - if ( fontInit.Ok() ) + if ( fontInit.IsOk() ) { data.SetInitialFont(fontInit); } diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index 1172c888cb..bc5d8c806f 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -46,6 +46,7 @@ #if wxUSE_TOGGLEBTN #include "wx/tglbtn.h" #endif +#include "wx/filename.h" #include "wx/valgen.h" @@ -83,6 +84,24 @@ wxGenericValidator::wxGenericValidator(wxDateTime *val) m_pDateTime = val; } +wxGenericValidator::wxGenericValidator(wxFileName *val) +{ + Initialize(); + m_pFileName = val; +} + +wxGenericValidator::wxGenericValidator(float *val) +{ + Initialize(); + m_pFloat = val; +} + +wxGenericValidator::wxGenericValidator(double *val) +{ + Initialize(); + m_pDouble = val; +} + #endif // wxUSE_DATETIME wxGenericValidator::wxGenericValidator(const wxGenericValidator& val) @@ -102,6 +121,9 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val) #if wxUSE_DATETIME m_pDateTime = val.m_pDateTime; #endif // wxUSE_DATETIME + m_pFileName = val.m_pFileName; + m_pFloat = val.m_pFloat; + m_pDouble = val.m_pDouble; return true; } @@ -321,6 +343,21 @@ bool wxGenericValidator::TransferToWindow(void) pControl->SetValue(str); return true; } + else if (m_pFileName) + { + pControl->SetValue(m_pFileName->GetFullPath()); + return true; + } + else if (m_pFloat) + { + pControl->SetValue(wxString::Format(wxT("%g"), *m_pFloat)); + return true; + } + else if (m_pDouble) + { + pControl->SetValue(wxString::Format(wxT("%g"), *m_pDouble)); + return true; + } } else #endif @@ -582,6 +619,21 @@ bool wxGenericValidator::TransferFromWindow(void) *m_pInt = wxAtoi(pControl->GetValue()); return true; } + else if (m_pFileName) + { + m_pFileName->Assign(pControl->GetValue()); + return true; + } + else if (m_pFloat) + { + *m_pFloat = (float)wxAtof(pControl->GetValue()); + return true; + } + else if (m_pDouble) + { + *m_pDouble = wxAtof(pControl->GetValue()); + return true; + } } else #endif @@ -645,13 +697,16 @@ bool wxGenericValidator::TransferFromWindow(void) */ void wxGenericValidator::Initialize() { - m_pBool = 0; - m_pInt = 0; - m_pString = 0; - m_pArrayInt = 0; + m_pBool = NULL; + m_pInt = NULL; + m_pString = NULL; + m_pArrayInt = NULL; #if wxUSE_DATETIME - m_pDateTime = 0; + m_pDateTime = NULL; #endif // wxUSE_DATETIME + m_pFileName = NULL; + m_pFloat = NULL; + m_pDouble = NULL; } #endif // wxUSE_VALIDATORS diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 77729d68c6..2d34340f70 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -1528,7 +1528,7 @@ wxColour wxWindowBase::GetBackgroundColour() const // wxWidgets versions where GetBackgroundColour() always returned // something -- so give them something even if it doesn't make sense // for this window (e.g. it has a themed background) - if ( !colBg.Ok() ) + if ( !colBg.IsOk() ) colBg = GetClassDefaultAttributes().colBg; return colBg; @@ -1540,7 +1540,7 @@ wxColour wxWindowBase::GetBackgroundColour() const wxColour wxWindowBase::GetForegroundColour() const { // logic is the same as above - if ( !m_hasFgCol && !m_foregroundColour.Ok() ) + if ( !m_hasFgCol && !m_foregroundColour.IsOk() ) { wxColour colFg = GetDefaultAttributes().colFg; @@ -1562,7 +1562,7 @@ bool wxWindowBase::SetBackgroundColour( const wxColour &colour ) m_inheritBgCol = m_hasBgCol; m_backgroundColour = colour; - SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() ); + SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.IsOk() ); return true; } @@ -1574,7 +1574,7 @@ bool wxWindowBase::SetForegroundColour( const wxColour &colour ) m_hasFgCol = colour.IsOk(); m_inheritFgCol = m_hasFgCol; m_foregroundColour = colour; - SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() ); + SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.IsOk() ); return true; } diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index 7a5b619a35..4902738a07 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -1341,7 +1341,7 @@ void wxZipInputStream::Init(const wxString& file) ffile = static_cast(m_parent_i_stream); wxZipEntryPtr_ entry; - if (ffile->Ok()) { + if (ffile->IsOk()) { do { entry.reset(GetNextEntry()); } diff --git a/src/dfb/bitmap.cpp b/src/dfb/bitmap.cpp index 35206ace5f..9e472a0edd 100644 --- a/src/dfb/bitmap.cpp +++ b/src/dfb/bitmap.cpp @@ -193,7 +193,7 @@ CreateSurfaceWithFormat(int w, int h, DFBSurfacePixelFormat format) // Creates a surface that will use wxImage's pixel data (RGB only) wxIDirectFBSurfacePtr CreateSurfaceForImage(const wxImage& image) { - wxCHECK_MSG( image.Ok(), NULL, "invalid image" ); + wxCHECK_MSG( image.IsOk(), NULL, "invalid image" ); // FIXME_DFB: implement alpha handling by merging alpha buffer with RGB // into a temporary RGBA surface wxCHECK_MSG( !image.HasAlpha(), NULL, "alpha channel not supported" ); @@ -423,7 +423,7 @@ bool wxBitmap::CreateWithFormat(int width, int height, int dfbFormat) #if wxUSE_IMAGE wxBitmap::wxBitmap(const wxImage& imageOrig, int depth) { - wxCHECK_RET( imageOrig.Ok(), wxT("invalid image") ); + wxCHECK_RET( imageOrig.IsOk(), wxT("invalid image") ); wxImage image(imageOrig); @@ -469,7 +469,7 @@ wxBitmap::wxBitmap(const wxImage& imageOrig, int depth) wxImage wxBitmap::ConvertToImage() const { - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); wxImage img(GetWidth(), GetHeight()); wxIDirectFBSurfacePtr src = M_BITMAP->m_surface; @@ -505,7 +505,7 @@ wxImage wxBitmap::ConvertToImage() const void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { - wxCHECK_MSG( Ok(), NULL, "invalid bitmap" ); + wxCHECK_MSG( IsOk(), NULL, "invalid bitmap" ); AllocExclusive(); @@ -543,7 +543,7 @@ void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) bool wxBitmap::HasAlpha() const { - wxCHECK_MSG( Ok(), false, "invalid bitmap" ); + wxCHECK_MSG( IsOk(), false, "invalid bitmap" ); return M_BITMAP->m_surface->GetPixelFormat() == DSPF_ARGB; } @@ -568,7 +568,7 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) int wxBitmap::GetHeight() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); int h = -1; M_BITMAP->m_surface->GetSize(NULL, &h); @@ -577,7 +577,7 @@ int wxBitmap::GetHeight() const int wxBitmap::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); int w = -1; M_BITMAP->m_surface->GetSize(&w, NULL); @@ -586,21 +586,21 @@ int wxBitmap::GetWidth() const int wxBitmap::GetDepth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BITMAP->m_surface->GetDepth(); } wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BITMAP->m_mask; } void wxBitmap::SetMask(wxMask *mask) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); AllocExclusive(); delete M_BITMAP->m_mask; @@ -615,7 +615,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && rect.x >= 0 && rect.y >= 0 && rect.x+rect.width <= GetWidth() && rect.y+rect.height <= GetHeight(), @@ -638,7 +638,7 @@ bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type) if ( handler == NULL ) { wxImage image; - if ( !image.LoadFile(name, type) || !image.Ok() ) + if ( !image.LoadFile(name, type) || !image.IsOk() ) { wxLogError(_("No bitmap handler for type %d defined."), type); return false; @@ -658,7 +658,7 @@ bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type) #warning "to common code" bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPalette *palette) const { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); wxBitmapHandler *handler = FindHandler(type); @@ -670,7 +670,7 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPal image.SetPalette(*palette); #endif // wxUSE_PALETTE - if ( image.Ok() ) + if ( image.IsOk() ) return image.SaveFile(filename, type); else { @@ -685,20 +685,20 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPal #if wxUSE_PALETTE wxPalette *wxBitmap::GetPalette() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BITMAP->m_palette; } void wxBitmap::SetPalette(const wxPalette& palette) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth") ); AllocExclusive(); wxDELETE(M_BITMAP->m_palette); - if ( !palette.Ok() ) return; + if ( !palette.IsOk() ) return; M_BITMAP->m_palette = new wxPalette(palette); } @@ -741,7 +741,7 @@ void wxBitmap::SetDepth(int depth) wxIDirectFBSurfacePtr wxBitmap::GetDirectFBSurface() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BITMAP->m_surface; } diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp index 87ba89e309..620a04aed9 100644 --- a/src/dfb/brush.cpp +++ b/src/dfb/brush.cpp @@ -91,14 +91,14 @@ bool wxBrush::operator==(const wxBrush& brush) const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; } diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp index 02bc3d22fa..0f00dfffbf 100644 --- a/src/dfb/dc.cpp +++ b/src/dfb/dc.cpp @@ -346,7 +346,7 @@ void wxDFBDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y) // if background mode is solid, DrawText must paint text's background: if ( m_backgroundMode == wxSOLID ) { - wxCHECK_RET( m_textBackgroundColour.Ok(), + wxCHECK_RET( m_textBackgroundColour.IsOk(), wxT("invalid background color") ); SelectColour(m_textBackgroundColour); @@ -354,7 +354,7 @@ void wxDFBDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y) } // finally draw the text itself: - wxCHECK_RET( m_textForegroundColour.Ok(), + wxCHECK_RET( m_textForegroundColour.IsOk(), wxT("invalid foreground color") ); SelectColour(m_textForegroundColour); m_surface->DrawString(text.utf8_str(), -1, xx, yy, DSTF_LEFT | DSTF_TOP); @@ -379,14 +379,14 @@ void wxDFBDCImpl::DoDrawRotatedText(const wxString& WXUNUSED(text), void wxDFBDCImpl::SetPen(const wxPen& pen) { - m_pen = pen.Ok() ? pen : DEFAULT_PEN; + m_pen = pen.IsOk() ? pen : DEFAULT_PEN; SelectColour(m_pen.GetColour()); } void wxDFBDCImpl::SetBrush(const wxBrush& brush) { - m_brush = brush.Ok() ? brush : DEFAULT_BRUSH; + m_brush = brush.IsOk() ? brush : DEFAULT_BRUSH; } void wxDFBDCImpl::SelectColour(const wxColour& clr) @@ -408,7 +408,7 @@ void wxDFBDCImpl::SetFont(const wxFont& font) { wxCHECK_RET( IsOk(), wxT("invalid dc") ); - wxFont f(font.Ok() ? font : DEFAULT_FONT); + wxFont f(font.IsOk() ? font : DEFAULT_FONT); wxFont oldfont(m_font); @@ -431,7 +431,7 @@ void wxDFBDCImpl::SetBackground(const wxBrush& brush) { wxCHECK_RET( IsOk(), wxT("invalid dc") ); - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_backgroundBrush = brush; } @@ -478,7 +478,7 @@ void wxDFBDCImpl::EndPage() wxCoord wxDFBDCImpl::GetCharHeight() const { wxCHECK_MSG( IsOk(), -1, wxT("invalid dc") ); - wxCHECK_MSG( m_font.Ok(), -1, wxT("no font selected") ); + wxCHECK_MSG( m_font.IsOk(), -1, wxT("no font selected") ); int h = -1; GetCurrentFont()->GetHeight(&h); @@ -488,7 +488,7 @@ wxCoord wxDFBDCImpl::GetCharHeight() const wxCoord wxDFBDCImpl::GetCharWidth() const { wxCHECK_MSG( IsOk(), -1, wxT("invalid dc") ); - wxCHECK_MSG( m_font.Ok(), -1, wxT("no font selected") ); + wxCHECK_MSG( m_font.IsOk(), -1, wxT("no font selected") ); int w = -1; GetCurrentFont()->GetStringWidth("H", 1, &w); @@ -502,8 +502,8 @@ void wxDFBDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y const wxFont *theFont) const { wxCHECK_RET( IsOk(), wxT("invalid dc") ); - wxCHECK_RET( m_font.Ok(), wxT("no font selected") ); - wxCHECK_RET( !theFont || theFont->Ok(), wxT("invalid font") ); + wxCHECK_RET( m_font.IsOk(), wxT("no font selected") ); + wxCHECK_RET( !theFont || theFont->IsOk(), wxT("invalid font") ); wxFont oldFont; if ( theFont != NULL ) @@ -640,7 +640,7 @@ bool wxDFBDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, void wxDFBDCImpl::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask) { wxCHECK_RET( IsOk(), wxT("invalid dc") ); - wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") ); DoDrawSubBitmap(bmp, 0, 0, bmp.GetWidth(), bmp.GetHeight(), @@ -659,7 +659,7 @@ void wxDFBDCImpl::DoDrawSubBitmap(const wxBitmap &bmp, wxCoord destx, wxCoord desty, int rop, bool useMask) { wxCHECK_RET( IsOk(), wxT("invalid dc") ); - wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") ); // NB: we could also support XOR here (via DSBLIT_XOR) // and possibly others via SetSrc/DstBlendFunction() diff --git a/src/dfb/dcmemory.cpp b/src/dfb/dcmemory.cpp index 5c77771059..8929ca41ce 100644 --- a/src/dfb/dcmemory.cpp +++ b/src/dfb/dcmemory.cpp @@ -65,7 +65,7 @@ void wxMemoryDCImpl::DoSelect(const wxBitmap& bitmap) { m_bmp = bitmap; - if ( !bitmap.Ok() ) + if ( !bitmap.IsOk() ) { // select the bitmap out of the DC m_surface = NULL; diff --git a/src/dfb/font.cpp b/src/dfb/font.cpp index cb36d55968..4311923e67 100644 --- a/src/dfb/font.cpp +++ b/src/dfb/font.cpp @@ -75,7 +75,7 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const wxIDirectFBFontPtr wxFont::GetDirectFBFont(bool antialiased) const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); // we don't support DC scaling yet, so use scale=1 wxFontInstance *i = M_FONTDATA->GetFontInstance(1.0, antialiased); @@ -84,14 +84,14 @@ wxIDirectFBFontPtr wxFont::GetDirectFBFont(bool antialiased) const int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->GetPointSize(); } wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->GetFaceName(); } @@ -103,21 +103,21 @@ wxFontFamily wxFont::DoGetFamily() const wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); return M_FONTDATA->GetStyle(); } wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); return M_FONTDATA->GetWeight(); } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->GetUnderlined(); } @@ -125,21 +125,21 @@ bool wxFont::GetUnderlined() const wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); return M_FONTDATA->GetEncoding(); } bool wxFont::IsFixedWidth() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->IsFixedWidth(); } const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); return M_FONTDATA->GetNativeFontInfo(); } diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp index 5b70c698bf..f1b9f9d686 100644 --- a/src/dfb/pen.cpp +++ b/src/dfb/pen.cpp @@ -155,7 +155,7 @@ wxDash* wxPen::GetDash() const wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); wxFAIL_MSG( "GetCap not implemented" ); return wxCAP_INVALID; @@ -163,7 +163,7 @@ wxPenCap wxPen::GetCap() const wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); wxFAIL_MSG( "GetJoin not implemented" ); return wxJOIN_INVALID; @@ -171,28 +171,28 @@ wxPenJoin wxPen::GetJoin() const wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return 1; } wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } wxBitmap *wxPen::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); wxFAIL_MSG( "GetStipple not implemented" ); return NULL; diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp index f30e4be345..7a2cb28b7d 100644 --- a/src/dfb/region.cpp +++ b/src/dfb/region.cpp @@ -149,13 +149,13 @@ bool wxRegion::DoUnionWithRect(const wxRect& rect) bool wxRegion::DoUnionWithRegion(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, "invalid region" ); + wxCHECK_MSG( region.IsOk(), false, "invalid region" ); return DoUnionWithRect(M_REGION_OF(region)->m_rect); } bool wxRegion::DoIntersect(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, "invalid region" ); + wxCHECK_MSG( region.IsOk(), false, "invalid region" ); AllocExclusive(); M_REGION->m_rect.Intersect(M_REGION_OF(region)->m_rect); @@ -164,8 +164,8 @@ bool wxRegion::DoIntersect(const wxRegion& region) bool wxRegion::DoSubtract(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, "invalid region" ); - wxCHECK_MSG( Ok(), false, "invalid region" ); + wxCHECK_MSG( region.IsOk(), false, "invalid region" ); + wxCHECK_MSG( IsOk(), false, "invalid region" ); const wxRect& rect = M_REGION_OF(region)->m_rect; @@ -190,7 +190,7 @@ bool wxRegion::DoSubtract(const wxRegion& region) bool wxRegion::DoXor(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, "invalid region" ); + wxCHECK_MSG( region.IsOk(), false, "invalid region" ); wxFAIL_MSG( "Xor not implemented" ); return false; } @@ -202,7 +202,7 @@ bool wxRegion::DoXor(const wxRegion& region) wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const { - wxCHECK_MSG( Ok(), wxOutRegion, "invalid region" ); + wxCHECK_MSG( IsOk(), wxOutRegion, "invalid region" ); if (M_REGION->m_rect.Contains(x, y)) return wxInRegion; @@ -212,7 +212,7 @@ wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const { - wxCHECK_MSG( Ok(), wxOutRegion, "invalid region" ); + wxCHECK_MSG( IsOk(), wxOutRegion, "invalid region" ); // 1) is the rectangle entirely covered by the region? if (M_REGION->m_rect.Contains(rect)) diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp index 51707653a8..06d9619065 100644 --- a/src/dfb/window.cpp +++ b/src/dfb/window.cpp @@ -323,7 +323,7 @@ bool wxWindowDFB::SetCursor(const wxCursor& cursor) #warning "implement this" #if 0 - if ( m_cursor.Ok() ) + if ( m_cursor.IsOk() ) DFB_wmSetWindowCursor(m_wnd, *m_cursor.GetDFBCursor()); else DFB_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetDFBCursor()); diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp index 117dddf817..fc38c186d6 100644 --- a/src/generic/aboutdlgg.cpp +++ b/src/generic/aboutdlgg.cpp @@ -85,7 +85,7 @@ wxString wxAboutDialogInfo::GetDescriptionAndCredits() const wxIcon wxAboutDialogInfo::GetIcon() const { wxIcon icon = m_icon; - if ( !icon.Ok() && wxTheApp ) + if ( !icon.IsOk() && wxTheApp ) { const wxTopLevelWindow * const tlw = wxDynamicCast(wxTheApp->GetTopWindow(), wxTopLevelWindow); @@ -196,7 +196,7 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* paren wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL); #if wxUSE_STATBMP wxIcon icon = info.GetIcon(); - if ( icon.Ok() ) + if ( icon.IsOk() ) { sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, icon), wxSizerFlags().Border(wxRIGHT)); diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index 15054cb158..0185018d42 100644 --- a/src/generic/accel.cpp +++ b/src/generic/accel.cpp @@ -162,7 +162,7 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry) const wxAcceleratorEntry * wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const { - if ( !Ok() ) + if ( !IsOk() ) { // not an error, the accel table is just empty return NULL; diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp index 227ac07e7a..d6e44ba9a2 100644 --- a/src/generic/animateg.cpp +++ b/src/generic/animateg.cpp @@ -308,7 +308,7 @@ wxAnimationCtrl::~wxAnimationCtrl() bool wxAnimationCtrl::LoadFile(const wxString& filename, wxAnimationType type) { wxFileInputStream fis(filename); - if (!fis.Ok()) + if (!fis.IsOk()) return false; return Load(fis, type); } diff --git a/src/generic/calctrlg.cpp b/src/generic/calctrlg.cpp index c19710b5b8..f8a14221c6 100644 --- a/src/generic/calctrlg.cpp +++ b/src/generic/calctrlg.cpp @@ -1002,13 +1002,13 @@ void wxGenericCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) colBg = attr->GetBackgroundColour(); } - if ( colFg.Ok() ) + if ( colFg.IsOk() ) { dc.SetTextForeground(colFg); changedColours = true; } - if ( colBg.Ok() ) + if ( colBg.IsOk() ) { dc.SetTextBackground(colBg); changedColours = true; diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp index a0371ad191..dc9874f98c 100644 --- a/src/generic/collpaneg.cpp +++ b/src/generic/collpaneg.cpp @@ -57,16 +57,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl) EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton) EVT_SIZE(wxGenericCollapsiblePane::OnSize) - - WX_EVENT_TABLE_CONTROL_CONTAINER(wxGenericCollapsiblePane) END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxGenericCollapsiblePane, wxControl) - void wxGenericCollapsiblePane::Init() { - WX_INIT_CONTROL_CONTAINER(); - m_pButton = NULL; m_pPane = NULL; m_pStaticLine = NULL; diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index c1d81ee82f..3b5695ab7d 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -315,7 +315,7 @@ void wxGenericColourDialog::InitializeColours(void) for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++) { wxColour col = wxTheColourDatabase->Find(wxColourDialogNames[i]); - if (col.Ok()) + if (col.IsOk()) m_standardColours[i].Set(col.Red(), col.Green(), col.Blue()); else m_standardColours[i].Set(0, 0, 0); @@ -324,14 +324,14 @@ void wxGenericColourDialog::InitializeColours(void) for (i = 0; i < WXSIZEOF(m_customColours); i++) { wxColour c = m_colourData.GetCustomColour(i); - if (c.Ok()) + if (c.IsOk()) m_customColours[i] = m_colourData.GetCustomColour(i); else m_customColours[i] = wxColour(255, 255, 255); } wxColour curr = m_colourData.GetColour(); - if ( curr.Ok() ) + if ( curr.IsOk() ) { bool m_initColourFound = false; diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 97a61a7347..bdc389ad66 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -214,6 +214,8 @@ private: model->Resort(); owner->OnColumnChange(idx); + + SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, idx); } void OnRClick(wxHeaderCtrlEvent& event) @@ -532,6 +534,8 @@ public: int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode + void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; } + // Some useful functions for row and item mapping wxDataViewItem GetItemByRow( unsigned int row ) const; int GetRowByItem( const wxDataViewItem & item ) const; @@ -796,9 +800,9 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) dc->DrawBitmap( m_bitmap, cell.x, cell.y ); - else if (m_icon.Ok()) + else if (m_icon.IsOk()) dc->DrawIcon( m_icon, cell.x, cell.y ); return true; @@ -806,9 +810,9 @@ bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state wxSize wxDataViewBitmapRenderer::GetSize() const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() ); - else if (m_icon.Ok()) + else if (m_icon.IsOk()) return wxSize( m_icon.GetWidth(), m_icon.GetHeight() ); return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); @@ -1769,8 +1773,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dataitem = node->GetItem(); - if ((i > 0) && model->IsContainer(dataitem) && - !model->HasContainerColumns(dataitem)) + // Skip all columns of "container" rows except the expander + // column itself unless HasContainerColumns() overrides this. + if ( col != GetOwner()->GetExpanderColumn() && + model->IsContainer(dataitem) && + !model->HasContainerColumns(dataitem) ) continue; } else @@ -3027,7 +3034,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item // Find the item along the parent-chain. // This algorithm is designed to speed up the node-finding method wxDataViewTreeNode* node = m_root; - for( unsigned iter = parentChain.size()-1; iter>=0; --iter ) + for( unsigned iter = parentChain.size()-1; ; --iter ) { if( node->HasChildren() ) { @@ -3058,6 +3065,9 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item } else return NULL; + + if ( !iter ) + break; } return NULL; } @@ -3369,7 +3379,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) break; case WXK_DOWN: - if ( m_currentRow < GetRowCount() - 1 ) + if ( m_currentRow + 1 < GetRowCount() ) OnArrowChar( m_currentRow + 1, event ); break; // Add the process for tree expanding/collapsing @@ -3718,8 +3728,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (!IsRowSelected(current)) { SelectAllRows(false); + const unsigned oldCurrent = m_currentRow; ChangeCurrentRow(current); SelectRow(m_currentRow,true); + RefreshRow(oldCurrent); SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); } } @@ -4020,6 +4032,16 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) Layout(); AdjustScrollbars(); + + // We must redraw the headers if their height changed. Normally this + // shouldn't happen as the control shouldn't let itself be resized beneath + // its minimal height but avoid the display artefacts that appear if it + // does happen, e.g. because there is really not enough vertical space. + if ( !HasFlag(wxDV_NO_HEADER) && m_headerArea && + m_headerArea->GetSize().y <= m_headerArea->GetBestSize(). y ) + { + m_headerArea->Refresh(); + } } void wxDataViewCtrl::SetFocus() @@ -4124,6 +4146,16 @@ unsigned int wxDataViewCtrl::GetColumnCount() const return m_cols.GetCount(); } +bool wxDataViewCtrl::SetRowHeight( int lineHeight ) +{ + if ( !m_clientArea ) + return false; + + m_clientArea->SetRowHeight(lineHeight); + + return true; +} + wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const { return m_cols[idx]; diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index b340cd4efb..5693d2f236 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -968,11 +968,11 @@ void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!bitmap.Ok()) return; + if (!bitmap.IsOk()) return; wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return; + if (!image.IsOk()) return; wxCoord w = image.GetWidth(); wxCoord h = image.GetHeight(); @@ -1038,7 +1038,7 @@ void wxPostScriptDCImpl::SetFont( const wxFont& font ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!font.Ok()) return; + if (!font.IsOk()) return; m_font = font; @@ -1133,7 +1133,7 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!pen.Ok()) return; + if (!pen.IsOk()) return; int oldStyle = m_pen.GetStyle(); @@ -1240,7 +1240,7 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_brush = brush; @@ -1288,7 +1288,7 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y if ( !textbuf ) return; - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1398,7 +1398,7 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC SetFont( m_font ); - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1957,7 +1957,7 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord wxPostScriptDCImpl::GetCharHeight() const { - if (m_font.Ok()) + if (m_font.IsOk()) return m_font.GetPointSize(); else return 12; @@ -2055,7 +2055,7 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string, / example: / / wxPostScriptDC dc(NULL, true); - / if (dc.Ok()){ + / if (dc.IsOk()){ / wxSetAFMPath("d:\\wxw161\\afm\\"); / dc.StartDoc("Test"); / dc.StartPage(); diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index f29e04c31f..e27a75acd3 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -1708,7 +1708,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) delete ft; - if ( !ic.Ok() ) + if ( !ic.IsOk() ) { int newid = file; m_HashTable->Put(extension, new wxFileIconEntry(newid)); @@ -1718,7 +1718,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) wxBitmap bmp; bmp.CopyFromIcon(ic); - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { int newid = file; m_HashTable->Put(extension, new wxFileIconEntry(newid)); diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index e4b50c9f34..6e3fbad8be 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -249,7 +249,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, m_isDirty = false; m_isDirty = false; - if (m_cursor.Ok()) + if (m_cursor.IsOk()) { m_oldCursor = window->GetCursor(); window->SetCursor(m_cursor); @@ -288,7 +288,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, #ifndef wxHAS_NATIVE_OVERLAY wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - if (!backing->Ok() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y)) + if (!backing->IsOk() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y)) (*backing) = wxBitmap(clientSize.x, clientSize.y); #endif // !wxHAS_NATIVE_OVERLAY @@ -345,7 +345,7 @@ bool wxGenericDragImage::EndDrag() #endif m_window->ReleaseMouse(); - if (m_cursor.Ok() && m_oldCursor.Ok()) + if (m_cursor.IsOk() && m_oldCursor.IsOk()) { m_window->SetCursor(m_oldCursor); } @@ -467,7 +467,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, DoDrawImage(*m_windowDC, newPos); #else // !wxHAS_NATIVE_OVERLAY wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap); - if (!backing->Ok()) + if (!backing->IsOk()) return false; wxRect oldRect(GetImageRect(oldPos)); @@ -499,7 +499,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, // keep reallocating all the time. int excess = 50; - if (!m_repairBitmap.Ok() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight())) + if (!m_repairBitmap.IsOk() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight())) { m_repairBitmap = wxBitmap(fullRect.GetWidth() + excess, fullRect.GetHeight() + excess); } @@ -539,12 +539,12 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, // Override this if you are using a virtual image (drawing your own image) bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { dc.DrawBitmap(m_bitmap, pos.x, pos.y, (m_bitmap.GetMask() != 0)); return true; } - else if (m_icon.Ok()) + else if (m_icon.IsOk()) { dc.DrawIcon(m_icon, pos.x, pos.y); return true; @@ -556,11 +556,11 @@ bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const // Override this if you are using a virtual image (drawing your own image) wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { return wxRect(pos.x, pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight()); } - else if (m_icon.Ok()) + else if (m_icon.IsOk()) { return wxRect(pos.x, pos.y, m_icon.GetWidth(), m_icon.GetHeight()); } diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp index c0086dbd19..0a697894dc 100644 --- a/src/generic/filectrlg.cpp +++ b/src/generic/filectrlg.cpp @@ -53,7 +53,7 @@ // ---------------------------------------------------------------------------- static -int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder) +int wxCALLBACK wxFileDataNameCompare( wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -71,7 +71,7 @@ int wxCALLBACK wxFileDataNameCompare( long data1, long data2, wxIntPtr sortOrder } static -int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder) +int wxCALLBACK wxFileDataSizeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -93,7 +93,7 @@ int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, wxIntPtr sortOrder) } static -int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder) +int wxCALLBACK wxFileDataTypeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -115,7 +115,7 @@ int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, wxIntPtr sortOrder) } static -int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, wxIntPtr sortOrder) +int wxCALLBACK wxFileDataTimeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder) { wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1); wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2); @@ -377,7 +377,7 @@ void wxFileData::MakeItem( wxListItem &item ) if (IsLink()) { wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") ); - if ( dg.Ok() ) + if ( dg.IsOk() ) item.SetTextColour(dg); } item.m_data = wxPtrToUInt(this); diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp index 2a986588cf..70c59b66f9 100644 --- a/src/generic/fontdlgg.cpp +++ b/src/generic/fontdlgg.cpp @@ -76,7 +76,7 @@ void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetBrush(*wxWHITE_BRUSH); dc.DrawRectangle(0, 0, size.x, size.y); - if ( font.Ok() ) + if ( font.IsOk() ) { dc.SetFont(font); dc.SetTextForeground(GetForegroundColour()); @@ -550,7 +550,7 @@ void wxGenericFontDialog::InitializeFont() int fontSize = 12; bool fontUnderline = false; - if (m_fontData.m_initialFont.Ok()) + if (m_fontData.m_initialFont.IsOk()) { fontFamily = m_fontData.m_initialFont.GetFamily(); fontWeight = m_fontData.m_initialFont.GetWeight(); @@ -602,7 +602,7 @@ void wxGenericFontDialog::DoChangeFont() if ( !m_colourChoice->GetStringSelection().empty() ) { wxColour col = wxTheColourDatabase->Find(m_colourChoice->GetStringSelection()); - if (col.Ok()) + if (col.IsOk()) { m_fontData.m_fontColour = col; } @@ -610,7 +610,7 @@ void wxGenericFontDialog::DoChangeFont() } // Update color here so that we can also use the color originally passed in // (EnableEffects may be false) - if (m_fontData.m_fontColour.Ok()) + if (m_fontData.m_fontColour.IsOk()) m_previewer->SetForegroundColour(m_fontData.m_fontColour); m_previewer->Refresh(); diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp index 7d1cfb908a..ffcbb91de3 100644 --- a/src/generic/fontpickerg.cpp +++ b/src/generic/fontpickerg.cpp @@ -97,7 +97,7 @@ void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) void wxGenericFontButton::UpdateFont() { - if ( !m_selectedFont.Ok() ) + if ( !m_selectedFont.IsOk() ) return; SetForegroundColour(m_data.GetColour()); diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index c7bbf5cbcf..7fb9f85f38 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -301,9 +301,6 @@ private : cairo_font_slant_t m_slant; cairo_font_weight_t m_weight; #endif -#ifdef __WXMSW__ - wxCairoContext( wxGraphicsRenderer* renderer, HDC context ); -#endif }; class wxCairoBitmapData : public wxGraphicsObjectRefData @@ -332,6 +329,9 @@ public: wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ); #ifdef __WXGTK__ wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable ); +#endif +#ifdef __WXMSW__ + wxCairoContext( wxGraphicsRenderer* renderer, HDC context ); #endif wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context ); wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window); @@ -368,6 +368,8 @@ public: virtual bool SetAntialiasMode(wxAntialiasMode antialias); + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation); + virtual bool SetCompositionMode(wxCompositionMode op); virtual void BeginLayer(wxDouble opacity); @@ -551,7 +553,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen ) { /* wxBitmap* bmp = pen.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { wxDELETE( m_penImage ); wxDELETE( m_penBrush ); @@ -666,7 +668,7 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush else { wxBitmap* bmp = brush.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { wxDELETE( m_brushImage ); m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE()); @@ -1342,6 +1344,12 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window) m_width = sz.x; m_height = sz.y; #endif + +#ifdef __WXMSW__ + m_mswSurface = cairo_win32_surface_create((HDC)window->GetHandle()); + Init(cairo_create(m_mswSurface)); +#endif + } wxCairoContext::~wxCairoContext() @@ -1349,10 +1357,6 @@ wxCairoContext::~wxCairoContext() if ( m_context ) { PopState(); -#ifdef __WXMSW__ - m_mswSurface = cairo_win32_surface_create((HDC)window->GetHandle()); - m_context = cairo_create(m_mswSurface); -#endif PopState(); cairo_destroy(m_context); } @@ -1692,6 +1696,12 @@ bool wxCairoContext::SetAntialiasMode(wxAntialiasMode antialias) return true; } +bool wxCairoContext::SetInterpolationQuality(wxInterpolationQuality WXUNUSED(interpolation)) +{ + // placeholder + return false; +} + bool wxCairoContext::SetCompositionMode(wxCompositionMode op) { if ( m_composition == op ) @@ -1785,7 +1795,11 @@ public : virtual wxGraphicsContext * CreateContext( wxWindow* window ); virtual wxGraphicsContext * CreateMeasuringContext(); - +#ifdef __WXMSW__ +#if wxUSE_ENH_METAFILE + virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc); +#endif +#endif // Path virtual wxGraphicsPath CreatePath(); @@ -1860,6 +1874,15 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc) return NULL; } +#ifdef __WXMSW__ +#if wxUSE_ENH_METAFILE +wxGraphicsContext * wxCairoRenderer::CreateContext( const wxEnhMetaFileDC& dc) +{ + return NULL; +} +#endif +#endif + wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context ) { #ifdef __WXMSW__ @@ -1918,7 +1941,7 @@ wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen) { - if ( !pen.Ok() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) + if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT ) return wxNullGraphicsPen; else { @@ -1930,7 +1953,7 @@ wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen) wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush ) { - if ( !brush.Ok() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) + if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT ) return wxNullGraphicsBrush; else { @@ -1967,7 +1990,7 @@ wxCairoRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, // sets the font wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col ) { - if ( font.Ok() ) + if ( font.IsOk() ) { wxGraphicsFont p; p.SetRefData(new wxCairoFontData( this , font, col )); @@ -1979,7 +2002,7 @@ wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour wxGraphicsBitmap wxCairoRenderer::CreateBitmap( const wxBitmap& bmp ) { - if ( bmp.Ok() ) + if ( bmp.IsOk() ) { wxGraphicsBitmap p; p.SetRefData(new wxCairoBitmapData( this , bmp )); diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 423cfe8bb8..8326934f7f 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -1534,9 +1534,8 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) // m_colLabels stores just as many elements as it needs, e.g. if only // the label of the first column had been set it would have only one // element and not numCols, so account for it - int nToRm = m_colLabels.size() - colID; - if ( nToRm > 0 ) - m_colLabels.RemoveAt( colID, nToRm ); + int numRemaining = m_colLabels.size() - colID; + m_colLabels.RemoveAt( colID, wxMin(numCols, numRemaining) ); } if ( numCols >= curNumCols ) diff --git a/src/generic/grideditors.cpp b/src/generic/grideditors.cpp index 6574ed6cb8..ac90aa3310 100644 --- a/src/generic/grideditors.cpp +++ b/src/generic/grideditors.cpp @@ -300,13 +300,13 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) else { // restore the standard colours fonts - if ( m_colFgOld.Ok() ) + if ( m_colFgOld.IsOk() ) { m_control->SetForegroundColour(m_colFgOld); m_colFgOld = wxNullColour; } - if ( m_colBgOld.Ok() ) + if ( m_colBgOld.IsOk() ) { m_control->SetBackgroundColour(m_colBgOld); m_colBgOld = wxNullColour; @@ -314,7 +314,7 @@ void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) // Workaround for GTK+1 font setting problem on some platforms #if !defined(__WXGTK__) || defined(__WXGTK20__) - if ( m_fontOld.Ok() ) + if ( m_fontOld.IsOk() ) { m_control->SetFont(m_fontOld); m_fontOld = wxNullFont; diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp index ccae40819f..af7666efe3 100644 --- a/src/generic/htmllbox.cpp +++ b/src/generic/htmllbox.cpp @@ -308,7 +308,7 @@ void wxHtmlListBox::CacheItem(size_t n) const m_htmlParser->SetDC(new wxClientDC(self)); m_htmlParser->SetFS(&self->m_filesystem); #if !wxUSE_UNICODE - if (GetFont().Ok()) + if (GetFont().IsOk()) m_htmlParser->SetInputEncoding(GetFont().GetEncoding()); #endif // use system's default GUI font by default: diff --git a/src/generic/hyperlinkg.cpp b/src/generic/hyperlinkg.cpp index fb8bc57ba1..257e6ef67f 100644 --- a/src/generic/hyperlinkg.cpp +++ b/src/generic/hyperlinkg.cpp @@ -41,6 +41,7 @@ #endif #include "wx/clipbrd.h" +#include "wx/renderer.h" // ============================================================================ // implementation @@ -89,6 +90,9 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id, // with GTK+'s native handling): Connect( wxEVT_PAINT, wxPaintEventHandler(wxGenericHyperlinkCtrl::OnPaint) ); + Connect( wxEVT_SET_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) ); + Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) ); + Connect( wxEVT_CHAR, wxKeyEventHandler(wxGenericHyperlinkCtrl::OnChar) ); Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeaveWindow) ); Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftDown) ); @@ -187,6 +191,32 @@ void wxGenericHyperlinkCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetTextBackground(GetBackgroundColour()); dc.DrawText(GetLabel(), GetLabelRect().GetTopLeft()); + if (HasFocus()) + { + wxRendererNative::Get().DrawFocusRect(this, dc, GetClientRect(), wxCONTROL_SELECTED); + } +} + +void wxGenericHyperlinkCtrl::OnFocus(wxFocusEvent& event) +{ + Refresh(); + event.Skip(); +} + +void wxGenericHyperlinkCtrl::OnChar(wxKeyEvent& event) +{ + switch (event.m_keyCode) + { + default: + event.Skip(); + break; + case WXK_SPACE: + case WXK_NUMPAD_SPACE: + SetForegroundColour(m_visitedColour); + m_visited = true; + SendEvent(); + break; + } } void wxGenericHyperlinkCtrl::OnLeftDown(wxMouseEvent& event) diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index ee1c9d7bdd..54203dbb7b 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -106,7 +106,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap ) int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) { wxBitmap bmp(bitmap); - if (mask.Ok()) + if (mask.IsOk()) bmp.SetMask(new wxMask(mask)); return Add(bmp); } @@ -214,7 +214,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit m_images.Insert( next, newBitmap ); } - if (mask.Ok()) + if (mask.IsOk()) newBitmap->SetMask(new wxMask(mask)); return true; diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 55bdeaec45..1cb929ddb0 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -850,7 +850,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent) // This may very well fail if there are insufficient colours available. // Degrade gracefully. - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { loadedIcons = false; diff --git a/src/generic/mask.cpp b/src/generic/mask.cpp index aec9a245c0..d5fe5cbff7 100644 --- a/src/generic/mask.cpp +++ b/src/generic/mask.cpp @@ -49,12 +49,12 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxImage imgSrc(bitmap.ConvertToImage()); imgSrc.SetMask(false); wxImage image(imgSrc.ConvertToMono(clr.Red(), clr.Green(), clr.Blue())); - if ( !image.Ok() ) + if ( !image.IsOk() ) return false; m_bitmap = wxBitmap(image, 1); - return m_bitmap.Ok(); + return m_bitmap.IsOk(); #else // !wxUSE_IMAGE wxUnusedVar(bitmap); wxUnusedVar(colour); @@ -65,7 +65,7 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap) { - wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap") ); + wxCHECK_MSG( bitmap.IsOk(), false, wxT("Invalid bitmap") ); wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") ); m_bitmap = bitmap; diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 0024bcec60..0601a60f38 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -281,7 +281,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, // native hot-tracking line (on XP) const int penwidth = 3; int y = rect.y + rect.height + 1 - penwidth; - wxColour c = (params && params->m_selectionColour.Ok()) ? + wxColour c = (params && params->m_selectionColour.IsOk()) ? params->m_selectionColour : wxColour(0x66, 0x66, 0x66); wxPen pen(c, penwidth); pen.SetCap(wxCAP_BUTT); @@ -322,7 +322,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, triPt[2].y = ar.height; } - wxColour c = (params && params->m_arrowColour.Ok()) ? + wxColour c = (params && params->m_arrowColour.IsOk()) ? params->m_arrowColour : wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW); wxDCPenChanger setPen(dc, c); @@ -336,7 +336,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, int bmpWidth = 0; // draw the bitmap if there is one - if ( params && params->m_labelBitmap.Ok() ) + if ( params && params->m_labelBitmap.IsOk() ) { int w = params->m_labelBitmap.GetWidth(); int h = params->m_labelBitmap.GetHeight(); @@ -379,9 +379,9 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, const int margin = 5; // number of pixels to reserve on either side of the label labelWidth += 2*margin; - wxFont font = params->m_labelFont.Ok() ? + wxFont font = params->m_labelFont.IsOk() ? params->m_labelFont : win->GetFont(); - wxColour clr = params->m_labelColour.Ok() ? + wxColour clr = params->m_labelColour.IsOk() ? params->m_labelColour : win->GetForegroundColour(); wxString label( params->m_labelText ); diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index ca2a1bb465..e9a7a32a37 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -85,13 +85,13 @@ public: void OnChar( wxKeyEvent &event ) { if (m_spin) - m_spin->OnTextChar(event); + m_spin->ProcessWindowEvent(event); } void OnKillFocus(wxFocusEvent& event) { if (m_spin) - m_spin->OnTextLostFocus(); + m_spin->ProcessWindowEvent(event); event.Skip(); } @@ -357,6 +357,11 @@ void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip) // Handle sub controls events // ---------------------------------------------------------------------------- +BEGIN_EVENT_TABLE(wxSpinCtrlGenericBase, wxSpinCtrlBase) + EVT_CHAR(wxSpinCtrlGenericBase::OnTextChar) + EVT_KILL_FOCUS(wxSpinCtrlGenericBase::OnTextLostFocus) +END_EVENT_TABLE() + void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) { event.Skip(); @@ -388,10 +393,12 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) DoSendEvent(); } -void wxSpinCtrlGenericBase::OnTextLostFocus() +void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event) { SyncSpinToText(); DoSendEvent(); + + event.Skip(); } void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index ee4512b788..da0795d71d 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -171,20 +171,20 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x) void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) wxDrawSplashBitmap(dc, m_bitmap, 0, 0); } void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event) { - if (event.GetDC() && m_bitmap.Ok()) + if (event.GetDC() && m_bitmap.IsOk()) { wxDrawSplashBitmap(* event.GetDC(), m_bitmap, 0, 0); } else { wxClientDC dc(this); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) wxDrawSplashBitmap(dc, m_bitmap, 0, 0); } } diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index b0c6dead72..03abc8baa5 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -66,12 +66,8 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) #if defined( __WXMSW__ ) || defined( __WXMAC__) EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor) #endif // wxMSW - - WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow) END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow, wxWindow) - static bool IsLive(wxSplitterWindow* wnd) { // with wxSP_LIVE_UPDATE style the splitter windows are always resized @@ -117,8 +113,6 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, void wxSplitterWindow::Init() { - WX_INIT_CONTROL_CONTAINER(); - m_splitMode = wxSPLIT_VERTICAL; m_permitUnsplitAlways = true; m_windowOne = NULL; diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp index 328a11d54b..d0efcd17b3 100644 --- a/src/generic/srchctlg.cpp +++ b/src/generic/srchctlg.cpp @@ -61,30 +61,16 @@ class wxSearchTextCtrl : public wxTextCtrl public: wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style) : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize, - style | wxNO_BORDER) + (style & ~wxBORDER_MASK) | wxNO_BORDER) { m_search = search; - m_defaultFG = GetForegroundColour(); + + SetHint(_("Search")); // remove the default minsize, the searchctrl will have one instead SetSizeHints(wxDefaultCoord,wxDefaultCoord); } - void SetDescriptiveText(const wxString& text) - { - if ( GetValue() == m_descriptiveText ) - { - ChangeValue(wxEmptyString); - } - - m_descriptiveText = text; - } - - wxString GetDescriptiveText() const - { - return m_descriptiveText; - } - // provide access to the base class protected methods to wxSearchCtrl which // needs to forward to them @@ -128,30 +114,8 @@ protected: m_search->GetEventHandler()->ProcessEvent(event); } - void OnIdle(wxIdleEvent& WXUNUSED(event)) - { - if ( IsEmpty() && !(wxWindow::FindFocus() == this) ) - { - ChangeValue(m_descriptiveText); - SetInsertionPoint(0); - SetForegroundColour(m_defaultFG.ChangeLightness (LIGHT_STEP)); - } - } - - void OnFocus(wxFocusEvent& event) - { - event.Skip(); - if ( GetValue() == m_descriptiveText ) - { - ChangeValue(wxEmptyString); - SetForegroundColour(m_defaultFG); - } - } - private: wxSearchCtrl* m_search; - wxString m_descriptiveText; - wxColour m_defaultFG; DECLARE_EVENT_TABLE() }; @@ -161,8 +125,6 @@ BEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl) EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText) EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl) EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText) - EVT_IDLE(wxSearchTextCtrl::OnIdle) - EVT_SET_FOCUS(wxSearchTextCtrl::OnFocus) END_EVENT_TABLE() // ---------------------------------------------------------------------------- @@ -181,6 +143,13 @@ public: void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; } + // The buttons in wxSearchCtrl shouldn't accept focus from keyboard because + // this would interfere with the usual TAB processing: the user expects + // that pressing TAB in the search control should switch focus to the next + // control and not give it to the button inside the same control. Besides, + // the search button can be already activated by pressing "Enter" so there + // is really no reason for it to be able to get focus from keyboard. + virtual bool AcceptsFocusFromKeyboard() const { return false; } protected: wxSize DoGetBestSize() const @@ -317,8 +286,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id, return false; } - m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK); - m_text->SetDescriptiveText(_("Search")); + m_text = new wxSearchTextCtrl(this, value, style); m_searchButton = new wxSearchButton(this, wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, @@ -434,12 +402,12 @@ bool wxSearchCtrl::IsCancelButtonVisible() const void wxSearchCtrl::SetDescriptiveText(const wxString& text) { - m_text->SetDescriptiveText(text); + m_text->SetHint(text); } wxString wxSearchCtrl::GetDescriptiveText() const { - return m_text->GetDescriptiveText(); + return m_text->GetHint(); } // ---------------------------------------------------------------------------- @@ -538,11 +506,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height) wxString wxSearchCtrl::DoGetValue() const { - wxString value = m_text->GetValue(); - if (value == m_text->GetDescriptiveText()) - return wxEmptyString; - else - return value; + return m_text->GetValue(); } wxString wxSearchCtrl::GetRange(long from, long to) const { @@ -799,7 +763,7 @@ bool wxSearchCtrl::SetFont(const wxFont& font) void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap ) { m_searchBitmap = bitmap; - m_searchBitmapUser = bitmap.Ok(); + m_searchBitmapUser = bitmap.IsOk(); if ( m_searchBitmapUser ) { if ( m_searchButton && !HasMenu() ) @@ -819,7 +783,7 @@ void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap ) void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap ) { m_searchMenuBitmap = bitmap; - m_searchMenuBitmapUser = bitmap.Ok(); + m_searchMenuBitmapUser = bitmap.IsOk(); if ( m_searchMenuBitmapUser ) { if ( m_searchButton && m_menu ) @@ -839,7 +803,7 @@ void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap ) void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap ) { m_cancelBitmap = bitmap; - m_cancelBitmapUser = bitmap.Ok(); + m_cancelBitmapUser = bitmap.IsOk(); if ( m_cancelBitmapUser ) { if ( m_cancelButton ) @@ -1119,7 +1083,7 @@ void wxSearchCtrl::RecalcBitmaps() if ( !m_searchBitmapUser ) { if ( - !m_searchBitmap.Ok() || + !m_searchBitmap.IsOk() || m_searchBitmap.GetHeight() != bitmapHeight || m_searchBitmap.GetWidth() != bitmapWidth ) @@ -1137,7 +1101,7 @@ void wxSearchCtrl::RecalcBitmaps() if ( !m_searchMenuBitmapUser ) { if ( - !m_searchMenuBitmap.Ok() || + !m_searchMenuBitmap.IsOk() || m_searchMenuBitmap.GetHeight() != bitmapHeight || m_searchMenuBitmap.GetWidth() != bitmapWidth ) @@ -1155,7 +1119,7 @@ void wxSearchCtrl::RecalcBitmaps() if ( !m_cancelBitmapUser ) { if ( - !m_cancelBitmap.Ok() || + !m_cancelBitmap.IsOk() || m_cancelBitmap.GetHeight() != bitmapHeight || m_cancelBitmap.GetWidth() != bitmapHeight ) diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index 8490534ae9..d87d766a07 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -324,7 +324,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn) ); #if wxUSE_STATBMP - if ( m_bitmap.Ok() ) + if ( m_bitmap.IsOk() ) { wxSize bitmapSize(wxDefaultSize); if (GetBitmapPlacement()) @@ -604,10 +604,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward) if ( m_statbmp ) { bmp = m_page->GetBitmap(); - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) bmp = m_bitmap; - if ( !bmpPrev.Ok() ) + if ( !bmpPrev.IsOk() ) bmpPrev = m_bitmap; if (!GetBitmapPlacement()) @@ -928,7 +928,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp) if (!GetBitmapPlacement()) return false; - if (bmp.Ok()) + if (bmp.IsOk()) { wxSize pageSize = m_sizerPage->GetSize(); if (pageSize == wxSize(0,0)) @@ -936,7 +936,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp) int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth()); int bitmapHeight = pageSize.y; - if (!m_statbmp->GetBitmap().Ok() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight) + if (!m_statbmp->GetBitmap().IsOk() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight) { wxBitmap bitmap(bitmapWidth, bitmapHeight); { diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp index 6728f212a8..dc17913122 100644 --- a/src/gtk/aboutdlg.cpp +++ b/src/gtk/aboutdlg.cpp @@ -145,7 +145,7 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent)) gtk_about_dialog_set_license(dlg, NULL); wxIcon icon = info.GetIcon(); - if ( icon.Ok() ) + if ( icon.IsOk() ) gtk_about_dialog_set_logo(dlg, info.GetIcon().GetPixbuf()); if ( info.HasWebSite() ) diff --git a/src/gtk/anybutton.cpp b/src/gtk/anybutton.cpp new file mode 100644 index 0000000000..eb5f525347 --- /dev/null +++ b/src/gtk/anybutton.cpp @@ -0,0 +1,422 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/gtk/anybutton.cpp +// Purpose: +// Author: Robert Roebling +// Created: 1998-05-20 (extracted from button.cpp) +// Id: $Id: anybutton.cpp 67326 2011-03-28 06:27:49Z PC $ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef wxHAS_ANY_BUTTON + +#ifndef WX_PRECOMP + #include "wx/anybutton.h" +#endif + +#include "wx/stockitem.h" + +#include "wx/gtk/private.h" + +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- + +extern "C" +{ + +static void +wxgtk_button_enter_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; + + button->GTKMouseEnters(); +} + +static void +wxgtk_button_leave_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; + + button->GTKMouseLeaves(); +} + +static void +wxgtk_button_press_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; + + button->GTKPressed(); +} + +static void +wxgtk_button_released_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) +{ + if ( button->GTKShouldIgnoreEvent() ) + return; + + button->GTKReleased(); +} + +} // extern "C" + +//----------------------------------------------------------------------------- +// wxAnyButton +//----------------------------------------------------------------------------- + +bool wxAnyButton::Enable( bool enable ) +{ + if (!base_type::Enable(enable)) + return false; + + gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); + + if (enable) + GTKFixSensitivity(); + + GTKUpdateBitmap(); + + return true; +} + +GdkWindow *wxAnyButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const +{ + return GTK_BUTTON(m_widget)->event_window; +} + +// static +wxVisualAttributes +wxAnyButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_button_new); +} + +// ---------------------------------------------------------------------------- +// bitmaps support +// ---------------------------------------------------------------------------- + +void wxAnyButton::GTKMouseEnters() +{ + m_isCurrent = true; + + GTKUpdateBitmap(); +} + +void wxAnyButton::GTKMouseLeaves() +{ + m_isCurrent = false; + + GTKUpdateBitmap(); +} + +void wxAnyButton::GTKPressed() +{ + m_isPressed = true; + + GTKUpdateBitmap(); +} + +void wxAnyButton::GTKReleased() +{ + m_isPressed = false; + + GTKUpdateBitmap(); +} + +void wxAnyButton::GTKOnFocus(wxFocusEvent& event) +{ + event.Skip(); + + GTKUpdateBitmap(); +} + +wxAnyButton::State wxAnyButton::GTKGetCurrentState() const +{ + if ( !IsThisEnabled() ) + return m_bitmaps[State_Disabled].IsOk() ? State_Disabled : State_Normal; + + if ( m_isPressed && m_bitmaps[State_Pressed].IsOk() ) + return State_Pressed; + + if ( m_isCurrent && m_bitmaps[State_Current].IsOk() ) + return State_Current; + + if ( HasFocus() && m_bitmaps[State_Focused].IsOk() ) + return State_Focused; + + return State_Normal; +} + +void wxAnyButton::GTKUpdateBitmap() +{ + // if we don't show bitmaps at all, there is nothing to update + if ( m_bitmaps[State_Normal].IsOk() ) + { + // if we do show them, this will return a state for which we do have a + // valid bitmap + State state = GTKGetCurrentState(); + + GTKDoShowBitmap(m_bitmaps[state]); + } +} + +void wxAnyButton::GTKDoShowBitmap(const wxBitmap& bitmap) +{ + wxASSERT_MSG( bitmap.IsOk(), "invalid bitmap" ); + + GtkWidget *image; + if ( DontShowLabel() ) + { + image = gtk_bin_get_child(GTK_BIN(m_widget)); + } + else // have both label and bitmap + { +#ifdef __WXGTK26__ + if ( !gtk_check_version(2,6,0) ) + { + image = gtk_button_get_image(GTK_BUTTON(m_widget)); + } + else +#endif // __WXGTK26__ + { + // buttons with both label and bitmap are only supported with GTK+ + // 2.6 so far + // + // it shouldn't be difficult to implement them ourselves for the + // previous GTK+ versions by stuffing a container with a label and + // an image inside GtkButton but there doesn't seem to be much + // point in doing this for ancient GTK+ versions + return; + } + } + + wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" ); + + gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf()); +} + +wxBitmap wxAnyButton::DoGetBitmap(State which) const +{ + return m_bitmaps[which]; +} + +void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) +{ + switch ( which ) + { + case State_Normal: + if ( DontShowLabel() ) + { + // we only have the bitmap in this button, never remove it but + // do invalidate the best size when the bitmap (and presumably + // its size) changes + InvalidateBestSize(); + } +#ifdef __WXGTK26__ + // normal image is special: setting it enables images for the button and + // resetting it to nothing disables all of them + else if ( !gtk_check_version(2,6,0) ) + { + GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget)); + if ( image && !bitmap.IsOk() ) + { + gtk_container_remove(GTK_CONTAINER(m_widget), image); + } + else if ( !image && bitmap.IsOk() ) + { + image = gtk_image_new(); + gtk_button_set_image(GTK_BUTTON(m_widget), image); + } + else // image presence or absence didn't change + { + // don't invalidate best size below + break; + } + + InvalidateBestSize(); + } +#endif // GTK+ 2.6+ + break; + + case State_Pressed: + if ( bitmap.IsOk() ) + { + if ( !m_bitmaps[which].IsOk() ) + { + // we need to install the callbacks to be notified about + // the button pressed state change + g_signal_connect + ( + m_widget, + "pressed", + G_CALLBACK(wxgtk_button_press_callback), + this + ); + + g_signal_connect + ( + m_widget, + "released", + G_CALLBACK(wxgtk_button_released_callback), + this + ); + } + } + else // no valid bitmap + { + if ( m_bitmaps[which].IsOk() ) + { + // we don't need to be notified about the button pressed + // state changes any more + g_signal_handlers_disconnect_by_func + ( + m_widget, + (gpointer)wxgtk_button_press_callback, + this + ); + + g_signal_handlers_disconnect_by_func + ( + m_widget, + (gpointer)wxgtk_button_released_callback, + this + ); + + // also make sure we don't remain stuck in pressed state + if ( m_isPressed ) + { + m_isPressed = false; + GTKUpdateBitmap(); + } + } + } + break; + + case State_Current: + // the logic here is the same as above for State_Pressed: we need + // to connect the handlers if we must be notified about the changes + // in the button current state and we disconnect them when/if we + // don't need them any more + if ( bitmap.IsOk() ) + { + if ( !m_bitmaps[which].IsOk() ) + { + g_signal_connect + ( + m_widget, + "enter", + G_CALLBACK(wxgtk_button_enter_callback), + this + ); + + g_signal_connect + ( + m_widget, + "leave", + G_CALLBACK(wxgtk_button_leave_callback), + this + ); + } + } + else // no valid bitmap + { + if ( m_bitmaps[which].IsOk() ) + { + g_signal_handlers_disconnect_by_func + ( + m_widget, + (gpointer)wxgtk_button_enter_callback, + this + ); + + g_signal_handlers_disconnect_by_func + ( + m_widget, + (gpointer)wxgtk_button_leave_callback, + this + ); + + if ( m_isCurrent ) + { + m_isCurrent = false; + GTKUpdateBitmap(); + } + } + } + break; + + case State_Focused: + if ( bitmap.IsOk() ) + { + Connect(wxEVT_SET_FOCUS, + wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + Connect(wxEVT_KILL_FOCUS, + wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + } + else // no valid focused bitmap + { + Disconnect(wxEVT_SET_FOCUS, + wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + Disconnect(wxEVT_KILL_FOCUS, + wxFocusEventHandler(wxAnyButton::GTKOnFocus)); + } + break; + + default: + // no callbacks to connect/disconnect + ; + } + + m_bitmaps[which] = bitmap; + + // update the bitmap immediately if necessary, otherwise it will be done + // when the bitmap for the corresponding state is needed the next time by + // GTKUpdateBitmap() + if ( bitmap.IsOk() && which == GTKGetCurrentState() ) + { + GTKDoShowBitmap(bitmap); + } +} + +void wxAnyButton::DoSetBitmapPosition(wxDirection dir) +{ +#ifdef __WXGTK210__ + if ( !gtk_check_version(2,10,0) ) + { + GtkPositionType gtkpos; + switch ( dir ) + { + default: + wxFAIL_MSG( "invalid position" ); + // fall through + + case wxLEFT: + gtkpos = GTK_POS_LEFT; + break; + + case wxRIGHT: + gtkpos = GTK_POS_RIGHT; + break; + + case wxTOP: + gtkpos = GTK_POS_TOP; + break; + + case wxBOTTOM: + gtkpos = GTK_POS_BOTTOM; + break; + } + + gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos); + InvalidateBestSize(); + } +#endif // GTK+ 2.10+ +} + +#endif // wxHAS_ANY_BUTTON diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index e7ba31b30d..667c6df8e4 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -104,21 +104,21 @@ bool wxBrush::operator==(const wxBrush& brush) const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return &M_BRUSHDATA->m_stipple; } diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 2d83f10cbf..28379ea998 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -38,42 +38,6 @@ wxgtk_button_clicked_callback(GtkWidget *WXUNUSED(widget), wxButton *button) button->HandleWindowEvent(event); } -static void -wxgtk_button_enter_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKMouseEnters(); -} - -static void -wxgtk_button_leave_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKMouseLeaves(); -} - -static void -wxgtk_button_press_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKPressed(); -} - -static void -wxgtk_button_released_callback(GtkWidget *WXUNUSED(widget), wxButton *button) -{ - if ( button->GTKShouldIgnoreEvent() ) - return; - - button->GTKReleased(); -} - //----------------------------------------------------------------------------- // "style_set" from m_widget //----------------------------------------------------------------------------- @@ -234,7 +198,7 @@ void wxButton::SetLabel( const wxString &lbl ) if (label.empty() && wxIsStockID(m_windowId)) label = wxGetStockLabel(m_windowId); - wxControl::SetLabel(label); + wxAnyButton::SetLabel(label); // don't use label if it was explicitly disabled if ( HasFlag(wxBU_NOTEXT) ) @@ -280,27 +244,6 @@ bool wxButton::DoSetLabelMarkup(const wxString& markup) return true; } -#endif // wxUSE_MARKUP - -bool wxButton::Enable( bool enable ) -{ - if (!base_type::Enable(enable)) - return false; - - gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); - - if (enable) - GTKFixSensitivity(); - - GTKUpdateBitmap(); - - return true; -} - -GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return GTK_BUTTON(m_widget)->event_window; -} GtkLabel *wxButton::GTKGetLabel() const { @@ -312,9 +255,8 @@ GtkLabel *wxButton::GTKGetLabel() const GList* list = gtk_container_get_children(GTK_CONTAINER(box)); for (GList* item = list; item; item = item->next) { - GtkBoxChild* boxChild = static_cast(item->data); - if ( GTK_IS_LABEL(boxChild->widget) ) - label = GTK_LABEL(boxChild->widget); + if (GTK_IS_LABEL(item->data)) + label = GTK_LABEL(item->data); } g_list_free(list); @@ -323,6 +265,7 @@ GtkLabel *wxButton::GTKGetLabel() const return GTK_LABEL(child); } +#endif // wxUSE_MARKUP void wxButton::DoApplyWidgetStyle(GtkRcStyle *style) { @@ -340,8 +283,7 @@ void wxButton::DoApplyWidgetStyle(GtkRcStyle *style) GList* list = gtk_container_get_children(GTK_CONTAINER(box)); for (GList* item = list; item; item = item->next) { - GtkBoxChild* boxChild = static_cast(item->data); - gtk_widget_modify_style(boxChild->widget, style); + gtk_widget_modify_style(GTK_WIDGET(item->data), style); } g_list_free(list); } @@ -361,7 +303,7 @@ wxSize wxButton::DoGetBestSize() const gtk_widget_set_can_default(m_widget, FALSE); } - wxSize ret( wxControl::DoGetBestSize() ); + wxSize ret( wxAnyButton::DoGetBestSize() ); if ( isDefault ) { @@ -389,326 +331,4 @@ wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return GetDefaultAttributesFromGTKWidget(gtk_button_new); } -// ---------------------------------------------------------------------------- -// bitmaps support -// ---------------------------------------------------------------------------- - -void wxButton::GTKMouseEnters() -{ - m_isCurrent = true; - - GTKUpdateBitmap(); -} - -void wxButton::GTKMouseLeaves() -{ - m_isCurrent = false; - - GTKUpdateBitmap(); -} - -void wxButton::GTKPressed() -{ - m_isPressed = true; - - GTKUpdateBitmap(); -} - -void wxButton::GTKReleased() -{ - m_isPressed = false; - - GTKUpdateBitmap(); -} - -void wxButton::GTKOnFocus(wxFocusEvent& event) -{ - event.Skip(); - - GTKUpdateBitmap(); -} - -wxButton::State wxButton::GTKGetCurrentState() const -{ - if ( !IsThisEnabled() ) - return m_bitmaps[State_Disabled].IsOk() ? State_Disabled : State_Normal; - - if ( m_isPressed && m_bitmaps[State_Pressed].IsOk() ) - return State_Pressed; - - if ( m_isCurrent && m_bitmaps[State_Current].IsOk() ) - return State_Current; - - if ( HasFocus() && m_bitmaps[State_Focused].IsOk() ) - return State_Focused; - - return State_Normal; -} - -void wxButton::GTKUpdateBitmap() -{ - // if we don't show bitmaps at all, there is nothing to update - if ( m_bitmaps[State_Normal].IsOk() ) - { - // if we do show them, this will return a state for which we do have a - // valid bitmap - State state = GTKGetCurrentState(); - - GTKDoShowBitmap(m_bitmaps[state]); - } -} - -void wxButton::GTKDoShowBitmap(const wxBitmap& bitmap) -{ - wxASSERT_MSG( bitmap.IsOk(), "invalid bitmap" ); - - GtkWidget *image; - if ( DontShowLabel() ) - { - image = gtk_bin_get_child(GTK_BIN(m_widget)); - } - else // have both label and bitmap - { -#ifdef __WXGTK26__ - if ( !gtk_check_version(2,6,0) ) - { - image = gtk_button_get_image(GTK_BUTTON(m_widget)); - } - else -#endif // __WXGTK26__ - { - // buttons with both label and bitmap are only supported with GTK+ - // 2.6 so far - // - // it shouldn't be difficult to implement them ourselves for the - // previous GTK+ versions by stuffing a container with a label and - // an image inside GtkButton but there doesn't seem to be much - // point in doing this for ancient GTK+ versions - return; - } - } - - wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" ); - - gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf()); -} - -wxBitmap wxButton::DoGetBitmap(State which) const -{ - return m_bitmaps[which]; -} - -void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ - switch ( which ) - { - case State_Normal: - if ( DontShowLabel() ) - { - // we only have the bitmap in this button, never remove it but - // do invalidate the best size when the bitmap (and presumably - // its size) changes - InvalidateBestSize(); - } -#ifdef __WXGTK26__ - // normal image is special: setting it enables images for the button and - // resetting it to nothing disables all of them - else if ( !gtk_check_version(2,6,0) ) - { - GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget)); - if ( image && !bitmap.IsOk() ) - { - gtk_container_remove(GTK_CONTAINER(m_widget), image); - } - else if ( !image && bitmap.IsOk() ) - { - image = gtk_image_new(); - gtk_button_set_image(GTK_BUTTON(m_widget), image); - } - else // image presence or absence didn't change - { - // don't invalidate best size below - break; - } - - InvalidateBestSize(); - } -#endif // GTK+ 2.6+ - break; - - case State_Pressed: - if ( bitmap.IsOk() ) - { - if ( !m_bitmaps[which].IsOk() ) - { - // we need to install the callbacks to be notified about - // the button pressed state change - g_signal_connect - ( - m_widget, - "pressed", - G_CALLBACK(wxgtk_button_press_callback), - this - ); - - g_signal_connect - ( - m_widget, - "released", - G_CALLBACK(wxgtk_button_released_callback), - this - ); - } - } - else // no valid bitmap - { - if ( m_bitmaps[which].IsOk() ) - { - // we don't need to be notified about the button pressed - // state changes any more - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_press_callback, - this - ); - - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_released_callback, - this - ); - - // also make sure we don't remain stuck in pressed state - if ( m_isPressed ) - { - m_isPressed = false; - GTKUpdateBitmap(); - } - } - } - break; - - case State_Current: - // the logic here is the same as above for State_Pressed: we need - // to connect the handlers if we must be notified about the changes - // in the button current state and we disconnect them when/if we - // don't need them any more - if ( bitmap.IsOk() ) - { - if ( !m_bitmaps[which].IsOk() ) - { - g_signal_connect - ( - m_widget, - "enter", - G_CALLBACK(wxgtk_button_enter_callback), - this - ); - - g_signal_connect - ( - m_widget, - "leave", - G_CALLBACK(wxgtk_button_leave_callback), - this - ); - } - } - else // no valid bitmap - { - if ( m_bitmaps[which].IsOk() ) - { - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_enter_callback, - this - ); - - g_signal_handlers_disconnect_by_func - ( - m_widget, - (gpointer)wxgtk_button_leave_callback, - this - ); - - if ( m_isCurrent ) - { - m_isCurrent = false; - GTKUpdateBitmap(); - } - } - } - break; - - case State_Focused: - if ( bitmap.IsOk() ) - { - Connect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxButton::GTKOnFocus)); - Connect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxButton::GTKOnFocus)); - } - else // no valid focused bitmap - { - Disconnect(wxEVT_SET_FOCUS, - wxFocusEventHandler(wxButton::GTKOnFocus)); - Disconnect(wxEVT_KILL_FOCUS, - wxFocusEventHandler(wxButton::GTKOnFocus)); - } - break; - - default: - // no callbacks to connect/disconnect - ; - } - - m_bitmaps[which] = bitmap; - - // update the bitmap immediately if necessary, otherwise it will be done - // when the bitmap for the corresponding state is needed the next time by - // GTKUpdateBitmap() - if ( bitmap.IsOk() && which == GTKGetCurrentState() ) - { - GTKDoShowBitmap(bitmap); - } -} - -void wxButton::DoSetBitmapPosition(wxDirection dir) -{ -#ifdef __WXGTK210__ - if ( !gtk_check_version(2,10,0) ) - { - GtkPositionType gtkpos; - switch ( dir ) - { - default: - wxFAIL_MSG( "invalid position" ); - // fall through - - case wxLEFT: - gtkpos = GTK_POS_LEFT; - break; - - case wxRIGHT: - gtkpos = GTK_POS_RIGHT; - break; - - case wxTOP: - gtkpos = GTK_POS_TOP; - break; - - case wxBOTTOM: - gtkpos = GTK_POS_BOTTOM; - break; - } - - gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos); - InvalidateBestSize(); - } -#endif // GTK+ 2.10+ -} - #endif // wxUSE_BUTTON diff --git a/src/gtk/calctrl.cpp b/src/gtk/calctrl.cpp index 24b1d73347..9d23433761 100644 --- a/src/gtk/calctrl.cpp +++ b/src/gtk/calctrl.cpp @@ -28,27 +28,19 @@ extern "C" { static void gtk_day_selected_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - wxDateTime date = cal->GetDate(); - if (cal->m_selectedDate == date) - return; - - cal->m_selectedDate = date; - - cal->GenerateEvent(wxEVT_CALENDAR_SEL_CHANGED); - // send deprecated event - cal->GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_SEL_CHANGED); } static void gtk_day_selected_double_click_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - cal->GenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_DOUBLECLICKED); } static void gtk_month_changed_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - cal->GenerateEvent(wxEVT_CALENDAR_PAGE_CHANGED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_PAGE_CHANGED); } // callbacks that send deprecated events @@ -56,13 +48,13 @@ static void gtk_month_changed_callback(GtkWidget *WXUNUSED(widget), static void gtk_prev_month_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - cal->GenerateEvent(wxEVT_CALENDAR_MONTH_CHANGED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_MONTH_CHANGED); } static void gtk_prev_year_callback(GtkWidget *WXUNUSED(widget), wxGtkCalendarCtrl *cal) { - cal->GenerateEvent(wxEVT_CALENDAR_YEAR_CHANGED); + cal->GTKGenerateEvent(wxEVT_CALENDAR_YEAR_CHANGED); } } @@ -127,6 +119,74 @@ bool wxGtkCalendarCtrl::Create(wxWindow *parent, return true; } +void wxGtkCalendarCtrl::GTKGenerateEvent(wxEventType type) +{ + // First check if the new date is in the specified range. + wxDateTime dt = GetDate(); + if ( !IsInValidRange(dt) ) + { + if ( m_validStart.IsValid() && dt < m_validStart ) + dt = m_validStart; + else + dt = m_validEnd; + + SetDate(dt); + + return; + } + + if ( type == wxEVT_CALENDAR_SEL_CHANGED ) + { + // Don't generate this event if the new date is the same as the old + // one. + if ( m_selectedDate == dt ) + return; + + m_selectedDate = dt; + + GenerateEvent(type); + + // Also send the deprecated event together with the new one. + GenerateEvent(wxEVT_CALENDAR_DAY_CHANGED); + } + else + { + GenerateEvent(type); + } +} + +bool wxGtkCalendarCtrl::IsInValidRange(const wxDateTime& dt) const +{ + return (!m_validStart.IsValid() || m_validStart <= dt) && + (!m_validEnd.IsValid() || dt <= m_validEnd); +} + +bool +wxGtkCalendarCtrl::SetDateRange(const wxDateTime& lowerdate, + const wxDateTime& upperdate) +{ + if ( lowerdate.IsValid() && upperdate.IsValid() && lowerdate >= upperdate ) + return false; + + m_validStart = lowerdate; + m_validEnd = upperdate; + + return true; +} + +bool +wxGtkCalendarCtrl::GetDateRange(wxDateTime *lowerdate, + wxDateTime *upperdate) const +{ + if ( lowerdate ) + *lowerdate = m_validStart; + if ( upperdate ) + *upperdate = m_validEnd; + + return m_validStart.IsValid() || m_validEnd.IsValid(); +} + + bool wxGtkCalendarCtrl::EnableMonthChange(bool enable) { if ( !wxCalendarCtrlBase::EnableMonthChange(enable) ) @@ -140,6 +200,9 @@ bool wxGtkCalendarCtrl::EnableMonthChange(bool enable) bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date) { + if ( date.IsValid() && !IsInValidRange(date) ) + return false; + g_signal_handlers_block_by_func(m_widget, (gpointer) gtk_day_selected_callback, this); g_signal_handlers_block_by_func(m_widget, @@ -162,9 +225,22 @@ bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date) wxDateTime wxGtkCalendarCtrl::GetDate() const { - guint year, month, day; - gtk_calendar_get_date(GTK_CALENDAR(m_widget), &year, &month, &day); - return wxDateTime(day, (wxDateTime::Month) month, year); + guint year, monthGTK, day; + gtk_calendar_get_date(GTK_CALENDAR(m_widget), &year, &monthGTK, &day); + + // GTK may return an invalid date, this happens at least when switching the + // month (or the year in case of February in a leap year) and the new month + // has fewer days than the currently selected one making the currently + // selected day invalid, e.g. just choosing May 31 and going back a month + // results in the date being (non existent) April 31 when we're called from + // gtk_prev_month_callback(). We need to manually work around this to avoid + // asserts from wxDateTime ctor. + const wxDateTime::Month month = static_cast(monthGTK); + const guint dayMax = wxDateTime::GetNumberOfDays(month, year); + if ( day > dayMax ) + day = dayMax; + + return wxDateTime(day, month, year); } void wxGtkCalendarCtrl::Mark(size_t day, bool mark) diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp index ca9e536a65..76dc32e935 100644 --- a/src/gtk/colordlg.cpp +++ b/src/gtk/colordlg.cpp @@ -105,7 +105,7 @@ int wxColourDialog::ShowModal() void wxColourDialog::ColourDataToDialog() { const GdkColor * const - col = m_data.GetColour().Ok() ? m_data.GetColour().GetColor() + col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor() : NULL; #if wxUSE_LIBHILDON @@ -138,7 +138,7 @@ void wxColourDialog::ColourDataToDialog() for (unsigned i = 0; i < 16; i++) { wxColour c = m_data.GetCustomColour(i); - if (c.Ok()) + if (c.IsOk()) { colors[n_colors] = *c.GetColor(); n_colors++; @@ -161,7 +161,7 @@ void wxColourDialog::DialogToColourData() m_data.SetColour(*clr); #elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON const GdkColor * const - col = m_data.GetColour().Ok() ? m_data.GetColour().GetColor() : NULL; + col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor() : NULL; GdkColor clr; if (col) diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 322689db99..185cb5c1d4 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -127,49 +127,49 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return wxByte(M_COLDATA->m_red >> SHIFT); } unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return wxByte(M_COLDATA->m_green >> SHIFT); } unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return wxByte(M_COLDATA->m_blue >> SHIFT); } unsigned char wxColour::Alpha() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_alpha; } void wxColour::CalcPixel( GdkColormap *cmap ) { - if (!Ok()) return; + if (!IsOk()) return; M_COLDATA->AllocColour( cmap ); } int wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } const GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") ); return &M_COLDATA->m_color; } diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index 73983f1351..525bccdb7e 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -423,7 +423,7 @@ void wxBeginBusyCursor(const wxCursor* cursor) if (gs_busyCount++ > 0) return; - wxASSERT_MSG( !gs_savedCursor.Ok(), + wxASSERT_MSG( !gs_savedCursor.IsOk(), wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = g_globalCursor; diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index dbe0952d50..5d8854134c 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -384,12 +384,12 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) m_bitmap = wxBitmap(image); - return m_bitmap.Ok(); + return m_bitmap.IsOk(); } void wxBitmapDataObject::DoConvertToPng() { - if ( !m_bitmap.Ok() ) + if ( !m_bitmap.IsOk() ) return; wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 249abb706d..e27c908000 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -1333,6 +1333,17 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer, wxSize size = cell->GetSize(); + wxDataViewCtrl * const ctrl = cell->GetOwner()->GetOwner(); + + // Uniform row height, if specified, overrides the value returned by the + // renderer. + if ( !ctrl->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) + { + const int uniformHeight = ctrl->GTKGetUniformRowHeight(); + if ( uniformHeight > 0 ) + size.y = uniformHeight; + } + int xpad, ypad; gtk_cell_renderer_get_padding(renderer, &xpad, &ypad); int calc_width = xpad * 2 + size.x; @@ -1824,7 +1835,7 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const return ret; } -void wxDataViewRenderer::GtkUpdateAlignment() +void wxDataViewRenderer::GtkApplyAlignment(GtkCellRenderer *renderer) { int align = m_alignment; @@ -1850,7 +1861,7 @@ void wxDataViewRenderer::GtkUpdateAlignment() GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_FLOAT ); g_value_set_float( &gvalue, xalign ); - g_object_set_property( G_OBJECT(m_renderer), "xalign", &gvalue ); + g_object_set_property( G_OBJECT(renderer), "xalign", &gvalue ); g_value_unset( &gvalue ); // vertical alignment: @@ -1864,7 +1875,7 @@ void wxDataViewRenderer::GtkUpdateAlignment() GValue gvalue2 = { 0, }; g_value_init( &gvalue2, G_TYPE_FLOAT ); g_value_set_float( &gvalue2, yalign ); - g_object_set_property( G_OBJECT(m_renderer), "yalign", &gvalue2 ); + g_object_set_property( G_OBJECT(renderer), "yalign", &gvalue2 ); g_value_unset( &gvalue2 ); } @@ -2348,14 +2359,20 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, Init(mode, align); } +void wxDataViewCustomRenderer::GtkInitTextRenderer() +{ + m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()); + g_object_ref_sink(m_text_renderer); + + GtkApplyAlignment(GTK_CELL_RENDERER(m_text_renderer)); +} + GtkCellRendererText *wxDataViewCustomRenderer::GtkGetTextRenderer() const { if ( !m_text_renderer ) { // we create it on demand so need to do it even from a const function - const_cast(this)-> - m_text_renderer = GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()); - g_object_ref_sink(m_text_renderer); + const_cast(this)->GtkInitTextRenderer(); } return m_text_renderer; @@ -2448,15 +2465,20 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, { m_renderer = (GtkCellRenderer*) gtk_cell_renderer_progress_new(); - GValue gvalue = { 0, }; - g_value_init( &gvalue, G_TYPE_STRING ); - - g_value_set_string( &gvalue, wxGTK_CONV_FONT( m_label, GetOwner()->GetOwner()->GetFont() ) ); - g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); - g_value_unset( &gvalue ); - SetMode(mode); SetAlignment(align); + +#if !wxUSE_UNICODE + // We can't initialize the renderer just yet because we don't have the + // pointer to the column that uses this renderer yet and so attempt to + // dereference GetOwner() to get the font that is used as a source of + // encoding in multibyte-to-Unicode conversion in GTKSetLabel() in + // non-Unicode builds would crash. So simply remember to do it later. + if ( !m_label.empty() ) + m_needsToSetLabel = true; + else +#endif // !wxUSE_UNICODE + GTKSetLabel(); } else #endif @@ -2470,11 +2492,36 @@ wxDataViewProgressRenderer::~wxDataViewProgressRenderer() { } +void wxDataViewProgressRenderer::GTKSetLabel() +{ + GValue gvalue = { 0, }; + g_value_init( &gvalue, G_TYPE_STRING ); + + // Take care to not use GetOwner() here if the label is empty, we can be + // called from ctor when GetOwner() is still NULL in this case. + g_value_set_string( &gvalue, + m_label.empty() ? "" + : wxGTK_CONV_FONT(m_label, + GetOwner()->GetOwner()->GetFont()) + ); + g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); + g_value_unset( &gvalue ); + +#if !wxUSE_UNICODE + m_needsToSetLabel = false; +#endif // !wxUSE_UNICODE +} + bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) { #ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { +#if !wxUSE_UNICODE + if ( m_needsToSetLabel ) + GTKSetLabel(); +#endif // !wxUSE_UNICODE + gint tmp = (long) value; GValue gvalue = { 0, }; g_value_init( &gvalue, G_TYPE_INT ); @@ -3083,7 +3130,7 @@ void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) { wxDataViewColumnBase::SetBitmap( bitmap ); - if (bitmap.Ok()) + if (bitmap.IsOk()) { GtkImage *gtk_image = GTK_IMAGE(m_image); @@ -3531,6 +3578,7 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag GtkTreePath *path ) { delete m_dragDataObject; + m_dragDataObject = NULL; wxDataViewItem item(GetOwner()->GTKPathToItem(path)); if ( !item ) @@ -4473,6 +4521,8 @@ void wxDataViewCtrl::Init() m_internal = NULL; m_cols.DeleteContents( true ); + + m_uniformRowHeight = -1; } bool wxDataViewCtrl::Create(wxWindow *parent, @@ -4836,6 +4886,33 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, NULL, FALSE); } +void wxDataViewCtrl::StartEditor(const wxDataViewItem& item, unsigned int column) +{ + wxCHECK_RET( m_treeview, + "Current item can't be set before creating the control." ); + + // We need to make sure the model knows about this item or the path would + // be invalid and gtk_tree_view_set_cursor() would silently do nothing. + ExpandAncestors(item); + + wxDataViewColumn *dvcolumn = GetColumn(column); + wxASSERT_MSG(dvcolumn, "Could not retrieve column"); + GtkTreeViewColumn *gcolumn = GTK_TREE_VIEW_COLUMN(dvcolumn->GetGtkHandle()); + + // We also need to preserve the existing selection from changing. + // Unfortunately the only way to do it seems to use our own selection + // function and forbid any selection changes during set cursor call. + wxGtkTreeSelectionLock + lock(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview))); + + // Do move the cursor now. + GtkTreeIter iter; + iter.user_data = item.GetID(); + wxGtkTreePath path(m_internal->get_path( &iter )); + + gtk_tree_view_set_cursor(GTK_TREE_VIEW(m_treeview), path, gcolumn, TRUE); +} + wxDataViewItem wxDataViewCtrl::GetSelection() const { GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) ); @@ -5076,6 +5153,12 @@ wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item), return wxRect(); } +bool wxDataViewCtrl::SetRowHeight(int rowHeight) +{ + m_uniformRowHeight = rowHeight; + return true; +} + void wxDataViewCtrl::DoSetExpanderColumn() { gtk_tree_view_set_expander_column( GTK_TREE_VIEW(m_treeview), diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 798b1f413f..f9a123a20f 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -1492,7 +1492,7 @@ void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord wxCHECK_RET( IsOk(), wxT("invalid window dc") ); -#if __WXGTK26__ +#ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { x = XLOG2DEV(x); diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index 4590917127..d502b5bd48 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/dcmemory.cpp @@ -65,7 +65,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) Destroy(); m_selected = bitmap; - if (m_selected.Ok()) + if (m_selected.IsOk()) { m_gdkwindow = m_selected.GetPixmap(); @@ -83,7 +83,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) void wxMemoryDCImpl::SetPen( const wxPen& penOrig ) { wxPen pen( penOrig ); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetDepth() == 1 && (pen != *wxTRANSPARENT_PEN) ) { @@ -96,7 +96,7 @@ void wxMemoryDCImpl::SetPen( const wxPen& penOrig ) void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig ) { wxBrush brush( brushOrig ); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetDepth() == 1 && (brush != *wxTRANSPARENT_BRUSH) ) { @@ -110,7 +110,7 @@ void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig ) { wxBrush brush(brushOrig); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetDepth() == 1 && (brush != *wxTRANSPARENT_BRUSH) ) { @@ -122,7 +122,7 @@ void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig ) void wxMemoryDCImpl::SetTextForeground( const wxColour& col ) { - if ( m_selected.Ok() && m_selected.GetDepth() == 1 ) + if ( m_selected.IsOk() && m_selected.GetDepth() == 1 ) wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE); else wxWindowDCImpl::SetTextForeground( col ); @@ -130,7 +130,7 @@ void wxMemoryDCImpl::SetTextForeground( const wxColour& col ) void wxMemoryDCImpl::SetTextBackground( const wxColour &col ) { - if (m_selected.Ok() && m_selected.GetDepth() == 1) + if (m_selected.IsOk() && m_selected.GetDepth() == 1) wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE ); else wxWindowDCImpl::SetTextBackground( col ); @@ -138,7 +138,7 @@ void wxMemoryDCImpl::SetTextBackground( const wxColour &col ) void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const { - if (m_selected.Ok()) + if (m_selected.IsOk()) { if (width) (*width) = m_selected.GetWidth(); if (height) (*height) = m_selected.GetHeight(); diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp index 6a0f1e655d..a58d60622e 100644 --- a/src/gtk/dcscreen.cpp +++ b/src/gtk/dcscreen.cpp @@ -13,13 +13,8 @@ #include "wx/dcscreen.h" #include "wx/gtk/dcscreen.h" -#ifndef WX_PRECOMP - #include "wx/window.h" -#endif - -#include -#include #include +#include //----------------------------------------------------------------------------- // wxScreenDCImpl @@ -58,6 +53,8 @@ void wxScreenDCImpl::Init() wxScreenDCImpl::~wxScreenDCImpl() { + g_object_unref(m_context); + gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN ); gdk_gc_set_subwindow( m_brushGC, GDK_CLIP_BY_CHILDREN ); gdk_gc_set_subwindow( m_textGC, GDK_CLIP_BY_CHILDREN ); diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms index 604a8c23c9..2d747f4dc8 100644 --- a/src/gtk/descrip.mms +++ b/src/gtk/descrip.mms @@ -2,7 +2,7 @@ # * # Make file for VMS * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * -# Date : 11 April 2011 * +# Date : 16 June 2011 * # * #***************************************************************************** .first @@ -99,7 +99,7 @@ OBJECTS0= \ tglbtn.obj,\ msgdlg.obj,\ treeentry_gtk.obj,textentry.obj,filectrl.obj,print.obj,win_gtk.obj,\ - mnemonics.obj,private.obj,assertdlg_gtk.obj,infobar.obj + mnemonics.obj,private.obj,assertdlg_gtk.obj,infobar.obj,anybutton.obj SOURCES =\ animate.cpp,\ @@ -165,7 +165,7 @@ SOURCES =\ utilsgtk.cpp,\ window.cpp,\ treeentry_gtk.c,textentry.cpp,filectrl.cpp,print.cpp,win_gtk.cpp,\ - mnemonics.cpp,private.cpp,assertdlg_gtk.cpp,infobar.cpp + mnemonics.cpp,private.cpp,assertdlg_gtk.cpp,infobar.cpp,anybutton.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -260,3 +260,4 @@ mnemonics.obj : mnemonics.cpp private.obj : private.cpp assertdlg_gtk.obj : assertdlg_gtk.cpp infobar.obj : infobar.cpp +anybutton.obj : anybutton.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 88e4402a80..c7bdf480a8 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -737,11 +737,11 @@ void wxDropSource::SetIcons(const wxIcon &iconCopy, m_iconMove = iconMove; m_iconNone = iconNone; - if ( !m_iconCopy.Ok() ) + if ( !m_iconCopy.IsOk() ) m_iconCopy = wxIcon(page_xpm); - if ( !m_iconMove.Ok() ) + if ( !m_iconMove.IsOk() ) m_iconMove = m_iconCopy; - if ( !m_iconNone.Ok() ) + if ( !m_iconNone.IsOk() ) m_iconNone = m_iconCopy; } diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index d50f46bfc5..ce8afcb7ad 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -116,7 +116,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent) G_CALLBACK (gtk_fontdialog_delete_callback), this); wxFont font = m_fontData.GetInitialFont(); - if( font.Ok() ) + if( font.IsOk() ) { const wxNativeFontInfo *info = font.GetNativeFontInfo(); diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index abe6b7ba62..5902314417 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -1534,7 +1534,7 @@ wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask)) { - if (!bitmap.Ok()) return; + if (!bitmap.IsOk()) return; if (bitmap.HasPixbuf()) { @@ -1565,7 +1565,7 @@ wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap, { wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return; + if (!image.IsOk()) return; gs_libGnomePrint->gnome_print_gsave( m_gpc ); double matrix[6]; @@ -1592,7 +1592,7 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx double xx = XLOG2DEV(x); double yy = YLOG2DEV(y); - bool underlined = m_font.Ok() && m_font.GetUnderlined(); + bool underlined = m_font.IsOk() && m_font.GetUnderlined(); const wxScopedCharBuffer data(text.utf8_str()); @@ -1610,7 +1610,7 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx pango_attr_list_unref(attrs); } - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1674,7 +1674,7 @@ void wxGnomePrinterDCImpl::SetFont( const wxFont& font ) { m_font = font; - if (m_font.Ok()) + if (m_font.IsOk()) { if (m_fontdesc) pango_font_description_free( m_fontdesc ); @@ -1691,7 +1691,7 @@ void wxGnomePrinterDCImpl::SetFont( const wxFont& font ) void wxGnomePrinterDCImpl::SetPen( const wxPen& pen ) { - if (!pen.Ok()) return; + if (!pen.IsOk()) return; m_pen = pen; @@ -1757,7 +1757,7 @@ void wxGnomePrinterDCImpl::SetPen( const wxPen& pen ) void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush ) { - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_brush = brush; diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 09b0b4a12a..d76523b681 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -855,7 +855,7 @@ GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { - if (m_hasBgCol && m_backgroundColour.Ok()) + if (m_hasBgCol && m_backgroundColour.IsOk()) { GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); if (window) diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index b506d195b6..3c99374528 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -698,8 +698,6 @@ void wxMenu::Init() gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff); } - m_prevRadio = NULL; - // append the title as the very first entry if we have it if ( !m_title.empty() ) { @@ -750,8 +748,6 @@ wxString wxMenu::GetTitle() const bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) { GtkWidget *menuItem; - GtkWidget* prevRadio = m_prevRadio; - m_prevRadio = NULL; switch (mitem->GetKind()) { case wxITEM_SEPARATOR: @@ -762,11 +758,44 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) break; case wxITEM_RADIO: { + // See if we need to create a new radio group for this item or + // add it to an existing one. + wxMenuItem* radioGroupItem = NULL; + + const size_t numItems = GetMenuItemCount(); + const size_t n = pos == -1 ? numItems + : static_cast(pos); + if ( n > 0 ) + { + wxMenuItem* const itemPrev = FindItemByPosition(n - 1); + if ( itemPrev->GetKind() == wxITEM_RADIO ) + { + // Appending an item after an existing radio item puts + // it into the same radio group. + radioGroupItem = itemPrev; + } + } + + if ( n < numItems ) + { + wxMenuItem* const itemNext = FindItemByPosition(n); + if ( itemNext->GetKind() == wxITEM_RADIO ) + { + // Inserting an item before an existing radio item + // also puts it into the existing radio group. + radioGroupItem = itemNext; + } + } + GSList* group = NULL; - if (prevRadio) - group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(prevRadio)); + if ( radioGroupItem ) + { + group = gtk_radio_menu_item_get_group( + GTK_RADIO_MENU_ITEM(radioGroupItem->GetMenuItem()) + ); + } + menuItem = gtk_radio_menu_item_new_with_label(group, ""); - m_prevRadio = menuItem; } break; default: @@ -835,14 +864,10 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem) wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - if ( !wxMenuBase::DoInsert(pos, item) ) - return NULL; - - // TODO if ( !GtkAppend(item, (int)pos) ) return NULL; - return item; + return wxMenuBase::DoInsert(pos, item); } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -851,13 +876,6 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) return NULL; GtkWidget * const mitem = item->GetMenuItem(); - if ( m_prevRadio == mitem ) - { - // deleting an item starts a new radio group (has to as we shouldn't - // keep a deleted pointer anyhow) - m_prevRadio = NULL; - } - gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL); gtk_widget_destroy(mitem); item->SetMenuItem(NULL); diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index e118019c71..4081bf6dfc 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -182,7 +182,7 @@ void wxPen::SetWidth( int width ) int wxPen::GetDashes( wxDash **ptr ) const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); *ptr = (wxDash*)M_PENDATA->m_dash; return M_PENDATA->m_countDashes; @@ -190,49 +190,49 @@ int wxPen::GetDashes( wxDash **ptr ) const int wxPen::GetDashCount() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return (M_PENDATA->m_countDashes); } wxDash* wxPen::GetDash() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return (wxDash*)M_PENDATA->m_dash; } wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_width; } wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp index d72c2a9a5e..071c5e6733 100644 --- a/src/gtk/print.cpp +++ b/src/gtk/print.cpp @@ -1738,7 +1738,7 @@ void wxGtkPrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCo angle = -angle; - bool underlined = m_font.Ok() && m_font.GetUnderlined(); + bool underlined = m_font.IsOk() && m_font.GetUnderlined(); const wxScopedCharBuffer data = text.utf8_str(); @@ -1756,7 +1756,7 @@ void wxGtkPrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCo pango_attr_list_unref(attrs); } - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1844,7 +1844,7 @@ void wxGtkPrinterDCImpl::SetFont( const wxFont& font ) { m_font = font; - if (m_font.Ok()) + if (m_font.IsOk()) { if (m_fontdesc) pango_font_description_free( m_fontdesc ); @@ -1861,7 +1861,7 @@ void wxGtkPrinterDCImpl::SetFont( const wxFont& font ) void wxGtkPrinterDCImpl::SetPen( const wxPen& pen ) { - if (!pen.Ok()) return; + if (!pen.IsOk()) return; m_pen = pen; @@ -1940,7 +1940,7 @@ void wxGtkPrinterDCImpl::SetPen( const wxPen& pen ) void wxGtkPrinterDCImpl::SetBrush( const wxBrush& brush ) { - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_brush = brush; diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 2073c24046..669dc09424 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -179,7 +179,7 @@ bool wxRegion::DoUnionWithRect(const wxRect& r) bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -198,7 +198,7 @@ bool wxRegion::DoUnionWithRegion( const wxRegion& region ) bool wxRegion::DoIntersect( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -215,7 +215,7 @@ bool wxRegion::DoIntersect( const wxRegion& region ) bool wxRegion::DoSubtract( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -232,7 +232,7 @@ bool wxRegion::DoSubtract( const wxRegion& region ) bool wxRegion::DoXor( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp index 291b30a49d..2ce5843e92 100644 --- a/src/gtk/scrolwin.cpp +++ b/src/gtk/scrolwin.cpp @@ -31,15 +31,12 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int xPos, int yPos, bool noRefresh) { + // prevent programmatic position changes from causing scroll events + m_win->SetScrollPos(wxHORIZONTAL, xPos); + m_win->SetScrollPos(wxVERTICAL, yPos); + base_type::SetScrollbars( pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh); - - gtk_range_set_value(m_win->m_scrollBar[wxWindow::ScrollDir_Horz], m_xScrollPosition); - gtk_range_set_value(m_win->m_scrollBar[wxWindow::ScrollDir_Vert], m_yScrollPosition); - m_win->m_scrollPos[wxWindow::ScrollDir_Horz] = - gtk_range_get_value(m_win->m_scrollBar[wxWindow::ScrollDir_Horz]); - m_win->m_scrollPos[wxWindow::ScrollDir_Vert] = - gtk_range_get_value(m_win->m_scrollBar[wxWindow::ScrollDir_Vert]); } void wxScrollHelper::DoAdjustScrollbar(GtkRange* range, diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 51f5a3eb08..0712e10fe7 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -258,7 +258,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) case wxSYS_SYSTEM_FONT: case wxSYS_DEVICE_DEFAULT_FONT: case wxSYS_DEFAULT_GUI_FONT: - if (!gs_fontSystem.Ok()) + if (!gs_fontSystem.IsOk()) { wxNativeFontInfo info; info.description = ButtonStyle()->font_desc; diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp index dc9b639711..a1c66085e3 100644 --- a/src/gtk/statbmp.cpp +++ b/src/gtk/statbmp.cpp @@ -47,7 +47,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_widget = gtk_image_new(); g_object_ref(m_widget); - if (bitmap.Ok()) + if (bitmap.IsOk()) SetBitmap(bitmap); PostCreation(size); @@ -60,7 +60,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { m_bitmap = bitmap; - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { // always use pixbuf, because pixmap mask does not // work with disabled images in some themes diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 59111db0c4..ee0c631afc 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -1289,7 +1289,7 @@ void wxTextCtrl::OnEnabled(bool WXUNUSED(enable)) // disabled and enabled mode, or we end up with a different colour under the // text. wxColour oldColour = GetBackgroundColour(); - if (oldColour.Ok()) + if (oldColour.IsOk()) { // Need to set twice or it'll optimize the useful stuff out if (oldColour == * wxWHITE) @@ -1666,7 +1666,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) if ( !wxControl::SetBackgroundColour( colour ) ) return false; - if (!m_backgroundColour.Ok()) + if (!m_backgroundColour.IsOk()) return false; // change active background color too diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp index 3880012995..4886ce1fcc 100644 --- a/src/gtk/tglbtn.cpp +++ b/src/gtk/tglbtn.cpp @@ -45,157 +45,30 @@ wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ); // wxBitmapToggleButton // ------------------------------------------------------------------------ -IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton) bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, - const wxBitmap &label, const wxPoint &pos, + const wxBitmap &bitmap, const wxPoint &pos, const wxSize &size, long style, const wxValidator& validator, const wxString &name) { - if (!PreCreation(parent, pos, size) || - !CreateBase(parent, id, pos, size, style, validator, name )) - { - wxFAIL_MSG(wxT("wxBitmapToggleButton creation failed")); - return false; - } - - // Create the gtk widget. - m_widget = gtk_toggle_button_new(); - g_object_ref(m_widget); - - if (style & wxNO_BORDER) - gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); - - m_bitmap = label; - OnSetBitmap(); - - g_signal_connect (m_widget, "clicked", - G_CALLBACK (gtk_togglebutton_clicked_callback), - this); - - m_parent->DoAddChild(this); - - PostCreation(size); - - return true; -} - -void wxBitmapToggleButton::GTKDisableEvents() -{ - g_signal_handlers_block_by_func(m_widget, - (gpointer) gtk_togglebutton_clicked_callback, this); -} - -void wxBitmapToggleButton::GTKEnableEvents() -{ - g_signal_handlers_unblock_by_func(m_widget, - (gpointer) gtk_togglebutton_clicked_callback, this); -} - -// void SetValue(bool state) -// Set the value of the toggle button. -void wxBitmapToggleButton::SetValue(bool state) -{ - wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button")); - - if (state == GetValue()) - return; - - GTKDisableEvents(); - - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state); - - GTKEnableEvents(); -} - -// bool GetValue() const -// Get the value of the toggle button. -bool wxBitmapToggleButton::GetValue() const -{ - wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button")); - - return gtk_toggle_button_get_active((GtkToggleButton*)m_widget); -} - -void wxBitmapToggleButton::SetLabel(const wxBitmap& label) -{ - wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button")); - - m_bitmap = label; - InvalidateBestSize(); - - OnSetBitmap(); -} - -void wxBitmapToggleButton::OnSetBitmap() -{ - if (!m_bitmap.Ok()) return; - - GtkWidget* image = gtk_bin_get_child(GTK_BIN(m_widget)); - if (image == NULL) - { - image = gtk_image_new(); - gtk_widget_show(image); - gtk_container_add((GtkContainer*)m_widget, image); - } - // always use pixbuf, because pixmap mask does not - // work with disabled images in some themes - gtk_image_set_from_pixbuf((GtkImage*)image, m_bitmap.GetPixbuf()); -} - -bool wxBitmapToggleButton::Enable(bool enable /*=true*/) -{ - bool isEnabled = IsEnabled(); - - if (!wxControl::Enable(enable)) + if ( !wxToggleButton::Create(parent, id, wxEmptyString, pos, size, style | wxBU_NOTEXT | wxBU_EXACTFIT, + validator, name) ) return false; - gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); - - if (!isEnabled && enable) + if ( bitmap.IsOk() ) { - GTKFixSensitivity(); + SetBitmapLabel(bitmap); + + // we need to adjust the size after setting the bitmap as it may be too + // big for the default button size + SetInitialSize(size); } return true; } -void wxBitmapToggleButton::DoApplyWidgetStyle(GtkRcStyle *style) -{ - gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); -} - -GdkWindow * -wxBitmapToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return GTK_BUTTON(m_widget)->event_window; -} - -// Get the "best" size for this control. -wxSize wxBitmapToggleButton::DoGetBestSize() const -{ - wxSize best; - - if (m_bitmap.Ok()) - { - int border = HasFlag(wxNO_BORDER) ? 4 : 10; - best.x = m_bitmap.GetWidth()+border; - best.y = m_bitmap.GetHeight()+border; - } - CacheBestSize(best); - return best; -} - - -// static -wxVisualAttributes -wxBitmapToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new); -} - // ------------------------------------------------------------------------ // wxToggleButton @@ -216,11 +89,28 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, return false; } - // Create the gtk widget. - m_widget = gtk_toggle_button_new_with_mnemonic(""); + // create either a standard toggle button with text label (which may still contain + // an image under GTK+ 2.6+) or a bitmap-only toggle button if we don't have any + // label + const bool + useLabel = !(style & wxBU_NOTEXT) && !label.empty(); + if ( useLabel ) + { + m_widget = gtk_toggle_button_new_with_mnemonic(""); + } + else // no label, suppose we will have a bitmap + { + m_widget = gtk_toggle_button_new(); + + GtkWidget *image = gtk_image_new(); + gtk_widget_show(image); + gtk_container_add(GTK_CONTAINER(m_widget), image); + } + g_object_ref(m_widget); - SetLabel(label); + if ( useLabel ) + SetLabel(label); g_signal_connect (m_widget, "clicked", G_CALLBACK (gtk_togglebutton_clicked_callback), @@ -274,7 +164,7 @@ void wxToggleButton::SetLabel(const wxString& label) { wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button")); - wxControl::SetLabel(label); + wxAnyButton::SetLabel(label); const wxString labelGTK = GTKConvertMnemonics(label); @@ -283,18 +173,31 @@ void wxToggleButton::SetLabel(const wxString& label) GTKApplyWidgetStyle( false ); } -bool wxToggleButton::Enable(bool enable /*=true*/) +#if wxUSE_MARKUP +bool wxToggleButton::DoSetLabelMarkup(const wxString& markup) { - if (!base_type::Enable(enable)) + wxCHECK_MSG( m_widget != NULL, false, "invalid toggle button" ); + + const wxString stripped = RemoveMarkup(markup); + if ( stripped.empty() && !markup.empty() ) return false; - gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); + wxControl::SetLabel(stripped); - if (enable) - GTKFixSensitivity(); + GtkLabel * const label = GTKGetLabel(); + wxCHECK_MSG( label, false, "no label in this toggle button?" ); + + GTKSetLabelWithMarkupForLabel(label, markup); return true; } +#endif // wxUSE_MARKUP + +GtkLabel *wxToggleButton::GTKGetLabel() const +{ + GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); + return GTK_LABEL(child); +} void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style) { @@ -302,16 +205,10 @@ void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style) gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); } -GdkWindow * -wxToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const -{ - return GTK_BUTTON(m_widget)->event_window; -} - // Get the "best" size for this control. wxSize wxToggleButton::DoGetBestSize() const { - wxSize ret(wxControl::DoGetBestSize()); + wxSize ret(wxAnyButton::DoGetBestSize()); if (!HasFlag(wxBU_EXACTFIT)) { diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 03bf36695f..5062335525 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -713,6 +713,13 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, wxTopLevelWindowGTK::~wxTopLevelWindowGTK() { + if ( m_netFrameExtentsTimerId ) + { + // Don't let the timer callback fire as the window pointer passed to it + // will become invalid very soon. + g_source_remove(m_netFrameExtentsTimerId); + } + #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 // it can also be a (standard) dialog if ( HILDON_IS_WINDOW(m_widget) ) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 4ac089ebcc..82a20f8a58 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1145,6 +1145,10 @@ template void InitMouseEvent(wxWindowGTK *win, event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK) != 0; event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK) != 0; event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK) != 0; + + // In gdk/win32 VK_XBUTTON1 is translated to GDK_BUTTON4_MASK + // and VK_XBUTTON2 to GDK_BUTTON5_MASK. In x11/gdk buttons 4/5 + // are wheel rotation and buttons 8/9 don't change the state. event.m_aux1Down = (gdk_event->state & GDK_BUTTON4_MASK) != 0; event.m_aux2Down = (gdk_event->state & GDK_BUTTON5_MASK) != 0; @@ -1196,6 +1200,20 @@ static void AdjustEventButtonState(wxMouseEvent& event) event.m_rightDown = !event.m_rightDown; return; } + + if ((event.GetEventType() == wxEVT_AUX1_DOWN) || + (event.GetEventType() == wxEVT_AUX1_DCLICK)) + { + event.m_aux1Down = true; + return; + } + + if ((event.GetEventType() == wxEVT_AUX2_DOWN) || + (event.GetEventType() == wxEVT_AUX2_DCLICK)) + { + event.m_aux2Down = true; + return; + } } // find the window to send the mouse event too @@ -1425,6 +1443,42 @@ gtk_window_button_press_callback( GtkWidget *widget, } } + else if (gdk_event->button == 8) + { + switch (gdk_event->type) + { + case GDK_3BUTTON_PRESS: + case GDK_BUTTON_PRESS: + event_type = wxEVT_AUX1_DOWN; + break; + + case GDK_2BUTTON_PRESS: + event_type = wxEVT_AUX1_DCLICK; + break; + + default: + ; + } + } + + else if (gdk_event->button == 9) + { + switch (gdk_event->type) + { + case GDK_3BUTTON_PRESS: + case GDK_BUTTON_PRESS: + event_type = wxEVT_AUX2_DOWN; + break; + + case GDK_2BUTTON_PRESS: + event_type = wxEVT_AUX2_DCLICK; + break; + + default: + ; + } + } + if ( event_type == wxEVT_NULL ) { // unknown mouse button or click type @@ -1508,6 +1562,14 @@ gtk_window_button_release_callback( GtkWidget *WXUNUSED(widget), event_type = wxEVT_RIGHT_UP; break; + case 8: + event_type = wxEVT_AUX1_UP; + break; + + case 9: + event_type = wxEVT_AUX2_UP; + break; + default: // unknown button, don't process return FALSE; @@ -2038,6 +2100,7 @@ wxMouseState wxGetMouseState() ms.SetLeftDown((mask & GDK_BUTTON1_MASK) != 0); ms.SetMiddleDown((mask & GDK_BUTTON2_MASK) != 0); ms.SetRightDown((mask & GDK_BUTTON3_MASK) != 0); + // see the comment in InitMouseEvent() ms.SetAux1Down((mask & GDK_BUTTON4_MASK) != 0); ms.SetAux2Down((mask & GDK_BUTTON5_MASK) != 0); @@ -2886,7 +2949,7 @@ int wxWindowGTK::GetCharHeight() const wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") ); wxFont font = GetFont(); - wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") ); + wxCHECK_MSG( font.IsOk(), 12, wxT("invalid font") ); PangoContext* context = gtk_widget_get_pango_context(m_widget); @@ -2912,7 +2975,7 @@ int wxWindowGTK::GetCharWidth() const wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") ); wxFont font = GetFont(); - wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") ); + wxCHECK_MSG( font.IsOk(), 8, wxT("invalid font") ); PangoContext* context = gtk_widget_get_pango_context(m_widget); @@ -2942,7 +3005,7 @@ void wxWindowGTK::DoGetTextExtent( const wxString& string, { wxFont fontToUse = theFont ? *theFont : GetFont(); - wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); + wxCHECK_RET( fontToUse.IsOk(), wxT("invalid font") ); if (string.empty()) { @@ -3203,8 +3266,7 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase ) { wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") ); - wxWindowGTK *oldParent = m_parent, - *newParent = (wxWindowGTK *)newParentBase; + wxWindowGTK * const newParent = (wxWindowGTK *)newParentBase; wxASSERT( GTK_IS_WIDGET(m_widget) ); @@ -3213,8 +3275,11 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase ) wxASSERT( GTK_IS_WIDGET(m_widget) ); - if (oldParent) - gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(m_widget)), m_widget); + // Notice that old m_parent pointer might be non-NULL here but the widget + // still not have any parent at GTK level if it's a notebook page that had + // been removed from the notebook so test this at GTK level and not wx one. + if ( GtkWidget *parentGTK = gtk_widget_get_parent(m_widget) ) + gtk_container_remove(GTK_CONTAINER(parentGTK), m_widget); wxASSERT( GTK_IS_WIDGET(m_widget) ); @@ -3378,9 +3443,11 @@ void wxWindowGTK::RealizeTabOrder() { wxWindowGTK *win = *i; + bool focusableFromKeyboard = win->AcceptsFocusFromKeyboard(); + if ( mnemonicWindow ) { - if ( win->AcceptsFocusFromKeyboard() ) + if ( focusableFromKeyboard ) { // wxComboBox et al. needs to focus on on a different // widget than m_widget, so if the main widget isn't @@ -3405,7 +3472,8 @@ void wxWindowGTK::RealizeTabOrder() mnemonicWindow = win; } - chain = g_list_prepend(chain, win->m_widget); + if ( focusableFromKeyboard ) + chain = g_list_prepend(chain, win->m_widget); } chain = g_list_reverse(chain); @@ -3450,7 +3518,7 @@ void wxWindowGTK::Lower() bool wxWindowGTK::SetCursor( const wxCursor &cursor ) { - if ( !wxWindowBase::SetCursor(cursor.Ok() ? cursor : *wxSTANDARD_CURSOR) ) + if ( !wxWindowBase::SetCursor(cursor.IsOk() ? cursor : *wxSTANDARD_CURSOR) ) return false; GTKUpdateCursor(); @@ -3462,8 +3530,8 @@ void wxWindowGTK::GTKUpdateCursor(bool update_self /*=true*/, bool recurse /*=tr { if (update_self) { - wxCursor cursor(g_globalCursor.Ok() ? g_globalCursor : GetCursor()); - if ( cursor.Ok() ) + wxCursor cursor(g_globalCursor.IsOk() ? g_globalCursor : GetCursor()); + if ( cursor.IsOk() ) { wxArrayGdkWindows windowsThis; GdkWindow* window = GTKGetWindow(windowsThis); @@ -3795,7 +3863,7 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) if (!wxWindowBase::SetBackgroundColour(colour)) return false; - if (colour.Ok()) + if (colour.IsOk()) { // We need the pixel value e.g. for background clearing. m_backgroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); @@ -3817,7 +3885,7 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) return false; } - if (colour.Ok()) + if (colour.IsOk()) { // We need the pixel value e.g. for background clearing. m_foregroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); @@ -3839,15 +3907,15 @@ GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle) { // do we need to apply any changes at all? if ( !forceStyle && - !m_font.Ok() && - !m_foregroundColour.Ok() && !m_backgroundColour.Ok() ) + !m_font.IsOk() && + !m_foregroundColour.IsOk() && !m_backgroundColour.IsOk() ) { return NULL; } GtkRcStyle *style = gtk_rc_style_new(); - if ( m_font.Ok() ) + if ( m_font.IsOk() ) { style->font_desc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); @@ -3858,7 +3926,7 @@ GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle) flagsActive = 0, flagsInsensitive = 0; - if ( m_foregroundColour.Ok() ) + if ( m_foregroundColour.IsOk() ) { const GdkColor *fg = m_foregroundColour.GetColor(); @@ -3875,7 +3943,7 @@ GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle) flagsActive |= GTK_RC_FG | GTK_RC_TEXT; } - if ( m_backgroundColour.Ok() ) + if ( m_backgroundColour.IsOk() ) { const GdkColor *bg = m_backgroundColour.GetColor(); @@ -4129,7 +4197,7 @@ void wxWindowGTK::DoCaptureMouse() wxCHECK_RET( window, wxT("CaptureMouse() failed") ); const wxCursor* cursor = &m_cursor; - if (!cursor->Ok()) + if (!cursor->IsOk()) cursor = wxSTANDARD_CURSOR; gdk_pointer_grab( window, FALSE, diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 109450dc55..a16c5d4a5c 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -93,7 +93,7 @@ bool wxMask::Create( const wxBitmap& bitmap, } wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return false; + if (!image.IsOk()) return false; m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 ); GdkGC *gc = gdk_gc_new( m_bitmap ); @@ -198,7 +198,7 @@ bool wxMask::Create( const wxBitmap& bitmap ) m_bitmap = NULL; } - if (!bitmap.Ok()) return false; + if (!bitmap.IsOk()) return false; wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") ); @@ -407,7 +407,7 @@ wxBitmap::wxBitmap(const char* const* bits) wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy ) { - wxCHECK_MSG( Ok(), wxNullBitmap, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullBitmap, wxT("invalid bitmap") ); if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height) return *this; @@ -592,7 +592,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth) { UnRef(); - wxCHECK_MSG( image.Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") ); wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") ); if (image.GetWidth() <= 0 || image.GetHeight() <= 0) @@ -954,7 +954,7 @@ wxImage wxBitmap::ConvertToImage() const { wxImage image; - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); image.Create(GetWidth(), GetHeight()); unsigned char *data = image.GetData(); @@ -1136,35 +1136,35 @@ wxBitmap::~wxBitmap() int wxBitmap::GetHeight() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_height; } int wxBitmap::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_width; } int wxBitmap::GetDepth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_bpp; } wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_mask; } void wxBitmap::SetMask( wxMask *mask ) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); AllocExclusive(); if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; @@ -1180,13 +1180,13 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rect.x >= 0) && (rect.y >= 0) && (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height), wxNullBitmap, wxT("invalid bitmap or bitmap region") ); wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") ); if (ret.GetPixmap()) { @@ -1228,12 +1228,12 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); // Try to save the bitmap via wxImage handlers: { wxImage image = ConvertToImage(); - if (image.Ok()) return image.SaveFile( name, type ); + if (image.IsOk()) return image.SaveFile( name, type ); } return false; @@ -1275,7 +1275,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) else // try if wxImage can load it { wxImage image; - if ( !image.LoadFile( name, type ) || !image.Ok() ) + if ( !image.LoadFile( name, type ) || !image.IsOk() ) return false; *this = wxBitmap(image); @@ -1287,7 +1287,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) #if wxUSE_PALETTE wxPalette *wxBitmap::GetPalette() const { - if (!Ok()) + if (!IsOk()) return NULL; return M_BMPDATA->m_palette; @@ -1335,21 +1335,21 @@ void wxBitmap::SetBitmap( GdkPixmap *bitmap ) GdkPixmap *wxBitmap::GetPixmap() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_pixmap; } bool wxBitmap::HasPixmap() const { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); return M_BMPDATA->m_pixmap != NULL; } GdkBitmap *wxBitmap::GetBitmap() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_bitmap; } diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index d38da098ab..175e861c48 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -111,21 +111,21 @@ bool wxBrush::operator == ( const wxBrush& brush ) const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return &M_BRUSHDATA->m_stipple; } diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index 5d3dd8738c..e52bdc4b01 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -172,10 +172,10 @@ bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window ) void wxCheckBox::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (g_globalCursor.IsOk()) cursor = g_globalCursor; GdkWindow *event_window = TOGGLE_BUTTON_EVENT_WIN(m_widgetCheckbox); - if ( event_window && cursor.Ok() ) + if ( event_window && cursor.IsOk() ) { /* I now set the cursor the anew in every OnInternalIdle call as setting the cursor in a parent window also effects the diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index eb133b79e1..2057133fe5 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -182,42 +182,42 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); } unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); } unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); } void wxColour::CalcPixel( GdkColormap *cmap ) { - if (!Ok()) return; + if (!IsOk()) return; M_COLDATA->AllocColour( cmap ); } int wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") ); return &M_COLDATA->m_color; } diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index 50a08c7f90..b3e56ef837 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -374,7 +374,7 @@ void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) ) if (gs_busyCount++ > 0) return; - wxASSERT_MSG( !gs_savedCursor.Ok(), + wxASSERT_MSG( !gs_savedCursor.IsOk(), wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = g_globalCursor; diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 7fc4bb83dc..04fc4a4675 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -357,12 +357,12 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) m_bitmap = wxBitmap(image); - return m_bitmap.Ok(); + return m_bitmap.IsOk(); } void wxBitmapDataObject::DoConvertToPng() { - if ( !m_bitmap.Ok() ) + if ( !m_bitmap.IsOk() ) return; wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL, diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index 5b5774bbab..bff8a142c0 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -1004,7 +1004,7 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap, { wxCHECK_RET( IsOk(), wxT("invalid window dc") ); - wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( bitmap.IsOk(), wxT("invalid bitmap") ); bool is_mono = (bitmap.GetBitmap() != NULL); @@ -1160,7 +1160,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, if (srcDC->m_isMemDC) { - if (!memDC->m_selected.Ok()) return false; + if (!memDC->m_selected.IsOk()) return false; is_mono = (memDC->m_selected.GetDepth() == 1); @@ -1650,7 +1650,7 @@ void wxWindowDCImpl::SetPen( const wxPen &pen ) m_pen = pen; - if (!m_pen.Ok()) return; + if (!m_pen.IsOk()) return; if (!m_window) return; @@ -1800,7 +1800,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush ) m_brush = brush; - if (!m_brush.Ok()) return; + if (!m_brush.IsOk()) return; if (!m_window) return; @@ -1809,7 +1809,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush ) gdk_gc_set_fill( m_brushGC, GDK_SOLID ); - if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok())) + if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->IsOk())) { if (m_brush.GetStipple()->GetPixmap()) { @@ -1848,7 +1848,7 @@ void wxWindowDCImpl::SetBackground( const wxBrush &brush ) m_backgroundBrush = brush; - if (!m_backgroundBrush.Ok()) return; + if (!m_backgroundBrush.IsOk()) return; if (!m_window) return; @@ -1860,7 +1860,7 @@ void wxWindowDCImpl::SetBackground( const wxBrush &brush ) gdk_gc_set_fill( m_bgGC, GDK_SOLID ); - if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok())) + if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->IsOk())) { if (m_backgroundBrush.GetStipple()->GetPixmap()) { @@ -1937,7 +1937,7 @@ void wxWindowDCImpl::SetTextForeground( const wxColour &col ) // don't set m_textForegroundColour to an invalid colour as we'd crash // later then (we use m_textForegroundColour.GetColor() without checking // in a few places) - if ( !col.Ok() || (m_textForegroundColour == col) ) + if ( !col.IsOk() || (m_textForegroundColour == col) ) return; m_textForegroundColour = col; @@ -1954,7 +1954,7 @@ void wxWindowDCImpl::SetTextBackground( const wxColour &col ) wxCHECK_RET( IsOk(), wxT("invalid window dc") ); // same as above - if ( !col.Ok() || (m_textBackgroundColour == col) ) + if ( !col.IsOk() || (m_textBackgroundColour == col) ) return; m_textBackgroundColour = col; @@ -2103,7 +2103,7 @@ void wxWindowDCImpl::ComputeScaleAndOrigin() wxGTKDCImpl::ComputeScaleAndOrigin(); // if scale has changed call SetPen to recalulate the line width - if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.Ok() ) + if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() ) { // this is a bit artificial, but we need to force wxDC to think the pen // has changed diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index 18bc2d0975..90b866b034 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -43,7 +43,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) Destroy(); m_selected = bitmap; - if (m_selected.Ok()) + if (m_selected.IsOk()) { if (m_selected.GetPixmap()) { @@ -68,7 +68,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) void wxMemoryDCImpl::SetPen( const wxPen& penOrig ) { wxPen pen( penOrig ); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetBitmap() && (pen != *wxTRANSPARENT_PEN) ) { @@ -81,7 +81,7 @@ void wxMemoryDCImpl::SetPen( const wxPen& penOrig ) void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig ) { wxBrush brush( brushOrig ); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetBitmap() && (brush != *wxTRANSPARENT_BRUSH) ) { @@ -95,7 +95,7 @@ void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig ) { wxBrush brush(brushOrig); - if ( m_selected.Ok() && + if ( m_selected.IsOk() && m_selected.GetBitmap() && (brush != *wxTRANSPARENT_BRUSH) ) { @@ -107,7 +107,7 @@ void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig ) void wxMemoryDCImpl::SetTextForeground( const wxColour& col ) { - if ( m_selected.Ok() && m_selected.GetBitmap() ) + if ( m_selected.IsOk() && m_selected.GetBitmap() ) { wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE); } @@ -119,7 +119,7 @@ void wxMemoryDCImpl::SetTextForeground( const wxColour& col ) void wxMemoryDCImpl::SetTextBackground( const wxColour &col ) { - if (m_selected.Ok() && m_selected.GetBitmap()) + if (m_selected.IsOk() && m_selected.GetBitmap()) { wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE ); } @@ -131,7 +131,7 @@ void wxMemoryDCImpl::SetTextBackground( const wxColour &col ) void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const { - if (m_selected.Ok()) + if (m_selected.IsOk()) { if (width) (*width) = m_selected.GetWidth(); if (height) (*height) = m_selected.GetHeight(); diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index d21b31386a..42b4bc790b 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -777,11 +777,11 @@ void wxDropSource::SetIcons(const wxIcon &iconCopy, m_iconMove = iconMove; m_iconNone = iconNone; - if ( !m_iconCopy.Ok() ) + if ( !m_iconCopy.IsOk() ) m_iconCopy = wxIcon(page_xpm); - if ( !m_iconMove.Ok() ) + if ( !m_iconMove.IsOk() ) m_iconMove = m_iconCopy; - if ( !m_iconNone.Ok() ) + if ( !m_iconNone.IsOk() ) m_iconNone = m_iconCopy; } diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index c6a1888c16..735585d3d3 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -520,14 +520,14 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_pointSize; } wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->m_faceName; } @@ -539,28 +539,28 @@ wxFontFamily wxFont::DoGetFamily() const wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); return M_FONTDATA->m_style; } wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); return M_FONTDATA->m_weight; } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->m_underlined; } wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); // m_encoding is unused in wxGTK2, return encoding that the user set. return M_FONTDATA->m_encoding; @@ -568,7 +568,7 @@ wxFontEncoding wxFont::GetEncoding() const const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); if ( !M_FONTDATA->HasNativeFont() ) { @@ -583,7 +583,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const bool wxFont::IsFixedWidth() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); if ( M_FONTDATA->HasNativeFont() ) { @@ -696,7 +696,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const { GdkFont *font = NULL; - wxCHECK_MSG( Ok(), font, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), font, wxT("invalid font") ); long int_scale = long(scale * 100.0 + 0.5); // key for fontlist int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100); diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp index 4a26646450..5b9a04bba4 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/fontdlg.cpp @@ -148,7 +148,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent) GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); wxFont font = m_fontData.GetInitialFont(); - if( font.Ok() ) + if( font.IsOk() ) { const wxNativeFontInfo *info = font.GetNativeFontInfo(); diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index c0e55bae2a..a3bb9f6acf 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -1012,7 +1012,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { - if (m_hasBgCol && m_backgroundColour.Ok()) + if (m_hasBgCol && m_backgroundColour.IsOk()) { GdkWindow *window = GTK_WIDGET(m_list)->window; if ( window ) @@ -1039,9 +1039,9 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) void wxListBox::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (g_globalCursor.IsOk()) cursor = g_globalCursor; - if (GTK_WIDGET(m_list)->window && cursor.Ok()) + if (GTK_WIDGET(m_list)->window && cursor.IsOk()) { /* I now set the cursor the anew in every OnInternalIdle call as setting the cursor in a parent window also effects the diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 3a75190b66..e41086721f 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -976,7 +976,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) // TODO menuItem = gtk_menu_item_new(); } - else if (mitem->GetBitmap().Ok()) + else if (mitem->GetBitmap().IsOk()) { text = mitem->wxMenuItemBase::GetItemLabel(); const wxBitmap *bitmap = &mitem->GetBitmap(); diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp index 8fa09cd73f..64484abbee 100644 --- a/src/gtk1/pen.cpp +++ b/src/gtk1/pen.cpp @@ -182,7 +182,7 @@ void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple)) int wxPen::GetDashes( wxDash **ptr ) const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); *ptr = (wxDash*)M_PENDATA->m_dash; return M_PENDATA->m_countDashes; @@ -190,49 +190,49 @@ int wxPen::GetDashes( wxDash **ptr ) const int wxPen::GetDashCount() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return (M_PENDATA->m_countDashes); } wxDash* wxPen::GetDash() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return (wxDash*)M_PENDATA->m_dash; } wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_width; } wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp index 35c377163e..d07bbcdeea 100644 --- a/src/gtk1/radiobut.cpp +++ b/src/gtk1/radiobut.cpp @@ -180,10 +180,10 @@ bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window ) void wxRadioButton::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (g_globalCursor.IsOk()) cursor = g_globalCursor; GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget); - if ( win && cursor.Ok()) + if ( win && cursor.IsOk()) { /* I now set the cursor the anew in every OnInternalIdle call as setting the cursor in a parent window also effects the diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index d128d9f973..bc33b74551 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -219,7 +219,7 @@ bool wxRegion::DoUnionWithRegion( const wxRegion& region ) bool wxRegion::DoIntersect( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -238,7 +238,7 @@ bool wxRegion::DoIntersect( const wxRegion& region ) bool wxRegion::DoSubtract( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -257,7 +257,7 @@ bool wxRegion::DoSubtract( const wxRegion& region ) bool wxRegion::DoXor( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index 36ba1f63d6..815c1e0aee 100644 --- a/src/gtk1/settings.cpp +++ b/src/gtk1/settings.cpp @@ -165,7 +165,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_BTNFACE: case wxSYS_COLOUR_MENUBAR: case wxSYS_COLOUR_3DLIGHT: - if (!gs_objects.m_colBtnFace.Ok()) + if (!gs_objects.m_colBtnFace.IsOk()) { int red, green, blue; if ( !GetColourFromGTKWidget(red, green, blue) ) @@ -190,7 +190,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_BTNSHADOW: //case wxSYS_COLOUR_3DSHADOW: - if (!gs_objects.m_colBtnShadow.Ok()) + if (!gs_objects.m_colBtnShadow.IsOk()) { wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE)); gs_objects.m_colBtnShadow = @@ -206,7 +206,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) return * wxWHITE; case wxSYS_COLOUR_HIGHLIGHT: - if (!gs_objects.m_colHighlight.Ok()) + if (!gs_objects.m_colHighlight.IsOk()) { int red, green, blue; if ( !GetColourFromGTKWidget(red, green, blue, @@ -225,7 +225,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) return gs_objects.m_colHighlight; case wxSYS_COLOUR_LISTBOX: - if (!gs_objects.m_colListBox.Ok()) + if (!gs_objects.m_colListBox.IsOk()) { int red, green, blue; if ( GetColourFromGTKWidget(red, green, blue, @@ -250,7 +250,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_INACTIVECAPTIONTEXT: case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_LISTBOXTEXT: - if (!gs_objects.m_colBtnText.Ok()) + if (!gs_objects.m_colBtnText.IsOk()) { int red, green, blue; if ( !GetColourFromGTKWidget(red, green, blue, @@ -270,20 +270,20 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) return gs_objects.m_colBtnText; case wxSYS_COLOUR_INFOBK: - if (!gs_objects.m_colTooltip.Ok()) { + if (!gs_objects.m_colTooltip.IsOk()) { GetTooltipColors(); } return gs_objects.m_colTooltip; case wxSYS_COLOUR_INFOTEXT: - if (!gs_objects.m_colTooltipText.Ok()) { + if (!gs_objects.m_colTooltipText.IsOk()) { GetTooltipColors(); } return gs_objects.m_colTooltipText; case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT: - if (!gs_objects.m_colHighlightText.Ok()) + if (!gs_objects.m_colHighlightText.IsOk()) { wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT); if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) @@ -298,7 +298,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_MENUHILIGHT: - if (!gs_objects.m_colMenuItemHighlight.Ok()) + if (!gs_objects.m_colMenuItemHighlight.IsOk()) { int red, green, blue; if ( !GetColourFromGTKWidget(red, green, blue, @@ -346,7 +346,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) case wxSYS_DEVICE_DEFAULT_FONT: case wxSYS_DEFAULT_GUI_FONT: { - if (!gs_objects.m_fontSystem.Ok()) + if (!gs_objects.m_fontSystem.IsOk()) { gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); } diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp index 6437e2b3fb..c92e00c40c 100644 --- a/src/gtk1/statbmp.cpp +++ b/src/gtk1/statbmp.cpp @@ -54,10 +54,10 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_bitmap = bitmap; - wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm)); + wxBitmap bmp(bitmap.IsOk() ? bitmap : wxBitmap(bogus_xpm)); m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL); - if (bitmap.Ok()) + if (bitmap.IsOk()) SetBitmap(bitmap); PostCreation(size); @@ -70,7 +70,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap ) { m_bitmap = bitmap; - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { GdkBitmap *mask = NULL; if (m_bitmap.GetMask()) diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 1aa82a3fff..7ce0d35e3d 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -726,7 +726,7 @@ void wxTextCtrl::OnEnabled( bool WXUNUSED(enable) ) // disabled and enabled mode, or we end up with a different colour under the // text. wxColour oldColour = GetBackgroundColour(); - if (oldColour.Ok()) + if (oldColour.IsOk()) { // Need to set twice or it'll optimize the useful stuff out if (oldColour == * wxWHITE) @@ -1110,7 +1110,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) if (!m_widget->window) return false; - if (!m_backgroundColour.Ok()) + if (!m_backgroundColour.IsOk()) return false; if (m_windowStyle & wxTE_MULTILINE) @@ -1242,9 +1242,9 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) void wxTextCtrl::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (g_globalCursor.IsOk()) cursor = g_globalCursor; - if (cursor.Ok()) + if (cursor.IsOk()) { GdkWindow *window = NULL; if (HasFlag(wxTE_MULTILINE)) @@ -1255,7 +1255,7 @@ void wxTextCtrl::OnInternalIdle() if (window) gdk_window_set_cursor( window, cursor.GetCursor() ); - if (!g_globalCursor.Ok()) + if (!g_globalCursor.IsOk()) cursor = *wxSTANDARD_CURSOR; window = m_widget->window; diff --git a/src/gtk1/tglbtn.cpp b/src/gtk1/tglbtn.cpp index f54630f874..286f3fc478 100644 --- a/src/gtk1/tglbtn.cpp +++ b/src/gtk1/tglbtn.cpp @@ -81,7 +81,7 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id, if (style & wxNO_BORDER) gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { OnSetBitmap(); } @@ -134,7 +134,7 @@ void wxToggleBitmapButton::SetLabel(const wxBitmap& label) void wxToggleBitmapButton::OnSetBitmap() { - if (!m_bitmap.Ok()) return; + if (!m_bitmap.IsOk()) return; GdkBitmap *mask = NULL; if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); @@ -179,11 +179,11 @@ void wxToggleBitmapButton::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) + if (g_globalCursor.IsOk()) cursor = g_globalCursor; GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget); - if ( win && cursor.Ok() ) + if ( win && cursor.IsOk() ) { /* I now set the cursor the anew in every OnInternalIdle call as setting the cursor in a parent window also effects the @@ -203,7 +203,7 @@ wxSize wxToggleBitmapButton::DoGetBestSize() const { wxSize best; - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { int border = HasFlag(wxNO_BORDER) ? 4 : 10; best.x = m_bitmap.GetWidth()+border; @@ -320,11 +320,11 @@ void wxToggleButton::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) + if (g_globalCursor.IsOk()) cursor = g_globalCursor; GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget); - if ( win && cursor.Ok() ) + if ( win && cursor.IsOk() ) { /* I now set the cursor the anew in every OnInternalIdle call as setting the cursor in a parent window also effects the diff --git a/src/gtk1/toolbar.cpp b/src/gtk1/toolbar.cpp index 21ed937b0c..0ab3c6798b 100644 --- a/src/gtk1/toolbar.cpp +++ b/src/gtk1/toolbar.cpp @@ -122,7 +122,7 @@ public: void SetPixmap(const wxBitmap& bitmap) { - if (bitmap.Ok()) + if (bitmap.IsOk()) { GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap() : NULL; @@ -357,7 +357,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { wxBitmap bitmap = tool->GetNormalBitmap(); - wxCHECK_MSG( bitmap.Ok(), false, + wxCHECK_MSG( bitmap.IsOk(), false, wxT("invalid bitmap for wxToolBar icon") ); wxCHECK_MSG( bitmap.GetBitmap() == NULL, false, @@ -597,9 +597,9 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) void wxToolBar::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (g_globalCursor.IsOk()) cursor = g_globalCursor; - if (cursor.Ok()) + if (cursor.IsOk()) { /* I now set the cursor the anew in every OnInternalIdle call as setting the cursor in a parent window also effects the diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index 19067668d0..22364cdcdc 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -1100,7 +1100,7 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons ) return; wxIcon icon = icons.GetIcon(-1); - if (icon.Ok()) + if (icon.IsOk()) { wxMask *mask = icon.GetMask(); GdkBitmap *bm = NULL; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 58956c1c97..42a37b7df2 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2929,9 +2929,9 @@ void wxWindowGTK::OnInternalIdle() GtkUpdate(); wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (g_globalCursor.IsOk()) cursor = g_globalCursor; - if (cursor.Ok()) + if (cursor.IsOk()) { /* I now set the cursor anew in every OnInternalIdle call as setting the cursor in a parent window also effects the @@ -2944,7 +2944,7 @@ void wxWindowGTK::OnInternalIdle() if (window) gdk_window_set_cursor( window, cursor.GetCursor() ); - if (!g_globalCursor.Ok()) + if (!g_globalCursor.IsOk()) cursor = *wxSTANDARD_CURSOR; window = m_widget->window; @@ -3218,7 +3218,7 @@ int wxWindowGTK::GetCharHeight() const wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") ); wxFont font = GetFont(); - wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") ); + wxCHECK_MSG( font.IsOk(), 12, wxT("invalid font") ); GdkFont *gfont = font.GetInternalFont( 1.0 ); @@ -3230,7 +3230,7 @@ int wxWindowGTK::GetCharWidth() const wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") ); wxFont font = GetFont(); - wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") ); + wxCHECK_MSG( font.IsOk(), 8, wxT("invalid font") ); GdkFont *gfont = font.GetInternalFont( 1.0 ); @@ -3246,7 +3246,7 @@ void wxWindowGTK::DoGetTextExtent(const wxString& string, { wxFont fontToUse = theFont ? *theFont : GetFont(); - wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); + wxCHECK_RET( fontToUse.IsOk(), wxT("invalid font") ); if (string.empty()) { @@ -3697,7 +3697,7 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) if (!wxWindowBase::SetBackgroundColour(colour)) return false; - if (colour.Ok()) + if (colour.IsOk()) { // We need the pixel value e.g. for background clearing. m_backgroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); @@ -3720,7 +3720,7 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) return false; } - if (colour.Ok()) + if (colour.IsOk()) { // We need the pixel value e.g. for background clearing. m_foregroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); @@ -3737,21 +3737,21 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) { // do we need to apply any changes at all? if ( !forceStyle && - !m_font.Ok() && - !m_foregroundColour.Ok() && !m_backgroundColour.Ok() ) + !m_font.IsOk() && + !m_foregroundColour.IsOk() && !m_backgroundColour.IsOk() ) { return NULL; } GtkRcStyle *style = gtk_rc_style_new(); - if ( m_font.Ok() ) + if ( m_font.IsOk() ) { wxString xfontname = m_font.GetNativeFontInfo()->GetXFontName(); style->fontset_name = g_strdup(xfontname.c_str()); } - if ( m_foregroundColour.Ok() ) + if ( m_foregroundColour.IsOk() ) { GdkColor *fg = m_foregroundColour.GetColor(); @@ -3765,7 +3765,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) style->color_flags[GTK_STATE_ACTIVE] = GTK_RC_FG; } - if ( m_backgroundColour.Ok() ) + if ( m_backgroundColour.IsOk() ) { GdkColor *bg = m_backgroundColour.GetColor(); @@ -3913,7 +3913,7 @@ void wxWindowGTK::DoCaptureMouse() wxCHECK_RET( window, wxT("CaptureMouse() failed") ); const wxCursor* cursor = &m_cursor; - if (!cursor->Ok()) + if (!cursor->IsOk()) cursor = wxSTANDARD_CURSOR; gdk_pointer_grab( window, FALSE, diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index 05a0f65f2b..d10ee5b627 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -58,7 +58,7 @@ #include "wx/spinctrl.h" // what is considered "small index"? -#define INDEX_IS_SMALL 100 +#define INDEX_IS_SMALL 1000 /* Motif defines this as a macro */ #ifdef Below @@ -361,7 +361,7 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id, if (htmlWindowBorder == wxBORDER_SUNKEN) htmlWindowBorder = wxBORDER_SIMPLE; #else - wxBorder htmlWindowBorder = wxBORDER_SIMPLE; + wxBorder htmlWindowBorder = wxBORDER_SUNKEN; #endif if (helpStyle & (wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH)) @@ -658,11 +658,11 @@ void wxHtmlHelpWindow::AddToolbarButtons(wxToolBar *toolBar, int style) wxBitmap woptionsBitmap = wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_TOOLBAR); - wxASSERT_MSG( (wpanelBitmap.Ok() && wbackBitmap.Ok() && - wforwardBitmap.Ok() && wupnodeBitmap.Ok() && - wupBitmap.Ok() && wdownBitmap.Ok() && - wopenBitmap.Ok() && wprintBitmap.Ok() && - woptionsBitmap.Ok()), + wxASSERT_MSG( (wpanelBitmap.IsOk() && wbackBitmap.IsOk() && + wforwardBitmap.IsOk() && wupnodeBitmap.IsOk() && + wupBitmap.IsOk() && wdownBitmap.IsOk() && + wopenBitmap.IsOk() && wprintBitmap.IsOk() && + woptionsBitmap.IsOk()), wxT("One or more HTML help frame toolbar bitmap could not be loaded.")) ; diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index f79224c539..50e178a6da 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -205,7 +205,7 @@ wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) const // wxHtmlCell::GetCursor() method simply returns wxNullCursor, so we // know that GetCursor() was overridden iff it returns valid cursor. wxCursor cur = GetCursor(); - if (cur.Ok()) + if (cur.IsOk()) return cur; #endif // WXWIN_COMPATIBILITY_2_6 diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 4ce2e3b80a..9becb22f5b 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -695,7 +695,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr // Pass two printout objects: for preview, and possible printing. wxPrintDialogData printDialogData(*GetPrintData()); wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData); - if (!preview->Ok()) + if (!preview->IsOk()) { delete preview; return false; @@ -731,7 +731,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) void wxHtmlEasyPrinting::PageSetup() { - if (!GetPrintData()->Ok()) + if (!GetPrintData()->IsOk()) { wxLogError(_("There was a problem during page setup: you may need to set a default printer.")); return; diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index 423ecf7bf5..60fee4e25e 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -417,7 +417,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface, #endif // wxUSE_GIF && wxUSE_TIMER { wxImage image(*s, wxBITMAP_TYPE_ANY); - if ( image.Ok() ) + if ( image.IsOk() ) SetImage(image); } } @@ -446,7 +446,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface, void wxHtmlImageCell::SetImage(const wxImage& img) { #if !defined(__WXMSW__) || wxUSE_WXDIB - if ( img.Ok() ) + if ( img.IsOk() ) { delete m_bitmap; diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index b373e85a9d..c54b437c86 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -340,7 +340,7 @@ TAG_HANDLER_BEGIN(BODY, "BODY") if ( is ) { wxImage image(*is); - if ( image.Ok() ) + if ( image.IsOk() ) winIface->SetHTMLBackgroundImage(image); } diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 078525080b..7bca5a4c3f 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -135,7 +135,7 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t if (tag.HasParam(wxT("BGCOLOR"))) { tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg); - if (m_tBkg.Ok()) + if (m_tBkg.IsOk()) SetBackgroundColour(m_tBkg); } if (tag.HasParam(wxT("VALIGN"))) @@ -344,7 +344,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) wxColour bk = m_rBkg; if (tag.HasParam(wxT("BGCOLOR"))) tag.GetParamAsColour(wxT("BGCOLOR"), &bk); - if (bk.Ok()) + if (bk.IsOk()) cell->SetBackgroundColour(bk); } if (m_Border > 0) diff --git a/src/jpeg/jpegM8.xml b/src/jpeg/jpegM8.xml deleted file mode 100755 index 8800595420..0000000000 --- a/src/jpeg/jpegM8.xml +++ /dev/null @@ -1,3328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - PPC - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnamePPC - OutputDirectory - Path:::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.bh - CompilerBalloon Help - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.p - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pas - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ppu - CompilerMW Pascal PPC - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.s - CompilerPPCAsm - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilejpeg_PPC.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfilejpeg_PPC.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - jcapimin.c - MacOS - Text - - - - Name - jcapistd.c - MacOS - Text - - - - Name - jccoefct.c - MacOS - Text - - - - Name - jccolor.c - MacOS - Text - - - - Name - jcdctmgr.c - MacOS - Text - - - - Name - jchuff.c - MacOS - Text - - - - Name - jcinit.c - MacOS - Text - - - - Name - jcmainct.c - MacOS - Text - - - - Name - jcmarker.c - MacOS - Text - - - - Name - jcmaster.c - MacOS - Text - - - - Name - jcomapi.c - MacOS - Text - - - - Name - jcparam.c - MacOS - Text - - - - Name - jcphuff.c - MacOS - Text - - - - Name - jcprepct.c - MacOS - Text - - - - Name - jcsample.c - MacOS - Text - - - - Name - jctrans.c - MacOS - Text - - - - Name - jdapimin.c - MacOS - Text - - - - Name - jdapistd.c - MacOS - Text - - - - Name - jdatadst.c - MacOS - Text - - - - Name - jdatasrc.c - MacOS - Text - - - - Name - jdcoefct.c - MacOS - Text - - - - Name - jdcolor.c - MacOS - Text - - - - Name - jddctmgr.c - MacOS - Text - - - - Name - jdhuff.c - MacOS - Text - - - - Name - jdinput.c - MacOS - Text - - - - Name - jdmainct.c - MacOS - Text - - - - Name - jdmarker.c - MacOS - Text - - - - Name - jdmaster.c - MacOS - Text - - - - Name - jdmerge.c - MacOS - Text - - - - Name - jdphuff.c - MacOS - Text - - - - Name - jdpostct.c - MacOS - Text - - - - Name - jdsample.c - MacOS - Text - - - - Name - jdtrans.c - MacOS - Text - - - - Name - jerror.c - MacOS - Text - - - - Name - jfdctflt.c - MacOS - Text - - - - Name - jfdctint.c - MacOS - Text - - - - Name - jfdctfst.c - MacOS - Text - - - - Name - jidctflt.c - MacOS - Text - - - - Name - jidctfst.c - MacOS - Text - - - - Name - jidctint.c - MacOS - Text - - - - Name - jidctred.c - MacOS - Text - - - - Name - jmemmgr.c - MacOS - Text - - - - Name - jquant1.c - MacOS - Text - - - - Name - jquant2.c - MacOS - Text - - - - Name - jutils.c - MacOS - Text - - - - Name - jmemmac.c - MacOS - Text - - - - - - Name - jcapimin.c - MacOS - - - Name - jcapistd.c - MacOS - - - Name - jccoefct.c - MacOS - - - Name - jccolor.c - MacOS - - - Name - jcdctmgr.c - MacOS - - - Name - jchuff.c - MacOS - - - Name - jcinit.c - MacOS - - - Name - jcmainct.c - MacOS - - - Name - jcmarker.c - MacOS - - - Name - jcmaster.c - MacOS - - - Name - jcomapi.c - MacOS - - - Name - jcparam.c - MacOS - - - Name - jcphuff.c - MacOS - - - Name - jcprepct.c - MacOS - - - Name - jcsample.c - MacOS - - - Name - jctrans.c - MacOS - - - Name - jdapimin.c - MacOS - - - Name - jdapistd.c - MacOS - - - Name - jdatadst.c - MacOS - - - Name - jdatasrc.c - MacOS - - - Name - jdcoefct.c - MacOS - - - Name - jdcolor.c - MacOS - - - Name - jddctmgr.c - MacOS - - - Name - jdhuff.c - MacOS - - - Name - jdinput.c - MacOS - - - Name - jdmainct.c - MacOS - - - Name - jdmarker.c - MacOS - - - Name - jdmaster.c - MacOS - - - Name - jdmerge.c - MacOS - - - Name - jdphuff.c - MacOS - - - Name - jdpostct.c - MacOS - - - Name - jdsample.c - MacOS - - - Name - jdtrans.c - MacOS - - - Name - jerror.c - MacOS - - - Name - jfdctflt.c - MacOS - - - Name - jfdctint.c - MacOS - - - Name - jfdctfst.c - MacOS - - - Name - jidctflt.c - MacOS - - - Name - jidctfst.c - MacOS - - - Name - jidctint.c - MacOS - - - Name - jidctred.c - MacOS - - - Name - jmemmgr.c - MacOS - - - Name - jquant1.c - MacOS - - - Name - jquant2.c - MacOS - - - Name - jutils.c - MacOS - - - Name - jmemmac.c - MacOS - - - - - Mach-O - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMacOS X Support/Headers/(wchar_t Support fix) - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Pathusr/include - PathFormatUnix - PathRootOS X Volume - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMSL/MSL_C - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMSL/MSL_C++ - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMacOS X Support - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Pathusr/lib - PathFormatUnix - PathRootOS X Volume - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathSystem/Library/Frameworks - PathFormatUnix - PathRootOS X Volume - - Recursivefalse - FrameworkPathtrue - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS X PPC Linker - PreLinker - PostLinker - TargetnameMach-O - OutputDirectory - Path:::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMDYL - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMLIB - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.arr - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.axp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.h++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.hpp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.lcf - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.m - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.mm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pchm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pchmm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.plc - CompilerProperty List Compiler - EditLanguageProperty List - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ploc - CompilerProperty List Compiler - EditLanguageProperty List - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.wke - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.a - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.dylib - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.gif - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.icns - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.jpg - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.nib - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.pl - CompilerPerl Tool - EditLanguagePerl - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.plist - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.psh - CompilerShell Tool - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.sh - CompilerShell Tool - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.strings - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.tiff - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilejpeg_MACH.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfilejpeg_PPC.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - jcapimin.c - MacOS - Text - - - - Name - jcapistd.c - MacOS - Text - - - - Name - jccoefct.c - MacOS - Text - - - - Name - jccolor.c - MacOS - Text - - - - Name - jcdctmgr.c - MacOS - Text - - - - Name - jchuff.c - MacOS - Text - - - - Name - jcinit.c - MacOS - Text - - - - Name - jcmainct.c - MacOS - Text - - - - Name - jcmarker.c - MacOS - Text - - - - Name - jcmaster.c - MacOS - Text - - - - Name - jcomapi.c - MacOS - Text - - - - Name - jcparam.c - MacOS - Text - - - - Name - jcphuff.c - MacOS - Text - - - - Name - jcprepct.c - MacOS - Text - - - - Name - jcsample.c - MacOS - Text - - - - Name - jctrans.c - MacOS - Text - - - - Name - jdapimin.c - MacOS - Text - - - - Name - jdapistd.c - MacOS - Text - - - - Name - jdatadst.c - MacOS - Text - - - - Name - jdatasrc.c - MacOS - Text - - - - Name - jdcoefct.c - MacOS - Text - - - - Name - jdcolor.c - MacOS - Text - - - - Name - jddctmgr.c - MacOS - Text - - - - Name - jdhuff.c - MacOS - Text - - - - Name - jdinput.c - MacOS - Text - - - - Name - jdmainct.c - MacOS - Text - - - - Name - jdmarker.c - MacOS - Text - - - - Name - jdmaster.c - MacOS - Text - - - - Name - jdmerge.c - MacOS - Text - - - - Name - jdphuff.c - MacOS - Text - - - - Name - jdpostct.c - MacOS - Text - - - - Name - jdsample.c - MacOS - Text - - - - Name - jdtrans.c - MacOS - Text - - - - Name - jerror.c - MacOS - Text - - - - Name - jfdctflt.c - MacOS - Text - - - - Name - jfdctint.c - MacOS - Text - - - - Name - jfdctfst.c - MacOS - Text - - - - Name - jidctflt.c - MacOS - Text - - - - Name - jidctfst.c - MacOS - Text - - - - Name - jidctint.c - MacOS - Text - - - - Name - jidctred.c - MacOS - Text - - - - Name - jmemmgr.c - MacOS - Text - - - - Name - jquant1.c - MacOS - Text - - - - Name - jquant2.c - MacOS - Text - - - - Name - jutils.c - MacOS - Text - - - - Name - jmemmac.c - MacOS - Text - - - - - - Name - jcapimin.c - MacOS - - - Name - jcapistd.c - MacOS - - - Name - jccoefct.c - MacOS - - - Name - jccolor.c - MacOS - - - Name - jcdctmgr.c - MacOS - - - Name - jchuff.c - MacOS - - - Name - jcinit.c - MacOS - - - Name - jcmainct.c - MacOS - - - Name - jcmarker.c - MacOS - - - Name - jcmaster.c - MacOS - - - Name - jcomapi.c - MacOS - - - Name - jcparam.c - MacOS - - - Name - jcphuff.c - MacOS - - - Name - jcprepct.c - MacOS - - - Name - jcsample.c - MacOS - - - Name - jctrans.c - MacOS - - - Name - jdapimin.c - MacOS - - - Name - jdapistd.c - MacOS - - - Name - jdatadst.c - MacOS - - - Name - jdatasrc.c - MacOS - - - Name - jdcoefct.c - MacOS - - - Name - jdcolor.c - MacOS - - - Name - jddctmgr.c - MacOS - - - Name - jdhuff.c - MacOS - - - Name - jdinput.c - MacOS - - - Name - jdmainct.c - MacOS - - - Name - jdmarker.c - MacOS - - - Name - jdmaster.c - MacOS - - - Name - jdmerge.c - MacOS - - - Name - jdphuff.c - MacOS - - - Name - jdpostct.c - MacOS - - - Name - jdsample.c - MacOS - - - Name - jdtrans.c - MacOS - - - Name - jerror.c - MacOS - - - Name - jfdctflt.c - MacOS - - - Name - jfdctint.c - MacOS - - - Name - jfdctfst.c - MacOS - - - Name - jidctflt.c - MacOS - - - Name - jidctfst.c - MacOS - - - Name - jidctint.c - MacOS - - - Name - jidctred.c - MacOS - - - Name - jmemmgr.c - MacOS - - - Name - jquant1.c - MacOS - - - Name - jquant2.c - MacOS - - - Name - jutils.c - MacOS - - - Name - jmemmac.c - MacOS - - - - - - Name - Carbon.framework - Unix - - Carbon - - - - - - - PPC - Mach-O - - - - - PPC - Name - jcapimin.c - MacOS - - - PPC - Name - jcapistd.c - MacOS - - - PPC - Name - jccoefct.c - MacOS - - - PPC - Name - jccolor.c - MacOS - - - PPC - Name - jcdctmgr.c - MacOS - - - PPC - Name - jchuff.c - MacOS - - - PPC - Name - jcinit.c - MacOS - - - PPC - Name - jcmainct.c - MacOS - - - PPC - Name - jcmarker.c - MacOS - - - PPC - Name - jcmaster.c - MacOS - - - PPC - Name - jcomapi.c - MacOS - - - PPC - Name - jcparam.c - MacOS - - - PPC - Name - jcphuff.c - MacOS - - - PPC - Name - jcprepct.c - MacOS - - - PPC - Name - jcsample.c - MacOS - - - PPC - Name - jctrans.c - MacOS - - - PPC - Name - jdapimin.c - MacOS - - - PPC - Name - jdapistd.c - MacOS - - - PPC - Name - jdatadst.c - MacOS - - - PPC - Name - jdatasrc.c - MacOS - - - PPC - Name - jdcoefct.c - MacOS - - - PPC - Name - jdcolor.c - MacOS - - - PPC - Name - jddctmgr.c - MacOS - - - PPC - Name - jdhuff.c - MacOS - - - PPC - Name - jdinput.c - MacOS - - - PPC - Name - jdmainct.c - MacOS - - - PPC - Name - jdmarker.c - MacOS - - - PPC - Name - jdmaster.c - MacOS - - - PPC - Name - jdmerge.c - MacOS - - - PPC - Name - jdphuff.c - MacOS - - - PPC - Name - jdpostct.c - MacOS - - - PPC - Name - jdsample.c - MacOS - - - PPC - Name - jdtrans.c - MacOS - - - PPC - Name - jerror.c - MacOS - - - PPC - Name - jfdctflt.c - MacOS - - - PPC - Name - jfdctint.c - MacOS - - - PPC - Name - jfdctfst.c - MacOS - - - PPC - Name - jidctflt.c - MacOS - - - PPC - Name - jidctfst.c - MacOS - - - PPC - Name - jidctint.c - MacOS - - - PPC - Name - jidctred.c - MacOS - - - PPC - Name - jmemmac.c - MacOS - - - PPC - Name - jmemmgr.c - MacOS - - - PPC - Name - jquant1.c - MacOS - - - PPC - Name - jquant2.c - MacOS - - - PPC - Name - jutils.c - MacOS - - - - diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp index 5cf71c1672..bae5a0c596 100644 --- a/src/mgl/bitmap.cpp +++ b/src/mgl/bitmap.cpp @@ -198,14 +198,14 @@ bool wxBitmap::Create(int width, int height, int depth) SetMonoPalette(wxColour(255, 255, 255), wxColour(0, 0, 0)); } - return Ok(); + return IsOk(); } wxBitmap::wxBitmap(const wxImage& image, int depth) { long width, height; - wxCHECK_RET( image.Ok(), wxT("invalid image") ); + wxCHECK_RET( image.IsOk(), wxT("invalid image") ); width = image.GetWidth(); height = image.GetHeight(); @@ -237,14 +237,14 @@ wxBitmap::wxBitmap(const wxImage& image, int depth) wxImage wxBitmap::ConvertToImage() const { - wxCHECK_MSG( Ok(), wxImage(), wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxImage(), wxT("invalid bitmap") ); int width, height; width = GetWidth(); height = GetHeight(); wxImage image(width, height); - wxASSERT_MSG( image.Ok(), wxT("cannot create image") ); + wxASSERT_MSG( image.IsOk(), wxT("cannot create image") ); MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage, width * 3, (void*)image.GetData(), NULL); @@ -299,35 +299,35 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) int wxBitmap::GetHeight() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_height; } int wxBitmap::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_width; } int wxBitmap::GetDepth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_bpp; } wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_mask; } void wxBitmap::SetMask(wxMask *mask) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); AllocExclusive(); delete M_BMPDATA->m_mask; @@ -343,13 +343,13 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rect.x >= 0) && (rect.y >= 0) && (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height), wxNullBitmap, wxT("invalid bitmap or bitmap region") ); wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") ); if ( GetPalette() ) ret.SetPalette(*GetPalette()); @@ -371,7 +371,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const void wxBitmap::SetMonoPalette(const wxColour& fg, const wxColour& bg) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); AllocExclusive(); palette_t *mono = M_BMPDATA->m_bitmap->pal; @@ -394,7 +394,7 @@ void wxBitmap::SetMonoPalette(const wxColour& fg, const wxColour& bg) MGLDevCtx *wxBitmap::CreateTmpDC() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); MGLDevCtx *tdc = new MGLMemoryDC(GetWidth(), GetHeight(), M_BMPDATA->m_bitmap->bitsPerPixel, @@ -446,7 +446,7 @@ bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type) if ( handler == NULL ) { wxImage image; - if ( !image.LoadFile(name, type) || !image.Ok() ) + if ( !image.LoadFile(name, type) || !image.IsOk() ) { wxLogError("no bitmap handler for type %d defined.", type); return false; @@ -463,7 +463,7 @@ bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type) bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPalette *palette) const { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); wxBitmapHandler *handler = FindHandler(type); @@ -473,7 +473,7 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPal if ( palette ) image.SetPalette(*palette); - if ( image.Ok() ) + if ( image.IsOk() ) return image.SaveFile(filename, type); else { @@ -487,20 +487,20 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPal wxPalette *wxBitmap::GetPalette() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_palette; } void wxBitmap::SetPalette(const wxPalette& palette) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth") ); AllocExclusive(); wxDELETE(M_BMPDATA->m_palette); - if ( !palette.Ok() ) return; + if ( !palette.IsOk() ) return; M_BMPDATA->m_palette = new wxPalette(palette); @@ -614,7 +614,7 @@ bool wxMGLBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, if ( !MGL_getBitmapSize(fullname.mb_str(), &width, &height, &bpp, &pf) ) return false; bitmap->Create(width, height, -1); - if ( !bitmap->Ok() ) return false; + if ( !bitmap->IsOk() ) return false; dc.SelectObject(*bitmap); if ( !dc.GetMGLDC()->loadBitmapIntoDC(fullname.mb_str(), 0, 0, TRUE) ) return false; @@ -625,7 +625,7 @@ bool wxMGLBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, if ( !MGL_getJPEGSize(fullname.mb_str(), &width, &height, &bpp, &pf) ) return false; bitmap->Create(width, height, -1); - if ( !bitmap->Ok() ) return false; + if ( !bitmap->IsOk() ) return false; dc.SelectObject(*bitmap); if ( !dc.GetMGLDC()->loadJPEGIntoDC(fullname.mb_str(), 0, 0, TRUE) ) return false; @@ -636,7 +636,7 @@ bool wxMGLBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, if ( !MGL_getPNGSize(fullname.mb_str(), &width, &height, &bpp, &pf) ) return false; bitmap->Create(width, height, -1); - if ( !bitmap->Ok() ) return false; + if ( !bitmap->IsOk() ) return false; dc.SelectObject(*bitmap); if ( !dc.GetMGLDC()->loadPNGIntoDC(fullname.mb_str(), 0, 0, TRUE) ) return false; @@ -647,7 +647,7 @@ bool wxMGLBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, if ( !MGL_getPCXSize(fullname.mb_str(), &width, &height, &bpp) ) return false; bitmap->Create(width, height, -1); - if ( !bitmap->Ok() ) return false; + if ( !bitmap->IsOk() ) return false; dc.SelectObject(*bitmap); if ( !dc.GetMGLDC()->loadPCXIntoDC(fullname.mb_str(), 0, 0, TRUE) ) return false; @@ -732,7 +732,7 @@ bool wxPNGBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, if ( bmp == NULL ) return false; bitmap->Create(bmp->width, bmp->height, -1); - if ( !bitmap->Ok() ) return false; + if ( !bitmap->IsOk() ) return false; // convert bmp to display's depth and write it to *bitmap: wxMemoryDC dc; diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index a03abbfb1c..a00c6ec8b6 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -144,7 +144,7 @@ wxBrush::wxBrush(const wxColour& col, int style) wxBrush::wxBrush(const wxBitmap &stippleBitmap) { - wxCHECK_RET( stippleBitmap.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( stippleBitmap.IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8, wxT("stipple bitmap must be 8x8") ); @@ -177,35 +177,35 @@ bool wxBrush::operator != (const wxBrush& brush) const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return &M_BRUSHDATA->m_stipple; } void* wxBrush::GetMaskPattern() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return (void*)&(M_BRUSHDATA->m_maskPattern); } void* wxBrush::GetPixPattern() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return (void*)&(M_BRUSHDATA->m_pixPattern); } @@ -232,7 +232,7 @@ void wxBrush::SetStipple(const wxBitmap& stipple) { AllocExclusive(); - wxCHECK_RET( stipple.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, wxT("stipple bitmap must be 8x8") ); diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp index 7f99c1e987..8832eff0e7 100644 --- a/src/mgl/cursor.cpp +++ b/src/mgl/cursor.cpp @@ -180,7 +180,7 @@ static wxCursor gs_globalCursor = wxNullCursor; void wxSetCursor(const wxCursor& cursor) { - if ( cursor.Ok() ) + if ( cursor.IsOk() ) { if ( g_winMng ) MGL_wmSetGlobalCursor(g_winMng, *cursor.GetMGLCursor()); @@ -225,11 +225,11 @@ void wxBeginBusyCursor(const wxCursor *cursor) { if ( gs_busyCount++ > 0 ) return; - wxASSERT_MSG( !gs_savedCursor.Ok(), + wxASSERT_MSG( !gs_savedCursor.IsOk(), wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = gs_globalCursor; - if ( cursor->Ok() ) + if ( cursor->IsOk() ) wxSetCursor(*cursor); else wxSetCursor(wxCursor(wxCURSOR_WAIT)); diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp index 5af342f8b7..40766b5af5 100644 --- a/src/mgl/dc.cpp +++ b/src/mgl/dc.cpp @@ -205,7 +205,7 @@ void wxDC::InitializeMGLDC() void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); wxRect rect(XLOG2DEV(cx), YLOG2DEV(cy), XLOG2DEVREL(cw), YLOG2DEVREL(ch)); @@ -222,7 +222,7 @@ void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch) void wxDC::DoSetDeviceClippingRegion(const wxRegion& region) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( region.IsEmpty() ) { @@ -262,7 +262,7 @@ void wxDC::DoSetDeviceClippingRegion(const wxRegion& region) void wxDC::DestroyClippingRegion() { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( !m_globalClippingRegion.IsNull() ) { @@ -303,7 +303,7 @@ int wxDC::GetDepth() const void wxDC::Clear() { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); m_MGLDC->makeCurrent(); // will go away with MGL6.0 if ( m_backgroundBrush.GetStyle() != wxTRANSPARENT ) @@ -340,7 +340,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const void wxDC::DoCrossHair(wxCoord x, wxCoord y) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( m_pen.GetStyle() != wxTRANSPARENT ) { @@ -361,7 +361,7 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y) void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( m_pen.GetStyle() != wxTRANSPARENT ) { @@ -381,7 +381,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); wxCoord xx1 = XLOG2DEV(x1); wxCoord yy1 = YLOG2DEV(y1); @@ -440,7 +440,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, void wxDC::DoDrawPoint(wxCoord x, wxCoord y) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( m_pen.GetStyle() != wxTRANSPARENT ) { @@ -454,7 +454,7 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y) void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,wxPolygonFillMode WXUNUSED(fillStyle)) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); wxCoord xxoffset = XLOG2DEVREL(xoffset), yyoffset = YLOG2DEVREL(yoffset); @@ -495,7 +495,7 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( m_pen.GetStyle() != wxTRANSPARENT ) { @@ -516,7 +516,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); wxCoord xx = XLOG2DEV(x); wxCoord yy = YLOG2DEV(y); @@ -559,7 +559,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( radius < 0.0 ) radius = -radius * ((width < height) ? width : height); @@ -635,7 +635,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); wxCoord x2 = (x+width); wxCoord y2 = (y+height); @@ -664,7 +664,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); wxCoord x2 = (x+w); wxCoord y2 = (y+h); @@ -736,7 +736,7 @@ bool wxDC::SelectMGLFont() void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); SelectMGLFont(); @@ -999,7 +999,7 @@ void wxDC::SelectMGLFatPen(int style, int flag) void wxDC::SelectPen() { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); wxColour& clr = m_pen.GetColour(); m_MGLDC->makeCurrent(); // will go away with MGL6.0 @@ -1045,7 +1045,7 @@ void wxDC::SelectPen() void wxDC::SelectBrush() { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); wxColour fg, bg; m_MGLDC->makeCurrent(); // will go away with MGL6.0 @@ -1071,7 +1071,7 @@ void wxDC::SelectBrush() void wxDC::SetPen(const wxPen& pen) { - if ( !pen.Ok() ) return; + if ( !pen.IsOk() ) return; if ( m_pen == pen ) return; m_pen = pen; m_penSelected = false; @@ -1080,7 +1080,7 @@ void wxDC::SetPen(const wxPen& pen) void wxDC::SetBrush(const wxBrush& brush) { - if ( !brush.Ok() ) return; + if ( !brush.IsOk() ) return; if ( m_brush == brush ) return; m_brush = brush; m_brushSelected = false; @@ -1089,11 +1089,11 @@ void wxDC::SetBrush(const wxBrush& brush) void wxDC::SetPalette(const wxPalette& palette) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); - if ( !palette.Ok() ) + if ( !palette.IsOk() ) { - if ( m_oldPalette.Ok() ) + if ( m_oldPalette.IsOk() ) SetPalette(m_oldPalette); return; } @@ -1112,7 +1112,7 @@ void wxDC::SetPalette(const wxPalette& palette) void wxDC::SetFont(const wxFont& font) { - if ( font.Ok() ) + if ( font.IsOk() ) { m_font = font; m_mglFont = NULL; @@ -1121,9 +1121,9 @@ void wxDC::SetFont(const wxFont& font) void wxDC::SetBackground(const wxBrush& brush) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_backgroundBrush = brush; wxColour &clr = m_backgroundBrush.GetColour(); @@ -1143,7 +1143,7 @@ void wxDC::SetBackgroundMode(int mode) void wxDC::SetLogicalFunction(wxRasterOperationMode function) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); m_logicalFunction = function; @@ -1301,7 +1301,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxRasterOperationMode rop, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask) { - wxCHECK_MSG( Ok(), false, wxT("invalid dc") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid dc") ); wxCHECK_MSG( source, false, wxT("invalid source dc") ); // transform the source DC coords to the device ones @@ -1349,8 +1349,8 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); + wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") ); wxCoord w = bmp.GetWidth(); wxCoord h = bmp.GetHeight(); @@ -1392,8 +1392,8 @@ void wxDC::DoDrawSubBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h, wxCoord destx, wxCoord desty, int rop, bool useMask) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); + wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") ); CalcBoundingBox(x, y); CalcBoundingBox(x + w, y + h); diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp index d09e8080f8..a5a61a33f6 100644 --- a/src/mgl/dcmemory.cpp +++ b/src/mgl/dcmemory.cpp @@ -40,7 +40,7 @@ wxMemoryDC::~wxMemoryDC() void wxMemoryDC::DoSelect(const wxBitmap& bitmap) { - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { m_selected = bitmap; SetMGLDC(m_selected.CreateTmpDC(), TRUE); @@ -49,7 +49,7 @@ void wxMemoryDC::DoSelect(const wxBitmap& bitmap) void wxMemoryDC::SetPen(const wxPen &pen) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( GetDepth() == 1 && *wxTRANSPARENT_PEN != pen ) { @@ -66,7 +66,7 @@ void wxMemoryDC::SetPen(const wxPen &pen) void wxMemoryDC::SetBrush(const wxBrush &brush) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( GetDepth() == 1 && *wxTRANSPARENT_BRUSH != brush ) { @@ -83,7 +83,7 @@ void wxMemoryDC::SetBrush(const wxBrush &brush) void wxMemoryDC::SetTextForeground(const wxColour &col) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( GetDepth() == 1 ) { @@ -100,7 +100,7 @@ void wxMemoryDC::SetTextForeground(const wxColour &col) void wxMemoryDC::SetTextBackground(const wxColour &col) { - wxCHECK_RET( Ok(), wxT("invalid dc") ); + wxCHECK_RET( IsOk(), wxT("invalid dc") ); if ( GetDepth() == 1 ) { diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp index b464e5dc71..117b1d7bdb 100644 --- a/src/mgl/font.cpp +++ b/src/mgl/font.cpp @@ -72,7 +72,7 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased) { - wxCHECK_MSG( Ok(), NULL, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); // we don't support DC scaling yet, so use scale=1 wxFontInstance *i = M_FONTDATA->GetFontInstance(1.0, antialiased); @@ -81,14 +81,14 @@ struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased) int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->GetPointSize(); } wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->GetFaceName(); } @@ -100,21 +100,21 @@ wxFontFamily wxFont::DoGetFamily() const wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); return M_FONTDATA->GetStyle(); } wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); return M_FONTDATA->GetWeight(); } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->GetUnderlined(); } @@ -122,21 +122,21 @@ bool wxFont::GetUnderlined() const wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); return M_FONTDATA->GetEncoding(); } bool wxFont::IsFixedWidth() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->IsFixedWidth(); } const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); return M_FONTDATA->GetNativeFontInfo(); } diff --git a/src/mgl/palette.cpp b/src/mgl/palette.cpp index 92536bb350..fcac1e22ea 100644 --- a/src/mgl/palette.cpp +++ b/src/mgl/palette.cpp @@ -126,12 +126,12 @@ bool wxPalette::GetRGB(int pixel, int wxPalette::GetColoursCount() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid palette") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid palette") ); return M_PALETTEDATA->m_count; } palette_t *wxPalette::GetMGLpalette_t() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid palette") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid palette") ); return M_PALETTEDATA->m_entries; } diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index 3eff4b729c..25572afe19 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -122,7 +122,7 @@ wxPen::wxPen(const wxColour& colour, int width, int style) wxPen::wxPen(const wxBitmap& stipple, int width) { - wxCHECK_RET( stipple.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, wxT("stipple bitmap must be 8x8") ); @@ -186,7 +186,7 @@ void wxPen::SetStyle(wxPenStyle style) void wxPen::SetStipple(const wxBitmap& stipple) { - wxCHECK_RET( stipple.Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, wxT("stipple bitmap must be 8x8") ); @@ -203,7 +203,7 @@ void wxPen::SetWidth(int width) int wxPen::GetDashes(wxDash **ptr) const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); *ptr = (wxDash*)M_PENDATA->m_dash; return M_PENDATA->m_countDashes; @@ -211,63 +211,63 @@ int wxPen::GetDashes(wxDash **ptr) const int wxPen::GetDashCount() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return (M_PENDATA->m_countDashes); } wxDash* wxPen::GetDash() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return (wxDash*)M_PENDATA->m_dash; } wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_style; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_width; } wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } wxBitmap *wxPen::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return &(M_PENDATA->m_stipple); } void* wxPen::GetPixPattern() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return (void*)&(M_PENDATA->m_pixPattern); } diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index aad3ea0e6b..ec655b4ebd 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -659,7 +659,7 @@ void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd) MGL_wmPushWindowEventHandler(m_wnd, wxWindowMouseHandler, EVT_MOUSEEVT, 0); MGL_wmPushWindowEventHandler(m_wnd, wxWindowKeybHandler, EVT_KEYEVT, 0); - if ( m_cursor.Ok() ) + if ( m_cursor.IsOk() ) MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor()); else MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor()); @@ -822,7 +822,7 @@ bool wxWindowMGL::SetCursor(const wxCursor& cursor) return false; } - if ( m_cursor.Ok() ) + if ( m_cursor.IsOk() ) MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor()); else MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor()); diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index 771c50ff85..6a68b1009b 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -138,7 +138,7 @@ void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData, void wxCheckBox::ChangeBackgroundColour() { - if (!m_backgroundColour.Ok()) + if (!m_backgroundColour.IsOk()) return; wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour, diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp index 32ae77bab4..7557887c05 100644 --- a/src/motif/choice.cpp +++ b/src/motif/choice.cpp @@ -205,7 +205,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items, wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour); - if( m_font.Ok() ) + if( m_font.IsOk() ) wxDoChangeFont( w, m_font ); m_widgetArray.Insert(w, pos); @@ -429,7 +429,7 @@ void wxChoice::ChangeFont(bool keepOriginalSize) // Note that this causes the widget to be resized back // to its original size! We therefore have to set the size // back again. TODO: a better way in Motif? - if (m_mainWidget && m_font.Ok()) + if (m_mainWidget && m_font.IsOk()) { Display* dpy = XtDisplay((Widget) m_mainWidget); int width, height, width1, height1; diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp index 91f7f3d16c..9fbb5241a2 100644 --- a/src/motif/combobox_native.cpp +++ b/src/motif/combobox_native.cpp @@ -327,7 +327,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, void wxComboBox::ChangeFont(bool keepOriginalSize) { - if( m_font.Ok() && m_mainWidget != NULL ) + if( m_font.IsOk() && m_mainWidget != NULL ) { wxDoChangeFont( GetXmText(this), m_font ); wxDoChangeFont( GetXmList(this), m_font ); diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index 22646e641a..56b1b840ca 100644 --- a/src/motif/cursor.cpp +++ b/src/motif/cursor.cpp @@ -466,7 +466,7 @@ wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor) else { // Restore old cursor - if (win->GetCursor().Ok()) + if (win->GetCursor().IsOk()) attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display); else attrs.cursor = None; diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp index c96ec26e15..0fd6bf384b 100644 --- a/src/motif/dataobj.cpp +++ b/src/motif/dataobj.cpp @@ -160,7 +160,7 @@ size_t wxBitmapDataObject::GetDataSize() const bool wxBitmapDataObject::GetDataHere(void* buf) const { - if( !GetBitmap().Ok() ) + if( !GetBitmap().IsOk() ) return false; (*(Pixmap*)buf) = (Pixmap)GetBitmap().GetDrawable(); diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp index 6ce44a8df1..4e83cd78e6 100644 --- a/src/motif/dc.cpp +++ b/src/motif/dc.cpp @@ -36,14 +36,14 @@ wxMotifDCImpl::wxMotifDCImpl(wxDC *owner) void wxMotifDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y) { wxCHECK_RET( IsOk(), "invalid dc" ); - wxCHECK_RET( icon.Ok(), "invalid icon" ); + wxCHECK_RET( icon.IsOk(), "invalid icon" ); DoDrawBitmap(icon, x, y, true); } void wxMotifDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask ) { - wxCHECK_RET( bitmap.Ok(), "invalid bitmap" ); + wxCHECK_RET( bitmap.IsOk(), "invalid bitmap" ); wxMemoryDC memDC; memDC.SelectObjectAsSource(bitmap); diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp index 79b11e38e6..72c64deea8 100644 --- a/src/motif/dcmemory.cpp +++ b/src/motif/dcmemory.cpp @@ -99,7 +99,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) XFreeGC((Display*) m_display, (GC) m_gc); m_gc = (WXGC) NULL; - if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display)) + if (m_bitmap.IsOk() && (bitmap.GetDisplay() == m_display)) { m_pixmap = m_bitmap.GetDrawable(); Display* display = (Display*) m_display; @@ -129,7 +129,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { if (width) (*width) = m_bitmap.GetWidth(); if (height) (*height) = m_bitmap.GetHeight(); diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp index e2da28904a..cf105fe9be 100644 --- a/src/motif/filedlg.cpp +++ b/src/motif/filedlg.cpp @@ -165,7 +165,7 @@ int wxFileDialog::ShowModal() Arg args[10]; int ac = 0; - if (m_backgroundColour.Ok()) + if (m_backgroundColour.IsOk()) { wxComputeColours (dpy, & m_backgroundColour, NULL); diff --git a/src/motif/font.cpp b/src/motif/font.cpp index 5707d14729..a07b6fa920 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -441,14 +441,14 @@ void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_pointSize; } wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->m_faceName ; } @@ -460,35 +460,35 @@ wxFontFamily wxFont::DoGetFamily() const wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); return M_FONTDATA->m_style; } wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); return M_FONTDATA->m_weight; } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->m_underlined; } wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); return M_FONTDATA->m_encoding; } const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); if(M_FONTDATA->m_nativeFontInfo.GetXFontName().empty()) GetInternalFont(); @@ -505,7 +505,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const // font to list in the private data for future reference. wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const { - if ( !Ok() ) + if ( !IsOk() ) return NULL; long intScale = long(scale * 100.0 + 0.5); // key for wxXFont @@ -617,18 +617,18 @@ WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const WXFontType wxFont::GetFontType(WXDisplay* display) const { #if wxMOTIF_USE_RENDER_TABLE - return Ok() ? GetRenderTable(display) : NULL; + return IsOk() ? GetRenderTable(display) : NULL; #else - return Ok() ? GetFontList(1.0, display) : NULL; + return IsOk() ? GetFontList(1.0, display) : NULL; #endif } WXFontType wxFont::GetFontTypeC(WXDisplay* display) const { #if wxMOTIF_USE_RENDER_TABLE - return Ok() ? GetRenderTable(display) : NULL; + return IsOk() ? GetRenderTable(display) : NULL; #else - return Ok() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL; + return IsOk() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL; #endif } diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 51755c4a1e..c4c3d3c952 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -449,7 +449,7 @@ void wxFrame::DoSetIcon(const wxIcon& icon) if (!m_frameShell) return; - if (!icon.Ok() || !icon.GetDrawable()) + if (!icon.IsOk() || !icon.GetDrawable()) return; XtVaSetValues((Widget) m_frameShell, diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index b0ab1011ab..da952a3627 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -101,7 +101,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT : XmBROWSE_SELECT ); ++count; - if( m_font.Ok() ) + if( m_font.IsOk() ) { XtSetArg( args[count], (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) ); diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 3312c052ad..02ada167a3 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -454,7 +454,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, XtSetArg (args[0], XmNnumColumns, m_numColumns); XtSetArg (args[1], XmNpacking, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT); - if ( !m_font.Ok() ) + if ( !m_font.IsOk() ) { if ( menuBar ) m_font = menuBar->GetFont(); @@ -586,7 +586,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const void wxMenu::SetBackgroundColour(const wxColour& col) { m_backgroundColour = col; - if (!col.Ok()) + if (!col.IsOk()) return; if (m_menuWidget) wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col); @@ -611,7 +611,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col) void wxMenu::SetForegroundColour(const wxColour& col) { m_foregroundColour = col; - if (!col.Ok()) + if (!col.IsOk()) return; if (m_menuWidget) wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col); @@ -637,7 +637,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize) { // Lesstif 0.87 hangs here, but 0.93 does not; MBN: sometimes it does #if !wxCHECK_LESSTIF() // || wxCHECK_LESSTIF_VERSION( 0, 93 ) - if (!m_font.Ok() || !m_menuWidget) + if (!m_font.IsOk() || !m_menuWidget) return; Display* dpy = XtDisplay((Widget) m_menuWidget); @@ -657,7 +657,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize) node = node->GetNext() ) { wxMenuItem* item = node->GetData(); - if (m_menuWidget && item->GetButtonWidget() && m_font.Ok()) + if (m_menuWidget && item->GetButtonWidget() && m_font.IsOk()) { XtVaSetValues ((Widget) item->GetButtonWidget(), wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), @@ -681,7 +681,7 @@ bool wxMenuBar::SetBackgroundColour(const wxColour& col) { if (!wxWindowBase::SetBackgroundColour(col)) return false; - if (!col.Ok()) + if (!col.IsOk()) return false; if (m_mainWidget) wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col); @@ -697,7 +697,7 @@ bool wxMenuBar::SetForegroundColour(const wxColour& col) { if (!wxWindowBase::SetForegroundColour(col)) return false; - if (!col.Ok()) + if (!col.IsOk()) return false; if (m_mainWidget) wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col); diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index 5a7a63b83a..d648c0e78c 100644 --- a/src/motif/msgdlg.cpp +++ b/src/motif/msgdlg.cpp @@ -154,7 +154,7 @@ int wxMessageDialog::ShowModal() Display* dpy = XtDisplay(wParent); - if (m_backgroundColour.Ok()) + if (m_backgroundColour.IsOk()) { wxComputeColours (dpy, & m_backgroundColour, NULL); diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index 548ae9777a..eea9bd71b9 100644 --- a/src/motif/statbmp.cpp +++ b/src/motif/statbmp.cpp @@ -59,9 +59,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, wxSize actualSize(size); // work around the cases where the bitmap is a wxNull(Icon/Bitmap) if (actualSize.x == -1) - actualSize.x = bitmap.Ok() ? bitmap.GetWidth() : 1; + actualSize.x = bitmap.IsOk() ? bitmap.GetWidth() : 1; if (actualSize.y == -1) - actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1; + actualSize.y = bitmap.IsOk() ? bitmap.GetHeight() : 1; PostCreation(); DoSetBitmap(); @@ -81,7 +81,7 @@ void wxStaticBitmap::DoSetBitmap() Widget widget = (Widget) m_mainWidget; int w2, h2; - if (m_messageBitmapOriginal.Ok()) + if (m_messageBitmapOriginal.IsOk()) { w2 = m_messageBitmapOriginal.GetWidth(); h2 = m_messageBitmapOriginal.GetHeight(); diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp index 77d27351ec..c8ae30e002 100644 --- a/src/motif/toolbar.cpp +++ b/src/motif/toolbar.cpp @@ -380,13 +380,13 @@ bool wxToolBar::Realize() wxColour col; col.SetPixel(backgroundPixel); - if( bmp.Ok() && bmp.GetMask() ) + if( bmp.IsOk() && bmp.GetMask() ) { bmp = wxCreateMaskedBitmap(bmp, col); tool->SetNormalBitmap(bmp); } - if( insensBmp.Ok() && insensBmp.GetMask() ) + if( insensBmp.IsOk() && insensBmp.GetMask() ) { insensBmp = wxCreateMaskedBitmap(insensBmp, col); tool->SetDisabledBitmap(insensBmp); @@ -410,7 +410,7 @@ bool wxToolBar::Realize() { wxBitmap tmp = tool->GetDisabledBitmap(); - insensPixmap = tmp.Ok() ? + insensPixmap = tmp.IsOk() ? (Pixmap)tmp.GetDrawable() : tool->GetInsensPixmap(); } diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 6b34406327..5fd3aeefb8 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -517,7 +517,7 @@ XmString wxFindAcceleratorText (const char *s) // Change a widget's foreground and background colours. void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour) { - if (!foregroundColour.Ok()) + if (!foregroundColour.IsOk()) return; // When should we specify the foreground, if it's calculated @@ -536,7 +536,7 @@ void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour) void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColour, bool changeArmColour) { - if (!backgroundColour.Ok()) + if (!backgroundColour.IsOk()) return; wxComputeColours (XtDisplay((Widget) widget), & backgroundColour, diff --git a/src/motif/window.cpp b/src/motif/window.cpp index 6078beb09c..01bac12813 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -687,10 +687,10 @@ bool wxWindow::SetCursor(const wxCursor& cursor) return false; } - // wxASSERT_MSG( m_cursor.Ok(), + // wxASSERT_MSG( m_cursor.IsOk(), // wxT("cursor must be valid after call to the base version")); const wxCursor* cursor2 = NULL; - if (m_cursor.Ok()) + if (m_cursor.IsOk()) cursor2 = & m_cursor; else cursor2 = wxSTANDARD_CURSOR; @@ -1454,7 +1454,7 @@ int wxWindow::GetCharHeight() const { int height; - if (m_font.Ok()) + if (m_font.IsOk()) wxGetTextExtent (GetXDisplay(), m_font, 1.0, "x", NULL, &height, NULL, NULL); else @@ -1467,7 +1467,7 @@ int wxWindow::GetCharWidth() const { int width; - if (m_font.Ok()) + if (m_font.IsOk()) wxGetTextExtent (GetXDisplay(), m_font, 1.0, "x", &width, NULL, NULL, NULL); else @@ -1486,7 +1486,7 @@ void wxWindow::DoGetTextExtent(const wxString& string, if (externalLeading) *externalLeading = 0; - if (fontToUse->Ok()) + if (fontToUse->IsOk()) wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0, string, x, y, NULL, descent); else @@ -1659,7 +1659,7 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) bool wxWindow::ProcessAccelerator(wxKeyEvent& event) { #if wxUSE_ACCEL - if (!m_acceleratorTable.Ok()) + if (!m_acceleratorTable.IsOk()) return false; int count = m_acceleratorTable.GetCount(); @@ -2489,7 +2489,7 @@ void wxWindow::ChangeFont(bool keepOriginalSize) // to its original size! We therefore have to set the size // back again. TODO: a better way in Motif? Widget w = (Widget) GetLabelWidget(); // Usually the main widget - if (w && m_font.Ok()) + if (w && m_font.IsOk()) { int width, height, width1, height1; GetSize(& width, & height); diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index 1da9cb7597..434df30367 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -148,7 +148,7 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const { MSG *msg = (MSG *)wxmsg; - return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); + return IsOk() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); } #endif // wxUSE_ACCEL diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp new file mode 100644 index 0000000000..2603cdfdf3 --- /dev/null +++ b/src/msw/anybutton.cpp @@ -0,0 +1,1232 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/msw/anybutton.cpp +// Purpose: wxAnyButton +// Author: Julian Smart +// Created: 1998-01-04 (extracted from button.cpp) +// RCS-ID: $Id: anybutton.cpp 67384 2011-04-03 20:31:32Z DS $ +// 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 + +#ifdef wxHAS_ANY_BUTTON + +#include "wx/anybutton.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/brush.h" + #include "wx/panel.h" + #include "wx/bmpbuttn.h" + #include "wx/settings.h" + #include "wx/dcscreen.h" + #include "wx/dcclient.h" + #include "wx/toplevel.h" + #include "wx/msw/wrapcctl.h" + #include "wx/msw/private.h" + #include "wx/msw/missing.h" +#endif + +#include "wx/imaglist.h" +#include "wx/stockitem.h" +#include "wx/msw/private/button.h" +#include "wx/msw/private/dc.h" +#include "wx/private/window.h" + +#if wxUSE_MARKUP + #include "wx/generic/private/markuptext.h" +#endif // wxUSE_MARKUP + +using namespace wxMSWImpl; + +#if wxUSE_UXTHEME + #include "wx/msw/uxtheme.h" + + // no need to include tmschema.h + #ifndef BP_PUSHBUTTON + #define BP_PUSHBUTTON 1 + + #define PBS_NORMAL 1 + #define PBS_HOT 2 + #define PBS_PRESSED 3 + #define PBS_DISABLED 4 + #define PBS_DEFAULTED 5 + + #define TMT_CONTENTMARGINS 3602 + #endif + + // provide the necessary declarations ourselves if they're missing from + // headers + #ifndef BCM_SETIMAGELIST + #define BCM_SETIMAGELIST 0x1602 + #define BCM_SETTEXTMARGIN 0x1604 + + enum + { + BUTTON_IMAGELIST_ALIGN_LEFT, + BUTTON_IMAGELIST_ALIGN_RIGHT, + BUTTON_IMAGELIST_ALIGN_TOP, + BUTTON_IMAGELIST_ALIGN_BOTTOM + }; + + struct BUTTON_IMAGELIST + { + HIMAGELIST himl; + RECT margin; + UINT uAlign; + }; + #endif +#endif // wxUSE_UXTHEME + +#ifndef WM_THEMECHANGED + #define WM_THEMECHANGED 0x031A +#endif + +#ifndef ODS_NOACCEL + #define ODS_NOACCEL 0x0100 +#endif + +#ifndef ODS_NOFOCUSRECT + #define ODS_NOFOCUSRECT 0x0200 +#endif + +#ifndef DT_HIDEPREFIX + #define DT_HIDEPREFIX 0x00100000 +#endif + +#if wxUSE_UXTHEME +extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp +#endif // wxUSE_UXTHEME + +// ---------------------------------------------------------------------------- +// button image data +// ---------------------------------------------------------------------------- + +// we use different data classes for owner drawn buttons and for themed XP ones + +class wxButtonImageData +{ +public: + wxButtonImageData() { } + virtual ~wxButtonImageData() { } + + virtual wxBitmap GetBitmap(wxAnyButton::State which) const = 0; + virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) = 0; + + virtual wxSize GetBitmapMargins() const = 0; + virtual void SetBitmapMargins(wxCoord x, wxCoord y) = 0; + + virtual wxDirection GetBitmapPosition() const = 0; + virtual void SetBitmapPosition(wxDirection dir) = 0; + +private: + wxDECLARE_NO_COPY_CLASS(wxButtonImageData); +}; + +namespace +{ + +// the gap between button edge and the interior area used by Windows for the +// standard buttons +const int OD_BUTTON_MARGIN = 4; + +class wxODButtonImageData : public wxButtonImageData +{ +public: + wxODButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap) + { + SetBitmap(bitmap, wxAnyButton::State_Normal); + SetBitmap(bitmap.ConvertToDisabled(), wxAnyButton::State_Disabled); + + m_dir = wxLEFT; + + // we use margins when we have both bitmap and text, but when we have + // only the bitmap it should take up the entire button area + if ( btn->ShowsLabel() ) + { + m_margin.x = btn->GetCharWidth(); + m_margin.y = btn->GetCharHeight() / 2; + } + } + + virtual wxBitmap GetBitmap(wxAnyButton::State which) const + { + return m_bitmaps[which]; + } + + virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) + { + m_bitmaps[which] = bitmap; + } + + virtual wxSize GetBitmapMargins() const + { + return m_margin; + } + + virtual void SetBitmapMargins(wxCoord x, wxCoord y) + { + m_margin = wxSize(x, y); + } + + virtual wxDirection GetBitmapPosition() const + { + return m_dir; + } + + virtual void SetBitmapPosition(wxDirection dir) + { + m_dir = dir; + } + +private: + // just store the values passed to us to be able to retrieve them later + // from the drawing code + wxBitmap m_bitmaps[wxAnyButton::State_Max]; + wxSize m_margin; + wxDirection m_dir; + + wxDECLARE_NO_COPY_CLASS(wxODButtonImageData); +}; + +#if wxUSE_UXTHEME + +// somehow the margin is one pixel greater than the value returned by +// GetThemeMargins() call +const int XP_BUTTON_EXTRA_MARGIN = 1; + +class wxXPButtonImageData : public wxButtonImageData +{ +public: + // we must be constructed with the size of our images as we need to create + // the image list + wxXPButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap) + : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */, + wxAnyButton::State_Max), + m_hwndBtn(GetHwndOf(btn)) + { + // initialize all bitmaps except for the disabled one to normal state + for ( int n = 0; n < wxAnyButton::State_Max; n++ ) + { + m_iml.Add(n == wxAnyButton::State_Disabled ? bitmap.ConvertToDisabled() + : bitmap); + } + + m_data.himl = GetHimagelistOf(&m_iml); + + // no margins by default + m_data.margin.left = + m_data.margin.right = + m_data.margin.top = + m_data.margin.bottom = 0; + + // use default alignment + m_data.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; + + UpdateImageInfo(); + } + + virtual wxBitmap GetBitmap(wxAnyButton::State which) const + { + return m_iml.GetBitmap(which); + } + + virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) + { + m_iml.Replace(which, bitmap); + + UpdateImageInfo(); + } + + virtual wxSize GetBitmapMargins() const + { + return wxSize(m_data.margin.left, m_data.margin.top); + } + + virtual void SetBitmapMargins(wxCoord x, wxCoord y) + { + RECT& margin = m_data.margin; + margin.left = + margin.right = x; + margin.top = + margin.bottom = y; + + if ( !::SendMessage(m_hwndBtn, BCM_SETTEXTMARGIN, 0, (LPARAM)&margin) ) + { + wxLogDebug("SendMessage(BCM_SETTEXTMARGIN) failed"); + } + } + + virtual wxDirection GetBitmapPosition() const + { + switch ( m_data.uAlign ) + { + default: + wxFAIL_MSG( "invalid image alignment" ); + // fall through + + case BUTTON_IMAGELIST_ALIGN_LEFT: + return wxLEFT; + + case BUTTON_IMAGELIST_ALIGN_RIGHT: + return wxRIGHT; + + case BUTTON_IMAGELIST_ALIGN_TOP: + return wxTOP; + + case BUTTON_IMAGELIST_ALIGN_BOTTOM: + return wxBOTTOM; + } + } + + virtual void SetBitmapPosition(wxDirection dir) + { + UINT alignNew; + switch ( dir ) + { + default: + wxFAIL_MSG( "invalid direction" ); + // fall through + + case wxLEFT: + alignNew = BUTTON_IMAGELIST_ALIGN_LEFT; + break; + + case wxRIGHT: + alignNew = BUTTON_IMAGELIST_ALIGN_RIGHT; + break; + + case wxTOP: + alignNew = BUTTON_IMAGELIST_ALIGN_TOP; + break; + + case wxBOTTOM: + alignNew = BUTTON_IMAGELIST_ALIGN_BOTTOM; + break; + } + + if ( alignNew != m_data.uAlign ) + { + m_data.uAlign = alignNew; + UpdateImageInfo(); + } + } + +private: + void UpdateImageInfo() + { + if ( !::SendMessage(m_hwndBtn, BCM_SETIMAGELIST, 0, (LPARAM)&m_data) ) + { + wxLogDebug("SendMessage(BCM_SETIMAGELIST) failed"); + } + } + + // we store image list separately to be able to use convenient wxImageList + // methods instead of working with raw HIMAGELIST + wxImageList m_iml; + + // store the rest of the data in BCM_SETIMAGELIST-friendly form + BUTTON_IMAGELIST m_data; + + // the button we're associated with + const HWND m_hwndBtn; + + + wxDECLARE_NO_COPY_CLASS(wxXPButtonImageData); +}; + +#endif // wxUSE_UXTHEME + +} // anonymous namespace + +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// helper functions from wx/msw/private/button.h +// ---------------------------------------------------------------------------- + +void wxMSWButton::UpdateMultilineStyle(HWND hwnd, const wxString& label) +{ + // update BS_MULTILINE style depending on the new label (resetting it + // doesn't seem to do anything very useful but it shouldn't hurt and we do + // have to set it whenever the label becomes multi line as otherwise it + // wouldn't be shown correctly as we don't use BS_MULTILINE when creating + // the control unless it already has new lines in its label) + long styleOld = ::GetWindowLong(hwnd, GWL_STYLE), + styleNew; + if ( label.find(wxT('\n')) != wxString::npos ) + styleNew = styleOld | BS_MULTILINE; + else + styleNew = styleOld & ~BS_MULTILINE; + + if ( styleNew != styleOld ) + ::SetWindowLong(hwnd, GWL_STYLE, styleNew); +} + +wxSize wxMSWButton::GetFittingSize(wxWindow *win, + const wxSize& sizeLabel, + int flags) +{ + // FIXME: this is pure guesswork, need to retrieve the real button margins + wxSize sizeBtn = sizeLabel; + + sizeBtn.x += 3*win->GetCharWidth(); + sizeBtn.y += win->GetCharHeight()/2; + + // account for the shield UAC icon if we have it + if ( flags & Size_AuthNeeded ) + sizeBtn.x += wxSystemSettings::GetMetric(wxSYS_SMALLICON_X); + + return sizeBtn; +} + +wxSize wxMSWButton::ComputeBestFittingSize(wxControl *btn, int flags) +{ + wxClientDC dc(btn); + + wxSize sizeBtn; + dc.GetMultiLineTextExtent(btn->GetLabelText(), &sizeBtn.x, &sizeBtn.y); + + return GetFittingSize(btn, sizeBtn, flags); +} + +wxSize wxMSWButton::IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size) +{ + wxSize sizeBtn(size); + + // All buttons have at least the standard height and, unless the user + // explicitly wants them to be as small as possible and used wxBU_EXACTFIT + // style to indicate this, of at least the standard width too. + // + // Notice that we really want to make all buttons equally high, otherwise + // they look ugly and the existing code using wxBU_EXACTFIT only uses it to + // control width and not height. + + // The 50x14 button size is documented in the "Recommended sizing and + // spacing" section of MSDN layout article. + // + // Note that we intentionally don't use GetDefaultSize() here, because + // it's inexact -- dialog units depend on this dialog's font. + const wxSize sizeDef = btn->ConvertDialogToPixels(wxSize(50, 14)); + if ( !btn->HasFlag(wxBU_EXACTFIT) ) + { + if ( sizeBtn.x < sizeDef.x ) + sizeBtn.x = sizeDef.x; + } + if ( sizeBtn.y < sizeDef.y ) + sizeBtn.y = sizeDef.y; + + btn->CacheBestSize(sizeBtn); + + return sizeBtn; +} + +// ---------------------------------------------------------------------------- +// creation/destruction +// ---------------------------------------------------------------------------- + +wxAnyButton::~wxAnyButton() +{ + delete m_imageData; +#if wxUSE_MARKUP + delete m_markupText; +#endif // wxUSE_MARKUP +} + +void wxAnyButton::SetLabel(const wxString& label) +{ + wxMSWButton::UpdateMultilineStyle(GetHwnd(), label); + + wxAnyButtonBase::SetLabel(label); + +#if wxUSE_MARKUP + // If we have a plain text label, we shouldn't be using markup any longer. + if ( m_markupText ) + { + delete m_markupText; + m_markupText = NULL; + + // Unfortunately we don't really know whether we can reset the button + // to be non-owner-drawn or not: if we had made it owner-drawn just + // because of a call to SetLabelMarkup(), we could, but not if there + // were [also] calls to Set{Fore,Back}groundColour(). If it's really a + // problem to have button remain owner-drawn forever just because it + // had markup label once, we should record the reason for our current + // owner-drawnness and check it here. + } +#endif // wxUSE_MARKUP +} + +// ---------------------------------------------------------------------------- +// size management including autosizing +// ---------------------------------------------------------------------------- + +void wxAnyButton::AdjustForBitmapSize(wxSize &size) const +{ + wxCHECK_RET( m_imageData, wxT("shouldn't be called if no image") ); + + // 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(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 wxAnyButton::DoGetBestSize() const +{ + wxAnyButton * const self = const_cast(this); + + wxSize size; + + // Account for the text part if we have it. + if ( ShowsLabel() ) + { + int flags = 0; + if ( DoGetAuthNeeded() ) + flags |= wxMSWButton::Size_AuthNeeded; + +#if wxUSE_MARKUP + if ( m_markupText ) + { + wxClientDC dc(self); + size = wxMSWButton::GetFittingSize(self, + m_markupText->Measure(dc), + flags); + } + else // Normal plain text (but possibly multiline) label. +#endif // wxUSE_MARKUP + { + size = wxMSWButton::ComputeBestFittingSize(self, flags); + } + } + + if ( m_imageData ) + AdjustForBitmapSize(size); + + return wxMSWButton::IncreaseToStdSizeAndCache(self, size); +} + +// ---------------------------------------------------------------------------- +// event/message handlers +// ---------------------------------------------------------------------------- + +WXLRESULT wxAnyButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +{ + if ( nMsg == WM_LBUTTONDBLCLK ) + { + // emulate a click event to force an owner-drawn button to change its + // appearance - without this, it won't do it + (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam); + + // and continue with processing the message normally as well + } +#if wxUSE_UXTHEME + else if ( nMsg == WM_THEMECHANGED ) + { + // need to recalculate the best size here + // as the theme size might have changed + InvalidateBestSize(); + } +#endif // wxUSE_UXTHEME + // must use m_mouseInWindow here instead of IsMouseInWindow() + // since we need to know the first time the mouse enters the window + // and IsMouseInWindow() would return true in this case + else if ( (nMsg == WM_MOUSEMOVE && !m_mouseInWindow) || + nMsg == WM_MOUSELEAVE ) + { + if ( + IsEnabled() && + ( +#if wxUSE_UXTHEME + wxUxThemeEngine::GetIfActive() || +#endif // wxUSE_UXTHEME + (m_imageData && m_imageData->GetBitmap(State_Current).IsOk()) + ) + ) + { + Refresh(); + } + } + + // let the base class do all real processing + return wxControl::MSWWindowProc(nMsg, wParam, lParam); +} + +// ---------------------------------------------------------------------------- +// button images +// ---------------------------------------------------------------------------- + +wxBitmap wxAnyButton::DoGetBitmap(State which) const +{ + return m_imageData ? m_imageData->GetBitmap(which) : wxBitmap(); +} + +void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) +{ +#if wxUSE_UXTHEME + wxXPButtonImageData *oldData = NULL; +#endif // wxUSE_UXTHEME + + // Check if we already had bitmaps of different size. + if ( m_imageData && + bitmap.GetSize() != m_imageData->GetBitmap(State_Normal).GetSize() ) + { + wxASSERT_MSG( which == State_Normal, + "Must set normal bitmap with the new size first" ); + +#if wxUSE_UXTHEME + if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() ) + { + // We can't change the size of the images stored in wxImageList + // in wxXPButtonImageData::m_iml so force recreating it below but + // keep the current data to copy its values into the new one. + oldData = static_cast(m_imageData); + m_imageData = NULL; + } +#endif // wxUSE_UXTHEME + //else: wxODButtonImageData doesn't require anything special + } + + // allocate the image data when the first bitmap is set + if ( !m_imageData ) + { +#if wxUSE_UXTHEME + // using image list doesn't work correctly if we don't have any label + // (even if we use BUTTON_IMAGELIST_ALIGN_CENTER alignment and + // BS_BITMAP style), at least under Windows 2003 so use owner drawn + // strategy for bitmap-only buttons + if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() ) + { + m_imageData = new wxXPButtonImageData(this, bitmap); + + if ( oldData ) + { + // Preserve the old values in case the user changed them. + m_imageData->SetBitmapPosition(oldData->GetBitmapPosition()); + + const wxSize oldMargins = oldData->GetBitmapMargins(); + m_imageData->SetBitmapMargins(oldMargins.x, oldMargins.y); + + // No need to preserve the bitmaps though as they were of wrong + // size anyhow. + + delete oldData; + } + } + else +#endif // wxUSE_UXTHEME + { + m_imageData = new wxODButtonImageData(this, bitmap); + MakeOwnerDrawn(); + } + } + else + { + m_imageData->SetBitmap(bitmap, which); + } + + // it should be enough to only invalidate the best size when the normal + // bitmap changes as all bitmaps assigned to the button should be of the + // same size anyhow + if ( which == State_Normal ) + InvalidateBestSize(); + + Refresh(); +} + +wxSize wxAnyButton::DoGetBitmapMargins() const +{ + return m_imageData ? m_imageData->GetBitmapMargins() : wxSize(0, 0); +} + +void wxAnyButton::DoSetBitmapMargins(wxCoord x, wxCoord y) +{ + wxCHECK_RET( m_imageData, "SetBitmap() must be called first" ); + + m_imageData->SetBitmapMargins(x, y); + InvalidateBestSize(); +} + +void wxAnyButton::DoSetBitmapPosition(wxDirection dir) +{ + wxCHECK_RET( m_imageData, "SetBitmap() must be called first" ); + + m_imageData->SetBitmapPosition(dir); + InvalidateBestSize(); +} + +// ---------------------------------------------------------------------------- +// markup support +// ---------------------------------------------------------------------------- + +#if wxUSE_MARKUP + +bool wxAnyButton::DoSetLabelMarkup(const wxString& markup) +{ + if ( !wxAnyButtonBase::DoSetLabelMarkup(markup) ) + return false; + + if ( !m_markupText ) + { + m_markupText = new wxMarkupText(markup); + MakeOwnerDrawn(); + } + else + { + // We are already owner-drawn so just update the text. + m_markupText->SetMarkup(markup); + } + + Refresh(); + + return true; +} + +#endif // wxUSE_MARKUP + +// ---------------------------------------------------------------------------- +// owner-drawn buttons support +// ---------------------------------------------------------------------------- + +// drawing helpers +namespace +{ + +// return the button state using both the ODS_XXX flags specified in state +// parameter and the current button state +wxAnyButton::State GetButtonState(wxAnyButton *btn, UINT state) +{ + if ( state & ODS_DISABLED ) + return wxAnyButton::State_Disabled; + + if ( state & ODS_SELECTED ) + return wxAnyButton::State_Pressed; + + if ( btn->HasCapture() || btn->IsMouseInWindow() ) + return wxAnyButton::State_Current; + + if ( state & ODS_FOCUS ) + return wxAnyButton::State_Focused; + + return btn->GetNormalState(); +} + +void DrawButtonText(HDC hdc, + RECT *pRect, + wxAnyButton *btn, + int flags) +{ + const wxString text = btn->GetLabel(); + + if ( text.find(wxT('\n')) != wxString::npos ) + { + // draw multiline label + + // center text horizontally in any case + flags |= DT_CENTER; + + // first we need to compute its bounding rect + RECT rc; + ::CopyRect(&rc, pRect); + ::DrawText(hdc, text.wx_str(), text.length(), &rc, + DT_CENTER | DT_CALCRECT); + + // now center this rect inside the entire button area + const LONG w = rc.right - rc.left; + const LONG h = rc.bottom - rc.top; + rc.left = (pRect->right - pRect->left)/2 - w/2; + rc.right = rc.left+w; + rc.top = (pRect->bottom - pRect->top)/2 - h/2; + rc.bottom = rc.top+h; + + ::DrawText(hdc, text.wx_str(), text.length(), &rc, flags); + } + else // single line label + { + // translate wx button flags to alignment flags for DrawText() + if ( btn->HasFlag(wxBU_RIGHT) ) + { + flags |= DT_RIGHT; + } + else if ( !btn->HasFlag(wxBU_LEFT) ) + { + flags |= DT_CENTER; + } + //else: DT_LEFT is the default anyhow (and its value is 0 too) + + if ( btn->HasFlag(wxBU_BOTTOM) ) + { + flags |= DT_BOTTOM; + } + else if ( !btn->HasFlag(wxBU_TOP) ) + { + flags |= DT_VCENTER; + } + //else: as above, DT_TOP is the default + + // notice that we must have DT_SINGLELINE for vertical alignment flags + // to work + ::DrawText(hdc, text.wx_str(), text.length(), pRect, + flags | DT_SINGLELINE ); + } +} + +void DrawRect(HDC hdc, const RECT& r) +{ + wxDrawLine(hdc, r.left, r.top, r.right, r.top); + wxDrawLine(hdc, r.right, r.top, r.right, r.bottom); + wxDrawLine(hdc, r.right, r.bottom, r.left, r.bottom); + wxDrawLine(hdc, r.left, r.bottom, r.left, r.top); +} + +/* + The button frame looks like this normally: + + WWWWWWWWWWWWWWWWWWB + WHHHHHHHHHHHHHHHHGB W = white (HILIGHT) + WH GB H = light grey (LIGHT) + WH GB G = dark grey (SHADOW) + WH GB B = black (DKSHADOW) + WH GB + WGGGGGGGGGGGGGGGGGB + BBBBBBBBBBBBBBBBBBB + + When the button is selected, the button becomes like this (the total button + size doesn't change): + + BBBBBBBBBBBBBBBBBBB + BWWWWWWWWWWWWWWWWBB + BWHHHHHHHHHHHHHHGBB + BWH GBB + BWH GBB + BWGGGGGGGGGGGGGGGBB + BBBBBBBBBBBBBBBBBBB + BBBBBBBBBBBBBBBBBBB + + When the button is pushed (while selected) it is like: + + BBBBBBBBBBBBBBBBBBB + BGGGGGGGGGGGGGGGGGB + BG GB + BG GB + BG GB + BG GB + BGGGGGGGGGGGGGGGGGB + BBBBBBBBBBBBBBBBBBB +*/ +void DrawButtonFrame(HDC hdc, RECT& rectBtn, + bool selected, bool pushed) +{ + RECT r; + CopyRect(&r, &rectBtn); + + AutoHPEN hpenBlack(GetSysColor(COLOR_3DDKSHADOW)), + hpenGrey(GetSysColor(COLOR_3DSHADOW)), + hpenLightGr(GetSysColor(COLOR_3DLIGHT)), + hpenWhite(GetSysColor(COLOR_3DHILIGHT)); + + SelectInHDC selectPen(hdc, hpenBlack); + + r.right--; + r.bottom--; + + if ( pushed ) + { + DrawRect(hdc, r); + + (void)SelectObject(hdc, hpenGrey); + ::InflateRect(&r, -1, -1); + + DrawRect(hdc, r); + } + else // !pushed + { + if ( selected ) + { + DrawRect(hdc, r); + + ::InflateRect(&r, -1, -1); + } + + wxDrawLine(hdc, r.left, r.bottom, r.right, r.bottom); + wxDrawLine(hdc, r.right, r.bottom, r.right, r.top - 1); + + (void)SelectObject(hdc, hpenWhite); + wxDrawLine(hdc, r.left, r.bottom - 1, r.left, r.top); + wxDrawLine(hdc, r.left, r.top, r.right, r.top); + + (void)SelectObject(hdc, hpenLightGr); + wxDrawLine(hdc, r.left + 1, r.bottom - 2, r.left + 1, r.top + 1); + wxDrawLine(hdc, r.left + 1, r.top + 1, r.right - 1, r.top + 1); + + (void)SelectObject(hdc, hpenGrey); + wxDrawLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1); + wxDrawLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top); + } + + InflateRect(&rectBtn, -OD_BUTTON_MARGIN, -OD_BUTTON_MARGIN); +} + +#if wxUSE_UXTHEME +void DrawXPBackground(wxAnyButton *button, HDC hdc, RECT& rectBtn, UINT state) +{ + wxUxThemeHandle theme(button, L"BUTTON"); + + // this array is indexed by wxAnyButton::State values and so must be kept in + // sync with it + static const int uxStates[] = + { + PBS_NORMAL, PBS_HOT, PBS_PRESSED, PBS_DISABLED, PBS_DEFAULTED + }; + + int iState = uxStates[GetButtonState(button, state)]; + + wxUxThemeEngine * const engine = wxUxThemeEngine::Get(); + + // draw parent background if needed + if ( engine->IsThemeBackgroundPartiallyTransparent + ( + theme, + BP_PUSHBUTTON, + iState + ) ) + { + // Set this button as the one whose background is being erased: this + // allows our WM_ERASEBKGND handler used by DrawThemeParentBackground() + // to correctly align the background brush with this window instead of + // the parent window to which WM_ERASEBKGND is sent. Notice that this + // doesn't work with custom user-defined EVT_ERASE_BACKGROUND handlers + // as they won't be aligned but unfortunately all the attempts to fix + // it by shifting DC origin before calling DrawThemeParentBackground() + // failed to work so we at least do this, even though this is far from + // being the perfect solution. + wxWindowBeingErased = button; + + engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn); + + wxWindowBeingErased = NULL; + } + + // draw background + engine->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState, + &rectBtn, NULL); + + // calculate content area margins + MARGINS margins; + engine->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState, + TMT_CONTENTMARGINS, &rectBtn, &margins); + ::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight); + ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN); + + if ( button->UseBgCol() ) + { + COLORREF colBg = wxColourToRGB(button->GetBackgroundColour()); + AutoHBRUSH hbrushBackground(colBg); + + // don't overwrite the focus rect + RECT rectClient; + ::CopyRect(&rectClient, &rectBtn); + ::InflateRect(&rectClient, -1, -1); + FillRect(hdc, &rectClient, hbrushBackground); + } +} +#endif // wxUSE_UXTHEME + +} // anonymous namespace + +// ---------------------------------------------------------------------------- +// owner drawn buttons support +// ---------------------------------------------------------------------------- + +void wxAnyButton::MakeOwnerDrawn() +{ + if ( !IsOwnerDrawn() ) + { + // make it so + // note that BS_OWNERDRAW is not independent from other style bits + long style = GetWindowLong(GetHwnd(), GWL_STYLE); + style &= ~(BS_3STATE | BS_AUTO3STATE | BS_AUTOCHECKBOX | BS_AUTORADIOBUTTON | BS_CHECKBOX | BS_DEFPUSHBUTTON | BS_GROUPBOX | BS_PUSHBUTTON | BS_RADIOBUTTON | BS_PUSHLIKE); + style |= BS_OWNERDRAW; + SetWindowLong(GetHwnd(), GWL_STYLE, style); + } +} + +bool wxAnyButton::IsOwnerDrawn() const +{ + long style = GetWindowLong(GetHwnd(), GWL_STYLE); + return ( (style & BS_OWNERDRAW) == BS_OWNERDRAW ); +} + +bool wxAnyButton::SetBackgroundColour(const wxColour &colour) +{ + if ( !wxControl::SetBackgroundColour(colour) ) + { + // nothing to do + return false; + } + + MakeOwnerDrawn(); + + Refresh(); + + return true; +} + +bool wxAnyButton::SetForegroundColour(const wxColour &colour) +{ + if ( !wxControl::SetForegroundColour(colour) ) + { + // nothing to do + return false; + } + + MakeOwnerDrawn(); + + Refresh(); + + return true; +} + +bool wxAnyButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) +{ + LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis; + HDC hdc = lpDIS->hDC; + + UINT state = lpDIS->itemState; + switch ( GetButtonState(this, state) ) + { + case State_Disabled: + state |= ODS_DISABLED; + break; + case State_Pressed: + state |= ODS_SELECTED; + break; + case State_Focused: + state |= ODS_FOCUS; + break; + default: + break; + } + + bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0; + + RECT rectBtn; + CopyRect(&rectBtn, &lpDIS->rcItem); + + // draw the button background + if ( !HasFlag(wxBORDER_NONE) ) + { +#if wxUSE_UXTHEME + if ( wxUxThemeEngine::GetIfActive() ) + { + DrawXPBackground(this, hdc, rectBtn, state); + } + else +#endif // wxUSE_UXTHEME + { + COLORREF colBg = wxColourToRGB(GetBackgroundColour()); + + // first, draw the background + AutoHBRUSH hbrushBackground(colBg); + FillRect(hdc, &rectBtn, hbrushBackground); + + // draw the border for the current state + bool selected = (state & ODS_SELECTED) != 0; + if ( !selected ) + { + wxTopLevelWindow * + tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( tlw ) + { + selected = tlw->GetDefaultItem() == this; + } + } + + DrawButtonFrame(hdc, rectBtn, selected, pushed); + } + + // draw the focus rectangle if we need it + if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) ) + { + DrawFocusRect(hdc, &rectBtn); + +#if wxUSE_UXTHEME + if ( !wxUxThemeEngine::GetIfActive() ) +#endif // wxUSE_UXTHEME + { + if ( pushed ) + { + // the label is shifted by 1 pixel to create "pushed" effect + OffsetRect(&rectBtn, 1, 1); + } + } + } + } + + + // draw the image, if any + if ( m_imageData ) + { + wxBitmap bmp = m_imageData->GetBitmap(GetButtonState(this, state)); + if ( !bmp.IsOk() ) + bmp = m_imageData->GetBitmap(State_Normal); + + const wxSize sizeBmp = bmp.GetSize(); + const wxSize margin = m_imageData->GetBitmapMargins(); + const wxSize sizeBmpWithMargins(sizeBmp + 2*margin); + wxRect rectButton(wxRectFromRECT(rectBtn)); + + // for simplicity, we start with centred rectangle and then move it to + // the appropriate edge + wxRect rectBitmap = wxRect(sizeBmp).CentreIn(rectButton); + + // move bitmap only if we have a label, otherwise keep it centered + if ( ShowsLabel() ) + { + switch ( m_imageData->GetBitmapPosition() ) + { + default: + wxFAIL_MSG( "invalid direction" ); + // fall through + + case wxLEFT: + rectBitmap.x = rectButton.x + margin.x; + rectButton.x += sizeBmpWithMargins.x; + rectButton.width -= sizeBmpWithMargins.x; + break; + + case wxRIGHT: + rectBitmap.x = rectButton.GetRight() - sizeBmp.x - margin.x; + rectButton.width -= sizeBmpWithMargins.x; + break; + + case wxTOP: + rectBitmap.y = rectButton.y + margin.y; + rectButton.y += sizeBmpWithMargins.y; + rectButton.height -= sizeBmpWithMargins.y; + break; + + case wxBOTTOM: + rectBitmap.y = rectButton.GetBottom() - sizeBmp.y - margin.y; + rectButton.height -= sizeBmpWithMargins.y; + break; + } + } + + wxDCTemp dst((WXHDC)hdc); + dst.DrawBitmap(bmp, rectBitmap.GetPosition(), true); + + wxCopyRectToRECT(rectButton, rectBtn); + } + + + // finally draw the label + if ( ShowsLabel() ) + { + COLORREF colFg = state & ODS_DISABLED + ? ::GetSysColor(COLOR_GRAYTEXT) + : wxColourToRGB(GetForegroundColour()); + + wxTextColoursChanger changeFg(hdc, colFg, CLR_INVALID); + wxBkModeChanger changeBkMode(hdc, wxBRUSHSTYLE_TRANSPARENT); + +#if wxUSE_MARKUP + if ( m_markupText ) + { + wxDCTemp dc((WXHDC)hdc); + dc.SetTextForeground(wxColour(colFg)); + dc.SetFont(GetFont()); + + m_markupText->Render(dc, wxRectFromRECT(rectBtn), + state & ODS_NOACCEL + ? wxMarkupText::Render_Default + : wxMarkupText::Render_ShowAccels); + } + else // Plain text label +#endif // wxUSE_MARKUP + { + // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000) + // systems but by happy coincidence ODS_NOACCEL is not used under + // them neither so DT_HIDEPREFIX should never be used there + DrawButtonText(hdc, &rectBtn, this, + state & ODS_NOACCEL ? DT_HIDEPREFIX : 0); + } + } + + return true; +} + +#endif // wxHAS_ANY_BUTTON diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 00df612886..10756fee7c 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -387,7 +387,7 @@ bool wxBitmap::CopyFromCursor(const wxCursor& cursor, wxBitmapTransparency trans { UnRef(); - if ( !cursor.Ok() ) + if ( !cursor.IsOk() ) return false; return CopyFromIconOrCursor(cursor, transp); @@ -397,7 +397,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon, wxBitmapTransparency transp) { UnRef(); - if ( !icon.Ok() ) + if ( !icon.IsOk() ) return false; return CopyFromIconOrCursor(icon, transp); @@ -605,7 +605,7 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc) SetHBITMAP((WXHBITMAP)hbmp); - return Ok(); + return IsOk(); } #if wxUSE_IMAGE @@ -739,7 +739,7 @@ wxImage wxBitmap::ConvertToImage() const // so the 'depth' argument is ignored. // TODO: transparency (create a mask image) - if (!Ok()) + if (!IsOk()) { wxFAIL_MSG( wxT("bitmap is invalid") ); return wxNullImage; @@ -747,7 +747,7 @@ wxImage wxBitmap::ConvertToImage() const wxImage image; - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); // create an wxImage object int width = GetWidth(); @@ -823,7 +823,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc) bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc) { - wxCHECK_MSG( image.Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") ); UnRef(); @@ -929,7 +929,7 @@ wxImage wxBitmap::ConvertToImage() const // and then DIB to our wxImage wxImage image = dib.ConvertToImage(); - if ( !image.Ok() ) + if ( !image.IsOk() ) { return wxNullImage; } @@ -1039,7 +1039,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) else // no bitmap handler found { wxImage image; - if ( image.LoadFile( filename, type ) && image.Ok() ) + if ( image.LoadFile( filename, type ) && image.IsOk() ) { *this = wxBitmap(image); @@ -1084,7 +1084,7 @@ bool wxBitmap::SaveFile(const wxString& filename, { // FIXME what about palette? shouldn't we use it? wxImage image = ConvertToImage(); - if ( image.Ok() ) + if ( image.IsOk() ) { return image.SaveFile(filename, type); } @@ -1106,14 +1106,14 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect ) const wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rect.x >= 0) && (rect.y >= 0) && (rect.x+rect.width <= GetWidth()) && (rect.y+rect.height <= GetHeight()), wxNullBitmap, wxT("Invalid bitmap or bitmap region") ); wxBitmap ret( rect.width, rect.height, GetDepth() ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") ); #ifndef __WXMICROWIN__ // handle alpha channel, if any @@ -1248,7 +1248,7 @@ void wxBitmap::SetMask(wxMask *mask) void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { #if wxUSE_WXDIB - if ( !Ok() ) + if ( !IsOk() ) { // no bitmap, no data (raw or otherwise) return NULL; @@ -1326,7 +1326,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) void wxBitmap::UngetRawData(wxPixelDataBase& dataBase) { #if wxUSE_WXDIB - if ( !Ok() ) + if ( !IsOk() ) return; if ( !&dataBase ) @@ -1427,7 +1427,7 @@ wxMask::~wxMask() bool wxMask::Create(const wxBitmap& bitmap) { #ifndef __WXMICROWIN__ - wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, false, + wxCHECK_MSG( bitmap.IsOk() && bitmap.GetDepth() == 1, false, wxT("can't create mask from invalid or not monochrome bitmap") ); if ( m_maskBitmap ) @@ -1468,7 +1468,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) } #if wxUSE_PALETTE - if (bitmap.Ok() && bitmap.GetPalette()->Ok()) + if (bitmap.IsOk() && bitmap.GetPalette()->IsOk()) { unsigned char red, green, blue; if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue)) @@ -1487,7 +1487,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex) bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { #ifndef __WXMICROWIN__ - wxCHECK_MSG( bitmap.Ok(), false, wxT("invalid bitmap in wxMask::Create") ); + wxCHECK_MSG( bitmap.IsOk(), false, wxT("invalid bitmap in wxMask::Create") ); if ( m_maskBitmap ) { @@ -1625,7 +1625,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp, int hotSpotX, int hotSpotY) { - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { // we can't create an icon/cursor form nothing return 0; diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 8cf3fc95ac..5aa74bfb40 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -80,7 +80,8 @@ bool wxBitmapButton::Create(wxWindow *parent, validator, name) ) return false; - SetBitmapLabel(bitmap); + if ( bitmap.IsOk() ) + SetBitmapLabel(bitmap); if ( !size.IsFullySpecified() ) { @@ -92,54 +93,4 @@ bool wxBitmapButton::Create(wxWindow *parent, return true; } -void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ - if ( bitmap.IsOk() ) - { - switch ( which ) - { -#if wxUSE_IMAGE - case State_Normal: - if ( !HasFlag(wxBU_AUTODRAW) && !m_disabledSetByUser ) - { - wxImage img(bitmap.ConvertToImage().ConvertToGreyscale()); - wxBitmapButtonBase::DoSetBitmap(img, State_Disabled); - } - break; -#endif // wxUSE_IMAGE - - case State_Focused: - // if the focus bitmap is specified but current one isn't, use - // the focus bitmap for hovering as well if this is consistent - // with the current Windows version look and feel - // - // rationale: this is compatible with the old wxGTK behaviour - // and also makes it much easier to do "the right thing" for - // all platforms (some of them, such as Windows XP, have "hot" - // buttons while others don't) - if ( !m_hoverSetByUser ) - wxBitmapButtonBase::DoSetBitmap(bitmap, State_Current); - break; - - case State_Current: - // don't overwrite it with the focused bitmap - m_hoverSetByUser = true; - break; - - case State_Disabled: - // don't overwrite it with the version automatically created - // from the normal one - m_disabledSetByUser = true; - break; - - default: - // nothing special to do but include the default clause to - // suppress gcc warnings - ; - } - } - - wxBitmapButtonBase::DoSetBitmap(bitmap, which); -} - #endif // wxUSE_BMPBUTTON diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index 09f346bcdd..2d266918b7 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -277,28 +277,28 @@ wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->GetColour(); } wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->GetStyle(); } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return M_BRUSHDATA->GetStipple(); } WXHANDLE wxBrush::GetResourceHandle() const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), FALSE, wxT("invalid brush") ); return (WXHANDLE)M_BRUSHDATA->GetHBRUSH(); } diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 10bb135fb5..e87917bd64 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -52,314 +52,12 @@ #include "wx/generic/private/markuptext.h" #endif // wxUSE_MARKUP -using namespace wxMSWImpl; - -#if wxUSE_UXTHEME - #include "wx/msw/uxtheme.h" - - // no need to include tmschema.h - #ifndef BP_PUSHBUTTON - #define BP_PUSHBUTTON 1 - - #define PBS_NORMAL 1 - #define PBS_HOT 2 - #define PBS_PRESSED 3 - #define PBS_DISABLED 4 - #define PBS_DEFAULTED 5 - - #define TMT_CONTENTMARGINS 3602 - #endif - - // provide the necessary declarations ourselves if they're missing from - // headers - #ifndef BCM_SETIMAGELIST - #define BCM_SETIMAGELIST 0x1602 - #define BCM_SETTEXTMARGIN 0x1604 - - enum - { - BUTTON_IMAGELIST_ALIGN_LEFT, - BUTTON_IMAGELIST_ALIGN_RIGHT, - BUTTON_IMAGELIST_ALIGN_TOP, - BUTTON_IMAGELIST_ALIGN_BOTTOM - }; - - struct BUTTON_IMAGELIST - { - HIMAGELIST himl; - RECT margin; - UINT uAlign; - }; - #endif -#endif // wxUSE_UXTHEME - -#ifndef WM_THEMECHANGED - #define WM_THEMECHANGED 0x031A -#endif - -#ifndef ODS_NOACCEL - #define ODS_NOACCEL 0x0100 -#endif - -#ifndef ODS_NOFOCUSRECT - #define ODS_NOFOCUSRECT 0x0200 -#endif - -#ifndef DT_HIDEPREFIX - #define DT_HIDEPREFIX 0x00100000 -#endif - // set the value for BCM_SETSHIELD (for the UAC shield) if it's not defined in // the header #ifndef BCM_SETSHIELD #define BCM_SETSHIELD 0x160c #endif -#if wxUSE_UXTHEME -extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp -#endif // wxUSE_UXTHEME - -// ---------------------------------------------------------------------------- -// button image data -// ---------------------------------------------------------------------------- - -// we use different data classes for owner drawn buttons and for themed XP ones - -class wxButtonImageData -{ -public: - wxButtonImageData() { } - virtual ~wxButtonImageData() { } - - virtual wxBitmap GetBitmap(wxButton::State which) const = 0; - virtual void SetBitmap(const wxBitmap& bitmap, wxButton::State which) = 0; - - virtual wxSize GetBitmapMargins() const = 0; - virtual void SetBitmapMargins(wxCoord x, wxCoord y) = 0; - - virtual wxDirection GetBitmapPosition() const = 0; - virtual void SetBitmapPosition(wxDirection dir) = 0; - -private: - wxDECLARE_NO_COPY_CLASS(wxButtonImageData); -}; - -namespace -{ - -// the gap between button edge and the interior area used by Windows for the -// standard buttons -const int OD_BUTTON_MARGIN = 4; - -class wxODButtonImageData : public wxButtonImageData -{ -public: - wxODButtonImageData(wxButton *btn, const wxBitmap& bitmap) - { - SetBitmap(bitmap, wxButton::State_Normal); - SetBitmap(bitmap.ConvertToDisabled(), wxButton::State_Disabled); - - m_dir = wxLEFT; - - // we use margins when we have both bitmap and text, but when we have - // only the bitmap it should take up the entire button area - if ( btn->ShowsLabel() ) - { - m_margin.x = btn->GetCharWidth(); - m_margin.y = btn->GetCharHeight() / 2; - } - } - - virtual wxBitmap GetBitmap(wxButton::State which) const - { - return m_bitmaps[which]; - } - - virtual void SetBitmap(const wxBitmap& bitmap, wxButton::State which) - { - m_bitmaps[which] = bitmap; - } - - virtual wxSize GetBitmapMargins() const - { - return m_margin; - } - - virtual void SetBitmapMargins(wxCoord x, wxCoord y) - { - m_margin = wxSize(x, y); - } - - virtual wxDirection GetBitmapPosition() const - { - return m_dir; - } - - virtual void SetBitmapPosition(wxDirection dir) - { - m_dir = dir; - } - -private: - // just store the values passed to us to be able to retrieve them later - // from the drawing code - wxBitmap m_bitmaps[wxButton::State_Max]; - wxSize m_margin; - wxDirection m_dir; - - wxDECLARE_NO_COPY_CLASS(wxODButtonImageData); -}; - -#if wxUSE_UXTHEME - -// somehow the margin is one pixel greater than the value returned by -// GetThemeMargins() call -const int XP_BUTTON_EXTRA_MARGIN = 1; - -class wxXPButtonImageData : public wxButtonImageData -{ -public: - // we must be constructed with the size of our images as we need to create - // the image list - wxXPButtonImageData(wxButton *btn, const wxBitmap& bitmap) - : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */, - wxButton::State_Max), - m_hwndBtn(GetHwndOf(btn)) - { - // initialize all bitmaps except for the disabled one to normal state - for ( int n = 0; n < wxButton::State_Max; n++ ) - { - m_iml.Add(n == wxButton::State_Disabled ? bitmap.ConvertToDisabled() - : bitmap); - } - - m_data.himl = GetHimagelistOf(&m_iml); - - // no margins by default - m_data.margin.left = - m_data.margin.right = - m_data.margin.top = - m_data.margin.bottom = 0; - - // use default alignment - m_data.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; - - UpdateImageInfo(); - } - - virtual wxBitmap GetBitmap(wxButton::State which) const - { - return m_iml.GetBitmap(which); - } - - virtual void SetBitmap(const wxBitmap& bitmap, wxButton::State which) - { - m_iml.Replace(which, bitmap); - - UpdateImageInfo(); - } - - virtual wxSize GetBitmapMargins() const - { - return wxSize(m_data.margin.left, m_data.margin.top); - } - - virtual void SetBitmapMargins(wxCoord x, wxCoord y) - { - RECT& margin = m_data.margin; - margin.left = - margin.right = x; - margin.top = - margin.bottom = y; - - if ( !::SendMessage(m_hwndBtn, BCM_SETTEXTMARGIN, 0, (LPARAM)&margin) ) - { - wxLogDebug("SendMessage(BCM_SETTEXTMARGIN) failed"); - } - } - - virtual wxDirection GetBitmapPosition() const - { - switch ( m_data.uAlign ) - { - default: - wxFAIL_MSG( "invalid image alignment" ); - // fall through - - case BUTTON_IMAGELIST_ALIGN_LEFT: - return wxLEFT; - - case BUTTON_IMAGELIST_ALIGN_RIGHT: - return wxRIGHT; - - case BUTTON_IMAGELIST_ALIGN_TOP: - return wxTOP; - - case BUTTON_IMAGELIST_ALIGN_BOTTOM: - return wxBOTTOM; - } - } - - virtual void SetBitmapPosition(wxDirection dir) - { - UINT alignNew; - switch ( dir ) - { - default: - wxFAIL_MSG( "invalid direction" ); - // fall through - - case wxLEFT: - alignNew = BUTTON_IMAGELIST_ALIGN_LEFT; - break; - - case wxRIGHT: - alignNew = BUTTON_IMAGELIST_ALIGN_RIGHT; - break; - - case wxTOP: - alignNew = BUTTON_IMAGELIST_ALIGN_TOP; - break; - - case wxBOTTOM: - alignNew = BUTTON_IMAGELIST_ALIGN_BOTTOM; - break; - } - - if ( alignNew != m_data.uAlign ) - { - m_data.uAlign = alignNew; - UpdateImageInfo(); - } - } - -private: - void UpdateImageInfo() - { - if ( !::SendMessage(m_hwndBtn, BCM_SETIMAGELIST, 0, (LPARAM)&m_data) ) - { - wxLogDebug("SendMessage(BCM_SETIMAGELIST) failed"); - } - } - - // we store image list separately to be able to use convenient wxImageList - // methods instead of working with raw HIMAGELIST - wxImageList m_iml; - - // store the rest of the data in BCM_SETIMAGELIST-friendly form - BUTTON_IMAGELIST m_data; - - // the button we're associated with - const HWND m_hwndBtn; - - - wxDECLARE_NO_COPY_CLASS(wxXPButtonImageData); -}; - -#endif // wxUSE_UXTHEME - -} // anonymous namespace - // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -368,86 +66,6 @@ private: // implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// helper functions from wx/msw/private/button.h -// ---------------------------------------------------------------------------- - -void wxMSWButton::UpdateMultilineStyle(HWND hwnd, const wxString& label) -{ - // update BS_MULTILINE style depending on the new label (resetting it - // doesn't seem to do anything very useful but it shouldn't hurt and we do - // have to set it whenever the label becomes multi line as otherwise it - // wouldn't be shown correctly as we don't use BS_MULTILINE when creating - // the control unless it already has new lines in its label) - long styleOld = ::GetWindowLong(hwnd, GWL_STYLE), - styleNew; - if ( label.find(wxT('\n')) != wxString::npos ) - styleNew = styleOld | BS_MULTILINE; - else - styleNew = styleOld & ~BS_MULTILINE; - - if ( styleNew != styleOld ) - ::SetWindowLong(hwnd, GWL_STYLE, styleNew); -} - -wxSize wxMSWButton::GetFittingSize(wxWindow *win, - const wxSize& sizeLabel, - int flags) -{ - // FIXME: this is pure guesswork, need to retrieve the real button margins - wxSize sizeBtn = sizeLabel; - - sizeBtn.x += 3*win->GetCharWidth(); - sizeBtn.y += win->GetCharHeight()/2; - - // account for the shield UAC icon if we have it - if ( flags & Size_AuthNeeded ) - sizeBtn.x += wxSystemSettings::GetMetric(wxSYS_SMALLICON_X); - - return sizeBtn; -} - -wxSize wxMSWButton::ComputeBestFittingSize(wxControl *btn, int flags) -{ - wxClientDC dc(btn); - - wxSize sizeBtn; - dc.GetMultiLineTextExtent(btn->GetLabelText(), &sizeBtn.x, &sizeBtn.y); - - return GetFittingSize(btn, sizeBtn, flags); -} - -wxSize wxMSWButton::IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size) -{ - wxSize sizeBtn(size); - - // All buttons have at least the standard height and, unless the user - // explicitly wants them to be as small as possible and used wxBU_EXACTFIT - // style to indicate this, of at least the standard width too. - // - // Notice that we really want to make all buttons equally high, otherwise - // they look ugly and the existing code using wxBU_EXACTFIT only uses it to - // control width and not height. - - // The 50x14 button size is documented in the "Recommended sizing and - // spacing" section of MSDN layout article. - // - // Note that we intentionally don't use GetDefaultSize() here, because - // it's inexact -- dialog units depend on this dialog's font. - const wxSize sizeDef = btn->ConvertDialogToPixels(wxSize(50, 14)); - if ( !btn->HasFlag(wxBU_EXACTFIT) ) - { - if ( sizeBtn.x < sizeDef.x ) - sizeBtn.x = sizeDef.x; - } - if ( sizeBtn.y < sizeDef.y ) - sizeBtn.y = sizeDef.y; - - btn->CacheBestSize(sizeBtn); - - return sizeBtn; -} - // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -498,11 +116,6 @@ wxButton::~wxButton() { UnsetTmpDefault(); } - - delete m_imageData; -#if wxUSE_MARKUP - delete m_markupText; -#endif // wxUSE_MARKUP } // ---------------------------------------------------------------------------- @@ -541,132 +154,6 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const return msStyle; } -void wxButton::SetLabel(const wxString& label) -{ - wxMSWButton::UpdateMultilineStyle(GetHwnd(), label); - - wxButtonBase::SetLabel(label); - -#if wxUSE_MARKUP - // If we have a plain text label, we shouldn't be using markup any longer. - if ( m_markupText ) - { - delete m_markupText; - m_markupText = NULL; - - // Unfortunately we don't really know whether we can reset the button - // to be non-owner-drawn or not: if we had made it owner-drawn just - // because of a call to SetLabelMarkup(), we could, but not if there - // were [also] calls to Set{Fore,Back}groundColour(). If it's really a - // problem to have button remain owner-drawn forever just because it - // had markup label once, we should record the reason for our current - // owner-drawnness and check it here. - } -#endif // wxUSE_MARKUP -} - -// ---------------------------------------------------------------------------- -// size management including autosizing -// ---------------------------------------------------------------------------- - -void wxButton::AdjustForBitmapSize(wxSize &size) const -{ - wxCHECK_RET( m_imageData, wxT("shouldn't be called if no image") ); - - // 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(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 -{ - wxButton * const self = const_cast(this); - - wxSize size; - - // Account for the text part if we have it. - if ( ShowsLabel() ) - { - int flags = 0; - if ( GetAuthNeeded() ) - flags |= wxMSWButton::Size_AuthNeeded; - -#if wxUSE_MARKUP - if ( m_markupText ) - { - wxClientDC dc(self); - size = wxMSWButton::GetFittingSize(self, - m_markupText->Measure(dc), - flags); - } - else // Normal plain text (but possibly multiline) label. -#endif // wxUSE_MARKUP - { - size = wxMSWButton::ComputeBestFittingSize(self, flags); - } - } - - if ( m_imageData ) - AdjustForBitmapSize(size); - - return wxMSWButton::IncreaseToStdSizeAndCache(self, size); -} - /* static */ wxSize wxButtonBase::GetDefaultSize() { @@ -922,44 +409,9 @@ WXLRESULT wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { UnsetTmpDefault(); } - else if ( nMsg == WM_LBUTTONDBLCLK ) - { - // emulate a click event to force an owner-drawn button to change its - // appearance - without this, it won't do it - (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam); - - // and continue with processing the message normally as well - } -#if wxUSE_UXTHEME - else if ( nMsg == WM_THEMECHANGED ) - { - // need to recalculate the best size here - // as the theme size might have changed - InvalidateBestSize(); - } -#endif // wxUSE_UXTHEME - // must use m_mouseInWindow here instead of IsMouseInWindow() - // since we need to know the first time the mouse enters the window - // and IsMouseInWindow() would return true in this case - else if ( (nMsg == WM_MOUSEMOVE && !m_mouseInWindow) || - nMsg == WM_MOUSELEAVE ) - { - if ( - IsEnabled() && - ( -#if wxUSE_UXTHEME - wxUxThemeEngine::GetIfActive() || -#endif // wxUSE_UXTHEME - (m_imageData && m_imageData->GetBitmap(State_Current).IsOk()) - ) - ) - { - Refresh(); - } - } // let the base class do all real processing - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + return wxAnyButton::MSWWindowProc(nMsg, wParam, lParam); } // ---------------------------------------------------------------------------- @@ -982,586 +434,5 @@ void wxButton::DoSetAuthNeeded(bool show) } } -// ---------------------------------------------------------------------------- -// button images -// ---------------------------------------------------------------------------- - -wxBitmap wxButton::DoGetBitmap(State which) const -{ - return m_imageData ? m_imageData->GetBitmap(which) : wxBitmap(); -} - -void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ -#if wxUSE_UXTHEME - wxXPButtonImageData *oldData = NULL; -#endif // wxUSE_UXTHEME - - // Check if we already had bitmaps of different size. - if ( m_imageData && - bitmap.GetSize() != m_imageData->GetBitmap(State_Normal).GetSize() ) - { - wxASSERT_MSG( which == State_Normal, - "Must set normal bitmap with the new size first" ); - -#if wxUSE_UXTHEME - if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() ) - { - // We can't change the size of the images stored in wxImageList - // in wxXPButtonImageData::m_iml so force recreating it below but - // keep the current data to copy its values into the new one. - oldData = static_cast(m_imageData); - m_imageData = NULL; - } -#endif // wxUSE_UXTHEME - //else: wxODButtonImageData doesn't require anything special - } - - // allocate the image data when the first bitmap is set - if ( !m_imageData ) - { -#if wxUSE_UXTHEME - // using image list doesn't work correctly if we don't have any label - // (even if we use BUTTON_IMAGELIST_ALIGN_CENTER alignment and - // BS_BITMAP style), at least under Windows 2003 so use owner drawn - // strategy for bitmap-only buttons - if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() ) - { - m_imageData = new wxXPButtonImageData(this, bitmap); - - if ( oldData ) - { - // Preserve the old values in case the user changed them. - m_imageData->SetBitmapPosition(oldData->GetBitmapPosition()); - - const wxSize oldMargins = oldData->GetBitmapMargins(); - m_imageData->SetBitmapMargins(oldMargins.x, oldMargins.y); - - // No need to preserve the bitmaps though as they were of wrong - // size anyhow. - - delete oldData; - } - } - else -#endif // wxUSE_UXTHEME - { - m_imageData = new wxODButtonImageData(this, bitmap); - MakeOwnerDrawn(); - } - } - else - { - m_imageData->SetBitmap(bitmap, which); - } - - // it should be enough to only invalidate the best size when the normal - // bitmap changes as all bitmaps assigned to the button should be of the - // same size anyhow - if ( which == State_Normal ) - InvalidateBestSize(); - - Refresh(); -} - -wxSize wxButton::DoGetBitmapMargins() const -{ - return m_imageData ? m_imageData->GetBitmapMargins() : wxSize(0, 0); -} - -void wxButton::DoSetBitmapMargins(wxCoord x, wxCoord y) -{ - wxCHECK_RET( m_imageData, "SetBitmap() must be called first" ); - - m_imageData->SetBitmapMargins(x, y); - InvalidateBestSize(); -} - -void wxButton::DoSetBitmapPosition(wxDirection dir) -{ - wxCHECK_RET( m_imageData, "SetBitmap() must be called first" ); - - m_imageData->SetBitmapPosition(dir); - InvalidateBestSize(); -} - -// ---------------------------------------------------------------------------- -// markup support -// ---------------------------------------------------------------------------- - -#if wxUSE_MARKUP - -bool wxButton::DoSetLabelMarkup(const wxString& markup) -{ - if ( !wxButtonBase::DoSetLabelMarkup(markup) ) - return false; - - if ( !m_markupText ) - { - m_markupText = new wxMarkupText(markup); - MakeOwnerDrawn(); - } - else - { - // We are already owner-drawn so just update the text. - m_markupText->SetMarkup(markup); - } - - Refresh(); - - return true; -} - -#endif // wxUSE_MARKUP - -// ---------------------------------------------------------------------------- -// owner-drawn buttons support -// ---------------------------------------------------------------------------- - -// drawing helpers -namespace -{ - -// return the button state using both the ODS_XXX flags specified in state -// parameter and the current button state -wxButton::State GetButtonState(wxButton *btn, UINT state) -{ - if ( state & ODS_DISABLED ) - return wxButton::State_Disabled; - - if ( state & ODS_SELECTED ) - return wxButton::State_Pressed; - - if ( btn->HasCapture() || btn->IsMouseInWindow() ) - return wxButton::State_Current; - - if ( state & ODS_FOCUS ) - return wxButton::State_Focused; - - return wxButton::State_Normal; -} - -void DrawButtonText(HDC hdc, - RECT *pRect, - wxButton *btn, - int flags) -{ - const wxString text = btn->GetLabel(); - - if ( text.find(wxT('\n')) != wxString::npos ) - { - // draw multiline label - - // center text horizontally in any case - flags |= DT_CENTER; - - // first we need to compute its bounding rect - RECT rc; - ::CopyRect(&rc, pRect); - ::DrawText(hdc, text.wx_str(), text.length(), &rc, - DT_CENTER | DT_CALCRECT); - - // now center this rect inside the entire button area - const LONG w = rc.right - rc.left; - const LONG h = rc.bottom - rc.top; - rc.left = (pRect->right - pRect->left)/2 - w/2; - rc.right = rc.left+w; - rc.top = (pRect->bottom - pRect->top)/2 - h/2; - rc.bottom = rc.top+h; - - ::DrawText(hdc, text.wx_str(), text.length(), &rc, flags); - } - else // single line label - { - // translate wx button flags to alignment flags for DrawText() - if ( btn->HasFlag(wxBU_RIGHT) ) - { - flags |= DT_RIGHT; - } - else if ( !btn->HasFlag(wxBU_LEFT) ) - { - flags |= DT_CENTER; - } - //else: DT_LEFT is the default anyhow (and its value is 0 too) - - if ( btn->HasFlag(wxBU_BOTTOM) ) - { - flags |= DT_BOTTOM; - } - else if ( !btn->HasFlag(wxBU_TOP) ) - { - flags |= DT_VCENTER; - } - //else: as above, DT_TOP is the default - - // notice that we must have DT_SINGLELINE for vertical alignment flags - // to work - ::DrawText(hdc, text.wx_str(), text.length(), pRect, - flags | DT_SINGLELINE ); - } -} - -void DrawRect(HDC hdc, const RECT& r) -{ - wxDrawLine(hdc, r.left, r.top, r.right, r.top); - wxDrawLine(hdc, r.right, r.top, r.right, r.bottom); - wxDrawLine(hdc, r.right, r.bottom, r.left, r.bottom); - wxDrawLine(hdc, r.left, r.bottom, r.left, r.top); -} - -/* - The button frame looks like this normally: - - WWWWWWWWWWWWWWWWWWB - WHHHHHHHHHHHHHHHHGB W = white (HILIGHT) - WH GB H = light grey (LIGHT) - WH GB G = dark grey (SHADOW) - WH GB B = black (DKSHADOW) - WH GB - WGGGGGGGGGGGGGGGGGB - BBBBBBBBBBBBBBBBBBB - - When the button is selected, the button becomes like this (the total button - size doesn't change): - - BBBBBBBBBBBBBBBBBBB - BWWWWWWWWWWWWWWWWBB - BWHHHHHHHHHHHHHHGBB - BWH GBB - BWH GBB - BWGGGGGGGGGGGGGGGBB - BBBBBBBBBBBBBBBBBBB - BBBBBBBBBBBBBBBBBBB - - When the button is pushed (while selected) it is like: - - BBBBBBBBBBBBBBBBBBB - BGGGGGGGGGGGGGGGGGB - BG GB - BG GB - BG GB - BG GB - BGGGGGGGGGGGGGGGGGB - BBBBBBBBBBBBBBBBBBB -*/ -void DrawButtonFrame(HDC hdc, RECT& rectBtn, - bool selected, bool pushed) -{ - RECT r; - CopyRect(&r, &rectBtn); - - AutoHPEN hpenBlack(GetSysColor(COLOR_3DDKSHADOW)), - hpenGrey(GetSysColor(COLOR_3DSHADOW)), - hpenLightGr(GetSysColor(COLOR_3DLIGHT)), - hpenWhite(GetSysColor(COLOR_3DHILIGHT)); - - SelectInHDC selectPen(hdc, hpenBlack); - - r.right--; - r.bottom--; - - if ( pushed ) - { - DrawRect(hdc, r); - - (void)SelectObject(hdc, hpenGrey); - ::InflateRect(&r, -1, -1); - - DrawRect(hdc, r); - } - else // !pushed - { - if ( selected ) - { - DrawRect(hdc, r); - - ::InflateRect(&r, -1, -1); - } - - wxDrawLine(hdc, r.left, r.bottom, r.right, r.bottom); - wxDrawLine(hdc, r.right, r.bottom, r.right, r.top - 1); - - (void)SelectObject(hdc, hpenWhite); - wxDrawLine(hdc, r.left, r.bottom - 1, r.left, r.top); - wxDrawLine(hdc, r.left, r.top, r.right, r.top); - - (void)SelectObject(hdc, hpenLightGr); - wxDrawLine(hdc, r.left + 1, r.bottom - 2, r.left + 1, r.top + 1); - wxDrawLine(hdc, r.left + 1, r.top + 1, r.right - 1, r.top + 1); - - (void)SelectObject(hdc, hpenGrey); - wxDrawLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1); - wxDrawLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top); - } - - InflateRect(&rectBtn, -OD_BUTTON_MARGIN, -OD_BUTTON_MARGIN); -} - -#if wxUSE_UXTHEME -void DrawXPBackground(wxButton *button, HDC hdc, RECT& rectBtn, UINT state) -{ - wxUxThemeHandle theme(button, L"BUTTON"); - - // this array is indexed by wxButton::State values and so must be kept in - // sync with it - static const int uxStates[] = - { - PBS_NORMAL, PBS_HOT, PBS_PRESSED, PBS_DISABLED, PBS_DEFAULTED - }; - - int iState = uxStates[GetButtonState(button, state)]; - - wxUxThemeEngine * const engine = wxUxThemeEngine::Get(); - - // draw parent background if needed - if ( engine->IsThemeBackgroundPartiallyTransparent - ( - theme, - BP_PUSHBUTTON, - iState - ) ) - { - // Set this button as the one whose background is being erased: this - // allows our WM_ERASEBKGND handler used by DrawThemeParentBackground() - // to correctly align the background brush with this window instead of - // the parent window to which WM_ERASEBKGND is sent. Notice that this - // doesn't work with custom user-defined EVT_ERASE_BACKGROUND handlers - // as they won't be aligned but unfortunately all the attempts to fix - // it by shifting DC origin before calling DrawThemeParentBackground() - // failed to work so we at least do this, even though this is far from - // being the perfect solution. - wxWindowBeingErased = button; - - engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn); - - wxWindowBeingErased = NULL; - } - - // draw background - engine->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState, - &rectBtn, NULL); - - // calculate content area margins - MARGINS margins; - engine->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState, - TMT_CONTENTMARGINS, &rectBtn, &margins); - ::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight); - ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN); - - if ( button->UseBgCol() ) - { - COLORREF colBg = wxColourToRGB(button->GetBackgroundColour()); - AutoHBRUSH hbrushBackground(colBg); - - // don't overwrite the focus rect - RECT rectClient; - ::CopyRect(&rectClient, &rectBtn); - ::InflateRect(&rectClient, -1, -1); - FillRect(hdc, &rectClient, hbrushBackground); - } -} -#endif // wxUSE_UXTHEME - -} // anonymous namespace - -// ---------------------------------------------------------------------------- -// owner drawn buttons support -// ---------------------------------------------------------------------------- - -void wxButton::MakeOwnerDrawn() -{ - long style = GetWindowLong(GetHwnd(), GWL_STYLE); - if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW ) - { - // make it so - style |= BS_OWNERDRAW; - SetWindowLong(GetHwnd(), GWL_STYLE, style); - } -} - -bool wxButton::SetBackgroundColour(const wxColour &colour) -{ - if ( !wxControl::SetBackgroundColour(colour) ) - { - // nothing to do - return false; - } - - MakeOwnerDrawn(); - - Refresh(); - - return true; -} - -bool wxButton::SetForegroundColour(const wxColour &colour) -{ - if ( !wxControl::SetForegroundColour(colour) ) - { - // nothing to do - return false; - } - - MakeOwnerDrawn(); - - Refresh(); - - return true; -} - -bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) -{ - LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis; - HDC hdc = lpDIS->hDC; - - UINT state = lpDIS->itemState; - bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0; - - RECT rectBtn; - CopyRect(&rectBtn, &lpDIS->rcItem); - - // draw the button background - if ( !HasFlag(wxBORDER_NONE) ) - { -#if wxUSE_UXTHEME - if ( wxUxThemeEngine::GetIfActive() ) - { - DrawXPBackground(this, hdc, rectBtn, state); - } - else -#endif // wxUSE_UXTHEME - { - COLORREF colBg = wxColourToRGB(GetBackgroundColour()); - - // first, draw the background - AutoHBRUSH hbrushBackground(colBg); - FillRect(hdc, &rectBtn, hbrushBackground); - - // draw the border for the current state - bool selected = (state & ODS_SELECTED) != 0; - if ( !selected ) - { - wxTopLevelWindow * - tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - if ( tlw ) - { - selected = tlw->GetDefaultItem() == this; - } - } - - DrawButtonFrame(hdc, rectBtn, selected, pushed); - } - - // draw the focus rectangle if we need it - if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) ) - { - DrawFocusRect(hdc, &rectBtn); - -#if wxUSE_UXTHEME - if ( !wxUxThemeEngine::GetIfActive() ) -#endif // wxUSE_UXTHEME - { - if ( pushed ) - { - // the label is shifted by 1 pixel to create "pushed" effect - OffsetRect(&rectBtn, 1, 1); - } - } - } - } - - - // draw the image, if any - if ( m_imageData ) - { - wxBitmap bmp = m_imageData->GetBitmap(GetButtonState(this, state)); - if ( !bmp.IsOk() ) - bmp = m_imageData->GetBitmap(State_Normal); - - const wxSize sizeBmp = bmp.GetSize(); - const wxSize margin = m_imageData->GetBitmapMargins(); - const wxSize sizeBmpWithMargins(sizeBmp + 2*margin); - wxRect rectButton(wxRectFromRECT(rectBtn)); - - // for simplicity, we start with centred rectangle and then move it to - // the appropriate edge - wxRect rectBitmap = wxRect(sizeBmp).CentreIn(rectButton); - - // move bitmap only if we have a label, otherwise keep it centered - if ( ShowsLabel() ) - { - switch ( m_imageData->GetBitmapPosition() ) - { - default: - wxFAIL_MSG( "invalid direction" ); - // fall through - - case wxLEFT: - rectBitmap.x = rectButton.x + margin.x; - rectButton.x += sizeBmpWithMargins.x; - rectButton.width -= sizeBmpWithMargins.x; - break; - - case wxRIGHT: - rectBitmap.x = rectButton.GetRight() - sizeBmp.x - margin.x; - rectButton.width -= sizeBmpWithMargins.x; - break; - - case wxTOP: - rectBitmap.y = rectButton.y + margin.y; - rectButton.y += sizeBmpWithMargins.y; - rectButton.height -= sizeBmpWithMargins.y; - break; - - case wxBOTTOM: - rectBitmap.y = rectButton.GetBottom() - sizeBmp.y - margin.y; - rectButton.height -= sizeBmpWithMargins.y; - break; - } - } - - wxDCTemp dst((WXHDC)hdc); - dst.DrawBitmap(bmp, rectBitmap.GetPosition(), true); - - wxCopyRectToRECT(rectButton, rectBtn); - } - - - // finally draw the label - if ( ShowsLabel() ) - { - COLORREF colFg = state & ODS_DISABLED - ? ::GetSysColor(COLOR_GRAYTEXT) - : wxColourToRGB(GetForegroundColour()); - - wxTextColoursChanger changeFg(hdc, colFg, CLR_INVALID); - wxBkModeChanger changeBkMode(hdc, wxBRUSHSTYLE_TRANSPARENT); - -#if wxUSE_MARKUP - if ( m_markupText ) - { - wxDCTemp dc((WXHDC)hdc); - dc.SetTextForeground(wxColour(colFg)); - dc.SetFont(GetFont()); - - m_markupText->Render(dc, wxRectFromRECT(rectBtn), - state & ODS_NOACCEL - ? wxMarkupText::Render_Default - : wxMarkupText::Render_ShowAccels); - } - else // Plain text label -#endif // wxUSE_MARKUP - { - // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000) - // systems but by happy coincidence ODS_NOACCEL is not used under - // them neither so DT_HIDEPREFIX should never be used there - DrawButtonText(hdc, &rectBtn, this, - state & ODS_NOACCEL ? DT_HIDEPREFIX : 0); - } - } - - return true; -} - #endif // wxUSE_BUTTON diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index a4e49c8ccb..3e4c964624 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -260,7 +260,7 @@ bool wxCheckBox::SetForegroundColour(const wxColour& colour) // the only way to change the checkbox foreground colour under Windows XP // is to owner draw it if ( wxUxThemeEngine::GetIfActive() ) - MakeOwnerDrawn(colour.Ok()); + MakeOwnerDrawn(colour.IsOk()); return true; } diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index 594610275d..da105ae254 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -214,7 +214,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, { wxBitmap *bitmap = (wxBitmap *)data; - if ( bitmap && bitmap->Ok() ) + if ( bitmap && bitmap->IsOk() ) { wxDIB dib(*bitmap); if ( dib.IsOk() ) diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 056794b517..0d937c9016 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -365,7 +365,7 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) HDC hdc = (HDC)pDC; WXHBRUSH hbr = 0; - if ( !colBg.Ok() ) + if ( !colBg.IsOk() ) { if ( wxWindow *win = wxFindWinFromHandle(hWnd) ) hbr = win->MSWGetBgBrush(pDC); @@ -380,7 +380,7 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) // use the background colour override if a valid colour is given: this is // used when the control is disabled to grey it out and also if colBg was // set just above - if ( colBg.Ok() ) + if ( colBg.IsOk() ) { wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg); hbr = (WXHBRUSH)brush->GetResourceHandle(); diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index bfa5771d24..74f57dcf52 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -391,7 +391,7 @@ const wxCursor *wxGetGlobalCursor() void wxSetCursor(const wxCursor& cursor) { - if ( cursor.Ok() ) + if ( cursor.IsOk() ) { ::SetCursor(GetHcursorOf(cursor)); diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp index 31952163c8..c544e32251 100644 --- a/src/msw/datectrl.cpp +++ b/src/msw/datectrl.cpp @@ -188,12 +188,41 @@ void wxDatePickerCtrl::SetValue(const wxDateTime& dt) SYSTEMTIME st; if ( dt.IsValid() ) + { + // Don't try setting the date if it's out of range: calendar control + // under XP (and presumably all the other pre-Vista Windows versions) + // doesn't return false from DateTime_SetSystemtime() in this case but + // doesn't actually change the date, so we can't update our m_date + // unconditionally and would need to check whether it was changed + // before doing it. It looks simpler to just check whether it's in + // range here instead. + // + // If we ever drop support for XP we could rely on the return value of + // DateTime_SetSystemtime() but this probably won't happen in near + // future. + wxDateTime dtStart, dtEnd; + GetRange(&dtStart, &dtEnd); + if ( (dtStart.IsValid() && dt < dtStart) || + (dtEnd.IsValid() && dt > dtEnd) ) + { + // Fail silently, some existing code relies on SetValue() with an + // out of range value simply doing nothing -- so don't. + return; + } + dt.GetAsMSWSysTime(&st); + } + if ( !DateTime_SetSystemtime(GetHwnd(), dt.IsValid() ? GDT_VALID : GDT_NONE, &st) ) { - wxLogDebug(wxT("DateTime_SetSystemtime() failed")); + // The only expected failure is when the date is out of range but we + // already checked for this above. + wxFAIL_MSG( wxT("Setting the calendar date unexpectedly failed.") ); + + // In any case, skip updating m_date below. + return; } // we need to keep only the date part, times don't make sense for this diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index e0e1ec6523..4420abf53a 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -34,6 +34,7 @@ #include "wx/bitmap.h" #include "wx/dcmemory.h" #include "wx/log.h" + #include "wx/math.h" #include "wx/icon.h" #include "wx/dcprint.h" #include "wx/module.h" @@ -82,7 +83,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl) // constants // --------------------------------------------------------------------------- -static const int VIEWPORT_EXTENT = 1024; +// The device space in Win32 GDI measures 2^27*2^27 , so we use 2^27-1 as the +// maximal possible view port extent. +static const int VIEWPORT_EXTENT = 134217727; // ROPs which don't have standard names (see "Ternary Raster Operations" in the // MSDN docs for how this and other numbers in wxDC::Blit() are obtained) @@ -1959,6 +1962,31 @@ bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widt return true; } +namespace +{ + +void ApplyEffectiveScale(double scale, int sign, int *device, int *logical) +{ + // To reduce rounding errors as much as possible, we try to use the largest + // possible extent (2^27-1) for the device space but we must also avoid + // overflowing the int range i.e. ensure that logical extents are less than + // 2^31 in magnitude. So the minimal scale we can use is 1/16 as for + // anything smaller VIEWPORT_EXTENT/scale would overflow the int range. + static const double MIN_LOGICAL_SCALE = 1./16; + + double physExtent = VIEWPORT_EXTENT; + if ( scale < MIN_LOGICAL_SCALE ) + { + physExtent *= scale/MIN_LOGICAL_SCALE; + scale = MIN_LOGICAL_SCALE; + } + + *device = wxRound(physExtent); + *logical = sign*wxRound(VIEWPORT_EXTENT/scale); +} + +} // anonymous namespace + void wxMSWDCImpl::RealizeScaleAndOrigin() { // although it may seem wasteful to always use MM_ANISOTROPIC here instead @@ -1969,34 +1997,13 @@ void wxMSWDCImpl::RealizeScaleAndOrigin() // wxWidgets API assumes that the coordinate space is "infinite" (i.e. only // limited by 2^32 range of the integer coordinates) but in MSW API we must - // actually specify the extents that we use. So we more or less arbitrarily - // decide to use "base" VIEWPORT_EXTENT and adjust it depending on scale. - // - // To avoid rounding errors we prefer to multiply by the scale if it's > 1 - // and to divide by it if it's < 1. + // actually specify the extents that we use so compute them here. + int devExtX, devExtY, // Viewport, i.e. device space, extents. logExtX, logExtY; // Window, i.e. logical coordinate space, extents. - if ( m_scaleX >= 1 ) - { - devExtX = VIEWPORT_EXTENT*m_scaleX; - logExtX = m_signX*VIEWPORT_EXTENT; - } - else - { - devExtX = VIEWPORT_EXTENT; - logExtX = m_signX*VIEWPORT_EXTENT/m_scaleX; - } - if ( m_scaleY >= 1 ) - { - devExtY = VIEWPORT_EXTENT*m_scaleY; - logExtY = m_signY*VIEWPORT_EXTENT; - } - else - { - devExtY = VIEWPORT_EXTENT; - logExtY = m_signY*VIEWPORT_EXTENT/m_scaleY; - } + ApplyEffectiveScale(m_scaleX, m_signX, &devExtX, &logExtX); + ApplyEffectiveScale(m_scaleY, m_signY, &devExtY, &logExtY); ::SetViewportExtEx(GetHdc(), devExtX, devExtY, NULL); ::SetWindowExtEx(GetHdc(), logExtX, logExtY, NULL); diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index bad81c1e72..4564a189d1 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -225,6 +225,12 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) : } #endif // wxHAS_PAINT_DEBUG + // see comments in src/msw/window.cpp where this is defined + extern bool wxDidCreatePaintDC; + + wxDidCreatePaintDC = true; + + m_window = window; // do we have a DC for this window in the cache? @@ -236,11 +242,6 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) : } else // not in cache, create a new one { - // see comments in src/msw/window.cpp where this is defined - extern bool wxDidCreatePaintDC; - - wxDidCreatePaintDC = true; - m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_window), &g_paintStruct); if (m_hDC) ms_cache.Add(new wxPaintDCInfo(m_window, this)); diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp index c84983ad85..b419feb715 100644 --- a/src/msw/dcmemory.cpp +++ b/src/msw/dcmemory.cpp @@ -104,7 +104,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) if ( m_oldBitmap ) { ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap); - if ( m_selectedBitmap.Ok() ) + if ( m_selectedBitmap.IsOk() ) { m_selectedBitmap.SetSelectedInto(NULL); m_selectedBitmap = wxNullBitmap; @@ -138,7 +138,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) void wxMemoryDCImpl::DoGetSize(int *width, int *height) const { - if ( m_selectedBitmap.Ok() ) + if ( m_selectedBitmap.IsOk() ) { *width = m_selectedBitmap.GetWidth(); *height = m_selectedBitmap.GetHeight(); @@ -163,7 +163,7 @@ static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoo { wxBrush brush(dc.GetBrush()); wxPen pen(dc.GetPen()); - if (brush.Ok() && brush.GetStyle() != wxTRANSPARENT) + if (brush.IsOk() && brush.GetStyle() != wxTRANSPARENT) { HBRUSH hBrush = (HBRUSH) brush.GetResourceHandle() ; if (hBrush) @@ -176,7 +176,7 @@ static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoo } } width --; height --; - if (pen.Ok() && pen.GetStyle() != wxTRANSPARENT) + if (pen.IsOk() && pen.GetStyle() != wxTRANSPARENT) { dc.DrawLine(x, y, x + width, y); dc.DrawLine(x, y, x, y + height); @@ -192,7 +192,7 @@ void wxMemoryDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor // Set this to 1 to work around an apparent video driver bug // (visible with e.g. 70x70 rectangle on a memory DC; see Drawing sample) #if wxUSE_MEMORY_DC_DRAW_RECTANGLE - if (m_brush.Ok() && m_pen.Ok() && + if (m_brush.IsOk() && m_pen.IsOk() && (m_brush.GetStyle() == wxSOLID || m_brush.GetStyle() == wxTRANSPARENT) && (m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT) && (GetLogicalFunction() == wxCOPY)) diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index 9ca81119cb..150232ed19 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -401,7 +401,7 @@ void wxPrinterDCImpl::DoDrawBitmap(const wxBitmap& bmp, wxCoord x, wxCoord y, bool useMask) { - wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); + wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); int width = bmp.GetWidth(), height = bmp.GetHeight(); diff --git a/src/msw/debughlp.cpp b/src/msw/debughlp.cpp index 1cbdb25f81..eb0445df09 100644 --- a/src/msw/debughlp.cpp +++ b/src/msw/debughlp.cpp @@ -359,6 +359,10 @@ wxDbgHelpDLL::DumpField(PSYMBOL_INFO pSym, void *pVariable, unsigned level) case SYMBOL_TAG_BASE_CLASS: s = DumpUDT(&sym, pVariable, level); break; + + default: + // Suppress gcc warnings about unhandled enum values. + break; } } @@ -367,6 +371,11 @@ wxDbgHelpDLL::DumpField(PSYMBOL_INFO pSym, void *pVariable, unsigned level) s = GetSymbolName(pSym) + wxT(" = ") + s; } break; + + default: + // Suppress gcc warnings about unhandled enum values, don't assert + // to avoid problems during fatal crash generation. + break; } if ( !s.empty() ) @@ -520,6 +529,11 @@ wxDbgHelpDLL::DumpSymbol(PSYMBOL_INFO pSym, void *pVariable) SYMBOL_INFO symDeref = *pSym; switch ( DereferenceSymbol(&symDeref, &pVariable) ) { + default: + // Suppress gcc warnings about unhandled enum values, don't assert + // to avoid problems during fatal crash generation. + break; + case SYMBOL_TAG_UDT: // show UDT recursively s = DumpUDT(&symDeref, pVariable); diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index b04985d6c2..3e54725e3a 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -443,7 +443,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar { // set our cursor for all windows (but see below) wxCursor cursor = m_cursor; - if ( !cursor.Ok() ) + if ( !cursor.IsOk() ) cursor = wxCURSOR_ARROW; ::SetCursor(GetHcursorOf(cursor)); diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index 14a44e2339..4eff321612 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -660,7 +660,7 @@ wxPalette *wxDIB::CreatePalette() const bool wxDIB::Create(const wxImage& image, PixelFormat pf) { - wxCHECK_MSG( image.Ok(), false, wxT("invalid wxImage in wxDIB ctor") ); + wxCHECK_MSG( image.IsOk(), false, wxT("invalid wxImage in wxDIB ctor") ); const int h = image.GetHeight(); const int w = image.GetWidth(); @@ -753,7 +753,7 @@ wxImage wxDIB::ConvertToImage() const const int w = GetWidth(); const int h = GetHeight(); wxImage image(w, h, false /* don't bother clearing memory */); - if ( !image.Ok() ) + if ( !image.IsOk() ) { wxFAIL_MSG( wxT("could not allocate data for image") ); return wxNullImage; diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index 27e5c366c2..7e06613e36 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -301,7 +301,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS return false; } - if (m_cursor.Ok()) + if (m_cursor.IsOk()) { #if wxUSE_SIMPLER_DRAGIMAGE m_oldCursor = window->GetCursor(); @@ -352,7 +352,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS } #if !wxUSE_SIMPLER_DRAGIMAGE - if (m_cursor.Ok()) + if (m_cursor.IsOk()) ::ShowCursor(FALSE); #endif @@ -397,7 +397,7 @@ bool wxDragImage::EndDrag() } #if wxUSE_SIMPLER_DRAGIMAGE - if (m_cursor.Ok() && m_oldCursor.Ok()) + if (m_cursor.IsOk() && m_oldCursor.IsOk()) m_window->SetCursor(m_oldCursor); #else ::ShowCursor(TRUE); diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp index 97850755ea..5249f46ff4 100644 --- a/src/msw/enhmeta.cpp +++ b/src/msw/enhmeta.cpp @@ -134,7 +134,7 @@ void wxEnhMetaFile::Free() bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound) { - wxCHECK_MSG( Ok(), false, wxT("can't play invalid enhanced metafile") ); + wxCHECK_MSG( IsOk(), false, wxT("can't play invalid enhanced metafile") ); wxCHECK_MSG( dc, false, wxT("invalid wxDC in wxEnhMetaFile::Play") ); RECT rect; @@ -174,7 +174,7 @@ wxSize wxEnhMetaFile::GetSize() const { wxSize size = wxDefaultSize; - if ( Ok() ) + if ( IsOk() ) { ENHMETAHEADER hdr; if ( !::GetEnhMetaFileHeader(GetEMF(), sizeof(hdr), &hdr) ) @@ -408,7 +408,7 @@ size_t wxEnhMetaFileDataObject::GetDataSize(const wxDataFormat& format) const bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf) const { - wxCHECK_MSG( m_metafile.Ok(), false, wxT("copying invalid enh metafile") ); + wxCHECK_MSG( m_metafile.IsOk(), false, wxT("copying invalid enh metafile") ); HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE(); @@ -536,7 +536,7 @@ size_t wxEnhMetaFileSimpleDataObject::GetDataSize() const bool wxEnhMetaFileSimpleDataObject::GetDataHere(void *buf) const { - wxCHECK_MSG( m_metafile.Ok(), false, wxT("copying invalid enh metafile") ); + wxCHECK_MSG( m_metafile.IsOk(), false, wxT("copying invalid enh metafile") ); HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE(); diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index bc0ecc8a38..96c3289a6d 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -68,13 +68,13 @@ int wxFontDialog::ShowModal() chooseFontStruct.hwndOwner = GetHwndOf(m_parent); chooseFontStruct.lpLogFont = &logFont; - if ( m_fontData.m_initialFont.Ok() ) + if ( m_fontData.m_initialFont.IsOk() ) { flags |= CF_INITTOLOGFONTSTRUCT; wxFillLogFont(&logFont, &m_fontData.m_initialFont); } - if ( m_fontData.m_fontColour.Ok() ) + if ( m_fontData.m_fontColour.IsOk() ) { chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour); } diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 25cfa7eb30..9126afb4d9 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -938,7 +938,7 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara case WM_QUERYDRAGICON: { const wxIcon& icon = GetIcon(); - HICON hIcon = icon.Ok() ? GetHiconOf(icon) + HICON hIcon = icon.IsOk() ? GetHiconOf(icon) : (HICON)GetDefaultIcon(); rc = (WXLRESULT)hIcon; processed = rc != 0; diff --git a/src/msw/fswatcher.cpp b/src/msw/fswatcher.cpp index 28c268e062..7f2bcd6e89 100644 --- a/src/msw/fswatcher.cpp +++ b/src/msw/fswatcher.cpp @@ -108,9 +108,9 @@ bool wxFSWatcherImplMSW::DoAdd(wxSharedPtr watch) } bool -wxFSWatcherImplMSW::DoRemove(wxSharedPtr WXUNUSED(watch)) +wxFSWatcherImplMSW::DoRemove(wxSharedPtr watch) { - return true; + return m_iocp.ScheduleForRemoval(watch); } // TODO ensuring that we have not already set watch for this handle/dir? @@ -136,9 +136,32 @@ void wxFSWatcherImplMSW::SendEvent(wxFileSystemWatcherEvent& evt) bool wxFSWatcherImplMSW::DoSetUpWatch(wxFSWatchEntryMSW& watch) { + BOOL bWatchSubtree wxDUMMY_INITIALIZE(FALSE); + + switch ( watch.GetType() ) + { + case wxFSWPath_File: + wxLogError(_("Monitoring individual files for changes is not " + "supported currently.")); + return false; + + case wxFSWPath_Dir: + bWatchSubtree = FALSE; + break; + + case wxFSWPath_Tree: + bWatchSubtree = TRUE; + break; + + case wxFSWPath_None: + wxFAIL_MSG( "Invalid watch type." ); + return false; + } + int flags = Watcher2NativeFlags(watch.GetFlags()); int ret = ReadDirectoryChangesW(watch.GetHandle(), watch.GetBuffer(), - wxFSWatchEntryMSW::BUFFER_SIZE, TRUE, + wxFSWatchEntryMSW::BUFFER_SIZE, + bWatchSubtree, flags, NULL, watch.GetOverlapped(), NULL); if (!ret) @@ -216,6 +239,11 @@ bool wxIOCPThread::ReadEvents() wxLogTrace( wxTRACE_FSWATCHER, "[iocp] Read entry: path='%s'", watch->GetPath()); + // First check if we're still interested in this watch, we could have + // removed it in the meanwhile. + if ( m_iocp->CompleteRemoval(watch) ) + return true; + // extract events from buffer info our vector container wxVector events; const char* memory = static_cast(watch->GetBuffer()); @@ -380,4 +408,30 @@ bool wxMSWFileSystemWatcher::Init() return ret; } +bool +wxMSWFileSystemWatcher::AddTree(const wxFileName& path, + int events, + const wxString& filter) +{ + if ( !filter.empty() ) + { + // Use the inefficient generic version as we can only monitor + // everything under the given directory. + // + // Notice that it would probably be better to still monitor everything + // natively and filter out the changes we're not interested in. + return wxFileSystemWatcherBase::AddTree(path, events, filter); + } + + + if ( !path.DirExists() ) + { + wxLogError(_("Can't monitor non-existent directory \"%s\" for changes."), + path.GetFullPath()); + return false; + } + + return DoAdd(path, events, wxFSWPath_Tree); +} + #endif // wxUSE_FSWATCHER diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index 5b4c3d6b13..818b18f7bf 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -325,7 +325,7 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, // TODO: load colourmap. bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.wx_str())); - if ( !bitmap->Ok() ) + if ( !bitmap->IsOk() ) { // it's probably not found wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."), @@ -494,7 +494,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon, icon->SetHICON((WXHICON)hicon); icon->SetSize(size.x, size.y); - return icon->Ok(); + return icon->IsOk(); } bool wxICOResourceHandler::LoadIcon(wxIcon *icon, @@ -559,7 +559,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, icon->SetHICON((WXHICON)hicon); - return icon->Ok(); + return icon->IsOk(); } // ---------------------------------------------------------------------------- diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp index df688b1135..44126964e7 100644 --- a/src/msw/gdiplus.cpp +++ b/src/msw/gdiplus.cpp @@ -36,6 +36,14 @@ #include "wx/msw/wrapgdip.h" +// w32api headers used by both MinGW and Cygwin wrongly define UINT16 inside +// Gdiplus namespace in gdiplus.h which results in ambiguity errors when using +// this type as UINT16 is also defined in global scope by windows.h (or rather +// basetsd.h included from it), so we redefine it to work around this problem. +#if defined(__CYGWIN__) || defined(__MINGW32__) + #define UINT16 unsigned short +#endif + // ---------------------------------------------------------------------------- // helper macros // ---------------------------------------------------------------------------- @@ -732,17 +740,17 @@ wxFOR_ALL_GDIPLUS_STATUS_FUNCS(wxDECL_GDIPLUS_FUNC_TYPE) #undef wxDECL_GDIPLUS_FUNC_TYPE -} // extern "C" - -// Special hack for Cygwin: its headers reference this variable which is -// normally defined in Cygwin-specific gdiplus.lib but as we don't link with it +// Special hack for w32api headers that reference this variable which is +// normally defined in w32api-specific gdiplus.lib but as we don't link with it // and load gdiplus.dll dynamically, it's not defined in our case resulting in // linking errors -- so just provide it ourselves, it doesn't matter where it // is and if Cygwin headers are modified to not use it in the future, it's not // a big deal neither, we'll just have an unused pointer. -#ifdef __CYGWIN__ -extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL; -#endif // __CYGWIN__ +#if defined(__CYGWIN__) || defined(__MINGW32__) +void *_GdipStringFormatCachedGenericTypographic = NULL; +#endif // __CYGWIN__ || __MINGW32__ + +} // extern "C" // ============================================================================ // wxGdiPlus helper class diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp index 0dff02b534..a16f03e7b8 100644 --- a/src/msw/glcanvas.cpp +++ b/src/msw/glcanvas.cpp @@ -734,10 +734,10 @@ bool wxGLCanvas::SetupPalette(const wxPalette& palette) m_palette = palette; - if ( !m_palette.Ok() ) + if ( !m_palette.IsOk() ) { m_palette = CreateDefaultPalette(); - if ( !m_palette.Ok() ) + if ( !m_palette.IsOk() ) return false; } @@ -799,7 +799,7 @@ wxPalette wxGLCanvas::CreateDefaultPalette() void wxGLCanvas::OnQueryNewPalette(wxQueryNewPaletteEvent& event) { /* realize palette if this is the current window */ - if ( GetPalette()->Ok() ) { + if ( GetPalette()->IsOk() ) { ::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE()); ::SelectPalette(GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE); ::RealizePalette(GetHDC()); @@ -814,7 +814,7 @@ void wxGLCanvas::OnPaletteChanged(wxPaletteChangedEvent& event) { /* realize palette if this is *not* the current window */ if ( GetPalette() && - GetPalette()->Ok() && (this != event.GetChangedWindow()) ) + GetPalette()->IsOk() && (this != event.GetChangedWindow()) ) { ::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE()); ::SelectPalette(GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE); diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index a5ba892d0c..c1c7df147c 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -335,6 +335,8 @@ public: virtual bool SetAntialiasMode(wxAntialiasMode antialias); + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation); + virtual bool SetCompositionMode(wxCompositionMode op); virtual void BeginLayer(wxDouble opacity); @@ -634,7 +636,7 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p case wxPENSTYLE_STIPPLE : { wxBitmap* bmp = pen.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(), #if wxUSE_PALETTE @@ -745,7 +747,7 @@ wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxB else { wxBitmap* bmp = brush.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { wxDELETE( m_brushImage ); m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(), @@ -1479,6 +1481,12 @@ bool wxGDIPlusContext::SetAntialiasMode(wxAntialiasMode antialias) return true; } +bool wxGDIPlusContext::SetInterpolationQuality(wxInterpolationQuality WXUNUSED(interpolation)) +{ + // placeholder + return false; +} + bool wxGDIPlusContext::SetCompositionMode(wxCompositionMode op) { if ( m_composition == op ) @@ -1539,6 +1547,8 @@ void wxGDIPlusContext::PushState() void wxGDIPlusContext::PopState() { + wxCHECK_RET( !m_stateStack.empty(), wxT("No state to pop") ); + GraphicsState state = m_stateStack.top(); m_stateStack.pop(); m_context->Restore(state); @@ -1988,7 +1998,7 @@ wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDoub wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen) { ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen); - if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT ) + if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT ) return wxNullGraphicsPen; else { @@ -2001,7 +2011,7 @@ wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen) wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) { ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); - if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT ) + if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT ) return wxNullGraphicsBrush; else { @@ -2044,7 +2054,7 @@ wxGDIPlusRenderer::CreateGDIPlusFont( const wxGDIPlusContext* gc, const wxColour &col ) { ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont); - if ( font.Ok() ) + if ( font.IsOk() ) { wxGraphicsFont p; p.SetRefData(new wxGDIPlusFontData( this, gc, font, col )); @@ -2057,7 +2067,7 @@ wxGDIPlusRenderer::CreateGDIPlusFont( const wxGDIPlusContext* gc, wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap &bitmap ) { ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { wxGraphicsBitmap p; p.SetRefData(new wxGDIPlusBitmapData( this , bitmap )); diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp index 366e635f9e..266af3feb0 100644 --- a/src/msw/imaglist.cpp +++ b/src/msw/imaglist.cpp @@ -299,7 +299,7 @@ bool wxImageList::Draw(int index, if ( solidBackground ) { const wxBrush& brush = dc.GetBackground(); - if ( brush.Ok() ) + if ( brush.IsOk() ) { clr = wxColourToRGB(brush.GetColour()); } @@ -399,7 +399,7 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask) wxMask *pMask; bool deleteMask = false; - if ( mask.Ok() ) + if ( mask.IsOk() ) { hbmpMask = GetHbitmapOf(mask); pMask = NULL; diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index b5913ea90c..9d49a3be10 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -1821,8 +1821,8 @@ int CALLBACK wxInternalDataCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM l wxMSWListItemData *data1 = (wxMSWListItemData *) lParam1; wxMSWListItemData *data2 = (wxMSWListItemData *) lParam2; - long d1 = (data1 == NULL ? 0 : data1->lParam); - long d2 = (data2 == NULL ? 0 : data2->lParam); + wxIntPtr d1 = (data1 == NULL ? 0 : data1->lParam); + wxIntPtr d2 = (data2 == NULL ? 0 : data2->lParam); return internalData->user_fn(d1, d2, internalData->data); diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 300cb6816d..edcb971d6a 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -2020,7 +2020,15 @@ wxLongLong wxAMMediaBackend::GetDuration() case S_OK: // outDuration is in seconds, we need milliseconds - return outDuration * 1000; +#ifdef wxLongLong_t + return static_cast(outDuration * 1000); +#else + // In principle it's possible to have video of duration greater + // than ~1193 hours which corresponds LONG_MAX in milliseconds so + // cast to wxLongLong first and multiply by 1000 only then to avoid + // the overflow (resulting in maximal duration of ~136 years). + return wxLongLong(static_cast(outDuration)) * 1000; +#endif } } diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 4769e1b00b..c1accd90e2 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -41,6 +41,7 @@ #endif #include "wx/scopedarray.h" +#include "wx/vector.h" #include "wx/msw/private.h" #include "wx/msw/wrapcctl.h" // include "properly" @@ -85,9 +86,102 @@ static const int idMenuTitle = wxID_NONE; // ---------------------------------------------------------------------------- -// private functions +// private helper classes and functions // ---------------------------------------------------------------------------- +// Contains the data about the radio items groups in the given menu. +class wxMenuRadioItemsData +{ +public: + wxMenuRadioItemsData() { } + + // Default copy ctor, assignment operator and dtor are all ok. + + // Find the start and end of the group containing the given position or + // return false if it's not inside any range. + bool GetGroupRange(int pos, int *start, int *end) const + { + // We use a simple linear search here because there are not that many + // items in a menu and hence even fewer radio items ranges anyhow, so + // normally there is no need to do anything fancy (like keeping the + // array sorted and using binary search). + for ( Ranges::const_iterator it = m_ranges.begin(); + it != m_ranges.end(); + ++it ) + { + const Range& r = *it; + + if ( r.start <= pos && pos <= r.end ) + { + if ( start ) + *start = r.start; + if ( end ) + *end = r.end; + + return true; + } + } + + return false; + } + + // Take into account the new radio item about to be added at the given + // position. + // + // Returns true if this item starts a new radio group, false if it extends + // an existing one. + bool UpdateOnInsert(int pos) + { + bool inExistingGroup = false; + + for ( Ranges::iterator it = m_ranges.begin(); + it != m_ranges.end(); + ++it ) + { + Range& r = *it; + + if ( pos < r.start ) + { + // Item is inserted before this range, update its indices. + r.start++; + r.end++; + } + else if ( pos <= r.end + 1 ) + { + // Item is inserted in the middle of this range or immediately + // after it in which case it extends this range so make it span + // one more item in any case. + r.end++; + + inExistingGroup = true; + } + //else: Item is inserted after this range, nothing to do for it. + } + + if ( inExistingGroup ) + return false; + + // Make a new range for the group this item will belong to. + Range r; + r.start = pos; + r.end = pos; + m_ranges.push_back(r); + + return true; + } + +private: + // Contains the inclusive positions of the range start and end. + struct Range + { + int start; + int end; + }; + + typedef wxVector Ranges; + Ranges m_ranges; +}; + namespace { @@ -168,8 +262,8 @@ inline bool IsGreaterThanStdSize(const wxBitmap& bmp) // Construct a menu with optional title (then use append) void wxMenu::Init() { + m_radioData = NULL; m_doBreak = false; - m_startRadioGroup = -1; #if wxUSE_OWNER_DRAWN m_ownerDrawn = false; @@ -211,6 +305,8 @@ wxMenu::~wxMenu() // delete accels WX_CLEAR_ARRAY(m_accels); #endif // wxUSE_ACCEL + + delete m_radioData; } void wxMenu::Break() @@ -219,13 +315,6 @@ void wxMenu::Break() m_doBreak = true; } -void wxMenu::Attach(wxMenuBarBase *menubar) -{ - wxMenuBase::Attach(menubar); - - EndRadioGroup(); -} - #if wxUSE_ACCEL int wxMenu::FindAccel(int id) const @@ -348,6 +437,11 @@ HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true) } // anonymous namespace +bool wxMenu::MSWGetRadioGroupRange(int pos, int *start, int *end) const +{ + return m_radioData && m_radioData->GetGroupRange(pos, start, end); +} + // append a new item or submenu to the menu bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) { @@ -397,6 +491,21 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) pos = GetMenuItemCount() - 1; } + // Update radio groups data if we're inserting a new radio item. + // + // NB: If we supported inserting non-radio items in the middle of existing + // radio groups to break them into two subgroups, we'd need to update + // m_radioData in this case too but currently this is not supported. + bool checkInitially = false; + if ( pItem->GetKind() == wxITEM_RADIO ) + { + if ( !m_radioData ) + m_radioData = new wxMenuRadioItemsData; + + if ( m_radioData->UpdateOnInsert(pos) ) + checkInitially = true; + } + // adjust position to account for the title of a popup menu, if any if ( !GetMenuBar() && !m_title.empty() ) pos += 2; // for the title itself and its separator @@ -424,17 +533,17 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) // them in any case if the item has custom colours or font static const wxWinVersion winver = wxGetWinVersion(); bool mustUseOwnerDrawn = winver < wxWinVersion_98 || - pItem->GetTextColour().Ok() || - pItem->GetBackgroundColour().Ok() || - pItem->GetFont().Ok(); + pItem->GetTextColour().IsOk() || + pItem->GetBackgroundColour().IsOk() || + pItem->GetFont().IsOk(); if ( !mustUseOwnerDrawn ) { const wxBitmap& bmpUnchecked = pItem->GetBitmap(false), bmpChecked = pItem->GetBitmap(true); - if ( (bmpUnchecked.Ok() && IsGreaterThanStdSize(bmpUnchecked)) || - (bmpChecked.Ok() && IsGreaterThanStdSize(bmpChecked)) ) + if ( (bmpUnchecked.IsOk() && IsGreaterThanStdSize(bmpUnchecked)) || + (bmpChecked.IsOk() && IsGreaterThanStdSize(bmpChecked)) ) { mustUseOwnerDrawn = true; } @@ -600,6 +709,10 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) } + // Check the item if it should be initially checked. + if ( checkInitially ) + pItem->Check(true); + // if we just appended the title, highlight it if ( id == (UINT_PTR)idMenuTitle ) { @@ -616,67 +729,9 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) return true; } -void wxMenu::EndRadioGroup() -{ - // we're not inside a radio group any longer - m_startRadioGroup = -1; -} - wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) { - wxCHECK_MSG( item, NULL, wxT("NULL item in wxMenu::DoAppend") ); - - bool check = false; - - if ( item->GetKind() == wxITEM_RADIO ) - { - int count = GetMenuItemCount(); - - if ( m_startRadioGroup == -1 ) - { - // start a new radio group - m_startRadioGroup = count; - - // for now it has just one element - item->SetAsRadioGroupStart(); - item->SetRadioGroupEnd(m_startRadioGroup); - - // ensure that we have a checked item in the radio group - check = true; - } - else // extend the current radio group - { - // we need to update its end item - item->SetRadioGroupStart(m_startRadioGroup); - wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup); - - if ( node ) - { - node->GetData()->SetRadioGroupEnd(count); - } - else - { - wxFAIL_MSG( wxT("where is the radio group start item?") ); - } - } - } - else // not a radio item - { - EndRadioGroup(); - } - - if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) ) - { - return NULL; - } - - if ( check ) - { - // check the item initially - item->Check(true); - } - - return item; + return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item) ? item : NULL; } wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index c7d5b48820..94d963d4ac 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -494,9 +494,6 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, void wxMenuItem::Init() { - m_radioGroup.start = -1; - m_isRadioGroupStart = false; - #if wxUSE_OWNER_DRAWN // when the color is not valid, wxOwnerDraw takes the default ones. @@ -557,30 +554,6 @@ bool wxMenuItem::IsChecked() const return (flag & MF_CHECKED) != 0; } -// radio group stuff -// ----------------- - -void wxMenuItem::SetAsRadioGroupStart() -{ - m_isRadioGroupStart = true; -} - -void wxMenuItem::SetRadioGroupStart(int start) -{ - wxASSERT_MSG( !m_isRadioGroupStart, - wxT("should only be called for the next radio items") ); - - m_radioGroup.start = start; -} - -void wxMenuItem::SetRadioGroupEnd(int end) -{ - wxASSERT_MSG( m_isRadioGroupStart, - wxT("should only be called for the first radio item") ); - - m_radioGroup.end = end; -} - // change item state // ----------------- @@ -634,17 +607,10 @@ void wxMenuItem::Check(bool check) int start, end; - if ( m_isRadioGroupStart ) + if ( !m_parentMenu->MSWGetRadioGroupRange(pos, &start, &end) ) { - // we already have all information we need - start = pos; - end = m_radioGroup.end; - } - else // next radio group item - { - // get the radio group end from the start item - start = m_radioGroup.start; - end = items.Item(start)->GetData()->m_radioGroup.end; + wxFAIL_MSG( wxT("Menu radio item not part of radio group?") ); + return; } #ifdef __WIN32__ @@ -1063,7 +1029,7 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc, - data->CheckBgMargin.cyBottomHeight - data->CheckMargin.cyBottomHeight); - if ( IsCheckable() && !m_bmpChecked.Ok() ) + if ( IsCheckable() && !m_bmpChecked.IsOk() ) { if ( stat & wxODChecked ) { @@ -1079,25 +1045,25 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc, bmp = GetDisabledBitmap(); } - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { // for not checkable bitmaps we should always use unchecked one // because their checked bitmap is not set bmp = GetBitmap(!IsCheckable() || (stat & wxODChecked)); #if wxUSE_IMAGE - if ( bmp.Ok() && stat & wxODDisabled ) + if ( bmp.IsOk() && stat & wxODDisabled ) { // we need to grey out the bitmap as we don't have any specific // disabled bitmap wxImage imgGrey = bmp.ConvertToImage().ConvertToGreyscale(); - if ( imgGrey.Ok() ) + if ( imgGrey.IsOk() ) bmp = wxBitmap(imgGrey); } #endif // wxUSE_IMAGE } - if ( bmp.Ok() ) + if ( bmp.IsOk() ) { wxMemoryDC dcMem(&dc); dcMem.SelectObjectAsSource(bmp); diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp index 2334638d82..7c786e5141 100644 --- a/src/msw/msgdlg.cpp +++ b/src/msw/msgdlg.cpp @@ -593,6 +593,16 @@ int wxMessageDialog::ShowModal() return wxID_CANCEL; } + // In case only an "OK" button was specified we actually created a + // "Cancel" button (see comment in MSWCommonTaskDialogInit). This + // results in msAns being IDCANCEL while we want IDOK (just like + // how the native MessageBox function does with only an "OK" button). + if ( (msAns == IDCANCEL) + && !(GetMessageDialogStyle() & (wxYES_NO|wxCANCEL)) ) + { + msAns = IDOK; + } + return MSWTranslateReturnCode( msAns ); } #endif // wxHAS_MSW_TASKDIALOG diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 71bbed0450..8a08625124 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -354,7 +354,7 @@ public: HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD) { // TODO: send an event with this id - if (m_window->m_oleInPlaceActiveObject.Ok()) + if (m_window->m_oleInPlaceActiveObject.IsOk()) m_window->m_oleInPlaceActiveObject->TranslateAccelerator(lpmsg); return S_FALSE; } @@ -425,7 +425,7 @@ public: HRESULT STDMETHODCALLTYPE DeactivateAndUndo(){return S_OK; } HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect) { - if (m_window->m_oleInPlaceObject.Ok() && lprcPosRect) + if (m_window->m_oleInPlaceObject.IsOk() && lprcPosRect) { // // Result of several hours and days of bug hunting - @@ -606,7 +606,7 @@ public: { wxAutoIOleInPlaceSite inPlaceSite( IID_IOleInPlaceSite, (IDispatch *) this); - if (!inPlaceSite.Ok()) + if (!inPlaceSite.IsOk()) return E_FAIL; if (pViewToActivate) @@ -618,7 +618,7 @@ public: { wxAutoIOleDocument oleDoc( IID_IOleDocument, m_window->m_oleObject); - if (! oleDoc.Ok()) + if (! oleDoc.IsOk()) return E_FAIL; HRESULT hr = oleDoc->CreateView(inPlaceSite, NULL, @@ -878,13 +878,13 @@ wxActiveXContainer::wxActiveXContainer(wxWindow * parent, wxActiveXContainer::~wxActiveXContainer() { // disconnect connection points - if (m_oleInPlaceObject.Ok()) + if (m_oleInPlaceObject.IsOk()) { m_oleInPlaceObject->InPlaceDeactivate(); m_oleInPlaceObject->UIDeactivate(); } - if (m_oleObject.Ok()) + if (m_oleObject.IsOk()) { if (m_docAdviseCookie != 0) m_oleObject->Unadvise(m_docAdviseCookie); @@ -934,7 +934,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) CHECK_HR(hret); // adviseSink wxAutoIAdviseSink adviseSink(IID_IAdviseSink, (IDispatch *) m_frameSite); - wxASSERT(adviseSink.Ok()); + wxASSERT(adviseSink.IsOk()); // Get Dispatch interface hret = m_Dispatch.QueryInterface(IID_IDispatch, m_ActiveX); @@ -946,13 +946,13 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) // get type info via class info wxAutoIProvideClassInfo classInfo(IID_IProvideClassInfo, m_ActiveX); - wxASSERT(classInfo.Ok()); + wxASSERT(classInfo.IsOk()); // type info wxAutoITypeInfo typeInfo; hret = classInfo->GetClassInfo(typeInfo.GetRef()); CHECK_HR(hret); - wxASSERT(typeInfo.Ok()); + wxASSERT(typeInfo.IsOk()); // TYPEATTR TYPEATTR *ta = NULL; @@ -975,7 +975,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) // get dispatch type info interface wxAutoITypeInfo ti; hret = typeInfo->GetRefTypeInfo(rt, ti.GetRef()); - if (! ti.Ok()) + if (! ti.IsOk()) continue; CHECK_HR(hret); @@ -1016,7 +1016,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) DWORD adviseCookie = 0; wxAutoIConnectionPointContainer cpContainer(IID_IConnectionPointContainer, m_ActiveX); - wxASSERT( cpContainer.Ok()); + wxASSERT( cpContainer.IsOk()); HRESULT hret = cpContainer->FindConnectionPoint(ta->guid, cp.GetRef()); @@ -1093,7 +1093,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) wxAutoIPersistStreamInit pPersistStreamInit(IID_IPersistStreamInit, m_oleObject); - if (pPersistStreamInit.Ok()) + if (pPersistStreamInit.IsOk()) { hret = pPersistStreamInit->InitNew(); CHECK_HR(hret); @@ -1105,7 +1105,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) m_oleObjectHWND = 0; - if (m_oleInPlaceObject.Ok()) + if (m_oleInPlaceObject.IsOk()) { hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND); if (SUCCEEDED(hret)) @@ -1119,7 +1119,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) wxCopyRectToRECT(m_realparent->GetClientSize(), posRect); if (posRect.right > 0 && posRect.bottom > 0 && - m_oleInPlaceObject.Ok()) + m_oleInPlaceObject.IsOk()) { m_oleInPlaceObject->SetObjectRects(&posRect, &posRect); } @@ -1133,7 +1133,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) CHECK_HR(hret); } - if (! m_oleObjectHWND && m_oleInPlaceObject.Ok()) + if (! m_oleObjectHWND && m_oleInPlaceObject.IsOk()) { hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND); CHECK_HR(hret); @@ -1182,7 +1182,7 @@ void wxActiveXContainer::OnSize(wxSizeEvent& event) return; // extents are in HIMETRIC units - if (m_oleObject.Ok()) + if (m_oleObject.IsOk()) { m_oleObject->DoVerb(OLEIVERB_HIDE, 0, m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect); @@ -1200,7 +1200,7 @@ void wxActiveXContainer::OnSize(wxSizeEvent& event) (HWND)m_realparent->GetHWND(), &posRect); } - if (m_oleInPlaceObject.Ok()) + if (m_oleInPlaceObject.IsOk()) m_oleInPlaceObject->SetObjectRects(&posRect, &posRect); event.Skip(); @@ -1244,7 +1244,7 @@ void wxActiveXContainer::OnPaint(wxPaintEvent& WXUNUSED(event)) //--------------------------------------------------------------------------- void wxActiveXContainer::OnSetFocus(wxFocusEvent& event) { - if (m_oleInPlaceActiveObject.Ok()) + if (m_oleInPlaceActiveObject.IsOk()) m_oleInPlaceActiveObject->OnFrameWindowActivate(TRUE); event.Skip(); @@ -1258,7 +1258,7 @@ void wxActiveXContainer::OnSetFocus(wxFocusEvent& event) //--------------------------------------------------------------------------- void wxActiveXContainer::OnKillFocus(wxFocusEvent& event) { - if (m_oleInPlaceActiveObject.Ok()) + if (m_oleInPlaceActiveObject.IsOk()) m_oleInPlaceActiveObject->OnFrameWindowActivate(FALSE); event.Skip(); diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index eadb8b1bfd..156605e408 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -852,7 +852,7 @@ bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf) wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes); bitmap.SetHBITMAP((WXHBITMAP)hbmp); - if ( !bitmap.Ok() ) { + if ( !bitmap.IsOk() ) { wxFAIL_MSG(wxT("pasting/dropping invalid bitmap")); return false; @@ -898,7 +898,7 @@ size_t wxBitmapDataObject::GetDataSize(const wxDataFormat& format) const bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format, void *pBuf) const { - wxASSERT_MSG( m_bitmap.Ok(), wxT("copying invalid bitmap") ); + wxASSERT_MSG( m_bitmap.IsOk(), wxT("copying invalid bitmap") ); HBITMAP hbmp = (HBITMAP)m_bitmap.GetHBITMAP(); if ( format.GetFormatId() == CF_DIB ) @@ -977,7 +977,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format, m_bitmap.SetHBITMAP((WXHBITMAP)hbmp); - wxASSERT_MSG( m_bitmap.Ok(), wxT("pasting invalid bitmap") ); + wxASSERT_MSG( m_bitmap.IsOk(), wxT("pasting invalid bitmap") ); return true; } diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp index fad7caec37..9118eecef8 100644 --- a/src/msw/ole/dropsrc.cpp +++ b/src/msw/ole/dropsrc.cpp @@ -233,7 +233,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags) bool wxDropSource::GiveFeedback(wxDragResult effect) { const wxCursor& cursor = GetCursor(effect); - if ( cursor.Ok() ) + if ( cursor.IsOk() ) { ::SetCursor((HCURSOR)cursor.GetHCURSOR()); diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 9c50a53fdc..c992ce0af5 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -362,6 +362,10 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) variant = oleVariant.boolVal != 0; break; + case VT_R4: + variant = oleVariant.fltVal; + break; + case VT_R8: variant = oleVariant.dblVal; break; diff --git a/src/msw/panel.cpp b/src/msw/panel.cpp index e5b57eeb3a..be95de10b3 100644 --- a/src/msw/panel.cpp +++ b/src/msw/panel.cpp @@ -3,7 +3,7 @@ // Purpose: Implementation of wxMSW-specific wxPanel class. // Author: Vadim Zeitlin // Created: 2011-03-18 -// RCS-ID: $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -33,6 +33,11 @@ // implementation // ============================================================================ +wxPanel::~wxPanel() +{ + delete m_backgroundBrush; +} + bool wxPanel::HasTransparentBackground() { for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index fd0e4c622e..518e4d91e0 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -540,42 +540,42 @@ void wxPen::SetCap(wxPenCap cap) wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->GetColour(); } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->GetWidth(); } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->GetStyle(); } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->GetJoin(); } wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->GetCap(); } int wxPen::GetDashes(wxDash** ptr) const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); *ptr = M_PENDATA->GetDash(); return M_PENDATA->GetDashCount(); @@ -583,21 +583,21 @@ int wxPen::GetDashes(wxDash** ptr) const wxDash* wxPen::GetDash() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return m_refData ? M_PENDATA->GetDash() : NULL; } int wxPen::GetDashCount() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return m_refData ? M_PENDATA->GetDashCount() : 0; } wxBitmap* wxPen::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return m_refData ? M_PENDATA->GetStipple() : NULL; } diff --git a/src/msw/progdlg.cpp b/src/msw/progdlg.cpp index 254fa00679..a39706ed29 100644 --- a/src/msw/progdlg.cpp +++ b/src/msw/progdlg.cpp @@ -761,6 +761,11 @@ void* wxProgressDialogTaskRunner::Entry() wxTdc.caption = m_sharedData.m_title.wx_str(); wxTdc.message = m_sharedData.m_message.wx_str(); + // MSWCommonTaskDialogInit() will add an IDCANCEL button but we need to + // give it the correct label. + wxTdc.btnOKLabel = m_sharedData.m_labelCancel; + wxTdc.useCustomLabels = true; + wxTdc.MSWCommonTaskDialogInit( tdc ); tdc.pfCallback = TaskDialogCallbackProc; tdc.lpCallbackData = (LONG_PTR) &m_sharedData; @@ -769,16 +774,9 @@ void* wxProgressDialogTaskRunner::Entry() tdc.dwFlags &= ~TDF_EXPAND_FOOTER_AREA; // Expand in content area. tdc.dwCommonButtons = 0; // Don't use common buttons. - wxTdc.useCustomLabels = true; - if ( m_sharedData.m_style & wxPD_CAN_SKIP ) wxTdc.AddTaskDialogButton( tdc, Id_SkipBtn, 0, _("Skip") ); - // Use a Cancel button when requested or use a Close button when - // the dialog does not automatically hide. - wxTdc.AddTaskDialogButton( tdc, IDCANCEL, 0, - m_sharedData.m_labelCancel ); - tdc.dwFlags |= TDF_CALLBACK_TIMER | TDF_SHOW_PROGRESS_BAR; if ( !m_sharedData.m_expandedInformation.empty() ) diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp index ab1629ca2a..83d11c2769 100644 --- a/src/msw/registry.cpp +++ b/src/msw/registry.cpp @@ -1235,7 +1235,7 @@ bool wxRegKey::Export(const wxString& filename) const wxFFileOutputStream ostr(filename, wxT("w")); - return ostr.Ok() && Export(ostr); + return ostr.IsOk() && Export(ostr); #else wxUnusedVar(filename); return false; diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 9d1e4d79e4..d1b57d14fe 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -31,6 +31,7 @@ #include "wx/settings.h" #endif //WX_PRECOMP +#include "wx/dcgraph.h" #include "wx/scopeguard.h" #include "wx/splitter.h" #include "wx/renderer.h" @@ -394,8 +395,12 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), const wxRect& rect, int flags) { + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int style = DFCS_SCROLLCOMBOBOX; if ( flags & wxCONTROL_DISABLED ) @@ -414,8 +419,12 @@ wxRendererMSW::DoDrawFrameControl(UINT type, const wxRect& rect, int flags) { + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int style = kind; if ( flags & wxCONTROL_CHECKED ) @@ -615,8 +624,12 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, return; } + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state; if ( flags & wxCONTROL_PRESSED ) @@ -654,8 +667,12 @@ wxRendererXP::DrawHeaderButton(wxWindow *win, return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); } + wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state; if ( flags & wxCONTROL_PRESSED ) @@ -696,8 +713,12 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, return; } + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED; wxUxThemeEngine::Get()->DrawThemeBackground @@ -734,8 +755,12 @@ wxRendererXP::DoDrawButtonLike(HTHEME htheme, const wxRect& rect, int flags) { + wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); + + wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); // the base state is always 1, whether it is PBS_NORMAL, // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp index b65a2814f5..7c1c7103f2 100644 --- a/src/msw/slider.cpp +++ b/src/msw/slider.cpp @@ -369,16 +369,8 @@ int wxSlider::GetLabelsSize(int *widthMin, int *widthMax) const { if ( widthMin && widthMax ) { - if ( HasFlag(wxSL_MIN_MAX_LABELS) ) - { - *widthMin = GetTextExtent(Format(m_rangeMin)).x; - *widthMax = GetTextExtent(Format(m_rangeMax)).x; - } - else - { - *widthMin = - *widthMax = 0; - } + *widthMin = GetTextExtent(Format(m_rangeMin)).x; + *widthMax = GetTextExtent(Format(m_rangeMax)).x; } return HasFlag(wxSL_LABELS) ? GetCharHeight() : 0; @@ -394,8 +386,15 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) return; } - const int labelHeight = GetLabelsSize(&m_minLabelWidth, &m_maxLabelWidth); - const int maxLabelWidth = wxMax(m_minLabelWidth, m_maxLabelWidth); + int minLabelWidth, + maxLabelWidth; + const int labelHeight = GetLabelsSize(&minLabelWidth, &maxLabelWidth); + const int longestLabelWidth = wxMax(minLabelWidth, maxLabelWidth); + if ( !HasFlag(wxSL_MIN_MAX_LABELS) ) + { + minLabelWidth = + maxLabelWidth = 0; + } int labelOffset = 0; int tickOffset = 0; @@ -413,16 +412,16 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) int holdTopX; int holdBottomWidth; int holdBottomX; - int xLabel = (wxMax((THUMB + (BORDERPAD * 2)), maxLabelWidth) / 2) - - (maxLabelWidth / 2) + x; + int xLabel = (wxMax((THUMB + (BORDERPAD * 2)), longestLabelWidth) / 2) - + (longestLabelWidth / 2) + x; if ( HasFlag(wxSL_LEFT) ) { if ( HasFlag(wxSL_MIN_MAX_LABELS) ) { holdTopX = xLabel; - holdTopWidth = m_minLabelWidth; - holdBottomX = xLabel - ((m_maxLabelWidth - m_minLabelWidth) / 2); - holdBottomWidth = m_maxLabelWidth; + holdTopWidth = minLabelWidth; + holdBottomX = xLabel - ((maxLabelWidth - minLabelWidth) / 2); + holdBottomWidth = maxLabelWidth; if ( HasFlag(wxSL_INVERSE) ) { wxSwap(holdTopWidth, holdBottomWidth); @@ -441,16 +440,16 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], x + THUMB + tickOffset + HGAP, y + (height - labelHeight)/2, - maxLabelWidth, labelHeight); + longestLabelWidth, labelHeight); } else // wxSL_RIGHT { if ( HasFlag(wxSL_MIN_MAX_LABELS) ) { - holdTopX = xLabel + maxLabelWidth + ((m_maxLabelWidth - m_minLabelWidth) / 2); - holdTopWidth = m_minLabelWidth; - holdBottomX = xLabel + maxLabelWidth; - holdBottomWidth = m_maxLabelWidth; + holdTopX = xLabel + longestLabelWidth + ((maxLabelWidth - minLabelWidth) / 2); + holdTopWidth = minLabelWidth; + holdBottomX = xLabel + longestLabelWidth; + holdBottomWidth = maxLabelWidth; if ( HasFlag(wxSL_INVERSE) ) { wxSwap(holdTopWidth, holdBottomWidth); @@ -466,11 +465,11 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) holdBottomWidth, labelHeight); } if ( HasFlag(wxSL_VALUE_LABEL) ) - labelOffset = maxLabelWidth + HGAP; + labelOffset = longestLabelWidth + HGAP; DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], x, y + (height - labelHeight)/2, - maxLabelWidth, labelHeight); + longestLabelWidth, labelHeight); } // position the slider itself along the left/right edge @@ -489,18 +488,31 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) int yLabelMinMax = (y + ((THUMB + tickOffset) / 2)) - (labelHeight / 2); int xLabelValue = - x + m_minLabelWidth + - ((width - (m_minLabelWidth + m_maxLabelWidth)) / 2) - - (m_maxLabelWidth / 2); + x + minLabelWidth + + ((width - (minLabelWidth + maxLabelWidth)) / 2) - + (longestLabelWidth / 2); + + int ySlider = y; if ( HasFlag(wxSL_BOTTOM) ) { + if ( HasFlag(wxSL_VALUE_LABEL) ) + { + DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], + xLabelValue, + y, + longestLabelWidth, labelHeight); + + ySlider += labelHeight; + yLabelMinMax += labelHeight; + } + if ( HasFlag(wxSL_MIN_MAX_LABELS) ) { holdLeftX = x; - holdLeftWidth = m_minLabelWidth; - holdRightX = x + width - m_maxLabelWidth; - holdRightWidth = m_maxLabelWidth; + holdLeftWidth = minLabelWidth; + holdRightX = x + width - maxLabelWidth; + holdRightWidth = maxLabelWidth; if ( HasFlag(wxSL_INVERSE) ) { wxSwap(holdLeftWidth, holdRightWidth); @@ -515,22 +527,23 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) yLabelMinMax, holdRightWidth, labelHeight); } - if ( HasFlag(wxSL_VALUE_LABEL) ) - { - DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], - xLabelValue, - y - labelHeight, - maxLabelWidth, labelHeight); - } } else // wxSL_TOP { + if ( HasFlag(wxSL_VALUE_LABEL) ) + { + DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], + xLabelValue, + y + THUMB + tickOffset, + longestLabelWidth, labelHeight); + } + if ( HasFlag(wxSL_MIN_MAX_LABELS) ) { holdLeftX = x; - holdLeftWidth = m_minLabelWidth; - holdRightX = x + width - m_maxLabelWidth; - holdRightWidth = m_maxLabelWidth; + holdLeftWidth = minLabelWidth; + holdRightX = x + width - maxLabelWidth; + holdRightWidth = maxLabelWidth; if ( HasFlag(wxSL_INVERSE) ) { wxSwap(holdLeftWidth, holdRightWidth); @@ -545,20 +558,15 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) yLabelMinMax, holdRightWidth, labelHeight); } - if ( HasFlag(wxSL_VALUE_LABEL) ) - DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], - xLabelValue, - y + THUMB + tickOffset, - maxLabelWidth, labelHeight); } // position the slider itself along the top/bottom edge if ( HasFlag(wxSL_MIN_MAX_LABELS) || HasFlag(wxSL_VALUE_LABEL) ) labelOffset = labelHeight; wxSliderBase::DoMoveWindow( - x + m_minLabelWidth + VGAP, - y, - width - (m_minLabelWidth + m_maxLabelWidth + (VGAP*2)), + x + minLabelWidth + VGAP, + ySlider, + width - (minLabelWidth + maxLabelWidth + (VGAP*2)), THUMB + tickOffset); } } @@ -583,7 +591,8 @@ wxSize wxSlider::DoGetBestSize() const int hLabel = GetLabelsSize(&widthMin, &widthMax); // account for the labels - size.x += HGAP + wxMax(widthMin, widthMax); + if ( HasFlag(wxSL_MIN_MAX_LABELS) ) + size.x += HGAP + wxMax(widthMin, widthMax); // labels are indented relative to the slider itself size.y += hLabel; @@ -597,12 +606,17 @@ wxSize wxSlider::DoGetBestSize() const if ( m_labels ) { - // labels add extra height int labelSize = GetLabelsSize(); - if ( HasFlag(wxSL_MIN_MAX_LABELS) ) + + // Min/max labels are compensated by the ticks so we don't need + // extra space for them if we're also showing ticks. + if ( HasFlag(wxSL_MIN_MAX_LABELS) && !HasFlag(wxSL_TICKS) ) size.y += labelSize; + + // The value label is always on top of the control and so does need + // extra space in any case. if ( HasFlag(wxSL_VALUE_LABEL) ) - size.y += labelSize*2.75; + size.y += labelSize; } } diff --git a/src/msw/sockmsw.cpp b/src/msw/sockmsw.cpp index 7ea56a4ea1..d531813ca6 100644 --- a/src/msw/sockmsw.cpp +++ b/src/msw/sockmsw.cpp @@ -347,7 +347,7 @@ LRESULT CALLBACK wxSocket_Internal_WinProc(HWND hWnd, // only then). Ignore such dummy notifications. { fd_set fds; - timeval tv = { 0 }; + timeval tv = { 0, 0 }; wxFD_ZERO(&fds); wxFD_SET(socket->m_fd, &fds); diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index 19e302e6d4..6cc84eac58 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -119,11 +119,21 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd, // is clicked with the "?" cursor case WM_HELP: #endif - spin->MSWWindowProc(message, wParam, lParam); + { + WXLRESULT result; + if ( spin->MSWHandleMessage(&result, message, wParam, lParam) ) + { + // Do not let the message be processed by the window proc + // of the text control if it had been already handled at wx + // level, this is consistent with what happens for normal, + // non-composite controls. + return 0; + } - // The control may have been deleted at this point, so check. - if ( !::IsWindow(hwnd) ) - return 0; + // The control may have been deleted at this point, so check. + if ( !::IsWindow(hwnd) ) + return 0; + } break; case WM_GETDLGCODE: diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index 0b2a52706e..31c46938b8 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -153,7 +153,7 @@ WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const bool wxStaticBitmap::ImageIsOk() const { - return m_image && m_image->Ok(); + return m_image && m_image->IsOk(); } wxIcon wxStaticBitmap::GetIcon() const diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index 0a08d82b9d..f7ced7f939 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -98,7 +98,7 @@ wxSize wxStaticText::DoGetBestClientSize() const { wxClientDC dc(const_cast(this)); wxFont font(GetFont()); - if (!font.Ok()) + if (!font.IsOk()) font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); dc.SetFont(font); diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp index 6f58f7cb00..a63dcc4fb6 100644 --- a/src/msw/statusbar.cpp +++ b/src/msw/statusbar.cpp @@ -374,7 +374,7 @@ int wxStatusBar::MSWGetBorderWidth() const /* static */ const wxStatusBar::MSWMetrics& wxStatusBar::MSWGetMetrics() { - static MSWMetrics s_metrics = { 0 }; + static MSWMetrics s_metrics = { 0, 0 }; if ( !s_metrics.textMargin ) { // Grip size should be self explanatory (the only problem with it is @@ -502,9 +502,6 @@ void wxStatusBar::DoMoveWindow(int x, int y, int width, int height) ); } - // adjust fields widths to the new size - MSWUpdateFieldsWidths(); - // 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 @@ -595,15 +592,21 @@ wxStatusBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) } #endif - bool needsEllipsization = HasFlag(wxSTB_ELLIPSIZE_START) || - HasFlag(wxSTB_ELLIPSIZE_MIDDLE) || - HasFlag(wxSTB_ELLIPSIZE_END); - if ( nMsg == WM_SIZE && needsEllipsization ) + if ( nMsg == WM_SIZE ) { - for (int i=0; i 1 ) { wxFont font = m_defaultStyle.GetFont(); - if ( !font.Ok() ) + if ( !font.IsOk() ) font = GetFont(); - if ( font.Ok() ) + if ( font.IsOk() ) { wxFontEncoding encoding = font.GetEncoding(); if ( encoding != wxFONTENCODING_SYSTEM ) @@ -1125,7 +1125,7 @@ void wxTextCtrl::AppendText(const wxString& text) // don't do this if we're frozen, saves some time if ( !IsFrozen() && IsMultiLine() && GetRichVersion() > 1 ) { - ::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, NULL); + ::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, (LPARAM)NULL); } #endif // wxUSE_RICHEDIT } @@ -1810,6 +1810,14 @@ void wxTextCtrl::OnKeyDown(wxKeyEvent& event) } } + // Default window procedure of multiline edit controls posts WM_CLOSE to + // the parent window when it gets Escape key press for some reason, prevent + // it from doing this as this resulted in dialog boxes being closed on + // Escape even when they shouldn't be (we do handle Escape ourselves + // correctly in the situations when it should close them). + if ( event.GetKeyCode() == WXK_ESCAPE && IsMultiLine() ) + return; + // no, we didn't process it event.Skip(); } @@ -2657,7 +2665,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) lf.lfWeight = FW_NORMAL; wxFont font = wxCreateFontFromLogFont(& lf); - if (font.Ok()) + if (font.IsOk()) { style.SetFont(font); } diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp index cde1757758..e4effb9ff0 100644 --- a/src/msw/tglbtn.cpp +++ b/src/msw/tglbtn.cpp @@ -38,9 +38,6 @@ #include "wx/log.h" #endif // WX_PRECOMP -#include "wx/renderer.h" -#include "wx/dcclient.h" - #include "wx/msw/private.h" #include "wx/msw/private/button.h" @@ -58,32 +55,16 @@ wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ); // wxBitmapToggleButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxControl) - -BEGIN_EVENT_TABLE(wxBitmapToggleButton,wxToggleButtonBase) - EVT_PAINT(wxBitmapToggleButton::OnPaint) - EVT_MOUSE_EVENTS(wxBitmapToggleButton::OnMouse) - EVT_CHAR(wxBitmapToggleButton::OnChar) - EVT_SIZE(wxBitmapToggleButton::OnSize) -END_EVENT_TABLE() - -void wxBitmapToggleButton::Init() -{ - m_depressed = false; - m_oldValue = false; - m_capturing = false; -} +IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton) bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap& label,const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name ) { - Init(); - - if (!wxToggleButtonBase::Create( parent, id, pos, size, style, validator, name )) + if (!wxToggleButton::Create( parent, id, wxEmptyString, pos, size, style, validator, name )) return false; - m_bitmap = label; + SetBitmap(label); if (size.x == -1 || size.y == -1) { @@ -98,152 +79,6 @@ bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id, return true; } -void wxBitmapToggleButton::SetValue(bool state) -{ - if (m_capturing) return; - - if (state == m_depressed) return; - - m_depressed = state; - Refresh(); -} - -bool wxBitmapToggleButton::GetValue() const -{ - return m_depressed; -} - -void wxBitmapToggleButton::SetLabel(const wxBitmap& label) -{ - m_bitmap = label; - m_disabledBitmap = wxBitmap(); - - Refresh(); -} - -bool wxBitmapToggleButton::Enable(bool enable) -{ - if (m_capturing) return false; - - if (!wxToggleButtonBase::Enable( enable )) - return false; - - Refresh(); - - return true; -} - -void wxBitmapToggleButton::OnPaint(wxPaintEvent &WXUNUSED(event)) -{ - wxSize size = GetSize(); - - wxBitmap bitmap = m_bitmap; - - wxPaintDC dc(this); - wxRendererNative &renderer = wxRendererNative::Get(); - int flags = 0; - if (m_depressed) - flags |= wxCONTROL_PRESSED; - wxRect rect(0,0,size.x,size.y); - renderer.DrawPushButton( this, dc, rect, flags ); - - if (bitmap.IsOk()) - { - if (!IsEnabled()) - { - if (!m_disabledBitmap.IsOk()) - { - wxImage image = m_bitmap.ConvertToImage(); - m_disabledBitmap = wxBitmap( image.ConvertToGreyscale() ); - } - - bitmap = m_disabledBitmap; - } - - wxSize bsize = bitmap.GetSize(); - int offset = 0; - if (m_depressed) offset = 1; - dc.DrawBitmap( bitmap, (size.x-bsize.x) / 2 + offset, (size.y-bsize.y) / 2 + offset, true ); - } - -} - -void wxBitmapToggleButton::OnMouse(wxMouseEvent &event) -{ - if (!IsEnabled()) - return; - - wxSize size = GetSize(); - bool mouse_in = ((event.GetX() > 0) && (event.GetX() < size.x) && - (event.GetY() > 0) && (event.GetY() < size.y)); - - if (m_capturing) - { - bool old_depressed = m_depressed; - if (mouse_in) - m_depressed = !m_oldValue; - else - m_depressed = m_oldValue; - - if (event.LeftUp()) - { - ReleaseMouse(); - m_capturing = false; - if (mouse_in) - { - wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId); - event.SetInt(GetValue()); - event.SetEventObject(this); - ProcessCommand(event); - } - } - - if (old_depressed != m_depressed) - Refresh(); - } - else - { - if (event.LeftDown()) - { - m_capturing = true; - m_oldValue = m_depressed; - m_depressed = !m_oldValue; - CaptureMouse(); - Refresh(); - } - } -} - -void wxBitmapToggleButton::OnChar(wxKeyEvent &event) -{ - if (event.GetKeyCode() == WXK_SPACE) - { - m_depressed = !m_depressed; - Refresh(); - - wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId); - event.SetInt(GetValue()); - event.SetEventObject(this); - ProcessCommand(event); - } -} - -void wxBitmapToggleButton::OnSize(wxSizeEvent &WXUNUSED(event)) -{ - Refresh(); -} - -wxSize wxBitmapToggleButton::DoGetBestSize() const -{ - if (!m_bitmap.IsOk()) - return wxSize(16,16); - - wxSize ret = m_bitmap.GetSize(); - ret.x += 8; - ret.y += 8; - return ret; -} - // ---------------------------------------------------------------------------- // wxToggleButton @@ -251,6 +86,11 @@ wxSize wxBitmapToggleButton::DoGetBestSize() const IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl) +void wxToggleButton::Init() +{ + m_state = false; +} + // Single check box item bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, @@ -260,6 +100,8 @@ bool wxToggleButton::Create(wxWindow *parent, const wxValidator& validator, const wxString& name) { + Init(); + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return false; @@ -294,26 +136,29 @@ WXDWORD wxToggleButton::MSWGetStyle(long style, WXDWORD *exstyle) const return msStyle; } -wxSize wxToggleButton::DoGetBestSize() const -{ - return wxMSWButton::ComputeBestSize(const_cast(this)); -} - -void wxToggleButton::SetLabel(const wxString& label) -{ - wxMSWButton::UpdateMultilineStyle(GetHwnd(), label); - - wxToggleButtonBase::SetLabel(label); -} - void wxToggleButton::SetValue(bool val) { - ::SendMessage(GetHwnd(), BM_SETCHECK, val, 0); + m_state = val; + if ( IsOwnerDrawn() ) + { + Refresh(); + } + else + { + ::SendMessage(GetHwnd(), BM_SETCHECK, val, 0); + } } bool wxToggleButton::GetValue() const { - return ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED; + if ( IsOwnerDrawn() ) + { + return m_state; + } + else + { + return ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED; + } } void wxToggleButton::Command(wxCommandEvent& event) @@ -322,8 +167,18 @@ void wxToggleButton::Command(wxCommandEvent& event) ProcessCommand(event); } -bool wxToggleButton::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) +bool wxToggleButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { + if ( param != BN_CLICKED && param != BN_DBLCLK ) + return false; + + // first update the value so that user event handler gets the new + // toggle button value + + // ownerdrawn buttons don't manage their state themselves unlike usual + // auto checkboxes so do it ourselves in any case + m_state = !m_state; + wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId); event.SetInt(GetValue()); event.SetEventObject(this); @@ -331,4 +186,12 @@ bool wxToggleButton::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) return true; } +wxAnyButton::State wxToggleButton::GetNormalState() const +{ + if ( GetValue() ) + return State_Pressed; + else + return State_Normal; +} + #endif // wxUSE_TOGGLEBTN diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp index 7e17a1828d..6ad75a3cd1 100644 --- a/src/msw/toolbar.cpp +++ b/src/msw/toolbar.cpp @@ -618,7 +618,7 @@ void wxToolBar::CreateDisabledImageList() { wxToolBarToolBase *tool = node->GetData(); wxBitmap bmpDisabled = tool->GetDisabledBitmap(); - if ( bmpDisabled.Ok() ) + if ( bmpDisabled.IsOk() ) { const wxSize sizeBitmap = bmpDisabled.GetSize(); m_disabledImgList = new wxImageList @@ -744,7 +744,7 @@ bool wxToolBar::Realize() const int w = bmp.GetWidth(); const int h = bmp.GetHeight(); - if ( bmp.Ok() ) + if ( bmp.IsOk() ) { int xOffset = wxMax(0, (m_defaultWidth - w)/2); int yOffset = wxMax(0, (m_defaultHeight - h)/2); @@ -762,7 +762,7 @@ bool wxToolBar::Realize() { wxBitmap bmpDisabled = tool->GetDisabledBitmap(); #if wxUSE_IMAGE && wxUSE_WXDIB - if ( !bmpDisabled.Ok() ) + if ( !bmpDisabled.IsOk() ) { // no disabled bitmap specified but we still need to // fill the space in the image list with something, so diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 7ece1c72c9..5b271f01a2 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -403,7 +403,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, if ( winTop ) { wxIcon icon = winTop->GetIcon(); - if ( icon.Ok() ) + if ( icon.IsOk() ) { ::SendMessage(GetHwnd(), WM_SETICON, (WPARAM)TRUE, diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index d7aebb80d6..c00ead4cf3 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -131,6 +131,32 @@ private: // private functions // ---------------------------------------------------------------------------- +namespace +{ + +// Work around a problem with TreeView_GetItemRect() when using MinGW/Cygwin: +// it results in warnings about breaking strict aliasing rules because HITEM is +// passed via a RECT pointer, so use a union to avoid them and define our own +// version of the standard macro using it. +union TVGetItemRectParam +{ + RECT rect; + HTREEITEM hItem; +}; + +inline bool +wxTreeView_GetItemRect(HWND hwnd, + HTREEITEM hItem, + TVGetItemRectParam& param, + BOOL fItemRect) +{ + param.hItem = hItem; + return ::SendMessage(hwnd, TVM_GETITEMRECT, fItemRect, + (LPARAM)¶m) == TRUE; +} + +} // anonymous namespace + // wrappers for TreeView_GetItem/TreeView_SetItem static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem) { @@ -1198,14 +1224,10 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const } // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect - RECT rect; - - // this ugliness comes directly from MSDN - it *is* the correct way to pass - // the HTREEITEM with TVM_GETITEMRECT - *(HTREEITEM *)&rect = HITEM(item); + TVGetItemRectParam param; // true means to get rect for just the text, not the whole line - if ( !::SendMessage(GetHwnd(), TVM_GETITEMRECT, true, (LPARAM)&rect) ) + if ( !wxTreeView_GetItemRect(GetHwnd(), HITEM(item), param, TRUE) ) { // if TVM_GETITEMRECT returned false, then the item is definitely not // visible (because its parent is not expanded) @@ -1215,7 +1237,7 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const // however if it returned true, the item might still be outside the // currently visible part of the tree, test for it (notice that partly // visible means visible here) - return rect.bottom > 0 && rect.top < GetClientSize().y; + return param.rect.bottom > 0 && param.rect.top < GetClientSize().y; } bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const @@ -1488,9 +1510,10 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent, // need this to make the "[+]" appear if ( firstChild ) { - RECT rect; - TreeView_GetItemRect(GetHwnd(), HITEM(parent), &rect, FALSE); - ::InvalidateRect(GetHwnd(), &rect, FALSE); + TVGetItemRectParam param; + + wxTreeView_GetItemRect(GetHwnd(), HITEM(parent), param, FALSE); + ::InvalidateRect(GetHwnd(), ¶m.rect, FALSE); } // associate the application tree item with Win32 tree item handle @@ -2030,18 +2053,18 @@ bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly) const { - RECT rc; - // Virtual root items have no bounding rectangle if ( IS_VIRTUAL_ROOT(item) ) { return false; } - if ( TreeView_GetItemRect(GetHwnd(), HITEM(item), - &rc, textOnly) ) + TVGetItemRectParam param; + + if ( wxTreeView_GetItemRect(GetHwnd(), HITEM(item), param, textOnly) ) { - rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom)); + rect = wxRect(wxPoint(param.rect.left, param.rect.top), + wxPoint(param.rect.right, param.rect.bottom)); return true; } @@ -3093,16 +3116,16 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) // do it for the other items itself - help it wxArrayTreeItemIds selections; size_t count = GetSelections(selections); - RECT rect; + TVGetItemRectParam param; for ( size_t n = 0; n < count; n++ ) { // TreeView_GetItemRect() will return false if item is not // visible, which may happen perfectly well - if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]), - &rect, TRUE) ) + if ( wxTreeView_GetItemRect(GetHwnd(), HITEM(selections[n]), + param, TRUE) ) { - ::InvalidateRect(GetHwnd(), &rect, FALSE); + ::InvalidateRect(GetHwnd(), ¶m.rect, FALSE); } } } diff --git a/src/msw/uiaction.cpp b/src/msw/uiaction.cpp index eb5bfd1e34..e8c7d94df8 100644 --- a/src/msw/uiaction.cpp +++ b/src/msw/uiaction.cpp @@ -20,6 +20,8 @@ #include "wx/msw/private/keyboard.h" +#include "wx/math.h" + namespace { @@ -56,11 +58,13 @@ bool wxUIActionSimulator::MouseMove(long x, long y) { // Because MOUSEEVENTF_ABSOLUTE takes measurements scaled between 0 & 65535 // we need to scale our input too - int displayx, displayy, scaledx, scaledy; + int displayx, displayy; wxDisplaySize(&displayx, &displayy); - scaledx = ((float)x / displayx) * 65535; - scaledy = ((float)y / displayy) * 65535; + + int scaledx = wxRound(((float)x / displayx) * 65535); + int scaledy = wxRound(((float)y / displayy) * 65535); mouse_event(MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, scaledx, scaledy, 0, 0); + return true; } diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index a002517d25..f208feb48f 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -1274,8 +1274,7 @@ wxString wxGetOsDescription() switch ( info.dwMinorVersion ) { case 0: - str.Printf(_("Windows 2000 (build %lu"), - info.dwBuildNumber); + str = _("Windows 2000"); break; case 2: @@ -1284,36 +1283,44 @@ wxString wxGetOsDescription() // type to resolve this ambiguity if ( wxIsWindowsServer() == 1 ) { - str.Printf(_("Windows Server 2003 (build %lu"), - info.dwBuildNumber); + str = _("Windows Server 2003"); break; } //else: must be XP, fall through case 1: - str.Printf(_("Windows XP (build %lu"), - info.dwBuildNumber); + str = _("Windows XP"); break; } break; case 6: - if ( info.dwMinorVersion == 0 ) + switch ( info.dwMinorVersion ) { - str.Printf(_("Windows Vista (build %lu"), - info.dwBuildNumber); + case 0: + str = wxIsWindowsServer() == 1 + ? _("Windows Server 2008") + : _("Windows Vista"); + break; + + case 1: + str = wxIsWindowsServer() == 1 + ? _("Windows Server 2008 R2") + : _("Windows 7"); + break; } break; } if ( str.empty() ) { - str.Printf(_("Windows NT %lu.%lu (build %lu"), - info.dwMajorVersion, - info.dwMinorVersion, - info.dwBuildNumber); + str.Printf(_("Windows NT %lu.%lu"), + info.dwMajorVersion, + info.dwMinorVersion); } + str << wxT(" (") + << wxString::Format(_("build %lu"), info.dwBuildNumber); if ( !wxIsEmpty(info.szCSDVersion) ) { str << wxT(", ") << info.szCSDVersion; diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 6fc63c0ee1..2887ce5340 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -1010,7 +1010,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler, wxFAIL_MSG( wxT("unexpected WaitForInputIdle() return code") ); // fall through - case -1: + case WAIT_FAILED: wxLogLastError(wxT("WaitForInputIdle() in wxExecute")); case WAIT_TIMEOUT: diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index 90da7a1ebd..e8a3119150 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/src/msw/wince/tbarwce.cpp @@ -429,7 +429,7 @@ bool wxToolMenuBar::Realize() } int n = 0; - if ( bmpToUse.Ok() ) + if ( bmpToUse.IsOk() ) { n = ::CommandBar_AddBitmap( (HWND) GetHWND(), NULL, (int) (HBITMAP) bmpToUse.GetHBITMAP(), 1, 16, 16 ); diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 0b1f0d3a3a..7535e4efeb 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -186,7 +186,7 @@ extern wxMenu *wxCurrentPopupMenu; // This is a hack used by the owner-drawn wxButton implementation to ensure // that the brush used for erasing its background is correctly aligned with the // control. -extern wxWindowMSW *wxWindowBeingErased = NULL; +wxWindowMSW *wxWindowBeingErased = NULL; #endif // wxUSE_UXTHEME namespace @@ -829,6 +829,7 @@ bool wxWindowMSW::SetFont(const wxFont& font) return true; } + bool wxWindowMSW::SetCursor(const wxCursor& cursor) { if ( !wxWindowBase::SetCursor(cursor) ) @@ -838,7 +839,10 @@ bool wxWindowMSW::SetCursor(const wxCursor& cursor) } // don't "overwrite" busy cursor - if ( m_cursor.Ok() && !wxIsBusy() ) + if ( wxIsBusy() ) + return true; + + if ( m_cursor.IsOk() ) { // normally we should change the cursor only if it's over this window // but we should do it always if we capture the mouse currently @@ -865,6 +869,26 @@ bool wxWindowMSW::SetCursor(const wxCursor& cursor) } //else: will be set later when the mouse enters this window } + else // Invalid cursor: this means reset to the default one. + { + // To revert to the correct cursor we need to find the window currently + // under the cursor and ask it to set its cursor itself as only it + // knows what it is. + POINT pt; + if ( !::GetCursorPos(&pt) ) + { + wxLogLastError(wxT("GetCursorPos")); + return false; + } + + const wxWindow* win = wxFindWindowAtPoint(wxPoint(pt.x, pt.y)); + if ( !win ) + win = this; + + ::SendMessage(GetHwndOf(win), WM_SETCURSOR, + (WPARAM)GetHwndOf(win), + MAKELPARAM(HTCLIENT, WM_MOUSEMOVE)); + } return true; } @@ -1787,6 +1811,15 @@ void wxWindowMSW::DoGetClientSize(int *x, int *y) const if ( y ) *y = rect.bottom; } + + // The size of the client window can't be negative but ::GetClientRect() + // can return negative size for an extremely small (1x1) window with + // borders so ensure that we correct it here as having negative sizes is + // completely unexpected. + if ( x && *x < 0 ) + *x = 0; + if ( y && *y < 0 ) + *y = 0; } void wxWindowMSW::DoGetPosition(int *x, int *y) const @@ -2140,7 +2173,7 @@ void wxWindowMSW::DoGetTextExtent(const wxString& string, int *externalLeading, const wxFont *fontToUse) const { - wxASSERT_MSG( !fontToUse || fontToUse->Ok(), + wxASSERT_MSG( !fontToUse || fontToUse->IsOk(), wxT("invalid font in GetTextExtent()") ); HFONT hfontToUse; @@ -2204,18 +2237,16 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y) { menu->UpdateUI(); + wxPoint pt; if ( x == wxDefaultCoord && y == wxDefaultCoord ) { - wxPoint mouse = ScreenToClient(wxGetMousePosition()); - x = mouse.x; y = mouse.y; + pt = wxGetMousePosition(); + } + else + { + pt = ClientToScreen(wxPoint(x, y)); } - HWND hWnd = GetHwnd(); - HMENU hMenu = GetHmenuOf(menu); - POINT point; - point.x = x; - point.y = y; - ::ClientToScreen(hWnd, &point); #if defined(__WXWINCE__) static const UINT flags = 0; #else // !__WXWINCE__ @@ -2233,7 +2264,7 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y) } #endif // __WXWINCE__/!__WXWINCE__ - ::TrackPopupMenu(hMenu, flags, point.x, point.y, 0, hWnd, NULL); + ::TrackPopupMenu(GetHmenuOf(menu), flags, pt.x, pt.y, 0, GetHwnd(), NULL); // we need to do it right now as otherwise the events are never going to be // sent to wxCurrentPopupMenu from HandleCommand() @@ -2372,8 +2403,6 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg) // emulate the button click btn = wxFindWinFromHandle(msg->hwnd); } - - bProcess = false; } else // not a button itself, do we have default button? { @@ -2433,6 +2462,13 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg) return true; } + // This "Return" key press won't be actually used for + // navigation so don't generate wxNavigationKeyEvent + // for it but still pass it to IsDialogMessage() as it + // may handle it in some other way (e.g. by playing the + // default error sound). + bProcess = false; + #endif // wxUSE_BUTTON #ifdef __WXWINCE__ @@ -2692,7 +2728,11 @@ LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM w return rc; } -WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +bool +wxWindowMSW::MSWHandleMessage(WXLRESULT *result, + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam) { // did we process the message? bool processed = false; @@ -3572,15 +3612,26 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l } if ( !processed ) + return false; + + *result = rc.result; + + return true; +} + +WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +{ + WXLRESULT result; + if ( !MSWHandleMessage(&result, message, wParam, lParam) ) { #if wxDEBUG_LEVEL >= 2 wxLogTrace("winmsg", wxT("Forwarding %s to DefWindowProc."), wxGetMessageName(message)); #endif // wxDEBUG_LEVEL >= 2 - rc.result = MSWDefWindowProc(message, wParam, lParam); + result = MSWDefWindowProc(message, wParam, lParam); } - return rc.result; + return result; } // ---------------------------------------------------------------------------- @@ -4181,7 +4232,7 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd), // m_cursor if the user code caught EVT_SET_CURSOR() and returned // nothing from it - this is a way to say that our cursor shouldn't // be used for this point - if ( !processedEvtSetCursor && m_cursor.Ok() ) + if ( !processedEvtSetCursor && m_cursor.IsOk() ) { hcursor = GetHcursorOf(m_cursor); } @@ -4189,7 +4240,7 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd), if ( !hcursor && !GetParent() ) { const wxCursor *cursor = wxGetGlobalCursor(); - if ( cursor && cursor->Ok() ) + if ( cursor && cursor->IsOk() ) { hcursor = GetHcursorOf(*cursor); } @@ -4626,7 +4677,7 @@ extern wxCOLORMAP *wxGetStdColourMap() // to. wxLogNull logNo; // suppress error if we couldn't load the bitmap wxBitmap stdColourBitmap(wxT("wxBITMAP_STD_COLOURS")); - if ( stdColourBitmap.Ok() ) + if ( stdColourBitmap.IsOk() ) { // the pixels in the bitmap must correspond to wxSTD_COL_XXX! wxASSERT_MSG( stdColourBitmap.GetWidth() == wxSTD_COL_MAX, diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp index fc5f2a319b..c65092363e 100644 --- a/src/os2/accel.cpp +++ b/src/os2/accel.cpp @@ -199,7 +199,7 @@ bool wxAcceleratorTable::Translate( WXHWND hWnd, ,GetHaccel() ,pMsg ); - return (Ok() && rc); + return (IsOk() && rc); } // end of wxAcceleratorTable::Translate // --------------------------------------------------------------------------- diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 74c400fccc..16373e6f32 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -142,7 +142,7 @@ bool wxBitmap::CopyFromCursor( { UnRef(); - if (!rCursor.Ok()) + if (!rCursor.IsOk()) return(false); return(CopyFromIconOrCursor(rCursor)); } // end of wxBitmap::CopyFromCursor @@ -153,7 +153,7 @@ bool wxBitmap::CopyFromIcon( { UnRef(); - if (!rIcon.Ok()) + if (!rIcon.IsOk()) return(false); return CopyFromIconOrCursor(rIcon); @@ -379,7 +379,7 @@ bool wxBitmap::Create( } SetHBITMAP((WXHBITMAP)hBmp); - return Ok(); + return IsOk(); } // end of wxBitmap::Create bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) @@ -398,7 +398,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) else // no bitmap handler found { wxImage image; - if ( image.LoadFile( filename, type ) && image.Ok() ) + if ( image.LoadFile( filename, type ) && image.IsOk() ) { *this = wxBitmap(image); @@ -493,7 +493,7 @@ bool wxBitmap::SaveFile( // FIXME what about palette? shouldn't we use it? wxImage vImage = ConvertToImage(); - if (!vImage.Ok()) + if (!vImage.IsOk()) return false; return(vImage.SaveFile( rFilename @@ -512,7 +512,7 @@ bool wxBitmap::CreateFromImage ( , int nDepth ) { - wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image")); + wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image")); m_refData = new wxBitmapRefData(); int nSizeLimit = 1024 * 768 * 3; @@ -549,7 +549,7 @@ bool wxBitmap::CreateFromImage ( // // Set bitmap parameters // - wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image")); + wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image")); SetWidth(nWidth); SetHeight(nBmpHeight); if (nDepth == 1) @@ -624,7 +624,7 @@ bool wxBitmap::CreateFromImage ( ); #if wxUSE_PALETTE HPAL hOldPalette = NULLHANDLE; - if (rImage.GetPalette().Ok()) + if (rImage.GetPalette().IsOk()) { hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE()); } @@ -840,7 +840,7 @@ wxImage wxBitmap::ConvertToImage() const wxImage vImage; wxDC* pDC; - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); // // Create an wxImage object @@ -1072,7 +1072,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rRect ) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rRect.x >= 0) && (rRect.y >= 0) && (rRect.x + rRect.width <= GetWidth()) && (rRect.y + rRect.height <= GetHeight()), @@ -1082,7 +1082,7 @@ wxBitmap wxBitmap::GetSubBitmap( ,rRect.height ,GetDepth() ); - wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( vRet.IsOk(), wxT("GetSubBitmap error") ); // @@ -1268,7 +1268,7 @@ bool wxMask::Create( ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); m_hMaskBitmap = 0; } - if (!rBitmap.Ok() || rBitmap.GetDepth() != 1) + if (!rBitmap.IsOk() || rBitmap.GetDepth() != 1) { return false; } @@ -1316,7 +1316,7 @@ bool wxMask::Create( ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); m_hMaskBitmap = 0; } - if (rBitmap.Ok() && rBitmap.GetPalette()->Ok()) + if (rBitmap.IsOk() && rBitmap.GetPalette()->IsOk()) { unsigned char cRed; unsigned char cGreen; @@ -1366,7 +1366,7 @@ bool wxMask::Create( ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); m_hMaskBitmap = 0; } - if (!rBitmap.Ok()) + if (!rBitmap.IsOk()) { return false; } diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp index c5f951fff7..fdb3f53502 100644 --- a/src/os2/brush.cpp +++ b/src/os2/brush.cpp @@ -215,7 +215,7 @@ bool wxBrush::RealizeResource() break; case wxSTIPPLE: - if (M_BRUSHDATA->m_vStipple.Ok()) + if (M_BRUSHDATA->m_vStipple.IsOk()) { ::GpiSetBitmapId( M_BRUSHDATA->m_hBrush ,(USHORT)M_BRUSHDATA->m_vStipple.GetHBITMAP() @@ -266,35 +266,35 @@ bool wxBrush::RealizeResource() wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_vColour; } wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_nStyle; } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return &(M_BRUSHDATA->m_vStipple); } int wxBrush::GetPS() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid brush") ); return M_BRUSHDATA->m_hBrush; } WXHANDLE wxBrush::GetResourceHandle() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid brush") ); return (WXHANDLE)M_BRUSHDATA->m_hBrush; } // end of wxBrush::GetResourceHandle diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp index 1f14052c8c..756677c1ca 100644 --- a/src/os2/cursor.cpp +++ b/src/os2/cursor.cpp @@ -302,7 +302,7 @@ void wxSetCursor(const wxCursor& cursor) { extern wxCursor *g_globalCursor; - if ( cursor.Ok() && cursor.GetHCURSOR() ) + if ( cursor.IsOk() && cursor.GetHCURSOR() ) { // ::SetCursor((HCURSOR) cursor.GetHCURSOR()); diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp index 81939cf429..be55a32aef 100644 --- a/src/os2/dataobj.cpp +++ b/src/os2/dataobj.cpp @@ -329,12 +329,12 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void* pBuf) m_bitmap = wxBitmap(vImage); #endif //wxUSE_STREAMS - return m_bitmap.Ok(); + return m_bitmap.IsOk(); } void wxBitmapDataObject::DoConvertToPng() { - if (!m_bitmap.Ok()) + if (!m_bitmap.IsOk()) return; #if wxUSE_STREAMS diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index ab1b0ad718..14d766ba38 100644 --- a/src/os2/dc.cpp +++ b/src/os2/dc.cpp @@ -386,7 +386,7 @@ void wxPMDCImpl::SelectOldObjects( if (m_hOldBitmap) { ::GpiSetBitmap(hPS, (HBITMAP) m_hOldBitmap); - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vSelectedBitmap.SetSelectedInto(NULL); } @@ -644,7 +644,7 @@ void wxPMDCImpl::DoDrawLine( } else { - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -656,7 +656,7 @@ void wxPMDCImpl::DoDrawLine( vPoint[0].y = vY1; vPoint[1].x = vX2; vPoint[1].y = vY2; - if (m_pen.Ok()) + if (m_pen.IsOk()) { vColor = m_pen.GetColour().GetPixel(); } @@ -822,7 +822,7 @@ void wxPMDCImpl::DoDrawPoint( POINTL vPoint; COLORREF vColor = 0x00ffffff; - if (m_pen.Ok()) + if (m_pen.IsOk()) { vColor = m_pen.GetColour().GetPixel(); } @@ -974,7 +974,7 @@ void wxPMDCImpl::DoDrawRectangle( vY = OS2Y(vY,vHeight); else { - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -1064,7 +1064,7 @@ void wxPMDCImpl::DoDrawRoundedRectangle( vY = OS2Y(vY,vHeight); else { - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -1359,7 +1359,7 @@ void wxPMDCImpl::DoDrawBitmap( lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel(); } - else if (GetBrush().Ok()) + else if (GetBrush().IsOk()) lColor = GetBrush().GetColour().GetPixel(); else lColor = m_textBackgroundColour.GetPixel(); @@ -1526,13 +1526,13 @@ void wxPMDCImpl::DoDrawBitmap( ULONG lOldForeGround = ::GpiQueryColor((HPS)GetHPS()); ULONG lOldBackGround = ::GpiQueryBackColor((HPS)GetHPS()); - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { ::GpiSetColor( (HPS)GetHPS() ,m_textForegroundColour.GetPixel() ); } - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) { ::GpiSetBackColor( (HPS)GetHPS() ,m_textBackgroundColour.GetPixel() @@ -1703,14 +1703,14 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText, // // Set text color attributes // - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { SetTextColor( m_hPS ,(int)m_textForegroundColour.GetPixel() ); } - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) { nOldBackground = SetTextBkColor( m_hPS ,(int)m_textBackgroundColour.GetPixel() @@ -1733,7 +1733,7 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText, } else { - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -1758,7 +1758,7 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText, // it never is set to anything else, but background should remain // transparent even if we just drew an opaque string) // - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) SetTextBkColor( m_hPS ,nOldBackground ); @@ -1849,7 +1849,7 @@ void wxPMDCImpl::DoSelectPalette( bool WXUNUSED(bRealize) ) m_hOldPalette = 0; } - if (m_palette.Ok()) + if (m_palette.IsOk()) { HPALETTE hOldPal; @@ -1891,7 +1891,7 @@ void wxPMDCImpl::SetPalette( m_hOldFont = 0; } m_palette = rPalette; - if (!rPalette.Ok()) + if (!rPalette.IsOk()) { if (m_hOldFont) { @@ -1916,14 +1916,14 @@ void wxPMDCImpl::SetFont( m_hOldFont = 0; } m_font = rFont; - if (!rFont.Ok()) + if (!rFont.IsOk()) { m_hOldFont = 0; } m_font.SetPS(m_hPS); // this will realize the font - if (m_font.Ok()) + if (m_font.IsOk()) { HFONT hFont = m_font.GetResourceHandle(); if (hFont == (HFONT) NULL) @@ -1942,14 +1942,14 @@ void wxPMDCImpl::SetPen( if (m_pen == rPen) return; m_pen = rPen; - if (!m_pen.Ok()) + if (!m_pen.IsOk()) return; if (m_hOldPen) m_hOldPen = 0L; m_pen = rPen; - if (!m_pen.Ok()) + if (!m_pen.IsOk()) { if (m_hOldPen) { @@ -1958,7 +1958,7 @@ void wxPMDCImpl::SetPen( m_hOldPen = 0L; } - if (m_pen.Ok()) + if (m_pen.IsOk()) { if (m_pen.GetResourceHandle()) { @@ -1977,14 +1977,14 @@ void wxPMDCImpl::SetBrush( if (m_hOldBrush) m_hOldBrush = 0L; m_brush = rBrush; - if (!m_brush.Ok()) + if (!m_brush.IsOk()) if (m_brush == rBrush) return; - if (!m_brush.Ok()) + if (!m_brush.IsOk()) if (m_hOldBrush) m_hOldBrush = 0L; - if (!m_brush.Ok()) + if (!m_brush.IsOk()) { if (m_hOldBrush) { @@ -1993,7 +1993,7 @@ void wxPMDCImpl::SetBrush( m_hOldBrush = 0L; } - if (m_brush.Ok()) + if (m_brush.IsOk()) { if (m_brush.GetResourceHandle()) { @@ -2008,7 +2008,7 @@ void wxPMDCImpl::SetBackground(const wxBrush& rBrush) { m_backgroundBrush = rBrush; - if (m_backgroundBrush.Ok()) + if (m_backgroundBrush.IsOk()) { (void)::GpiSetBackColor((HPS)m_hPS, m_backgroundBrush.GetColour().GetPixel()); } @@ -2383,7 +2383,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest, const wxBitmap& rBmp = pm_impl->GetSelectedBitmap(); pMask = rBmp.GetMask(); - if (!(rBmp.Ok() && pMask && pMask->GetMaskBitmap())) + if (!(rBmp.IsOk() && pMask && pMask->GetMaskBitmap())) { bUseMask = false; } @@ -2396,7 +2396,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest, ); vOldTextColor = (COLORREF)vCbnd.lColor; - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { vCbnd.lColor = (LONG)m_textForegroundColour.GetPixel(); ::GpiSetAttrs( m_hPS // presentation-space handle @@ -2406,7 +2406,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest, ,&vCbnd // buffer for attributes. ); } - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) { ::GpiSetBackColor(m_hPS, (LONG)m_textBackgroundColour.GetPixel()); } diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp index ccddc30e76..64acc9f90d 100644 --- a/src/os2/dcmemory.cpp +++ b/src/os2/dcmemory.cpp @@ -139,7 +139,7 @@ void wxMemoryDCImpl::DoSelect( if (m_hOldBitmap) { ::GpiSetBitmap(m_hPS, NULLHANDLE); - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vSelectedBitmap.SetSelectedInto(NULL); m_vSelectedBitmap = wxNullBitmap; @@ -201,7 +201,7 @@ void wxMemoryDCImpl::DoGetSize( , int* pHeight ) const { - if (!m_vSelectedBitmap.Ok()) + if (!m_vSelectedBitmap.IsOk()) { *pWidth = 0; *pHeight = 0; diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp index 918ff77c9c..9f3bd395cc 100644 --- a/src/os2/dcprint.cpp +++ b/src/os2/dcprint.cpp @@ -261,7 +261,7 @@ void wxPrinterDCImpl::DoDrawBitmap( const wxBitmap& rBmp, wxCoord WXUNUSED(vY), bool WXUNUSED(bUseMask)) { - wxCHECK_RET( rBmp.Ok(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); + wxCHECK_RET( rBmp.IsOk(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); // int nWidth = rBmp.GetWidth(); // int nHeight = rBmp.GetHeight(); diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp index 636484e397..3afb3474f5 100644 --- a/src/os2/dnd.cpp +++ b/src/os2/dnd.cpp @@ -499,7 +499,7 @@ bool wxDropSource::GiveFeedback ( { const wxCursor& rCursor = GetCursor(eEffect); - if (rCursor.Ok()) + if (rCursor.IsOk()) { ::WinSetPointer(HWND_DESKTOP, (HPOINTER)rCursor.GetHCURSOR()); m_vDragImage.hImage = (LHANDLE)rCursor.GetHCURSOR(); diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 37f3bc3bfb..80ebeb2682 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -1075,7 +1075,7 @@ void wxFont::DoSetNativeFontInfo( int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->GetPointSize(); } // end of wxFont::GetPointSize @@ -1087,35 +1087,35 @@ wxFontFamily wxFont::DoGetFamily() const wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); return M_FONTDATA->GetStyle(); } // end of wxFont::GetStyle wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); return M_FONTDATA->GetWeight(); } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->GetUnderlined(); } // end of wxFont::GetUnderlined wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->GetFaceName(); } // end of wxFont::GetFaceName wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); return M_FONTDATA->GetEncoding(); } // end of wxFont::GetEncoding diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index dfccb2ccad..6f200c9dde 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -852,7 +852,7 @@ bool wxFrame::HandlePaint() const wxIcon& vIcon = GetIcon(); HPOINTER hIcon; - if (vIcon.Ok()) + if (vIcon.IsOk()) hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L); else hIcon = (HPOINTER)m_hDefaultIcon; @@ -1302,7 +1302,7 @@ MRESULT wxFrame::OS2WindowProc( WXUINT uMessage, const wxIcon& vIcon = GetIcon(); HPOINTER hIcon; - if (vIcon.Ok()) + if (vIcon.IsOk()) hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L); else hIcon = (HPOINTER)m_hDefaultIcon; diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp index c149132d88..405d2221f3 100644 --- a/src/os2/gdiimage.cpp +++ b/src/os2/gdiimage.cpp @@ -376,7 +376,7 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap, wxBitmapRefData* pData = pBitmap->GetBitmapData(); - if ( pBitmap->Ok() ) + if ( pBitmap->IsOk() ) { BITMAPINFOHEADER vBmph; @@ -385,7 +385,7 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap, pData->m_nHeight = vBmph.cy; pData->m_nDepth = vBmph.cBitCount; } - return(pBitmap->Ok()); + return(pBitmap->IsOk()); } // end of wxBMPResourceHandler::LoadFile bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap, @@ -477,5 +477,5 @@ bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon, pIcon->SetHICON((WXHICON)hIcon); - return pIcon->Ok(); + return pIcon->IsOk(); } // end of wxICOResourceHandler::LoadIcon diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 3eccd6eb75..59d72daced 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -489,7 +489,7 @@ bool wxMenuItem::OnMeasureItem( size_t* pWidth, size_t* pHeight ) // resize the space so the BMP will fit. Without this, BMPs // must be no larger or smaller than 16x16. // - if (m_bmpChecked.Ok()) + if (m_bmpChecked.IsOk()) { // // Is BMP height larger than text height? @@ -695,7 +695,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC, // Draw the bitmap // --------------- // - if (IsCheckable() && !m_bmpChecked.Ok()) + if (IsCheckable() && !m_bmpChecked.IsOk()) { if (eStatus & wxODChecked) { @@ -724,7 +724,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC, // wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE)); - if (vBmp.Ok()) + if (vBmp.IsOk()) { wxMemoryDC vDCMem(&rDC); diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index 5c35af15c8..c1c9f7253c 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -490,49 +490,49 @@ void wxPen::SetCap( wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_vColour; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_nWidth; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_nStyle; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_nJoin; } wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_nCap; } int wxPen::GetPS() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid pen") ); return M_PENDATA->m_hPen; } int wxPen::GetDashes(wxDash** ptr) const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); *ptr = M_PENDATA->m_dash; return M_PENDATA->m_nbDash; @@ -540,21 +540,21 @@ int wxPen::GetDashes(wxDash** ptr) const wxDash* wxPen::GetDash() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return M_PENDATA->m_dash; } int wxPen::GetDashCount() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_nbDash; } wxBitmap* wxPen::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return &(M_PENDATA->m_vStipple); } diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index c55d438bb2..b15c673c1e 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -368,7 +368,7 @@ bool wxSlider::Create( ,NULL // no control data ,NULL // no Presentation parameters ); - if (GetFont().Ok()) + if (GetFont().IsOk()) { if (GetFont().GetResourceHandle()) { diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index 5874763573..9a7f0985a3 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -134,7 +134,7 @@ bool wxStaticBitmap::Create( wxWindow* pParent, bool wxStaticBitmap::ImageIsOk() const { - return(m_pImage && m_pImage->Ok()); + return(m_pImage && m_pImage->IsOk()); } void wxStaticBitmap::Free() diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp index 9a802aa710..b2fa1e4840 100644 --- a/src/os2/toolbar.cpp +++ b/src/os2/toolbar.cpp @@ -821,7 +821,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase ) PrepareDC(rDc); - if (!vBitmap.Ok()) + if (!vBitmap.IsOk()) return; if ((pMask = vBitmap.GetMask()) != NULL) if (pMask->GetMaskBitmap() != NULLHANDLE) @@ -835,7 +835,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase ) wxColour vColor(wxT("GREY")); rDc.SetTextForeground(vColor); - if (!pTool->GetDisabledBitmap().Ok()) + if (!pTool->GetDisabledBitmap().IsOk()) pTool->SetDisabledBitmap(wxDisableBitmap( vBitmap ,(long)GetBackgroundColour().GetPixel() )); @@ -894,7 +894,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase ) LowerTool(pTool); rDc.SetTextForeground(vColor); - if (!pTool->GetDisabledBitmap().Ok()) + if (!pTool->GetDisabledBitmap().IsOk()) pTool->SetDisabledBitmap(wxDisableBitmap( vBitmap ,(long)GetBackgroundColour().GetPixel() )); diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index b605488501..b7df26740e 100644 --- a/src/os2/toplevel.cpp +++ b/src/os2/toplevel.cpp @@ -1015,7 +1015,7 @@ void wxTopLevelWindowOS2::SetIcons( const wxIcon& vIcon = rIcons.GetIconOfExactSize(32); - if (vIcon.Ok()) + if (vIcon.IsOk()) { ::WinSendMsg( m_hFrame ,WM_SETICON diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp index 9ab06acf96..eca34900b8 100644 --- a/src/os2/utilsgui.cpp +++ b/src/os2/utilsgui.cpp @@ -859,7 +859,7 @@ wxBitmap wxDisableBitmap( ::GpiSetBitmap(hPS, NULLHANDLE); ::GpiDestroyPS(hPS); ::DevCloseDC(hDC); - if (vNewBmp.Ok()) + if (vNewBmp.IsOk()) return(vNewBmp); return(wxNullBitmap); } // end of wxDisableBitmap diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 0c0bbef6b2..b0aa9ea547 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -571,7 +571,7 @@ bool wxWindowOS2::SetCursor( const wxCursor& rCursor) return false; } - if ( m_cursor.Ok() ) { + if ( m_cursor.IsOk() ) { HWND hWnd = GetHwnd(); POINTL vPoint; RECTL vRect; diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp index 163fcf4107..14f0b1887a 100644 --- a/src/osx/accel.cpp +++ b/src/osx/accel.cpp @@ -86,7 +86,7 @@ bool wxAcceleratorTable::IsOk() const int wxAcceleratorTable::GetCommand( wxKeyEvent &event ) { - if (!Ok()) return -1; + if (!IsOk()) return -1; wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); while (node) diff --git a/src/osx/anybutton_osx.cpp b/src/osx/anybutton_osx.cpp new file mode 100644 index 0000000000..66d0948ad8 --- /dev/null +++ b/src/osx/anybutton_osx.cpp @@ -0,0 +1,95 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/osx/anybutton_osx.cpp +// Purpose: wxAnyButton +// Author: Stefan Csomor +// Created: 1998-01-01 (extracted from button_osx.cpp) +// RCS-ID: $Id: anybutton_osx.cpp 67280 2011-03-22 14:17:38Z DS $ +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#include "wx/wxprec.h" + +#include "wx/anybutton.h" + +#ifndef WX_PRECOMP + #include "wx/panel.h" + #include "wx/toplevel.h" + #include "wx/dcclient.h" + #include "wx/stattext.h" +#endif + +#include "wx/stockitem.h" + +#include "wx/osx/private.h" + +BEGIN_EVENT_TABLE(wxAnyButton, wxControl) + EVT_ENTER_WINDOW(wxAnyButton::OnEnterWindow) + EVT_LEAVE_WINDOW(wxAnyButton::OnLeaveWindow) +END_EVENT_TABLE() + +void wxAnyButton::SetLabel(const wxString& label) +{ + if ( HasFlag(wxBU_NOTEXT) ) + { + // just store the label internally but don't really use it for the + // button + m_labelOrig = + m_label = label; + return; + } + + wxAnyButtonBase::SetLabel(label); +} + +wxBitmap wxAnyButton::DoGetBitmap(State which) const +{ + return m_bitmaps[which]; +} + +void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) +{ + m_bitmaps[which] = bitmap; + + if ( which == State_Normal ) + GetPeer()->SetBitmap(bitmap); + else if ( which == State_Pressed ) + { + wxButtonImpl* bi = dynamic_cast (GetPeer()); + if ( bi ) + bi->SetPressedBitmap(bitmap); + } + InvalidateBestSize(); +} + +void wxAnyButton::DoSetBitmapPosition(wxDirection dir) +{ + GetPeer()->SetBitmapPosition(dir); + InvalidateBestSize(); +} + +#if wxUSE_MARKUP && wxOSX_USE_COCOA + +bool wxAnyButton::DoSetLabelMarkup(const wxString& markup) +{ + if ( !wxAnyButtonBase::DoSetLabelMarkup(markup) ) + return false; + + GetPeer()->SetLabelMarkup(markup); + + return true; +} + +#endif // wxUSE_MARKUP && wxOSX_USE_COCOA + +void wxAnyButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event)) +{ + if ( DoGetBitmap( State_Current ).IsOk() ) + GetPeer()->SetBitmap( DoGetBitmap( State_Current ) ); +} + +void wxAnyButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event)) +{ + if ( DoGetBitmap( State_Current ).IsOk() ) + GetPeer()->SetBitmap( DoGetBitmap( State_Normal ) ); +} diff --git a/src/osx/brush.cpp b/src/osx/brush.cpp index 4d14ee0eec..8cd833dd46 100644 --- a/src/osx/brush.cpp +++ b/src/osx/brush.cpp @@ -140,21 +140,21 @@ wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->GetColour(); } wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->GetStyle(); } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return M_BRUSHDATA->GetStipple(); } diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp index da30664452..6984a9af08 100644 --- a/src/osx/button_osx.cpp +++ b/src/osx/button_osx.cpp @@ -42,11 +42,6 @@ bool IsHelpButtonWithStandardLabel(wxWindowID id, const wxString& label) } // anonymous namespace -BEGIN_EVENT_TABLE(wxButton, wxControl) - EVT_ENTER_WINDOW(wxButton::OnEnterWindow) - EVT_LEAVE_WINDOW(wxButton::OnLeaveWindow) -END_EVENT_TABLE() - bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& labelOrig, @@ -105,58 +100,9 @@ void wxButton::SetLabel(const wxString& label) return; } - if ( HasFlag(wxBU_NOTEXT) ) - { - // just store the label internally but don't really use it for the - // button - m_labelOrig = - m_label = label; - return; - } - - wxButtonBase::SetLabel(label); + wxAnyButton::SetLabel(label); } -wxBitmap wxButton::DoGetBitmap(State which) const -{ - return m_bitmaps[which]; -} - -void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which) -{ - m_bitmaps[which] = bitmap; - - if ( which == State_Normal ) - GetPeer()->SetBitmap(bitmap); - else if ( which == State_Pressed ) - { - wxButtonImpl* bi = dynamic_cast (GetPeer()); - if ( bi ) - bi->SetPressedBitmap(bitmap); - } - InvalidateBestSize(); -} - -void wxButton::DoSetBitmapPosition(wxDirection dir) -{ - GetPeer()->SetBitmapPosition(dir); - InvalidateBestSize(); -} - -#if wxUSE_MARKUP && wxOSX_USE_COCOA - -bool wxButton::DoSetLabelMarkup(const wxString& markup) -{ - if ( !wxButtonBase::DoSetLabelMarkup(markup) ) - return false; - - GetPeer()->SetLabelMarkup(markup); - - return true; -} - -#endif // wxUSE_MARKUP && wxOSX_USE_COCOA - wxWindow *wxButton::SetDefault() { wxWindow *btnOldDefault = wxButtonBase::SetDefault(); @@ -177,18 +123,6 @@ void wxButton::Command (wxCommandEvent & WXUNUSED(event)) // ProcessCommand(event); } -void wxButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event)) -{ - if ( DoGetBitmap( State_Current ).IsOk() ) - GetPeer()->SetBitmap( DoGetBitmap( State_Current ) ); -} - -void wxButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event)) -{ - if ( DoGetBitmap( State_Current ).IsOk() ) - GetPeer()->SetBitmap( DoGetBitmap( State_Normal ) ); -} - bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) { wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId); @@ -197,6 +131,12 @@ bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) return true; } +/* static */ +wxSize wxButtonBase::GetDefaultSize() +{ + return wxAnyButton::GetDefaultSize(); +} + //------------------------------------------------------- // wxDisclosureTriangle //------------------------------------------------------- diff --git a/src/osx/carbon/anybutton.cpp b/src/osx/carbon/anybutton.cpp new file mode 100644 index 0000000000..36a642a698 --- /dev/null +++ b/src/osx/carbon/anybutton.cpp @@ -0,0 +1,113 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/osx/carbon/anybutton.cpp +// Purpose: wxAnyButton +// Author: Stefan Csomor +// Created: 1998-01-01 (extracted from button.cpp) +// RCS-ID: $Id: anybutton.cpp 67230 2011-03-18 14:20:12Z SC $ +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#include "wx/wxprec.h" + +#include "wx/anybutton.h" + +#ifndef WX_PRECOMP + #include "wx/panel.h" + #include "wx/toplevel.h" + #include "wx/dcclient.h" +#endif + +#include "wx/stockitem.h" + +#include "wx/osx/private.h" + +wxSize wxAnyButton::DoGetBestSize() const +{ + if ( GetId() == wxID_HELP ) + return wxSize( 20 , 20 ) ; + + wxSize sz = GetDefaultSize() ; + + switch (GetWindowVariant()) + { + case wxWINDOW_VARIANT_NORMAL: + case wxWINDOW_VARIANT_LARGE: + sz.y = 20 ; + break; + + case wxWINDOW_VARIANT_SMALL: + sz.y = 17 ; + break; + + case wxWINDOW_VARIANT_MINI: + sz.y = 15 ; + break; + + default: + break; + } + +#if wxOSX_USE_CARBON + Rect bestsize = { 0 , 0 , 0 , 0 } ; + GetPeer()->GetBestRect( &bestsize ) ; + + int wBtn; + if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) ) + { + Point bounds; + + ControlFontStyleRec controlFont; + OSStatus err = GetPeer()->GetData( kControlEntireControl, kControlFontStyleTag, &controlFont ); + verify_noerr( err ); + + // GetThemeTextDimensions will cache strings and the documentation + // says not to use the NoCopy string creation calls. + // This also means that we can't use CFSTR without + // -fno-constant-cfstrings if the library might be unloaded, + // as GetThemeTextDimensions may cache a pointer to our + // unloaded segment. + wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "), + GetFont().GetEncoding() ); + +#if wxOSX_USE_ATSU_TEXT + SInt16 baseline; + if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) + { + err = GetThemeTextDimensions( + (CFStringRef)str, + m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline ); + verify_noerr( err ); + } + else +#endif + { + wxClientDC dc(const_cast(this)); + wxCoord width, height ; + dc.GetTextExtent( m_label , &width, &height); + bounds.h = width; + bounds.v = height; + } + + wBtn = bounds.h + sz.y; + } + else + { + wBtn = bestsize.right - bestsize.left ; + // non 'normal' window variants don't return the correct height + // sz.y = bestsize.bottom - bestsize.top ; + } + if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT)) + sz.x = wBtn; +#endif + + return sz ; +} + +wxSize wxAnyButton::GetDefaultSize() +{ + int wBtn = 70 ; + int hBtn = 20 ; + + return wxSize(wBtn, hBtn); +} diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp index 2924a24614..b96099be0d 100644 --- a/src/osx/carbon/button.cpp +++ b/src/osx/carbon/button.cpp @@ -27,96 +27,6 @@ // // -wxSize wxButton::DoGetBestSize() const -{ - if ( GetId() == wxID_HELP ) - return wxSize( 20 , 20 ) ; - - wxSize sz = GetDefaultSize() ; - - switch (GetWindowVariant()) - { - case wxWINDOW_VARIANT_NORMAL: - case wxWINDOW_VARIANT_LARGE: - sz.y = 20 ; - break; - - case wxWINDOW_VARIANT_SMALL: - sz.y = 17 ; - break; - - case wxWINDOW_VARIANT_MINI: - sz.y = 15 ; - break; - - default: - break; - } - -#if wxOSX_USE_CARBON - Rect bestsize = { 0 , 0 , 0 , 0 } ; - GetPeer()->GetBestRect( &bestsize ) ; - - int wBtn; - if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) ) - { - Point bounds; - - ControlFontStyleRec controlFont; - OSStatus err = GetPeer()->GetData( kControlEntireControl, kControlFontStyleTag, &controlFont ); - verify_noerr( err ); - - // GetThemeTextDimensions will cache strings and the documentation - // says not to use the NoCopy string creation calls. - // This also means that we can't use CFSTR without - // -fno-constant-cfstrings if the library might be unloaded, - // as GetThemeTextDimensions may cache a pointer to our - // unloaded segment. - wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "), - GetFont().GetEncoding() ); - -#if wxOSX_USE_ATSU_TEXT - SInt16 baseline; - if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) - { - err = GetThemeTextDimensions( - (CFStringRef)str, - m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline ); - verify_noerr( err ); - } - else -#endif - { - wxClientDC dc(const_cast(this)); - wxCoord width, height ; - dc.GetTextExtent( m_label , &width, &height); - bounds.h = width; - bounds.v = height; - } - - wBtn = bounds.h + sz.y; - } - else - { - wBtn = bestsize.right - bestsize.left ; - // non 'normal' window variants don't return the correct height - // sz.y = bestsize.bottom - bestsize.top ; - } - if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT)) - sz.x = wBtn; -#endif - - return sz ; -} - -wxSize wxButton::GetDefaultSize() -{ - int wBtn = 70 ; - int hBtn = 20 ; - - return wxSize(wBtn, hBtn); -} - wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id, diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm index 1fdc0bee31..c44060037d 100644 --- a/src/osx/carbon/colordlgosx.mm +++ b/src/osx/carbon/colordlgosx.mm @@ -56,7 +56,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) - (id)init { - [super init]; + self = [super init]; m_bIsClosed = false; return self; diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp index 2662bb8bd0..387f7402a5 100644 --- a/src/osx/carbon/combobox.cpp +++ b/src/osx/carbon/combobox.cpp @@ -25,13 +25,6 @@ #include "wx/osx/private.h" -WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl) - -BEGIN_EVENT_TABLE(wxComboBox, wxControl) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox) -END_EVENT_TABLE() - - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -318,11 +311,6 @@ void wxComboBox::DelegateChoice( const wxString& value ) SetStringSelection( value ); } -void wxComboBox::Init() -{ - WX_INIT_CONTROL_CONTAINER(); -} - bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp index 995e08b846..fba9efb8f5 100644 --- a/src/osx/carbon/cursor.cpp +++ b/src/osx/carbon/cursor.cpp @@ -527,7 +527,7 @@ wxCursor::wxCursor(const wxString& cursor_file, wxBitmapType flags, int hotSpotX #if wxUSE_IMAGE wxImage image ; image.LoadFile( cursor_file, flags ) ; - if ( image.Ok() ) + if ( image.IsOk() ) { image.SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX ) ; image.SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY ) ; diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index b330edff1c..a4cfb843af 100644 --- a/src/osx/carbon/dataobj.cpp +++ b/src/osx/carbon/dataobj.cpp @@ -534,7 +534,7 @@ bool wxDataObject::HasDataInPasteboard( void * pb ) wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType ); if ( dataFormat == flavorFormat || - dataFormat.GetType() == wxDF_UNICODETEXT && flavorFormat.GetType() == wxDF_TEXT ) + (dataFormat.GetType() == wxDF_UNICODETEXT && flavorFormat.GetType() == wxDF_TEXT) ) { hasData = true; } @@ -636,7 +636,7 @@ wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& rBitmap ) { Init(); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { SetBitmap( rBitmap ); } @@ -651,7 +651,7 @@ void wxBitmapDataObject::SetBitmap( const wxBitmap& rBitmap ) { Clear(); wxBitmapDataObjectBase::SetBitmap( rBitmap ); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { CGImageRef cgImageRef = (CGImageRef) m_bitmap.CreateCGImage(); @@ -742,8 +742,8 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf ) if ( source ) { cgImageRef = CGImageSourceCreateImageAtIndex(source, 0, NULL); + CFRelease( source ); } - CFRelease( source ); CFRelease( data ); if ( cgImageRef ) @@ -756,7 +756,7 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void *pBuf ) cgImageRef = NULL; } - return m_bitmap.Ok(); + return m_bitmap.IsOk(); } #endif diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp index 4975013a64..ff748471c2 100644 --- a/src/osx/carbon/dataview.cpp +++ b/src/osx/carbon/dataview.cpp @@ -889,7 +889,7 @@ bool wxMacDataViewDataBrowserListViewControl::InsertColumn(unsigned int pos, wxD UInt32 noOfColumns; - wxCFStringRef title(columnPtr->GetTitle(),m_font.Ok() ? dynamic_cast(GetWXPeer())->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()); + wxCFStringRef title(columnPtr->GetTitle(),m_font.IsOk() ? dynamic_cast(GetWXPeer())->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()); // try to get new ID for the column: @@ -1236,6 +1236,11 @@ void wxMacDataViewDataBrowserListViewControl::OnSize() SetHasScrollBars(true,true); } +void wxMacDataViewDataBrowserListViewControl::StartEditor( const wxDataViewItem & item, unsigned int column ) +{ + // implement me +} + // // callback functions (inherited from wxMacDataBrowserTableViewControl) // @@ -2339,7 +2344,7 @@ bool wxDataViewTextRenderer::MacRender() { wxCHECK_MSG(GetValue().GetType() == GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << GetValue().GetType()); - wxCFStringRef cfString(GetValue().GetString(),(GetView()->GetFont().Ok() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); + wxCFStringRef cfString(GetValue().GetString(),(GetView()->GetFont().IsOk() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); return (::SetDataBrowserItemDataText(GetNativeData()->GetItemDataRef(),cfString) == noErr); } @@ -2365,7 +2370,7 @@ bool wxDataViewBitmapRenderer::MacRender() wxBitmap bitmap; bitmap << GetValue(); - return (!(bitmap.Ok()) || (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),bitmap.GetIconRef()) == noErr)); + return (!(bitmap.IsOk()) || (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),bitmap.GetIconRef()) == noErr)); } IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer) @@ -2390,7 +2395,7 @@ bool wxDataViewIconTextRenderer::MacRender() iconText << GetValue(); - wxCFStringRef cfString(iconText.GetText(),(GetView()->GetFont().Ok() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); + wxCFStringRef cfString(iconText.GetText(),(GetView()->GetFont().IsOk() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); if (iconText.GetIcon().IsOk()) if (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),MAC_WXHICON(iconText.GetIcon().GetHICON())) != noErr) @@ -2556,7 +2561,7 @@ void wxDataViewColumn::SetBitmap(wxBitmap const& bitmap) DataBrowserListViewHeaderDesc headerDescription; wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); - if (GetBitmap().Ok()) + if (GetBitmap().IsOk()) headerDescription.btnContentInfo.u.iconRef = GetBitmap().GetIconRef(); else headerDescription.btnContentInfo.u.iconRef = NULL; @@ -2735,7 +2740,7 @@ void wxDataViewColumn::SetTitle(wxString const& title) if (macDataViewListCtrlPtr != NULL) { DataBrowserListViewHeaderDesc headerDescription; - wxCFStringRef cfTitle(title,(dataViewCtrlPtr->GetFont().Ok() ? dataViewCtrlPtr->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); + wxCFStringRef cfTitle(title,(dataViewCtrlPtr->GetFont().IsOk() ? dataViewCtrlPtr->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); headerDescription.titleString = cfTitle; diff --git a/src/osx/carbon/dcprint.cpp b/src/osx/carbon/dcprint.cpp index 70dd928a39..e0f31f91a2 100644 --- a/src/osx/carbon/dcprint.cpp +++ b/src/osx/carbon/dcprint.cpp @@ -46,7 +46,7 @@ public : // returns 0 in case of no Error, otherwise platform specific error codes virtual wxUint32 GetStatus() const = 0 ; - bool Ok() { return GetStatus() == 0 ; } + bool IsOk() { return GetStatus() == 0 ; } static wxNativePrinterDC* Create(wxPrintData* data) ; } ; @@ -112,6 +112,10 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data ) #endif } } + else + { + res.hRes = res.vRes = 300; + } m_maxX = wxCoord((double)m_maxX * res.hRes / 72.0); m_maxY = wxCoord((double)m_maxY * res.vRes / 72.0); @@ -288,7 +292,7 @@ wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printda m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ; if ( m_nativePrinterDC ) { - m_ok = m_nativePrinterDC->Ok() ; + m_ok = m_nativePrinterDC->IsOk() ; if ( !m_ok ) { wxString message ; @@ -329,7 +333,7 @@ bool wxPrinterDCImpl::StartDoc( const wxString& message ) { // in case we have to do additional things when successful } - m_ok = m_nativePrinterDC->Ok() ; + m_ok = m_nativePrinterDC->IsOk() ; if ( !m_ok ) { wxString message ; @@ -347,7 +351,7 @@ void wxPrinterDCImpl::EndDoc(void) return ; m_nativePrinterDC->EndDoc( (wxPrinterDC*) GetOwner() ) ; - m_ok = m_nativePrinterDC->Ok() ; + m_ok = m_nativePrinterDC->IsOk() ; if ( !m_ok ) { @@ -397,7 +401,7 @@ void wxPrinterDCImpl::StartPage() m_backgroundBrush = *wxWHITE_BRUSH; m_nativePrinterDC->StartPage( (wxPrinterDC*) GetOwner() ) ; - m_ok = m_nativePrinterDC->Ok() ; + m_ok = m_nativePrinterDC->IsOk() ; } @@ -407,7 +411,7 @@ void wxPrinterDCImpl::EndPage() return ; m_nativePrinterDC->EndPage( (wxPrinterDC*) GetOwner() ); - m_ok = m_nativePrinterDC->Ok() ; + m_ok = m_nativePrinterDC->IsOk() ; } void wxPrinterDCImpl::DoGetSize(int *width, int *height) const diff --git a/src/osx/carbon/evtloop.cpp b/src/osx/carbon/evtloop.cpp index 255c08f0f2..d263effec7 100644 --- a/src/osx/carbon/evtloop.cpp +++ b/src/osx/carbon/evtloop.cpp @@ -83,6 +83,16 @@ int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout) } } +void wxGUIEventLoop::WakeUp() +{ + OSStatus err = noErr; + wxMacCarbonEvent wakeupEvent; + wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(), + kEventAttributeNone ); + err = PostEventToQueue(GetMainEventQueue(), wakeupEvent, + kEventPriorityHigh ); +} + void wxGUIEventLoop::DoRun() { wxMacAutoreleasePool autoreleasepool; diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 5a1b9bae8b..643903040d 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -893,7 +893,7 @@ UIFont* wxFont::OSXGetUIFont() const const wxNativeFontInfo * wxFont::GetNativeFontInfo() const { wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") ); - wxCHECK_MSG( Ok(), NULL, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); // cast away constness otherwise lazy font resolution is not possible const_cast(this)->RealizeResource(); diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp index cf0aed1759..80c103c46f 100644 --- a/src/osx/carbon/fontdlg.cpp +++ b/src/osx/carbon/fontdlg.cpp @@ -223,7 +223,7 @@ int wxFontDialog::ShowModal() OSStatus err ; wxFont font = *wxNORMAL_FONT ; - if ( m_fontData.m_initialFont.Ok() ) + if ( m_fontData.m_initialFont.IsOk() ) { font = m_fontData.m_initialFont ; } @@ -316,7 +316,7 @@ void wxFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) wxSize size = GetSize(); wxFont font = GetFont(); - if ( font.Ok() ) + if ( font.IsOk() ) { dc.SetFont(font); // Calculate vertical centre @@ -604,7 +604,7 @@ void wxFontDialog::CreateControls() InitializeControls(); m_previewCtrl->SetFont(m_dialogFont); - if (m_fontData.GetColour().Ok()) + if (m_fontData.GetColour().IsOk()) { m_previewCtrl->SetForegroundColour(m_fontData.GetColour()); } @@ -700,7 +700,7 @@ void wxFontDialog::InitializeFont() bool fontUnderline = false; wxString fontName; - if (m_fontData.m_initialFont.Ok()) + if (m_fontData.m_initialFont.IsOk()) { fontFamily = m_fontData.m_initialFont.GetFamily(); fontWeight = m_fontData.m_initialFont.GetWeight(); @@ -738,7 +738,7 @@ void wxFontDialog::InitializeControls() } m_facenameCtrl->SetStringSelection(facename); - if (m_colourCtrl && m_fontData.GetColour().Ok()) + if (m_colourCtrl && m_fontData.GetColour().IsOk()) { m_colourCtrl->SetColour(m_fontData.GetColour()); m_colourCtrl->Refresh(); diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm index c5863ad7e3..2d42537db7 100644 --- a/src/osx/carbon/fontdlgosx.mm +++ b/src/osx/carbon/fontdlgosx.mm @@ -167,6 +167,7 @@ int RunMixedFontDialog(wxFontDialog* dialog) NSRect rectBox = NSMakeRect( 0 , 0 , 192 , 40 ); accessoryView = [[wxMacFontPanelAccView alloc] initWithFrame:rectBox]; [fontPanel setAccessoryView:accessoryView]; + [accessoryView release]; [fontPanel setDefaultButtonCell:[[accessoryView okButton] cell]] ; } @@ -174,14 +175,14 @@ int RunMixedFontDialog(wxFontDialog* dialog) [accessoryView resetFlags]; #if wxOSX_USE_COCOA wxFont font = *wxNORMAL_FONT ; - if ( fontdata.m_initialFont.Ok() ) + if ( fontdata.m_initialFont.IsOk() ) { font = fontdata.m_initialFont ; } [[NSFontPanel sharedFontPanel] setPanelFont: font.OSXGetNSFont() isMultiple:NO]; - if(fontdata.m_fontColour.Ok()) + if(fontdata.m_fontColour.IsOk()) [[NSColorPanel sharedColorPanel] setColor: [NSColor colorWithCalibratedRed:fontdata.m_fontColour.Red() / 255.0 green:fontdata.m_fontColour.Green() / 255.0 @@ -220,7 +221,6 @@ int RunMixedFontDialog(wxFontDialog* dialog) retval = wxID_OK ; } [fontPanel setAccessoryView:nil]; - [accessoryView release]; return retval ; } @@ -373,7 +373,7 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) //if the font is valid set the default (selected) font of the //NSFontDialog to that font - if (thewxfont.Ok()) + if (thewxfont.IsOk()) { NSFontTraitMask theMask = 0; @@ -401,7 +401,7 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) } - if(m_fontData.m_fontColour.Ok()) + if(m_fontData.m_fontColour.IsOk()) [[NSColorPanel sharedColorPanel] setColor: [NSColor colorWithCalibratedRed:m_fontData.m_fontColour.Red() / 255.0 green:m_fontData.m_fontColour.Green() / 255.0 diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 2a3bf12a40..4b1df9cdca 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -225,7 +225,7 @@ class ImagePattern : public wxMacCoreGraphicsPattern public : ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform ) { - wxASSERT( bmp && bmp->Ok() ); + wxASSERT( bmp && bmp->IsOk() ); #ifdef __WXMAC__ Init( (CGImageRef) bmp->CreateCGImage() , transform ); #endif @@ -500,7 +500,7 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer case wxPENSTYLE_STIPPLE: { wxBitmap* bmp = pen.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) ); m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) ); @@ -647,7 +647,7 @@ wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush ) { // now brush is a bitmap wxBitmap* bmp = brush.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { m_isPattern = true; m_patternColorComponents = new CGFloat[1] ; @@ -1415,6 +1415,8 @@ public: virtual bool SetAntialiasMode(wxAntialiasMode antialias); + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation); + virtual bool SetCompositionMode(wxCompositionMode op); virtual void BeginLayer(wxDouble opacity); @@ -1487,6 +1489,11 @@ public: virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + + // fast convenience methods + + + virtual void DrawRectangleX( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); void SetNativeContext( CGContextRef cg ); @@ -1573,6 +1580,8 @@ void wxMacCoreGraphicsContext::Init() m_view = NULL; #endif m_invisible = false; + m_antialias = wxANTIALIAS_DEFAULT; + m_interpolation = wxINTERPOLATION_DEFAULT; } wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer) @@ -1703,16 +1712,10 @@ bool wxMacCoreGraphicsContext::EnsureIsValid() if ( m_cgContext ) { CGContextSaveGState( m_cgContext ); - CGContextConcatCTM( m_cgContext, m_windowTransform ); - CGContextSetTextMatrix( m_cgContext, CGAffineTransformIdentity ); - m_contextSynthesized = true; #if wxOSX_USE_COCOA_OR_CARBON if ( m_clipRgn.get() ) { - // the clip region is in device coordinates, so we convert this again to user coordinates wxCFRef hishape( HIShapeCreateMutableCopy( m_clipRgn ) ); - CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform); - HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y ); // if the shape is empty, HIShapeReplacePathInCGContext doesn't work if ( HIShapeIsEmpty(hishape)) { @@ -1726,6 +1729,9 @@ bool wxMacCoreGraphicsContext::EnsureIsValid() } } #endif + CGContextConcatCTM( m_cgContext, m_windowTransform ); + CGContextSetTextMatrix( m_cgContext, CGAffineTransformIdentity ); + m_contextSynthesized = true; CGContextSaveGState( m_cgContext ); #if 0 // turn on for debugging of clientdc @@ -1775,6 +1781,45 @@ bool wxMacCoreGraphicsContext::SetAntialiasMode(wxAntialiasMode antialias) return true; } +bool wxMacCoreGraphicsContext::SetInterpolationQuality(wxInterpolationQuality interpolation) +{ + if (!EnsureIsValid()) + return true; + + if (m_interpolation == interpolation) + return true; + + m_interpolation = interpolation; + CGInterpolationQuality quality; + + switch (interpolation) + { + case wxINTERPOLATION_DEFAULT: + quality = kCGInterpolationDefault; + break; + case wxINTERPOLATION_NONE: + quality = kCGInterpolationNone; + break; + case wxINTERPOLATION_FAST: + quality = kCGInterpolationLow; + break; + case wxINTERPOLATION_GOOD: +#if wxOSX_USE_COCOA_OR_CARBON + quality = UMAGetSystemVersion() < 0x1060 ? kCGInterpolationHigh : (CGInterpolationQuality) 4 /*kCGInterpolationMedium only on 10.6*/; +#else + quality = kCGInterpolationMedium; +#endif + break; + case wxINTERPOLATION_BEST: + quality = kCGInterpolationHigh; + break; + default: + return false; + } + CGContextSetInterpolationQuality(m_cgContext, quality); + return true; +} + bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op) { if (!EnsureIsValid()) @@ -1955,6 +2000,7 @@ void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDoubl // the clipping itself must be stored as device coordinates, otherwise // we cannot apply it back correctly r.origin= CGPointApplyAffineTransform( r.origin, m_windowTransform ); + r.size= CGSizeApplyAffineTransform(r.size, m_windowTransform); m_clipRgn.reset(HIShapeCreateWithRect(&r)); #else // allow usage as measuring context @@ -2613,6 +2659,27 @@ void * wxMacCoreGraphicsContext::GetNativeContext() return m_cgContext; } + +void wxMacCoreGraphicsContext::DrawRectangleX( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + if (m_composition == wxCOMPOSITION_DEST) + return; + + CGRect rect = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h ); + if ( !m_brush.IsNull() ) + { + ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this); + CGContextFillRect(m_cgContext, rect); + } + + wxQuartzOffsetHelper helper( m_cgContext , ShouldOffset() ); + if ( !m_pen.IsNull() ) + { + ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this); + CGContextStrokeRect(m_cgContext, rect); + } +} + // concatenates this transform with the current transform of this context void wxMacCoreGraphicsContext::ConcatTransform( const wxGraphicsMatrix& matrix ) { @@ -2842,7 +2909,7 @@ wxGraphicsMatrix wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen) { - if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT ) + if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT ) return wxNullGraphicsPen; else { @@ -2854,7 +2921,7 @@ wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen) wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush ) { - if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT ) + if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT ) return wxNullGraphicsBrush; else { @@ -2866,7 +2933,7 @@ wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush ) wxGraphicsBitmap wxMacCoreGraphicsRenderer::CreateBitmap( const wxBitmap& bmp ) { - if ( bmp.Ok() ) + if ( bmp.IsOk() ) { wxGraphicsBitmap p; p.SetRefData(new wxMacCoreGraphicsBitmapData( this , bmp.CreateCGImage(), bmp.GetDepth() == 1 ) ); @@ -2931,7 +2998,7 @@ wxMacCoreGraphicsRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, // sets the font wxGraphicsFont wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const wxColour &col ) { - if ( font.Ok() ) + if ( font.IsOk() ) { wxGraphicsFont p; p.SetRefData(new wxMacCoreGraphicsFontData( this , font, col )); diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp index d99c5a1e64..5afbf3c67b 100644 --- a/src/osx/carbon/icon.cpp +++ b/src/osx/carbon/icon.cpp @@ -137,21 +137,21 @@ wxIcon::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const WXHICON wxIcon::GetHICON() const { - wxASSERT( Ok() ) ; + wxASSERT( IsOk() ) ; return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ; } int wxIcon::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid icon") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid icon") ); return M_ICONDATA->GetWidth(); } int wxIcon::GetHeight() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid icon") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid icon") ); return M_ICONDATA->GetHeight(); } @@ -414,7 +414,7 @@ bool wxIcon::LoadIconAsBitmap(const wxString& filename, wxBitmapType type, int d else { wxImage loadimage( filename, type ); - if (loadimage.Ok()) + if (loadimage.IsOk()) { if ( desiredWidth == -1 ) desiredWidth = loadimage.GetWidth() ; @@ -467,7 +467,7 @@ bool wxICONResourceHandler::LoadFile( if ( icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) ) { bitmap->CopyFromIcon( icon ) ; - return bitmap->Ok() ; + return bitmap->IsOk() ; } return false; } diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp index 4301982e51..441f9aa930 100644 --- a/src/osx/carbon/listbox.cpp +++ b/src/osx/carbon/listbox.cpp @@ -406,7 +406,7 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned in // TODO: Why is m_font not defined when we enter wxLC_LIST mode, but is // defined for other modes? wxFontEncoding enc; - if ( m_font.Ok() ) + if ( m_font.IsOk() ) enc = m_font.GetEncoding(); else enc = wxLocale::GetSystemEncoding(); diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp index c37094dc70..fcb9796ec0 100644 --- a/src/osx/carbon/listctrl_mac.cpp +++ b/src/osx/carbon/listctrl_mac.cpp @@ -943,7 +943,7 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item) if (item.GetMask() & wxLIST_MASK_TEXT) { wxFontEncoding enc; - if ( m_font.Ok() ) + if ( m_font.IsOk() ) enc = GetFont().GetEncoding(); else enc = wxLocale::GetSystemEncoding(); @@ -2177,7 +2177,7 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item) if (imageList && imageList->GetImageCount() > 0) { wxBitmap bmp = imageList->GetBitmap(0); - //if (bmp.Ok()) + //if (bmp.IsOk()) // type = kDataBrowserIconAndTextType; } @@ -2786,7 +2786,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( if (bgColor == wxNullColour) bgColor = listBgColor; - if (!font.Ok()) + if (!font.IsOk()) font = list->GetFont(); wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() ); @@ -2850,12 +2850,12 @@ void wxMacDataBrowserListCtrlControl::DrawItem( else { - if (color.Ok()) + if (color.IsOk()) color.GetRGBColor(&labelColor); - else if (list->GetTextColour().Ok()) + else if (list->GetTextColour().IsOk()) list->GetTextColour().GetRGBColor(&labelColor); - if (bgColor.Ok()) + if (bgColor.IsOk()) { bgColor.GetRGBColor(&backgroundColor); CGContextSaveGState(context); @@ -2897,7 +2897,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( { info.version = kHIThemeTextInfoVersionOne; info.fontID = kThemeViewsFont; - if (font.Ok()) + if (font.IsOk()) { info.fontID = kThemeSpecifiedFont; info.font = (CTFontRef) font.OSXGetCTFont(); @@ -2911,7 +2911,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( info.version = kHIThemeTextInfoVersionZero; info.fontID = kThemeViewsFont; - if (font.Ok()) + if (font.IsOk()) { info.fontID = font.MacGetThemeFontID(); diff --git a/src/osx/carbon/menu.cpp b/src/osx/carbon/menu.cpp index ab442f635f..5a9f62156f 100644 --- a/src/osx/carbon/menu.cpp +++ b/src/osx/carbon/menu.cpp @@ -56,7 +56,7 @@ public : MenuItemIndex i = FindMenuItemIndex() ; if ( i > 0 ) { - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { #if wxUSE_BMPBUTTON ControlButtonContentInfo info ; diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp index 6e8905e6b4..dde3a496b9 100644 --- a/src/osx/carbon/metafile.cpp +++ b/src/osx/carbon/metafile.cpp @@ -274,7 +274,7 @@ wxSize wxMetaFile::GetSize() const { wxSize dataSize = wxDefaultSize; - if (Ok()) + if (IsOk()) { dataSize.x = M_METAFILEDATA->GetWidth(); dataSize.y = M_METAFILEDATA->GetHeight(); diff --git a/src/osx/carbon/notebmac.cpp b/src/osx/carbon/notebmac.cpp index 189b31c2a3..710aadbcb0 100644 --- a/src/osx/carbon/notebmac.cpp +++ b/src/osx/carbon/notebmac.cpp @@ -169,7 +169,7 @@ void wxMacControl::SetupTabs( const wxNotebook& notebook) if ( notebook.GetImageList() && notebook.GetPageImage(ii) >= 0 ) { const wxBitmap bmap = notebook.GetImageList()->GetBitmap( notebook.GetPageImage( ii ) ) ; - if ( bmap.Ok() ) + if ( bmap.IsOk() ) { ControlButtonContentInfo info ; diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp index 36e322147a..99a9875516 100644 --- a/src/osx/carbon/region.cpp +++ b/src/osx/carbon/region.cpp @@ -89,8 +89,8 @@ wxRegion::wxRegion(long x, long y, long w, long h) wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight) { m_refData = new wxRegionRefData(topLeft.x , topLeft.y , - topLeft.x - bottomRight.x , - topLeft.y - bottomRight.y); + bottomRight.x - topLeft.x, + bottomRight.y - topLeft.y); } wxRegion::wxRegion(const wxRect& rect) @@ -191,6 +191,8 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y) // nothing to do return true; + AllocExclusive(); + verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ; return true ; @@ -200,19 +202,9 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y) //! Union /e region with this. bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid wxRegion") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid wxRegion") ); - // Don't change shared data - if (!m_refData) - { - m_refData = new wxRegionRefData(); - } - else if (m_refData->GetRefCount() > 1) - { - wxRegionRefData* ref = (wxRegionRefData*)m_refData; - UnRef(); - m_refData = new wxRegionRefData(*ref); - } + AllocExclusive(); switch (op) { @@ -250,11 +242,21 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op) //# Information on region //----------------------------------------------------------------------------- -bool wxRegion::DoIsEqual(const wxRegion& WXUNUSED(region)) const +bool wxRegion::DoIsEqual(const wxRegion& region) const { - wxFAIL_MSG( wxT("not implemented") ); + // There doesn't seem to be any native function for checking the equality + // of HIShapes so we compute their differences to determine if they are + // equal. + wxRegion r(*this); + r.Subtract(region); - return false; + if ( !r.IsEmpty() ) + return false; + + wxRegion r2(region); + r2.Subtract(*this); + + return r2.IsEmpty(); } // Outer bounds of region diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index 9fc1a415bf..7e5c766acc 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -39,12 +39,17 @@ #endif // wxHAS_DRAW_TITLE_BAR_BITMAP -// check if we're currently in a paint event -inline bool wxInPaintEvent(wxWindow* win, wxDC& dc) +// check if we're having a CGContext we can draw into +inline bool wxHasCGContext(wxWindow* WXUNUSED(win), wxDC& dc) { - return win->MacGetCGContextRef() != NULL || - // wxMemoryDC's also have a valid CGContext. - dc.IsKindOf( CLASSINFO(wxMemoryDC) ); + wxGCDCImpl* gcdc = wxDynamicCast( dc.GetImpl() , wxGCDCImpl); + + if ( gcdc ) + { + if ( gcdc->GetGraphicsContext()->GetNativeContext() ) + return true; + } + return false; } @@ -158,7 +163,7 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win, dc.SetBrush( *wxTRANSPARENT_BRUSH ); HIRect headerRect = CGRectMake( x, y, w, h ); - if ( !wxInPaintEvent(win, dc) ) + if ( !wxHasCGContext(win, dc) ) { win->Refresh( &rect ); } @@ -247,7 +252,7 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win, dc.SetBrush( *wxTRANSPARENT_BRUSH ); HIRect headerRect = CGRectMake( x, y, w, h ); - if ( !wxInPaintEvent(win, dc) ) + if ( !wxHasCGContext(win, dc) ) { win->Refresh( &rect ); } @@ -293,7 +298,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win, // under compositing we should only draw when called by the OS, otherwise just issue a redraw command // strange redraw errors occur if we don't do this - if ( !wxInPaintEvent(win, dc) ) + if ( !wxHasCGContext(win, dc) ) { wxRect rect( (int) splitterRect.origin.x, (int) splitterRect.origin.y, (int) splitterRect.size.width, (int) splitterRect.size.height ); @@ -363,7 +368,7 @@ wxRendererMac::DrawMacThemeButton(wxWindow *win, dc.SetBrush( *wxTRANSPARENT_BRUSH ); HIRect headerRect = CGRectMake( x, y, w, h ); - if ( !wxInPaintEvent(win, dc) ) + if ( !wxHasCGContext(win, dc) ) { win->Refresh( &rect ); } @@ -571,7 +576,7 @@ void wxRendererMac::DrawTextCtrl(wxWindow* win, wxDC& dc, dc.SetBrush( *wxTRANSPARENT_BRUSH ); HIRect hiRect = CGRectMake( x, y, w, h ); - if ( !wxInPaintEvent(win, dc) ) + if ( !wxHasCGContext(win, dc) ) { win->Refresh( &rect ); } diff --git a/src/osx/carbon/statbmp.cpp b/src/osx/carbon/statbmp.cpp index 1034298f46..51c59cb55c 100644 --- a/src/osx/carbon/statbmp.cpp +++ b/src/osx/carbon/statbmp.cpp @@ -66,7 +66,7 @@ void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) wxPaintDC dc(this); PrepareDC(dc); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) { dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ; } @@ -74,7 +74,7 @@ void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) wxSize wxStaticBitmap::DoGetBestSize() const { - if ( m_bitmap.Ok() ) + if ( m_bitmap.IsOk() ) return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) ); // this is completely arbitrary diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp index 49b11122b2..ca38276fd2 100644 --- a/src/osx/carbon/taskbar.cpp +++ b/src/osx/carbon/taskbar.cpp @@ -381,7 +381,7 @@ bool wxDockTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& WXUNUSED(too // convert the wxIcon into a wxBitmap so we can perform some // wxBitmap operations with it wxBitmap bmp( icon ); - wxASSERT( bmp.Ok() ); + wxASSERT( bmp.IsOk() ); // get the CGImageRef for the wxBitmap: // OSX builds only, but then the dock only exists in OSX diff --git a/src/osx/carbon/uma.cpp b/src/osx/carbon/uma.cpp index 8606c1196f..fd077da113 100644 --- a/src/osx/carbon/uma.cpp +++ b/src/osx/carbon/uma.cpp @@ -79,7 +79,10 @@ void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry ) { if ( !entry ) + { + SetMenuItemCommandKey(menu, item, false, 0); return ; + } UInt8 modifiers = 0 ; SInt16 key = entry->GetKeyCode() ; diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp index c6275209fc..e95ceaa8ff 100644 --- a/src/osx/carbon/utils.cpp +++ b/src/osx/carbon/utils.cpp @@ -855,7 +855,7 @@ void wxMacDataItemBrowserControl::InsertColumn(int col, DataBrowserPropertyType // TODO: Why is m_font not defined when we enter wxLC_LIST mode, but is // defined for other modes? wxFontEncoding enc; - if ( m_font.Ok() ) + if ( m_font.IsOk() ) enc = m_font.GetEncoding(); else enc = wxLocale::GetSystemEncoding(); diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm index 438a024c42..dc4248f3c7 100644 --- a/src/osx/carbon/utilscocoa.mm +++ b/src/osx/carbon/utilscocoa.mm @@ -413,8 +413,7 @@ CGImageRef wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage ) if (nsimage != nil) { NSSize imageSize = [nsimage size]; - CGColorSpaceRef genericRGB = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); - CGContextRef context = CGBitmapContextCreate(NULL, imageSize.width, imageSize.height, 8, 0, genericRGB, kCGImageAlphaPremultipliedFirst); + CGContextRef context = CGBitmapContextCreate(NULL, imageSize.width, imageSize.height, 8, 0, wxMacGetGenericRGBColorSpace(), kCGImageAlphaPremultipliedFirst); NSGraphicsContext *nsGraphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO]; [NSGraphicsContext saveGraphicsState]; [NSGraphicsContext setCurrentContext:nsGraphicsContext]; diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp index cda4a37d2e..e45c547eab 100644 --- a/src/osx/checkbox_osx.cpp +++ b/src/osx/checkbox_osx.cpp @@ -89,7 +89,7 @@ bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) ) { wxCheckBoxState origState ; - newState = origState = Get3StateValue(); + origState = Get3StateValue(); switch (origState) { diff --git a/src/osx/cocoa/anybutton.mm b/src/osx/cocoa/anybutton.mm new file mode 100644 index 0000000000..c90127bcea --- /dev/null +++ b/src/osx/cocoa/anybutton.mm @@ -0,0 +1,48 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/osx/cocoa/anybutton.mm +// Purpose: wxAnyButton +// Author: Stefan Csomor +// Created: 1998-01-01 (extracted from button.mm) +// RCS-ID: $Id: anybutton.mm 67681 2011-05-03 16:29:04Z DS $ +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#include "wx/wxprec.h" + +#include "wx/button.h" + +#ifndef WX_PRECOMP +#endif + +#include "wx/osx/private.h" + +wxSize wxAnyButton::DoGetBestSize() const +{ + // We only use help button bezel if we don't have any (non standard) label + // to display in the button. Otherwise even wxID_HELP buttons look like + // normal push buttons. + if ( GetId() == wxID_HELP && GetLabel().empty() ) + return wxSize( 23 , 23 ) ; + + wxRect r ; + GetPeer()->GetBestRect(&r); + + wxSize sz = r.GetSize(); + sz.x = sz.x + MacGetLeftBorderSize() + + MacGetRightBorderSize(); + sz.y = sz.y + MacGetTopBorderSize() + + MacGetBottomBorderSize(); + + const int wBtnStd = GetDefaultSize().x; + + if ( (sz.x < wBtnStd) && !HasFlag(wxBU_EXACTFIT) ) + sz.x = wBtnStd; + + return sz ; +} + +wxSize wxAnyButton::GetDefaultSize() +{ + return wxSize(84, 20); +} diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm index 3829d7c8cb..fa8938295d 100644 --- a/src/osx/cocoa/button.mm +++ b/src/osx/cocoa/button.mm @@ -23,36 +23,6 @@ #endif // wxUSE_MARKUP -wxSize wxButton::DoGetBestSize() const -{ - // We only use help button bezel if we don't have any (non standard) label - // to display in the button. Otherwise even wxID_HELP buttons look like - // normal push buttons. - if ( GetId() == wxID_HELP && GetLabel().empty() ) - return wxSize( 23 , 23 ) ; - - wxRect r ; - GetPeer()->GetBestRect(&r); - - wxSize sz = r.GetSize(); - sz.x = sz.x + MacGetLeftBorderSize() + - MacGetRightBorderSize(); - sz.y = sz.y + MacGetTopBorderSize() + - MacGetBottomBorderSize(); - - const int wBtnStd = GetDefaultSize().x; - - if ( (sz.x < wBtnStd) && !HasFlag(wxBU_EXACTFIT) ) - sz.x = wBtnStd; - - return sz ; -} - -wxSize wxButton::GetDefaultSize() -{ - return wxSize(84, 20); -} - @implementation wxNSButton + (void)initialize @@ -119,6 +89,7 @@ public: wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v) : wxWidgetCocoaImpl(wxpeer, v) { + SetNeedsFrame(false); } virtual void SetBitmap(const wxBitmap& bitmap) @@ -221,8 +192,10 @@ void SetBezelStyleFromBorderFlags(NSButton *v, long style) [v setBezelStyle:NSRegularSquareBezelStyle]; else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN ) [v setBezelStyle:NSSmallSquareBezelStyle]; - else + else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE ) [v setBezelStyle:NSShadowlessSquareBezelStyle]; + else + [v setBezelStyle:NSRegularSquareBezelStyle]; } } @@ -233,7 +206,7 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, const wxString& label, const wxPoint& pos, const wxSize& size, - long WXUNUSED(style), + long style, long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; @@ -249,9 +222,41 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, } else { - [v setBezelStyle:NSRoundedBezelStyle]; - } + if ( style & wxBORDER_NONE ) + { + [v setBezelStyle:NSShadowlessSquareBezelStyle]; + [v setBordered:NO]; + } + else + { + // the following styles only exist for certain sizes, so avoid them for + // multi-line + if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND) + { + if ( (style & wxBORDER_MASK) == wxBORDER_RAISED ) + [v setBezelStyle:NSRoundedBezelStyle]; + else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN ) + [v setBezelStyle:NSTexturedRoundedBezelStyle]; + else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE ) + [v setBezelStyle:NSShadowlessSquareBezelStyle]; + else + [v setBezelStyle:NSRoundedBezelStyle]; + } + else + { + if ( (style & wxBORDER_MASK) == wxBORDER_RAISED ) + [v setBezelStyle:NSRegularSquareBezelStyle]; + else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN ) + [v setBezelStyle:NSSmallSquareBezelStyle]; + else if ( (style & wxBORDER_MASK) == wxBORDER_SIMPLE ) + [v setBezelStyle:NSShadowlessSquareBezelStyle]; + else + [v setBezelStyle:NSRegularSquareBezelStyle]; + } + } + } + [v setButtonType:NSMomentaryPushInButton]; return new wxButtonCocoaImpl( wxpeer, v ); } @@ -289,7 +294,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer, SetBezelStyleFromBorderFlags(v, style); - if (bitmap.Ok()) + if (bitmap.IsOk()) [v setImage:bitmap.GetNSImage() ]; [v setButtonType:NSMomentaryPushInButton]; @@ -379,7 +384,7 @@ wxCFRef downArray ; static wxBitmap trianglebm(disc_triangle_xpm); if ( downArray.get() == NULL ) { - downArray.reset( [wxDisclosureNSButton rotateImage:trianglebm.GetNSImage()] ); + downArray.reset( [[wxDisclosureNSButton rotateImage:trianglebm.GetNSImage()] retain] ); } if ( isOpen ) @@ -407,7 +412,7 @@ wxCFRef downArray ; fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0]; [newImage unlockFocus]; - return newImage; + return [newImage autorelease]; } @end diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index 2aeac7950d..148c9b0113 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -25,6 +25,7 @@ #include "wx/osx/cocoa/dataview.h" #include "wx/renderer.h" #include "wx/stopwatch.h" +#include "wx/dcgraph.h" // ============================================================================ // Constants used locally @@ -520,7 +521,7 @@ outlineView:(NSOutlineView*)outlineView event.SetItem(wxDataViewItemFromItem(item)); event.SetModel(dvc->GetModel()); - BOOL dragSuccessful; + BOOL dragSuccessful = false; if ( [bestType compare:DataViewPboardType] == NSOrderedSame ) { NSArray* dataArray((NSArray*) @@ -756,7 +757,7 @@ outlineView:(NSOutlineView*)outlineView if (bestType == nil) return NSDragOperationNone; - NSDragOperation dragOperation; + NSDragOperation dragOperation = NSDragOperationNone; wxDataViewCtrl* const dvc(implementation->GetDataViewCtrl()); wxCHECK_MSG(dvc, false, "Pointer to data view control not set correctly."); @@ -862,7 +863,7 @@ outlineView:(NSOutlineView*)outlineView if ([writeItems count] > 0) { bool dataStringAvailable(true); // a flag indicating if for all items a data string is available - NSMutableArray* dataArray = [[NSMutableArray arrayWithCapacity:[writeItems count]] retain]; // data of all items + NSMutableArray* dataArray = [NSMutableArray arrayWithCapacity:[writeItems count]]; // data of all items wxString dataString; // contains the string data of all items // send a begin drag event for all selected items and proceed with @@ -1164,9 +1165,27 @@ outlineView:(NSOutlineView*)outlineView wxDataViewCustomRenderer * const renderer = obj->customRenderer; - wxDC * const dc = renderer->GetDC(); - renderer->WXCallRender(wxFromNSRect(controlView, cellFrame), dc, 0); - renderer->SetDC(NULL); + // if this method is called everything is already setup correctly, + CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; + CGContextSaveGState( context ); + + if ( ![controlView isFlipped] ) + { + CGContextTranslateCTM( context, 0, [controlView bounds].size.height ); + CGContextScaleCTM( context, 1, -1 ); + } + + wxGCDC dc; + wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(context); + dc.SetGraphicsContext(gc); + + int state = 0; + if ( [self isHighlighted] ) + state |= wxDATAVIEW_CELL_SELECTED; + + renderer->WXCallRender(wxFromNSRect(controlView, cellFrame), &dc, state); + + CGContextRestoreGState( context ); } -(NSRect) imageRectForBounds:(NSRect)cellFrame @@ -2165,9 +2184,9 @@ bool wxCocoaDataViewControl::IsExpanded(const wxDataViewItem& item) const bool wxCocoaDataViewControl::Reload() { [m_DataSource clearBuffers]; + [m_OutlineView reloadData]; [m_OutlineView scrollColumnToVisible:0]; [m_OutlineView scrollRowToVisible:0]; - [m_OutlineView reloadData]; return true; } @@ -2314,6 +2333,11 @@ void wxCocoaDataViewControl::Resort() [m_OutlineView reloadData]; } +void wxCocoaDataViewControl::StartEditor( const wxDataViewItem & item, unsigned int column ) +{ + [m_OutlineView editColumn:column row:[m_OutlineView rowForItem:[m_DataSource getDataViewItemFromBuffer:item]] withEvent:nil select:YES]; +} + // // other methods (inherited from wxDataViewWidgetImpl) // @@ -2780,9 +2804,9 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer(const wxArrayString& choices, cell = [[NSPopUpButtonCell alloc] init]; [cell setControlSize:NSMiniControlSize]; - [cell setFont:[[NSFont fontWithName:[[cell font] fontName] size:[NSFont systemFontSizeForControlSize:NSMiniControlSize]] autorelease]]; + [cell setFont:[NSFont fontWithName:[[cell font] fontName] size:[NSFont systemFontSizeForControlSize:NSMiniControlSize]]]; for (size_t i=0; iGetWXWindow(); - ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; - [sheetDelegate setImplementation: this]; [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil - modalForWindow: nativeParent modalDelegate: sheetDelegate + modalForWindow: nativeParent modalDelegate: m_sheetDelegate didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: nil]; } diff --git a/src/osx/cocoa/dnd.mm b/src/osx/cocoa/dnd.mm index ca4aa44c5d..ecfa2e2b91 100644 --- a/src/osx/cocoa/dnd.mm +++ b/src/osx/cocoa/dnd.mm @@ -64,7 +64,7 @@ wxDragResult NSDragOperationToWxDragResult(NSDragOperation code) - (id)init { - [super init]; + self = [super init]; dragFinished = NO; resultCode = NSDragOperationNone; impl = 0; diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm index 91df515ef9..759c02b1ca 100644 --- a/src/osx/cocoa/evtloop.mm +++ b/src/osx/cocoa/evtloop.mm @@ -107,12 +107,15 @@ wxGUIEventLoop::wxGUIEventLoop() { m_modalSession = nil; m_dummyWindow = nil; + m_modalNestedLevel = 0; + m_modalWindow = NULL; } wxGUIEventLoop::~wxGUIEventLoop() { wxASSERT( m_modalSession == nil ); wxASSERT( m_dummyWindow == nil ); + wxASSERT( m_modalNestedLevel == 0 ); } //----------------------------------------------------------------------------- @@ -243,9 +246,14 @@ void wxGUIEventLoop::DoRun() void wxGUIEventLoop::DoStop() { - [NSApp stop:0]; // only calling stop: is not enough when called from a runloop-observer, // therefore add a dummy event, to make sure the runloop gets another round + [NSApp stop:0]; + WakeUp(); +} + +void wxGUIEventLoop::WakeUp() +{ NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined location:NSMakePoint(0.0, 0.0) modifierFlags:0 @@ -308,6 +316,16 @@ void wxModalEventLoop::DoStop() void wxGUIEventLoop::BeginModalSession( wxWindow* modalWindow ) { WXWindow nsnow = nil; + + if ( m_modalNestedLevel > 0 ) + { + wxASSERT_MSG( m_modalWindow == modalWindow, "Nested Modal Sessions must be based on same window"); + m_modalNestedLevel++; + return; + } + + m_modalWindow = modalWindow; + m_modalNestedLevel = 1; if ( modalWindow ) { @@ -333,17 +351,24 @@ void wxGUIEventLoop::BeginModalSession( wxWindow* modalWindow ) m_dummyWindow = nsnow; } m_modalSession = [NSApp beginModalSessionForWindow:nsnow]; + wxASSERT_MSG(m_modalSession != NULL, "modal session couldn't be started"); } void wxGUIEventLoop::EndModalSession() { wxASSERT_MSG(m_modalSession != NULL, "no modal session active"); - [NSApp endModalSession:(NSModalSession)m_modalSession]; - m_modalSession = nil; - if ( m_dummyWindow ) + + wxASSERT_MSG(m_modalNestedLevel > 0, "incorrect modal nesting level"); + + if ( --m_modalNestedLevel == 0 ) { - [m_dummyWindow release]; - m_dummyWindow = nil; + [NSApp endModalSession:(NSModalSession)m_modalSession]; + m_modalSession = nil; + if ( m_dummyWindow ) + { + [m_dummyWindow release]; + m_dummyWindow = nil; + } } } diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm index c0b6185d34..a1c79b7fc5 100644 --- a/src/osx/cocoa/filedlg.mm +++ b/src/osx/cocoa/filedlg.mm @@ -65,7 +65,7 @@ - (id) init { - [super init]; + self = [super init]; _dialog = NULL; return self; } @@ -164,6 +164,13 @@ wxFileDialog::wxFileDialog( : wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name) { m_filterIndex = -1; + m_sheetDelegate = [[ModalDialogDelegate alloc] init]; + [(ModalDialogDelegate*)m_sheetDelegate setImplementation: this]; +} + +wxFileDialog::~wxFileDialog() +{ + [m_sheetDelegate release]; } bool wxFileDialog::SupportsExtraControl() const @@ -308,10 +315,8 @@ void wxFileDialog::ShowWindowModal() [sPanel setAllowsOtherFileTypes:NO]; NSWindow* nativeParent = parentWindow->GetWXWindow(); - ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; - [sheetDelegate setImplementation: this]; [sPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString() - modalForWindow: nativeParent modalDelegate: sheetDelegate + modalForWindow: nativeParent modalDelegate: m_sheetDelegate didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: nil]; } @@ -329,11 +334,9 @@ void wxFileDialog::ShowWindowModal() [oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )]; NSWindow* nativeParent = parentWindow->GetWXWindow(); - ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; - [sheetDelegate setImplementation: this]; [oPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString() types: types modalForWindow: nativeParent - modalDelegate: sheetDelegate + modalDelegate: m_sheetDelegate didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: nil]; } @@ -433,7 +436,7 @@ void wxFileDialog::SetupExtraControls(WXWindow nativeWindow) accView = m_filterPanel->GetHandle(); if( HasFlag(wxFD_OPEN) ) { - if ( 1 /* UMAGetSystemVersion() < 0x1060 */ ) + if ( UMAGetSystemVersion() < 0x1060 ) { wxOpenPanelDelegate* del = [[wxOpenPanelDelegate alloc]init]; [del setFileDialog:this]; @@ -463,6 +466,8 @@ void wxFileDialog::SetupExtraControls(WXWindow nativeWindow) int wxFileDialog::ShowModal() { + wxMacAutoreleasePool autoreleasepool; + wxCFStringRef cf( m_message ); wxCFStringRef dir( m_dir ); @@ -564,7 +569,7 @@ int wxFileDialog::ShowModal() DoOnFilterSelected(m_firstFileTypeFilter); } - returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ]; + returnCode = [sPanel runModalForDirectory: m_dir.IsEmpty() ? nil : dir.AsNSString() file:file.AsNSString() ]; ModalFinishedCallback(sPanel, returnCode); } else @@ -582,13 +587,14 @@ int wxFileDialog::ShowModal() if ( UMAGetSystemVersion() < 0x1060 ) { - returnCode = [oPanel runModalForDirectory:dir.AsNSString() + returnCode = [oPanel runModalForDirectory:m_dir.IsEmpty() ? nil : dir.AsNSString() file:file.AsNSString() types:(m_delegate == nil ? types : nil)]; } else { [oPanel setAllowedFileTypes: (m_delegate == nil ? types : nil)]; - [oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() + if ( !m_dir.IsEmpty() ) + [oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() isDirectory:YES]]; returnCode = [oPanel runModal]; } diff --git a/src/osx/cocoa/gauge.mm b/src/osx/cocoa/gauge.mm index d748223702..79762b5540 100644 --- a/src/osx/cocoa/gauge.mm +++ b/src/osx/cocoa/gauge.mm @@ -37,6 +37,13 @@ @end +@interface NSView(PossibleSizeMethods) +- (NSControlSize)controlSize; +@end + +namespace +{ + class wxOSXGaugeCocoaImpl : public wxWidgetCocoaImpl { public : @@ -64,6 +71,27 @@ public : [(wxNSProgressIndicator*)m_osxView startAnimation:nil]; } } + + void GetLayoutInset(int &left , int &top , int &right, int &bottom) const + { + left = top = right = bottom = 0; + NSControlSize size = size = [(wxNSProgressIndicator*)m_osxView controlSize]; + + switch( size ) + { + case NSRegularControlSize: + left = right = 2; + top = 0; + bottom = 4; + break; + case NSMiniControlSize: + case NSSmallControlSize: + left = right = 1; + top = 0; + bottom = 2; + break; + } + } protected: void SetDeterminateMode() { @@ -75,7 +103,8 @@ protected: } } }; - + +} // anonymous namespace wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm index 8f38d778cb..4b10d40656 100644 --- a/src/osx/cocoa/listbox.mm +++ b/src/osx/cocoa/listbox.mm @@ -161,7 +161,7 @@ protected : - (id) init { - [super init]; + self = [super init]; column = nil; return self; } @@ -224,7 +224,7 @@ protected: - (id) init { - [super init]; + self = [super init]; impl = nil; return self; } diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm index 346b992bf3..22fabe5344 100644 --- a/src/osx/cocoa/menu.mm +++ b/src/osx/cocoa/menu.mm @@ -38,7 +38,7 @@ - (id) initWithTitle:(NSString*) title { - [super initWithTitle:title]; + self = [super initWithTitle:title]; impl = NULL; return self; } @@ -69,7 +69,7 @@ - (id) init { - [super init]; + self = [super init]; return self; } diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm index c0e1b058f6..543b64f321 100644 --- a/src/osx/cocoa/menuitem.mm +++ b/src/osx/cocoa/menuitem.mm @@ -74,8 +74,8 @@ SEL wxOSXGetSelectorFromID(int menuId ) - (id) initWithTitle:(NSString *)aString action:(SEL)aSelector keyEquivalent:(NSString *)charCode { - [super initWithTitle:aString action:aSelector keyEquivalent:charCode]; - return self; + self = [super initWithTitle:aString action:aSelector keyEquivalent:charCode]; + return self; } - (void) clickedAction: (id) sender @@ -100,8 +100,12 @@ SEL wxOSXGetSelectorFromID(int menuId ) wxUnusedVar(menuItem); if( impl ) { - if ( impl->GetWXPeer()->GetMenu()->HandleCommandUpdateStatus(impl->GetWXPeer()) ) - return impl->GetWXPeer()->IsEnabled(); + wxMenuItem* wxmenuitem = impl->GetWXPeer(); + if ( wxmenuitem ) + { + wxmenuitem->GetMenu()->HandleCommandUpdateStatus(wxmenuitem); + return wxmenuitem->IsEnabled(); + } } return YES ; } @@ -120,6 +124,12 @@ SEL wxOSXGetSelectorFromID(int menuId ) void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry* entry ) { + if ( entry == NULL ) + { + [menuItem setKeyEquivalent:@""]; + return; + } + unsigned int modifiers = 0 ; int key = entry->GetKeyCode() ; if ( key ) @@ -256,9 +266,7 @@ public : wxCFStringRef cfText(text); [m_osxMenuItem setTitle:cfText.AsNSString()]; - if ( entry ) - wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry ); - + wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry ); } bool DoDefault(); @@ -320,7 +328,7 @@ wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu, wxCFStringRef cfText(text); SEL selector = nil; bool targetSelf = false; - if ( ! pParentMenu->GetNoEventsMode() && pSubMenu == NULL ) + if ( (pParentMenu == NULL || !pParentMenu->GetNoEventsMode()) && pSubMenu == NULL ) { selector = wxOSXGetSelectorFromID(menuid); @@ -342,8 +350,7 @@ wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu, } else { - if ( entry ) - wxMacCocoaMenuItemSetAccelerator( menuitem, entry ); + wxMacCocoaMenuItemSetAccelerator( menuitem, entry ); } item = menuitem; } diff --git a/src/osx/cocoa/msgdlg.mm b/src/osx/cocoa/msgdlg.mm index 296c77ebcc..ad44f55600 100644 --- a/src/osx/cocoa/msgdlg.mm +++ b/src/osx/cocoa/msgdlg.mm @@ -49,6 +49,13 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxPoint& WXUNUSED(pos)) : wxMessageDialogBase(parent, message, caption, style) { + m_sheetDelegate = [[ModalDialogDelegate alloc] init]; + [(ModalDialogDelegate*)m_sheetDelegate setImplementation: this]; +} + +wxMessageDialog::~wxMessageDialog() +{ + [m_sheetDelegate release]; } int wxMessageDialog::ShowModal() @@ -167,9 +174,7 @@ void wxMessageDialog::ShowWindowModal() if (parentWindow) { NSWindow* nativeParent = parentWindow->GetWXWindow(); - ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; - [sheetDelegate setImplementation: this]; - [alert beginSheetModalForWindow: nativeParent modalDelegate: sheetDelegate + [alert beginSheetModalForWindow: nativeParent modalDelegate: m_sheetDelegate didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: nil]; } diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index d7f79609fb..29e42db165 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -271,7 +271,7 @@ extern int wxOSXGetIdFromSelector(SEL action ); - (id) init { - [super init]; + self = [super init]; return self; } @@ -299,8 +299,8 @@ extern int wxOSXGetIdFromSelector(SEL action ); wxMenuItem* menuitem = mbar->FindItem(wxOSXGetIdFromSelector(action), &menu); if ( menu != NULL && menuitem != NULL) { - if ( menu->HandleCommandUpdateStatus(menuitem) ) - return menuitem->IsEnabled(); + menu->HandleCommandUpdateStatus(menuitem); + return menuitem->IsEnabled(); } } return YES; @@ -452,6 +452,7 @@ extern int wxOSXGetIdFromSelector(SEL action ); editor = [[wxNSTextFieldEditor alloc] init]; [editor setFieldEditor:YES]; [tf setFieldEditor:editor]; + [editor release]; } return editor; } @@ -716,8 +717,12 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha) return true; } -bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) ) +bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col ) { + [m_macWindow setBackgroundColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0) + green:(CGFloat) (col.Green() / 255.0) + blue:(CGFloat) (col.Blue() / 255.0) + alpha:(CGFloat) (col.Alpha() / 255.0)]]; return true; } @@ -873,25 +878,39 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style)) m_macFullScreenData = data ; data->m_formerLevel = [m_macWindow level]; data->m_formerFrame = [m_macWindow frame]; - CGDisplayCapture( kCGDirectMainDisplay ); - [m_macWindow setLevel:CGShieldingWindowLevel()]; +#if 0 + // CGDisplayCapture( kCGDirectMainDisplay ); + //[m_macWindow setLevel:NSMainMenuWindowLevel+1/*CGShieldingWindowLevel()*/]; +#endif NSRect screenframe = [[NSScreen mainScreen] frame]; NSRect frame = NSMakeRect (0, 0, 100, 100); NSRect contentRect; contentRect = [NSWindow contentRectForFrameRect: frame - styleMask: NSTitledWindowMask]; + styleMask: [m_macWindow styleMask]]; screenframe.origin.y += (frame.origin.y - contentRect.origin.y); screenframe.size.height += (frame.size.height - contentRect.size.height); [m_macWindow setFrame:screenframe display:YES]; + + SetSystemUIMode(kUIModeAllHidden, + kUIOptionDisableAppleMenu + /* + | kUIOptionDisableProcessSwitch + | kUIOptionDisableForceQuit + */); } else if ( m_macFullScreenData != NULL ) { FullScreenData *data = (FullScreenData *) m_macFullScreenData ; - CGDisplayRelease( kCGDirectMainDisplay ); - [m_macWindow setLevel:data->m_formerLevel]; +#if 0 + // CGDisplayRelease( kCGDirectMainDisplay ); + // [m_macWindow setLevel:data->m_formerLevel]; +#endif + [m_macWindow setFrame:data->m_formerFrame display:YES]; delete data ; m_macFullScreenData = NULL ; + + SetSystemUIMode(kUIModeNormal, 0); } return true; diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm index 398d3798fa..ff4e70b7c7 100644 --- a/src/osx/cocoa/notebook.mm +++ b/src/osx/cocoa/notebook.mm @@ -49,7 +49,7 @@ - (id) init { - [super init]; + self = [super init]; return self; } @@ -175,7 +175,7 @@ public: if ( notebook.GetImageList() && notebook.GetPageImage(i) >= 0 ) { const wxBitmap bmap = notebook.GetImageList()->GetBitmap( notebook.GetPageImage( i ) ) ; - if ( bmap.Ok() ) + if ( bmap.IsOk() ) { // TODO how to set an image on a tab } diff --git a/src/osx/cocoa/printdlg.mm b/src/osx/cocoa/printdlg.mm index 83186372d3..d74128d3a9 100644 --- a/src/osx/cocoa/printdlg.mm +++ b/src/osx/cocoa/printdlg.mm @@ -37,6 +37,7 @@ wxOSXCocoaPrintData::wxOSXCocoaPrintData() m_macPageFormat = (PMPageFormat) [m_macPrintInfo PMPageFormat]; m_macPrintSettings = (PMPrintSettings) [m_macPrintInfo PMPrintSettings]; m_macPrintSession = (PMPrintSession) [m_macPrintInfo PMPrintSession] ; + PMGetPageFormatPaper(m_macPageFormat, &m_macPaper); } wxOSXCocoaPrintData::~wxOSXCocoaPrintData() diff --git a/src/osx/cocoa/slider.mm b/src/osx/cocoa/slider.mm index 08327c438f..3bab4cc06a 100644 --- a/src/osx/cocoa/slider.mm +++ b/src/osx/cocoa/slider.mm @@ -90,6 +90,13 @@ wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer, long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; + if ( size == wxDefaultSize ) + { + if ( style & wxSL_VERTICAL ) + r.size.height = r.size.width * 2; + else + r.size.width = r.size.height * 2; + } wxNSSlider* v = [[wxNSSlider alloc] initWithFrame:r]; int tickMarks = 0; diff --git a/src/osx/cocoa/srchctrl.mm b/src/osx/cocoa/srchctrl.mm index e665167688..567789a2e9 100644 --- a/src/osx/cocoa/srchctrl.mm +++ b/src/osx/cocoa/srchctrl.mm @@ -49,7 +49,7 @@ - (id)initWithFrame:(NSRect)frame { - [super initWithFrame:frame]; + self = [super initWithFrame:frame]; return self; } @@ -70,7 +70,7 @@ partialString = [[textView string] substringWithRange:charRange]; matches = [NSMutableArray array]; - wxTextWidgetImpl* impl = (wxTextWidgetImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + // wxTextWidgetImpl* impl = (wxTextWidgetImpl* ) wxWidgetImpl::FindFromWXWidget( self ); wxArrayString completions; // adapt to whatever strategy we have for getting the strings diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm index f055449a4d..9b0d796a5b 100644 --- a/src/osx/cocoa/taskbar.mm +++ b/src/osx/cocoa/taskbar.mm @@ -62,7 +62,7 @@ public: virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) = 0; virtual bool RemoveIcon() = 0; - bool IsIconInstalled() const { return m_icon.Ok(); } + bool IsIconInstalled() const { return m_icon.IsOk(); } virtual bool PopupMenu(wxMenu *menu) = 0; virtual ~wxTaskBarIconImpl(); diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index f8e4f22bf2..b5913b841b 100644 --- a/src/osx/cocoa/textctrl.mm +++ b/src/osx/cocoa/textctrl.mm @@ -258,7 +258,12 @@ protected : - (void) setFieldEditor:(wxNSTextFieldEditor*) editor { - fieldEditor = editor; + if ( editor != fieldEditor ) + { + [editor retain]; + [fieldEditor release]; + fieldEditor = editor; + } } - (wxNSTextFieldEditor*) fieldEditor @@ -630,7 +635,7 @@ wxNSTextFieldControl::wxNSTextFieldControl(wxWindow *wxPeer, void wxNSTextFieldControl::Init(WXWidget w) { - NSTextField wxOSX_10_6_AND_LATER() *tf = (NSTextField*) w; + NSTextField wxOSX_10_6_AND_LATER() *tf = (NSTextField wxOSX_10_6_AND_LATER()*) w; m_textField = tf; [m_textField setDelegate: tf]; m_selStart = m_selEnd = 0; diff --git a/src/osx/cocoa/tglbtn.mm b/src/osx/cocoa/tglbtn.mm index af184af177..9066edca9f 100644 --- a/src/osx/cocoa/tglbtn.mm +++ b/src/osx/cocoa/tglbtn.mm @@ -60,7 +60,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer, NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; wxNSButton* v = [[wxNSButton alloc] initWithFrame:r]; - if (label.Ok()) + if (label.IsOk()) [v setImage:label.GetNSImage() ]; SetBezelStyleFromBorderFlags(v, style); diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm index 2f3fc49395..664029f75d 100644 --- a/src/osx/cocoa/toolbar.mm +++ b/src/osx/cocoa/toolbar.mm @@ -324,7 +324,7 @@ private: - (id)initWithItemIdentifier: (NSString*) identifier { - [super initWithItemIdentifier:identifier]; + self = [super initWithItemIdentifier:identifier]; impl = NULL; [self setTarget: self]; [self setAction: @selector(clickedAction:)]; @@ -413,7 +413,7 @@ private: - (id)initWithFrame:(NSRect)frame { - [super initWithFrame:frame]; + self = [super initWithFrame:frame]; impl = NULL; [self setTarget: self]; [self setAction: @selector(clickedAction:)]; diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 4c35abe950..c7879d0e6b 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -179,7 +179,7 @@ void wxBell() @implementation ModalDialogDelegate - (id)init { - [super init]; + self = [super init]; sheetFinished = NO; resultCode = -1; impl = 0; @@ -379,7 +379,7 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const [view lockFocus]; // we use this method as other methods force a repaint, and this method can be // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow) - NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain]; + NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]]; [view unlockFocus]; if ( [rep respondsToSelector:@selector(CGImage)] ) { @@ -388,8 +388,6 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) ); // since our context is upside down we dont use CGContextDrawImage wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ; - CGImageRelease(cgImageRef); - cgImageRef = NULL; } else { diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 9bbcb2146b..b859eba7cb 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -802,12 +802,32 @@ void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect) // [NSWindow setAllowsConcurrentViewDrawing:NO] does not affect it. if ( !wxThread::IsMain() ) { - // just call the superclass handler, we don't need any custom wx drawing - // here and it seems to work fine: - wxOSX_DrawRectHandlerPtr - superimpl = (wxOSX_DrawRectHandlerPtr) - [[self superclass] instanceMethodForSelector:_cmd]; - superimpl(self, _cmd, rect); + if ( impl->IsUserPane() ) + { + wxWindow* win = impl->GetWXPeer(); + if ( win->UseBgCol() ) + { + + CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; + CGContextSaveGState( context ); + + CGContextSetFillColorWithColor( context, win->GetBackgroundColour().GetCGColor()); + CGRect r = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); + CGContextFillRect( context, r ); + + CGContextRestoreGState( context ); + } + } + else + { + // just call the superclass handler, we don't need any custom wx drawing + // here and it seems to work fine: + wxOSX_DrawRectHandlerPtr + superimpl = (wxOSX_DrawRectHandlerPtr) + [[self superclass] instanceMethodForSelector:_cmd]; + superimpl(self, _cmd, rect); + } + return; } #endif // wxUSE_THREADS @@ -1424,7 +1444,7 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible ) - (id)init:(wxWindow *)win { - [super init]; + self = [super init]; m_win = win; m_isDone = false; @@ -2095,9 +2115,9 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) // this will fire higher level events, like insertText, to help // us handle EVT_CHAR, etc. - if ( IsUserPane() && [event type] == NSKeyDown) + if ( !result ) { - if ( !result ) + if ( IsUserPane() && [event type] == NSKeyDown) { if ( wxevent.GetKeyCode() < WXK_SPACE || wxevent.GetKeyCode() == WXK_DELETE || wxevent.GetKeyCode() >= WXK_START ) { diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index 8ef77049d1..408ab309bb 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -149,7 +149,7 @@ static int GetBestBytesPerRow( int rawBytes ) void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType ) { memset( info , 0 , sizeof(ControlButtonContentInfo) ) ; - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { wxBitmapRefData * bmap = bitmap.GetBitmapData() ; if ( bmap == NULL ) @@ -1031,28 +1031,28 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const void * wxBitmap::GetRawAccess() const { - wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ; + wxCHECK_MSG( IsOk() , NULL , wxT("invalid bitmap") ) ; return M_BITMAPDATA->GetRawAccess() ; } void * wxBitmap::BeginRawAccess() { - wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ; + wxCHECK_MSG( IsOk() , NULL , wxT("invalid bitmap") ) ; return M_BITMAPDATA->BeginRawAccess() ; } void wxBitmap::EndRawAccess() { - wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ; + wxCHECK_RET( IsOk() , wxT("invalid bitmap") ) ; M_BITMAPDATA->EndRawAccess() ; } CGImageRef wxBitmap::CreateCGImage() const { - wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ; + wxCHECK_MSG( IsOk(), NULL , wxT("invalid bitmap") ) ; return M_BITMAPDATA->CreateCGImage() ; } @@ -1060,7 +1060,7 @@ CGImageRef wxBitmap::CreateCGImage() const #ifndef __WXOSX_IPHONE__ IconRef wxBitmap::GetIconRef() const { - wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ; + wxCHECK_MSG( IsOk(), NULL , wxT("invalid bitmap") ) ; return M_BITMAPDATA->GetIconRef() ; } @@ -1094,14 +1094,14 @@ WX_UIImage wxBitmap::GetUIImage() const #endif wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rect.x >= 0) && (rect.y >= 0) && (rect.x+rect.width <= GetWidth()) && (rect.y+rect.height <= GetHeight()), wxNullBitmap, wxT("invalid bitmap or bitmap region") ); wxBitmap ret( rect.width, rect.height, GetDepth() ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") ); int destwidth = rect.width ; int destheight = rect.height ; @@ -1192,7 +1192,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) { #if wxUSE_IMAGE wxImage loadimage(filename, type); - if (loadimage.Ok()) + if (loadimage.IsOk()) { *this = loadimage; @@ -1228,7 +1228,7 @@ bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height wxBitmap::wxBitmap(const wxImage& image, int depth) { - wxCHECK_RET( image.Ok(), wxT("invalid image") ); + wxCHECK_RET( image.IsOk(), wxT("invalid image") ); // width and height of the device-dependent bitmap int width = image.GetWidth(); @@ -1302,7 +1302,7 @@ wxImage wxBitmap::ConvertToImage() const { wxImage image; - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); // create an wxImage object int width = GetWidth(); @@ -1434,35 +1434,35 @@ bool wxBitmap::SaveFile( const wxString& filename, int wxBitmap::GetHeight() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BITMAPDATA->GetHeight(); } int wxBitmap::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BITMAPDATA->GetWidth() ; } int wxBitmap::GetDepth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BITMAPDATA->GetDepth(); } wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BITMAPDATA->m_bitmapMask; } bool wxBitmap::HasAlpha() const { - wxCHECK_MSG( Ok(), false , wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false , wxT("invalid bitmap") ); return M_BITMAPDATA->HasAlpha() ; } @@ -1494,7 +1494,7 @@ void wxBitmap::SetOk(bool isOk) #if wxUSE_PALETTE wxPalette *wxBitmap::GetPalette() const { - wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap GetPalette()") ); + wxCHECK_MSG( IsOk(), NULL, wxT("Invalid bitmap GetPalette()") ); return &M_BITMAPDATA->m_bitmapPalette; } @@ -1638,26 +1638,29 @@ bool wxMask::Create(const wxBitmap& bitmap) size_t size = m_bytesPerRow * m_height ; unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ; wxASSERT( destdatabase != NULL ) ; - - memset( destdatabase , 0 , size ) ; - unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ; - - for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow ) + + if ( destdatabase ) { - unsigned char *destdata = destdatabase ; - unsigned char r, g, b; + memset( destdatabase , 0 , size ) ; + unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ; - for ( int x = 0 ; x < m_width ; ++x ) + for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow ) { - srcdata++ ; - r = *srcdata++ ; - g = *srcdata++ ; - b = *srcdata++ ; + unsigned char *destdata = destdatabase ; + unsigned char r, g, b; - if ( ( r + g + b ) > 0x10 ) - *destdata++ = 0xFF ; - else - *destdata++ = 0x00 ; + for ( int x = 0 ; x < m_width ; ++x ) + { + srcdata++ ; + r = *srcdata++ ; + g = *srcdata++ ; + b = *srcdata++ ; + + if ( ( r + g + b ) > 0x10 ) + *destdata++ = 0xFF ; + else + *destdata++ = 0x00 ; + } } } @@ -1872,7 +1875,7 @@ void wxBitmap::InitStandardHandlers() void *wxBitmap::GetRawData(wxPixelDataBase& data, int WXUNUSED(bpp)) { - if ( !Ok() ) + if ( !IsOk() ) // no bitmap, no data (raw or otherwise) return NULL; diff --git a/src/osx/core/dcmemory.cpp b/src/osx/core/dcmemory.cpp index 9610395377..eabdc34f98 100644 --- a/src/osx/core/dcmemory.cpp +++ b/src/osx/core/dcmemory.cpp @@ -55,7 +55,7 @@ void wxMemoryDCImpl::Init() wxMemoryDCImpl::~wxMemoryDCImpl() { - if ( m_selected.Ok() ) + if ( m_selected.IsOk() ) { m_selected.EndRawAccess() ; wxDELETE(m_graphicContext); @@ -64,14 +64,14 @@ wxMemoryDCImpl::~wxMemoryDCImpl() void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) { - if ( m_selected.Ok() ) + if ( m_selected.IsOk() ) { m_selected.EndRawAccess() ; wxDELETE(m_graphicContext); } m_selected = bitmap; - if (m_selected.Ok()) + if (m_selected.IsOk()) { if ( m_selected.GetDepth() != 1 ) m_selected.UseAlpha() ; @@ -97,7 +97,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const { - if (m_selected.Ok()) + if (m_selected.IsOk()) { if (width) (*width) = m_selected.GetWidth(); diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp index f151cb5684..afe67a048c 100644 --- a/src/osx/core/evtloop_cf.cpp +++ b/src/osx/core/evtloop_cf.cpp @@ -147,14 +147,21 @@ wxCFEventLoop::AddSourceForFD(int WXUNUSED(fd), #endif // wxUSE_EVENTLOOP_SOURCE -extern "C" void wxObserverCallBack(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) +void wxCFEventLoop::OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info) { wxCFEventLoop * eventloop = static_cast(info); if ( eventloop ) - eventloop->ObserverCallBack(observer, activity); + eventloop->CommonModeObserverCallBack(observer, activity); } -void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), int activity) +void wxCFEventLoop::OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info) +{ + wxCFEventLoop * eventloop = static_cast(info); + if ( eventloop ) + eventloop->DefaultModeObserverCallBack(observer, activity); +} + +void wxCFEventLoop::CommonModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), int activity) { if ( activity & kCFRunLoopBeforeTimers ) { @@ -185,6 +192,22 @@ void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), in } } +void +wxCFEventLoop::DefaultModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), + int WXUNUSED(activity)) +{ + /* + if ( activity & kCFRunLoopBeforeTimers ) + { + } + + if ( activity & kCFRunLoopBeforeWaiting ) + { + } + */ +} + + wxCFEventLoop::wxCFEventLoop() { m_shouldExit = false; @@ -194,15 +217,21 @@ wxCFEventLoop::wxCFEventLoop() CFRunLoopObserverContext ctxt; bzero( &ctxt, sizeof(ctxt) ); ctxt.info = this; - m_runLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0, - wxObserverCallBack, &ctxt ); - CFRunLoopAddObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes); - CFRelease(m_runLoopObserver); + m_commonModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0, + (CFRunLoopObserverCallBack) wxCFEventLoop::OSXCommonModeObserverCallBack, &ctxt ); + CFRunLoopAddObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes); + CFRelease(m_commonModeRunLoopObserver); + + m_defaultModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0, + (CFRunLoopObserverCallBack) wxCFEventLoop::OSXDefaultModeObserverCallBack, &ctxt ); + CFRunLoopAddObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode); + CFRelease(m_defaultModeRunLoopObserver); } wxCFEventLoop::~wxCFEventLoop() { - CFRunLoopRemoveObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes); + CFRunLoopRemoveObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes); + CFRunLoopRemoveObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode); } diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp index ca31f2186e..9b1eded8fe 100644 --- a/src/osx/core/printmac.cpp +++ b/src/osx/core/printmac.cpp @@ -651,6 +651,11 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) #endif } } + else + { + // fallback + res.hRes = res.vRes = 300; + } printout->SetPPIPrinter(int(res.hRes), int(res.vRes)); // Set printout parameters diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp index 08c094bd86..c239ca35ff 100644 --- a/src/osx/dataview_osx.cpp +++ b/src/osx/dataview_osx.cpp @@ -633,6 +633,11 @@ void wxDataViewCtrl::AddChildren(wxDataViewItem const& parentItem) (void) GetModel()->ItemsAdded(parentItem,items); } +void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int column ) +{ + GetDataViewPeer()->StartEditor(item, column); +} + void wxDataViewCtrl::FinishCustomItemEditing() { if (GetCustomRendererItem().IsOk()) diff --git a/src/osx/dnd_osx.cpp b/src/osx/dnd_osx.cpp index fc2e684f2d..46c93cf148 100644 --- a/src/osx/dnd_osx.cpp +++ b/src/osx/dnd_osx.cpp @@ -164,7 +164,7 @@ wxDropSource::~wxDropSource() bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect) { const wxCursor& cursor = GetCursor(effect); - bool result = cursor.Ok(); + bool result = cursor.IsOk(); if ( result ) cursor.MacInstall(); diff --git a/src/osx/imaglist.cpp b/src/osx/imaglist.cpp index e2191ca179..2f9346ac52 100644 --- a/src/osx/imaglist.cpp +++ b/src/osx/imaglist.cpp @@ -108,7 +108,7 @@ int wxImageList::Add( const wxBitmap &bitmap ) int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) { wxBitmap bmp( bitmap ); - if (mask.Ok()) + if (mask.IsOk()) bmp.SetMask( new wxMask( mask ) ); return Add( bmp ); @@ -231,7 +231,7 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &ma m_images.Insert( next, newBitmap ); } - if (mask.Ok()) + if (mask.IsOk()) newBitmap->SetMask(new wxMask(mask)); return true; diff --git a/src/osx/iphone/anybutton.mm b/src/osx/iphone/anybutton.mm new file mode 100644 index 0000000000..ffdf3262e4 --- /dev/null +++ b/src/osx/iphone/anybutton.mm @@ -0,0 +1,56 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/osx/iphone/anybutton.mm +// Purpose: wxAnyButton +// Author: Stefan Csomor +// Created: 1998-01-01 (extracted from button.mm) +// RCS-ID: $Id: anybutton.mm 67232 2011-03-18 15:10:15Z DS $ +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#include "wx/wxprec.h" + +#include "wx/anybutton.h" + +#ifndef WX_PRECOMP + #include "wx/panel.h" + #include "wx/toplevel.h" + #include "wx/dcclient.h" +#endif + +#include "wx/stockitem.h" + +#include "wx/osx/private.h" + +wxSize wxAnyButton::DoGetBestSize() const +{ + if ( GetId() == wxID_HELP ) + return wxSize( 18 , 18 ) ; + + wxSize sz = GetDefaultSize() ; + + wxRect r ; + + GetPeer()->GetBestRect(&r); + + if ( r.GetWidth() == 0 && r.GetHeight() == 0 ) + { + } + sz.x = r.GetWidth(); + sz.y = r.GetHeight(); + + int wBtn = 72; + + if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT)) + sz.x = wBtn; + + return sz ; +} + +wxSize wxAnyButton::GetDefaultSize() +{ + int wBtn = 72 ; + int hBtn = 35 ; + + return wxSize(wBtn, hBtn); +} diff --git a/src/osx/iphone/button.mm b/src/osx/iphone/button.mm index e9df18bb46..e2afa1c0cb 100644 --- a/src/osx/iphone/button.mm +++ b/src/osx/iphone/button.mm @@ -23,39 +23,6 @@ #include "wx/osx/private.h" -wxSize wxButton::DoGetBestSize() const -{ - if ( GetId() == wxID_HELP ) - return wxSize( 18 , 18 ) ; - - wxSize sz = GetDefaultSize() ; - - wxRect r ; - - GetPeer()->GetBestRect(&r); - - if ( r.GetWidth() == 0 && r.GetHeight() == 0 ) - { - } - sz.x = r.GetWidth(); - sz.y = r.GetHeight(); - - int wBtn = 72; - - if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT)) - sz.x = wBtn; - - return sz ; -} - -wxSize wxButton::GetDefaultSize() -{ - int wBtn = 72 ; - int hBtn = 35 ; - - return wxSize(wBtn, hBtn); -} - @implementation wxUIButton + (void)initialize diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm index 449a92e572..659fb243f2 100644 --- a/src/osx/iphone/toolbar.mm +++ b/src/osx/iphone/toolbar.mm @@ -126,7 +126,7 @@ wxToolBarToolBase( [bui initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; bui.width = 25.0f; } - else if ( bmpNormal.Ok() ) + else if ( bmpNormal.IsOk() ) { [bui initWithImage:bmpNormal.GetUIImage() style:UIBarButtonItemStylePlain target:toolbar action:@selector(clickedAction:)]; diff --git a/src/osx/menuitem_osx.cpp b/src/osx/menuitem_osx.cpp index 3b516a6414..93ef505286 100644 --- a/src/osx/menuitem_osx.cpp +++ b/src/osx/menuitem_osx.cpp @@ -176,7 +176,7 @@ void wxMenuItem::UpdateItemBitmap() if ( !m_parentMenu ) return; - if ( m_bitmap.Ok() ) + if ( m_bitmap.IsOk() ) { GetPeer()->SetBitmap( m_bitmap ); } diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp index 4886a876b4..0f0ea5f37b 100644 --- a/src/osx/notebook_osx.cpp +++ b/src/osx/notebook_osx.cpp @@ -245,10 +245,10 @@ bool wxNotebook::InsertPage(size_t nPage, return true; } -int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) const +int wxNotebook::HitTest(const wxPoint& pt, long *flags) const { int resultV = wxNOT_FOUND; -#if 0 +#ifdef __WXOSX_CARBON__ const int countPages = GetPageCount(); // we have to convert from Client to Window relative coordinates @@ -300,6 +300,9 @@ int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) con else *flags |= wxBK_HITTEST_NOWHERE; } +#else + wxUnusedVar(pt); + wxUnusedVar(flags); #endif return resultV; } diff --git a/src/osx/pen.cpp b/src/osx/pen.cpp index a40bdfcf9f..ec49069ed8 100644 --- a/src/osx/pen.cpp +++ b/src/osx/pen.cpp @@ -164,42 +164,42 @@ bool wxPen::operator==(const wxPen& pen) const wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_width; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_join; } wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_cap; } int wxPen::GetDashes(wxDash **ptr) const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); *ptr = M_PENDATA->m_dash; return M_PENDATA->m_nbDash; @@ -212,7 +212,7 @@ int wxPen::GetDashCount() const wxBitmap *wxPen::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); return &M_PENDATA->m_stipple; } diff --git a/src/osx/spinctrl_osx.cpp b/src/osx/spinctrl_osx.cpp index 7d207e68eb..cace5fd4e6 100644 --- a/src/osx/spinctrl_osx.cpp +++ b/src/osx/spinctrl_osx.cpp @@ -196,13 +196,6 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton) EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton) END_EVENT_TABLE() -BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxSpinCtrl) -END_EVENT_TABLE() - -WX_DELEGATE_TO_CONTROL_CONTAINER(wxSpinCtrl, wxControl) - - // ============================================================================ // implementation // ============================================================================ @@ -215,7 +208,6 @@ void wxSpinCtrl::Init() { m_text = NULL; m_btn = NULL; - WX_INIT_CONTROL_CONTAINER(); } bool wxSpinCtrl::Create(wxWindow *parent, diff --git a/src/osx/textentry_osx.cpp b/src/osx/textentry_osx.cpp index 8061d068e4..d7175f8238 100644 --- a/src/osx/textentry_osx.cpp +++ b/src/osx/textentry_osx.cpp @@ -63,11 +63,15 @@ wxTextEntry::~wxTextEntry() wxString wxTextEntry::DoGetValue() const { + wxCHECK_MSG( GetTextPeer(), wxString(), "Must create the control first" ); + return GetTextPeer()->GetStringValue() ; } void wxTextEntry::GetSelection(long* from, long* to) const { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + GetTextPeer()->GetSelection( from , to ) ; } @@ -80,18 +84,24 @@ void wxTextEntry::SetMaxLength(unsigned long len) void wxTextEntry::Copy() { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + if (CanCopy()) GetTextPeer()->Copy() ; } void wxTextEntry::Cut() { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + if (CanCut()) GetTextPeer()->Cut() ; } void wxTextEntry::Paste() { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + if (CanPaste()) GetTextPeer()->Paste() ; } @@ -122,16 +132,20 @@ bool wxTextEntry::CanPaste() const if (!IsEditable()) return false; + wxCHECK_MSG( GetTextPeer(), false, "Must create the control first" ); + return GetTextPeer()->CanPaste() ; } void wxTextEntry::SetEditable(bool editable) { - if ( editable != m_editable ) - { - m_editable = editable ; - GetTextPeer()->SetEditable( editable ) ; - } + if ( editable == m_editable ) + return; + + m_editable = editable ; + + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + GetTextPeer()->SetEditable( editable ) ; } void wxTextEntry::SetInsertionPoint(long pos) @@ -155,11 +169,15 @@ long wxTextEntry::GetInsertionPoint() const wxTextPos wxTextEntry::GetLastPosition() const { + wxCHECK_MSG( GetTextPeer(), -1, "Must create the control first" ); + return GetTextPeer()->GetLastPosition() ; } void wxTextEntry::Remove(long from, long to) { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + { EventsSuppressor noevents(this); GetTextPeer()->Remove( from , to ); @@ -170,11 +188,15 @@ void wxTextEntry::Remove(long from, long to) void wxTextEntry::SetSelection(long from, long to) { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + GetTextPeer()->SetSelection( from , to ) ; } void wxTextEntry::WriteText(const wxString& str) { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + { EventsSuppressor noevents(this); GetTextPeer()->WriteText( str ); @@ -185,6 +207,8 @@ void wxTextEntry::WriteText(const wxString& str) void wxTextEntry::Clear() { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + { EventsSuppressor noevents(this); GetTextPeer()->Clear(); @@ -204,12 +228,16 @@ bool wxTextEntry::IsEditable() const void wxTextEntry::Undo() { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + if (CanUndo()) GetTextPeer()->Undo() ; } void wxTextEntry::Redo() { + wxCHECK_RET( GetTextPeer(), "Must create the control first" ); + if (CanRedo()) GetTextPeer()->Redo() ; } @@ -219,6 +247,8 @@ bool wxTextEntry::CanUndo() const if ( !IsEditable() ) return false ; + wxCHECK_MSG( GetTextPeer(), false, "Must create the control first" ); + return GetTextPeer()->CanUndo() ; } @@ -227,6 +257,8 @@ bool wxTextEntry::CanRedo() const if ( !IsEditable() ) return false ; + wxCHECK_MSG( GetTextPeer(), false, "Must create the control first" ); + return GetTextPeer()->CanRedo() ; } diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp index c381cd4eda..5eb31a43bc 100644 --- a/src/osx/tglbtn_osx.cpp +++ b/src/osx/tglbtn_osx.cpp @@ -49,6 +49,21 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, { DontCreatePeer(); + m_marginX = + m_marginY = 0; + + // FIXME: this hack is needed because we're called from + // wxBitmapToggleButton::Create() with this style and we currently use a + // different wxWidgetImpl method (CreateBitmapToggleButton() rather than + // CreateToggleButton()) for creating bitmap buttons, but we really ought + // to unify the creation of buttons of all kinds and then remove + // this check + if ( style & wxBU_NOTEXT ) + { + return wxControl::Create(parent, id, pos, size, style, + validator, name); + } + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) return false; @@ -61,18 +76,6 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, return TRUE; } -wxSize wxToggleButton::DoGetBestSize() const -{ - int wBtn = 70 ; - int hBtn = 20 ; - - int lBtn = m_label.Length() * 8 + 12 ; - if (lBtn > wBtn) - wBtn = lBtn; - - return wxSize ( wBtn , hBtn ) ; -} - void wxToggleButton::SetValue(bool val) { GetPeer()->SetValue( val ) ; @@ -102,7 +105,7 @@ bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) // wxBitmapToggleButton // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton) bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& label, @@ -113,13 +116,13 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, { DontCreatePeer(); - m_bitmap = label; + if ( !wxToggleButton::Create(parent, id, wxEmptyString, pos, size, style | wxBU_NOTEXT | wxBU_EXACTFIT, validator, name) ) + return false; m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN; - if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) - return false; + m_bitmaps[State_Normal] = label; SetPeer(wxWidgetImpl::CreateBitmapToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() )); @@ -128,42 +131,5 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, return TRUE; } -wxSize wxBitmapToggleButton::DoGetBestSize() const -{ - if (!m_bitmap.IsOk()) - return wxSize(20,20); - - wxSize best; - best.x = m_bitmap.GetWidth() + 2 * m_marginX; - best.y = m_bitmap.GetHeight() + 2 * m_marginY; - - return best; -} - -void wxBitmapToggleButton::SetValue(bool val) -{ - GetPeer()->SetValue( val ) ; -} - -bool wxBitmapToggleButton::GetValue() const -{ - return GetPeer()->GetValue() ; -} - -void wxBitmapToggleButton::Command(wxCommandEvent & event) -{ - SetValue((event.GetInt() != 0)); - ProcessCommand(event); -} - -bool wxBitmapToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) -{ - wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId); - event.SetInt(GetValue()); - event.SetEventObject(this); - ProcessCommand(event); - return noErr ; -} - #endif // wxUSE_TOGGLEBTN diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 3adbc2c67e..00115ba251 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -444,7 +444,8 @@ void wxWindowMac::MacChildAdded() #endif } -void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size) +void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), + const wxSize& WXUNUSED(size)) { // todo remove if refactoring works correctly #if 0 @@ -475,7 +476,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) { // Don't assert, in case we set the window variant before // the window is created - // wxASSERT( GetPeer()->Ok() ) ; + // wxASSERT( GetPeer()->IsOk() ) ; m_windowVariant = variant ; @@ -588,7 +589,7 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col ) { if (m_growBox) { - if ( m_backgroundColour.Ok() ) + if ( m_backgroundColour.IsOk() ) m_growBox->SetBackgroundColour(m_backgroundColour); else m_growBox->SetBackgroundColour(*wxWHITE); @@ -897,7 +898,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) return false ; } - wxASSERT_MSG( m_cursor.Ok(), + wxASSERT_MSG( m_cursor.IsOk(), wxT("cursor must be valid after call to the base version")); if ( GetPeer() != NULL ) @@ -1560,7 +1561,7 @@ void wxWindowMac::MacPaintGrowBox() CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ; CGContextSaveGState( cgContext ); - if ( m_backgroundColour.Ok() ) + if ( m_backgroundColour.IsOk() ) { CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() ); } @@ -1573,7 +1574,7 @@ void wxWindowMac::MacPaintGrowBox() #else if (m_growBox) { - if ( m_backgroundColour.Ok() ) + if ( m_backgroundColour.IsOk() ) m_growBox->SetBackgroundColour(m_backgroundColour); else m_growBox->SetBackgroundColour(*wxWHITE); @@ -1831,18 +1832,18 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt ) // if the user code caught EVT_SET_CURSOR() and returned nothing from // it - this is a way to say that our cursor shouldn't be used for this // point - if ( !processedEvtSetCursor && m_cursor.Ok() ) + if ( !processedEvtSetCursor && m_cursor.IsOk() ) cursor = m_cursor ; if ( !wxIsBusy() && !GetParent() ) cursor = *wxSTANDARD_CURSOR ; } - if ( cursor.Ok() ) + if ( cursor.IsOk() ) cursor.MacInstall() ; } - return cursor.Ok() ; + return cursor.IsOk() ; } wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) ) diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp index 3a0cd03728..4329848379 100644 --- a/src/palmos/font.cpp +++ b/src/palmos/font.cpp @@ -479,7 +479,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const wxString wxFont::GetNativeFontInfoDesc() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); // be sure we have an HFONT associated... wxConstCast(this, wxFont)->RealizeResource(); @@ -488,7 +488,7 @@ wxString wxFont::GetNativeFontInfoDesc() const wxString wxFont::GetNativeFontInfoUserDesc() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); // be sure we have an HFONT associated... wxConstCast(this, wxFont)->RealizeResource(); diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp index 907eceec53..d0187762de 100644 --- a/src/propgrid/advprops.cpp +++ b/src/propgrid/advprops.cpp @@ -668,7 +668,7 @@ void wxFontProperty::OnSetValue() wxFont font; font << m_value; - if ( !font.Ok() ) + if ( !font.IsOk() ) { m_value << *wxNORMAL_FONT; } @@ -906,7 +906,7 @@ void wxSystemColourProperty::Init( int type, const wxColour& colour ) { wxColourPropertyValue cpv; - if ( colour.Ok() ) + if ( colour.IsOk() ) cpv.Init( type, colour ); else cpv.Init( type, *wxWHITE ); @@ -1097,7 +1097,7 @@ void wxSystemColourProperty::OnSetValue() cpv << m_value; wxColour col = cpv.m_colour; - if ( !col.Ok() ) + if ( !col.IsOk() ) { SetValueToUnspecified(); SetIndex(wxNOT_FOUND); @@ -1120,7 +1120,7 @@ void wxSystemColourProperty::OnSetValue() wxColour col; col << m_value; - if ( !col.Ok() ) + if ( !col.IsOk() ) { SetValueToUnspecified(); SetIndex(wxNOT_FOUND); @@ -1383,7 +1383,7 @@ void wxSystemColourProperty::OnCustomPaint( wxDC& dc, const wxRect& rect, col = GetVal().m_colour; } - if ( col.Ok() ) + if ( col.IsOk() ) { dc.SetBrush(col); dc.DrawRectangle(rect); @@ -1585,7 +1585,7 @@ wxColourProperty::~wxColourProperty() void wxColourProperty::Init( wxColour colour ) { - if ( !colour.Ok() ) + if ( !colour.IsOk() ) colour = *wxWHITE; wxVariant variant; variant << colour; @@ -1864,7 +1864,7 @@ void wxImageFileProperty::OnCustomPaint( wxDC& dc, const wxRect& rect, wxPGPaintData& ) { - if ( m_pBitmap || (m_pImage && m_pImage->Ok() ) ) + if ( m_pBitmap || (m_pImage && m_pImage->IsOk() ) ) { // Draw the thumbnail diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index 0ca85a9877..97647f7e30 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -774,7 +774,7 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb, const wxBitmap* itemBitmap = NULL; - if ( item >= 0 && choices.IsOk() && choices.Item(item).GetBitmap().Ok() && comValIndex == -1 ) + if ( item >= 0 && choices.IsOk() && choices.Item(item).GetBitmap().IsOk() && comValIndex == -1 ) itemBitmap = &choices.Item(item).GetBitmap(); // diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp index fa81f9e898..1e4f0cdfac 100644 --- a/src/propgrid/property.cpp +++ b/src/propgrid/property.cpp @@ -24,6 +24,7 @@ #include "wx/hash.h" #include "wx/string.h" #include "wx/log.h" + #include "wx/math.h" #include "wx/event.h" #include "wx/window.h" #include "wx/panel.h" @@ -158,7 +159,7 @@ int wxPGCellRenderer::PreDrawCell( wxDC& dc, const wxRect& rect, const wxPGCell& dc.SetFont(font); const wxBitmap& bmp = cell.GetBitmap(); - if ( bmp.Ok() && + if ( bmp.IsOk() && // Do not draw oversized bitmap outside choice popup ((flags & ChoicePopup) || bmp.GetHeight() < rect.height ) ) @@ -327,7 +328,7 @@ wxSize wxPGDefaultRenderer::GetImageSize( const wxPGProperty* property, { wxBitmap* bmp = property->GetValueImage(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) return wxSize(bmp->GetWidth(),bmp->GetHeight()); } } @@ -1297,7 +1298,7 @@ void wxPGProperty::OnCustomPaint( wxDC& dc, { wxBitmap* bmp = m_valueBitmap; - wxCHECK_RET( bmp && bmp->Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( bmp && bmp->IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( rect.x >= 0, wxT("unexpected measure call") ); @@ -2091,7 +2092,7 @@ void wxPGProperty::SetValueImage( wxBitmap& bmp ) { delete m_valueBitmap; - if ( &bmp && bmp.Ok() ) + if ( &bmp && bmp.IsOk() ) { // Resize the image wxSize maxSz = GetGrid()->GetImageSize(); @@ -2103,8 +2104,8 @@ void wxPGProperty::SetValueImage( wxBitmap& bmp ) // Here we use high-quality wxImage scaling functions available wxImage img = bmp.ConvertToImage(); double scaleY = (double)maxSz.y / (double)imSz.y; - img.Rescale(((double)bmp.GetWidth())*scaleY, - ((double)bmp.GetHeight())*scaleY, + img.Rescale(wxRound(bmp.GetWidth()*scaleY), + wxRound(bmp.GetHeight()*scaleY), wxIMAGE_QUALITY_HIGH); wxBitmap* bmpNew = new wxBitmap(img, 32); #else @@ -2569,6 +2570,25 @@ void wxPGProperty::DeleteChildren() } } +bool wxPGProperty::IsChildSelected( bool recursive ) const +{ + size_t i; + for ( i = 0; i < GetChildCount(); i++ ) + { + wxPGProperty* child = Item(i); + + // Test child + if ( m_parentState->DoIsPropertySelected( child ) ) + return true; + + // Test sub-childs + if ( recursive && child->IsChildSelected( recursive ) ) + return true; + } + + return false; +} + wxVariant wxPGProperty::ChildChanged( wxVariant& WXUNUSED(thisValue), int WXUNUSED(childIndex), wxVariant& WXUNUSED(childValue) ) const diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 26a550223a..5af8805a19 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -2600,7 +2600,7 @@ void wxPropertyGrid::DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 ) void wxPropertyGrid::RefreshProperty( wxPGProperty* p ) { - if ( m_pState->DoIsPropertySelected(p) ) + if ( m_pState->DoIsPropertySelected(p) || p->IsChildSelected(true) ) { // NB: We must copy the selection. wxArrayPGProperty selection = m_pState->m_selection; diff --git a/src/regex/regexM8.xml b/src/regex/regexM8.xml deleted file mode 100644 index 81e3f14ac7..0000000000 --- a/src/regex/regexM8.xml +++ /dev/null @@ -1,2418 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - PPC - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path../../include - PathFormatUnix - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnamePPC - OutputDirectory - Path:::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.bh - CompilerBalloon Help - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.p - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pas - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ppu - CompilerMW Pascal PPC - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.s - CompilerPPCAsm - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÿÀ°¯p"²¸ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - MWVJavaDebugging_UseRemoteLaunchAgentfalse - MWVJavaDebugging_LaunchVMasServerfalse - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - MWJava_Language_enableAssertsfalse - MWJava_Language_targetVM1.1 - - - Manifest-JAD Attributes - - AttributeMain-Class - ValueAuto-Generated - - - - - MWJava_MRJAppBuilder_outFileMRJApplication - MWJava_MRJAppBuilder_mergefalse - MWJava_MRJAppBuilder_quitMenutrue - MWJava_MRJAppBuilder_growfalse - MWJava_MRJAppBuilder_stdoutTypeConsole - MWJava_MRJAppBuilder_stderrTypeConsole - MWJava_MRJAppBuilder_stdinTypeConsole - MWJava_MRJAppBuilder_appIconPVersion0 - MWJava_MRJAppBuilder_appIconPType0 - MWJava_MRJAppBuilder_appIconPFormat0 - MWJava_MRJAppBuilder_appIconPTree - MWJava_MRJAppBuilder_appIconFile - MWJava_MRJAppBuilder_splashScreenPVersion0 - MWJava_MRJAppBuilder_splashScreenPType0 - MWJava_MRJAppBuilder_splashScreenPFormat0 - MWJava_MRJAppBuilder_splashScreenPTree - MWJava_MRJAppBuilder_splashScreenPICTFile - MWJava_MRJAppBuilder_aboutName - MWJava_MRJAppBuilder_stdoutPVersion0 - MWJava_MRJAppBuilder_stdoutPType0 - MWJava_MRJAppBuilder_stdoutPFormat0 - MWJava_MRJAppBuilder_stdoutPTree - MWJava_MRJAppBuilder_stdoutFile - MWJava_MRJAppBuilder_stdoutAppendfalse - MWJava_MRJAppBuilder_stderrPType0 - MWJava_MRJAppBuilder_stderrPFormat0 - MWJava_MRJAppBuilder_stderrPTree - MWJava_MRJAppBuilder_stderrFile - MWJava_MRJAppBuilder_stderrAppendfalse - MWJava_MRJAppBuilder_stdinPType0 - MWJava_MRJAppBuilder_stdinPFormat0 - MWJava_MRJAppBuilder_stdinPTree - MWJava_MRJAppBuilder_stdinFile - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype1514754080 - MWJava_Output_fcreator1297570384 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - MWJava_Output_preverify0 - MWJava_Output_genJad0 - MWJava_Output_obfuscate0 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_simulator0 - MWJava_Proj_useVM\000\000macosx - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Deprecated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_fcreator1229278547 - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesInline - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap1 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilezlib_PPC.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfileregex_PPC.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWinRC_prefixname - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSectHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showDatatrue - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showRawfalse - PDisasmX86_showAllRawfalse - PDisasmX86_showSourcefalse - PDisasmX86_showRelocationtrue - PDisasmX86_showHextrue - PDisasmX86_showCommentsfalse - PDisasmX86_showSymDefstrue - PDisasmX86_unmangletrue - PDisasmX86_verbosetrue - PDisasmX86_resolveRelocstrue - PDisasmX86_resolveLocalsfalse - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - GlobalOptimizer_X86_optimizationlevelLevel0 - GlobalOptimizer_X86_optforSpeed - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - regcomp.c - Unix - Text - - - - Name - regfree.c - Unix - Text - - - - Name - regerror.c - Unix - Text - - - - Name - regexec.c - Unix - Text - - - - - - Name - regcomp.c - Unix - - - Name - regfree.c - Unix - - - Name - regerror.c - Unix - - - Name - regexec.c - Unix - - - - - Mach-O - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path../../include - PathFormatUnix - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMacOS X Support/Headers/(wchar_t Support fix) - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Pathusr/include - PathFormatUnix - PathRootOS X Volume - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMSL/MSL_C - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMSL/MSL_C++ - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMacOS X Support - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS X PPC Linker - PreLinker - PostLinker - TargetnameMach-O - OutputDirectory - Path:::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMDYL - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMLIB - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.arr - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.axp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.h++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.hpp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.lcf - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.m - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.mm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pchm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pchmm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.plc - CompilerProperty List Compiler - EditLanguageProperty List - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ploc - CompilerProperty List Compiler - EditLanguageProperty List - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.wke - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.a - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.dylib - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.gif - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.icns - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.jpg - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.nib - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.pl - CompilerPerl Tool - EditLanguagePerl - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.plist - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.psh - CompilerShell Tool - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.sh - CompilerShell Tool - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.strings - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.tiff - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamewx_cwc.pch - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÿÀ°¯p"²¸ - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - MWVJavaDebugging_UseRemoteLaunchAgentfalse - MWVJavaDebugging_LaunchVMasServerfalse - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - MWJava_Language_enableAssertsfalse - MWJava_Language_targetVM1.1 - - - Manifest-JAD Attributes - - AttributeMain-Class - ValueAuto-Generated - - - - - MWJava_MRJAppBuilder_outFileMRJApplication - MWJava_MRJAppBuilder_mergefalse - MWJava_MRJAppBuilder_quitMenutrue - MWJava_MRJAppBuilder_growfalse - MWJava_MRJAppBuilder_stdoutTypeConsole - MWJava_MRJAppBuilder_stderrTypeConsole - MWJava_MRJAppBuilder_stdinTypeConsole - MWJava_MRJAppBuilder_appIconPVersion0 - MWJava_MRJAppBuilder_appIconPType0 - MWJava_MRJAppBuilder_appIconPFormat0 - MWJava_MRJAppBuilder_appIconPTree - MWJava_MRJAppBuilder_appIconFile - MWJava_MRJAppBuilder_splashScreenPVersion0 - MWJava_MRJAppBuilder_splashScreenPType0 - MWJava_MRJAppBuilder_splashScreenPFormat0 - MWJava_MRJAppBuilder_splashScreenPTree - MWJava_MRJAppBuilder_splashScreenPICTFile - MWJava_MRJAppBuilder_aboutName - MWJava_MRJAppBuilder_stdoutPVersion0 - MWJava_MRJAppBuilder_stdoutPType0 - MWJava_MRJAppBuilder_stdoutPFormat0 - MWJava_MRJAppBuilder_stdoutPTree - MWJava_MRJAppBuilder_stdoutFile - MWJava_MRJAppBuilder_stdoutAppendfalse - MWJava_MRJAppBuilder_stderrPType0 - MWJava_MRJAppBuilder_stderrPFormat0 - MWJava_MRJAppBuilder_stderrPTree - MWJava_MRJAppBuilder_stderrFile - MWJava_MRJAppBuilder_stderrAppendfalse - MWJava_MRJAppBuilder_stdinPType0 - MWJava_MRJAppBuilder_stdinPFormat0 - MWJava_MRJAppBuilder_stdinPTree - MWJava_MRJAppBuilder_stdinFile - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype1514754080 - MWJava_Output_fcreator1297570384 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - MWJava_Output_preverify0 - MWJava_Output_genJad0 - MWJava_Output_obfuscate0 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_simulator0 - MWJava_Proj_useVM\000\000macosx - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Deprecated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_fcreator1229278547 - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesInline - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap1 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfileregex_MACH.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfileregex_PPC.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWinRC_prefixname - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSectHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showDatatrue - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showRawfalse - PDisasmX86_showAllRawfalse - PDisasmX86_showSourcefalse - PDisasmX86_showRelocationtrue - PDisasmX86_showHextrue - PDisasmX86_showCommentsfalse - PDisasmX86_showSymDefstrue - PDisasmX86_unmangletrue - PDisasmX86_verbosetrue - PDisasmX86_resolveRelocstrue - PDisasmX86_resolveLocalsfalse - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - GlobalOptimizer_X86_optimizationlevelLevel0 - GlobalOptimizer_X86_optforSpeed - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - regcomp.c - Unix - Text - - - - Name - regfree.c - Unix - Text - - - - Name - regerror.c - Unix - Text - - - - Name - regexec.c - Unix - Text - - - - - - Name - regcomp.c - Unix - - - Name - regfree.c - Unix - - - Name - regerror.c - Unix - - - Name - regexec.c - Unix - - - - - - - PPC - Mach-O - - - - - PPC - Name - regcomp.c - Unix - - - PPC - Name - regfree.c - Unix - - - PPC - Name - regerror.c - Unix - - - PPC - Name - regexec.c - Unix - - - - diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index c095af9c78..946c96c1a7 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -4338,7 +4338,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) int lineSpacing = 0; // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc. - if (attr.HasLineSpacing() && attr.GetLineSpacing() > 0 && attr.GetFont().Ok()) + if (attr.HasLineSpacing() && attr.GetLineSpacing() > 0 && attr.GetFont().IsOk()) { wxCheckSetFont(dc, attr.GetFont()); lineSpacing = (int) (double(dc.GetCharHeight()) * (double(attr.GetLineSpacing())/10.0 - 1.0)); @@ -5949,7 +5949,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR int charHeight = dc.GetCharHeight(); int x, y; - if ( textFont.Ok() ) + if ( textFont.IsOk() ) { if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) ) { @@ -6248,7 +6248,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz bool bScript(false); wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr)); - if (font.Ok()) + if (font.IsOk()) { if ( textAttr.HasTextEffects() && ( (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) || (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) ) @@ -7792,7 +7792,7 @@ int wxRichTextBuffer::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition, w bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& bulletAttr, const wxRect& rect) { - if (bulletAttr.GetTextColour().Ok()) + if (bulletAttr.GetTextColour().IsOk()) { wxCheckSetPen(dc, wxPen(bulletAttr.GetTextColour())); wxCheckSetBrush(dc, wxBrush(bulletAttr.GetTextColour())); @@ -7892,7 +7892,7 @@ bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& wxCheckSetFont(dc, font); - if (attr.GetTextColour().Ok()) + if (attr.GetTextColour().IsOk()) dc.SetTextForeground(attr.GetTextColour()); dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); @@ -10153,7 +10153,7 @@ IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject) bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename) { wxFFileInputStream stream(filename); - if (stream.Ok()) + if (stream.IsOk()) return LoadFile(buffer, stream); return false; @@ -10162,7 +10162,7 @@ bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& f bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename) { wxFFileOutputStream stream(filename); - if (stream.Ok()) + if (stream.IsOk()) return SaveFile(buffer, stream); return false; @@ -10496,7 +10496,7 @@ unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t siz unsigned char* wxRichTextImageBlock::ReadBlock(const wxString& filename, size_t size) { wxFileInputStream stream(filename); - if (!stream.Ok()) + if (!stream.IsOk()) return NULL; return ReadBlock(stream, size); @@ -10514,7 +10514,7 @@ bool wxRichTextImageBlock::WriteBlock(wxOutputStream& stream, unsigned char* blo bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* block, size_t size) { wxFileOutputStream outStream(filename); - if (!outStream.Ok()) + if (!outStream.IsOk()) return false; return WriteBlock(outStream, block, size); diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index c95805f58a..f5039443c5 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -230,7 +230,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va validator, name)) return false; - if (!GetFont().Ok()) + if (!GetFont().IsOk()) { SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } @@ -456,6 +456,11 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) if (GetCaret()) GetCaret()->Show(); PositionCaret(); +#else +#if !defined(__WXMAC__) + // Causes caret dropouts on Mac + PositionCaret(); +#endif #endif } @@ -563,12 +568,7 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) // For now, don't handle shift-click when we're selecting multiple objects. if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal) - { - if (!m_selection.IsValid()) - ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); - else - ExtendSelection(m_caretPosition, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); - } + ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN); else SelectNone(); } @@ -2323,7 +2323,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop) void wxRichTextCtrl::PaintBackground(wxDC& dc) { wxColour backgroundColour = GetBackgroundColour(); - if (!backgroundColour.Ok()) + if (!backgroundColour.IsOk()) backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); // Clear the background @@ -2350,9 +2350,9 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size) if (sz.x < 1 || sz.y < 1) return false; - if (!m_bufferBitmap.Ok() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y) + if (!m_bufferBitmap.IsOk() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y) m_bufferBitmap = wxBitmap(sz.x, sz.y); - return m_bufferBitmap.Ok(); + return m_bufferBitmap.IsOk(); } #endif @@ -2664,12 +2664,12 @@ bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock, const wx bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType, const wxRichTextAttr& textAttr) { - if (bitmap.Ok()) + if (bitmap.IsOk()) { wxRichTextImageBlock imageBlock; wxImage image = bitmap.ConvertToImage(); - if (image.Ok() && imageBlock.MakeImageBlock(image, bitmapType)) + if (image.IsOk() && imageBlock.MakeImageBlock(image, bitmapType)) return WriteImage(imageBlock, textAttr); } @@ -2925,13 +2925,19 @@ void wxRichTextCtrl::SetSelection(long from, long to) // Editing // ---------------------------------------------------------------------------- -void wxRichTextCtrl::Replace(long WXUNUSED(from), long WXUNUSED(to), +void wxRichTextCtrl::Replace(long from, long to, const wxString& value) { BeginBatchUndo(_("Replace")); + SetSelection(from, to); + + wxRichTextAttr attr = GetDefaultStyle(); + DeleteSelectedContent(); + SetDefaultStyle(attr); + DoWriteText(value, SetValue_SelectionOnly); EndBatchUndo(); diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index d85249f47f..768ef405b0 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -516,7 +516,7 @@ void wxRichTextFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) font.SetPointSize( static_cast(size) ); } - if ( font.Ok() ) + if ( font.IsOk() ) { dc.SetFont(font); // Calculate vertical and horizontal centre @@ -828,7 +828,7 @@ wxString wxRichTextFontListBox::CreateHTML(const wxString& facename) const if (!facename.IsEmpty() && facename != _("(none)")) str << wxT(" face=\"") << facename << wxT("\""); /* - if (def->GetStyle().GetTextColour().Ok()) + if (def->GetStyle().GetTextColour().IsOk()) str << wxT(" color=\"#") << ColourToHexString(def->GetStyle().GetTextColour()) << wxT("\""); */ diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 7576075bc8..06670cb486 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -488,9 +488,9 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY) { #if 0 - if (!image->GetImage().Ok() && image->GetImageBlock().GetData()) + if (!image->GetImage().IsOk() && image->GetImageBlock().GetData()) image->LoadFromBlock(); - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) image->MakeBlock(); #endif @@ -517,13 +517,13 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES) { #if 0 - if (!image->GetImage().Ok() && image->GetImageBlock().GetData()) + if (!image->GetImage().IsOk() && image->GetImageBlock().GetData()) image->LoadFromBlock(); - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) image->MakeBlock(); #endif - if (image->GetImageBlock().Ok()) + if (image->GetImageBlock().IsOk()) { wxString tempDir(GetTempDir()); if (tempDir.IsEmpty()) @@ -549,10 +549,10 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s str << GetMimeType(image->GetImageBlock().GetImageType()); str << wxT(";base64,"); #if 0 - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) image->MakeBlock(); #endif - if (image->GetImageBlock().Ok()) + if (image->GetImageBlock().IsOk()) { wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() ); str << data; diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp index d12d681a9f..f73bb16211 100644 --- a/src/richtext/richtextindentspage.cpp +++ b/src/richtext/richtextindentspage.cpp @@ -415,9 +415,12 @@ bool wxRichTextIndentsSpacingPage::TransferDataFromWindow() wxString leftIndent(m_indentLeft->GetValue()); wxString leftFirstIndent(m_indentLeftFirst->GetValue()); - if (!leftIndent.empty()) + if (!leftIndent.empty() || !leftFirstIndent.empty()) { - int visualLeftIndent = wxAtoi(leftIndent); + int visualLeftIndent = 0; + if (!leftIndent.empty()) + visualLeftIndent = wxAtoi(leftIndent); + int visualLeftFirstIndent = wxAtoi(leftFirstIndent); int actualLeftIndent = visualLeftFirstIndent; int actualLeftSubIndent = visualLeftIndent - visualLeftFirstIndent; diff --git a/src/richtext/richtextprint.cpp b/src/richtext/richtextprint.cpp index 9855d57966..0bdbb0b031 100644 --- a/src/richtext/richtextprint.cpp +++ b/src/richtext/richtextprint.cpp @@ -194,11 +194,11 @@ void wxRichTextPrintout::RenderPage(wxDC *dc, int page) if (page > 1 || m_headerFooterData.GetShowOnFirstPage()) { - if (m_headerFooterData.GetFont().Ok()) + if (m_headerFooterData.GetFont().IsOk()) dc->SetFont(m_headerFooterData.GetFont()); else dc->SetFont(*wxNORMAL_FONT); - if (m_headerFooterData.GetTextColour().Ok()) + if (m_headerFooterData.GetTextColour().IsOk()) dc->SetTextForeground(m_headerFooterData.GetTextColour()); else dc->SetTextForeground(*wxBLACK); @@ -371,7 +371,7 @@ void wxRichTextPrintout::CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& he !m_headerFooterData.GetHeaderText(wxRICHTEXT_PAGE_EVEN, wxRICHTEXT_PAGE_CENTRE).IsEmpty() || !m_headerFooterData.GetHeaderText(wxRICHTEXT_PAGE_EVEN, wxRICHTEXT_PAGE_RIGHT).IsEmpty()) { - if (m_headerFooterData.GetFont().Ok()) + if (m_headerFooterData.GetFont().IsOk()) dc->SetFont(m_headerFooterData.GetFont()); else dc->SetFont(*wxNORMAL_FONT); @@ -396,7 +396,7 @@ void wxRichTextPrintout::CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& he !m_headerFooterData.GetFooterText(wxRICHTEXT_PAGE_EVEN, wxRICHTEXT_PAGE_CENTRE).IsEmpty() || !m_headerFooterData.GetFooterText(wxRICHTEXT_PAGE_EVEN, wxRICHTEXT_PAGE_RIGHT).IsEmpty()) { - if (m_headerFooterData.GetFont().Ok()) + if (m_headerFooterData.GetFont().IsOk()) dc->SetFont(m_headerFooterData.GetFont()); else dc->SetFont(*wxNORMAL_FONT); @@ -570,7 +570,7 @@ bool wxRichTextPrinting::DoPreview(wxRichTextPrintout *printout1, wxRichTextPrin // Pass two printout objects: for preview, and possible printing. wxPrintDialogData printDialogData(*GetPrintData()); wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData); - if (!preview->Ok()) + if (!preview->IsOk()) { delete preview; return false; @@ -601,7 +601,7 @@ bool wxRichTextPrinting::DoPrint(wxRichTextPrintout *printout) void wxRichTextPrinting::PageSetup() { - if (!GetPrintData()->Ok()) + if (!GetPrintData()->IsOk()) { wxLogError(_("There was a problem during page setup: you may need to set a default printer.")); return; diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp index 12a4ba29a3..c0cc55761f 100644 --- a/src/richtext/richtextstyles.cpp +++ b/src/richtext/richtextstyles.cpp @@ -821,7 +821,7 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons if (!attr.GetFontFaceName().IsEmpty()) str << wxT(" face=\"") << attr.GetFontFaceName() << wxT("\""); - if (attr.GetTextColour().Ok()) + if (attr.GetTextColour().IsOk()) str << wxT(" color=\"#") << ColourToHexString(attr.GetTextColour()) << wxT("\""); str << wxT(">"); diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp index ac02424bf7..9a34fd8894 100644 --- a/src/richtext/richtextxml.cpp +++ b/src/richtext/richtextxml.cpp @@ -1076,10 +1076,10 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxRichT wxString wxRichTextXMLHandler::AddAttributes(const wxRichTextAttr& attr, bool isPara) { wxString str; - if (attr.HasTextColour() && attr.GetTextColour().Ok()) + if (attr.HasTextColour() && attr.GetTextColour().IsOk()) AddAttribute(str, wxT("textcolor"), attr.GetTextColour()); - if (attr.HasBackgroundColour() && attr.GetBackgroundColour().Ok()) + if (attr.HasBackgroundColour() && attr.GetBackgroundColour().IsOk()) AddAttribute(str, wxT("bgcolor"), attr.GetBackgroundColour()); if (attr.HasFontSize()) @@ -1371,9 +1371,9 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxXmlNode* parent, wxRichTextSt bool wxRichTextXMLHandler::AddAttributes(wxXmlNode* node, wxRichTextAttr& attr, bool isPara) { - if (attr.HasTextColour() && attr.GetTextColour().Ok()) + if (attr.HasTextColour() && attr.GetTextColour().IsOk()) node->AddAttribute(wxT("textcolor"), MakeString(attr.GetTextColour())); - if (attr.HasBackgroundColour() && attr.GetBackgroundColour().Ok()) + if (attr.HasBackgroundColour() && attr.GetBackgroundColour().IsOk()) node->AddAttribute(wxT("bgcolor"), MakeString(attr.GetBackgroundColour())); if (attr.HasFontSize()) @@ -2381,7 +2381,7 @@ bool wxRichTextImage::ExportXML(wxOutputStream& stream, int indent, wxRichTextXM ::OutputIndentation(stream, indent); ::OutputString(stream, wxT("GetConvMem(), handler->GetConvFile()); - if (!GetImageBlock().Ok()) + if (!GetImageBlock().IsOk()) { // No data ::OutputString(stream, style + wxT(">"), handler->GetConvMem(), handler->GetConvFile()); @@ -2419,7 +2419,7 @@ bool wxRichTextImage::ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler wxXmlNode* elementNode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("image")); parent->AddChild(elementNode); - if (GetImageBlock().Ok()) + if (GetImageBlock().IsOk()) elementNode->AddAttribute(wxT("imagetype"), MakeString((int) GetImageBlock().GetImageType())); handler->AddAttributes(elementNode, GetAttributes(), false); diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 11de4291e3..6d6856895b 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -34,6 +34,12 @@ #include "wx/clipbrd.h" #include "wx/dnd.h" +#if !wxUSE_STD_CONTAINERS && !wxUSE_STD_IOSTREAM && !wxUSE_STD_STRING + #include "wx/beforestd.h" + #include + #include "wx/afterstd.h" +#endif + #include "ScintillaWX.h" #include "ExternalLexer.h" #include "wx/stc/stc.h" @@ -1068,9 +1074,7 @@ void ScintillaWX::DoDragLeave() { // Force the whole window to be repainted void ScintillaWX::FullPaint() { -#ifndef __WXMAC__ stc->Refresh(false); -#endif stc->Update(); } diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py index ff2b7b6360..326b259fe6 100755 --- a/src/stc/gen_iface.py +++ b/src/stc/gen_iface.py @@ -194,9 +194,9 @@ methodOverrideMap = { const wxColour& background) { SendMsg(%s, markerNumber, markerSymbol); - if (foreground.Ok()) + if (foreground.IsOk()) MarkerSetForeground(markerNumber, foreground); - if (background.Ok()) + if (background.IsOk()) MarkerSetBackground(markerNumber, background);''', ('Set the symbol used for a particular marker number,', diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index ca1231db4d..c31f350f55 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////// -// Name: src/stc/stc.cpp +// Name: stc.cpp // Purpose: A wxWidgets implementation of Scintilla. This class is the // one meant to be used directly by wx applications. It does not // derive directly from the Scintilla classes, but instead @@ -527,9 +527,9 @@ void wxStyledTextCtrl::MarkerDefine(int markerNumber, int markerSymbol, const wxColour& background) { SendMsg(2040, markerNumber, markerSymbol); - if (foreground.Ok()) + if (foreground.IsOk()) MarkerSetForeground(markerNumber, foreground); - if (background.Ok()) + if (background.IsOk()) MarkerSetBackground(markerNumber, background); } @@ -1964,7 +1964,7 @@ void wxStyledTextCtrl::SetWrapVisualFlags(int wrapVisualFlags) SendMsg(2460, wrapVisualFlags, 0); } -// Retrieve the display mode of visual flags for wrapped lines. +// Retrive the display mode of visual flags for wrapped lines. int wxStyledTextCtrl::GetWrapVisualFlags() const { return SendMsg(2461, 0, 0); @@ -1976,7 +1976,7 @@ void wxStyledTextCtrl::SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation) SendMsg(2462, wrapVisualFlagsLocation, 0); } -// Retrieve the location of visual flags for wrapped lines. +// Retrive the location of visual flags for wrapped lines. int wxStyledTextCtrl::GetWrapVisualFlagsLocation() const { return SendMsg(2463, 0, 0); @@ -1988,7 +1988,7 @@ void wxStyledTextCtrl::SetWrapStartIndent(int indent) SendMsg(2464, indent, 0); } -// Retrieve the start indent for wrapped lines. +// Retrive the start indent for wrapped lines. int wxStyledTextCtrl::GetWrapStartIndent() const { return SendMsg(2465, 0, 0); diff --git a/src/stc/stcM8.xml b/src/stc/stcM8.xml deleted file mode 100644 index 5e7ee5fea1..0000000000 --- a/src/stc/stcM8.xml +++ /dev/null @@ -1,7164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - PPC - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path::::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnamePPC - OutputDirectory - Path::::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.bh - CompilerBalloon Help - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cxx - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.p - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pas - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ppu - CompilerMW Pascal PPC - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.s - CompilerPPCAsm - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamestc_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÿÄ@¨à˜"¨T - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - MWVJavaDebugging_UseRemoteLaunchAgentfalse - MWVJavaDebugging_LaunchVMasServerfalse - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - MWJava_Language_enableAssertsfalse - MWJava_Language_targetVM1.1 - - - Manifest-JAD Attributes - - AttributeMain-Class - ValueAuto-Generated - - - - - MWJava_MRJAppBuilder_outFileMRJApplication - MWJava_MRJAppBuilder_mergefalse - MWJava_MRJAppBuilder_quitMenutrue - MWJava_MRJAppBuilder_growfalse - MWJava_MRJAppBuilder_stdoutTypeConsole - MWJava_MRJAppBuilder_stderrTypeConsole - MWJava_MRJAppBuilder_stdinTypeConsole - MWJava_MRJAppBuilder_appIconPVersion0 - MWJava_MRJAppBuilder_appIconPType0 - MWJava_MRJAppBuilder_appIconPFormat0 - MWJava_MRJAppBuilder_appIconPTree - MWJava_MRJAppBuilder_appIconFile - MWJava_MRJAppBuilder_splashScreenPVersion0 - MWJava_MRJAppBuilder_splashScreenPType0 - MWJava_MRJAppBuilder_splashScreenPFormat0 - MWJava_MRJAppBuilder_splashScreenPTree - MWJava_MRJAppBuilder_splashScreenPICTFile - MWJava_MRJAppBuilder_aboutName - MWJava_MRJAppBuilder_stdoutPVersion0 - MWJava_MRJAppBuilder_stdoutPType0 - MWJava_MRJAppBuilder_stdoutPFormat0 - MWJava_MRJAppBuilder_stdoutPTree - MWJava_MRJAppBuilder_stdoutFile - MWJava_MRJAppBuilder_stdoutAppendfalse - MWJava_MRJAppBuilder_stderrPType0 - MWJava_MRJAppBuilder_stderrPFormat0 - MWJava_MRJAppBuilder_stderrPTree - MWJava_MRJAppBuilder_stderrFile - MWJava_MRJAppBuilder_stderrAppendfalse - MWJava_MRJAppBuilder_stdinPType0 - MWJava_MRJAppBuilder_stdinPFormat0 - MWJava_MRJAppBuilder_stdinPTree - MWJava_MRJAppBuilder_stdinFile - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype1514754080 - MWJava_Output_fcreator1297570384 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - MWJava_Output_preverify0 - MWJava_Output_genJad0 - MWJava_Output_obfuscate0 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_simulator0 - MWJava_Proj_useVM\000\000mrj225 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Deprecated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_fcreator1229278547 - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - Definesismac,isMacRCC - Compatiblefalse - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilewxxrc_PPC.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfilewxstc_PPC.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWinRC_prefixname - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSectHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showDatatrue - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showRawfalse - PDisasmX86_showAllRawfalse - PDisasmX86_showSourcefalse - PDisasmX86_showRelocationtrue - PDisasmX86_showHextrue - PDisasmX86_showCommentsfalse - PDisasmX86_showSymDefstrue - PDisasmX86_unmanglefalse - PDisasmX86_verbosefalse - PDisasmX86_resolveRelocstrue - PDisasmX86_resolveLocalsfalse - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - GlobalOptimizer_X86_optimizationlevelLevel0 - GlobalOptimizer_X86_optforSpeed - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - PlatWX.cpp - MacOS - Text - Debug - - - Name - ScintillaWX.cpp - MacOS - Text - Debug - - - Name - stc.cpp - MacOS - Text - Debug - - - Name - AutoComplete.cxx - MacOS - Text - Debug - - - Name - CallTip.cxx - MacOS - Text - Debug - - - Name - CellBuffer.cxx - MacOS - Text - Debug - - - Name - ContractionState.cxx - MacOS - Text - Debug - - - Name - Document.cxx - MacOS - Text - Debug - - - Name - DocumentAccessor.cxx - MacOS - Text - Debug - - - Name - Editor.cxx - MacOS - Text - Debug - - - Name - Indicator.cxx - MacOS - Text - Debug - - - Name - KeyMap.cxx - MacOS - Text - Debug - - - Name - KeyWords.cxx - MacOS - Text - Debug - - - Name - LexAda.cxx - MacOS - Text - Debug - - - Name - LexAVE.cxx - MacOS - Text - Debug - - - Name - LexBaan.cxx - MacOS - Text - Debug - - - Name - LexBullant.cxx - MacOS - Text - Debug - - - Name - LexConf.cxx - MacOS - Text - Debug - - - Name - LexCPP.cxx - MacOS - Text - Debug - - - Name - LexCrontab.cxx - MacOS - Text - Debug - - - Name - LexEiffel.cxx - MacOS - Text - Debug - - - Name - LexHTML.cxx - MacOS - Text - Debug - - - Name - LexLisp.cxx - MacOS - Text - Debug - - - Name - LexLua.cxx - MacOS - Text - Debug - - - Name - LexMatlab.cxx - MacOS - Text - Debug - - - Name - LexOthers.cxx - MacOS - Text - Debug - - - Name - LexPascal.cxx - MacOS - Text - Debug - - - Name - LexPerl.cxx - MacOS - Text - Debug - - - Name - LexPython.cxx - MacOS - Text - Debug - - - Name - LexRuby.cxx - MacOS - Text - Debug - - - Name - LexSQL.cxx - MacOS - Text - Debug - - - Name - LexVB.cxx - MacOS - Text - Debug - - - Name - LineMarker.cxx - MacOS - Text - Debug - - - Name - PropSet.cxx - MacOS - Text - Debug - - - Name - RESearch.cxx - MacOS - Text - Debug - - - Name - ScintillaBase.cxx - MacOS - Text - Debug - - - Name - Style.cxx - MacOS - Text - Debug - - - Name - StyleContext.cxx - MacOS - Text - Debug - - - Name - UniConversion.cxx - MacOS - Text - Debug - - - Name - ViewStyle.cxx - MacOS - Text - Debug - - - Name - WindowAccessor.cxx - MacOS - Text - Debug - - - - - Name - PlatWX.cpp - MacOS - - - Name - ScintillaWX.cpp - MacOS - - - Name - stc.cpp - MacOS - - - Name - AutoComplete.cxx - MacOS - - - Name - CallTip.cxx - MacOS - - - Name - CellBuffer.cxx - MacOS - - - Name - ContractionState.cxx - MacOS - - - Name - Document.cxx - MacOS - - - Name - DocumentAccessor.cxx - MacOS - - - Name - Editor.cxx - MacOS - - - Name - Indicator.cxx - MacOS - - - Name - KeyMap.cxx - MacOS - - - Name - KeyWords.cxx - MacOS - - - Name - LexAda.cxx - MacOS - - - Name - LexAVE.cxx - MacOS - - - Name - LexBaan.cxx - MacOS - - - Name - LexBullant.cxx - MacOS - - - Name - LexConf.cxx - MacOS - - - Name - LexCPP.cxx - MacOS - - - Name - LexCrontab.cxx - MacOS - - - Name - LexEiffel.cxx - MacOS - - - Name - LexHTML.cxx - MacOS - - - Name - LexLisp.cxx - MacOS - - - Name - LexLua.cxx - MacOS - - - Name - LexMatlab.cxx - MacOS - - - Name - LexOthers.cxx - MacOS - - - Name - LexPascal.cxx - MacOS - - - Name - LexPerl.cxx - MacOS - - - Name - LexPython.cxx - MacOS - - - Name - LexRuby.cxx - MacOS - - - Name - LexSQL.cxx - MacOS - - - Name - LexVB.cxx - MacOS - - - Name - LineMarker.cxx - MacOS - - - Name - PropSet.cxx - MacOS - - - Name - RESearch.cxx - MacOS - - - Name - ScintillaBase.cxx - MacOS - - - Name - Style.cxx - MacOS - - - Name - StyleContext.cxx - MacOS - - - Name - UniConversion.cxx - MacOS - - - Name - ViewStyle.cxx - MacOS - - - Name - WindowAccessor.cxx - MacOS - - - - - All - - - - UserSourceTrees - - - AlwaysSearchUserPathsfalse - InterpretDOSAndUnixPathsfalse - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerNone - PreLinker - PostLinker - TargetnameAll - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeMMPr - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMakefalse - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileName - CodeCompletionMacroFileName - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÿÄ@¨à˜"¨T - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - MWVJavaDebugging_UseRemoteLaunchAgentfalse - MWVJavaDebugging_LaunchVMasServerfalse - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - MWJava_Language_enableAssertsfalse - MWJava_Language_targetVM1.1 - - - Manifest-JAD Attributes - - AttributeMain-Class - ValueAuto-Generated - - - - - MWJava_MRJAppBuilder_outFileMRJApplication - MWJava_MRJAppBuilder_mergefalse - MWJava_MRJAppBuilder_quitMenutrue - MWJava_MRJAppBuilder_growfalse - MWJava_MRJAppBuilder_stdoutTypeConsole - MWJava_MRJAppBuilder_stderrTypeConsole - MWJava_MRJAppBuilder_stdinTypeConsole - MWJava_MRJAppBuilder_appIconPVersion0 - MWJava_MRJAppBuilder_appIconPType0 - MWJava_MRJAppBuilder_appIconPFormat0 - MWJava_MRJAppBuilder_appIconPTree - MWJava_MRJAppBuilder_appIconFile - MWJava_MRJAppBuilder_splashScreenPVersion0 - MWJava_MRJAppBuilder_splashScreenPType0 - MWJava_MRJAppBuilder_splashScreenPFormat0 - MWJava_MRJAppBuilder_splashScreenPTree - MWJava_MRJAppBuilder_splashScreenPICTFile - MWJava_MRJAppBuilder_aboutName - MWJava_MRJAppBuilder_stdoutPVersion0 - MWJava_MRJAppBuilder_stdoutPType0 - MWJava_MRJAppBuilder_stdoutPFormat0 - MWJava_MRJAppBuilder_stdoutPTree - MWJava_MRJAppBuilder_stdoutFile - MWJava_MRJAppBuilder_stdoutAppendfalse - MWJava_MRJAppBuilder_stderrPType0 - MWJava_MRJAppBuilder_stderrPFormat0 - MWJava_MRJAppBuilder_stderrPTree - MWJava_MRJAppBuilder_stderrFile - MWJava_MRJAppBuilder_stderrAppendfalse - MWJava_MRJAppBuilder_stdinPType0 - MWJava_MRJAppBuilder_stdinPFormat0 - MWJava_MRJAppBuilder_stdinPTree - MWJava_MRJAppBuilder_stdinFile - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype1514754080 - MWJava_Output_fcreator1297570384 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - MWJava_Output_preverify0 - MWJava_Output_genJad0 - MWJava_Output_obfuscate0 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_simulator0 - MWJava_Proj_useVM\000\000mrj225 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Deprecated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_fcreator1229278547 - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - Definesismac,isMacRCC - Compatiblefalse - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentMC68K - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeExecutable - MWProject_MacOSX_outfile - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetypeMEXE - MWProject_MacOSX_vmaddress4096 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilea.out - MWProject_PPC_filecreator???? - MWProject_PPC_filetypeAPPL - MWProject_PPC_size384 - MWProject_PPC_minsize384 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWinRC_prefixname - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSectHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showDatatrue - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showRawfalse - PDisasmX86_showAllRawfalse - PDisasmX86_showSourcefalse - PDisasmX86_showRelocationtrue - PDisasmX86_showHextrue - PDisasmX86_showCommentsfalse - PDisasmX86_showSymDefstrue - PDisasmX86_unmangletrue - PDisasmX86_verbosetrue - PDisasmX86_resolveRelocstrue - PDisasmX86_resolveLocalsfalse - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - GlobalOptimizer_X86_optimizationlevelLevel0 - GlobalOptimizer_X86_optforSpeed - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - - - - - CARBON - - - CARBON Debug - - - PPC - - - PPC Debug - - - - - PPC Debug - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path::::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnamePPC Debug - OutputDirectory - Path::::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.bh - CompilerBalloon Help - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cxx - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.p - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pas - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ppu - CompilerMW Pascal PPC - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.s - CompilerPPCAsm - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamestc_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÿÄ@¨à˜"¨T - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - MWVJavaDebugging_UseRemoteLaunchAgentfalse - MWVJavaDebugging_LaunchVMasServerfalse - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - MWJava_Language_enableAssertsfalse - MWJava_Language_targetVM1.1 - - - Manifest-JAD Attributes - - AttributeMain-Class - ValueAuto-Generated - - - - - MWJava_MRJAppBuilder_outFileMRJApplication - MWJava_MRJAppBuilder_mergefalse - MWJava_MRJAppBuilder_quitMenutrue - MWJava_MRJAppBuilder_growfalse - MWJava_MRJAppBuilder_stdoutTypeConsole - MWJava_MRJAppBuilder_stderrTypeConsole - MWJava_MRJAppBuilder_stdinTypeConsole - MWJava_MRJAppBuilder_appIconPVersion0 - MWJava_MRJAppBuilder_appIconPType0 - MWJava_MRJAppBuilder_appIconPFormat0 - MWJava_MRJAppBuilder_appIconPTree - MWJava_MRJAppBuilder_appIconFile - MWJava_MRJAppBuilder_splashScreenPVersion0 - MWJava_MRJAppBuilder_splashScreenPType0 - MWJava_MRJAppBuilder_splashScreenPFormat0 - MWJava_MRJAppBuilder_splashScreenPTree - MWJava_MRJAppBuilder_splashScreenPICTFile - MWJava_MRJAppBuilder_aboutName - MWJava_MRJAppBuilder_stdoutPVersion0 - MWJava_MRJAppBuilder_stdoutPType0 - MWJava_MRJAppBuilder_stdoutPFormat0 - MWJava_MRJAppBuilder_stdoutPTree - MWJava_MRJAppBuilder_stdoutFile - MWJava_MRJAppBuilder_stdoutAppendfalse - MWJava_MRJAppBuilder_stderrPType0 - MWJava_MRJAppBuilder_stderrPFormat0 - MWJava_MRJAppBuilder_stderrPTree - MWJava_MRJAppBuilder_stderrFile - MWJava_MRJAppBuilder_stderrAppendfalse - MWJava_MRJAppBuilder_stdinPType0 - MWJava_MRJAppBuilder_stdinPFormat0 - MWJava_MRJAppBuilder_stdinPTree - MWJava_MRJAppBuilder_stdinFile - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype1514754080 - MWJava_Output_fcreator1297570384 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - MWJava_Output_preverify0 - MWJava_Output_genJad0 - MWJava_Output_obfuscate0 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_simulator0 - MWJava_Proj_useVM\000\000mrj225 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Deprecated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_fcreator1229278547 - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - Definesismac,isMacRCC - Compatiblefalse - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilewxstc_PPC_d.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfilewxstc_PPC_d.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWinRC_prefixname - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSectHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showDatatrue - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showRawfalse - PDisasmX86_showAllRawfalse - PDisasmX86_showSourcefalse - PDisasmX86_showRelocationtrue - PDisasmX86_showHextrue - PDisasmX86_showCommentsfalse - PDisasmX86_showSymDefstrue - PDisasmX86_unmanglefalse - PDisasmX86_verbosefalse - PDisasmX86_resolveRelocstrue - PDisasmX86_resolveLocalsfalse - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - GlobalOptimizer_X86_optimizationlevelLevel0 - GlobalOptimizer_X86_optforSpeed - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - PlatWX.cpp - MacOS - Text - Debug - - - Name - ScintillaWX.cpp - MacOS - Text - Debug - - - Name - stc.cpp - MacOS - Text - Debug - - - Name - AutoComplete.cxx - MacOS - Text - Debug - - - Name - CallTip.cxx - MacOS - Text - Debug - - - Name - CellBuffer.cxx - MacOS - Text - Debug - - - Name - ContractionState.cxx - MacOS - Text - Debug - - - Name - Document.cxx - MacOS - Text - Debug - - - Name - DocumentAccessor.cxx - MacOS - Text - Debug - - - Name - Editor.cxx - MacOS - Text - Debug - - - Name - Indicator.cxx - MacOS - Text - Debug - - - Name - KeyMap.cxx - MacOS - Text - Debug - - - Name - KeyWords.cxx - MacOS - Text - Debug - - - Name - LexAda.cxx - MacOS - Text - Debug - - - Name - LexAVE.cxx - MacOS - Text - Debug - - - Name - LexBaan.cxx - MacOS - Text - Debug - - - Name - LexBullant.cxx - MacOS - Text - Debug - - - Name - LexConf.cxx - MacOS - Text - Debug - - - Name - LexCPP.cxx - MacOS - Text - Debug - - - Name - LexCrontab.cxx - MacOS - Text - Debug - - - Name - LexEiffel.cxx - MacOS - Text - Debug - - - Name - LexHTML.cxx - MacOS - Text - Debug - - - Name - LexLisp.cxx - MacOS - Text - Debug - - - Name - LexLua.cxx - MacOS - Text - Debug - - - Name - LexMatlab.cxx - MacOS - Text - Debug - - - Name - LexOthers.cxx - MacOS - Text - Debug - - - Name - LexPascal.cxx - MacOS - Text - Debug - - - Name - LexPerl.cxx - MacOS - Text - Debug - - - Name - LexPython.cxx - MacOS - Text - Debug - - - Name - LexRuby.cxx - MacOS - Text - Debug - - - Name - LexSQL.cxx - MacOS - Text - Debug - - - Name - LexVB.cxx - MacOS - Text - Debug - - - Name - LineMarker.cxx - MacOS - Text - Debug - - - Name - PropSet.cxx - MacOS - Text - Debug - - - Name - RESearch.cxx - MacOS - Text - Debug - - - Name - ScintillaBase.cxx - MacOS - Text - Debug - - - Name - Style.cxx - MacOS - Text - Debug - - - Name - StyleContext.cxx - MacOS - Text - Debug - - - Name - UniConversion.cxx - MacOS - Text - Debug - - - Name - ViewStyle.cxx - MacOS - Text - Debug - - - Name - WindowAccessor.cxx - MacOS - Text - Debug - - - - - Name - PlatWX.cpp - MacOS - - - Name - ScintillaWX.cpp - MacOS - - - Name - stc.cpp - MacOS - - - Name - AutoComplete.cxx - MacOS - - - Name - CallTip.cxx - MacOS - - - Name - CellBuffer.cxx - MacOS - - - Name - ContractionState.cxx - MacOS - - - Name - Document.cxx - MacOS - - - Name - DocumentAccessor.cxx - MacOS - - - Name - Editor.cxx - MacOS - - - Name - Indicator.cxx - MacOS - - - Name - KeyMap.cxx - MacOS - - - Name - KeyWords.cxx - MacOS - - - Name - LexAda.cxx - MacOS - - - Name - LexAVE.cxx - MacOS - - - Name - LexBaan.cxx - MacOS - - - Name - LexBullant.cxx - MacOS - - - Name - LexConf.cxx - MacOS - - - Name - LexCPP.cxx - MacOS - - - Name - LexCrontab.cxx - MacOS - - - Name - LexEiffel.cxx - MacOS - - - Name - LexHTML.cxx - MacOS - - - Name - LexLisp.cxx - MacOS - - - Name - LexLua.cxx - MacOS - - - Name - LexMatlab.cxx - MacOS - - - Name - LexOthers.cxx - MacOS - - - Name - LexPascal.cxx - MacOS - - - Name - LexPerl.cxx - MacOS - - - Name - LexPython.cxx - MacOS - - - Name - LexRuby.cxx - MacOS - - - Name - LexSQL.cxx - MacOS - - - Name - LexVB.cxx - MacOS - - - Name - LineMarker.cxx - MacOS - - - Name - PropSet.cxx - MacOS - - - Name - RESearch.cxx - MacOS - - - Name - ScintillaBase.cxx - MacOS - - - Name - Style.cxx - MacOS - - - Name - StyleContext.cxx - MacOS - - - Name - UniConversion.cxx - MacOS - - - Name - ViewStyle.cxx - MacOS - - - Name - WindowAccessor.cxx - MacOS - - - - - CARBON - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path::::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameCARBON - OutputDirectory - Path::::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.bh - CompilerBalloon Help - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cxx - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.p - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pas - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ppu - CompilerMW Pascal PPC - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.s - CompilerPPCAsm - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamestc_cwc.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÿÄ@¨à˜"¨T - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - MWVJavaDebugging_UseRemoteLaunchAgentfalse - MWVJavaDebugging_LaunchVMasServerfalse - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - MWJava_Language_enableAssertsfalse - MWJava_Language_targetVM1.1 - - - Manifest-JAD Attributes - - AttributeMain-Class - ValueAuto-Generated - - - - - MWJava_MRJAppBuilder_outFileMRJApplication - MWJava_MRJAppBuilder_mergefalse - MWJava_MRJAppBuilder_quitMenutrue - MWJava_MRJAppBuilder_growfalse - MWJava_MRJAppBuilder_stdoutTypeConsole - MWJava_MRJAppBuilder_stderrTypeConsole - MWJava_MRJAppBuilder_stdinTypeConsole - MWJava_MRJAppBuilder_appIconPVersion0 - MWJava_MRJAppBuilder_appIconPType0 - MWJava_MRJAppBuilder_appIconPFormat0 - MWJava_MRJAppBuilder_appIconPTree - MWJava_MRJAppBuilder_appIconFile - MWJava_MRJAppBuilder_splashScreenPVersion0 - MWJava_MRJAppBuilder_splashScreenPType0 - MWJava_MRJAppBuilder_splashScreenPFormat0 - MWJava_MRJAppBuilder_splashScreenPTree - MWJava_MRJAppBuilder_splashScreenPICTFile - MWJava_MRJAppBuilder_aboutName - MWJava_MRJAppBuilder_stdoutPVersion0 - MWJava_MRJAppBuilder_stdoutPType0 - MWJava_MRJAppBuilder_stdoutPFormat0 - MWJava_MRJAppBuilder_stdoutPTree - MWJava_MRJAppBuilder_stdoutFile - MWJava_MRJAppBuilder_stdoutAppendfalse - MWJava_MRJAppBuilder_stderrPType0 - MWJava_MRJAppBuilder_stderrPFormat0 - MWJava_MRJAppBuilder_stderrPTree - MWJava_MRJAppBuilder_stderrFile - MWJava_MRJAppBuilder_stderrAppendfalse - MWJava_MRJAppBuilder_stdinPType0 - MWJava_MRJAppBuilder_stdinPFormat0 - MWJava_MRJAppBuilder_stdinPTree - MWJava_MRJAppBuilder_stdinFile - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype1514754080 - MWJava_Output_fcreator1297570384 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - MWJava_Output_preverify0 - MWJava_Output_genJad0 - MWJava_Output_obfuscate0 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_simulator0 - MWJava_Proj_useVM\000\000mrj225 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Deprecated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_fcreator1229278547 - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - Definesismac,isMacRCC - Compatiblefalse - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilewxxrc_CARBON.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfilewxstc_CARBON.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWinRC_prefixname - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSectHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showDatatrue - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showRawfalse - PDisasmX86_showAllRawfalse - PDisasmX86_showSourcefalse - PDisasmX86_showRelocationtrue - PDisasmX86_showHextrue - PDisasmX86_showCommentsfalse - PDisasmX86_showSymDefstrue - PDisasmX86_unmanglefalse - PDisasmX86_verbosefalse - PDisasmX86_resolveRelocstrue - PDisasmX86_resolveLocalsfalse - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - GlobalOptimizer_X86_optimizationlevelLevel0 - GlobalOptimizer_X86_optforSpeed - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - PlatWX.cpp - MacOS - Text - Debug - - - Name - ScintillaWX.cpp - MacOS - Text - Debug - - - Name - stc.cpp - MacOS - Text - Debug - - - Name - AutoComplete.cxx - MacOS - Text - Debug - - - Name - CallTip.cxx - MacOS - Text - Debug - - - Name - CellBuffer.cxx - MacOS - Text - Debug - - - Name - ContractionState.cxx - MacOS - Text - Debug - - - Name - Document.cxx - MacOS - Text - Debug - - - Name - DocumentAccessor.cxx - MacOS - Text - Debug - - - Name - Editor.cxx - MacOS - Text - Debug - - - Name - Indicator.cxx - MacOS - Text - Debug - - - Name - KeyMap.cxx - MacOS - Text - Debug - - - Name - KeyWords.cxx - MacOS - Text - Debug - - - Name - LexAda.cxx - MacOS - Text - Debug - - - Name - LexAVE.cxx - MacOS - Text - Debug - - - Name - LexBaan.cxx - MacOS - Text - Debug - - - Name - LexBullant.cxx - MacOS - Text - Debug - - - Name - LexConf.cxx - MacOS - Text - Debug - - - Name - LexCPP.cxx - MacOS - Text - Debug - - - Name - LexCrontab.cxx - MacOS - Text - Debug - - - Name - LexEiffel.cxx - MacOS - Text - Debug - - - Name - LexHTML.cxx - MacOS - Text - Debug - - - Name - LexLisp.cxx - MacOS - Text - Debug - - - Name - LexLua.cxx - MacOS - Text - Debug - - - Name - LexMatlab.cxx - MacOS - Text - Debug - - - Name - LexOthers.cxx - MacOS - Text - Debug - - - Name - LexPascal.cxx - MacOS - Text - Debug - - - Name - LexPerl.cxx - MacOS - Text - Debug - - - Name - LexPython.cxx - MacOS - Text - Debug - - - Name - LexRuby.cxx - MacOS - Text - Debug - - - Name - LexSQL.cxx - MacOS - Text - Debug - - - Name - LexVB.cxx - MacOS - Text - Debug - - - Name - LineMarker.cxx - MacOS - Text - Debug - - - Name - PropSet.cxx - MacOS - Text - Debug - - - Name - RESearch.cxx - MacOS - Text - Debug - - - Name - ScintillaBase.cxx - MacOS - Text - Debug - - - Name - Style.cxx - MacOS - Text - Debug - - - Name - StyleContext.cxx - MacOS - Text - Debug - - - Name - UniConversion.cxx - MacOS - Text - Debug - - - Name - ViewStyle.cxx - MacOS - Text - Debug - - - Name - WindowAccessor.cxx - MacOS - Text - Debug - - - - - Name - PlatWX.cpp - MacOS - - - Name - ScintillaWX.cpp - MacOS - - - Name - stc.cpp - MacOS - - - Name - AutoComplete.cxx - MacOS - - - Name - CallTip.cxx - MacOS - - - Name - CellBuffer.cxx - MacOS - - - Name - ContractionState.cxx - MacOS - - - Name - Document.cxx - MacOS - - - Name - DocumentAccessor.cxx - MacOS - - - Name - Editor.cxx - MacOS - - - Name - Indicator.cxx - MacOS - - - Name - KeyMap.cxx - MacOS - - - Name - KeyWords.cxx - MacOS - - - Name - LexAda.cxx - MacOS - - - Name - LexAVE.cxx - MacOS - - - Name - LexBaan.cxx - MacOS - - - Name - LexBullant.cxx - MacOS - - - Name - LexConf.cxx - MacOS - - - Name - LexCPP.cxx - MacOS - - - Name - LexCrontab.cxx - MacOS - - - Name - LexEiffel.cxx - MacOS - - - Name - LexHTML.cxx - MacOS - - - Name - LexLisp.cxx - MacOS - - - Name - LexLua.cxx - MacOS - - - Name - LexMatlab.cxx - MacOS - - - Name - LexOthers.cxx - MacOS - - - Name - LexPascal.cxx - MacOS - - - Name - LexPerl.cxx - MacOS - - - Name - LexPython.cxx - MacOS - - - Name - LexRuby.cxx - MacOS - - - Name - LexSQL.cxx - MacOS - - - Name - LexVB.cxx - MacOS - - - Name - LineMarker.cxx - MacOS - - - Name - PropSet.cxx - MacOS - - - Name - RESearch.cxx - MacOS - - - Name - ScintillaBase.cxx - MacOS - - - Name - Style.cxx - MacOS - - - Name - StyleContext.cxx - MacOS - - - Name - UniConversion.cxx - MacOS - - - Name - ViewStyle.cxx - MacOS - - - Name - WindowAccessor.cxx - MacOS - - - - - CARBON Debug - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path::::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameCARBON Debug - OutputDirectory - Path::::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.bh - CompilerBalloon Help - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cxx - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.p - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pas - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ppu - CompilerMW Pascal PPC - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.s - CompilerPPCAsm - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixnamestc_cwc_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWFTP_Post_hostName - MWFTP_Post_username - MWFTP_Post_password0ÿÄ@¨à˜"¨T - MWFTP_Post_remoteDir - MWFTP_Post_ftp_PathVersion1 - MWFTP_Post_ftp_PathType0 - MWFTP_Post_ftp_PathFormat0 - MWFTP_Post_ftp_tree - MWFTP_Post_uploadDir - MWFTP_Post_ftp_port21 - MWFTP_Post_SendBin1 - MWFTP_Post_ShouldLog1 - - - MWCommandLine_Java_clsName - MWCommandLine_Java_args - - - MWVJavaDebugging_Protocol1 - MWVJavaDebugging_JDKVersion1 - MWVJavaDebugging_TimeOut25 - MWVJavaDebugging_SupportSlowDevicesfalse - MWVJavaDebugging_UseRemoteLaunchAgentfalse - MWVJavaDebugging_LaunchVMasServerfalse - - - MWJava_Language_optimizefalse - MWJava_Language_warnDeprecatedfalse - MWJava_Language_emitMapfalse - MWJava_Language_strictFileNamesfalse - MWJava_Language_strictFileHierarchyfalse - MWJava_Language_1_1_Compatiblefalse - MWJava_Language_emitHeaders0 - MWJava_Language_headerTypeJNINativeHeaders - MWJava_Language_packageFilter - MWJava_Language_genCommentstrue - MWJava_Language_genHeadersfalse - MWJava_Language_enableAssertsfalse - MWJava_Language_targetVM1.1 - - - Manifest-JAD Attributes - - AttributeMain-Class - ValueAuto-Generated - - - - - MWJava_MRJAppBuilder_outFileMRJApplication - MWJava_MRJAppBuilder_mergefalse - MWJava_MRJAppBuilder_quitMenutrue - MWJava_MRJAppBuilder_growfalse - MWJava_MRJAppBuilder_stdoutTypeConsole - MWJava_MRJAppBuilder_stderrTypeConsole - MWJava_MRJAppBuilder_stdinTypeConsole - MWJava_MRJAppBuilder_appIconPVersion0 - MWJava_MRJAppBuilder_appIconPType0 - MWJava_MRJAppBuilder_appIconPFormat0 - MWJava_MRJAppBuilder_appIconPTree - MWJava_MRJAppBuilder_appIconFile - MWJava_MRJAppBuilder_splashScreenPVersion0 - MWJava_MRJAppBuilder_splashScreenPType0 - MWJava_MRJAppBuilder_splashScreenPFormat0 - MWJava_MRJAppBuilder_splashScreenPTree - MWJava_MRJAppBuilder_splashScreenPICTFile - MWJava_MRJAppBuilder_aboutName - MWJava_MRJAppBuilder_stdoutPVersion0 - MWJava_MRJAppBuilder_stdoutPType0 - MWJava_MRJAppBuilder_stdoutPFormat0 - MWJava_MRJAppBuilder_stdoutPTree - MWJava_MRJAppBuilder_stdoutFile - MWJava_MRJAppBuilder_stdoutAppendfalse - MWJava_MRJAppBuilder_stderrPType0 - MWJava_MRJAppBuilder_stderrPFormat0 - MWJava_MRJAppBuilder_stderrPTree - MWJava_MRJAppBuilder_stderrFile - MWJava_MRJAppBuilder_stderrAppendfalse - MWJava_MRJAppBuilder_stdinPType0 - MWJava_MRJAppBuilder_stdinPFormat0 - MWJava_MRJAppBuilder_stdinPTree - MWJava_MRJAppBuilder_stdinFile - - - MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar - MWJava_Output_ftype1514754080 - MWJava_Output_fcreator1297570384 - MWJava_Output_compress0 - MWJava_Output_genManifest0 - MWJava_Output_trunctypeFront - MWJava_Output_deleteClasses0 - MWJava_Output_consoleApp1 - MWJava_Output_preverify0 - MWJava_Output_genJad0 - MWJava_Output_obfuscate0 - - - MWJava_Proj_projtypeApplet - MWJava_Proj_mainClassName - MWJava_Proj_HTMLAppCreator1145457748 - MWJava_Proj_HTMLAppNameMetrowerks Java - MWJava_Proj_PathVersion1 - MWJava_Proj_PathType0 - MWJava_Proj_PathFormat0 - MWJava_Proj_tree - MWJava_Proj_HTMLAppWin32NameInternet Explorer - MWJava_Proj_compress0 - MWJava_Proj_simulator0 - MWJava_Proj_useVM\000\000mrj225 - MWJava_Proj_vmarguments - MWJava_Proj_vmName - MWJava_Proj_simPropFile - - - MWJavaDoc_Proj_Version1 - MWJavaDoc_Proj_Deprecated1 - MWJavaDoc_Proj_Author1 - MWJavaDoc_Proj_Index1 - MWJavaDoc_Proj_Tree1 - MWJavaDoc_Proj_SunResolveToSame0 - MWJavaDoc_Proj_Shortnames1 - MWJavaDoc_Proj_Folder0 - MWJavaDoc_Proj_GenerateAPILinks0 - MWJavaDoc_Proj_scopePublic - MWJavaDoc_Proj_fcreator1229278547 - MWJavaDoc_Proj_encodingName - MWJavaDoc_Proj_decodingName - MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - Definesismac,isMacRCC - Compatiblefalse - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilewxstc_CARBON_d.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfilewxstc_CARBON_d.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWWinRC_prefixname - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - PDisasmX86_showHeaderstrue - PDisasmX86_showSectHeaderstrue - PDisasmX86_showSymTabtrue - PDisasmX86_showCodetrue - PDisasmX86_showDatatrue - PDisasmX86_showDebugfalse - PDisasmX86_showExceptionsfalse - PDisasmX86_showRawfalse - PDisasmX86_showAllRawfalse - PDisasmX86_showSourcefalse - PDisasmX86_showRelocationtrue - PDisasmX86_showHextrue - PDisasmX86_showCommentsfalse - PDisasmX86_showSymDefstrue - PDisasmX86_unmanglefalse - PDisasmX86_verbosefalse - PDisasmX86_resolveRelocstrue - PDisasmX86_resolveLocalsfalse - - - MWDebugger_X86_Exceptions - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - GlobalOptimizer_X86_optimizationlevelLevel0 - GlobalOptimizer_X86_optforSpeed - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - PlatWX.cpp - MacOS - Text - Debug - - - Name - ScintillaWX.cpp - MacOS - Text - Debug - - - Name - stc.cpp - MacOS - Text - Debug - - - Name - AutoComplete.cxx - MacOS - Text - Debug - - - Name - CallTip.cxx - MacOS - Text - Debug - - - Name - CellBuffer.cxx - MacOS - Text - Debug - - - Name - ContractionState.cxx - MacOS - Text - Debug - - - Name - Document.cxx - MacOS - Text - Debug - - - Name - DocumentAccessor.cxx - MacOS - Text - Debug - - - Name - Editor.cxx - MacOS - Text - Debug - - - Name - Indicator.cxx - MacOS - Text - Debug - - - Name - KeyMap.cxx - MacOS - Text - Debug - - - Name - KeyWords.cxx - MacOS - Text - Debug - - - Name - LexAda.cxx - MacOS - Text - Debug - - - Name - LexAVE.cxx - MacOS - Text - Debug - - - Name - LexBaan.cxx - MacOS - Text - Debug - - - Name - LexBullant.cxx - MacOS - Text - Debug - - - Name - LexConf.cxx - MacOS - Text - Debug - - - Name - LexCPP.cxx - MacOS - Text - Debug - - - Name - LexCrontab.cxx - MacOS - Text - Debug - - - Name - LexEiffel.cxx - MacOS - Text - Debug - - - Name - LexLisp.cxx - MacOS - Text - Debug - - - Name - LexHTML.cxx - MacOS - Text - Debug - - - Name - LexLua.cxx - MacOS - Text - Debug - - - Name - LexMatlab.cxx - MacOS - Text - Debug - - - Name - LexOthers.cxx - MacOS - Text - Debug - - - Name - LexPascal.cxx - MacOS - Text - Debug - - - Name - LexPerl.cxx - MacOS - Text - Debug - - - Name - LexPython.cxx - MacOS - Text - Debug - - - Name - LexRuby.cxx - MacOS - Text - Debug - - - Name - LexSQL.cxx - MacOS - Text - Debug - - - Name - LexVB.cxx - MacOS - Text - Debug - - - Name - LineMarker.cxx - MacOS - Text - Debug - - - Name - PropSet.cxx - MacOS - Text - Debug - - - Name - RESearch.cxx - MacOS - Text - Debug - - - Name - ScintillaBase.cxx - MacOS - Text - Debug - - - Name - Style.cxx - MacOS - Text - Debug - - - Name - StyleContext.cxx - MacOS - Text - Debug - - - Name - UniConversion.cxx - MacOS - Text - Debug - - - Name - ViewStyle.cxx - MacOS - Text - Debug - - - Name - WindowAccessor.cxx - MacOS - Text - Debug - - - - - Name - PlatWX.cpp - MacOS - - - Name - ScintillaWX.cpp - MacOS - - - Name - stc.cpp - MacOS - - - Name - AutoComplete.cxx - MacOS - - - Name - CallTip.cxx - MacOS - - - Name - CellBuffer.cxx - MacOS - - - Name - ContractionState.cxx - MacOS - - - Name - Document.cxx - MacOS - - - Name - DocumentAccessor.cxx - MacOS - - - Name - Editor.cxx - MacOS - - - Name - Indicator.cxx - MacOS - - - Name - KeyMap.cxx - MacOS - - - Name - KeyWords.cxx - MacOS - - - Name - LexAda.cxx - MacOS - - - Name - LexAVE.cxx - MacOS - - - Name - LexBaan.cxx - MacOS - - - Name - LexBullant.cxx - MacOS - - - Name - LexConf.cxx - MacOS - - - Name - LexCPP.cxx - MacOS - - - Name - LexCrontab.cxx - MacOS - - - Name - LexEiffel.cxx - MacOS - - - Name - LexLisp.cxx - MacOS - - - Name - LexHTML.cxx - MacOS - - - Name - LexLua.cxx - MacOS - - - Name - LexMatlab.cxx - MacOS - - - Name - LexOthers.cxx - MacOS - - - Name - LexPascal.cxx - MacOS - - - Name - LexPerl.cxx - MacOS - - - Name - LexPython.cxx - MacOS - - - Name - LexRuby.cxx - MacOS - - - Name - LexSQL.cxx - MacOS - - - Name - LexVB.cxx - MacOS - - - Name - LineMarker.cxx - MacOS - - - Name - PropSet.cxx - MacOS - - - Name - RESearch.cxx - MacOS - - - Name - ScintillaBase.cxx - MacOS - - - Name - Style.cxx - MacOS - - - Name - StyleContext.cxx - MacOS - - - Name - UniConversion.cxx - MacOS - - - Name - ViewStyle.cxx - MacOS - - - Name - WindowAccessor.cxx - MacOS - - - - - - - PPC - PPC Debug - CARBON - CARBON Debug - All - - - - - PPC - Name - PlatWX.cpp - MacOS - - - PPC - Name - ScintillaWX.cpp - MacOS - - - PPC - Name - stc.cpp - MacOS - - scintilla - src - - PPC - Name - AutoComplete.cxx - MacOS - - - PPC - Name - CallTip.cxx - MacOS - - - PPC - Name - CellBuffer.cxx - MacOS - - - PPC - Name - ContractionState.cxx - MacOS - - - PPC - Name - Document.cxx - MacOS - - - PPC - Name - DocumentAccessor.cxx - MacOS - - - PPC - Name - Editor.cxx - MacOS - - - PPC - Name - Indicator.cxx - MacOS - - - PPC - Name - KeyMap.cxx - MacOS - - - PPC - Name - KeyWords.cxx - MacOS - - - PPC - Name - LexAda.cxx - MacOS - - - PPC - Name - LexAVE.cxx - MacOS - - - PPC - Name - LexBaan.cxx - MacOS - - - PPC - Name - LexBullant.cxx - MacOS - - - PPC - Name - LexConf.cxx - MacOS - - - PPC - Name - LexCPP.cxx - MacOS - - - PPC - Name - LexCrontab.cxx - MacOS - - - PPC - Name - LexEiffel.cxx - MacOS - - - PPC - Name - LexHTML.cxx - MacOS - - - PPC - Name - LexLisp.cxx - MacOS - - - PPC - Name - LexLua.cxx - MacOS - - - PPC - Name - LexMatlab.cxx - MacOS - - - PPC - Name - LexOthers.cxx - MacOS - - - PPC - Name - LexPascal.cxx - MacOS - - - PPC - Name - LexPerl.cxx - MacOS - - - PPC - Name - LexPython.cxx - MacOS - - - PPC - Name - LexRuby.cxx - MacOS - - - PPC - Name - LexSQL.cxx - MacOS - - - PPC - Name - LexVB.cxx - MacOS - - - PPC - Name - LineMarker.cxx - MacOS - - - PPC - Name - PropSet.cxx - MacOS - - - PPC - Name - RESearch.cxx - MacOS - - - PPC - Name - ScintillaBase.cxx - MacOS - - - PPC - Name - Style.cxx - MacOS - - - PPC - Name - StyleContext.cxx - MacOS - - - PPC - Name - UniConversion.cxx - MacOS - - - PPC - Name - ViewStyle.cxx - MacOS - - - PPC - Name - WindowAccessor.cxx - MacOS - - - - - - diff --git a/src/univ/button.cpp b/src/univ/button.cpp index b26b313082..7f4c253d14 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -125,7 +125,7 @@ bool wxButton::Create(wxWindow *parent, SetLabel(label); - if (bitmap.Ok()) + if (bitmap.IsOk()) SetBitmap(bitmap); // SetInitialSize called by SetBitmap() else SetInitialSize(size); @@ -170,7 +170,7 @@ wxSize wxButton::DoGetBestClientSize() const wxCoord width, height; dc.GetMultiLineTextExtent(GetLabel(), &width, &height); - if ( m_bitmap.Ok() ) + if ( m_bitmap.IsOk() ) { // allocate extra space for the bitmap wxCoord heightBmp = m_bitmap.GetHeight() + 2*m_marginBmpY; @@ -221,7 +221,7 @@ bool wxButton::DoDrawBackground(wxDC& dc) rect.width = size.x; rect.height = size.y; - if ( GetBackgroundBitmap().Ok() ) + if ( GetBackgroundBitmap().IsOk() ) { // get the bitmap and the flags int alignment; diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp index d07f1ad561..2c070024f6 100644 --- a/src/univ/checkbox.cpp +++ b/src/univ/checkbox.cpp @@ -116,7 +116,7 @@ void wxCheckBox::OnCheck() wxBitmap wxCheckBox::GetBitmap(State state, Status status) const { wxBitmap bmp = m_bitmaps[state][status]; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) bmp = m_bitmaps[State_Normal][status]; return bmp; @@ -178,7 +178,7 @@ void wxCheckBox::DoDraw(wxControlRenderer *renderer) wxSize wxCheckBox::GetBitmapSize() const { wxBitmap bmp = GetBitmap(State_Normal, Status_Checked); - return bmp.Ok() ? wxSize(bmp.GetWidth(), bmp.GetHeight()) + return bmp.IsOk() ? wxSize(bmp.GetWidth(), bmp.GetHeight()) : GetRenderer()->GetCheckBitmapSize(); } diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index 95df6afad4..0cfcbcdd71 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -273,12 +273,13 @@ wxComboBox::~wxComboBox() wxString wxComboBox::DoGetValue() const { - return wxComboCtrl::GetValue(); + return GetTextCtrl() ? GetTextCtrl()->GetValue() : wxString(); } void wxComboBox::SetValue(const wxString& value) { - wxComboCtrl::SetValue(value); + if ( GetTextCtrl() ) + GetTextCtrl()->SetValue(value); } void wxComboBox::WriteText(const wxString& value) diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp index 1a55bb9576..27d9b1e809 100644 --- a/src/univ/ctrlrend.cpp +++ b/src/univ/ctrlrend.cpp @@ -95,10 +95,10 @@ void wxControlRenderer::DrawButtonLabel(const wxBitmap& bitmap, m_dc.SetTextForeground(m_window->GetForegroundColour()); wxString label = m_window->GetLabel(); - if ( !label.empty() || bitmap.Ok() ) + if ( !label.empty() || bitmap.IsOk() ) { wxRect rectLabel = m_rect; - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { rectLabel.Inflate(-marginX, -marginY); } @@ -158,7 +158,7 @@ void wxControlRenderer::DrawBitmap(wxDC &dc, { // we may change the bitmap if we stretch it wxBitmap bmp = bitmap; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) return; int width = bmp.GetWidth(), diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 0d08d019ce..01076f3e65 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -262,10 +262,6 @@ void wxFrame::DoSetClientSize(int width, int height) #if wxUSE_TOOLBAR if ( m_frameToolBar ) { -#if wxUSE_STATUSBAR - height += m_frameStatusBar->GetSize().y; -#endif // wxUSE_STATUSBAR - if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL ) width += m_frameToolBar->GetSize().x; else diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 5bc9e4ae72..15a7adb837 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -602,7 +602,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer) bmp = item->GetDisabledBitmap(); } - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { // strangely enough, for unchecked item we use the // "checked" bitmap because this is the default one - this diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp index cf209a4397..d047af7f97 100644 --- a/src/univ/radiobut.cpp +++ b/src/univ/radiobut.cpp @@ -148,7 +148,7 @@ void wxRadioButton::SendEvent() wxSize wxRadioButton::GetBitmapSize() const { wxBitmap bmp = GetBitmap(State_Normal, Status_Checked); - return bmp.Ok() ? wxSize(bmp.GetWidth(), bmp.GetHeight()) + return bmp.IsOk() ? wxSize(bmp.GetWidth(), bmp.GetHeight()) : GetRenderer()->GetRadioBitmapSize(); } diff --git a/src/univ/stdrend.cpp b/src/univ/stdrend.cpp index d9253ac5e3..64e7903504 100644 --- a/src/univ/stdrend.cpp +++ b/src/univ/stdrend.cpp @@ -169,7 +169,7 @@ void wxStdRenderer::DrawBackground(wxDC& dc, { wxColour colBg; - if (col.Ok()) + if (col.IsOk()) { colBg = col; } @@ -678,7 +678,7 @@ void wxStdRenderer::DrawCheckButton(wxDC& dc, wxAlignment align, int indexAccel) { - if (bitmap.Ok()) + if (bitmap.IsOk()) DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel); else DrawCheckOrRadioButton(dc, label, GetCheckBitmap(flags), rect, flags, align, indexAccel); @@ -692,7 +692,7 @@ void wxStdRenderer::DrawRadioButton(wxDC& dc, wxAlignment align, int indexAccel) { - if (bitmap.Ok()) + if (bitmap.IsOk()) DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel); else DrawCheckOrRadioButton(dc, label, GetRadioBitmap(flags), rect, flags, align, indexAccel); @@ -1148,7 +1148,7 @@ void wxStdRenderer::DrawFrameIcon(wxDC& dc, const wxIcon& icon, int flags) { - if ( icon.Ok() ) + if ( icon.IsOk() ) { wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR); dc.DrawIcon(icon, r.x, r.y); @@ -1174,7 +1174,7 @@ void wxStdRenderer::DrawFrameButton(wxDC& dc, } wxBitmap bmp = GetFrameButtonBitmap(idx); - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) return; wxRect rectBtn(x, y, FRAME_BUTTON_WIDTH, FRAME_BUTTON_HEIGHT); diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index 35d3924f79..2f383b594c 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -646,7 +646,7 @@ wxColour wxGTKColourScheme::GetBackground(wxWindow *win) const if ( !win->ShouldInheritColours() ) { // doesn't depend on the state - if ( !col.Ok() ) + if ( !col.IsOk() ) { col = Get(WINDOW); } @@ -657,7 +657,7 @@ wxColour wxGTKColourScheme::GetBackground(wxWindow *win) const // the colour set by the user should be used for the normal state // and for the states for which we don't have any specific colours - if ( !col.Ok() || (flags != 0) ) + if ( !col.IsOk() || (flags != 0) ) { #if wxUSE_SCROLLBAR if ( wxDynamicCast(win, wxScrollBar) ) @@ -1069,7 +1069,7 @@ void wxGTKRenderer::DrawDownZag(wxDC& dc, wxBitmap wxGTKRenderer::GetCheckBitmap(int flags) { - if ( !m_bitmapsCheckbox[0][0].Ok() ) + if ( !m_bitmapsCheckbox[0][0].IsOk() ) { // init the bitmaps once only wxRect rect; @@ -1126,7 +1126,7 @@ wxBitmap wxGTKRenderer::GetRadioBitmap(int flags) GetIndicatorsFromFlags(flags, state, status); wxBitmap& bmp = m_bitmapsRadiobtn[state][status]; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { const wxSize size = GetRadioBitmapSize(); @@ -1142,7 +1142,7 @@ wxBitmap wxGTKRenderer::GetRadioBitmap(int flags) wxBitmap wxGTKRenderer::GetLineWrapBitmap() const { - if ( !m_bmpLineWrap.Ok() ) + if ( !m_bmpLineWrap.IsOk() ) { // the line wrap bitmap as used by GTK+ #define line_wrap_width 6 @@ -1153,7 +1153,7 @@ wxBitmap wxGTKRenderer::GetLineWrapBitmap() const }; wxBitmap bmpLineWrap(line_wrap_bits, line_wrap_width, line_wrap_height); - if ( !bmpLineWrap.Ok() ) + if ( !bmpLineWrap.IsOk() ) { wxFAIL_MSG( wxT("Failed to create line wrap XBM") ); } @@ -1176,7 +1176,7 @@ void wxGTKRenderer::DrawToolBarButton(wxDC& dc, int tbarStyle) { // we don't draw the separators at all - if ( !label.empty() || bitmap.Ok() ) + if ( !label.empty() || bitmap.IsOk() ) { wxRect rect = rectOrig; rect.Deflate(BORDER_THICKNESS); @@ -1260,7 +1260,7 @@ void wxGTKRenderer::DrawLineWrapMark(wxDC& dc, const wxRect& rect) dc.DrawBitmap(bmpLineWrap, rect.x, rect.y + (rect.height - bmpLineWrap.GetHeight())/2); - if ( colFgOld.Ok() ) + if ( colFgOld.IsOk() ) { // restore old colour dc.SetTextForeground(colFgOld); @@ -1677,12 +1677,12 @@ void wxGTKRenderer::DoDrawMenuItem(wxDC& dc, if ( geometryInfo ) { wxBitmap bmp = bitmap; - if ( !bmp.Ok() && (flags & wxCONTROL_CHECKABLE) ) + if ( !bmp.IsOk() && (flags & wxCONTROL_CHECKABLE) ) { bmp = GetCheckBitmap(flags); } - if ( bmp.Ok() ) + if ( bmp.IsOk() ) { rect.SetRight(geometryInfo->GetLabelOffset()); wxControlRenderer::DrawBitmap(dc, bmp, rect); @@ -1796,7 +1796,7 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win, } const wxBitmap& bmp = item->GetBitmap(); - if ( bmp.Ok() ) + if ( bmp.IsOk() ) { wxCoord widthBmp = bmp.GetWidth(); if ( widthBmp > widthBmpMax ) @@ -1878,7 +1878,7 @@ void wxGTKRenderer::GetComboBitmaps(wxBitmap *bmpNormal, wxBitmap *bmpPressed, wxBitmap *bmpDisabled) { - if ( !m_bitmapsCombo[ComboState_Normal].Ok() ) + if ( !m_bitmapsCombo[ComboState_Normal].IsOk() ) { InitComboBitmaps(); } @@ -2097,7 +2097,7 @@ void wxGTKRenderer::DrawArrow(wxDC& dc, case wxUP: dc.DrawLine(ptArrow[Point_Second], ptArrow[Point_First]); dc.DrawPoint(ptArrow[Point_First]); - if ( penShadow[3].Ok() ) + if ( penShadow[3].IsOk() ) { dc.SetPen(penShadow[3]); dc.DrawLine(ptArrow[Point_First].x + 1, ptArrow[Point_First].y, @@ -2109,7 +2109,7 @@ void wxGTKRenderer::DrawArrow(wxDC& dc, dc.DrawPoint(ptArrow[Point_Third]); dc.DrawLine(ptArrow[Point_Third].x - 2, ptArrow[Point_Third].y, ptArrow[Point_First].x + 1, ptArrow[Point_First].y); - if ( penShadow[2].Ok() ) + if ( penShadow[2].IsOk() ) { dc.SetPen(penShadow[2]); dc.DrawLine(ptArrow[Point_Third].x - 1, ptArrow[Point_Third].y, @@ -2123,7 +2123,7 @@ void wxGTKRenderer::DrawArrow(wxDC& dc, dc.DrawLine(ptArrow[Point_First], ptArrow[Point_Second]); dc.DrawLine(ptArrow[Point_First].x + 2, ptArrow[Point_First].y, ptArrow[Point_Third].x - 1, ptArrow[Point_Third].y); - if ( penShadow[2].Ok() ) + if ( penShadow[2].IsOk() ) { dc.SetPen(penShadow[2]); dc.DrawLine(ptArrow[Point_Second].x, ptArrow[Point_Second].y - 1, @@ -2137,7 +2137,7 @@ void wxGTKRenderer::DrawArrow(wxDC& dc, case wxLEFT: dc.DrawLine(ptArrow[Point_Second], ptArrow[Point_First]); dc.DrawPoint(ptArrow[Point_First]); - if ( penShadow[2].Ok() ) + if ( penShadow[2].IsOk() ) { dc.SetPen(penShadow[2]); dc.DrawLine(ptArrow[Point_Third].x - 1, ptArrow[Point_Third].y, diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp index 13c5107e96..7719bfa186 100644 --- a/src/univ/themes/mono.cpp +++ b/src/univ/themes/mono.cpp @@ -585,7 +585,7 @@ wxColour wxMonoColourScheme::GetBackground(wxWindow *win) const } // doesn't depend on the state - if ( !col.Ok() ) + if ( !col.IsOk() ) { col = GetBg(); } @@ -770,7 +770,7 @@ wxBitmap wxMonoRenderer::GetIndicator(IndicatorType indType, int flags) GetIndicatorsFromFlags(flags, indState, indStatus); wxBitmap& bmp = m_bmpIndicators[indType][indState][indStatus]; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { const char **xpm = ms_xpmIndicators[indType][indState][indStatus]; if ( xpm ) @@ -787,7 +787,7 @@ wxBitmap wxMonoRenderer::GetFrameButtonBitmap(FrameButtonType type) { if ( type == FrameButton_Close ) { - if ( !m_bmpFrameClose.Ok() ) + if ( !m_bmpFrameClose.IsOk() ) { static const char *xpmFrameClose[] = { /* columns rows colors chars-per-pixel */ @@ -1045,7 +1045,7 @@ void wxMonoRenderer::DrawArrow(wxDC& dc, wxCHECK_RET( arrowDir != Arrow_Max, wxT("invalid arrow direction") ); wxBitmap& bmp = m_bmpArrows[arrowDir]; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { bmp = wxBitmap(ms_xpmArrows[arrowDir]); } diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index 37943fb3ef..0738111495 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -1253,7 +1253,7 @@ wxColour wxWin32ColourScheme::GetBackground(wxWindow *win) const col = Get(CONTROL); else { - if ( !col.Ok() ) + if ( !col.IsOk() ) { // doesn't depend on the state col = Get(WINDOW); @@ -1262,7 +1262,7 @@ wxColour wxWin32ColourScheme::GetBackground(wxWindow *win) const } #endif // wxUSE_TEXTCTRL - if (!col.Ok()) + if (!col.IsOk()) col = Get(CONTROL); // Most controls should be this colour, not WINDOW } else @@ -1271,7 +1271,7 @@ wxColour wxWin32ColourScheme::GetBackground(wxWindow *win) const // the colour set by the user should be used for the normal state // and for the states for which we don't have any specific colours - if ( !col.Ok() || (flags & wxCONTROL_PRESSED) != 0 ) + if ( !col.IsOk() || (flags & wxCONTROL_PRESSED) != 0 ) { #if wxUSE_SCROLLBAR if ( wxDynamicCast(win, wxScrollBar) ) @@ -1681,7 +1681,7 @@ void wxWin32Renderer::DrawCheckItemBitmap(wxDC& dc, int flags) { wxBitmap bmp; - if ( bitmap.Ok() ) + if ( bitmap.IsOk() ) { bmp = bitmap; } @@ -1691,7 +1691,7 @@ void wxWin32Renderer::DrawCheckItemBitmap(wxDC& dc, ? IndicatorStatus_Checked : IndicatorStatus_Unchecked; - if ( !m_bmpCheckBitmaps[i].Ok() ) + if ( !m_bmpCheckBitmaps[i].IsOk() ) { m_bmpCheckBitmaps[i] = wxBitmap(ms_xpmChecked[i]); } @@ -1714,7 +1714,7 @@ wxBitmap wxWin32Renderer::GetIndicator(IndicatorType indType, int flags) GetIndicatorsFromFlags(flags, indState, indStatus); wxBitmap& bmp = m_bmpIndicators[indType][indState][indStatus]; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { const char **xpm = ms_xpmIndicators[indType][indState][indStatus]; if ( xpm ) @@ -2442,12 +2442,12 @@ void wxWin32Renderer::DrawMenuItem(wxDC& dc, // draw the bitmap: use the bitmap provided or the standard checkmark for // the checkable items wxBitmap bmp = bitmap; - if ( !bmp.Ok() && (flags & wxCONTROL_CHECKED) ) + if ( !bmp.IsOk() && (flags & wxCONTROL_CHECKED) ) { bmp = GetIndicator(IndicatorType_Menu, flags); } - if ( bmp.Ok() ) + if ( bmp.IsOk() ) { rect.SetRight(geometryInfo.GetLabelOffset()); wxControlRenderer::DrawBitmap(dc, bmp, rect); @@ -2557,7 +2557,7 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win, } const wxBitmap& bmp = item->GetBitmap(); - if ( bmp.Ok() ) + if ( bmp.IsOk() ) { wxCoord widthBmp = bmp.GetWidth(); if ( widthBmp > widthBmpMax ) @@ -3205,7 +3205,7 @@ void wxWin32Renderer::AdjustSize(wxSize *size, const wxWindow *window) wxBitmap wxWin32Renderer::GetFrameButtonBitmap(FrameButtonType type) { wxBitmap& bmp = m_bmpFrameButtons[type]; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { bmp = wxBitmap(ms_xpmFrameButtons[type]); } diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp index 44c188fba3..da03781e9c 100644 --- a/src/univ/toolbar.cpp +++ b/src/univ/toolbar.cpp @@ -292,7 +292,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable) { #if wxUSE_IMAGE // created disabled-state bitmap on demand - if ( !enable && !tool->GetDisabledBitmap().Ok() ) + if ( !enable && !tool->GetDisabledBitmap().IsOk() ) { wxImage image(tool->GetNormalBitmap().ConvertToImage()); diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp index cc90efba41..06afa0f303 100644 --- a/src/univ/topluniv.cpp +++ b/src/univ/topluniv.cpp @@ -208,7 +208,7 @@ long wxTopLevelWindow::GetDecorationsStyle() const if ( IsMaximized() ) style |= wxTOPLEVEL_MAXIMIZED; - if ( GetIcon().Ok() ) + if ( GetIcon().IsOk() ) style |= wxTOPLEVEL_ICON; if ( m_isActive ) style |= wxTOPLEVEL_ACTIVE; @@ -329,13 +329,13 @@ void wxTopLevelWindow::SetIcons(const wxIconBundle& icons) wxSize size = m_renderer->GetFrameIconSize(); const wxIcon& icon = icons.GetIcon( size ); - if ( !icon.Ok() || size.x == wxDefaultCoord ) + if ( !icon.IsOk() || size.x == wxDefaultCoord ) m_titlebarIcon = icon; else { wxBitmap bmp1; bmp1.CopyFromIcon(icon); - if ( !bmp1.Ok() ) + if ( !bmp1.IsOk() ) m_titlebarIcon = wxNullIcon; else if ( bmp1.GetWidth() == size.x && bmp1.GetHeight() == size.y ) m_titlebarIcon = icon; diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 2cfba82d83..1e6ab4bb99 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -258,7 +258,7 @@ void wxWindow::SetBackground(const wxBitmap& bitmap, const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment, wxStretch *stretch) const { - if ( m_bitmapBg.Ok() ) + if ( m_bitmapBg.IsOk() ) { if ( alignment ) *alignment = m_alignBgBitmap; @@ -408,7 +408,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc) void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect) { - if ( GetBackgroundBitmap().Ok() ) + if ( GetBackgroundBitmap().IsOk() ) { // Get the bitmap and the flags int alignment; diff --git a/src/unix/fswatcher_kqueue.cpp b/src/unix/fswatcher_kqueue.cpp index 41ecbdede7..5229e5139b 100644 --- a/src/unix/fswatcher_kqueue.cpp +++ b/src/unix/fswatcher_kqueue.cpp @@ -314,17 +314,12 @@ protected: wxArrayInt::iterator changeType = changedFlags.begin(); for ( ; it != changedFiles.end(); ++it, ++changeType ) { - wxFileName path; - if ( wxDirExists(*it) ) - { - path = wxFileName::DirName( - basepath + wxFileName::GetPathSeparator() + *it - ); - } - else - { - path.Assign(basepath, *it); - } + const wxString fullpath = w.GetPath() + + wxFileName::GetPathSeparator() + + *it; + const wxFileName path(wxDirExists(fullpath) + ? wxFileName::DirName(fullpath) + : wxFileName::FileName(fullpath)); wxFileSystemWatcherEvent event(*changeType, path, path); SendEvent(event); diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index 0fbf87aa14..2703497bfa 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -38,7 +38,8 @@ #ifdef __WXGTK__ #include -# include // for GDK_WINDOW_XWINDOW + #include + #include "wx/gtk/private/gtk2-compat.h" #endif //----------------------------------------------------------------------------- @@ -262,7 +263,7 @@ static gboolean gtk_window_expose_callback(GtkWidget *widget, if(event->count > 0) return FALSE; - GdkWindow *window = widget->window; + GdkWindow* window = gtk_widget_get_window(widget); // I've seen this reccommended somewhere... // TODO: Is this needed? Maybe it is just cruft... @@ -305,7 +306,7 @@ static gint gtk_window_realize_callback(GtkWidget* widget, { gdk_flush(); - GdkWindow *window = widget->window; + GdkWindow* window = gtk_widget_get_window(widget); wxASSERT(window); gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay), @@ -698,7 +699,7 @@ void wxGStreamerMediaBackend::SetupXOverlay() { // Use the xoverlay extension to tell gstreamer to play in our window #ifdef __WXGTK__ - if(!GTK_WIDGET_REALIZED(m_ctrl->m_wxwindow)) + if (!gtk_widget_get_realized(m_ctrl->m_wxwindow)) { // Not realized yet - set to connect at realization time g_signal_connect (m_ctrl->m_wxwindow, @@ -710,20 +711,18 @@ void wxGStreamerMediaBackend::SetupXOverlay() { gdk_flush(); - GdkWindow *window = m_ctrl->m_wxwindow->window; + GdkWindow* window = gtk_widget_get_window(m_ctrl->m_wxwindow); wxASSERT(window); #endif - - gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(m_xoverlay), + gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(m_xoverlay), #ifdef __WXGTK__ GDK_WINDOW_XWINDOW( window ) #else ctrl->GetHandle() #endif ); - #ifdef __WXGTK__ - g_signal_connect (m_ctrl->m_wxwindow, + g_signal_connect(m_ctrl->m_wxwindow, // m_ctrl->m_wxwindow/*m_ctrl->m_widget*/, "expose_event", G_CALLBACK(gtk_window_expose_callback), this); diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index cded72e272..b35d0861ac 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -116,7 +116,7 @@ bool wxMask::Create( const wxBitmap& bitmap, m_display = bitmap.GetDisplay(); wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return false; + if (!image.IsOk()) return false; m_display = bitmap.GetDisplay(); @@ -220,7 +220,7 @@ bool wxMask::Create( const wxBitmap& bitmap ) m_bitmap = NULL; } - if (!bitmap.Ok()) return false; + if (!bitmap.IsOk()) return false; wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") ); @@ -465,9 +465,9 @@ wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) { #if wxUSE_NANOX - if (!image.Ok()) + if (!image.IsOk()) { - wxASSERT_MSG(image.Ok(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage.")); + wxASSERT_MSG(image.IsOk(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage.")); return false; } @@ -573,7 +573,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) UnRef(); - wxCHECK_MSG( image.Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") ); wxCHECK_MSG( depth == -1, false, wxT("invalid bitmap depth") ); m_refData = new wxBitmapRefData(); @@ -793,7 +793,7 @@ wxImage wxBitmap::ConvertToImage() const { wxImage image; - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); Display *xdisplay = (Display*) M_BMPDATA->m_display; wxASSERT_MSG( xdisplay, wxT("No display") ); @@ -958,35 +958,35 @@ wxBitmap::~wxBitmap() int wxBitmap::GetHeight() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_height; } int wxBitmap::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_width; } int wxBitmap::GetDepth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_bpp; } wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_mask; } void wxBitmap::SetMask( wxMask *mask ) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); AllocExclusive(); if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; @@ -1002,14 +1002,14 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { - wxCHECK_MSG( Ok() && + wxCHECK_MSG( IsOk() && (rect.x >= 0) && (rect.y >= 0) && (rect.x+rect.width <= M_BMPDATA->m_width ) && (rect.y+rect.height <= M_BMPDATA->m_height), wxNullBitmap, wxT("invalid bitmap or bitmap region") ); wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp ); - wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); + wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") ); if( GetMask() ) { @@ -1048,7 +1048,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); wxBitmapHandler *handler = FindHandler(type); @@ -1056,7 +1056,7 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, if (handler == NULL) { wxImage image(this->ConvertToImage()); - if (image.Ok()) return image.SaveFile( name, type ); + if (image.IsOk()) return image.SaveFile( name, type ); return false; } @@ -1078,7 +1078,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) if (!image.LoadFile( name, type )) return false; - if (image.Ok()) + if (image.IsOk()) { *this = wxBitmap(image); return true; @@ -1091,21 +1091,21 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) void wxBitmap::SetPalette(const wxPalette& palette) { - wxCHECK_RET(Ok(), wxT("invalid bitmap")); + wxCHECK_RET(IsOk(), wxT("invalid bitmap")); wxCHECK_RET(GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth")); AllocExclusive(); wxDELETE(M_BMPDATA->m_palette); - if (!palette.Ok()) return; + if (!palette.IsOk()) return; M_BMPDATA->m_palette = new wxPalette(palette); } wxPalette *wxBitmap::GetPalette() const { - if (!Ok()) return NULL; + if (!IsOk()) return NULL; return M_BMPDATA->m_palette; } @@ -1147,21 +1147,21 @@ void wxBitmap::SetBitmap( WXPixmap bitmap ) WXPixmap wxBitmap::GetPixmap() const { - wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") ); return (WXPixmap)M_BMPDATA->m_pixmap; } WXPixmap wxBitmap::GetBitmap() const { - wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") ); return (WXPixmap)M_BMPDATA->m_bitmap; } WXPixmap wxBitmap::GetDrawable() const { - wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), (WXPixmap) NULL, wxT("invalid bitmap") ); return (WXPixmap)(M_BMPDATA->m_bpp == 1 ? M_BMPDATA->m_bitmap : M_BMPDATA->m_pixmap); @@ -1169,7 +1169,7 @@ WXPixmap wxBitmap::GetDrawable() const WXDisplay *wxBitmap::GetDisplay() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_display; } @@ -1432,7 +1432,7 @@ bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap, const wxPalette *WXUNUSED(palette)) const { wxImage image(bitmap->ConvertToImage()); - if (image.Ok()) + if (image.IsOk()) return image.SaveFile( name, type ); return false; @@ -1540,7 +1540,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits, #else // !wxHAVE_LIB_XPM wxXPMDecoder decoder; wxImage image(decoder.ReadData((const char **)bits)); - return image.Ok() && bitmap->CreateFromImage(image); + return image.IsOk() && bitmap->CreateFromImage(image); #endif // wxHAVE_LIB_XPM/!wxHAVE_LIB_XPM } diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index 25192ebb53..80275b7fc5 100644 --- a/src/x11/brush.cpp +++ b/src/x11/brush.cpp @@ -112,21 +112,21 @@ bool wxBrush::operator == ( const wxBrush& brush ) const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return &M_BRUSHDATA->m_stipple; } diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index 671c3b010f..bd3b94f578 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -189,7 +189,7 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); #if wxUSE_NANOX return (unsigned char) M_COLDATA->m_color.red ; @@ -200,7 +200,7 @@ unsigned char wxColour::Red() const unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); #if wxUSE_NANOX return (unsigned char) M_COLDATA->m_color.green ; @@ -211,7 +211,7 @@ unsigned char wxColour::Green() const unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); #if wxUSE_NANOX return (unsigned char) M_COLDATA->m_color.blue ; @@ -222,7 +222,7 @@ unsigned char wxColour::Blue() const void wxColour::CalcPixel( WXColormap cmap ) { - wxCHECK_RET( Ok(), wxT("invalid colour") ); + wxCHECK_RET( IsOk(), wxT("invalid colour") ); wxCHECK_RET( cmap, wxT("invalid colormap") ); @@ -231,14 +231,14 @@ void wxColour::CalcPixel( WXColormap cmap ) unsigned long wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } WXColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") ); return (WXColor*) &M_COLDATA->m_color; } diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index d89db5b450..c314e4f387 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -201,7 +201,7 @@ void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) ) if (gs_busyCount++ > 0) return; - wxASSERT_MSG( !gs_savedCursor.Ok(), + wxASSERT_MSG( !gs_savedCursor.IsOk(), wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = g_globalCursor; diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp index 88de745710..01e5cd9ed0 100644 --- a/src/x11/dataobj.cpp +++ b/src/x11/dataobj.cpp @@ -349,7 +349,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) m_bitmap = image; - return m_bitmap.Ok(); + return m_bitmap.IsOk(); #else return false; #endif @@ -358,7 +358,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf) void wxBitmapDataObject::DoConvertToPng() { #if wxUSE_LIBPNG - if (!m_bitmap.Ok()) + if (!m_bitmap.IsOk()) return; wxImage image = m_bitmap.ConvertToImage(); diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp index e8124afc84..bdafb7aaf9 100644 --- a/src/x11/dcmemory.cpp +++ b/src/x11/dcmemory.cpp @@ -62,7 +62,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) Destroy(); m_selected = bitmap; - if (m_selected.Ok()) + if (m_selected.IsOk()) { if (m_selected.GetPixmap()) { @@ -86,7 +86,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const { - if (m_selected.Ok()) + if (m_selected.IsOk()) { if (width) (*width) = m_selected.GetWidth(); if (height) (*height) = m_selected.GetHeight(); diff --git a/src/x11/font.cpp b/src/x11/font.cpp index 97592a54c8..aa89f60ffd 100644 --- a/src/x11/font.cpp +++ b/src/x11/font.cpp @@ -711,14 +711,14 @@ void wxFont::Unshare() int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->m_pointSize; } wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->m_faceName; } @@ -730,35 +730,35 @@ wxFontFamily wxFont::DoGetFamily() const wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); return M_FONTDATA->m_style; } wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); return M_FONTDATA->m_weight; } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->m_underlined; } wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); return M_FONTDATA->m_encoding; } const wxNativeFontInfo *wxFont::GetNativeFontInfo() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); #if wxUSE_UNICODE #else @@ -771,7 +771,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const bool wxFont::IsFixedWidth() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); #if wxUSE_UNICODE return wxFontBase::IsFixedWidth(); @@ -864,7 +864,7 @@ void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info ) // font to list in the private data for future reference. wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const { - if ( !Ok() ) + if ( !IsOk() ) return NULL; long intScale = long(scale * 100.0 + 0.5); // key for wxXFont diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp index 7142bed347..c17740e4d9 100644 --- a/src/x11/pen.cpp +++ b/src/x11/pen.cpp @@ -179,7 +179,7 @@ void wxPen::SetWidth( int width ) int wxPen::GetDashes( wxDash **ptr ) const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); *ptr = (wxDash*)M_PENDATA->m_dash; return M_PENDATA->m_countDashes; @@ -197,42 +197,42 @@ wxDash* wxPen::GetDash() const wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return M_PENDATA->m_width; } wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } wxBitmap *wxPen::GetStipple() const { - wxCHECK_MSG( Ok(), &wxNullBitmap, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), &wxNullBitmap, wxT("invalid pen") ); return &M_PENDATA->m_stipple; } diff --git a/src/x11/region.cpp b/src/x11/region.cpp index 2abcca5e45..ad635c28da 100644 --- a/src/x11/region.cpp +++ b/src/x11/region.cpp @@ -175,7 +175,7 @@ bool wxRegion::DoUnionWithRect(const wxRect& r) bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -196,7 +196,7 @@ bool wxRegion::DoUnionWithRegion( const wxRegion& region ) bool wxRegion::DoIntersect( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -220,7 +220,7 @@ bool wxRegion::DoIntersect( const wxRegion& region ) bool wxRegion::DoSubtract( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { @@ -241,7 +241,7 @@ bool wxRegion::DoSubtract( const wxRegion& region ) bool wxRegion::DoXor( const wxRegion& region ) { - wxCHECK_MSG( region.Ok(), false, wxT("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") ); if (!m_refData) { diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index 0cf59dd5dc..5da3d5b3b7 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -377,7 +377,7 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style) void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon) { - if (icon.Ok() && X11GetMainWindow()) + if (icon.IsOk() && X11GetMainWindow()) { #if !wxUSE_NANOX XWMHints *wmHints = XAllocWMHints(); diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 3b569bf98f..1f004c99b4 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -582,7 +582,7 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) wxCHECK_MSG( xwindow, false, wxT("invalid window") ); wxCursor cursorToUse; - if (m_cursor.Ok()) + if (m_cursor.IsOk()) cursorToUse = m_cursor; else cursorToUse = *wxSTANDARD_CURSOR; @@ -1031,7 +1031,7 @@ void wxWindowX11::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int inc int wxWindowX11::GetCharHeight() const { wxFont font(GetFont()); - wxCHECK_MSG( font.Ok(), 0, wxT("valid window font needed") ); + wxCHECK_MSG( font.IsOk(), 0, wxT("valid window font needed") ); #if wxUSE_UNICODE // There should be an easier way. @@ -1059,7 +1059,7 @@ int wxWindowX11::GetCharHeight() const int wxWindowX11::GetCharWidth() const { wxFont font(GetFont()); - wxCHECK_MSG( font.Ok(), 0, wxT("valid window font needed") ); + wxCHECK_MSG( font.IsOk(), 0, wxT("valid window font needed") ); #if wxUSE_UNICODE // There should be an easier way. @@ -1092,7 +1092,7 @@ void wxWindowX11::DoGetTextExtent(const wxString& string, wxFont fontToUse = GetFont(); if (theFont) fontToUse = *theFont; - wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); + wxCHECK_RET( fontToUse.IsOk(), wxT("invalid font") ); if (string.empty()) { @@ -1747,6 +1747,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule) bool wxWinModule::OnInit() { Display *xdisplay = wxGlobalDisplay(); + if ( !xdisplay ) + { + // This module may be linked into a console program when using + // monolithic library and in this case it's perfectly normal not to + // have a display, so just return without doing anything and avoid + // crashing below. + return true; + } + int xscreen = DefaultScreen( xdisplay ); Window xroot = RootWindow( xdisplay, xscreen ); g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL ); diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp index f9209d0fff..ee78a9aca4 100644 --- a/src/xml/xml.cpp +++ b/src/xml/xml.cpp @@ -58,6 +58,8 @@ wxXmlNode::wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, m_lineNo(lineNo), m_noConversion(false) { + wxASSERT_MSG ( type != wxXML_ELEMENT_NODE || content.empty(), "element nodes can't have content" ); + if (m_parent) { if (m_parent->m_children) @@ -77,7 +79,9 @@ wxXmlNode::wxXmlNode(wxXmlNodeType type, const wxString& name, m_attrs(NULL), m_parent(NULL), m_children(NULL), m_next(NULL), m_lineNo(lineNo), m_noConversion(false) -{} +{ + wxASSERT_MSG ( type != wxXML_ELEMENT_NODE || content.empty(), "element nodes can't have content" ); +} wxXmlNode::wxXmlNode(const wxXmlNode& node) { @@ -451,7 +455,7 @@ void wxXmlDocument::DoCopy(const wxXmlDocument& doc) bool wxXmlDocument::Load(const wxString& filename, const wxString& encoding, int flags) { wxFileInputStream stream(filename); - if (!stream.Ok()) + if (!stream.IsOk()) return false; return Load(stream, encoding, flags); } @@ -459,7 +463,7 @@ bool wxXmlDocument::Load(const wxString& filename, const wxString& encoding, int bool wxXmlDocument::Save(const wxString& filename, int indentstep) const { wxFileOutputStream stream(filename); - if (!stream.Ok()) + if (!stream.IsOk()) return false; return Save(stream, indentstep); } diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp index a6499e422a..acce070d34 100644 --- a/src/xrc/xh_listc.cpp +++ b/src/xrc/xh_listc.cpp @@ -128,6 +128,8 @@ void wxListCtrlXmlHandler::HandleListCol() HandleCommonItemAttrs(item); if (HasParam(wxT("width"))) item.SetWidth((int)GetLong(wxT("width"))); + if (HasParam(wxT("image"))) + item.SetImage((int)GetLong(wxT("image"))); list->InsertColumn(list->GetColumnCount(), item); } @@ -160,7 +162,7 @@ void wxListCtrlXmlHandler::HandleListItem() int image; if ( list->HasFlag(wxLC_ICON) ) image = GetImageIndex(list, wxIMAGE_LIST_NORMAL); - else if ( list->HasFlag(wxLC_SMALL_ICON) ) + else if ( list->HasFlag(wxLC_SMALL_ICON) || list->HasFlag(wxLC_REPORT) || list->HasFlag(wxLC_LIST) ) image = GetImageIndex(list, wxIMAGE_LIST_SMALL); else image = wxNOT_FOUND; diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp index efc5c36f99..591d8c50f0 100644 --- a/src/xrc/xh_treebk.cpp +++ b/src/xrc/xh_treebk.cpp @@ -76,6 +76,24 @@ wxObject *wxTreebookXmlHandler::DoCreateResource() CreateChildren(m_tbk, true/*only this handler*/); + wxXmlNode *node = GetParamNode("object"); + int pageIndex = 0; + for (unsigned int i = 0; i < m_tbk->GetPageCount(); i++) + { + if ( m_tbk->GetPage(i) ) + { + wxXmlNode *child = node->GetChildren(); + while (child) + { + if (child->GetName() == "expanded" && child->GetNodeContent() == "1") + m_tbk->ExpandNode(pageIndex, true); + + child = child->GetNext(); + } + pageIndex++; + } + } + m_treeContext = old_treeContext; m_isInside = old_ins; m_tbk = old_par; diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 96650224bb..95525ac90a 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -1745,7 +1745,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour& // the colour doesn't use #RRGGBB format, check if it is symbolic // colour name: clr = GetSystemColour(v); - if (clr.Ok()) + if (clr.IsOk()) return clr; ReportParamError @@ -1823,7 +1823,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxXmlNode* node, art_id, art_client) ) { wxBitmap stockArt(wxArtProvider::GetBitmap(art_id, art_client, size)); - if ( stockArt.Ok() ) + if ( stockArt.IsOk() ) return stockArt; } @@ -1847,7 +1847,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxXmlNode* node, wxImage img(name); #endif - if (!img.Ok()) + if (!img.IsOk()) { ReportParamError ( @@ -1961,7 +1961,7 @@ wxImageList *wxXmlResourceHandler::GetImageList(const wxString& param) { if (n->GetType() == wxXML_ELEMENT_NODE && n->GetName() == parambitmap) { - wxIcon icon = GetIcon(n); + wxIcon icon = GetIcon(n, wxART_OTHER, size); if ( !imagelist ) { // We need the real image list size to create it. @@ -2277,7 +2277,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) // is this font based on a system font? wxFont font = GetSystemFont(GetParamValue(wxT("sysfont"))); - if (font.Ok()) + if (font.IsOk()) { if (hasSize && isize != -1) font.SetPointSize(isize); diff --git a/src/zlib/zlibM8.xml b/src/zlib/zlibM8.xml deleted file mode 100755 index f2ad675845..0000000000 --- a/src/zlib/zlibM8.xml +++ /dev/null @@ -1,2236 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - PPC - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnamePPC - OutputDirectory - Path:::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.bh - CompilerBalloon Help - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.p - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pas - CompilerMW Pascal PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ppu - CompilerMW Pascal PPC - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.s - CompilerPPCAsm - EditLanguageBalloon Help - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesInline - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap1 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilezlib_PPC.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfilezlib_PPC.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - adler32.c - MacOS - Text - Debug - - - Name - compress.c - MacOS - Text - Debug - - - Name - crc32.c - MacOS - Text - Debug - - - Name - deflate.c - MacOS - Text - Debug - - - Name - gzio.c - MacOS - Text - Debug - - - Name - inffast.c - MacOS - Text - Debug - - - Name - inflate.c - MacOS - Text - Debug - - - Name - inftrees.c - MacOS - Text - Debug - - - Name - trees.c - MacOS - Text - Debug - - - Name - uncompr.c - MacOS - Text - Debug - - - Name - zutil.c - MacOS - Text - Debug - - - - - Name - adler32.c - MacOS - - - Name - compress.c - MacOS - - - Name - crc32.c - MacOS - - - Name - deflate.c - MacOS - - - Name - gzio.c - MacOS - - - Name - inffast.c - MacOS - - - Name - inflate.c - MacOS - - - Name - inftrees.c - MacOS - - - Name - trees.c - MacOS - - - Name - uncompr.c - MacOS - - - Name - zutil.c - MacOS - - - - - Mach-O - - - - UserSourceTrees - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - RequireFrameworkStyleIncludesfalse - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMacOS X Support/Headers/(wchar_t Support fix) - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - Pathusr/include - PathFormatUnix - PathRootOS X Volume - - Recursivefalse - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMSL/MSL_C - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMSL/MSL_C++ - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - SearchPath - PathMacOS X Support - PathFormatUnix - PathRootCodeWarrior - - Recursivetrue - FrameworkPathfalse - HostFlagsAll - - - - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine - MWRuntimeSettings_HostApplication - Path - PathFormatGeneric - PathRootAbsolute - - MWRuntimeSettings_EnvVars - - - LinkerMacOS X PPC Linker - PreLinker - PostLinker - TargetnameMach-O - OutputDirectory - Path:::lib: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMDYL - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMLIB - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.arr - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.axp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.h++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.hpp - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.lcf - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.m - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.mm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pchm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pchmm - CompilerMW C/C++ PPC Mac OS X - EditLanguageC/C++ - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.plc - CompilerProperty List Compiler - EditLanguageProperty List - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.ploc - CompilerProperty List Compiler - EditLanguageProperty List - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - EditLanguageRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.wke - Compiler - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.a - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.dylib - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.gif - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.icns - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.jpg - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.lib - CompilerMachO Importer - EditLanguageC/C++ - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.nib - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.pl - CompilerPerl Tool - EditLanguagePerl - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.plist - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.ppob - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.psh - CompilerShell Tool - EditLanguage - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - EditLanguage - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.sh - CompilerShell Tool - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.strings - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.tiff - CompilerCopy To Package - EditLanguage - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - - - CacheModDatestrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - BrowserGenerator1 - DebuggerAppPath - Path - PathFormatGeneric - PathRootAbsolute - - DebuggerCmdLineArgs - DebuggerWorkingDir - Path - PathFormatGeneric - PathRootAbsolute - - CodeCompletionPrefixFileNameMacHeaders.c - CodeCompletionMacroFileNameMacOS_Carbon_C++_Macros.h - - - ConsoleEncoding0 - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPType0 - - - Enabledfalse - ConnectionName - DownloadPath - LaunchRemoteAppfalse - RemoteAppPath - CoreID0 - JTAGClockSpeed8000 - IsMultiCorefalse - OSDownloadfalse - UseGlobalOSDownloadfalse - OSDownloadConnectionName - OSDownloadPath - AltDownloadfalse - AltDownloadConnectionName - - - OtherExecutables - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline0 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars0 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - MWFrontEnd_C_templateparser0 - MWFrontEnd_C_c990 - MWFrontEnd_C_bottomupinline1 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator???? - MWMerge_MacOS_outputTypeAPPL - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_flattenResource0 - MWMerge_MacOS_flatFileNamea.rsrc - MWMerge_MacOS_flatFileOutputPath - Path: - PathFormatMacOS - PathRootProject - - MWMerge_MacOS_skipResources - DLGX - ckid - Proj - WSPC - - - - FileLockedfalse - ResourcesMapIsReadOnlyfalse - PrinterDriverIsMultiFinderCompatiblefalse - Invisiblefalse - HasBundlefalse - NameLockedfalse - Stationeryfalse - HasCustomIconfalse - Sharedfalse - HasBeenInitedfalse - Label0 - Comments - - - MWMacOSPackager_UsePackager0 - MWMacOSPackager_FolderToPackage - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreateClassicAlias0 - MWMacOSPackager_ClassicAliasMethodUseTargetOutput - MWMacOSPackager_ClassicAliasPath - Path - PathFormatMacOS - PathRootAbsolute - - MWMacOSPackager_CreatePkgInfo0 - MWMacOSPackager_PkgCreatorType???? - MWMacOSPackager_PkgFileTypeAPPL - - - MWCodeGen_PPC_structalignmentPPC_mw - MWCodeGen_PPC_tracebacktablesInline - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_function_align4 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_largetoc0 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_poolconst0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_linkerpoolsstrings0 - MWCodeGen_PPC_volatileasm0 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_altivec_move_block0 - MWCodeGen_PPC_strictIEEEfp0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_genfsel0 - MWCodeGen_PPC_orderedfpcmp0 - - - MWCodeGen_MachO_structalignmentPPC_mw - MWCodeGen_MachO_profiler_enumOff - MWCodeGen_MachO_processorGeneric - MWCodeGen_MachO_function_align4 - MWCodeGen_MachO_common0 - MWCodeGen_MachO_peephole1 - MWCodeGen_MachO_readonlystrings0 - MWCodeGen_MachO_linkerpoolsstrings1 - MWCodeGen_MachO_volatileasm0 - MWCodeGen_MachO_schedule0 - MWCodeGen_MachO_altivec0 - MWCodeGen_MachO_vecmove0 - MWCodeGen_MachO_fp_ieee_strict0 - MWCodeGen_MachO_fpcontract1 - MWCodeGen_MachO_genfsel0 - MWCodeGen_MachO_fp_cmps_ordered0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel2 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap1 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - - - MWLinker_MacOSX_linksym0 - MWLinker_MacOSX_symfullpath0 - MWLinker_MacOSX_nolinkwarnings0 - MWLinker_MacOSX_linkmap0 - MWLinker_MacOSX_dontdeadstripinitcode0 - MWLinker_MacOSX_permitmultdefs1 - MWLinker_MacOSX_use_objectivec_semantics0 - MWLinker_MacOSX_strip_debug_symbols0 - MWLinker_MacOSX_split_segs0 - MWLinker_MacOSX_report_msl_overloads0 - MWLinker_MacOSX_objects_follow_linkorder0 - MWLinker_MacOSX_linkmodeFast - MWLinker_MacOSX_exportsReferencedGlobals - MWLinker_MacOSX_sortcodeNone - MWLinker_MacOSX_mainnamestart - - - MWProject_MacOSX_typeLibrary - MWProject_MacOSX_outfilezlib_MACH.lib - MWProject_MacOSX_filecreator???? - MWProject_MacOSX_filetype???? - MWProject_MacOSX_vmaddress0 - MWProject_MacOSX_usedefaultvmaddr1 - MWProject_MacOSX_flatrsrc0 - MWProject_MacOSX_flatrsrcfilename - MWProject_MacOSX_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MacOSX_installpath./ - MWProject_MacOSX_dont_prebind0 - MWProject_MacOSX_flat_namespace0 - MWProject_MacOSX_frameworkversionA - MWProject_MacOSX_currentversion0 - MWProject_MacOSX_flat_oldimpversion0 - - - MWLinker_MachO_exportsNone - MWLinker_MachO_mainnamestart - MWLinker_MachO_currentversion0 - MWLinker_MachO_compatibleversion0 - MWLinker_MachO_symfullpath0 - MWLinker_MachO_supresswarnings0 - MWLinker_MachO_multisymerror0 - MWLinker_MachO_prebind1 - MWLinker_MachO_deadstrip1 - MWLinker_MachO_objectivecsemantics0 - MWLinker_MachO_whichfileloaded0 - MWLinker_MachO_whyfileloaded0 - MWLinker_MachO_readonlyrelocsErrors - MWLinker_MachO_undefinedsymbolsErrors - MWLinker_MachO_twolevelnamespace1 - MWLinker_MachO_stripdebugsymbols0 - - - MWProject_MachO_typeExecutable - MWProject_MachO_outfilea.exe - MWProject_MachO_filecreator???? - MWProject_MachO_filetypeMEXE - MWProject_MachO_vmaddress4096 - MWProject_MachO_flatrsrc1 - MWProject_MachO_flatrsrcfilenamea.rsrc - MWProject_MachO_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_MachO_installpath./ - MWProject_MachO_frameworkversion - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeLibrary - MWProject_PPC_outfilezlib_PPC.lib - MWProject_PPC_filecreator???? - MWProject_PPC_filetype???? - MWProject_PPC_size0 - MWProject_PPC_minsize0 - MWProject_PPC_stacksize0 - MWProject_PPC_flags0 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype???? - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - MWProject_PPC_flatrsrc0 - MWProject_PPC_flatrsrcoutputdir - Path: - PathFormatMacOS - PathRootProject - - MWProject_PPC_flatrsrcfilename - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - PList_OutputTypeFile - PList_OutputEncodingUTF-8 - PList_Prefix - PList_FileFilenameInfo.plist - PList_FileDirectory - Path: - PathFormatMacOS - PathRootProject - - PList_ResourceTypeplst - PList_ResourceID0 - PList_ResourceName - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - MWCodeGen_X86_processorGeneric - MWCodeGen_X86_alignmentbytes8 - MWCodeGen_X86_exceptionsZeroOverhead - MWCodeGen_X86_name_manglingMWWin32 - MWCodeGen_X86_use_extinst0 - MWCodeGen_X86_extinst_mmx0 - MWCodeGen_X86_extinst_3dnow0 - MWCodeGen_X86_use_mmx_3dnow_convention0 - MWCodeGen_X86_extinst_cmov0 - MWCodeGen_X86_extinst_sse0 - MWCodeGen_X86_extinst_sse20 - MWCodeGen_X86_intrinsics0 - MWCodeGen_X86_optimizeasm0 - MWCodeGen_X86_disableopts0 - MWCodeGen_X86_profile0 - MWLinker_X86_runtimeCustom - MWCodeGen_X86_readonlystrings0 - - - MWLinker_X86_subsysmajorid4 - MWLinker_X86_subsysminorid0 - MWCOFF_X86_opsysmajorid4 - MWCOFF_X86_opsysminorid0 - MWLinker_X86_usrmajorid0 - MWLinker_X86_usrminorid0 - MWProject_X86_maxstacksize1024 - MWProject_X86_minstacksize4 - MWProject_X86_size1024 - MWProject_X86_minsize4 - MWCOFF_X86_coff_flags0 - MWCOFF_X86_dll_flags0 - MWProject_X86_baseaddress4194304 - MWCOFF_X86_filealign512 - MWCOFF_X86_sectionalign4096 - - - MWLinker_X86_entrypointusageDefault - MWLinker_X86_entrypoint - MWLinker_X86_subsystemWinGUI - MWLinker_X86_commandfile - MWLinker_X86_generatemap0 - MWLinker_X86_linksym0 - MWLinker_X86_linkCV1 - MWLinker_X86_symfullpathfalse - MWLinker_X86_linkdebugtrue - MWLinker_X86_checksumfalse - MWLinker_X86_zero_init_bssfalse - MWLinker_X86_mergedatafalse - MWLinker_X86_usedefaultlibsfalse - MWLinker_X86_adddefaultlibsfalse - MWLinker_X86_nowarningsfalse - MWLinker_X86_verbosefalse - - - MWProject_X86_typeApplication - MWProject_X86_outfileNONAME.EXE - MWProject_X86_importlib - MWProject_X86_setimportlibdirfalse - MWProject_X86_dontgenerateimportlibfalse - MWProject_X86_oldformatlibfalse - MWProject_X86_replaceobjextensionfalse - MWProject_X86_copyallfilesfalse - - - - Name - adler32.c - MacOS - Text - Debug - - - Name - compress.c - MacOS - Text - Debug - - - Name - crc32.c - MacOS - Text - Debug - - - Name - deflate.c - MacOS - Text - Debug - - - Name - gzio.c - MacOS - Text - Debug - - - Name - inffast.c - MacOS - Text - Debug - - - Name - inflate.c - MacOS - Text - Debug - - - Name - inftrees.c - MacOS - Text - Debug - - - Name - trees.c - MacOS - Text - Debug - - - Name - uncompr.c - MacOS - Text - Debug - - - Name - zutil.c - MacOS - Text - Debug - - - - - Name - adler32.c - MacOS - - - Name - compress.c - MacOS - - - Name - crc32.c - MacOS - - - Name - deflate.c - MacOS - - - Name - gzio.c - MacOS - - - Name - inffast.c - MacOS - - - Name - inflate.c - MacOS - - - Name - inftrees.c - MacOS - - - Name - trees.c - MacOS - - - Name - uncompr.c - MacOS - - - Name - zutil.c - MacOS - - - - - - - PPC - Mach-O - - - - - PPC - Name - adler32.c - MacOS - - - PPC - Name - compress.c - MacOS - - - PPC - Name - crc32.c - MacOS - - - PPC - Name - deflate.c - MacOS - - - PPC - Name - gzio.c - MacOS - - - PPC - Name - inffast.c - MacOS - - - PPC - Name - inflate.c - MacOS - - - PPC - Name - inftrees.c - MacOS - - - PPC - Name - trees.c - MacOS - - - PPC - Name - uncompr.c - MacOS - - - PPC - Name - zutil.c - MacOS - - - - diff --git a/tests/Makefile.in b/tests/Makefile.in index 9f9506631b..61c235eaee 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -166,6 +166,7 @@ TEST_GUI_OBJECTS = \ test_gui_choicebooktest.o \ test_gui_choicetest.o \ test_gui_comboboxtest.o \ + test_gui_datepickerctrltest.o \ test_gui_frametest.o \ test_gui_gaugetest.o \ test_gui_gridtest.o \ @@ -731,6 +732,9 @@ test_gui_choicetest.o: $(srcdir)/controls/choicetest.cpp $(TEST_GUI_ODEP) test_gui_comboboxtest.o: $(srcdir)/controls/comboboxtest.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/comboboxtest.cpp +test_gui_datepickerctrltest.o: $(srcdir)/controls/datepickerctrltest.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/datepickerctrltest.cpp + test_gui_frametest.o: $(srcdir)/controls/frametest.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/frametest.cpp diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp index 04fdb902a2..b56777059f 100644 --- a/tests/archive/archivetest.cpp +++ b/tests/archive/archivetest.cpp @@ -680,7 +680,7 @@ void ArchiveTestCase::CreateArchive(wxOutputStream& out, // then load the archive file { wxFFileInputStream in(tmparc); - if (in.Ok()) + if (in.IsOk()) out.Write(in); } @@ -690,7 +690,7 @@ void ArchiveTestCase::CreateArchive(wxOutputStream& out, // for the non-seekable test, have the archiver output to "-" // and read the archive via a pipe PFileInputStream in(wxString::Format(archiver, wxT("-"))); - if (in.Ok()) + if (in.IsOk()) out.Write(in); } } @@ -893,7 +893,7 @@ void ArchiveTestCase::ExtractArchive(wxInputStream& in, // write the archive to a temporary file { wxFFileOutputStream out(tmparc); - if (out.Ok()) + if (out.IsOk()) out.Write(in); } @@ -905,7 +905,7 @@ void ArchiveTestCase::ExtractArchive(wxInputStream& in, // for the non-seekable test, have the archiver extract "-" and // feed it the archive via a pipe PFileOutputStream out(wxString::Format(unarchiver, wxT("-"))); - if (out.Ok()) + if (out.IsOk()) out.Write(in); } @@ -958,7 +958,7 @@ void ArchiveTestCase::VerifyDir(wxString& path, if (!isDir) { wxFFileInputStream in(path); CPPUNIT_ASSERT_MESSAGE( - "entry not found in archive" + error_entry, in.Ok()); + "entry not found in archive" + error_entry, in.IsOk()); size_t size = (size_t)in.GetLength(); wxCharBuffer buf(size); diff --git a/tests/archive/ziptest.cpp b/tests/archive/ziptest.cpp index 6976b083bb..e78786a742 100644 --- a/tests/archive/ziptest.cpp +++ b/tests/archive/ziptest.cpp @@ -180,7 +180,7 @@ void ZipPipeTestCase::runTest() { PFileInputStream in(cmd); - if (in.Ok()) + if (in.IsOk()) out.Write(in); } diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in index 8c4d1960e2..0c638533a9 100644 --- a/tests/benchmarks/Makefile.in +++ b/tests/benchmarks/Makefile.in @@ -43,6 +43,7 @@ BENCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CXXFLAGS) BENCH_OBJECTS = \ bench_bench.o \ + bench_datetime.o \ bench_htmlpars.o \ bench_htmltag.o \ bench_ipcclient.o \ @@ -131,6 +132,9 @@ data: bench_bench.o: $(srcdir)/bench.cpp $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/bench.cpp +bench_datetime.o: $(srcdir)/datetime.cpp + $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/datetime.cpp + bench_htmlpars.o: $(srcdir)/htmlparser/htmlpars.cpp $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/htmlparser/htmlpars.cpp diff --git a/tests/benchmarks/bench.bkl b/tests/benchmarks/bench.bkl index 0b7c329173..452900a95f 100644 --- a/tests/benchmarks/bench.bkl +++ b/tests/benchmarks/bench.bkl @@ -11,6 +11,7 @@ template_append="wx_append_base"> bench.cpp + datetime.cpp htmlparser/htmlpars.cpp htmlparser/htmltag.cpp ipcclient.cpp diff --git a/tests/benchmarks/bench.dsp b/tests/benchmarks/bench.dsp index fa92335ffe..f87807d078 100644 --- a/tests/benchmarks/bench.dsp +++ b/tests/benchmarks/bench.dsp @@ -239,6 +239,10 @@ SOURCE=.\bench.cpp # End Source File # Begin Source File +SOURCE=.\datetime.cpp +# End Source File +# Begin Source File + SOURCE=.\htmlparser\htmlpars.cpp # End Source File # Begin Source File diff --git a/tests/benchmarks/bench_vc7.vcproj b/tests/benchmarks/bench_vc7.vcproj index 41b6c37f9d..0968742ce1 100644 --- a/tests/benchmarks/bench_vc7.vcproj +++ b/tests/benchmarks/bench_vc7.vcproj @@ -544,6 +544,9 @@ + + diff --git a/tests/benchmarks/bench_vc8.vcproj b/tests/benchmarks/bench_vc8.vcproj index ddafa8a631..d206538dc5 100644 --- a/tests/benchmarks/bench_vc8.vcproj +++ b/tests/benchmarks/bench_vc8.vcproj @@ -807,6 +807,10 @@ RelativePath=".\bench.cpp" > + + diff --git a/tests/benchmarks/bench_vc9.vcproj b/tests/benchmarks/bench_vc9.vcproj index 0400f4e5b6..55726ee9c7 100644 --- a/tests/benchmarks/bench_vc9.vcproj +++ b/tests/benchmarks/bench_vc9.vcproj @@ -779,6 +779,10 @@ RelativePath=".\bench.cpp" > + + diff --git a/tests/benchmarks/datetime.cpp b/tests/benchmarks/datetime.cpp new file mode 100644 index 0000000000..3be9ddcf89 --- /dev/null +++ b/tests/benchmarks/datetime.cpp @@ -0,0 +1,20 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: tests/benchmarks/datetime.cpp +// Purpose: wxDateTime benchmarks +// Author: Vadim Zeitlin +// Created: 2011-05-23 +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#include "wx/datetime.h" + +#include "bench.h" + +BENCHMARK_FUNC(ParseDate) +{ + wxDateTime dt; + return dt.ParseDate("May 23, 2011") && dt.GetMonth() == wxDateTime::May; +} + diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc index b818d6d7b1..6dab7dabab 100644 --- a/tests/benchmarks/makefile.bcc +++ b/tests/benchmarks/makefile.bcc @@ -37,6 +37,7 @@ BENCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(CPPFLAGS) $(CXXFLAGS) BENCH_OBJECTS = \ $(OBJS)\bench_bench.obj \ + $(OBJS)\bench_datetime.obj \ $(OBJS)\bench_htmlpars.obj \ $(OBJS)\bench_htmltag.obj \ $(OBJS)\bench_ipcclient.obj \ @@ -212,6 +213,9 @@ data: $(OBJS)\bench_bench.obj: .\bench.cpp $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\bench.cpp +$(OBJS)\bench_datetime.obj: .\datetime.cpp + $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\datetime.cpp + $(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc index 71e83e157c..22a562f5af 100644 --- a/tests/benchmarks/makefile.gcc +++ b/tests/benchmarks/makefile.gcc @@ -30,6 +30,7 @@ BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ $(CXXFLAGS) BENCH_OBJECTS = \ $(OBJS)\bench_bench.o \ + $(OBJS)\bench_datetime.o \ $(OBJS)\bench_htmlpars.o \ $(OBJS)\bench_htmltag.o \ $(OBJS)\bench_ipcclient.o \ @@ -198,6 +199,9 @@ data: $(OBJS)\bench_bench.o: ./bench.cpp $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\bench_datetime.o: ./datetime.cpp + $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\bench_htmlpars.o: ./htmlparser/htmlpars.cpp $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index ab4b76b129..417dbbcb68 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -31,6 +31,7 @@ BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ $(CXXFLAGS) BENCH_OBJECTS = \ $(OBJS)\bench_bench.obj \ + $(OBJS)\bench_datetime.obj \ $(OBJS)\bench_htmlpars.obj \ $(OBJS)\bench_htmltag.obj \ $(OBJS)\bench_ipcclient.obj \ @@ -299,6 +300,9 @@ data: $(OBJS)\bench_bench.obj: .\bench.cpp $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\bench.cpp +$(OBJS)\bench_datetime.obj: .\datetime.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\datetime.cpp + $(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat index c768080932..61ba44e23f 100644 --- a/tests/benchmarks/makefile.wat +++ b/tests/benchmarks/makefile.wat @@ -226,6 +226,7 @@ BENCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) BENCH_OBJECTS = & $(OBJS)\bench_bench.obj & + $(OBJS)\bench_datetime.obj & $(OBJS)\bench_htmlpars.obj & $(OBJS)\bench_htmltag.obj & $(OBJS)\bench_ipcclient.obj & @@ -270,6 +271,9 @@ data : .SYMBOLIC $(OBJS)\bench_bench.obj : .AUTODEPEND .\bench.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< +$(OBJS)\bench_datetime.obj : .AUTODEPEND .\datetime.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + $(OBJS)\bench_htmlpars.obj : .AUTODEPEND .\htmlparser\htmlpars.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< diff --git a/tests/cmdline/cmdlinetest.cpp b/tests/cmdline/cmdlinetest.cpp index 07b030ff37..82f6548e65 100644 --- a/tests/cmdline/cmdlinetest.cpp +++ b/tests/cmdline/cmdlinetest.cpp @@ -139,6 +139,8 @@ void CmdLineTestCase::ParseSwitches() p.AddSwitch("b"); p.AddSwitch("c"); p.AddSwitch("d"); + p.AddSwitch("n", "neg", "Switch that can be negated", + wxCMD_LINE_SWITCH_NEGATABLE); p.SetCmdLine(""); CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) ); @@ -182,6 +184,23 @@ void CmdLineTestCase::ParseSwitches() CPPUNIT_ASSERT( !p.Found("b") ); CPPUNIT_ASSERT( !p.Found("c") ); CPPUNIT_ASSERT( p.Found("d") ); + + p.SetCmdLine("-n"); + CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) ); + CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_NOT_FOUND, p.FoundSwitch("a") ); + CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_ON, p.FoundSwitch("n") ); + + p.SetCmdLine("-n-"); + CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) ); + CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_OFF, p.FoundSwitch("neg") ); + + p.SetCmdLine("--neg"); + CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) ); + CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_ON, p.FoundSwitch("neg") ); + + p.SetCmdLine("--neg-"); + CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) ); + CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_OFF, p.FoundSwitch("n") ); } void CmdLineTestCase::Usage() diff --git a/tests/controls/datepickerctrltest.cpp b/tests/controls/datepickerctrltest.cpp new file mode 100644 index 0000000000..b28b1491e9 --- /dev/null +++ b/tests/controls/datepickerctrltest.cpp @@ -0,0 +1,112 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/controls/datepickerctrltest.cpp +// Purpose: wxDatePickerCtrl unit test +// Author: Vadim Zeitlin +// Created: 2011-06-18 +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vadim Zeitlin +/////////////////////////////////////////////////////////////////////////////// + +#include "testprec.h" + +#if wxUSE_DATEPICKCTRL + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/app.h" +#endif // WX_PRECOMP + +#include "wx/datectrl.h" + +#include "testableframe.h" +#include "testdate.h" + +class DatePickerCtrlTestCase : public CppUnit::TestCase +{ +public: + DatePickerCtrlTestCase() { } + + void setUp(); + void tearDown(); + +private: + CPPUNIT_TEST_SUITE( DatePickerCtrlTestCase ); + CPPUNIT_TEST( Value ); + CPPUNIT_TEST( Range ); + CPPUNIT_TEST_SUITE_END(); + + void Value(); + void Range(); + + wxDatePickerCtrl* m_datepicker; + + DECLARE_NO_COPY_CLASS(DatePickerCtrlTestCase) +}; + +// register in the unnamed registry so that these tests are run by default +CPPUNIT_TEST_SUITE_REGISTRATION( DatePickerCtrlTestCase ); + +// also include in its own registry so that these tests can be run alone +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DatePickerCtrlTestCase, "DatePickerCtrlTestCase" ); + +void DatePickerCtrlTestCase::setUp() +{ + m_datepicker = new wxDatePickerCtrl(wxTheApp->GetTopWindow(), wxID_ANY); +} + +void DatePickerCtrlTestCase::tearDown() +{ + delete m_datepicker; +} + +void DatePickerCtrlTestCase::Value() +{ + const wxDateTime dt(18, wxDateTime::Jul, 2011); + m_datepicker->SetValue(dt); + + CPPUNIT_ASSERT_EQUAL( dt, m_datepicker->GetValue() ); + + // We don't use wxDP_ALLOWNONE currently, hence a value is required. + WX_ASSERT_FAILS_WITH_ASSERT( m_datepicker->SetValue(wxDateTime()) ); +} + +void DatePickerCtrlTestCase::Range() +{ + // Initially we have no valid range but MSW version still has (built in) + // minimum as it doesn't support dates before 1601-01-01, hence don't rely + // on GetRange() returning false. + wxDateTime dtRangeStart, dtRangeEnd; + m_datepicker->GetRange(&dtRangeStart, &dtRangeEnd); + CPPUNIT_ASSERT( !dtRangeEnd.IsValid() ); + + // After we set it we should be able to get it back. + const wxDateTime + dtStart(15, wxDateTime::Feb, 1923), + dtEnd(18, wxDateTime::Jun, 2011); + + m_datepicker->SetRange(dtStart, dtEnd); + CPPUNIT_ASSERT( m_datepicker->GetRange(&dtRangeStart, &dtRangeEnd) ); + CPPUNIT_ASSERT_EQUAL( dtStart, dtRangeStart ); + CPPUNIT_ASSERT_EQUAL( dtEnd, dtRangeEnd ); + + // Setting dates inside the range should work, including the range end + // points. + m_datepicker->SetValue(dtStart); + CPPUNIT_ASSERT_EQUAL( dtStart, m_datepicker->GetValue() ); + + m_datepicker->SetValue(dtEnd); + CPPUNIT_ASSERT_EQUAL( dtEnd, m_datepicker->GetValue() ); + + + // Setting dates outside the range should not work. + m_datepicker->SetValue(dtEnd + wxTimeSpan::Day()); + CPPUNIT_ASSERT_EQUAL( dtEnd, m_datepicker->GetValue() ); + + m_datepicker->SetValue(dtStart - wxTimeSpan::Day()); + CPPUNIT_ASSERT_EQUAL( dtEnd, m_datepicker->GetValue() ); +} + +#endif // wxUSE_DATEPICKCTRL diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index 8d1d4aa38b..f5af743b0c 100644 --- a/tests/datetime/datetimetest.cpp +++ b/tests/datetime/datetimetest.cpp @@ -22,18 +22,9 @@ #if wxUSE_DATETIME -#include "wx/datetime.h" #include "wx/wxcrt.h" // for wxStrstr() -// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects -static std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt) -{ - ostr << dt.FormatISOCombined(' '); - - return ostr; -} - -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t) +#include "testdate.h" // to test Today() meaningfully we must be able to change the system date which // is not usually the case, but if we're under Win32 we can try it -- define diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp index ed82680061..fc158e7162 100644 --- a/tests/fswatcher/fswatchertest.cpp +++ b/tests/fswatcher/fswatchertest.cpp @@ -17,6 +17,10 @@ #pragma hdrstop #endif +#ifndef WX_PRECOMP + #include "wx/timer.h" +#endif + #include "wx/evtloop.h" #include "wx/filename.h" #include "wx/filefn.h" @@ -248,7 +252,7 @@ public: break; case 2: // actual test - CPPUNIT_ASSERT(CheckResult()); + CheckResult(); Exit(); break; @@ -325,7 +329,7 @@ public: tested = true; } - virtual bool CheckResult() + virtual void CheckResult() { CPPUNIT_ASSERT_MESSAGE( "No events received", !m_events.empty() ); @@ -356,8 +360,6 @@ public: CPPUNIT_ASSERT_EQUAL(expected.GetPath(), e->GetPath()); CPPUNIT_ASSERT_EQUAL(expected.GetNewPath(), e->GetNewPath()); - - return true; } virtual void GenerateEvent() = 0; @@ -414,6 +416,8 @@ private: CPPUNIT_TEST( TestEventAccess ); #endif // __WXMSW__ #endif // !wxHAS_KQUEUE + + CPPUNIT_TEST( TestNoEventsAfterRemove ); CPPUNIT_TEST_SUITE_END(); void TestEventCreate(); @@ -422,6 +426,8 @@ private: void TestEventModify(); void TestEventAccess(); + void TestNoEventsAfterRemove(); + DECLARE_NO_COPY_CLASS(FileSystemWatcherTestCase) }; @@ -607,3 +613,60 @@ void FileSystemWatcherTestCase::TestEventAccess() EventTester tester; tester.Run(); } + +namespace +{ + +// We can't define this class locally inside TestNoEventsAfterRemove() for some +// reason with g++ 4.0 under OS X 10.5, it results in the following mysterious +// error: +// +// /var/tmp//ccTkNCkc.s:unknown:Non-global symbol: +// __ZThn80_ZN25FileSystemWatcherTestCase23TestNoEventsAfterRemoveEvEN11EventTester6NotifyEv.eh +// can't be a weak_definition +// +// So define this class outside the function instead. +class NoEventsAfterRemoveEventTester : public EventHandler, + public wxTimer +{ +public: + NoEventsAfterRemoveEventTester() + { + // We need to use an inactivity timer as we never get any file + // system events in this test, so we consider that the test is + // finished when this 1s timeout expires instead of, as usual, + // stopping after getting the file system events. + Start(1000, true); + } + + virtual void GenerateEvent() + { + m_watcher->Remove(EventGenerator::GetWatchDir()); + CPPUNIT_ASSERT(eg.CreateFile()); + } + + virtual void CheckResult() + { + CPPUNIT_ASSERT( m_events.empty() ); + } + + virtual wxFileSystemWatcherEvent ExpectedEvent() + { + CPPUNIT_FAIL( "Shouldn't be called" ); + + return wxFileSystemWatcherEvent(wxFSW_EVENT_ERROR); + } + + virtual void Notify() + { + SendIdle(); + } +}; + +} // anonymous namespace + +void FileSystemWatcherTestCase::TestNoEventsAfterRemove() +{ + NoEventsAfterRemoveEventTester tester; + tester.Run(); +} diff --git a/tests/makefile.bcc b/tests/makefile.bcc index da4658bfb1..4dc8feebdb 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -151,6 +151,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_choicebooktest.obj \ $(OBJS)\test_gui_choicetest.obj \ $(OBJS)\test_gui_comboboxtest.obj \ + $(OBJS)\test_gui_datepickerctrltest.obj \ $(OBJS)\test_gui_frametest.obj \ $(OBJS)\test_gui_gaugetest.obj \ $(OBJS)\test_gui_gridtest.obj \ @@ -779,6 +780,9 @@ $(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp $(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp +$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp + $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp + $(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 05aa99bef4..48f4061311 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -144,6 +144,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_choicebooktest.o \ $(OBJS)\test_gui_choicetest.o \ $(OBJS)\test_gui_comboboxtest.o \ + $(OBJS)\test_gui_datepickerctrltest.o \ $(OBJS)\test_gui_frametest.o \ $(OBJS)\test_gui_gaugetest.o \ $(OBJS)\test_gui_gridtest.o \ @@ -760,6 +761,9 @@ $(OBJS)\test_gui_choicetest.o: ./controls/choicetest.cpp $(OBJS)\test_gui_comboboxtest.o: ./controls/comboboxtest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\test_gui_datepickerctrltest.o: ./controls/datepickerctrltest.cpp + $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\test_gui_frametest.o: ./controls/frametest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< diff --git a/tests/makefile.vc b/tests/makefile.vc index 0de79873de..c32d4fa9dd 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -146,6 +146,7 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_choicebooktest.obj \ $(OBJS)\test_gui_choicetest.obj \ $(OBJS)\test_gui_comboboxtest.obj \ + $(OBJS)\test_gui_datepickerctrltest.obj \ $(OBJS)\test_gui_frametest.obj \ $(OBJS)\test_gui_gaugetest.obj \ $(OBJS)\test_gui_gridtest.obj \ @@ -905,6 +906,9 @@ $(OBJS)\test_gui_choicetest.obj: .\controls\choicetest.cpp $(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp +$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp + $(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp diff --git a/tests/makefile.wat b/tests/makefile.wat index f89e93c51d..25630d784d 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -390,6 +390,7 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_choicebooktest.obj & $(OBJS)\test_gui_choicetest.obj & $(OBJS)\test_gui_comboboxtest.obj & + $(OBJS)\test_gui_datepickerctrltest.obj & $(OBJS)\test_gui_frametest.obj & $(OBJS)\test_gui_gaugetest.obj & $(OBJS)\test_gui_gridtest.obj & @@ -819,6 +820,9 @@ $(OBJS)\test_gui_choicetest.obj : .AUTODEPEND .\controls\choicetest.cpp $(OBJS)\test_gui_comboboxtest.obj : .AUTODEPEND .\controls\comboboxtest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_datepickerctrltest.obj : .AUTODEPEND .\controls\datepickerctrltest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_frametest.obj : .AUTODEPEND .\controls\frametest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp index 6d8fd784de..3424af6b50 100644 --- a/tests/menu/menu.cpp +++ b/tests/menu/menu.cpp @@ -84,6 +84,7 @@ private: CPPUNIT_TEST( FindInMenu ); CPPUNIT_TEST( Count ); CPPUNIT_TEST( Labels ); + CPPUNIT_TEST( RadioItems ); CPPUNIT_TEST_SUITE_END(); void CreateFrame(); @@ -92,6 +93,7 @@ private: void FindInMenu(); void Count(); void Labels(); + void RadioItems(); wxFrame* m_frame; @@ -304,3 +306,56 @@ void MenuTestCase::Labels() CPPUNIT_ASSERT_EQUAL( "Foo", itemFoo->GetItemLabelText() ); CPPUNIT_ASSERT_EQUAL( "Foo", wxMenuItem::GetLabelText("&Foo\tCtrl-F") ); } + +void MenuTestCase::RadioItems() +{ + wxMenuBar * const bar = m_frame->GetMenuBar(); + wxMenu * const menu = new wxMenu; + bar->Append(menu, "&Radio"); + + // Adding consecutive radio items creates a radio group. + menu->AppendRadioItem(MenuTestCase_First, "Radio 0"); + menu->AppendRadioItem(MenuTestCase_First + 1, "Radio 1"); + + // First item of a radio group is checked by default. + CPPUNIT_ASSERT( menu->IsChecked(MenuTestCase_First) ); + + // Checking the second one make the first one unchecked however. + menu->Check(MenuTestCase_First + 1, true); + CPPUNIT_ASSERT( !menu->IsChecked(MenuTestCase_First) ); + CPPUNIT_ASSERT( menu->IsChecked(MenuTestCase_First + 1) ); + + // Adding more radio items after a separator creates another radio group... + menu->AppendSeparator(); + menu->AppendRadioItem(MenuTestCase_First + 2, "Radio 2"); + menu->AppendRadioItem(MenuTestCase_First + 3, "Radio 3"); + menu->AppendRadioItem(MenuTestCase_First + 4, "Radio 4"); + + // ... which is independent from the first one. + CPPUNIT_ASSERT( menu->IsChecked(MenuTestCase_First + 2) ); + + menu->Check(MenuTestCase_First + 3, true); + CPPUNIT_ASSERT( menu->IsChecked(MenuTestCase_First + 3) ); + CPPUNIT_ASSERT( !menu->IsChecked(MenuTestCase_First + 2) ); + CPPUNIT_ASSERT( menu->IsChecked(MenuTestCase_First + 1) ); + + + // Insert an item in the middle of an existing radio group. + menu->InsertRadioItem(4, MenuTestCase_First + 5, "Radio 5"); + CPPUNIT_ASSERT( menu->IsChecked(MenuTestCase_First + 3) ); + + menu->Check( MenuTestCase_First + 5, true ); + CPPUNIT_ASSERT( !menu->IsChecked(MenuTestCase_First + 3) ); + + + // Prepend a couple of items before the first group. + menu->PrependRadioItem(MenuTestCase_First + 6, "Radio 6"); + menu->PrependRadioItem(MenuTestCase_First + 7, "Radio 7"); + menu->Check(MenuTestCase_First + 7, true); + CPPUNIT_ASSERT( !menu->IsChecked(MenuTestCase_First + 1) ); + + + // Check that the last radio group still works as expected. + menu->Check(MenuTestCase_First + 4, true); + CPPUNIT_ASSERT( !menu->IsChecked(MenuTestCase_First + 5) ); +} diff --git a/tests/streams/datastreamtest.cpp b/tests/streams/datastreamtest.cpp index 55fdf12871..d42dc381c9 100644 --- a/tests/streams/datastreamtest.cpp +++ b/tests/streams/datastreamtest.cpp @@ -153,7 +153,8 @@ public: ProcessData(&*Values.begin(), Values.size(), pfnWriter, pfnReader); } - bool Ok(void) const { + bool IsOk() const + { return m_ok; } }; @@ -214,8 +215,8 @@ void DataStreamTestCase::LongLongRW() CPPUNIT_ASSERT( TestRW(wxLongLong(0x12345678l)) == wxLongLong(0x12345678l) ); CPPUNIT_ASSERT( TestRW(wxLongLong(0x12345678l, 0xabcdef01l)) == wxLongLong(0x12345678l, 0xabcdef01l) ); - CPPUNIT_ASSERT( TestMultiRW(ValuesLL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).Ok() ); - CPPUNIT_ASSERT( TestMultiRW(ValuesULL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).Ok() ); + CPPUNIT_ASSERT( TestMultiRW(ValuesLL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).IsOk() ); + CPPUNIT_ASSERT( TestMultiRW(ValuesULL, &wxDataOutputStream::WriteLL, &wxDataInputStream::ReadLL).IsOk() ); } #endif @@ -238,8 +239,8 @@ void DataStreamTestCase::Int64RW() CPPUNIT_ASSERT( TestRW(wxUint64(0x12345678l)) == wxUint64(0x12345678l) ); CPPUNIT_ASSERT( TestRW((wxUint64(0x12345678l) << 32) + wxUint64(0xabcdef01l)) == (wxUint64(0x12345678l) << 32) + wxUint64(0xabcdef01l) ); - CPPUNIT_ASSERT( TestMultiRW(ValuesI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).Ok() ); - CPPUNIT_ASSERT( TestMultiRW(ValuesUI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).Ok() ); + CPPUNIT_ASSERT( TestMultiRW(ValuesI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).IsOk() ); + CPPUNIT_ASSERT( TestMultiRW(ValuesUI64, &wxDataOutputStream::Write64, &wxDataInputStream::Read64).IsOk() ); } #endif diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp index 5533edb664..da11ccaeca 100644 --- a/tests/streams/largefile.cpp +++ b/tests/streams/largefile.cpp @@ -220,7 +220,7 @@ protected: wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const { auto_ptr in(new wxFileInputStream(name)); - CPPUNIT_ASSERT(in->Ok()); + CPPUNIT_ASSERT(in->IsOk()); return in.release(); } @@ -252,7 +252,7 @@ protected: wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const { auto_ptr in(new wxFFileInputStream(name)); - CPPUNIT_ASSERT(in->Ok()); + CPPUNIT_ASSERT(in->IsOk()); return in.release(); } diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp index a05686ed0c..1d1ec0375b 100644 --- a/tests/streams/textstreamtest.cpp +++ b/tests/streams/textstreamtest.cpp @@ -129,7 +129,7 @@ void TextStreamTestCase::MiscTests() { wxString filename = wxT("testdata.fc"); wxFileInputStream fsIn(filename); - if ( !fsIn.Ok() ) + if ( !fsIn.IsOk() ) { return; } diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp index 56582e9a67..14fb85ff94 100644 --- a/tests/strings/vararg.cpp +++ b/tests/strings/vararg.cpp @@ -39,6 +39,9 @@ private: CPPUNIT_TEST( CharPrintf ); #if wxUSE_STD_STRING CPPUNIT_TEST( StdString ); +#endif +#if wxUSE_LONGLONG + CPPUNIT_TEST( LongLongPrintf ); #endif CPPUNIT_TEST( Sscanf ); CPPUNIT_TEST( RepeatedPrintf ); @@ -49,6 +52,9 @@ private: void CharPrintf(); #if wxUSE_STD_STRING void StdString(); +#endif +#if wxUSE_LONGLONG + void LongLongPrintf(); #endif void Sscanf(); void RepeatedPrintf(); @@ -152,6 +158,18 @@ void VarArgTestCase::StdString() } #endif // wxUSE_STD_STRING +#if wxUSE_LONGLONG +void VarArgTestCase::LongLongPrintf() +{ + const char * const llfmt = "%" wxLongLongFmtSpec "d"; + + CPPUNIT_ASSERT_EQUAL( "17", wxString::Format(llfmt, wxLL(17)) ); + + wxLongLong ll = 1234567890; + CPPUNIT_ASSERT_EQUAL( "1234567890", wxString::Format(llfmt, ll) ); +} +#endif // wxUSE_LONGLONG + void VarArgTestCase::Sscanf() { int i = 0; diff --git a/tests/test.bkl b/tests/test.bkl index 80b7eb176c..e6d35ee6fd 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -147,6 +147,7 @@ controls/choicebooktest.cpp controls/choicetest.cpp controls/comboboxtest.cpp + controls/datepickerctrltest.cpp controls/frametest.cpp controls/gaugetest.cpp controls/gridtest.cpp diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp index 9fd20781c2..c4f64ae8bd 100644 --- a/tests/test_test_gui.dsp +++ b/tests/test_test_gui.dsp @@ -307,6 +307,10 @@ SOURCE=.\config\config.cpp # End Source File # Begin Source File +SOURCE=.\controls\datepickerctrltest.cpp +# End Source File +# Begin Source File + SOURCE=.\dummy.cpp # ADD BASE CPP /Yc"testprec.h" # ADD CPP /Yc"testprec.h" diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj index 861d041cec..b598f0dcb6 100644 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@ -619,6 +619,9 @@ + + + + diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj index 76f0924655..8680942bca 100644 --- a/tests/test_vc9_test_gui.vcproj +++ b/tests/test_vc9_test_gui.vcproj @@ -871,6 +871,10 @@ RelativePath=".\config\config.cpp" > + + diff --git a/tests/testdate.h b/tests/testdate.h new file mode 100644 index 0000000000..5d28568da6 --- /dev/null +++ b/tests/testdate.h @@ -0,0 +1,25 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/testdate.h +// Purpose: Unit test helpers for dealing with wxDateTime. +// Author: Vadim Zeitlin +// RCS-ID: $Id$ +// Copyright: (c) 2011 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TESTS_TESTDATE_H_ +#define _WX_TESTS_TESTDATE_H_ + +#include "wx/datetime.h" + +// need this to be able to use CPPUNIT_ASSERT_EQUAL with wxDateTime objects +inline std::ostream& operator<<(std::ostream& ostr, const wxDateTime& dt) +{ + ostr << dt.FormatISOCombined(' '); + + return ostr; +} + +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxDateTime::wxDateTime_t) + +#endif // _WX_TESTS_TESTDATE_H_ diff --git a/tests/window/clientsize.cpp b/tests/window/clientsize.cpp index 1b075fa1f6..57089680ef 100644 --- a/tests/window/clientsize.cpp +++ b/tests/window/clientsize.cpp @@ -37,10 +37,12 @@ public: private: CPPUNIT_TEST_SUITE( ClientSizeTestCase ); CPPUNIT_TEST( ClientToWindow ); + CPPUNIT_TEST( ClientSizeNotNegative ); CPPUNIT_TEST( WindowToClient ); CPPUNIT_TEST_SUITE_END(); void ClientToWindow(); + void ClientSizeNotNegative(); void WindowToClient(); wxWindow *m_win; @@ -78,6 +80,18 @@ void ClientSizeTestCase::ClientToWindow() m_win->ClientToWindowSize(m_win->GetClientSize())); } +void ClientSizeTestCase::ClientSizeNotNegative() +{ + wxWindow* w = new wxWindow(wxTheApp->GetTopWindow(), -1, + wxDefaultPosition, wxDefaultSize, + wxBORDER_THEME); + w->SetSize(wxSize(1,1)); + const wxSize szw = w->GetClientSize(); + CPPUNIT_ASSERT(szw.GetWidth() >= 0); + CPPUNIT_ASSERT(szw.GetHeight() >= 0); + w->Destroy(); +} + void ClientSizeTestCase::WindowToClient() { CPPUNIT_ASSERT(m_win->GetClientSize() == diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp index 09cc8b6d07..e7f1545b17 100644 --- a/utils/emulator/src/emulator.cpp +++ b/utils/emulator/src/emulator.cpp @@ -372,7 +372,7 @@ void wxEmulatorContainer::OnPaint(wxPaintEvent& WXUNUSED(event)) wxPaintDC dc(this); wxSize sz = GetClientSize(); - if (wxGetApp().m_emulatorInfo.m_emulatorBackgroundBitmap.Ok()) + if (wxGetApp().m_emulatorInfo.m_emulatorBackgroundBitmap.IsOk()) { int deviceWidth = wxGetApp().m_emulatorInfo.m_emulatorDeviceSize.x; int deviceHeight = wxGetApp().m_emulatorInfo.m_emulatorDeviceSize.y; diff --git a/utils/helpview/src/helpviewM5.xml b/utils/helpview/src/helpviewM5.xml deleted file mode 100644 index a89b0be347..0000000000 --- a/utils/helpview/src/helpviewM5.xml +++ /dev/null @@ -1,3835 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - Classic Release - - - - UserSourceTrees - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SearchPath - Path::::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - HostFlagsAll - - - SearchPath - Path::::lib: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameClassic Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerCommandLine - Debugger Runtime - 0002000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPTypefalse - - - MWCodeGen_68K_codesizeSmall - MWCodeGen_68K_structalignmentMC68K - MWCodeGen_68K_fp_modeSANE - MWCodeGen_68K_code680200 - MWCodeGen_68K_profiler0 - MWCodeGen_68K_mpwc0 - MWCodeGen_68K_fourbyteints0 - MWCodeGen_68K_IEEEdoubles0 - MWCodeGen_68K_fardata0 - MWCodeGen_68K_farvtables0 - MWCodeGen_68K_farstrings0 - MWCodeGen_68K_pcrelstrings0 - MWCodeGen_68K_macsbugNew - MWCodeGen_68K_a6frames1 - - - MWDisassembler_68K_showcode1 - MWDisassembler_68K_mix0 - MWDisassembler_68K_nohex0 - MWDisassembler_68K_showdata1 - MWDisassembler_68K_showexceptions1 - MWDisassembler_68K_showsym0 - MWDisassembler_68K_shownames1 - - - GlobalOptimizer_68K_optimizationlevelLevel0 - GlobalOptimizer_68K_optforSpeed - - - MWLinker_68K_linksym1 - MWLinker_68K_symfullpath1 - MWLinker_68K_linksingle0 - MWLinker_68K_fastlink1 - MWLinker_68K_generateMap0 - MWLinker_68K_nolinkwarnings0 - MWLinker_68K_glueintosegone1 - MWLinker_68K_dontdeadstripinitcode0 - - - MWProject_68K_typeApplication - MWProject_68K_outfilea.out - MWProject_68K_symfilename - MWProject_68K_filecreator1061109567 - MWProject_68K_filetype1095782476 - MWProject_68K_size384 - MWProject_68K_flags22720 - MWProject_68K_rsrcheaderStandard - MWProject_68K_rsrcname - MWProject_68K_rsrctype1061109567 - MWProject_68K_rsrcid0 - MWProject_68K_rsrcmulti0 - MWProject_68K_rsrcstore0 - MWProject_68K_rsrcmerge0 - MWProject_68K_rsrcflags0 - MWProject_68K_a40 - MWProject_68K_minsize384 - MWProject_68K_rsrcsegtype0 - MWProject_68K_cfm68kcodegen0 - MWProject_68K_stacksize0 - MWProject_68K_thedebugger0 - MWProject_68K_rsrc_custom0 - MWProject_68K_is_rseg_app0 - MWProject_68K_is_pilot_lib0 - MWProject_68K_pilot_main_entry - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle1 - MWFrontEnd_C_prefixname/wx/wx_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline1 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars1 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWCFM68K_exportsNone - MWCFM68K_olddefversion0 - MWCFM68K_oldimpversion0 - MWCFM68K_currentversion0 - MWCFM68K_farthreshold256 - PCFM68K_sharedata0 - MWCFM68K_fragmentname - MWCFM68K_initname - MWCFM68K_mainname__start - MWCFM68K_termname - MWCFM68K_libfolder0 - MWCFM68K_alignmentAlign_2 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator1061109567 - MWMerge_MacOS_outputType1095782476 - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_skipResources - - *c€ - ÍcH - Íx* - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentPPC - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - PPC Mach-O CodeGen - 0001000001010000010000000001010101000000 - - PPC Mach-O Linker - 0001000000000100000100000000000000000000000000000000000000007374 - 6172740000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000 - - PPC Mach-O Target - 0001000005612E6F757400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000 - - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilehelpview Classic Release - MWProject_PPC_filecreator1061109567 - MWProject_PPC_filetype1095782476 - MWProject_PPC_size3840 - MWProject_PPC_minsize3840 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype1061109567 - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - - Name - InterfaceLib - MacOS - Library - Debug - - - Name - wx_PPC.lib - MacOS - Library - Debug - - - Name - MSL C++.PPC.Lib - MacOS - Library - Debug - - - Name - MSL C.PPC.Lib - MacOS - Library - Debug - - - Name - MathLib - MacOS - Library - Debug - - - Name - console.stubs.c - MacOS - Text - - - - Name - MSL RuntimePPC.Lib - MacOS - Library - Debug - - - Name - AppearanceLib - MacOS - Library - Debug, WeakImport - - - Name - wx_PPC.rsrc - MacOS - Resource - - - - Name - InternetConfigLib - MacOS - Library - - - - Name - ThreadsLib - MacOS - Library - - - - Name - ControlsLib - MacOS - Library - WeakImport - - - Name - DialogsLib - MacOS - Library - WeakImport - - - Name - WindowsLib - MacOS - Library - WeakImport - - - Name - MenusLib - MacOS - Library - WeakImport - - - Name - CursorDevicesGlue.o - MacOS - Library - - - - Name - PLStringFuncsPPC.lib - MacOS - Library - - - - Name - OpenTransportLib - MacOS - Library - - - - Name - OpenTptAppleTalkLib - MacOS - Library - - - - Name - OpenTptInternetLib - MacOS - Library - - - - Name - OpenTptATalkPPC.o - MacOS - Library - - - - Name - OpenTransportAppPPC.o - MacOS - Library - - - - Name - OpenTptInetPPC.o - MacOS - Library - - - - Name - tiff.lib - MacOS - Library - - - - Name - jpeg.lib - MacOS - Library - - - - Name - png.lib - MacOS - Library - - - - Name - zlib.lib - MacOS - Library - - - - Name - NavigationLib - MacOS - Library - - - - Name - CarbonAccessors.o - MacOS - Library - - - - Name - helpview.cpp - MacOS - Text - - - - - - Name - InterfaceLib - MacOS - - - Name - wx_PPC.lib - MacOS - - - Name - MSL C++.PPC.Lib - MacOS - - - Name - MSL C.PPC.Lib - MacOS - - - Name - MathLib - MacOS - - - Name - console.stubs.c - MacOS - - - Name - MSL RuntimePPC.Lib - MacOS - - - Name - AppearanceLib - MacOS - - - Name - wx_PPC.rsrc - MacOS - - - Name - InternetConfigLib - MacOS - - - Name - ThreadsLib - MacOS - - - Name - ControlsLib - MacOS - - - Name - DialogsLib - MacOS - - - Name - WindowsLib - MacOS - - - Name - MenusLib - MacOS - - - Name - CursorDevicesGlue.o - MacOS - - - Name - PLStringFuncsPPC.lib - MacOS - - - Name - OpenTransportLib - MacOS - - - Name - OpenTptAppleTalkLib - MacOS - - - Name - OpenTptInternetLib - MacOS - - - Name - OpenTptATalkPPC.o - MacOS - - - Name - OpenTransportAppPPC.o - MacOS - - - Name - OpenTptInetPPC.o - MacOS - - - Name - tiff.lib - MacOS - - - Name - jpeg.lib - MacOS - - - Name - png.lib - MacOS - - - Name - zlib.lib - MacOS - - - Name - NavigationLib - MacOS - - - Name - CarbonAccessors.o - MacOS - - - Name - helpview.cpp - MacOS - - - - - Classic Debug - - - - UserSourceTrees - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SearchPath - Path::::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - HostFlagsAll - - - SearchPath - Path::::lib: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameClassic Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerCommandLine - Debugger Runtime - 0002000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000E2D755010000000000001000E2D7E60 - 0002000000000000000000000E2D2DD000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPTypefalse - - - MWCodeGen_68K_codesizeSmall - MWCodeGen_68K_structalignmentMC68K - MWCodeGen_68K_fp_modeSANE - MWCodeGen_68K_code680200 - MWCodeGen_68K_profiler0 - MWCodeGen_68K_mpwc0 - MWCodeGen_68K_fourbyteints0 - MWCodeGen_68K_IEEEdoubles0 - MWCodeGen_68K_fardata0 - MWCodeGen_68K_farvtables0 - MWCodeGen_68K_farstrings0 - MWCodeGen_68K_pcrelstrings0 - MWCodeGen_68K_macsbugNew - MWCodeGen_68K_a6frames1 - - - MWDisassembler_68K_showcode1 - MWDisassembler_68K_mix0 - MWDisassembler_68K_nohex0 - MWDisassembler_68K_showdata1 - MWDisassembler_68K_showexceptions1 - MWDisassembler_68K_showsym0 - MWDisassembler_68K_shownames1 - - - GlobalOptimizer_68K_optimizationlevelLevel0 - GlobalOptimizer_68K_optforSpeed - - - MWLinker_68K_linksym1 - MWLinker_68K_symfullpath1 - MWLinker_68K_linksingle0 - MWLinker_68K_fastlink1 - MWLinker_68K_generateMap0 - MWLinker_68K_nolinkwarnings0 - MWLinker_68K_glueintosegone1 - MWLinker_68K_dontdeadstripinitcode0 - - - MWProject_68K_typeApplication - MWProject_68K_outfilea.out - MWProject_68K_symfilename - MWProject_68K_filecreator1061109567 - MWProject_68K_filetype1095782476 - MWProject_68K_size384 - MWProject_68K_flags22720 - MWProject_68K_rsrcheaderStandard - MWProject_68K_rsrcname - MWProject_68K_rsrctype1061109567 - MWProject_68K_rsrcid0 - MWProject_68K_rsrcmulti0 - MWProject_68K_rsrcstore0 - MWProject_68K_rsrcmerge0 - MWProject_68K_rsrcflags0 - MWProject_68K_a40 - MWProject_68K_minsize384 - MWProject_68K_rsrcsegtype0 - MWProject_68K_cfm68kcodegen0 - MWProject_68K_stacksize0 - MWProject_68K_thedebugger0 - MWProject_68K_rsrc_custom0 - MWProject_68K_is_rseg_app0 - MWProject_68K_is_pilot_lib0 - MWProject_68K_pilot_main_entry - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline1 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars1 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWWarning_C_warn_illpragma1 - MWWarning_C_warn_emptydecl1 - MWWarning_C_warn_possunwant1 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic1 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual1 - MWWarning_C_warn_implicitconv1 - MWWarning_C_warn_notinlined1 - MWWarning_C_warn_structclass1 - - - MWCFM68K_exportsNone - MWCFM68K_olddefversion0 - MWCFM68K_oldimpversion0 - MWCFM68K_currentversion0 - MWCFM68K_farthreshold256 - PCFM68K_sharedata0 - MWCFM68K_fragmentname - MWCFM68K_initname - MWCFM68K_mainname__start - MWCFM68K_termname - MWCFM68K_libfolder0 - MWCFM68K_alignmentAlign_2 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator1061109567 - MWMerge_MacOS_outputType1095782476 - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_skipResources - - *c€ - ÍcH - Íx* - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentPPC - MWCodeGen_PPC_tracebacktablesInline - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - PPC Mach-O CodeGen - 0001000001010000010000000001010101000000 - - PPC Mach-O Linker - 0001000000000100000100000000000000000000000000000000000000007374 - 6172740000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000 - - PPC Mach-O Target - 0001000005612E6F757400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000 - - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilehelpview Classic Debug - MWProject_PPC_filecreator1061109567 - MWProject_PPC_filetype1095782476 - MWProject_PPC_size3840 - MWProject_PPC_minsize3840 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype1061109567 - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - - Name - InterfaceLib - MacOS - Library - Debug - - - Name - MSL C++.PPC.Lib - MacOS - Library - Debug - - - Name - MSL C.PPC.Lib - MacOS - Library - Debug - - - Name - MathLib - MacOS - Library - Debug - - - Name - console.stubs.c - MacOS - Text - Debug - - - Name - MSL RuntimePPC.Lib - MacOS - Library - Debug - - - Name - AppearanceLib - MacOS - Library - Debug, WeakImport - - - Name - wx_PPC_d.lib - MacOS - Library - Debug - - - Name - wx_PPC.rsrc - MacOS - Resource - Debug - - - Name - InternetConfigLib - MacOS - Library - Debug - - - Name - ThreadsLib - MacOS - Library - Debug - - - Name - ControlsLib - MacOS - Library - Debug, WeakImport - - - Name - DialogsLib - MacOS - Library - Debug, WeakImport - - - Name - WindowsLib - MacOS - Library - Debug, WeakImport - - - Name - MenusLib - MacOS - Library - Debug, WeakImport - - - Name - OpenTransportLib - MacOS - Library - Debug - - - Name - OpenTptAppleTalkLib - MacOS - Library - Debug - - - Name - OpenTptInternetLib - MacOS - Library - Debug - - - Name - CursorDevicesGlue.o - MacOS - Library - Debug - - - Name - OpenTptATalkPPC.o - MacOS - Library - Debug - - - Name - OpenTransportAppPPC.o - MacOS - Library - Debug - - - Name - OpenTptInetPPC.o - MacOS - Library - Debug - - - Name - PLStringFuncsPPC.lib - MacOS - Library - Debug - - - Name - zlib.lib - MacOS - Library - Debug - - - Name - png.lib - MacOS - Library - Debug - - - Name - tiffd.lib - MacOS - Library - Debug - - - Name - jpeg.lib - MacOS - Library - Debug - - - Name - NavigationLib - MacOS - Library - Debug - - - Name - CarbonAccessors.o - MacOS - Library - Debug - - - Name - helpview.cpp - MacOS - Text - Debug - - - - - Name - InterfaceLib - MacOS - - - Name - MSL C++.PPC.Lib - MacOS - - - Name - MSL C.PPC.Lib - MacOS - - - Name - MathLib - MacOS - - - Name - console.stubs.c - MacOS - - - Name - MSL RuntimePPC.Lib - MacOS - - - Name - AppearanceLib - MacOS - - - Name - wx_PPC_d.lib - MacOS - - - Name - wx_PPC.rsrc - MacOS - - - Name - InternetConfigLib - MacOS - - - Name - ThreadsLib - MacOS - - - Name - ControlsLib - MacOS - - - Name - DialogsLib - MacOS - - - Name - WindowsLib - MacOS - - - Name - MenusLib - MacOS - - - Name - OpenTransportLib - MacOS - - - Name - OpenTptAppleTalkLib - MacOS - - - Name - OpenTptInternetLib - MacOS - - - Name - CursorDevicesGlue.o - MacOS - - - Name - OpenTptATalkPPC.o - MacOS - - - Name - OpenTransportAppPPC.o - MacOS - - - Name - OpenTptInetPPC.o - MacOS - - - Name - PLStringFuncsPPC.lib - MacOS - - - Name - zlib.lib - MacOS - - - Name - png.lib - MacOS - - - Name - tiffd.lib - MacOS - - - Name - jpeg.lib - MacOS - - - Name - NavigationLib - MacOS - - - Name - CarbonAccessors.o - MacOS - - - Name - helpview.cpp - MacOS - - - - - Carbon Debug - - - - UserSourceTrees - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SearchPath - Path::::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - HostFlagsAll - - - SearchPath - Path::::lib: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameCarbon Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerCommandLine - Debugger Runtime - 0002000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPTypefalse - - - MWCodeGen_68K_codesizeSmall - MWCodeGen_68K_structalignmentMC68K - MWCodeGen_68K_fp_modeSANE - MWCodeGen_68K_code680200 - MWCodeGen_68K_profiler0 - MWCodeGen_68K_mpwc0 - MWCodeGen_68K_fourbyteints0 - MWCodeGen_68K_IEEEdoubles0 - MWCodeGen_68K_fardata0 - MWCodeGen_68K_farvtables0 - MWCodeGen_68K_farstrings0 - MWCodeGen_68K_pcrelstrings0 - MWCodeGen_68K_macsbugNew - MWCodeGen_68K_a6frames1 - - - MWDisassembler_68K_showcode1 - MWDisassembler_68K_mix0 - MWDisassembler_68K_nohex0 - MWDisassembler_68K_showdata1 - MWDisassembler_68K_showexceptions1 - MWDisassembler_68K_showsym0 - MWDisassembler_68K_shownames1 - - - GlobalOptimizer_68K_optimizationlevelLevel0 - GlobalOptimizer_68K_optforSpeed - - - MWLinker_68K_linksym1 - MWLinker_68K_symfullpath1 - MWLinker_68K_linksingle0 - MWLinker_68K_fastlink1 - MWLinker_68K_generateMap0 - MWLinker_68K_nolinkwarnings0 - MWLinker_68K_glueintosegone1 - MWLinker_68K_dontdeadstripinitcode0 - - - MWProject_68K_typeApplication - MWProject_68K_outfilea.out - MWProject_68K_symfilename - MWProject_68K_filecreator1061109567 - MWProject_68K_filetype1095782476 - MWProject_68K_size384 - MWProject_68K_flags22720 - MWProject_68K_rsrcheaderStandard - MWProject_68K_rsrcname - MWProject_68K_rsrctype1061109567 - MWProject_68K_rsrcid0 - MWProject_68K_rsrcmulti0 - MWProject_68K_rsrcstore0 - MWProject_68K_rsrcmerge0 - MWProject_68K_rsrcflags0 - MWProject_68K_a40 - MWProject_68K_minsize384 - MWProject_68K_rsrcsegtype0 - MWProject_68K_cfm68kcodegen0 - MWProject_68K_stacksize0 - MWProject_68K_thedebugger0 - MWProject_68K_rsrc_custom0 - MWProject_68K_is_rseg_app0 - MWProject_68K_is_pilot_lib0 - MWProject_68K_pilot_main_entry - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cwc_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline1 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars1 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWWarning_C_warn_illpragma1 - MWWarning_C_warn_emptydecl1 - MWWarning_C_warn_possunwant1 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic1 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual1 - MWWarning_C_warn_implicitconv1 - MWWarning_C_warn_notinlined1 - MWWarning_C_warn_structclass1 - - - MWCFM68K_exportsNone - MWCFM68K_olddefversion0 - MWCFM68K_oldimpversion0 - MWCFM68K_currentversion0 - MWCFM68K_farthreshold256 - PCFM68K_sharedata0 - MWCFM68K_fragmentname - MWCFM68K_initname - MWCFM68K_mainname__start - MWCFM68K_termname - MWCFM68K_libfolder0 - MWCFM68K_alignmentAlign_2 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator1061109567 - MWMerge_MacOS_outputType1095782476 - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_skipResources - - *c€ - ÍcH - Íx* - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentPPC - MWCodeGen_PPC_tracebacktablesInline - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - PPC Mach-O CodeGen - 0001000001010000010000000001010101000000 - - PPC Mach-O Linker - 0001000000000100000100000000000000000000000000000000000000007374 - 6172740000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000 - - PPC Mach-O Target - 0001000005612E6F757400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000 - - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilehelpview Carbon Debug - MWProject_PPC_filecreator1061109567 - MWProject_PPC_filetype1095782476 - MWProject_PPC_size3840 - MWProject_PPC_minsize3840 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype1061109567 - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - - Name - MSL C++.PPC.Lib - MacOS - Library - Debug - - - Name - console.stubs.c - MacOS - Text - Debug - - - Name - MSL RuntimePPC.Lib - MacOS - Library - Debug - - - Name - wx_CARBON_d.lib - MacOS - Library - Debug - - - Name - MSL C.CARBON.Lib - MacOS - Library - Debug - - - Name - CarbonLib - MacOS - Library - Debug - - - Name - wx_CARBON.rsrc - MacOS - Resource - Debug - - - Name - tiffd.lib - MacOS - Library - Debug - - - Name - jpeg.lib - MacOS - Library - Debug - - - Name - png.lib - MacOS - Library - Debug - - - Name - zlib.lib - MacOS - Library - Debug - - - Name - helpview.cpp - MacOS - Text - Debug - - - - - Name - MSL C++.PPC.Lib - MacOS - - - Name - console.stubs.c - MacOS - - - Name - MSL RuntimePPC.Lib - MacOS - - - Name - wx_CARBON_d.lib - MacOS - - - Name - MSL C.CARBON.Lib - MacOS - - - Name - CarbonLib - MacOS - - - Name - wx_CARBON.rsrc - MacOS - - - Name - tiffd.lib - MacOS - - - Name - jpeg.lib - MacOS - - - Name - png.lib - MacOS - - - Name - zlib.lib - MacOS - - - Name - helpview.cpp - MacOS - - - - - Carbon Release - - - - UserSourceTrees - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SearchPath - Path::::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - HostFlagsAll - - - SearchPath - Path::::lib: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameCarbon Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerCommandLine - Debugger Runtime - 0002000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPTypefalse - - - MWCodeGen_68K_codesizeSmall - MWCodeGen_68K_structalignmentMC68K - MWCodeGen_68K_fp_modeSANE - MWCodeGen_68K_code680200 - MWCodeGen_68K_profiler0 - MWCodeGen_68K_mpwc0 - MWCodeGen_68K_fourbyteints0 - MWCodeGen_68K_IEEEdoubles0 - MWCodeGen_68K_fardata0 - MWCodeGen_68K_farvtables0 - MWCodeGen_68K_farstrings0 - MWCodeGen_68K_pcrelstrings0 - MWCodeGen_68K_macsbugNew - MWCodeGen_68K_a6frames1 - - - MWDisassembler_68K_showcode1 - MWDisassembler_68K_mix0 - MWDisassembler_68K_nohex0 - MWDisassembler_68K_showdata1 - MWDisassembler_68K_showexceptions1 - MWDisassembler_68K_showsym0 - MWDisassembler_68K_shownames1 - - - GlobalOptimizer_68K_optimizationlevelLevel0 - GlobalOptimizer_68K_optforSpeed - - - MWLinker_68K_linksym1 - MWLinker_68K_symfullpath1 - MWLinker_68K_linksingle0 - MWLinker_68K_fastlink1 - MWLinker_68K_generateMap0 - MWLinker_68K_nolinkwarnings0 - MWLinker_68K_glueintosegone1 - MWLinker_68K_dontdeadstripinitcode0 - - - MWProject_68K_typeApplication - MWProject_68K_outfilea.out - MWProject_68K_symfilename - MWProject_68K_filecreator1061109567 - MWProject_68K_filetype1095782476 - MWProject_68K_size384 - MWProject_68K_flags22720 - MWProject_68K_rsrcheaderStandard - MWProject_68K_rsrcname - MWProject_68K_rsrctype1061109567 - MWProject_68K_rsrcid0 - MWProject_68K_rsrcmulti0 - MWProject_68K_rsrcstore0 - MWProject_68K_rsrcmerge0 - MWProject_68K_rsrcflags0 - MWProject_68K_a40 - MWProject_68K_minsize384 - MWProject_68K_rsrcsegtype0 - MWProject_68K_cfm68kcodegen0 - MWProject_68K_stacksize0 - MWProject_68K_thedebugger0 - MWProject_68K_rsrc_custom0 - MWProject_68K_is_rseg_app0 - MWProject_68K_is_pilot_lib0 - MWProject_68K_pilot_main_entry - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle1 - MWFrontEnd_C_prefixname/wx/wx_cwc.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline1 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars1 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWCFM68K_exportsNone - MWCFM68K_olddefversion0 - MWCFM68K_oldimpversion0 - MWCFM68K_currentversion0 - MWCFM68K_farthreshold256 - PCFM68K_sharedata0 - MWCFM68K_fragmentname - MWCFM68K_initname - MWCFM68K_mainname__start - MWCFM68K_termname - MWCFM68K_libfolder0 - MWCFM68K_alignmentAlign_2 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator1061109567 - MWMerge_MacOS_outputType1095782476 - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_skipResources - - *c€ - ÍcH - Íx* - - - - Perl_Prefix_Filename - - - MWCodeGen_PPC_structalignmentPPC - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - PPC Mach-O CodeGen - 0001000001010000010000000001010101000000 - - PPC Mach-O Linker - 0001000000000100000100000000000000000000000000000000000000007374 - 6172740000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000 - - PPC Mach-O Target - 0001000005612E6F757400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000 - - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfilehelpview Carbon Release - MWProject_PPC_filecreator1061109567 - MWProject_PPC_filetype1095782476 - MWProject_PPC_size3840 - MWProject_PPC_minsize3840 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype1061109567 - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - - Name - MSL C++.PPC.Lib - MacOS - Library - Debug - - - Name - console.stubs.c - MacOS - Text - - - - Name - MSL RuntimePPC.Lib - MacOS - Library - Debug - - - Name - MSL C.CARBON.Lib - MacOS - Library - - - - Name - CarbonLib - MacOS - Library - - - - Name - wx_CARBON.lib - MacOS - Library - - - - Name - wx_CARBON.rsrc - MacOS - Resource - - - - Name - tiff.lib - MacOS - Library - - - - Name - jpeg.lib - MacOS - Library - - - - Name - zlib.lib - MacOS - Library - - - - Name - png.lib - MacOS - Library - - - - Name - helpview.cpp - MacOS - Text - - - - - - Name - MSL C++.PPC.Lib - MacOS - - - Name - console.stubs.c - MacOS - - - Name - MSL RuntimePPC.Lib - MacOS - - - Name - MSL C.CARBON.Lib - MacOS - - - Name - CarbonLib - MacOS - - - Name - wx_CARBON.lib - MacOS - - - Name - wx_CARBON.rsrc - MacOS - - - Name - tiff.lib - MacOS - - - Name - jpeg.lib - MacOS - - - Name - zlib.lib - MacOS - - - Name - png.lib - MacOS - - - Name - helpview.cpp - MacOS - - - - - - - Classic Release - Classic Debug - Carbon Debug - Carbon Release - - - - - Classic Release - Name - helpview.cpp - MacOS - - wx - - Classic Release - Name - wx_PPC.lib - MacOS - - - Classic Debug - Name - wx_PPC_d.lib - MacOS - - - Carbon Debug - Name - wx_CARBON_d.lib - MacOS - - - Carbon Release - Name - wx_CARBON.lib - MacOS - - - Carbon Debug - Name - wx_CARBON.rsrc - MacOS - - - Classic Release - Name - wx_PPC.rsrc - MacOS - - - Classic Release - Name - tiff.lib - MacOS - - - Classic Release - Name - zlib.lib - MacOS - - - Classic Release - Name - png.lib - MacOS - - - Classic Debug - Name - tiffd.lib - MacOS - - - Classic Release - Name - jpeg.lib - MacOS - - - MSL ANSI Libraries - - Classic Release - Name - console.stubs.c - MacOS - - - Classic Release - Name - MSL RuntimePPC.Lib - MacOS - - - Classic Release - Name - MSL C++.PPC.Lib - MacOS - - - Classic Release - Name - MSL C.PPC.Lib - MacOS - - - Carbon Debug - Name - MSL C.CARBON.Lib - MacOS - - - Win32 SDK - - MacOS - Weak Linked OS - - Classic Release - Name - ControlsLib - MacOS - - - Classic Release - Name - DialogsLib - MacOS - - - Classic Release - Name - WindowsLib - MacOS - - - Classic Release - Name - MenusLib - MacOS - - - Classic Release - Name - NavigationLib - MacOS - - - - Classic Release - Name - InterfaceLib - MacOS - - - Carbon Debug - Name - CarbonLib - MacOS - - - Classic Release - Name - CarbonAccessors.o - MacOS - - - Classic Release - Name - MathLib - MacOS - - - Classic Release - Name - AppearanceLib - MacOS - - - Classic Release - Name - InternetConfigLib - MacOS - - - Classic Release - Name - ThreadsLib - MacOS - - - Classic Release - Name - OpenTransportLib - MacOS - - - Classic Release - Name - OpenTptAppleTalkLib - MacOS - - - Classic Release - Name - OpenTptInternetLib - MacOS - - - Classic Release - Name - CursorDevicesGlue.o - MacOS - - - Classic Release - Name - OpenTptATalkPPC.o - MacOS - - - Classic Release - Name - OpenTransportAppPPC.o - MacOS - - - Classic Release - Name - PLStringFuncsPPC.lib - MacOS - - - Classic Release - Name - OpenTptInetPPC.o - MacOS - - - - - diff --git a/wxBase.spec b/wxBase.spec index 6da52b156b..eeaaca38c2 100644 --- a/wxBase.spec +++ b/wxBase.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.2 +%define ver 2.9.3 %define ver2 2.9 %define rel 1 diff --git a/wxGTK.spec b/wxGTK.spec index ae6e400837..3dad0b791f 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,5 +1,5 @@ %define _prefix /usr -%define ver 2.9.2 +%define ver 2.9.3 %define ver2 2.9 %define rel 1 diff --git a/wxMGL.spec b/wxMGL.spec index ba69bd97d4..f75efd6c9e 100644 --- a/wxMGL.spec +++ b/wxMGL.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.2 +%define ver 2.9.3 %define ver2 2.9 %define rel 1 diff --git a/wxMotif.spec b/wxMotif.spec index 54bf5c51a4..c6a2a80ec7 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.2 +%define ver 2.9.3 %define ver2 2.9 %define rel 1 diff --git a/wxX11.spec b/wxX11.spec index cf642ac112..8d183a8691 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.2 +%define ver 2.9.3 %define ver2 2.9 %define rel 1