diff --git a/Makefile.in b/Makefile.in index dcc662d74e..25997147b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -877,18 +877,6 @@ ALL_BASE_SOURCES = \ src/msw/fswatcher.cpp \ $(BASE_WINCE_SRC) \ $(BASE_OSX_SRC) \ - src/common/fdiodispatcher.cpp \ - src/common/selectdispatcher.cpp \ - src/unix/appunix.cpp \ - src/unix/evtloopunix.cpp \ - src/unix/timerunx.cpp \ - src/os2/dir.cpp \ - src/os2/mimetype.cpp \ - src/os2/snglinst.cpp \ - src/os2/stdpaths.cpp \ - src/os2/thread.cpp \ - src/os2/utils.cpp \ - src/os2/utilsexc.cpp \ src/msdos/dir.cpp \ src/msdos/mimetype.cpp \ src/msdos/utilsdos.cpp \ @@ -2154,7 +2142,6 @@ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname = \ @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__uninstall_wxtiff___depname \ @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = uninstall_wxtiff @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o -@COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o COND_wxUSE_EXPAT_builtin___wxexpat___depname = \ @@ -2593,17 +2580,6 @@ COND_TOOLKIT__BASE_OSX_HDR = \ @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR) @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR) @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h -COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR = \ - wx/unix/app.h \ - wx/os2/apptbase.h \ - wx/os2/apptrait.h \ - wx/unix/evtloop.h \ - wx/os2/mimetype.h \ - wx/os2/private.h \ - wx/os2/stdpaths.h \ - wx/os2/chkconf.h \ - wx/os2/wxrsc.h -@COND_PLATFORM_OS2_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR) COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ wx/unix/app.h \ wx/unix/apptbase.h \ @@ -2784,7 +2760,6 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR = \ @COND_TOOLKIT_OSX_CARBON@LOWLEVEL_HDR = @COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR = @COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR = -@COND_TOOLKIT_PM@LOWLEVEL_HDR = COND_TOOLKIT_WINCE_LOWLEVEL_HDR = \ wx/msw/nonownedwnd.h \ wx/msw/ole/activex.h \ @@ -3579,82 +3554,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \ wx/osx/carbon/uma.h \ wx/generic/region.h @COND_TOOLKIT_OSX_IPHONE@GUI_HDR = $(COND_TOOLKIT_OSX_IPHONE_GUI_HDR) -COND_TOOLKIT_PM_GUI_HDR = \ - wx/generic/caret.h \ - wx/generic/clrpickerg.h \ - wx/generic/collpaneg.h \ - wx/generic/colrdlgg.h \ - wx/generic/dirdlgg.h \ - wx/generic/fdrepdlg.h \ - wx/generic/listctrl.h \ - wx/generic/mdig.h \ - wx/generic/statusbr.h \ - wx/os2/accel.h \ - wx/os2/app.h \ - wx/os2/bitmap.h \ - wx/os2/bmpbuttn.h \ - wx/os2/brush.h \ - wx/os2/button.h \ - wx/os2/checkbox.h \ - wx/os2/checklst.h \ - wx/os2/choice.h \ - wx/os2/clipbrd.h \ - wx/os2/colour.h \ - wx/os2/combobox.h \ - wx/os2/control.h \ - wx/os2/cursor.h \ - wx/os2/dataform.h \ - wx/os2/dataobj.h \ - wx/os2/dataobj2.h \ - wx/os2/dc.h \ - wx/os2/dcclient.h \ - wx/os2/dcmemory.h \ - wx/os2/dcprint.h \ - wx/os2/dcscreen.h \ - wx/os2/dialog.h \ - wx/os2/dnd.h \ - wx/os2/filedlg.h \ - wx/os2/font.h \ - wx/os2/fontdlg.h \ - wx/os2/frame.h \ - wx/os2/gauge.h \ - wx/os2/gdiimage.h \ - wx/os2/helpwin.h \ - wx/os2/icon.h \ - wx/os2/iniconf.h \ - wx/os2/listbox.h \ - wx/os2/menu.h \ - wx/os2/menuitem.h \ - wx/os2/metafile.h \ - wx/os2/minifram.h \ - wx/os2/msgdlg.h \ - wx/os2/notebook.h \ - wx/os2/ownerdrw.h \ - wx/os2/palette.h \ - wx/os2/pen.h \ - wx/os2/pnghand.h \ - wx/os2/pngread.h \ - wx/os2/print.h \ - wx/os2/radiobox.h \ - wx/os2/radiobut.h \ - wx/os2/region.h \ - wx/os2/scrolbar.h \ - wx/os2/settings.h \ - wx/os2/slider.h \ - wx/os2/spinbutt.h \ - wx/os2/spinctrl.h \ - wx/os2/statbmp.h \ - wx/os2/statbox.h \ - wx/os2/statline.h \ - wx/os2/stattext.h \ - wx/os2/textctrl.h \ - wx/os2/textentry.h \ - wx/os2/tglbtn.h \ - wx/os2/toolbar.h \ - wx/os2/tooltip.h \ - wx/os2/toplevel.h \ - wx/os2/window.h -@COND_TOOLKIT_PM@GUI_HDR = $(COND_TOOLKIT_PM_GUI_HDR) COND_TOOLKIT_WINCE_GUI_HDR = \ wx/generic/clrpickerg.h \ wx/generic/collpaneg.h \ @@ -3844,8 +3743,6 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_OSX_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR) @COND_TOOLKIT_OSX_IPHONE@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_OSX_IPHONE@ wx/generic/animate.h wx/osx/sound.h -@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \ -@COND_TOOLKIT_PM@ wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_WINCE@ wx/msw/notifmsg.h wx/msw/sound.h wx/msw/taskbar.h @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \ @@ -4001,7 +3898,6 @@ COND_WXUNIV_1_ADVANCED_HDR = \ @COND_TOOLKIT_OSX_CARBON@MEDIA_PLATFORM_HDR = @COND_TOOLKIT_OSX_COCOA@MEDIA_PLATFORM_HDR = @COND_TOOLKIT_OSX_IPHONE@MEDIA_PLATFORM_HDR = -@COND_TOOLKIT_PM@MEDIA_PLATFORM_HDR = @COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = @COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR) @@ -4538,20 +4434,6 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_MSDOS_1@ monodll_msdos_dir.o monodll_msdos_mimetype.o \ @COND_PLATFORM_MSDOS_1@ monodll_utilsdos.o -COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS = \ - monodll_fdiodispatcher.o \ - monodll_selectdispatcher.o \ - monodll_appunix.o \ - monodll_evtloopunix.o \ - monodll_timerunx.o \ - monodll_os2_dir.o \ - monodll_os2_mimetype.o \ - monodll_os2_snglinst.o \ - monodll_os2_stdpaths.o \ - monodll_os2_thread.o \ - monodll_os2_utils.o \ - monodll_os2_utilsexc.o -@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_fdiodispatcher.o \ monodll_selectdispatcher.o \ @@ -4587,7 +4469,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_msw_snglinst.o \ monodll_msw_stackwalk.o \ monodll_msw_stdpaths.o \ - monodll_msw_thread.o \ + monodll_thread.o \ monodll_msw_timer.o \ monodll_msw_utils.o \ monodll_msw_utilsexc.o \ @@ -4605,7 +4487,6 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \ @COND_PLATFORM_MACOSX_1@ = monodll_socketiohandler.o monodll_sockunix.o \ @COND_PLATFORM_MACOSX_1@ monodll_sockosx.o -@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_sockunix.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_UNIX_1@ monodll_socketiohandler.o monodll_sockunix.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = \ @@ -5337,7 +5218,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_msw_font.o \ monodll_msw_fontenum.o \ monodll_msw_fontutil.o \ - monodll_msw_gdiimage.o \ + monodll_gdiimage.o \ monodll_msw_gdiobj.o \ monodll_gdiplus.o \ monodll_msw_graphics.o \ @@ -5362,12 +5243,12 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_msw_tooltip.o \ monodll_msw_toplevel.o \ monodll_uiaction.o \ - monodll_msw_utilsgui.o \ + monodll_utilsgui.o \ monodll_utilswin.o \ monodll_uxtheme.o \ monodll_msw_window.o \ monodll_helpchm.o \ - monodll_msw_helpwin.o \ + monodll_helpwin.o \ monodll_automtn.o \ monodll_uuid.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) @@ -5377,7 +5258,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS) @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_OSX_IPHONE@ $(__OSX_LOWLEVEL_SRC_OBJECTS) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS = COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \ monodll_activex.o \ monodll_msw_app.o \ @@ -5400,7 +5280,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \ monodll_msw_font.o \ monodll_msw_fontenum.o \ monodll_msw_fontutil.o \ - monodll_msw_gdiimage.o \ + monodll_gdiimage.o \ monodll_msw_gdiobj.o \ monodll_gdiplus.o \ monodll_msw_graphics.o \ @@ -5425,7 +5305,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \ monodll_msw_tooltip.o \ monodll_msw_toplevel.o \ monodll_uiaction.o \ - monodll_msw_utilsgui.o \ + monodll_utilsgui.o \ monodll_utilswin.o \ monodll_uxtheme.o \ monodll_msw_window.o @@ -5643,7 +5523,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_gtk_msgdlg.o \ monodll_gtk_nativewin.o \ monodll_gtk_notebook.o \ - monodll_gtk_print.o \ + monodll_print.o \ monodll_gtk_radiobox.o \ monodll_gtk_radiobut.o \ monodll_gtk_scrolbar.o \ @@ -5698,7 +5578,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS = \ monodll_gtk_msgdlg.o \ monodll_gtk_nativewin.o \ monodll_gtk_notebook.o \ - monodll_gtk_print.o \ + monodll_print.o \ monodll_gtk_radiobox.o \ monodll_gtk_radiobut.o \ monodll_gtk_scrolbar.o \ @@ -5811,7 +5691,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_msw_frame.o \ monodll_msw_gauge.o \ monodll_headerctrl.o \ - monodll_msw_iniconf.o \ + monodll_iniconf.o \ monodll_msw_listbox.o \ monodll_msw_listctrl.o \ monodll_msw_mdi.o \ @@ -5819,11 +5699,11 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_msw_menuitem.o \ monodll_msw_metafile.o \ monodll_msw_msgdlg.o \ - monodll_msw_nativdlg.o \ + monodll_nativdlg.o \ monodll_msw_nativewin.o \ monodll_msw_notebook.o \ monodll_access.o \ - monodll_msw_ownerdrw.o \ + monodll_ownerdrw.o \ monodll_msw_panel.o \ monodll_progdlg.o \ monodll_msw_radiobox.o \ @@ -5940,93 +5820,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS = \ monodll_iphone_utils.o \ monodll_iphone_window.o @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS) -COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ - monodll_generic_caret.o \ - monodll_clrpickerg.o \ - monodll_collpaneg.o \ - monodll_colrdlgg.o \ - monodll_dirdlgg.o \ - monodll_generic_fdrepdlg.o \ - monodll_filepickerg.o \ - monodll_fontpickerg.o \ - monodll_generic_imaglist.o \ - monodll_generic_listctrl.o \ - monodll_mdig.o \ - monodll_prntdlgg.o \ - monodll_generic_statusbr.o \ - monodll_generic_textmeasure.o \ - monodll_os2_accel.o \ - monodll_os2_app.o \ - monodll_os2_bitmap.o \ - monodll_os2_bmpbuttn.o \ - monodll_os2_brush.o \ - monodll_os2_button.o \ - monodll_os2_checkbox.o \ - monodll_os2_checklst.o \ - monodll_os2_choice.o \ - monodll_os2_clipbrd.o \ - monodll_os2_colour.o \ - monodll_os2_combobox.o \ - monodll_os2_control.o \ - monodll_os2_cursor.o \ - monodll_os2_data.o \ - monodll_os2_dataobj.o \ - monodll_os2_dc.o \ - monodll_os2_dcclient.o \ - monodll_os2_dcmemory.o \ - monodll_os2_dcprint.o \ - monodll_os2_dcscreen.o \ - monodll_os2_dialog.o \ - monodll_os2_dnd.o \ - monodll_os2_evtloop.o \ - monodll_os2_filedlg.o \ - monodll_os2_font.o \ - monodll_os2_fontdlg.o \ - monodll_os2_fontenum.o \ - monodll_os2_fontutil.o \ - monodll_os2_frame.o \ - monodll_os2_gauge.o \ - monodll_os2_gdiimage.o \ - monodll_sockpm.o \ - monodll_os2_helpwin.o \ - monodll_os2_icon.o \ - monodll_os2_iniconf.o \ - monodll_os2_listbox.o \ - monodll_os2_main.o \ - monodll_os2_menu.o \ - monodll_os2_menuitem.o \ - monodll_os2_metafile.o \ - monodll_os2_minifram.o \ - monodll_os2_msgdlg.o \ - monodll_os2_nativdlg.o \ - monodll_os2_notebook.o \ - monodll_os2_ownerdrw.o \ - monodll_os2_palette.o \ - monodll_os2_pen.o \ - monodll_os2_popupwin.o \ - monodll_os2_print.o \ - monodll_os2_radiobox.o \ - monodll_os2_radiobut.o \ - monodll_os2_region.o \ - monodll_os2_scrolbar.o \ - monodll_os2_settings.o \ - monodll_os2_slider.o \ - monodll_os2_spinbutt.o \ - monodll_os2_spinctrl.o \ - monodll_os2_statbmp.o \ - monodll_os2_statbox.o \ - monodll_os2_statline.o \ - monodll_os2_stattext.o \ - monodll_os2_textctrl.o \ - monodll_os2_textentry.o \ - monodll_os2_tglbtn.o \ - monodll_os2_timer.o \ - monodll_os2_toolbar.o \ - monodll_os2_tooltip.o \ - monodll_os2_toplevel.o \ - monodll_os2_utilsgui.o \ - monodll_os2_window.o -@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_clrpickerg.o \ monodll_collpaneg.o \ @@ -6053,7 +5846,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_msw_frame.o \ monodll_msw_gauge.o \ monodll_headerctrl.o \ - monodll_msw_iniconf.o \ + monodll_iniconf.o \ monodll_msw_listbox.o \ monodll_msw_listctrl.o \ monodll_msw_mdi.o \ @@ -6061,11 +5854,11 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_msw_menuitem.o \ monodll_msw_metafile.o \ monodll_msw_msgdlg.o \ - monodll_msw_nativdlg.o \ + monodll_nativdlg.o \ monodll_msw_nativewin.o \ monodll_msw_notebook.o \ monodll_access.o \ - monodll_msw_ownerdrw.o \ + monodll_ownerdrw.o \ monodll_msw_panel.o \ monodll_progdlg.o \ monodll_msw_radiobox.o \ @@ -6287,7 +6080,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_msw_font.o \ monodll_msw_fontenum.o \ monodll_msw_fontutil.o \ - monodll_msw_gdiimage.o \ + monodll_gdiimage.o \ monodll_msw_gdiobj.o \ monodll_gdiplus.o \ monodll_msw_graphics.o \ @@ -6312,12 +6105,12 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_msw_tooltip.o \ monodll_msw_toplevel.o \ monodll_uiaction.o \ - monodll_msw_utilsgui.o \ + monodll_utilsgui.o \ monodll_utilswin.o \ monodll_uxtheme.o \ monodll_msw_window.o \ monodll_helpchm.o \ - monodll_msw_helpwin.o \ + monodll_helpwin.o \ monodll_automtn.o \ monodll_uuid.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) @@ -6327,7 +6120,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS) @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_1 \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_1 = COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_activex.o \ monodll_msw_app.o \ @@ -6350,7 +6142,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_msw_font.o \ monodll_msw_fontenum.o \ monodll_msw_fontutil.o \ - monodll_msw_gdiimage.o \ + monodll_gdiimage.o \ monodll_msw_gdiobj.o \ monodll_gdiplus.o \ monodll_msw_graphics.o \ @@ -6375,7 +6167,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_msw_tooltip.o \ monodll_msw_toplevel.o \ monodll_uiaction.o \ - monodll_msw_utilsgui.o \ + monodll_utilsgui.o \ monodll_utilswin.o \ monodll_uxtheme.o \ monodll_msw_window.o @@ -6568,9 +6360,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS \ @COND_TOOLKIT_OSX_IPHONE@ = monodll_animateg.o monodll_sound_osx.o \ @COND_TOOLKIT_OSX_IPHONE@ monodll_core_sound.o -@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \ -@COND_TOOLKIT_PM@ monodll_animateg.o monodll_os2_joystick.o \ -@COND_TOOLKIT_PM@ monodll_os2_sound.o COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ monodll_msw_aboutdlg.o \ @@ -6697,9 +6486,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_1 \ @COND_TOOLKIT_OSX_IPHONE@ = monodll_animateg.o monodll_sound_osx.o \ @COND_TOOLKIT_OSX_IPHONE@ monodll_core_sound.o -@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_PM@ monodll_animateg.o monodll_os2_joystick.o \ -@COND_TOOLKIT_PM@ monodll_os2_sound.o COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monodll_taskbarcmn.o \ monodll_msw_aboutdlg.o \ @@ -6731,7 +6517,6 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS \ @COND_TOOLKIT_OSX_COCOA@ = monodll_osx_cocoa_mediactrl.o @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS = -@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS = @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_WINCE@ monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \ @COND_TOOLKIT_WINCE@ monodll_mediactrl_qt.o @@ -6791,20 +6576,6 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_1 \ @COND_PLATFORM_MSDOS_1@ = monolib_msdos_dir.o monolib_msdos_mimetype.o \ @COND_PLATFORM_MSDOS_1@ monolib_utilsdos.o -COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ - monolib_fdiodispatcher.o \ - monolib_selectdispatcher.o \ - monolib_appunix.o \ - monolib_evtloopunix.o \ - monolib_timerunx.o \ - monolib_os2_dir.o \ - monolib_os2_mimetype.o \ - monolib_os2_snglinst.o \ - monolib_os2_stdpaths.o \ - monolib_os2_thread.o \ - monolib_os2_utils.o \ - monolib_os2_utilsexc.o -@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_fdiodispatcher.o \ monolib_selectdispatcher.o \ @@ -6840,7 +6611,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_msw_snglinst.o \ monolib_msw_stackwalk.o \ monolib_msw_stdpaths.o \ - monolib_msw_thread.o \ + monolib_thread.o \ monolib_msw_timer.o \ monolib_msw_utils.o \ monolib_msw_utilsexc.o \ @@ -6858,7 +6629,6 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \ @COND_PLATFORM_MACOSX_1@ = monolib_socketiohandler.o monolib_sockunix.o \ @COND_PLATFORM_MACOSX_1@ monolib_sockosx.o -@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_sockunix.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_UNIX_1@ monolib_socketiohandler.o monolib_sockunix.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 \ @@ -7590,7 +7360,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_msw_font.o \ monolib_msw_fontenum.o \ monolib_msw_fontutil.o \ - monolib_msw_gdiimage.o \ + monolib_gdiimage.o \ monolib_msw_gdiobj.o \ monolib_gdiplus.o \ monolib_msw_graphics.o \ @@ -7615,12 +7385,12 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_msw_tooltip.o \ monolib_msw_toplevel.o \ monolib_uiaction.o \ - monolib_msw_utilsgui.o \ + monolib_utilsgui.o \ monolib_utilswin.o \ monolib_uxtheme.o \ monolib_msw_window.o \ monolib_helpchm.o \ - monolib_msw_helpwin.o \ + monolib_helpwin.o \ monolib_automtn.o \ monolib_uuid.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) @@ -7630,7 +7400,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ @COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_27) @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_2 \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_27) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_2 = COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_activex.o \ monolib_msw_app.o \ @@ -7653,7 +7422,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_msw_font.o \ monolib_msw_fontenum.o \ monolib_msw_fontutil.o \ - monolib_msw_gdiimage.o \ + monolib_gdiimage.o \ monolib_msw_gdiobj.o \ monolib_gdiplus.o \ monolib_msw_graphics.o \ @@ -7678,7 +7447,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_msw_tooltip.o \ monolib_msw_toplevel.o \ monolib_uiaction.o \ - monolib_msw_utilsgui.o \ + monolib_utilsgui.o \ monolib_utilswin.o \ monolib_uxtheme.o \ monolib_msw_window.o @@ -7896,7 +7665,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_gtk_msgdlg.o \ monolib_gtk_nativewin.o \ monolib_gtk_notebook.o \ - monolib_gtk_print.o \ + monolib_print.o \ monolib_gtk_radiobox.o \ monolib_gtk_radiobut.o \ monolib_gtk_scrolbar.o \ @@ -7951,7 +7720,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_1 = \ monolib_gtk_msgdlg.o \ monolib_gtk_nativewin.o \ monolib_gtk_notebook.o \ - monolib_gtk_print.o \ + monolib_print.o \ monolib_gtk_radiobox.o \ monolib_gtk_radiobut.o \ monolib_gtk_scrolbar.o \ @@ -8064,7 +7833,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_msw_frame.o \ monolib_msw_gauge.o \ monolib_headerctrl.o \ - monolib_msw_iniconf.o \ + monolib_iniconf.o \ monolib_msw_listbox.o \ monolib_msw_listctrl.o \ monolib_msw_mdi.o \ @@ -8072,11 +7841,11 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_msw_menuitem.o \ monolib_msw_metafile.o \ monolib_msw_msgdlg.o \ - monolib_msw_nativdlg.o \ + monolib_nativdlg.o \ monolib_msw_nativewin.o \ monolib_msw_notebook.o \ monolib_access.o \ - monolib_msw_ownerdrw.o \ + monolib_ownerdrw.o \ monolib_msw_panel.o \ monolib_progdlg.o \ monolib_msw_radiobox.o \ @@ -8193,93 +7962,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 = \ monolib_iphone_utils.o \ monolib_iphone_window.o @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1) -COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ - monolib_generic_caret.o \ - monolib_clrpickerg.o \ - monolib_collpaneg.o \ - monolib_colrdlgg.o \ - monolib_dirdlgg.o \ - monolib_generic_fdrepdlg.o \ - monolib_filepickerg.o \ - monolib_fontpickerg.o \ - monolib_generic_imaglist.o \ - monolib_generic_listctrl.o \ - monolib_mdig.o \ - monolib_prntdlgg.o \ - monolib_generic_statusbr.o \ - monolib_generic_textmeasure.o \ - monolib_os2_accel.o \ - monolib_os2_app.o \ - monolib_os2_bitmap.o \ - monolib_os2_bmpbuttn.o \ - monolib_os2_brush.o \ - monolib_os2_button.o \ - monolib_os2_checkbox.o \ - monolib_os2_checklst.o \ - monolib_os2_choice.o \ - monolib_os2_clipbrd.o \ - monolib_os2_colour.o \ - monolib_os2_combobox.o \ - monolib_os2_control.o \ - monolib_os2_cursor.o \ - monolib_os2_data.o \ - monolib_os2_dataobj.o \ - monolib_os2_dc.o \ - monolib_os2_dcclient.o \ - monolib_os2_dcmemory.o \ - monolib_os2_dcprint.o \ - monolib_os2_dcscreen.o \ - monolib_os2_dialog.o \ - monolib_os2_dnd.o \ - monolib_os2_evtloop.o \ - monolib_os2_filedlg.o \ - monolib_os2_font.o \ - monolib_os2_fontdlg.o \ - monolib_os2_fontenum.o \ - monolib_os2_fontutil.o \ - monolib_os2_frame.o \ - monolib_os2_gauge.o \ - monolib_os2_gdiimage.o \ - monolib_sockpm.o \ - monolib_os2_helpwin.o \ - monolib_os2_icon.o \ - monolib_os2_iniconf.o \ - monolib_os2_listbox.o \ - monolib_os2_main.o \ - monolib_os2_menu.o \ - monolib_os2_menuitem.o \ - monolib_os2_metafile.o \ - monolib_os2_minifram.o \ - monolib_os2_msgdlg.o \ - monolib_os2_nativdlg.o \ - monolib_os2_notebook.o \ - monolib_os2_ownerdrw.o \ - monolib_os2_palette.o \ - monolib_os2_pen.o \ - monolib_os2_popupwin.o \ - monolib_os2_print.o \ - monolib_os2_radiobox.o \ - monolib_os2_radiobut.o \ - monolib_os2_region.o \ - monolib_os2_scrolbar.o \ - monolib_os2_settings.o \ - monolib_os2_slider.o \ - monolib_os2_spinbutt.o \ - monolib_os2_spinctrl.o \ - monolib_os2_statbmp.o \ - monolib_os2_statbox.o \ - monolib_os2_statline.o \ - monolib_os2_stattext.o \ - monolib_os2_textctrl.o \ - monolib_os2_textentry.o \ - monolib_os2_tglbtn.o \ - monolib_os2_timer.o \ - monolib_os2_toolbar.o \ - monolib_os2_tooltip.o \ - monolib_os2_toplevel.o \ - monolib_os2_utilsgui.o \ - monolib_os2_window.o -@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_clrpickerg.o \ monolib_collpaneg.o \ @@ -8306,7 +7988,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_msw_frame.o \ monolib_msw_gauge.o \ monolib_headerctrl.o \ - monolib_msw_iniconf.o \ + monolib_iniconf.o \ monolib_msw_listbox.o \ monolib_msw_listctrl.o \ monolib_msw_mdi.o \ @@ -8314,11 +7996,11 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_msw_menuitem.o \ monolib_msw_metafile.o \ monolib_msw_msgdlg.o \ - monolib_msw_nativdlg.o \ + monolib_nativdlg.o \ monolib_msw_nativewin.o \ monolib_msw_notebook.o \ monolib_access.o \ - monolib_msw_ownerdrw.o \ + monolib_ownerdrw.o \ monolib_msw_panel.o \ monolib_progdlg.o \ monolib_msw_radiobox.o \ @@ -8540,7 +8222,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_msw_font.o \ monolib_msw_fontenum.o \ monolib_msw_fontutil.o \ - monolib_msw_gdiimage.o \ + monolib_gdiimage.o \ monolib_msw_gdiobj.o \ monolib_gdiplus.o \ monolib_msw_graphics.o \ @@ -8565,12 +8247,12 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_msw_tooltip.o \ monolib_msw_toplevel.o \ monolib_uiaction.o \ - monolib_msw_utilsgui.o \ + monolib_utilsgui.o \ monolib_utilswin.o \ monolib_uxtheme.o \ monolib_msw_window.o \ monolib_helpchm.o \ - monolib_msw_helpwin.o \ + monolib_helpwin.o \ monolib_automtn.o \ monolib_uuid.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) @@ -8580,7 +8262,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_27) @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_3 \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_27) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_3 = COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_activex.o \ monolib_msw_app.o \ @@ -8603,7 +8284,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_msw_font.o \ monolib_msw_fontenum.o \ monolib_msw_fontutil.o \ - monolib_msw_gdiimage.o \ + monolib_gdiimage.o \ monolib_msw_gdiobj.o \ monolib_gdiplus.o \ monolib_msw_graphics.o \ @@ -8628,7 +8309,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_msw_tooltip.o \ monolib_msw_toplevel.o \ monolib_uiaction.o \ - monolib_msw_utilsgui.o \ + monolib_utilsgui.o \ monolib_utilswin.o \ monolib_uxtheme.o \ monolib_msw_window.o @@ -8821,9 +8502,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_2 \ @COND_TOOLKIT_OSX_IPHONE@ = monolib_animateg.o monolib_sound_osx.o \ @COND_TOOLKIT_OSX_IPHONE@ monolib_core_sound.o -@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_PM@ monolib_animateg.o monolib_os2_joystick.o \ -@COND_TOOLKIT_PM@ monolib_os2_sound.o COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ monolib_taskbarcmn.o \ monolib_msw_aboutdlg.o \ @@ -8950,9 +8628,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_3 \ @COND_TOOLKIT_OSX_IPHONE@ = monolib_animateg.o monolib_sound_osx.o \ @COND_TOOLKIT_OSX_IPHONE@ monolib_core_sound.o -@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_PM@ monolib_animateg.o monolib_os2_joystick.o \ -@COND_TOOLKIT_PM@ monolib_os2_sound.o COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ monolib_taskbarcmn.o \ monolib_msw_aboutdlg.o \ @@ -8986,7 +8661,6 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 \ @COND_TOOLKIT_OSX_COCOA@ = monolib_osx_cocoa_mediactrl.o @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = -@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_WINCE@ monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \ @COND_TOOLKIT_WINCE@ monolib_mediactrl_qt.o @@ -9097,20 +8771,6 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_2 \ @COND_PLATFORM_MSDOS_1@ = basedll_msdos_dir.o basedll_msdos_mimetype.o \ @COND_PLATFORM_MSDOS_1@ basedll_utilsdos.o -COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ - basedll_fdiodispatcher.o \ - basedll_selectdispatcher.o \ - basedll_appunix.o \ - basedll_evtloopunix.o \ - basedll_timerunx.o \ - basedll_os2_dir.o \ - basedll_os2_mimetype.o \ - basedll_os2_snglinst.o \ - basedll_os2_stdpaths.o \ - basedll_os2_thread.o \ - basedll_os2_utils.o \ - basedll_os2_utilsexc.o -@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_fdiodispatcher.o \ basedll_selectdispatcher.o \ @@ -9146,10 +8806,10 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_msw_snglinst.o \ basedll_msw_stackwalk.o \ basedll_msw_stdpaths.o \ - basedll_msw_thread.o \ + basedll_thread.o \ basedll_timer.o \ basedll_msw_utils.o \ - basedll_msw_utilsexc.o \ + basedll_utilsexc.o \ basedll_fswatcher.o \ $(__BASE_WINCE_SRC_OBJECTS_2) @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) @@ -9199,20 +8859,6 @@ COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_3 \ @COND_PLATFORM_MSDOS_1@ = baselib_msdos_dir.o baselib_msdos_mimetype.o \ @COND_PLATFORM_MSDOS_1@ baselib_utilsdos.o -COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ - baselib_fdiodispatcher.o \ - baselib_selectdispatcher.o \ - baselib_appunix.o \ - baselib_evtloopunix.o \ - baselib_timerunx.o \ - baselib_os2_dir.o \ - baselib_os2_mimetype.o \ - baselib_os2_snglinst.o \ - baselib_os2_stdpaths.o \ - baselib_os2_thread.o \ - baselib_os2_utils.o \ - baselib_os2_utilsexc.o -@COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_fdiodispatcher.o \ baselib_selectdispatcher.o \ @@ -9248,10 +8894,10 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_msw_snglinst.o \ baselib_msw_stackwalk.o \ baselib_msw_stdpaths.o \ - baselib_msw_thread.o \ + baselib_thread.o \ baselib_timer.o \ baselib_msw_utils.o \ - baselib_msw_utilsexc.o \ + baselib_utilsexc.o \ baselib_fswatcher.o \ $(__BASE_WINCE_SRC_OBJECTS_3) @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) @@ -9333,7 +8979,6 @@ COND_USE_SOVERSOLARIS_1___netdll___so_symlinks_uninst_cmd = rm -f \ @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \ @COND_PLATFORM_MACOSX_1@ = netdll_socketiohandler.o netdll_sockunix.o \ @COND_PLATFORM_MACOSX_1@ netdll_sockosx.o -@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_sockunix.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = \ @COND_PLATFORM_UNIX_1@ netdll_socketiohandler.o netdll_sockunix.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 \ @@ -9353,7 +8998,6 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \ @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \ @COND_PLATFORM_MACOSX_1@ = netlib_socketiohandler.o netlib_sockunix.o \ @COND_PLATFORM_MACOSX_1@ netlib_sockosx.o -@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_sockunix.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = \ @COND_PLATFORM_UNIX_1@ netlib_socketiohandler.o netlib_sockunix.o @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 \ @@ -10016,7 +9660,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_msw_font.o \ coredll_msw_fontenum.o \ coredll_msw_fontutil.o \ - coredll_msw_gdiimage.o \ + coredll_gdiimage.o \ coredll_msw_gdiobj.o \ coredll_gdiplus.o \ coredll_msw_graphics.o \ @@ -10041,12 +9685,12 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_msw_tooltip.o \ coredll_msw_toplevel.o \ coredll_uiaction.o \ - coredll_msw_utilsgui.o \ + coredll_utilsgui.o \ coredll_utilswin.o \ coredll_uxtheme.o \ coredll_msw_window.o \ coredll_helpchm.o \ - coredll_msw_helpwin.o \ + coredll_helpwin.o \ coredll_automtn.o \ coredll_uuid.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) @@ -10056,7 +9700,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ @COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4) @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_4 \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_4 = COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_activex.o \ coredll_msw_app.o \ @@ -10079,7 +9722,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_msw_font.o \ coredll_msw_fontenum.o \ coredll_msw_fontutil.o \ - coredll_msw_gdiimage.o \ + coredll_gdiimage.o \ coredll_msw_gdiobj.o \ coredll_gdiplus.o \ coredll_msw_graphics.o \ @@ -10104,7 +9747,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_msw_tooltip.o \ coredll_msw_toplevel.o \ coredll_uiaction.o \ - coredll_msw_utilsgui.o \ + coredll_utilsgui.o \ coredll_utilswin.o \ coredll_uxtheme.o \ coredll_msw_window.o @@ -10322,7 +9965,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_gtk_msgdlg.o \ coredll_gtk_nativewin.o \ coredll_gtk_notebook.o \ - coredll_gtk_print.o \ + coredll_print.o \ coredll_gtk_radiobox.o \ coredll_gtk_radiobut.o \ coredll_gtk_scrolbar.o \ @@ -10377,7 +10020,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_2 = \ coredll_gtk_msgdlg.o \ coredll_gtk_nativewin.o \ coredll_gtk_notebook.o \ - coredll_gtk_print.o \ + coredll_print.o \ coredll_gtk_radiobox.o \ coredll_gtk_radiobut.o \ coredll_gtk_scrolbar.o \ @@ -10490,7 +10133,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_msw_frame.o \ coredll_msw_gauge.o \ coredll_headerctrl.o \ - coredll_msw_iniconf.o \ + coredll_iniconf.o \ coredll_msw_listbox.o \ coredll_msw_listctrl.o \ coredll_msw_mdi.o \ @@ -10498,11 +10141,11 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_msw_menuitem.o \ coredll_msw_metafile.o \ coredll_msw_msgdlg.o \ - coredll_msw_nativdlg.o \ + coredll_nativdlg.o \ coredll_msw_nativewin.o \ coredll_msw_notebook.o \ coredll_access.o \ - coredll_msw_ownerdrw.o \ + coredll_ownerdrw.o \ coredll_panel.o \ coredll_progdlg.o \ coredll_msw_radiobox.o \ @@ -10619,93 +10262,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 = \ coredll_iphone_utils.o \ coredll_iphone_window.o @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2) -COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ - coredll_generic_caret.o \ - coredll_clrpickerg.o \ - coredll_collpaneg.o \ - coredll_colrdlgg.o \ - coredll_dirdlgg.o \ - coredll_generic_fdrepdlg.o \ - coredll_filepickerg.o \ - coredll_fontpickerg.o \ - coredll_generic_imaglist.o \ - coredll_generic_listctrl.o \ - coredll_mdig.o \ - coredll_prntdlgg.o \ - coredll_generic_statusbr.o \ - coredll_generic_textmeasure.o \ - coredll_os2_accel.o \ - coredll_os2_app.o \ - coredll_os2_bitmap.o \ - coredll_os2_bmpbuttn.o \ - coredll_os2_brush.o \ - coredll_os2_button.o \ - coredll_os2_checkbox.o \ - coredll_os2_checklst.o \ - coredll_os2_choice.o \ - coredll_os2_clipbrd.o \ - coredll_os2_colour.o \ - coredll_os2_combobox.o \ - coredll_os2_control.o \ - coredll_os2_cursor.o \ - coredll_os2_data.o \ - coredll_os2_dataobj.o \ - coredll_os2_dc.o \ - coredll_os2_dcclient.o \ - coredll_os2_dcmemory.o \ - coredll_os2_dcprint.o \ - coredll_os2_dcscreen.o \ - coredll_os2_dialog.o \ - coredll_os2_dnd.o \ - coredll_os2_evtloop.o \ - coredll_os2_filedlg.o \ - coredll_os2_font.o \ - coredll_os2_fontdlg.o \ - coredll_os2_fontenum.o \ - coredll_os2_fontutil.o \ - coredll_os2_frame.o \ - coredll_os2_gauge.o \ - coredll_os2_gdiimage.o \ - coredll_sockpm.o \ - coredll_os2_helpwin.o \ - coredll_os2_icon.o \ - coredll_os2_iniconf.o \ - coredll_os2_listbox.o \ - coredll_os2_main.o \ - coredll_os2_menu.o \ - coredll_os2_menuitem.o \ - coredll_os2_metafile.o \ - coredll_os2_minifram.o \ - coredll_os2_msgdlg.o \ - coredll_os2_nativdlg.o \ - coredll_os2_notebook.o \ - coredll_os2_ownerdrw.o \ - coredll_os2_palette.o \ - coredll_os2_pen.o \ - coredll_os2_popupwin.o \ - coredll_os2_print.o \ - coredll_os2_radiobox.o \ - coredll_os2_radiobut.o \ - coredll_os2_region.o \ - coredll_os2_scrolbar.o \ - coredll_os2_settings.o \ - coredll_os2_slider.o \ - coredll_os2_spinbutt.o \ - coredll_os2_spinctrl.o \ - coredll_os2_statbmp.o \ - coredll_os2_statbox.o \ - coredll_os2_statline.o \ - coredll_os2_stattext.o \ - coredll_os2_textctrl.o \ - coredll_os2_textentry.o \ - coredll_os2_tglbtn.o \ - coredll_os2_timer.o \ - coredll_os2_toolbar.o \ - coredll_os2_tooltip.o \ - coredll_os2_toplevel.o \ - coredll_os2_utilsgui.o \ - coredll_os2_window.o -@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_clrpickerg.o \ coredll_collpaneg.o \ @@ -10732,7 +10288,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_msw_frame.o \ coredll_msw_gauge.o \ coredll_headerctrl.o \ - coredll_msw_iniconf.o \ + coredll_iniconf.o \ coredll_msw_listbox.o \ coredll_msw_listctrl.o \ coredll_msw_mdi.o \ @@ -10740,11 +10296,11 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_msw_menuitem.o \ coredll_msw_metafile.o \ coredll_msw_msgdlg.o \ - coredll_msw_nativdlg.o \ + coredll_nativdlg.o \ coredll_msw_nativewin.o \ coredll_msw_notebook.o \ coredll_access.o \ - coredll_msw_ownerdrw.o \ + coredll_ownerdrw.o \ coredll_panel.o \ coredll_progdlg.o \ coredll_msw_radiobox.o \ @@ -10966,7 +10522,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_msw_font.o \ coredll_msw_fontenum.o \ coredll_msw_fontutil.o \ - coredll_msw_gdiimage.o \ + coredll_gdiimage.o \ coredll_msw_gdiobj.o \ coredll_gdiplus.o \ coredll_msw_graphics.o \ @@ -10991,12 +10547,12 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_msw_tooltip.o \ coredll_msw_toplevel.o \ coredll_uiaction.o \ - coredll_msw_utilsgui.o \ + coredll_utilsgui.o \ coredll_utilswin.o \ coredll_uxtheme.o \ coredll_msw_window.o \ coredll_helpchm.o \ - coredll_msw_helpwin.o \ + coredll_helpwin.o \ coredll_automtn.o \ coredll_uuid.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) @@ -11006,7 +10562,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ @COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4) @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_5 \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_5 = COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_activex.o \ coredll_msw_app.o \ @@ -11029,7 +10584,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_msw_font.o \ coredll_msw_fontenum.o \ coredll_msw_fontutil.o \ - coredll_msw_gdiimage.o \ + coredll_gdiimage.o \ coredll_msw_gdiobj.o \ coredll_gdiplus.o \ coredll_msw_graphics.o \ @@ -11054,7 +10609,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_msw_tooltip.o \ coredll_msw_toplevel.o \ coredll_uiaction.o \ - coredll_msw_utilsgui.o \ + coredll_utilsgui.o \ coredll_utilswin.o \ coredll_uxtheme.o \ coredll_msw_window.o @@ -11697,7 +11252,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_msw_font.o \ corelib_msw_fontenum.o \ corelib_msw_fontutil.o \ - corelib_msw_gdiimage.o \ + corelib_gdiimage.o \ corelib_msw_gdiobj.o \ corelib_gdiplus.o \ corelib_msw_graphics.o \ @@ -11722,12 +11277,12 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_msw_tooltip.o \ corelib_msw_toplevel.o \ corelib_uiaction.o \ - corelib_msw_utilsgui.o \ + corelib_utilsgui.o \ corelib_utilswin.o \ corelib_uxtheme.o \ corelib_msw_window.o \ corelib_helpchm.o \ - corelib_msw_helpwin.o \ + corelib_helpwin.o \ corelib_automtn.o \ corelib_uuid.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) @@ -11737,7 +11292,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ @COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2) @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_6 \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_6 = COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_activex.o \ corelib_msw_app.o \ @@ -11760,7 +11314,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_msw_font.o \ corelib_msw_fontenum.o \ corelib_msw_fontutil.o \ - corelib_msw_gdiimage.o \ + corelib_gdiimage.o \ corelib_msw_gdiobj.o \ corelib_gdiplus.o \ corelib_msw_graphics.o \ @@ -11785,7 +11339,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_msw_tooltip.o \ corelib_msw_toplevel.o \ corelib_uiaction.o \ - corelib_msw_utilsgui.o \ + corelib_utilsgui.o \ corelib_utilswin.o \ corelib_uxtheme.o \ corelib_msw_window.o @@ -12003,7 +11557,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_gtk_msgdlg.o \ corelib_gtk_nativewin.o \ corelib_gtk_notebook.o \ - corelib_gtk_print.o \ + corelib_print.o \ corelib_gtk_radiobox.o \ corelib_gtk_radiobut.o \ corelib_gtk_scrolbar.o \ @@ -12058,7 +11612,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_3 = \ corelib_gtk_msgdlg.o \ corelib_gtk_nativewin.o \ corelib_gtk_notebook.o \ - corelib_gtk_print.o \ + corelib_print.o \ corelib_gtk_radiobox.o \ corelib_gtk_radiobut.o \ corelib_gtk_scrolbar.o \ @@ -12171,7 +11725,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_msw_frame.o \ corelib_msw_gauge.o \ corelib_headerctrl.o \ - corelib_msw_iniconf.o \ + corelib_iniconf.o \ corelib_msw_listbox.o \ corelib_msw_listctrl.o \ corelib_msw_mdi.o \ @@ -12179,11 +11733,11 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_msw_menuitem.o \ corelib_msw_metafile.o \ corelib_msw_msgdlg.o \ - corelib_msw_nativdlg.o \ + corelib_nativdlg.o \ corelib_msw_nativewin.o \ corelib_msw_notebook.o \ corelib_access.o \ - corelib_msw_ownerdrw.o \ + corelib_ownerdrw.o \ corelib_panel.o \ corelib_progdlg.o \ corelib_msw_radiobox.o \ @@ -12300,93 +11854,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 = \ corelib_iphone_utils.o \ corelib_iphone_window.o @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3) -COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ - corelib_generic_caret.o \ - corelib_clrpickerg.o \ - corelib_collpaneg.o \ - corelib_colrdlgg.o \ - corelib_dirdlgg.o \ - corelib_generic_fdrepdlg.o \ - corelib_filepickerg.o \ - corelib_fontpickerg.o \ - corelib_generic_imaglist.o \ - corelib_generic_listctrl.o \ - corelib_mdig.o \ - corelib_prntdlgg.o \ - corelib_generic_statusbr.o \ - corelib_generic_textmeasure.o \ - corelib_os2_accel.o \ - corelib_os2_app.o \ - corelib_os2_bitmap.o \ - corelib_os2_bmpbuttn.o \ - corelib_os2_brush.o \ - corelib_os2_button.o \ - corelib_os2_checkbox.o \ - corelib_os2_checklst.o \ - corelib_os2_choice.o \ - corelib_os2_clipbrd.o \ - corelib_os2_colour.o \ - corelib_os2_combobox.o \ - corelib_os2_control.o \ - corelib_os2_cursor.o \ - corelib_os2_data.o \ - corelib_os2_dataobj.o \ - corelib_os2_dc.o \ - corelib_os2_dcclient.o \ - corelib_os2_dcmemory.o \ - corelib_os2_dcprint.o \ - corelib_os2_dcscreen.o \ - corelib_os2_dialog.o \ - corelib_os2_dnd.o \ - corelib_os2_evtloop.o \ - corelib_os2_filedlg.o \ - corelib_os2_font.o \ - corelib_os2_fontdlg.o \ - corelib_os2_fontenum.o \ - corelib_os2_fontutil.o \ - corelib_os2_frame.o \ - corelib_os2_gauge.o \ - corelib_os2_gdiimage.o \ - corelib_sockpm.o \ - corelib_os2_helpwin.o \ - corelib_os2_icon.o \ - corelib_os2_iniconf.o \ - corelib_os2_listbox.o \ - corelib_os2_main.o \ - corelib_os2_menu.o \ - corelib_os2_menuitem.o \ - corelib_os2_metafile.o \ - corelib_os2_minifram.o \ - corelib_os2_msgdlg.o \ - corelib_os2_nativdlg.o \ - corelib_os2_notebook.o \ - corelib_os2_ownerdrw.o \ - corelib_os2_palette.o \ - corelib_os2_pen.o \ - corelib_os2_popupwin.o \ - corelib_os2_print.o \ - corelib_os2_radiobox.o \ - corelib_os2_radiobut.o \ - corelib_os2_region.o \ - corelib_os2_scrolbar.o \ - corelib_os2_settings.o \ - corelib_os2_slider.o \ - corelib_os2_spinbutt.o \ - corelib_os2_spinctrl.o \ - corelib_os2_statbmp.o \ - corelib_os2_statbox.o \ - corelib_os2_statline.o \ - corelib_os2_stattext.o \ - corelib_os2_textctrl.o \ - corelib_os2_textentry.o \ - corelib_os2_tglbtn.o \ - corelib_os2_timer.o \ - corelib_os2_toolbar.o \ - corelib_os2_tooltip.o \ - corelib_os2_toplevel.o \ - corelib_os2_utilsgui.o \ - corelib_os2_window.o -@COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3) COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_clrpickerg.o \ corelib_collpaneg.o \ @@ -12413,7 +11880,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_msw_frame.o \ corelib_msw_gauge.o \ corelib_headerctrl.o \ - corelib_msw_iniconf.o \ + corelib_iniconf.o \ corelib_msw_listbox.o \ corelib_msw_listctrl.o \ corelib_msw_mdi.o \ @@ -12421,11 +11888,11 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_msw_menuitem.o \ corelib_msw_metafile.o \ corelib_msw_msgdlg.o \ - corelib_msw_nativdlg.o \ + corelib_nativdlg.o \ corelib_msw_nativewin.o \ corelib_msw_notebook.o \ corelib_access.o \ - corelib_msw_ownerdrw.o \ + corelib_ownerdrw.o \ corelib_panel.o \ corelib_progdlg.o \ corelib_msw_radiobox.o \ @@ -12647,7 +12114,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_msw_font.o \ corelib_msw_fontenum.o \ corelib_msw_fontutil.o \ - corelib_msw_gdiimage.o \ + corelib_gdiimage.o \ corelib_msw_gdiobj.o \ corelib_gdiplus.o \ corelib_msw_graphics.o \ @@ -12672,12 +12139,12 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_msw_tooltip.o \ corelib_msw_toplevel.o \ corelib_uiaction.o \ - corelib_msw_utilsgui.o \ + corelib_utilsgui.o \ corelib_utilswin.o \ corelib_uxtheme.o \ corelib_msw_window.o \ corelib_helpchm.o \ - corelib_msw_helpwin.o \ + corelib_helpwin.o \ corelib_automtn.o \ corelib_uuid.o @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) @@ -12687,7 +12154,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ @COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2) @COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_7 \ @COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_7 = COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_activex.o \ corelib_msw_app.o \ @@ -12710,7 +12176,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_msw_font.o \ corelib_msw_fontenum.o \ corelib_msw_fontutil.o \ - corelib_msw_gdiimage.o \ + corelib_gdiimage.o \ corelib_msw_gdiobj.o \ corelib_gdiplus.o \ corelib_msw_graphics.o \ @@ -12735,7 +12201,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_msw_tooltip.o \ corelib_msw_toplevel.o \ corelib_uiaction.o \ - corelib_msw_utilsgui.o \ + corelib_utilsgui.o \ corelib_utilswin.o \ corelib_uxtheme.o \ corelib_msw_window.o @@ -12997,9 +12463,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \ @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_4 \ @COND_TOOLKIT_OSX_IPHONE@ = advdll_animateg.o advdll_sound_osx.o \ @COND_TOOLKIT_OSX_IPHONE@ advdll_core_sound.o -@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_4 = \ -@COND_TOOLKIT_PM@ advdll_animateg.o advdll_os2_joystick.o \ -@COND_TOOLKIT_PM@ advdll_os2_sound.o COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \ advdll_taskbarcmn.o \ advdll_msw_aboutdlg.o \ @@ -13126,9 +12589,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \ @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_5 \ @COND_TOOLKIT_OSX_IPHONE@ = advdll_animateg.o advdll_sound_osx.o \ @COND_TOOLKIT_OSX_IPHONE@ advdll_core_sound.o -@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_5 = \ -@COND_TOOLKIT_PM@ advdll_animateg.o advdll_os2_joystick.o \ -@COND_TOOLKIT_PM@ advdll_os2_sound.o COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \ advdll_taskbarcmn.o \ advdll_msw_aboutdlg.o \ @@ -13310,9 +12770,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \ @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_6 \ @COND_TOOLKIT_OSX_IPHONE@ = advlib_animateg.o advlib_sound_osx.o \ @COND_TOOLKIT_OSX_IPHONE@ advlib_core_sound.o -@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_6 = \ -@COND_TOOLKIT_PM@ advlib_animateg.o advlib_os2_joystick.o \ -@COND_TOOLKIT_PM@ advlib_os2_sound.o COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \ advlib_taskbarcmn.o \ advlib_msw_aboutdlg.o \ @@ -13439,9 +12896,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \ @COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_7 \ @COND_TOOLKIT_OSX_IPHONE@ = advlib_animateg.o advlib_sound_osx.o \ @COND_TOOLKIT_OSX_IPHONE@ advlib_core_sound.o -@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_7 = \ -@COND_TOOLKIT_PM@ advlib_animateg.o advlib_os2_joystick.o \ -@COND_TOOLKIT_PM@ advlib_os2_sound.o COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \ advlib_taskbarcmn.o \ advlib_msw_aboutdlg.o \ @@ -13550,7 +13004,6 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 \ @COND_TOOLKIT_OSX_COCOA@ = mediadll_osx_cocoa_mediactrl.o @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = -@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_2 = @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_WINCE@ mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \ @COND_TOOLKIT_WINCE@ mediadll_mediactrl_qt.o @@ -13584,7 +13037,6 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 \ @COND_TOOLKIT_OSX_COCOA@ = medialib_osx_cocoa_mediactrl.o @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = -@COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_3 = @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_WINCE@ medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \ @COND_TOOLKIT_WINCE@ medialib_mediactrl_qt.o @@ -14520,7 +13972,6 @@ COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_cmd = rm -f \ @COND_TOOLKIT_OSX_COCOA@ = gldll_osx_cocoa_glcanvas.o gldll_glcanvas_osx.o @COND_TOOLKIT_OSX_IPHONE@__OPENGL_SRC_PLATFORM_OBJECTS \ @COND_TOOLKIT_OSX_IPHONE@ = gldll_iphone_glcanvas.o gldll_glcanvas_osx.o -@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_os2_glcanvas.o @COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_msw_glcanvas.o @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS = \ @COND_TOOLKIT_X11@ gldll_x11_glcanvas.o gldll_glx11.o @@ -14563,7 +14014,6 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \ @COND_TOOLKIT_OSX_COCOA@ = gllib_osx_cocoa_glcanvas.o gllib_glcanvas_osx.o @COND_TOOLKIT_OSX_IPHONE@__OPENGL_SRC_PLATFORM_OBJECTS_1 \ @COND_TOOLKIT_OSX_IPHONE@ = gllib_iphone_glcanvas.o gllib_glcanvas_osx.o -@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_os2_glcanvas.o @COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_msw_glcanvas.o @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \ @COND_TOOLKIT_X11@ gllib_x11_glcanvas.o gllib_glx11.o @@ -16542,9 +15992,6 @@ wxtiff_tif_zip.o: $(srcdir)/src/tiff/libtiff/tif_zip.c @COND_PLATFORM_MACOSX_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/libtiff/tif_unix.c @COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_unix.c -@COND_PLATFORM_OS2_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/libtiff/tif_unix.c -@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_unix.c - wxexpat_xmlparse.o: $(srcdir)/src/expat/lib/xmlparse.c $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmlparse.c @@ -17247,7 +16694,7 @@ monodll_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONODLL_ODEP) monodll_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp -monodll_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(MONODLL_ODEP) +monodll_thread.o: $(srcdir)/src/msw/thread.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp monodll_msw_timer.o: $(srcdir)/src/msw/timer.cpp $(MONODLL_ODEP) @@ -17283,27 +16730,6 @@ monodll_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(MONODLL_ODEP) monodll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp -monodll_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp - -monodll_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp - -monodll_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp - -monodll_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp - -monodll_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp - -monodll_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp - -monodll_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp - monodll_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp @@ -18150,219 +17576,6 @@ monodll_cocoa_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONODLL_ODEP) monodll_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm -monodll_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp - -monodll_os2_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp - -monodll_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp - -monodll_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp - -monodll_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp - -monodll_os2_button.o: $(srcdir)/src/os2/button.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp - -monodll_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp - -monodll_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp - -monodll_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp - -monodll_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp - -monodll_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp - -monodll_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp - -monodll_os2_control.o: $(srcdir)/src/os2/control.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp - -monodll_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp - -monodll_os2_data.o: $(srcdir)/src/os2/data.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp - -monodll_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp - -monodll_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp - -monodll_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp - -monodll_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp - -monodll_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp - -monodll_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp - -monodll_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp - -monodll_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp - -monodll_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp - -monodll_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp - -monodll_os2_font.o: $(srcdir)/src/os2/font.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp - -monodll_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp - -monodll_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp - -monodll_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp - -monodll_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp - -monodll_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp - -monodll_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp - -monodll_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp - -monodll_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp - -monodll_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp - -monodll_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp - -monodll_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp - -monodll_os2_main.o: $(srcdir)/src/os2/main.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp - -monodll_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp - -monodll_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp - -monodll_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp - -monodll_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp - -monodll_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp - -monodll_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp - -monodll_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp - -monodll_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp - -monodll_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp - -monodll_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp - -monodll_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp - -monodll_os2_print.o: $(srcdir)/src/os2/print.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp - -monodll_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp - -monodll_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp - -monodll_os2_region.o: $(srcdir)/src/os2/region.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp - -monodll_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp - -monodll_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp - -monodll_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp - -monodll_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp - -monodll_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp - -monodll_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp - -monodll_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp - -monodll_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp - -monodll_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp - -monodll_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp - -monodll_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp - -monodll_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp - -monodll_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp - -monodll_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp - -monodll_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp - -monodll_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp - -monodll_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp - -monodll_os2_window.o: $(srcdir)/src/os2/window.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp - monodll_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp @@ -18936,27 +18149,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp -@COND_PLATFORM_OS2_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp - @COND_PLATFORM_UNIX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp @COND_PLATFORM_MACOSX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp -@COND_PLATFORM_OS2_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp - @COND_PLATFORM_UNIX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp @COND_PLATFORM_MACOSX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp -@COND_PLATFORM_OS2_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp - @COND_PLATFORM_UNIX_1@monodll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp @@ -18981,9 +18185,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp -@COND_PLATFORM_OS2_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp - @COND_PLATFORM_UNIX_1@monodll_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp @@ -19014,9 +18215,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp -@COND_PLATFORM_OS2_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp - @COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp @@ -19053,9 +18251,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_OS2_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp @@ -19068,9 +18263,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp @@ -19104,9 +18296,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp @@ -19602,9 +18791,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp @@ -19848,10 +19034,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP) @@ -19986,10 +19172,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONODLL_ODEP) @@ -20007,7 +19193,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP) @@ -20397,9 +19583,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp @@ -20433,9 +19616,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp @@ -20463,9 +19643,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp @@ -20496,9 +19673,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp @@ -20532,9 +19706,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp @@ -20709,10 +19880,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONODLL_ODEP) @@ -20862,9 +20033,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -20892,9 +20060,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp @@ -20916,9 +20081,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @@ -20940,9 +20102,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp @@ -20988,18 +20147,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp - @COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp @@ -21117,10 +20270,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP) @@ -21165,10 +20318,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP) @@ -21189,10 +20342,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONODLL_ODEP) @@ -22515,9 +21668,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp -@COND_TOOLKIT_PM_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp @@ -22689,12 +21839,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp -@COND_TOOLKIT_PM_USE_GUI_1@monodll_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp - -@COND_TOOLKIT_PM_USE_GUI_1@monodll_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp @@ -23124,7 +22268,7 @@ monolib_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONOLIB_ODEP) monolib_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp -monolib_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(MONOLIB_ODEP) +monolib_thread.o: $(srcdir)/src/msw/thread.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp monolib_msw_timer.o: $(srcdir)/src/msw/timer.cpp $(MONOLIB_ODEP) @@ -23160,27 +22304,6 @@ monolib_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(MONOLIB_ODEP) monolib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp -monolib_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp - -monolib_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp - -monolib_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp - -monolib_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp - -monolib_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp - -monolib_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp - -monolib_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp - monolib_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp @@ -24027,219 +23150,6 @@ monolib_cocoa_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONOLIB_ODEP) monolib_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm -monolib_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp - -monolib_os2_app.o: $(srcdir)/src/os2/app.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp - -monolib_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp - -monolib_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp - -monolib_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp - -monolib_os2_button.o: $(srcdir)/src/os2/button.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp - -monolib_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp - -monolib_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp - -monolib_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp - -monolib_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp - -monolib_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp - -monolib_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp - -monolib_os2_control.o: $(srcdir)/src/os2/control.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp - -monolib_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp - -monolib_os2_data.o: $(srcdir)/src/os2/data.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp - -monolib_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp - -monolib_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp - -monolib_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp - -monolib_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp - -monolib_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp - -monolib_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp - -monolib_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp - -monolib_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp - -monolib_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp - -monolib_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp - -monolib_os2_font.o: $(srcdir)/src/os2/font.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp - -monolib_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp - -monolib_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp - -monolib_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp - -monolib_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp - -monolib_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp - -monolib_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp - -monolib_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp - -monolib_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp - -monolib_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp - -monolib_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp - -monolib_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp - -monolib_os2_main.o: $(srcdir)/src/os2/main.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp - -monolib_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp - -monolib_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp - -monolib_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp - -monolib_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp - -monolib_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp - -monolib_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp - -monolib_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp - -monolib_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp - -monolib_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp - -monolib_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp - -monolib_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp - -monolib_os2_print.o: $(srcdir)/src/os2/print.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp - -monolib_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp - -monolib_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp - -monolib_os2_region.o: $(srcdir)/src/os2/region.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp - -monolib_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp - -monolib_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp - -monolib_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp - -monolib_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp - -monolib_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp - -monolib_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp - -monolib_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp - -monolib_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp - -monolib_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp - -monolib_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp - -monolib_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp - -monolib_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp - -monolib_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp - -monolib_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp - -monolib_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp - -monolib_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp - -monolib_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp - -monolib_os2_window.o: $(srcdir)/src/os2/window.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp - monolib_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp @@ -24813,27 +23723,18 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@monolib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp -@COND_PLATFORM_OS2_1@monolib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp - @COND_PLATFORM_UNIX_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp @COND_PLATFORM_MACOSX_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp -@COND_PLATFORM_OS2_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp - @COND_PLATFORM_UNIX_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp @COND_PLATFORM_MACOSX_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp -@COND_PLATFORM_OS2_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp - @COND_PLATFORM_UNIX_1@monolib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp @@ -24858,9 +23759,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp -@COND_PLATFORM_OS2_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp - @COND_PLATFORM_UNIX_1@monolib_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp @@ -24891,9 +23789,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp -@COND_PLATFORM_OS2_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp - @COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp @@ -24930,9 +23825,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_OS2_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp @@ -24945,9 +23837,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp @@ -24981,9 +23870,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp @@ -25479,9 +24365,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp @@ -25725,10 +24608,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP) @@ -25863,10 +24746,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP) @@ -25884,7 +24767,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP) @@ -26274,9 +25157,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp @@ -26310,9 +25190,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp @@ -26340,9 +25217,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp @@ -26373,9 +25247,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp @@ -26409,9 +25280,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp @@ -26586,10 +25454,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONOLIB_ODEP) @@ -26739,9 +25607,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -26769,9 +25634,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp @@ -26793,9 +25655,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @@ -26817,9 +25676,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp @@ -26865,18 +25721,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp - @COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp @@ -26994,10 +25844,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP) @@ -27042,10 +25892,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP) @@ -27066,10 +25916,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONOLIB_ODEP) @@ -28392,9 +27242,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp -@COND_TOOLKIT_PM_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp @@ -28566,12 +27413,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp -@COND_TOOLKIT_PM_USE_GUI_1@monolib_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp - -@COND_TOOLKIT_PM_USE_GUI_1@monolib_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp @@ -29001,7 +27842,7 @@ basedll_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASEDLL_ODEP) basedll_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp -basedll_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(BASEDLL_ODEP) +basedll_thread.o: $(srcdir)/src/msw/thread.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp basedll_timer.o: $(srcdir)/src/msw/timer.cpp $(BASEDLL_ODEP) @@ -29010,7 +27851,7 @@ basedll_timer.o: $(srcdir)/src/msw/timer.cpp $(BASEDLL_ODEP) basedll_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp -basedll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASEDLL_ODEP) +basedll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp basedll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASEDLL_ODEP) @@ -29037,27 +27878,6 @@ basedll_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(BASEDLL_ODEP) basedll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp -basedll_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp - -basedll_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp - -basedll_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp - -basedll_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp - -basedll_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp - -basedll_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp - -basedll_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp - basedll_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp @@ -29103,27 +27923,18 @@ basedll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp -@COND_PLATFORM_OS2_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp - @COND_PLATFORM_UNIX_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp @COND_PLATFORM_MACOSX_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp -@COND_PLATFORM_OS2_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp - @COND_PLATFORM_UNIX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp @COND_PLATFORM_MACOSX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp -@COND_PLATFORM_OS2_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp - @COND_PLATFORM_UNIX_1@basedll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp @@ -29148,9 +27959,6 @@ basedll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp -@COND_PLATFORM_OS2_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp - @COND_PLATFORM_UNIX_1@basedll_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(BASEDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp @@ -29181,9 +27989,6 @@ basedll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp -@COND_PLATFORM_OS2_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp - @COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp @@ -29517,7 +28322,7 @@ baselib_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASELIB_ODEP) baselib_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp -baselib_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(BASELIB_ODEP) +baselib_thread.o: $(srcdir)/src/msw/thread.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp baselib_timer.o: $(srcdir)/src/msw/timer.cpp $(BASELIB_ODEP) @@ -29526,7 +28331,7 @@ baselib_timer.o: $(srcdir)/src/msw/timer.cpp $(BASELIB_ODEP) baselib_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp -baselib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASELIB_ODEP) +baselib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp baselib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASELIB_ODEP) @@ -29553,27 +28358,6 @@ baselib_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(BASELIB_ODEP) baselib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp -baselib_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp - -baselib_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp - -baselib_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp - -baselib_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp - -baselib_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp - -baselib_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp - -baselib_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp - baselib_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp @@ -29619,27 +28403,18 @@ baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@baselib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp -@COND_PLATFORM_OS2_1@baselib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASELIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp - @COND_PLATFORM_UNIX_1@baselib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASELIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp @COND_PLATFORM_MACOSX_1@baselib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp -@COND_PLATFORM_OS2_1@baselib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASELIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp - @COND_PLATFORM_UNIX_1@baselib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASELIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp @COND_PLATFORM_MACOSX_1@baselib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp -@COND_PLATFORM_OS2_1@baselib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASELIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp - @COND_PLATFORM_UNIX_1@baselib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp @@ -29664,9 +28439,6 @@ baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@baselib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp -@COND_PLATFORM_OS2_1@baselib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASELIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp - @COND_PLATFORM_UNIX_1@baselib_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(BASELIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp @@ -29697,9 +28469,6 @@ baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@baselib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASELIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp -@COND_PLATFORM_OS2_1@baselib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASELIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp - @COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP) @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp @@ -29781,9 +28550,6 @@ netdll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETDLL_ODEP) @COND_PLATFORM_MACOSX_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_OS2_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp - netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP) $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -29838,9 +28604,6 @@ netlib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETLIB_ODEP) @COND_PLATFORM_MACOSX_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP) @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_OS2_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp - coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 @@ -30639,219 +29402,6 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(COREDLL_ODEP) coredll_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm -coredll_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp - -coredll_os2_app.o: $(srcdir)/src/os2/app.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp - -coredll_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp - -coredll_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp - -coredll_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp - -coredll_os2_button.o: $(srcdir)/src/os2/button.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp - -coredll_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp - -coredll_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp - -coredll_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp - -coredll_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp - -coredll_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp - -coredll_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp - -coredll_os2_control.o: $(srcdir)/src/os2/control.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp - -coredll_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp - -coredll_os2_data.o: $(srcdir)/src/os2/data.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp - -coredll_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp - -coredll_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp - -coredll_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp - -coredll_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp - -coredll_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp - -coredll_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp - -coredll_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp - -coredll_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp - -coredll_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp - -coredll_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp - -coredll_os2_font.o: $(srcdir)/src/os2/font.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp - -coredll_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp - -coredll_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp - -coredll_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp - -coredll_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp - -coredll_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp - -coredll_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp - -coredll_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp - -coredll_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp - -coredll_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp - -coredll_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp - -coredll_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp - -coredll_os2_main.o: $(srcdir)/src/os2/main.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp - -coredll_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp - -coredll_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp - -coredll_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp - -coredll_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp - -coredll_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp - -coredll_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp - -coredll_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp - -coredll_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp - -coredll_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp - -coredll_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp - -coredll_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp - -coredll_os2_print.o: $(srcdir)/src/os2/print.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp - -coredll_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp - -coredll_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp - -coredll_os2_region.o: $(srcdir)/src/os2/region.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp - -coredll_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp - -coredll_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp - -coredll_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp - -coredll_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp - -coredll_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp - -coredll_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp - -coredll_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp - -coredll_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp - -coredll_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp - -coredll_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp - -coredll_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp - -coredll_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp - -coredll_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp - -coredll_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp - -coredll_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp - -coredll_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp - -coredll_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp - -coredll_os2_window.o: $(srcdir)/src/os2/window.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp - coredll_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp @@ -30984,9 +29534,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp @@ -31020,9 +29567,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp @@ -31518,9 +30062,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp @@ -31764,10 +30305,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP) @@ -31902,10 +30443,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP) @@ -31923,7 +30464,7 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP) @@ -32313,9 +30854,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp @@ -32349,9 +30887,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp @@ -32379,9 +30914,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp @@ -32412,9 +30944,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp @@ -32448,9 +30977,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp @@ -32625,10 +31151,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(COREDLL_ODEP) @@ -32778,9 +31304,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -32808,9 +31331,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp @@ -32832,9 +31352,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @@ -32856,9 +31373,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp @@ -32904,18 +31418,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp - @COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp @@ -33033,10 +31541,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP) @@ -33081,10 +31589,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP) @@ -33105,10 +31613,10 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_panel.o: $(srcdir)/src/msw/panel.cpp $(COREDLL_ODEP) @@ -35022,219 +33530,6 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(CORELIB_ODEP) corelib_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm -corelib_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp - -corelib_os2_app.o: $(srcdir)/src/os2/app.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp - -corelib_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp - -corelib_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp - -corelib_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp - -corelib_os2_button.o: $(srcdir)/src/os2/button.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp - -corelib_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp - -corelib_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp - -corelib_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp - -corelib_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp - -corelib_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp - -corelib_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp - -corelib_os2_control.o: $(srcdir)/src/os2/control.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp - -corelib_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp - -corelib_os2_data.o: $(srcdir)/src/os2/data.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp - -corelib_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp - -corelib_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp - -corelib_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp - -corelib_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp - -corelib_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp - -corelib_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp - -corelib_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp - -corelib_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp - -corelib_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp - -corelib_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp - -corelib_os2_font.o: $(srcdir)/src/os2/font.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp - -corelib_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp - -corelib_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp - -corelib_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp - -corelib_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp - -corelib_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp - -corelib_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp - -corelib_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp - -corelib_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp - -corelib_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp - -corelib_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp - -corelib_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp - -corelib_os2_main.o: $(srcdir)/src/os2/main.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp - -corelib_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp - -corelib_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp - -corelib_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp - -corelib_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp - -corelib_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp - -corelib_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp - -corelib_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp - -corelib_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp - -corelib_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp - -corelib_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp - -corelib_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp - -corelib_os2_print.o: $(srcdir)/src/os2/print.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp - -corelib_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp - -corelib_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp - -corelib_os2_region.o: $(srcdir)/src/os2/region.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp - -corelib_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp - -corelib_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp - -corelib_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp - -corelib_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp - -corelib_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp - -corelib_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp - -corelib_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp - -corelib_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp - -corelib_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp - -corelib_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp - -corelib_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp - -corelib_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp - -corelib_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp - -corelib_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp - -corelib_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp - -corelib_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp - -corelib_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp - -corelib_os2_window.o: $(srcdir)/src/os2/window.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp - corelib_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp @@ -35367,9 +33662,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp @@ -35403,9 +33695,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp @@ -35901,9 +34190,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp @@ -36147,10 +34433,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP) @@ -36285,10 +34571,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP) @@ -36306,7 +34592,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP) @@ -36696,9 +34982,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp @@ -36732,9 +35015,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp @@ -36762,9 +35042,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp @@ -36795,9 +35072,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp @@ -36831,9 +35105,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp @@ -37008,10 +35279,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(CORELIB_ODEP) @@ -37161,9 +35432,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -37191,9 +35459,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp @@ -37215,9 +35480,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @@ -37239,9 +35501,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp @@ -37287,18 +35546,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp - @COND_USE_GUI_1_WXUNIV_1@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp @@ -37416,10 +35669,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP) @@ -37464,10 +35717,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP) @@ -37488,10 +35741,10 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_panel.o: $(srcdir)/src/msw/panel.cpp $(CORELIB_ODEP) @@ -38820,9 +37073,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp -@COND_TOOLKIT_PM@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp @@ -38994,12 +37244,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp -@COND_TOOLKIT_PM@advdll_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp - -@COND_TOOLKIT_PM@advdll_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp @@ -39291,9 +37535,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp -@COND_TOOLKIT_PM@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp @@ -39465,12 +37706,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp -@COND_TOOLKIT_PM@advlib_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp - -@COND_TOOLKIT_PM@advlib_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp @@ -40563,9 +38798,6 @@ gldll_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLDLL_ODEP) gldll_gtk1_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLDLL_ODEP) $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp -gldll_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLDLL_ODEP) - $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp - @COND_TOOLKIT_OSX_CARBON@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP) @COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp @@ -40626,9 +38858,6 @@ gllib_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLLIB_ODEP) gllib_gtk1_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLLIB_ODEP) $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp -gllib_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP) - $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp - @COND_TOOLKIT_OSX_CARBON@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP) @COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp @@ -40718,7 +38947,6 @@ X11INC = $(WXDIR)/include/wx/x11 MOTIFDIR = $(WXDIR)/src/motif MSDOSDIR = $(WXDIR)/src/msdos MSWDIR = $(WXDIR)/src/msw -PMDIR = $(WXDIR)/src/os2 MACDIR = $(WXDIR)/src/osx COCOADIR = $(WXDIR)/src/cocoa FTDIR = $(WXDIR)/src/freetype @@ -40989,14 +39217,12 @@ BASE_DIST: ALL_DIST INTL_DIST mkdir $(DISTDIR)/include/wx/osx mkdir $(DISTDIR)/include/wx/osx/carbon mkdir $(DISTDIR)/include/wx/osx/core - mkdir $(DISTDIR)/include/wx/os2 mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/osx mkdir $(DISTDIR)/src/osx/core mkdir $(DISTDIR)/src/osx/carbon mkdir $(DISTDIR)/src/msdos mkdir $(DISTDIR)/src/msw - mkdir $(DISTDIR)/src/os2 $(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt $(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \ diff --git a/aclocal.m4 b/aclocal.m4 index 94cc12d0be..8dbf1fad4c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -17,7 +17,6 @@ m4_include([build/aclocal/ax_cflags_gcc_option.m4]) m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4]) m4_include([build/aclocal/ax_gcc_option.m4]) m4_include([build/aclocal/ax_gxx_version.m4]) -m4_include([build/aclocal/bakefile-dllar.m4]) m4_include([build/aclocal/bakefile-lang.m4]) m4_include([build/aclocal/bakefile.m4]) m4_include([build/aclocal/cppunit.m4]) diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 76cea6a950..15f0e8a6ab 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -464,7 +464,7 @@ dnl ### begin block 20_COND_PLATFORM_MSDOS_1[wx.bkl] ### COND_PLATFORM_MSDOS_1="" fi AC_SUBST(COND_PLATFORM_MSDOS_1) -dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### +dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ### COND_PLATFORM_OS2_1="#" if test "x$PLATFORM_OS2" = "x1" ; then COND_PLATFORM_OS2_1="" @@ -866,24 +866,6 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0[wx.bkl] ### COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0) -dnl ### begin block 20_COND_TOOLKIT_PM[wx.bkl] ### - COND_TOOLKIT_PM="#" - if test "x$TOOLKIT" = "xPM" ; then - COND_TOOLKIT_PM="" - fi - AC_SUBST(COND_TOOLKIT_PM) -dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1[wx.bkl] ### - COND_TOOLKIT_PM_USE_GUI_1="#" - if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_PM_USE_GUI_1="" - fi - AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1) -dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0[wx.bkl] ### - COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="" - fi - AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0) dnl ### begin block 20_COND_TOOLKIT_WINCE[wx.bkl] ### COND_TOOLKIT_WINCE="#" if test "x$TOOLKIT" = "xWINCE" ; then diff --git a/build/aclocal/bakefile-dllar.m4 b/build/aclocal/bakefile-dllar.m4 deleted file mode 100644 index 105e40a474..0000000000 --- a/build/aclocal/bakefile-dllar.m4 +++ /dev/null @@ -1,483 +0,0 @@ -AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH], -[ -dnl ===================== dllar.sh begins here ===================== -dnl (Created by merge-scripts.py from dllar.sh -dnl file do not edit here!) -D='$' -cat <dllar.sh -#!/bin/sh -# -# dllar - a tool to build both a .dll and an .a file -# from a set of object (.o) files for EMX/OS2. -# -# Written by Andrew Zabolotny, bit@freya.etu.ru -# Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de -# -# This script will accept a set of files on the command line. -# All the public symbols from the .o files will be exported into -# a .DEF file, then linker will be run (through gcc) against them to -# build a shared library consisting of all given .o files. All libraries -# (.a) will be first decompressed into component .o files then act as -# described above. You can optionally give a description (-d "description") -# which will be put into .DLL. To see the list of accepted options (as well -# as command-line format) simply run this program without options. The .DLL -# is built to be imported by name (there is no guarantee that new versions -# of the library you build will have same ordinals for same symbols). -# -# dllar is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# dllar is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with dllar; see the file COPYING. If not, write to the Free -# Software Foundation, 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# To successfuly run this program you will need: -# - Current drive should have LFN support (HPFS, ext2, network, etc) -# (Sometimes dllar generates filenames which won't fit 8.3 scheme) -# - gcc -# (used to build the .dll) -# - emxexp -# (used to create .def file from .o files) -# - emximp -# (used to create .a file from .def file) -# - GNU text utilites (cat, sort, uniq) -# used to process emxexp output -# - GNU file utilities (mv, rm) -# - GNU sed -# - lxlite (optional, see flag below) -# (used for general .dll cleanup) -# - -flag_USE_LXLITE=1; - -# -# helper functions -# basnam, variant of basename, which does _not_ remove the path, _iff_ -# second argument (suffix to remove) is given -basnam(){ - case ${D}# in - 1) - echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//' - ;; - 2) - echo ${D}1 | sed 's/'${D}2'${D}//' - ;; - *) - echo "error in basnam ${D}*" - exit 8 - ;; - esac -} - -# Cleanup temporary files and output -CleanUp() { - cd ${D}curDir - for i in ${D}inputFiles ; do - case ${D}i in - *!) - rm -rf \`basnam ${D}i !\` - ;; - *) - ;; - esac - done - - # Kill result in case of failure as there is just to many stupid make/nmake - # things out there which doesn't do this. - if @<:@ ${D}# -eq 0 @:>@; then - rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile - fi -} - -# Print usage and exit script with rc=1. -PrintHelp() { - echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@' - echo ' @<:@-name-mangler-script script.sh@:>@' - echo ' @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@' - echo ' @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"' - echo ' @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@' - echo ' @<:@*.o@:>@ @<:@*.a@:>@' - echo '*> "output_file" should have no extension.' - echo ' If it has the .o, .a or .dll extension, it is automatically removed.' - echo ' The import library name is derived from this and is set to "name".a,' - echo ' unless overridden by -import' - echo '*> "importlib_name" should have no extension.' - echo ' If it has the .o, or .a extension, it is automatically removed.' - echo ' This name is used as the import library name and may be longer and' - echo ' more descriptive than the DLL name which has to follow the old ' - echo ' 8.3 convention of FAT.' - echo '*> "script.sh may be given to override the output_file name by a' - echo ' different name. It is mainly useful if the regular make process' - echo ' of some package does not take into account OS/2 restriction of' - echo ' DLL name lengths. It takes the importlib name as input and is' - echo ' supposed to procude a shorter name as output. The script should' - echo ' expect to get importlib_name without extension and should produce' - echo ' a (max.) 8 letter name without extension.' - echo '*> "cc" is used to use another GCC executable. (default: gcc.exe)' - echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)' - echo ' These flags will be put at the start of GCC command line.' - echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.' - echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define' - echo ' multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".' - echo ' If the last character of a symbol is "*", all symbols beginning' - echo ' with the prefix before "*" will be exclude, (see _GLOBAL* above).' - echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or' - echo ' TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.' - echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s' - echo ' C runtime DLLs.' - echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.' - echo '*> All other switches (for example -L./ or -lmylib) will be passed' - echo ' unchanged to GCC at the end of command line.' - echo '*> If you create a DLL from a library and you do not specify -o,' - echo ' the basename for DLL and import library will be set to library name,' - echo ' the initial library will be renamed to 'name'_s.a (_s for static)' - echo ' i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial' - echo ' library will be renamed into gcc_s.a.' - echo '--------' - echo 'Example:' - echo ' dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord' - echo ' -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"' - CleanUp - exit 1 -} - -# Execute a command. -# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script. -# @Uses Whatever CleanUp() uses. -doCommand() { - echo "${D}*" - eval ${D}* - rcCmd=${D}? - - if @<:@ ${D}rcCmd -ne 0 @:>@; then - echo "command failed, exit code="${D}rcCmd - CleanUp - exit ${D}rcCmd - fi -} - -# main routine -# setup globals -cmdLine=${D}* -outFile="" -outimpFile="" -inputFiles="" -renameScript="" -description="" -CC=gcc.exe -CFLAGS="-s -Zcrtdll" -EXTRA_CFLAGS="" -EXPORT_BY_ORDINALS=0 -exclude_symbols="" -library_flags="" -curDir=\`pwd\` -curDirS=curDir -case ${D}curDirS in -*/) - ;; -*) - curDirS=${D}{curDirS}"/" - ;; -esac -# Parse commandline -libsToLink=0 -omfLinking=0 -while @<:@ ${D}1 @:>@; do - case ${D}1 in - -ord*) - EXPORT_BY_ORDINALS=1; - ;; - -o*) - shift - outFile=${D}1 - ;; - -i*) - shift - outimpFile=${D}1 - ;; - -name-mangler-script) - shift - renameScript=${D}1 - ;; - -d*) - shift - description=${D}1 - ;; - -f*) - shift - CFLAGS=${D}1 - ;; - -c*) - shift - CC=${D}1 - ;; - -h*) - PrintHelp - ;; - -ex*) - shift - exclude_symbols=${D}{exclude_symbols}${D}1" " - ;; - -libf*) - shift - library_flags=${D}{library_flags}${D}1" " - ;; - -nocrt*) - CFLAGS="-s" - ;; - -nolxl*) - flag_USE_LXLITE=0 - ;; - -* | /*) - case ${D}1 in - -L* | -l*) - libsToLink=1 - ;; - -Zomf) - omfLinking=1 - ;; - *) - ;; - esac - EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1 - ;; - *.dll) - EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`" - if @<:@ ${D}omfLinking -eq 1 @:>@; then - EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib" - else - EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a" - fi - ;; - *) - found=0; - if @<:@ ${D}libsToLink -ne 0 @:>@; then - EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1 - else - for file in ${D}1 ; do - if @<:@ -f ${D}file @:>@; then - inputFiles="${D}{inputFiles} ${D}file" - found=1 - fi - done - if @<:@ ${D}found -eq 0 @:>@; then - echo "ERROR: No file(s) found: "${D}1 - exit 8 - fi - fi - ;; - esac - shift -done # iterate cmdline words - -# -if @<:@ -z "${D}inputFiles" @:>@; then - echo "dllar: no input files" - PrintHelp -fi - -# Now extract all .o files from .a files -newInputFiles="" -for file in ${D}inputFiles ; do - case ${D}file in - *.a | *.lib) - case ${D}file in - *.a) - suffix=".a" - AR="ar" - ;; - *.lib) - suffix=".lib" - AR="emxomfar" - EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf" - ;; - *) - ;; - esac - dirname=\`basnam ${D}file ${D}suffix\`"_%" - mkdir ${D}dirname - if @<:@ ${D}? -ne 0 @:>@; then - echo "Failed to create subdirectory ./${D}dirname" - CleanUp - exit 8; - fi - # Append '!' to indicate archive - newInputFiles="${D}newInputFiles ${D}{dirname}!" - doCommand "cd ${D}dirname; ${D}AR x ../${D}file" - cd ${D}curDir - found=0; - for subfile in ${D}dirname/*.o* ; do - if @<:@ -f ${D}subfile @:>@; then - found=1 - if @<:@ -s ${D}subfile @:>@; then - # FIXME: This should be: is file size > 32 byte, _not_ > 0! - newInputFiles="${D}newInputFiles ${D}subfile" - fi - fi - done - if @<:@ ${D}found -eq 0 @:>@; then - echo "WARNING: there are no files in archive \\'${D}file\\'" - fi - ;; - *) - newInputFiles="${D}{newInputFiles} ${D}file" - ;; - esac -done -inputFiles="${D}newInputFiles" - -# Output filename(s). -do_backup=0; -if @<:@ -z ${D}outFile @:>@; then - do_backup=1; - set outFile ${D}inputFiles; outFile=${D}2 -fi - -# If it is an archive, remove the '!' and the '_%' suffixes -case ${D}outFile in -*_%!) - outFile=\`basnam ${D}outFile _%!\` - ;; -*) - ;; -esac -case ${D}outFile in -*.dll) - outFile=\`basnam ${D}outFile .dll\` - ;; -*.DLL) - outFile=\`basnam ${D}outFile .DLL\` - ;; -*.o) - outFile=\`basnam ${D}outFile .o\` - ;; -*.obj) - outFile=\`basnam ${D}outFile .obj\` - ;; -*.a) - outFile=\`basnam ${D}outFile .a\` - ;; -*.lib) - outFile=\`basnam ${D}outFile .lib\` - ;; -*) - ;; -esac -case ${D}outimpFile in -*.a) - outimpFile=\`basnam ${D}outimpFile .a\` - ;; -*.lib) - outimpFile=\`basnam ${D}outimpFile .lib\` - ;; -*) - ;; -esac -if @<:@ -z ${D}outimpFile @:>@; then - outimpFile=${D}outFile -fi -defFile="${D}{outFile}.def" -arcFile="${D}{outimpFile}.a" -arcFile2="${D}{outimpFile}.lib" - -#create ${D}dllFile as something matching 8.3 restrictions, -if @<:@ -z ${D}renameScript @:>@ ; then - dllFile="${D}outFile" -else - dllFile=\`${D}renameScript ${D}outimpFile\` -fi - -if @<:@ ${D}do_backup -ne 0 @:>@ ; then - if @<:@ -f ${D}arcFile @:>@ ; then - doCommand "mv ${D}arcFile ${D}{outFile}_s.a" - fi - if @<:@ -f ${D}arcFile2 @:>@ ; then - doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib" - fi -fi - -# Extract public symbols from all the object files. -tmpdefFile=${D}{defFile}_% -rm -f ${D}tmpdefFile -for file in ${D}inputFiles ; do - case ${D}file in - *!) - ;; - *) - doCommand "emxexp -u ${D}file >> ${D}tmpdefFile" - ;; - esac -done - -# Create the def file. -rm -f ${D}defFile -echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile -dllFile="${D}{dllFile}.dll" -if @<:@ ! -z ${D}description @:>@; then - echo "DESCRIPTION \\"${D}{description}\\"" >> ${D}defFile -fi -echo "EXPORTS" >> ${D}defFile - -doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%" -grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile - -# Checks if the export is ok or not. -for word in ${D}exclude_symbols; do - grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}% - mv ${D}{tmpdefFile}% ${D}tmpdefFile -done - - -if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then - sed "=" < ${D}tmpdefFile | \\ - sed ' - N - : loop - s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/ - t loop - ' > ${D}{tmpdefFile}% - grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile -else - rm -f ${D}{tmpdefFile}% -fi -cat ${D}tmpdefFile >> ${D}defFile -rm -f ${D}tmpdefFile - -# Do linking, create implib, and apply lxlite. -gccCmdl=""; -for file in ${D}inputFiles ; do - case ${D}file in - *!) - ;; - *) - gccCmdl="${D}gccCmdl ${D}file" - ;; - esac -done -doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS" -touch "${D}{outFile}.dll" - -doCommand "emximp -o ${D}arcFile ${D}defFile" -if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then - add_flags=""; - if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then - add_flags="-ynd" - fi - doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile" -fi -doCommand "emxomf -s -l ${D}arcFile" - -# Successful exit. -CleanUp 1 -exit 0 -EOF -dnl ===================== dllar.sh ends here ===================== -]) diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 index 6c0d8d7b8a..f9194da5b2 100644 --- a/build/aclocal/bakefile.m4 +++ b/build/aclocal/bakefile.m4 @@ -73,7 +73,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM], PLATFORM_MAC=0 PLATFORM_MACOS=0 PLATFORM_MACOSX=0 - PLATFORM_OS2=0 PLATFORM_BEOS=0 if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then @@ -84,9 +83,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM], *-pc-msdosdjgpp ) PLATFORM_MSDOS=1 ;; - *-pc-os2_emx | *-pc-os2-emx ) - PLATFORM_OS2=1 - ;; *-*-darwin* ) PLATFORM_MAC=1 PLATFORM_MACOSX=1 @@ -110,9 +106,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM], msdos ) PLATFORM_MSDOS=1 ;; - os2 ) - PLATFORM_OS2=1 - ;; darwin ) PLATFORM_MAC=1 PLATFORM_MACOSX=1 @@ -135,7 +128,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM], AC_SUBST(PLATFORM_MAC) AC_SUBST(PLATFORM_MACOS) AC_SUBST(PLATFORM_MACOSX) - AC_SUBST(PLATFORM_OS2) AC_SUBST(PLATFORM_BEOS) ]) @@ -148,10 +140,6 @@ dnl --------------------------------------------------------------------------- AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS], [ - AC_ARG_ENABLE([omf], AS_HELP_STRING([--enable-omf], - [use OMF object format (OS/2)]), - [bk_os2_use_omf="$enableval"]) - case "${BAKEFILE_HOST}" in *-*-darwin* ) dnl For Unix to MacOS X porting instructions, see: @@ -166,19 +154,6 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS], fi ;; - *-pc-os2_emx | *-pc-os2-emx ) - if test "x$bk_os2_use_omf" = "xyes" ; then - AR=emxomfar - RANLIB=: - LDFLAGS="-Zomf $LDFLAGS" - CFLAGS="-Zomf $CFLAGS" - CXXFLAGS="-Zomf $CXXFLAGS" - OS2_LIBEXT="lib" - else - OS2_LIBEXT="a" - fi - ;; - i*86-*-beos* ) LDFLAGS="-L/boot/develop/lib/x86 $LDFLAGS" ;; @@ -243,16 +218,6 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES], DLLPREFIX="" dlldir="$bindir" ;; - *-pc-os2_emx | *-pc-os2-emx ) - SO_SUFFIX="dll" - SO_SUFFIX_MODULE="dll" - DLLIMP_SUFFIX=$OS2_LIBEXT - EXEEXT=".exe" - DLLPREFIX="" - LIBPREFIX="" - LIBEXT=".$OS2_LIBEXT" - dlldir="$bindir" - ;; *-*-darwin* ) SO_SUFFIX="dylib" SO_SUFFIX_MODULE="bundle" @@ -432,14 +397,6 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD], WINDOWS_IMPLIB=1 ;; - *-pc-os2_emx | *-pc-os2-emx ) - SHARED_LD_CC="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - SHARED_LD_CXX="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - PIC_FLAG="" - AC_BAKEFILE_CREATE_FILE_DLLAR_SH - chmod +x dllar.sh - ;; - powerpc-apple-macos* | \ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ *-*-mirbsd* | \ diff --git a/build/autogen.mk b/build/autogen.mk index 3eba33b0b9..f72b447808 100644 --- a/build/autogen.mk +++ b/build/autogen.mk @@ -54,7 +54,6 @@ ACLOCAL_SOURCES = \ build/aclocal/ac_raf_func_which_getservbyname_r.m4 \ build/aclocal/atomic_builtins.m4 \ build/aclocal/ax_func_which_gethostbyname_r.m4 \ - build/aclocal/bakefile-dllar.m4 \ build/aclocal/bakefile-lang.m4 \ build/aclocal/bakefile.m4 \ build/aclocal/cppunit.m4 \ diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 2099b49647..6557fc05f2 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -558,13 +558,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(EXTRALIBS_FOR_BASE) - - - - upm32 - - - $(UNICOWS_LIB) diff --git a/build/bakefiles/common_samples_intree.bkl b/build/bakefiles/common_samples_intree.bkl index c845ef282c..c0c487854c 100644 --- a/build/bakefiles/common_samples_intree.bkl +++ b/build/bakefiles/common_samples_intree.bkl @@ -31,9 +31,6 @@ $(WXTOPDIR)samples/sample.rc - - - @@ -104,20 +101,6 @@ - - - - - - $(TOP_SRCDIR)include/wx/os2/wx.res - - - $(os2_lib_res) - diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl index 7484df0554..65e5a3e6de 100644 --- a/build/bakefiles/config.bkl +++ b/build/bakefiles/config.bkl @@ -445,7 +445,7 @@ to run the tests, include CppUnit library here. - + @@ -477,7 +477,6 @@ it if SHARED=1 unless you know what you are doing. $(WIN32_TOOLKIT) $(WIN32_TOOLKIT) $(WIN32_TOOLKIT) - PM wince @@ -486,7 +485,6 @@ it if SHARED=1 unless you know what you are doing. $(WIN32_TOOLKIT_LOWERCASE) $(WIN32_TOOLKIT_LOWERCASE) $(WIN32_TOOLKIT_LOWERCASE) - pm diff --git a/build/bakefiles/expat.bkl b/build/bakefiles/expat.bkl index 8c69ebe7a1..5df403bcfd 100644 --- a/build/bakefiles/expat.bkl +++ b/build/bakefiles/expat.bkl @@ -33,9 +33,6 @@ COMPILED_FROM_DSP - - OS2_32 - __MSDOS__ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 1f598f167c..eca94ba691 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -241,38 +241,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(BASE_COREFOUNDATION_HDR) - - - - - - src/common/fdiodispatcher.cpp - src/common/selectdispatcher.cpp - src/unix/appunix.cpp - src/unix/evtloopunix.cpp - src/unix/timerunx.cpp - src/os2/dir.cpp - src/os2/mimetype.cpp - src/os2/snglinst.cpp - src/os2/stdpaths.cpp - src/os2/thread.cpp - src/os2/utils.cpp - src/os2/utilsexc.cpp - - - - - wx/unix/app.h - wx/os2/apptbase.h - wx/os2/apptrait.h - wx/unix/evtloop.h - wx/os2/mimetype.h - wx/os2/private.h - wx/os2/stdpaths.h - wx/os2/chkconf.h - wx/os2/wxrsc.h - - @@ -581,10 +549,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/wince/net.h - - src/unix/sockunix.cpp - - src/common/fs_inet.cpp src/common/ftp.cpp @@ -2060,183 +2024,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - - - - - - - - - - - - src/generic/caret.cpp - src/generic/clrpickerg.cpp - src/generic/collpaneg.cpp - src/generic/colrdlgg.cpp - src/generic/dirdlgg.cpp - src/generic/fdrepdlg.cpp - src/generic/filepickerg.cpp - src/generic/fontpickerg.cpp - src/generic/imaglist.cpp - src/generic/listctrl.cpp - src/generic/mdig.cpp - src/generic/prntdlgg.cpp - src/generic/statusbr.cpp - src/generic/textmeasure.cpp - - src/os2/accel.cpp - src/os2/app.cpp - src/os2/bitmap.cpp - src/os2/bmpbuttn.cpp - src/os2/brush.cpp - src/os2/button.cpp - src/os2/checkbox.cpp - src/os2/checklst.cpp - src/os2/choice.cpp - src/os2/clipbrd.cpp - src/os2/colour.cpp - src/os2/combobox.cpp - src/os2/control.cpp - src/os2/cursor.cpp - src/os2/data.cpp - src/os2/dataobj.cpp - src/os2/dc.cpp - src/os2/dcclient.cpp - src/os2/dcmemory.cpp - src/os2/dcprint.cpp - src/os2/dcscreen.cpp - src/os2/dialog.cpp - src/os2/dnd.cpp - src/os2/evtloop.cpp - src/os2/filedlg.cpp - src/os2/font.cpp - src/os2/fontdlg.cpp - src/os2/fontenum.cpp - src/os2/fontutil.cpp - src/os2/frame.cpp - src/os2/gauge.cpp - src/os2/gdiimage.cpp - src/os2/sockpm.cpp - src/os2/helpwin.cpp - src/os2/icon.cpp - src/os2/iniconf.cpp - src/os2/listbox.cpp - src/os2/main.cpp - src/os2/menu.cpp - src/os2/menuitem.cpp - src/os2/metafile.cpp - src/os2/minifram.cpp - src/os2/msgdlg.cpp - src/os2/nativdlg.cpp - src/os2/notebook.cpp - src/os2/ownerdrw.cpp - src/os2/palette.cpp - src/os2/pen.cpp - src/os2/popupwin.cpp - src/os2/print.cpp - src/os2/radiobox.cpp - src/os2/radiobut.cpp - src/os2/region.cpp - src/os2/scrolbar.cpp - src/os2/settings.cpp - src/os2/slider.cpp - src/os2/spinbutt.cpp - src/os2/spinctrl.cpp - src/os2/statbmp.cpp - src/os2/statbox.cpp - src/os2/statline.cpp - src/os2/stattext.cpp - src/os2/textctrl.cpp - src/os2/textentry.cpp - src/os2/tglbtn.cpp - src/os2/timer.cpp - src/os2/toolbar.cpp - src/os2/tooltip.cpp - src/os2/toplevel.cpp - src/os2/utilsgui.cpp - src/os2/window.cpp - - - wx/generic/caret.h - wx/generic/clrpickerg.h - wx/generic/collpaneg.h - wx/generic/colrdlgg.h - wx/generic/dirdlgg.h - wx/generic/fdrepdlg.h - wx/generic/listctrl.h - wx/generic/mdig.h - wx/generic/statusbr.h - wx/os2/accel.h - wx/os2/app.h - wx/os2/bitmap.h - wx/os2/bmpbuttn.h - wx/os2/brush.h - wx/os2/button.h - wx/os2/checkbox.h - wx/os2/checklst.h - wx/os2/choice.h - wx/os2/clipbrd.h - wx/os2/colour.h - wx/os2/combobox.h - wx/os2/control.h - wx/os2/cursor.h - wx/os2/dataform.h - wx/os2/dataobj.h - wx/os2/dataobj2.h - wx/os2/dc.h - wx/os2/dcclient.h - wx/os2/dcmemory.h - wx/os2/dcprint.h - wx/os2/dcscreen.h - wx/os2/dialog.h - wx/os2/dnd.h - wx/os2/filedlg.h - wx/os2/font.h - wx/os2/fontdlg.h - wx/os2/frame.h - wx/os2/gauge.h - wx/os2/gdiimage.h - wx/os2/helpwin.h - wx/os2/icon.h - wx/os2/iniconf.h - wx/os2/listbox.h - wx/os2/menu.h - wx/os2/menuitem.h - wx/os2/metafile.h - wx/os2/minifram.h - wx/os2/msgdlg.h - wx/os2/notebook.h - wx/os2/ownerdrw.h - wx/os2/palette.h - wx/os2/pen.h - wx/os2/pnghand.h - wx/os2/pngread.h - wx/os2/print.h - wx/os2/radiobox.h - wx/os2/radiobut.h - wx/os2/region.h - wx/os2/scrolbar.h - wx/os2/settings.h - wx/os2/slider.h - wx/os2/spinbutt.h - wx/os2/spinctrl.h - wx/os2/statbmp.h - wx/os2/statbox.h - wx/os2/statline.h - wx/os2/stattext.h - wx/os2/textctrl.h - wx/os2/textentry.h - wx/os2/tglbtn.h - wx/os2/toolbar.h - wx/os2/tooltip.h - wx/os2/toplevel.h - wx/os2/window.h - - - - @@ -3152,17 +2939,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/core/joystick.h - - src/generic/animateg.cpp - src/os2/joystick.cpp - src/os2/sound.cpp - - - wx/generic/animate.h - wx/os2/joystick.h - wx/os2/sound.h - - src/common/taskbarcmn.cpp src/unix/joystick.cpp @@ -3321,11 +3097,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - - - - - src/unix/mediactrl.cpp @@ -3626,7 +3397,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/glcanvas.cpp src/x11/glcanvas.cpp src/unix/glx11.cpp src/x11/glcanvas.cpp src/unix/glx11.cpp - src/os2/glcanvas.cpp @@ -3850,7 +3620,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC) $(BASE_OSX_SHARED_SRC) - $(BASE_OS2_SRC) $(BASE_MSDOS_SRC) @@ -3884,7 +3653,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(BASE_WIN32_HDR) $(BASE_WINCE_HDR) $(BASE_OSX_HDR) $(BASE_MSDOS_HDR) - $(BASE_OS2_HDR) @@ -3901,7 +3669,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC) $(NET_UNIX_SRC) $(NET_OSX_SRC) - $(NET_OS2_SRC) $(NET_WIN32_HDR) $(NET_WINCE_HDR) @@ -3925,7 +3692,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(OSX_LOWLEVEL_SRC) $(OSX_LOWLEVEL_SRC) $(COCOA_LOWLEVEL_SRC) - $(OS2_LOWLEVEL_SRC) $(X11_LOWLEVEL_SRC) $(DFB_LOWLEVEL_SRC) @@ -3940,7 +3706,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(OSX_LOWLEVEL_HDR) $(OSX_LOWLEVEL_HDR) $(COCOA_LOWLEVEL_HDR) - $(OS2_LOWLEVEL_HDR) $(X11_LOWLEVEL_HDR) $(DFB_LOWLEVEL_HDR) @@ -3961,7 +3726,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(OSX_COCOA_SRC) $(OSX_IPHONE_SRC) $(COCOA_SRC) - $(OS2_SRC) $(GTK2_HDR) @@ -3974,7 +3738,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(OSX_SHARED_HDR) $(OSX_COCOA_HDR) $(OSX_SHARED_HDR) $(OSX_IPHONE_HDR) $(COCOA_HDR) - $(OS2_HDR) @@ -3999,7 +3762,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(ADVANCED_GTK_SRC) $(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC) $(ADVANCED_UNIX_SRC) - $(ADVANCED_OS2_SRC) $(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR) @@ -4013,7 +3775,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(ADVANCED_GTK_HDR) $(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR) $(ADVANCED_UNIX_HDR) - $(ADVANCED_OS2_HDR) @@ -4050,7 +3811,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(MEDIA_UNIX_SRC) $(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC) $(MEDIA_UNIX_SRC) - $(MEDIA_OS2_SRC) $(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR) @@ -4062,7 +3822,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(MEDIA_UNIX_HDR) $(MEDIA_UNIX_HDR) $(MEDIA_UNIX_HDR) - $(MEDIA_OS2_HDR) $(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC) $(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR) @@ -4111,7 +3870,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(BASE_CMN_SRC) $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC) $(BASE_OSX_SRC) - $(BASE_OS2_SRC) $(BASE_MSDOS_SRC) $(BASE_AND_GUI_CMN_SRC) $(BASE_AND_GUI_OSX_CARBON_SRC) diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index f0fdf624b6..5223197216 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -32,7 +32,6 @@ X11INC = $(WXDIR)/include/wx/x11 MOTIFDIR = $(WXDIR)/src/motif MSDOSDIR = $(WXDIR)/src/msdos MSWDIR = $(WXDIR)/src/msw -PMDIR = $(WXDIR)/src/os2 MACDIR = $(WXDIR)/src/osx COCOADIR = $(WXDIR)/src/cocoa FTDIR = $(WXDIR)/src/freetype @@ -303,14 +302,12 @@ BASE_DIST: ALL_DIST INTL_DIST mkdir $(DISTDIR)/include/wx/osx mkdir $(DISTDIR)/include/wx/osx/carbon mkdir $(DISTDIR)/include/wx/osx/core - mkdir $(DISTDIR)/include/wx/os2 mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/osx mkdir $(DISTDIR)/src/osx/core mkdir $(DISTDIR)/src/osx/carbon mkdir $(DISTDIR)/src/msdos mkdir $(DISTDIR)/src/msw - mkdir $(DISTDIR)/src/os2 $(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt $(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \ diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl index 27dc2b8805..746ca6b42f 100644 --- a/build/bakefiles/tiff.bkl +++ b/build/bakefiles/tiff.bkl @@ -36,7 +36,6 @@ src/tiff/libtiff/tif_unix.c src/tiff/libtiff/tif_unix.c - src/tiff/libtiff/tif_unix.c src/tiff/libtiff/tif_win32.c @@ -50,7 +49,6 @@ -w-8004 -w-8012 -w-8057 -w-8060 -w-8066 -w2 -wcd=124 - OS2_32 __MSDOS__ + $(LIBDIRNAME) @@ -193,8 +193,7 @@ univ - $(TOOLKIT_LOWERCASE) - os2 + $(TOOLKIT_LOWERCASE) diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl index a56c27bcd1..a765d33375 100644 --- a/build/bakefiles/wxpresets/presets/wx.bkl +++ b/build/bakefiles/wxpresets/presets/wx.bkl @@ -414,7 +414,7 @@ @mkdir -p $(_DIRNAME) - + if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME)) diff --git a/build/buildbot/config/push.xml b/build/buildbot/config/push.xml index ddc80074ac..63a735b4a0 100644 --- a/build/buildbot/config/push.xml +++ b/build/buildbot/config/push.xml @@ -17,70 +17,6 @@ - - wxOS2 Stable GCC - psh_os2_stable_gcc - - - - - - - - - - - - - - - - wxOS2 Stable OpenWatcom - psh_os2_stable_ow - - - - - - - - - - - - - - wxOS2 Trunk GCC - psh_os2_trunk_gcc - - - - - - - - - - - - - - - - wxOS2 Trunk OpenWatcom - psh_os2_trunk_ow - - - - - - - - - - - - Solaris HEAD GTK1 psh_solaris_hd_gtk1 diff --git a/build/os2/Bakefiles.os2.bkgen b/build/os2/Bakefiles.os2.bkgen deleted file mode 100644 index 801df856f7..0000000000 --- a/build/os2/Bakefiles.os2.bkgen +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - -DPLATFORM_OS2=1 - - - - - - -o../os2/makefile.wat - - - - -DOPTIONS_FILE=config.wat - - - -DOPTIONS_FILE=../build/os2/config.wat - - - -DOPTIONS_FILE=../../build/os2/config.wat - - - -DOPTIONS_FILE=../../../build/os2/config.wat - - - -DOPTIONS_FILE=../../../../build/os2/config.wat - - - diff --git a/build/os2/config.wat b/build/os2/config.wat deleted file mode 100644 index 6c75c4494d..0000000000 --- a/build/os2/config.wat +++ /dev/null @@ -1,133 +0,0 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.2 (http://bakefile.sourceforge.net) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -CC = wcc386 - -# C++ compiler -CXX = wpp386 - -# Standard flags for CC -CFLAGS = - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# The C preprocessor -CPP = $(CC) -p - -# What type of library to build? [0,1] -# 1 - DLL -SHARED = 0 - -# Build wxUniversal instead of native port? [0,1] -# 1 - Universal -WXUNIV = 0 - -# Compile Unicode build of wxWidgets? [0,1] -# 1 - Unicode -UNICODE = 1 - -# Type of compiled binaries [debug,release] -BUILD = debug - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO = default - -# Should __WXDEBUG__ be defined? The default value "default" means that it will -# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default] -DEBUG_FLAG = default - -# Multiple libraries or single huge monolithic one? [0,1] -# 0 - Multilib -# 1 - Monolithic -MONOLITHIC = 1 - -# Build GUI libraries? [0,1] -# 0 - Base -# 1 - GUI -USE_GUI = 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML = 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA = 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC = 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI = 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT = 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC = 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL = 0 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA = 0 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS = 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI = 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS = 1 - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -USE_GDIPLUS = 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD = 0 - -# Use this to name your customized DLLs differently -VENDOR = custom - -# -WX_FLAVOUR = - -# -WX_LIB_FLAVOUR = - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS = - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS = - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS = dynamic - diff --git a/build/os2/makefile.wat b/build/os2/makefile.wat deleted file mode 100644 index a2e0e4f4c9..0000000000 --- a/build/os2/makefile.wat +++ /dev/null @@ -1,12874 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.2 (http://bakefile.sourceforge.net) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! loaddll wlink wlink -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = pm -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -WXDEBUGFLAG = d -!endif -!endif -!ifeq DEBUG_FLAG 1 -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = pm_lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = pm_dll -!endif -__wxpng___depname = -!ifeq USE_GUI 1 -__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib -!endif -__wxjpeg___depname = -!ifeq USE_GUI 1 -__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib -!endif -__wxtiff___depname = -!ifeq USE_GUI 1 -__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__monodll___depname = -!ifeq MONOLITHIC 1 -!ifeq SHARED 1 -__monodll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll -!endif -!endif -____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = -!ifeq USE_GUI 1 -____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & - $(____CORE_SRC_FILENAMES_OBJECTS) & - $(____ADVANCED_SRC_FILENAMES_OBJECTS) & - $(OBJS)\monodll_mediactrlcmn.obj & - $(OBJS)\monodll_helpctrl.obj & - $(OBJS)\monodll_helpdata.obj & - $(OBJS)\monodll_helpdlg.obj & - $(OBJS)\monodll_helpfrm.obj & - $(OBJS)\monodll_helpwnd.obj & - $(OBJS)\monodll_htmlcell.obj & - $(OBJS)\monodll_htmlfilt.obj & - $(OBJS)\monodll_htmlpars.obj & - $(OBJS)\monodll_htmltag.obj & - $(OBJS)\monodll_htmlwin.obj & - $(OBJS)\monodll_htmprint.obj & - $(OBJS)\monodll_m_dflist.obj & - $(OBJS)\monodll_m_fonts.obj & - $(OBJS)\monodll_m_hline.obj & - $(OBJS)\monodll_m_image.obj & - $(OBJS)\monodll_m_layout.obj & - $(OBJS)\monodll_m_links.obj & - $(OBJS)\monodll_m_list.obj & - $(OBJS)\monodll_m_pre.obj & - $(OBJS)\monodll_m_style.obj & - $(OBJS)\monodll_m_tables.obj & - $(OBJS)\monodll_winpars.obj & - $(OBJS)\monodll_htmllbox.obj & - $(OBJS)\monodll_debugrpt.obj & - $(OBJS)\monodll_dbgrptg.obj & - $(OBJS)\monodll_xh_animatctrl.obj & - $(OBJS)\monodll_xh_bmp.obj & - $(OBJS)\monodll_xh_bmpcbox.obj & - $(OBJS)\monodll_xh_bmpbt.obj & - $(OBJS)\monodll_xh_bttn.obj & - $(OBJS)\monodll_xh_cald.obj & - $(OBJS)\monodll_xh_chckb.obj & - $(OBJS)\monodll_xh_chckl.obj & - $(OBJS)\monodll_xh_choic.obj & - $(OBJS)\monodll_xh_choicbk.obj & - $(OBJS)\monodll_xh_clrpicker.obj & - $(OBJS)\monodll_xh_collpane.obj & - $(OBJS)\monodll_xh_combo.obj & - $(OBJS)\monodll_xh_datectrl.obj & - $(OBJS)\monodll_xh_dirpicker.obj & - $(OBJS)\monodll_xh_dlg.obj & - $(OBJS)\monodll_xh_frame.obj & - $(OBJS)\monodll_xh_mdi.obj & - $(OBJS)\monodll_xh_filepicker.obj & - $(OBJS)\monodll_xh_fontpicker.obj & - $(OBJS)\monodll_xh_gauge.obj & - $(OBJS)\monodll_xh_gdctl.obj & - $(OBJS)\monodll_xh_grid.obj & - $(OBJS)\monodll_xh_html.obj & - $(OBJS)\monodll_xh_hyperlink.obj & - $(OBJS)\monodll_xh_listb.obj & - $(OBJS)\monodll_xh_listbk.obj & - $(OBJS)\monodll_xh_listc.obj & - $(OBJS)\monodll_xh_menu.obj & - $(OBJS)\monodll_xh_notbk.obj & - $(OBJS)\monodll_xh_odcombo.obj & - $(OBJS)\monodll_xh_panel.obj & - $(OBJS)\monodll_xh_propdlg.obj & - $(OBJS)\monodll_xh_radbt.obj & - $(OBJS)\monodll_xh_radbx.obj & - $(OBJS)\monodll_xh_scrol.obj & - $(OBJS)\monodll_xh_scwin.obj & - $(OBJS)\monodll_xh_htmllbox.obj & - $(OBJS)\monodll_xh_sizer.obj & - $(OBJS)\monodll_xh_slidr.obj & - $(OBJS)\monodll_xh_spin.obj & - $(OBJS)\monodll_xh_split.obj & - $(OBJS)\monodll_xh_srchctrl.obj & - $(OBJS)\monodll_xh_statbar.obj & - $(OBJS)\monodll_xh_stbmp.obj & - $(OBJS)\monodll_xh_stbox.obj & - $(OBJS)\monodll_xh_stlin.obj & - $(OBJS)\monodll_xh_sttxt.obj & - $(OBJS)\monodll_xh_text.obj & - $(OBJS)\monodll_xh_tglbtn.obj & - $(OBJS)\monodll_xh_toolb.obj & - $(OBJS)\monodll_xh_tree.obj & - $(OBJS)\monodll_xh_treebk.obj & - $(OBJS)\monodll_xh_unkwn.obj & - $(OBJS)\monodll_xh_wizrd.obj & - $(OBJS)\monodll_xmlres.obj & - $(OBJS)\monodll_xmlrsall.obj & - $(OBJS)\monodll_framemanager.obj & - $(OBJS)\monodll_dockart.obj & - $(OBJS)\monodll_floatpane.obj & - $(OBJS)\monodll_auibook.obj & - $(OBJS)\monodll_tabmdi.obj & - $(OBJS)\monodll_richtextctrl.obj & - $(OBJS)\monodll_richtextbuffer.obj & - $(OBJS)\monodll_richtextstyles.obj & - $(OBJS)\monodll_richtextxml.obj & - $(OBJS)\monodll_richtexthtml.obj & - $(OBJS)\monodll_richtextformatdlg.obj & - $(OBJS)\monodll_richtextsymboldlg.obj & - $(OBJS)\monodll_richtextstyledlg.obj & - $(OBJS)\monodll_richtextprint.obj & - $(OBJS)\monodll_stc.obj & - $(OBJS)\monodll_PlatWX.obj & - $(OBJS)\monodll_ScintillaWX.obj -!endif -____CORE_SRC_FILENAMES_OBJECTS = -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -____CORE_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_caret.obj & - $(OBJS)\monodll_colrdlgg.obj & - $(OBJS)\monodll_dirdlgg.obj & - $(OBJS)\monodll_fdrepdlg.obj & - $(OBJS)\monodll_imaglist.obj & - $(OBJS)\monodll_listctrl.obj & - $(OBJS)\monodll_mdig.obj & - $(OBJS)\monodll_prntdlgg.obj & - $(OBJS)\monodll_statusbr.obj & - $(OBJS)\monodll_accel.obj & - $(OBJS)\monodll_app.obj & - $(OBJS)\monodll_bitmap.obj & - $(OBJS)\monodll_bmpbuttn.obj & - $(OBJS)\monodll_brush.obj & - $(OBJS)\monodll_button.obj & - $(OBJS)\monodll_checkbox.obj & - $(OBJS)\monodll_checklst.obj & - $(OBJS)\monodll_choice.obj & - $(OBJS)\monodll_clipbrd.obj & - $(OBJS)\monodll_colour.obj & - $(OBJS)\monodll_combobox.obj & - $(OBJS)\monodll_control.obj & - $(OBJS)\monodll_cursor.obj & - $(OBJS)\monodll_data.obj & - $(OBJS)\monodll_dataobj.obj & - $(OBJS)\monodll_dc.obj & - $(OBJS)\monodll_dcclient.obj & - $(OBJS)\monodll_dcmemory.obj & - $(OBJS)\monodll_dcprint.obj & - $(OBJS)\monodll_dcscreen.obj & - $(OBJS)\monodll_dialog.obj & - $(OBJS)\monodll_dnd.obj & - $(OBJS)\monodll_evtloop.obj & - $(OBJS)\monodll_filedlg.obj & - $(OBJS)\monodll_font.obj & - $(OBJS)\monodll_fontdlg.obj & - $(OBJS)\monodll_fontenum.obj & - $(OBJS)\monodll_fontutil.obj & - $(OBJS)\monodll_frame.obj & - $(OBJS)\monodll_gauge.obj & - $(OBJS)\monodll_gdiimage.obj & - $(OBJS)\monodll_gsockpm.obj & - $(OBJS)\monodll_helpwin.obj & - $(OBJS)\monodll_icon.obj & - $(OBJS)\monodll_iniconf.obj & - $(OBJS)\monodll_listbox.obj & - $(OBJS)\monodll_main.obj & - $(OBJS)\monodll_menu.obj & - $(OBJS)\monodll_menuitem.obj & - $(OBJS)\monodll_metafile.obj & - $(OBJS)\monodll_msgdlg.obj & - $(OBJS)\monodll_nativdlg.obj & - $(OBJS)\monodll_notebook.obj & - $(OBJS)\monodll_ownerdrw.obj & - $(OBJS)\monodll_palette.obj & - $(OBJS)\monodll_pen.obj & - $(OBJS)\monodll_popupwin.obj & - $(OBJS)\monodll_print.obj & - $(OBJS)\monodll_radiobox.obj & - $(OBJS)\monodll_radiobut.obj & - $(OBJS)\monodll_region.obj & - $(OBJS)\monodll_scrolbar.obj & - $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_slider.obj & - $(OBJS)\monodll_spinbutt.obj & - $(OBJS)\monodll_spinctrl.obj & - $(OBJS)\monodll_statbmp.obj & - $(OBJS)\monodll_statbox.obj & - $(OBJS)\monodll_statline.obj & - $(OBJS)\monodll_stattext.obj & - $(OBJS)\monodll_tabctrl.obj & - $(OBJS)\monodll_textctrl.obj & - $(OBJS)\monodll_tglbtn.obj & - $(OBJS)\monodll_timer.obj & - $(OBJS)\monodll_toolbar.obj & - $(OBJS)\monodll_tooltip.obj & - $(OBJS)\monodll_toplevel.obj & - $(OBJS)\monodll_utilsgui.obj & - $(OBJS)\monodll_window.obj & - $(OBJS)\monodll_accelcmn.obj & - $(OBJS)\monodll_accesscmn.obj & - $(OBJS)\monodll_anidecod.obj & - $(OBJS)\monodll_appcmn.obj & - $(OBJS)\monodll_artprov.obj & - $(OBJS)\monodll_artstd.obj & - $(OBJS)\monodll_bmpbase.obj & - $(OBJS)\monodll_bookctrl.obj & - $(OBJS)\monodll_btncmn.obj & - $(OBJS)\monodll_cairo.obj & - $(OBJS)\monodll_choiccmn.obj & - $(OBJS)\monodll_clipcmn.obj & - $(OBJS)\monodll_clrpickercmn.obj & - $(OBJS)\monodll_colourcmn.obj & - $(OBJS)\monodll_combocmn.obj & - $(OBJS)\monodll_cmdproc.obj & - $(OBJS)\monodll_cmndata.obj & - $(OBJS)\monodll_containr.obj & - $(OBJS)\monodll_cshelp.obj & - $(OBJS)\monodll_ctrlcmn.obj & - $(OBJS)\monodll_ctrlsub.obj & - $(OBJS)\monodll_datacmn.obj & - $(OBJS)\monodll_dcbase.obj & - $(OBJS)\monodll_dcbufcmn.obj & - $(OBJS)\monodll_dcgraph.obj & - $(OBJS)\monodll_dcsvg.obj & - $(OBJS)\monodll_dlgcmn.obj & - $(OBJS)\monodll_dndcmn.obj & - $(OBJS)\monodll_dobjcmn.obj & - $(OBJS)\monodll_docmdi.obj & - $(OBJS)\monodll_docview.obj & - $(OBJS)\monodll_dpycmn.obj & - $(OBJS)\monodll_dseldlg.obj & - $(OBJS)\monodll_effects.obj & - $(OBJS)\monodll_fddlgcmn.obj & - $(OBJS)\monodll_filectrlcmn.obj & - $(OBJS)\monodll_filepickercmn.obj & - $(OBJS)\monodll_fontpickercmn.obj & - $(OBJS)\monodll_fldlgcmn.obj & - $(OBJS)\monodll_fontcmn.obj & - $(OBJS)\monodll_fontenumcmn.obj & - $(OBJS)\monodll_fontmap.obj & - $(OBJS)\monodll_fontutilcmn.obj & - $(OBJS)\monodll_framecmn.obj & - $(OBJS)\monodll_gaugecmn.obj & - $(OBJS)\monodll_gbsizer.obj & - $(OBJS)\monodll_gdicmn.obj & - $(OBJS)\monodll_geometry.obj & - $(OBJS)\monodll_gifdecod.obj & - $(OBJS)\monodll_graphcmn.obj & - $(OBJS)\monodll_helpbase.obj & - $(OBJS)\monodll_iconbndl.obj & - $(OBJS)\monodll_imagall.obj & - $(OBJS)\monodll_imagbmp.obj & - $(OBJS)\monodll_image.obj & - $(OBJS)\monodll_imagfill.obj & - $(OBJS)\monodll_imaggif.obj & - $(OBJS)\monodll_imagiff.obj & - $(OBJS)\monodll_imagjpeg.obj & - $(OBJS)\monodll_imagpcx.obj & - $(OBJS)\monodll_imagpng.obj & - $(OBJS)\monodll_imagpnm.obj & - $(OBJS)\monodll_imagtga.obj & - $(OBJS)\monodll_imagtiff.obj & - $(OBJS)\monodll_imagxpm.obj & - $(OBJS)\monodll_layout.obj & - $(OBJS)\monodll_lboxcmn.obj & - $(OBJS)\monodll_listctrlcmn.obj & - $(OBJS)\monodll_matrix.obj & - $(OBJS)\monodll_menucmn.obj & - $(OBJS)\monodll_nbkbase.obj & - $(OBJS)\monodll_overlaycmn.obj & - $(OBJS)\monodll_paper.obj & - $(OBJS)\monodll_pickerbase.obj & - $(OBJS)\monodll_popupcmn.obj & - $(OBJS)\monodll_prntbase.obj & - $(OBJS)\monodll_quantize.obj & - $(OBJS)\monodll_radiocmn.obj & - $(OBJS)\monodll_rendcmn.obj & - $(OBJS)\monodll_rgncmn.obj & - $(OBJS)\monodll_settcmn.obj & - $(OBJS)\monodll_sizer.obj & - $(OBJS)\monodll_srchcmn.obj & - $(OBJS)\monodll_statbar.obj & - $(OBJS)\monodll_stattextcmn.obj & - $(OBJS)\monodll_stockitem.obj & - $(OBJS)\monodll_tbarbase.obj & - $(OBJS)\monodll_textcmn.obj & - $(OBJS)\monodll_textentrycmn.obj & - $(OBJS)\monodll_toplvcmn.obj & - $(OBJS)\monodll_treebase.obj & - $(OBJS)\monodll_valgen.obj & - $(OBJS)\monodll_validate.obj & - $(OBJS)\monodll_valtext.obj & - $(OBJS)\monodll_wincmn.obj & - $(OBJS)\monodll_xpmdecod.obj & - $(OBJS)\monodll_busyinfo.obj & - $(OBJS)\monodll_buttonbar.obj & - $(OBJS)\monodll_choicdgg.obj & - $(OBJS)\monodll_choicbkg.obj & - $(OBJS)\monodll_clrpickerg.obj & - $(OBJS)\monodll_collpaneg.obj & - $(OBJS)\monodll_combog.obj & - $(OBJS)\monodll_dcpsg.obj & - $(OBJS)\monodll_dirctrlg.obj & - $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_filectrlg.obj & - $(OBJS)\monodll_filepickerg.obj & - $(OBJS)\monodll_fontpickerg.obj & - $(OBJS)\monodll_listbkg.obj & - $(OBJS)\monodll_logg.obj & - $(OBJS)\monodll_numdlgg.obj & - $(OBJS)\monodll_panelg.obj & - $(OBJS)\monodll_progdlgg.obj & - $(OBJS)\monodll_printps.obj & - $(OBJS)\monodll_renderg.obj & - $(OBJS)\monodll_scrlwing.obj & - $(OBJS)\monodll_selstore.obj & - $(OBJS)\monodll_spinctlg.obj & - $(OBJS)\monodll_splitter.obj & - $(OBJS)\monodll_srchctlg.obj & - $(OBJS)\monodll_textdlgg.obj & - $(OBJS)\monodll_tipwin.obj & - $(OBJS)\monodll_toolbkg.obj & - $(OBJS)\monodll_treectlg.obj & - $(OBJS)\monodll_treebkg.obj & - $(OBJS)\monodll_vlbox.obj & - $(OBJS)\monodll_vscroll.obj -!endif -!endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -____CORE_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_accel.obj & - $(OBJS)\monodll_colrdlgg.obj & - $(OBJS)\monodll_dirdlgg.obj & - $(OBJS)\monodll_fdrepdlg.obj & - $(OBJS)\monodll_filedlgg.obj & - $(OBJS)\monodll_fontdlgg.obj & - $(OBJS)\monodll_listctrl.obj & - $(OBJS)\monodll_mdig.obj & - $(OBJS)\monodll_msgdlgg.obj & - $(OBJS)\monodll_prntdlgg.obj & - $(OBJS)\monodll_tabg.obj & - $(OBJS)\monodll_bmpbuttn.obj & - $(OBJS)\monodll_button.obj & - $(OBJS)\monodll_checkbox.obj & - $(OBJS)\monodll_checklst.obj & - $(OBJS)\monodll_choice.obj & - $(OBJS)\monodll_colschem.obj & - $(OBJS)\monodll_combobox.obj & - $(OBJS)\monodll_control.obj & - $(OBJS)\monodll_ctrlrend.obj & - $(OBJS)\monodll_dialog.obj & - $(OBJS)\monodll_framuniv.obj & - $(OBJS)\monodll_gauge.obj & - $(OBJS)\monodll_inpcons.obj & - $(OBJS)\monodll_inphand.obj & - $(OBJS)\monodll_listbox.obj & - $(OBJS)\monodll_menu.obj & - $(OBJS)\monodll_notebook.obj & - $(OBJS)\monodll_radiobox.obj & - $(OBJS)\monodll_radiobut.obj & - $(OBJS)\monodll_scrarrow.obj & - $(OBJS)\monodll_scrolbar.obj & - $(OBJS)\monodll_scrthumb.obj & - $(OBJS)\monodll_slider.obj & - $(OBJS)\monodll_spinbutt.obj & - $(OBJS)\monodll_statbmp.obj & - $(OBJS)\monodll_statbox.obj & - $(OBJS)\monodll_statline.obj & - $(OBJS)\monodll_stattext.obj & - $(OBJS)\monodll_statusbr.obj & - $(OBJS)\monodll_stdrend.obj & - $(OBJS)\monodll_textctrl.obj & - $(OBJS)\monodll_tglbtn.obj & - $(OBJS)\monodll_theme.obj & - $(OBJS)\monodll_toolbar.obj & - $(OBJS)\monodll_topluniv.obj & - $(OBJS)\monodll_winuniv.obj & - $(OBJS)\monodll_gtk.obj & - $(OBJS)\monodll_metal.obj & - $(OBJS)\monodll_mono.obj & - $(OBJS)\monodll_win32.obj & - $(OBJS)\monodll_accelcmn.obj & - $(OBJS)\monodll_accesscmn.obj & - $(OBJS)\monodll_anidecod.obj & - $(OBJS)\monodll_appcmn.obj & - $(OBJS)\monodll_artprov.obj & - $(OBJS)\monodll_artstd.obj & - $(OBJS)\monodll_bmpbase.obj & - $(OBJS)\monodll_bookctrl.obj & - $(OBJS)\monodll_btncmn.obj & - $(OBJS)\monodll_cairo.obj & - $(OBJS)\monodll_choiccmn.obj & - $(OBJS)\monodll_clipcmn.obj & - $(OBJS)\monodll_clrpickercmn.obj & - $(OBJS)\monodll_colourcmn.obj & - $(OBJS)\monodll_combocmn.obj & - $(OBJS)\monodll_cmdproc.obj & - $(OBJS)\monodll_cmndata.obj & - $(OBJS)\monodll_containr.obj & - $(OBJS)\monodll_cshelp.obj & - $(OBJS)\monodll_ctrlcmn.obj & - $(OBJS)\monodll_ctrlsub.obj & - $(OBJS)\monodll_datacmn.obj & - $(OBJS)\monodll_dcbase.obj & - $(OBJS)\monodll_dcbufcmn.obj & - $(OBJS)\monodll_dcgraph.obj & - $(OBJS)\monodll_dcsvg.obj & - $(OBJS)\monodll_dlgcmn.obj & - $(OBJS)\monodll_dndcmn.obj & - $(OBJS)\monodll_dobjcmn.obj & - $(OBJS)\monodll_docmdi.obj & - $(OBJS)\monodll_docview.obj & - $(OBJS)\monodll_dpycmn.obj & - $(OBJS)\monodll_dseldlg.obj & - $(OBJS)\monodll_effects.obj & - $(OBJS)\monodll_fddlgcmn.obj & - $(OBJS)\monodll_filectrlcmn.obj & - $(OBJS)\monodll_filepickercmn.obj & - $(OBJS)\monodll_fontpickercmn.obj & - $(OBJS)\monodll_fldlgcmn.obj & - $(OBJS)\monodll_fontcmn.obj & - $(OBJS)\monodll_fontenumcmn.obj & - $(OBJS)\monodll_fontmap.obj & - $(OBJS)\monodll_fontutilcmn.obj & - $(OBJS)\monodll_framecmn.obj & - $(OBJS)\monodll_gaugecmn.obj & - $(OBJS)\monodll_gbsizer.obj & - $(OBJS)\monodll_gdicmn.obj & - $(OBJS)\monodll_geometry.obj & - $(OBJS)\monodll_gifdecod.obj & - $(OBJS)\monodll_graphcmn.obj & - $(OBJS)\monodll_helpbase.obj & - $(OBJS)\monodll_iconbndl.obj & - $(OBJS)\monodll_imagall.obj & - $(OBJS)\monodll_imagbmp.obj & - $(OBJS)\monodll_image.obj & - $(OBJS)\monodll_imagfill.obj & - $(OBJS)\monodll_imaggif.obj & - $(OBJS)\monodll_imagiff.obj & - $(OBJS)\monodll_imagjpeg.obj & - $(OBJS)\monodll_imagpcx.obj & - $(OBJS)\monodll_imagpng.obj & - $(OBJS)\monodll_imagpnm.obj & - $(OBJS)\monodll_imagtga.obj & - $(OBJS)\monodll_imagtiff.obj & - $(OBJS)\monodll_imagxpm.obj & - $(OBJS)\monodll_layout.obj & - $(OBJS)\monodll_lboxcmn.obj & - $(OBJS)\monodll_listctrlcmn.obj & - $(OBJS)\monodll_matrix.obj & - $(OBJS)\monodll_menucmn.obj & - $(OBJS)\monodll_nbkbase.obj & - $(OBJS)\monodll_overlaycmn.obj & - $(OBJS)\monodll_paper.obj & - $(OBJS)\monodll_pickerbase.obj & - $(OBJS)\monodll_popupcmn.obj & - $(OBJS)\monodll_prntbase.obj & - $(OBJS)\monodll_quantize.obj & - $(OBJS)\monodll_radiocmn.obj & - $(OBJS)\monodll_rendcmn.obj & - $(OBJS)\monodll_rgncmn.obj & - $(OBJS)\monodll_settcmn.obj & - $(OBJS)\monodll_sizer.obj & - $(OBJS)\monodll_srchcmn.obj & - $(OBJS)\monodll_statbar.obj & - $(OBJS)\monodll_stattextcmn.obj & - $(OBJS)\monodll_stockitem.obj & - $(OBJS)\monodll_tbarbase.obj & - $(OBJS)\monodll_textcmn.obj & - $(OBJS)\monodll_textentrycmn.obj & - $(OBJS)\monodll_toplvcmn.obj & - $(OBJS)\monodll_treebase.obj & - $(OBJS)\monodll_valgen.obj & - $(OBJS)\monodll_validate.obj & - $(OBJS)\monodll_valtext.obj & - $(OBJS)\monodll_wincmn.obj & - $(OBJS)\monodll_xpmdecod.obj & - $(OBJS)\monodll_busyinfo.obj & - $(OBJS)\monodll_buttonbar.obj & - $(OBJS)\monodll_choicdgg.obj & - $(OBJS)\monodll_choicbkg.obj & - $(OBJS)\monodll_clrpickerg.obj & - $(OBJS)\monodll_collpaneg.obj & - $(OBJS)\monodll_combog.obj & - $(OBJS)\monodll_dcpsg.obj & - $(OBJS)\monodll_dirctrlg.obj & - $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_filectrlg.obj & - $(OBJS)\monodll_filepickerg.obj & - $(OBJS)\monodll_fontpickerg.obj & - $(OBJS)\monodll_listbkg.obj & - $(OBJS)\monodll_logg.obj & - $(OBJS)\monodll_numdlgg.obj & - $(OBJS)\monodll_panelg.obj & - $(OBJS)\monodll_progdlgg.obj & - $(OBJS)\monodll_printps.obj & - $(OBJS)\monodll_renderg.obj & - $(OBJS)\monodll_scrlwing.obj & - $(OBJS)\monodll_selstore.obj & - $(OBJS)\monodll_spinctlg.obj & - $(OBJS)\monodll_splitter.obj & - $(OBJS)\monodll_srchctlg.obj & - $(OBJS)\monodll_textdlgg.obj & - $(OBJS)\monodll_tipwin.obj & - $(OBJS)\monodll_toolbkg.obj & - $(OBJS)\monodll_treectlg.obj & - $(OBJS)\monodll_treebkg.obj & - $(OBJS)\monodll_vlbox.obj & - $(OBJS)\monodll_vscroll.obj -!endif -!endif -____ADVANCED_SRC_FILENAMES_OBJECTS = -!ifeq WXUNIV 0 -____ADVANCED_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_animatecmn.obj & - $(OBJS)\monodll_datavcmn.obj & - $(OBJS)\monodll_hyperlnkcmn.obj & - $(OBJS)\monodll_aboutdlgg.obj & - $(OBJS)\monodll_animateg.obj & - $(OBJS)\monodll_bmpcboxg.obj & - $(OBJS)\monodll_calctrl.obj & - $(OBJS)\monodll_datavgen.obj & - $(OBJS)\monodll_datectlg.obj & - $(OBJS)\monodll_editlbox.obj & - $(OBJS)\monodll_grid.obj & - $(OBJS)\monodll_gridctrl.obj & - $(OBJS)\monodll_gridsel.obj & - $(OBJS)\monodll_helpext.obj & - $(OBJS)\monodll_hyperlinkg.obj & - $(OBJS)\monodll_laywin.obj & - $(OBJS)\monodll_odcombo.obj & - $(OBJS)\monodll_propdlg.obj & - $(OBJS)\monodll_sashwin.obj & - $(OBJS)\monodll_splash.obj & - $(OBJS)\monodll_tipdlg.obj & - $(OBJS)\monodll_wizard.obj & - $(OBJS)\monodll_joystick.obj & - $(OBJS)\monodll_sound.obj -!endif -!ifeq WXUNIV 1 -____ADVANCED_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_animatecmn.obj & - $(OBJS)\monodll_datavcmn.obj & - $(OBJS)\monodll_hyperlnkcmn.obj & - $(OBJS)\monodll_aboutdlgg.obj & - $(OBJS)\monodll_animateg.obj & - $(OBJS)\monodll_bmpcboxg.obj & - $(OBJS)\monodll_calctrl.obj & - $(OBJS)\monodll_datavgen.obj & - $(OBJS)\monodll_datectlg.obj & - $(OBJS)\monodll_editlbox.obj & - $(OBJS)\monodll_grid.obj & - $(OBJS)\monodll_gridctrl.obj & - $(OBJS)\monodll_gridsel.obj & - $(OBJS)\monodll_helpext.obj & - $(OBJS)\monodll_hyperlinkg.obj & - $(OBJS)\monodll_laywin.obj & - $(OBJS)\monodll_odcombo.obj & - $(OBJS)\monodll_propdlg.obj & - $(OBJS)\monodll_sashwin.obj & - $(OBJS)\monodll_splash.obj & - $(OBJS)\monodll_tipdlg.obj & - $(OBJS)\monodll_wizard.obj & - $(OBJS)\monodll_joystick.obj & - $(OBJS)\monodll_sound.obj -!endif -__wxscintilla_library_link_DEP = -!ifeq USE_STC 1 -__wxscintilla_library_link_DEP = $(__wxscintilla) -!endif -__monolib___depname = -!ifeq MONOLITHIC 1 -!ifeq SHARED 0 -__monolib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!endif -____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = -!ifeq USE_GUI 1 -____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & - $(____CORE_SRC_FILENAMES_1_OBJECTS) & - $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) & - $(OBJS)\monolib_mediactrlcmn.obj & - $(OBJS)\monolib_helpctrl.obj & - $(OBJS)\monolib_helpdata.obj & - $(OBJS)\monolib_helpdlg.obj & - $(OBJS)\monolib_helpfrm.obj & - $(OBJS)\monolib_helpwnd.obj & - $(OBJS)\monolib_htmlcell.obj & - $(OBJS)\monolib_htmlfilt.obj & - $(OBJS)\monolib_htmlpars.obj & - $(OBJS)\monolib_htmltag.obj & - $(OBJS)\monolib_htmlwin.obj & - $(OBJS)\monolib_htmprint.obj & - $(OBJS)\monolib_m_dflist.obj & - $(OBJS)\monolib_m_fonts.obj & - $(OBJS)\monolib_m_hline.obj & - $(OBJS)\monolib_m_image.obj & - $(OBJS)\monolib_m_layout.obj & - $(OBJS)\monolib_m_links.obj & - $(OBJS)\monolib_m_list.obj & - $(OBJS)\monolib_m_pre.obj & - $(OBJS)\monolib_m_style.obj & - $(OBJS)\monolib_m_tables.obj & - $(OBJS)\monolib_winpars.obj & - $(OBJS)\monolib_htmllbox.obj & - $(OBJS)\monolib_debugrpt.obj & - $(OBJS)\monolib_dbgrptg.obj & - $(OBJS)\monolib_xh_animatctrl.obj & - $(OBJS)\monolib_xh_bmp.obj & - $(OBJS)\monolib_xh_bmpcbox.obj & - $(OBJS)\monolib_xh_bmpbt.obj & - $(OBJS)\monolib_xh_bttn.obj & - $(OBJS)\monolib_xh_cald.obj & - $(OBJS)\monolib_xh_chckb.obj & - $(OBJS)\monolib_xh_chckl.obj & - $(OBJS)\monolib_xh_choic.obj & - $(OBJS)\monolib_xh_choicbk.obj & - $(OBJS)\monolib_xh_clrpicker.obj & - $(OBJS)\monolib_xh_collpane.obj & - $(OBJS)\monolib_xh_combo.obj & - $(OBJS)\monolib_xh_datectrl.obj & - $(OBJS)\monolib_xh_dirpicker.obj & - $(OBJS)\monolib_xh_dlg.obj & - $(OBJS)\monolib_xh_frame.obj & - $(OBJS)\monolib_xh_mdi.obj & - $(OBJS)\monolib_xh_filepicker.obj & - $(OBJS)\monolib_xh_fontpicker.obj & - $(OBJS)\monolib_xh_gauge.obj & - $(OBJS)\monolib_xh_gdctl.obj & - $(OBJS)\monolib_xh_grid.obj & - $(OBJS)\monolib_xh_html.obj & - $(OBJS)\monolib_xh_hyperlink.obj & - $(OBJS)\monolib_xh_listb.obj & - $(OBJS)\monolib_xh_listbk.obj & - $(OBJS)\monolib_xh_listc.obj & - $(OBJS)\monolib_xh_menu.obj & - $(OBJS)\monolib_xh_notbk.obj & - $(OBJS)\monolib_xh_odcombo.obj & - $(OBJS)\monolib_xh_panel.obj & - $(OBJS)\monolib_xh_propdlg.obj & - $(OBJS)\monolib_xh_radbt.obj & - $(OBJS)\monolib_xh_radbx.obj & - $(OBJS)\monolib_xh_scrol.obj & - $(OBJS)\monolib_xh_scwin.obj & - $(OBJS)\monolib_xh_htmllbox.obj & - $(OBJS)\monolib_xh_sizer.obj & - $(OBJS)\monolib_xh_slidr.obj & - $(OBJS)\monolib_xh_spin.obj & - $(OBJS)\monolib_xh_split.obj & - $(OBJS)\monolib_xh_srchctrl.obj & - $(OBJS)\monolib_xh_statbar.obj & - $(OBJS)\monolib_xh_stbmp.obj & - $(OBJS)\monolib_xh_stbox.obj & - $(OBJS)\monolib_xh_stlin.obj & - $(OBJS)\monolib_xh_sttxt.obj & - $(OBJS)\monolib_xh_text.obj & - $(OBJS)\monolib_xh_tglbtn.obj & - $(OBJS)\monolib_xh_toolb.obj & - $(OBJS)\monolib_xh_tree.obj & - $(OBJS)\monolib_xh_treebk.obj & - $(OBJS)\monolib_xh_unkwn.obj & - $(OBJS)\monolib_xh_wizrd.obj & - $(OBJS)\monolib_xmlres.obj & - $(OBJS)\monolib_xmlrsall.obj & - $(OBJS)\monolib_framemanager.obj & - $(OBJS)\monolib_dockart.obj & - $(OBJS)\monolib_floatpane.obj & - $(OBJS)\monolib_auibook.obj & - $(OBJS)\monolib_tabmdi.obj & - $(OBJS)\monolib_richtextctrl.obj & - $(OBJS)\monolib_richtextbuffer.obj & - $(OBJS)\monolib_richtextstyles.obj & - $(OBJS)\monolib_richtextxml.obj & - $(OBJS)\monolib_richtexthtml.obj & - $(OBJS)\monolib_richtextformatdlg.obj & - $(OBJS)\monolib_richtextsymboldlg.obj & - $(OBJS)\monolib_richtextstyledlg.obj & - $(OBJS)\monolib_richtextprint.obj & - $(OBJS)\monolib_stc.obj & - $(OBJS)\monolib_PlatWX.obj & - $(OBJS)\monolib_ScintillaWX.obj -!endif -____CORE_SRC_FILENAMES_1_OBJECTS = -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -____CORE_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_caret.obj & - $(OBJS)\monolib_colrdlgg.obj & - $(OBJS)\monolib_dirdlgg.obj & - $(OBJS)\monolib_fdrepdlg.obj & - $(OBJS)\monolib_imaglist.obj & - $(OBJS)\monolib_listctrl.obj & - $(OBJS)\monolib_mdig.obj & - $(OBJS)\monolib_prntdlgg.obj & - $(OBJS)\monolib_statusbr.obj & - $(OBJS)\monolib_accel.obj & - $(OBJS)\monolib_app.obj & - $(OBJS)\monolib_bitmap.obj & - $(OBJS)\monolib_bmpbuttn.obj & - $(OBJS)\monolib_brush.obj & - $(OBJS)\monolib_button.obj & - $(OBJS)\monolib_checkbox.obj & - $(OBJS)\monolib_checklst.obj & - $(OBJS)\monolib_choice.obj & - $(OBJS)\monolib_clipbrd.obj & - $(OBJS)\monolib_colour.obj & - $(OBJS)\monolib_combobox.obj & - $(OBJS)\monolib_control.obj & - $(OBJS)\monolib_cursor.obj & - $(OBJS)\monolib_data.obj & - $(OBJS)\monolib_dataobj.obj & - $(OBJS)\monolib_dc.obj & - $(OBJS)\monolib_dcclient.obj & - $(OBJS)\monolib_dcmemory.obj & - $(OBJS)\monolib_dcprint.obj & - $(OBJS)\monolib_dcscreen.obj & - $(OBJS)\monolib_dialog.obj & - $(OBJS)\monolib_dnd.obj & - $(OBJS)\monolib_evtloop.obj & - $(OBJS)\monolib_filedlg.obj & - $(OBJS)\monolib_font.obj & - $(OBJS)\monolib_fontdlg.obj & - $(OBJS)\monolib_fontenum.obj & - $(OBJS)\monolib_fontutil.obj & - $(OBJS)\monolib_frame.obj & - $(OBJS)\monolib_gauge.obj & - $(OBJS)\monolib_gdiimage.obj & - $(OBJS)\monolib_gsockpm.obj & - $(OBJS)\monolib_helpwin.obj & - $(OBJS)\monolib_icon.obj & - $(OBJS)\monolib_iniconf.obj & - $(OBJS)\monolib_listbox.obj & - $(OBJS)\monolib_main.obj & - $(OBJS)\monolib_menu.obj & - $(OBJS)\monolib_menuitem.obj & - $(OBJS)\monolib_metafile.obj & - $(OBJS)\monolib_msgdlg.obj & - $(OBJS)\monolib_nativdlg.obj & - $(OBJS)\monolib_notebook.obj & - $(OBJS)\monolib_ownerdrw.obj & - $(OBJS)\monolib_palette.obj & - $(OBJS)\monolib_pen.obj & - $(OBJS)\monolib_popupwin.obj & - $(OBJS)\monolib_print.obj & - $(OBJS)\monolib_radiobox.obj & - $(OBJS)\monolib_radiobut.obj & - $(OBJS)\monolib_region.obj & - $(OBJS)\monolib_scrolbar.obj & - $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_slider.obj & - $(OBJS)\monolib_spinbutt.obj & - $(OBJS)\monolib_spinctrl.obj & - $(OBJS)\monolib_statbmp.obj & - $(OBJS)\monolib_statbox.obj & - $(OBJS)\monolib_statline.obj & - $(OBJS)\monolib_stattext.obj & - $(OBJS)\monolib_tabctrl.obj & - $(OBJS)\monolib_textctrl.obj & - $(OBJS)\monolib_tglbtn.obj & - $(OBJS)\monolib_timer.obj & - $(OBJS)\monolib_toolbar.obj & - $(OBJS)\monolib_tooltip.obj & - $(OBJS)\monolib_toplevel.obj & - $(OBJS)\monolib_utilsgui.obj & - $(OBJS)\monolib_window.obj & - $(OBJS)\monolib_accelcmn.obj & - $(OBJS)\monolib_accesscmn.obj & - $(OBJS)\monolib_anidecod.obj & - $(OBJS)\monolib_appcmn.obj & - $(OBJS)\monolib_artprov.obj & - $(OBJS)\monolib_artstd.obj & - $(OBJS)\monolib_bmpbase.obj & - $(OBJS)\monolib_bookctrl.obj & - $(OBJS)\monolib_btncmn.obj & - $(OBJS)\monolib_cairo.obj & - $(OBJS)\monolib_choiccmn.obj & - $(OBJS)\monolib_clipcmn.obj & - $(OBJS)\monolib_clrpickercmn.obj & - $(OBJS)\monolib_colourcmn.obj & - $(OBJS)\monolib_combocmn.obj & - $(OBJS)\monolib_cmdproc.obj & - $(OBJS)\monolib_cmndata.obj & - $(OBJS)\monolib_containr.obj & - $(OBJS)\monolib_cshelp.obj & - $(OBJS)\monolib_ctrlcmn.obj & - $(OBJS)\monolib_ctrlsub.obj & - $(OBJS)\monolib_datacmn.obj & - $(OBJS)\monolib_dcbase.obj & - $(OBJS)\monolib_dcbufcmn.obj & - $(OBJS)\monolib_dcgraph.obj & - $(OBJS)\monolib_dcsvg.obj & - $(OBJS)\monolib_dlgcmn.obj & - $(OBJS)\monolib_dndcmn.obj & - $(OBJS)\monolib_dobjcmn.obj & - $(OBJS)\monolib_docmdi.obj & - $(OBJS)\monolib_docview.obj & - $(OBJS)\monolib_dpycmn.obj & - $(OBJS)\monolib_dseldlg.obj & - $(OBJS)\monolib_effects.obj & - $(OBJS)\monolib_fddlgcmn.obj & - $(OBJS)\monolib_filectrlcmn.obj & - $(OBJS)\monolib_filepickercmn.obj & - $(OBJS)\monolib_fontpickercmn.obj & - $(OBJS)\monolib_fldlgcmn.obj & - $(OBJS)\monolib_fontcmn.obj & - $(OBJS)\monolib_fontenumcmn.obj & - $(OBJS)\monolib_fontmap.obj & - $(OBJS)\monolib_fontutilcmn.obj & - $(OBJS)\monolib_framecmn.obj & - $(OBJS)\monolib_gaugecmn.obj & - $(OBJS)\monolib_gbsizer.obj & - $(OBJS)\monolib_gdicmn.obj & - $(OBJS)\monolib_geometry.obj & - $(OBJS)\monolib_gifdecod.obj & - $(OBJS)\monolib_graphcmn.obj & - $(OBJS)\monolib_helpbase.obj & - $(OBJS)\monolib_iconbndl.obj & - $(OBJS)\monolib_imagall.obj & - $(OBJS)\monolib_imagbmp.obj & - $(OBJS)\monolib_image.obj & - $(OBJS)\monolib_imagfill.obj & - $(OBJS)\monolib_imaggif.obj & - $(OBJS)\monolib_imagiff.obj & - $(OBJS)\monolib_imagjpeg.obj & - $(OBJS)\monolib_imagpcx.obj & - $(OBJS)\monolib_imagpng.obj & - $(OBJS)\monolib_imagpnm.obj & - $(OBJS)\monolib_imagtga.obj & - $(OBJS)\monolib_imagtiff.obj & - $(OBJS)\monolib_imagxpm.obj & - $(OBJS)\monolib_layout.obj & - $(OBJS)\monolib_lboxcmn.obj & - $(OBJS)\monolib_listctrlcmn.obj & - $(OBJS)\monolib_matrix.obj & - $(OBJS)\monolib_menucmn.obj & - $(OBJS)\monolib_nbkbase.obj & - $(OBJS)\monolib_overlaycmn.obj & - $(OBJS)\monolib_paper.obj & - $(OBJS)\monolib_pickerbase.obj & - $(OBJS)\monolib_popupcmn.obj & - $(OBJS)\monolib_prntbase.obj & - $(OBJS)\monolib_quantize.obj & - $(OBJS)\monolib_radiocmn.obj & - $(OBJS)\monolib_rendcmn.obj & - $(OBJS)\monolib_rgncmn.obj & - $(OBJS)\monolib_settcmn.obj & - $(OBJS)\monolib_sizer.obj & - $(OBJS)\monolib_srchcmn.obj & - $(OBJS)\monolib_statbar.obj & - $(OBJS)\monolib_stattextcmn.obj & - $(OBJS)\monolib_stockitem.obj & - $(OBJS)\monolib_tbarbase.obj & - $(OBJS)\monolib_textcmn.obj & - $(OBJS)\monolib_textentrycmn.obj & - $(OBJS)\monolib_toplvcmn.obj & - $(OBJS)\monolib_treebase.obj & - $(OBJS)\monolib_valgen.obj & - $(OBJS)\monolib_validate.obj & - $(OBJS)\monolib_valtext.obj & - $(OBJS)\monolib_wincmn.obj & - $(OBJS)\monolib_xpmdecod.obj & - $(OBJS)\monolib_busyinfo.obj & - $(OBJS)\monolib_buttonbar.obj & - $(OBJS)\monolib_choicdgg.obj & - $(OBJS)\monolib_choicbkg.obj & - $(OBJS)\monolib_clrpickerg.obj & - $(OBJS)\monolib_collpaneg.obj & - $(OBJS)\monolib_combog.obj & - $(OBJS)\monolib_dcpsg.obj & - $(OBJS)\monolib_dirctrlg.obj & - $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_filectrlg.obj & - $(OBJS)\monolib_filepickerg.obj & - $(OBJS)\monolib_fontpickerg.obj & - $(OBJS)\monolib_listbkg.obj & - $(OBJS)\monolib_logg.obj & - $(OBJS)\monolib_numdlgg.obj & - $(OBJS)\monolib_panelg.obj & - $(OBJS)\monolib_progdlgg.obj & - $(OBJS)\monolib_printps.obj & - $(OBJS)\monolib_renderg.obj & - $(OBJS)\monolib_scrlwing.obj & - $(OBJS)\monolib_selstore.obj & - $(OBJS)\monolib_spinctlg.obj & - $(OBJS)\monolib_splitter.obj & - $(OBJS)\monolib_srchctlg.obj & - $(OBJS)\monolib_textdlgg.obj & - $(OBJS)\monolib_tipwin.obj & - $(OBJS)\monolib_toolbkg.obj & - $(OBJS)\monolib_treectlg.obj & - $(OBJS)\monolib_treebkg.obj & - $(OBJS)\monolib_vlbox.obj & - $(OBJS)\monolib_vscroll.obj -!endif -!endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -____CORE_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_accel.obj & - $(OBJS)\monolib_colrdlgg.obj & - $(OBJS)\monolib_dirdlgg.obj & - $(OBJS)\monolib_fdrepdlg.obj & - $(OBJS)\monolib_filedlgg.obj & - $(OBJS)\monolib_fontdlgg.obj & - $(OBJS)\monolib_listctrl.obj & - $(OBJS)\monolib_mdig.obj & - $(OBJS)\monolib_msgdlgg.obj & - $(OBJS)\monolib_prntdlgg.obj & - $(OBJS)\monolib_tabg.obj & - $(OBJS)\monolib_bmpbuttn.obj & - $(OBJS)\monolib_button.obj & - $(OBJS)\monolib_checkbox.obj & - $(OBJS)\monolib_checklst.obj & - $(OBJS)\monolib_choice.obj & - $(OBJS)\monolib_colschem.obj & - $(OBJS)\monolib_combobox.obj & - $(OBJS)\monolib_control.obj & - $(OBJS)\monolib_ctrlrend.obj & - $(OBJS)\monolib_dialog.obj & - $(OBJS)\monolib_framuniv.obj & - $(OBJS)\monolib_gauge.obj & - $(OBJS)\monolib_inpcons.obj & - $(OBJS)\monolib_inphand.obj & - $(OBJS)\monolib_listbox.obj & - $(OBJS)\monolib_menu.obj & - $(OBJS)\monolib_notebook.obj & - $(OBJS)\monolib_radiobox.obj & - $(OBJS)\monolib_radiobut.obj & - $(OBJS)\monolib_scrarrow.obj & - $(OBJS)\monolib_scrolbar.obj & - $(OBJS)\monolib_scrthumb.obj & - $(OBJS)\monolib_slider.obj & - $(OBJS)\monolib_spinbutt.obj & - $(OBJS)\monolib_statbmp.obj & - $(OBJS)\monolib_statbox.obj & - $(OBJS)\monolib_statline.obj & - $(OBJS)\monolib_stattext.obj & - $(OBJS)\monolib_statusbr.obj & - $(OBJS)\monolib_stdrend.obj & - $(OBJS)\monolib_textctrl.obj & - $(OBJS)\monolib_tglbtn.obj & - $(OBJS)\monolib_theme.obj & - $(OBJS)\monolib_toolbar.obj & - $(OBJS)\monolib_topluniv.obj & - $(OBJS)\monolib_winuniv.obj & - $(OBJS)\monolib_gtk.obj & - $(OBJS)\monolib_metal.obj & - $(OBJS)\monolib_mono.obj & - $(OBJS)\monolib_win32.obj & - $(OBJS)\monolib_accelcmn.obj & - $(OBJS)\monolib_accesscmn.obj & - $(OBJS)\monolib_anidecod.obj & - $(OBJS)\monolib_appcmn.obj & - $(OBJS)\monolib_artprov.obj & - $(OBJS)\monolib_artstd.obj & - $(OBJS)\monolib_bmpbase.obj & - $(OBJS)\monolib_bookctrl.obj & - $(OBJS)\monolib_btncmn.obj & - $(OBJS)\monolib_cairo.obj & - $(OBJS)\monolib_choiccmn.obj & - $(OBJS)\monolib_clipcmn.obj & - $(OBJS)\monolib_clrpickercmn.obj & - $(OBJS)\monolib_colourcmn.obj & - $(OBJS)\monolib_combocmn.obj & - $(OBJS)\monolib_cmdproc.obj & - $(OBJS)\monolib_cmndata.obj & - $(OBJS)\monolib_containr.obj & - $(OBJS)\monolib_cshelp.obj & - $(OBJS)\monolib_ctrlcmn.obj & - $(OBJS)\monolib_ctrlsub.obj & - $(OBJS)\monolib_datacmn.obj & - $(OBJS)\monolib_dcbase.obj & - $(OBJS)\monolib_dcbufcmn.obj & - $(OBJS)\monolib_dcgraph.obj & - $(OBJS)\monolib_dcsvg.obj & - $(OBJS)\monolib_dlgcmn.obj & - $(OBJS)\monolib_dndcmn.obj & - $(OBJS)\monolib_dobjcmn.obj & - $(OBJS)\monolib_docmdi.obj & - $(OBJS)\monolib_docview.obj & - $(OBJS)\monolib_dpycmn.obj & - $(OBJS)\monolib_dseldlg.obj & - $(OBJS)\monolib_effects.obj & - $(OBJS)\monolib_fddlgcmn.obj & - $(OBJS)\monolib_filectrlcmn.obj & - $(OBJS)\monolib_filepickercmn.obj & - $(OBJS)\monolib_fontpickercmn.obj & - $(OBJS)\monolib_fldlgcmn.obj & - $(OBJS)\monolib_fontcmn.obj & - $(OBJS)\monolib_fontenumcmn.obj & - $(OBJS)\monolib_fontmap.obj & - $(OBJS)\monolib_fontutilcmn.obj & - $(OBJS)\monolib_framecmn.obj & - $(OBJS)\monolib_gaugecmn.obj & - $(OBJS)\monolib_gbsizer.obj & - $(OBJS)\monolib_gdicmn.obj & - $(OBJS)\monolib_geometry.obj & - $(OBJS)\monolib_gifdecod.obj & - $(OBJS)\monolib_graphcmn.obj & - $(OBJS)\monolib_helpbase.obj & - $(OBJS)\monolib_iconbndl.obj & - $(OBJS)\monolib_imagall.obj & - $(OBJS)\monolib_imagbmp.obj & - $(OBJS)\monolib_image.obj & - $(OBJS)\monolib_imagfill.obj & - $(OBJS)\monolib_imaggif.obj & - $(OBJS)\monolib_imagiff.obj & - $(OBJS)\monolib_imagjpeg.obj & - $(OBJS)\monolib_imagpcx.obj & - $(OBJS)\monolib_imagpng.obj & - $(OBJS)\monolib_imagpnm.obj & - $(OBJS)\monolib_imagtga.obj & - $(OBJS)\monolib_imagtiff.obj & - $(OBJS)\monolib_imagxpm.obj & - $(OBJS)\monolib_layout.obj & - $(OBJS)\monolib_lboxcmn.obj & - $(OBJS)\monolib_listctrlcmn.obj & - $(OBJS)\monolib_matrix.obj & - $(OBJS)\monolib_menucmn.obj & - $(OBJS)\monolib_nbkbase.obj & - $(OBJS)\monolib_overlaycmn.obj & - $(OBJS)\monolib_paper.obj & - $(OBJS)\monolib_pickerbase.obj & - $(OBJS)\monolib_popupcmn.obj & - $(OBJS)\monolib_prntbase.obj & - $(OBJS)\monolib_quantize.obj & - $(OBJS)\monolib_radiocmn.obj & - $(OBJS)\monolib_rendcmn.obj & - $(OBJS)\monolib_rgncmn.obj & - $(OBJS)\monolib_settcmn.obj & - $(OBJS)\monolib_sizer.obj & - $(OBJS)\monolib_srchcmn.obj & - $(OBJS)\monolib_statbar.obj & - $(OBJS)\monolib_stattextcmn.obj & - $(OBJS)\monolib_stockitem.obj & - $(OBJS)\monolib_tbarbase.obj & - $(OBJS)\monolib_textcmn.obj & - $(OBJS)\monolib_textentrycmn.obj & - $(OBJS)\monolib_toplvcmn.obj & - $(OBJS)\monolib_treebase.obj & - $(OBJS)\monolib_valgen.obj & - $(OBJS)\monolib_validate.obj & - $(OBJS)\monolib_valtext.obj & - $(OBJS)\monolib_wincmn.obj & - $(OBJS)\monolib_xpmdecod.obj & - $(OBJS)\monolib_busyinfo.obj & - $(OBJS)\monolib_buttonbar.obj & - $(OBJS)\monolib_choicdgg.obj & - $(OBJS)\monolib_choicbkg.obj & - $(OBJS)\monolib_clrpickerg.obj & - $(OBJS)\monolib_collpaneg.obj & - $(OBJS)\monolib_combog.obj & - $(OBJS)\monolib_dcpsg.obj & - $(OBJS)\monolib_dirctrlg.obj & - $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_filectrlg.obj & - $(OBJS)\monolib_filepickerg.obj & - $(OBJS)\monolib_fontpickerg.obj & - $(OBJS)\monolib_listbkg.obj & - $(OBJS)\monolib_logg.obj & - $(OBJS)\monolib_numdlgg.obj & - $(OBJS)\monolib_panelg.obj & - $(OBJS)\monolib_progdlgg.obj & - $(OBJS)\monolib_printps.obj & - $(OBJS)\monolib_renderg.obj & - $(OBJS)\monolib_scrlwing.obj & - $(OBJS)\monolib_selstore.obj & - $(OBJS)\monolib_spinctlg.obj & - $(OBJS)\monolib_splitter.obj & - $(OBJS)\monolib_srchctlg.obj & - $(OBJS)\monolib_textdlgg.obj & - $(OBJS)\monolib_tipwin.obj & - $(OBJS)\monolib_toolbkg.obj & - $(OBJS)\monolib_treectlg.obj & - $(OBJS)\monolib_treebkg.obj & - $(OBJS)\monolib_vlbox.obj & - $(OBJS)\monolib_vscroll.obj -!endif -!endif -____ADVANCED_SRC_FILENAMES_1_OBJECTS = -!ifeq WXUNIV 0 -____ADVANCED_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_animatecmn.obj & - $(OBJS)\monolib_datavcmn.obj & - $(OBJS)\monolib_hyperlnkcmn.obj & - $(OBJS)\monolib_aboutdlgg.obj & - $(OBJS)\monolib_animateg.obj & - $(OBJS)\monolib_bmpcboxg.obj & - $(OBJS)\monolib_calctrl.obj & - $(OBJS)\monolib_datavgen.obj & - $(OBJS)\monolib_datectlg.obj & - $(OBJS)\monolib_editlbox.obj & - $(OBJS)\monolib_grid.obj & - $(OBJS)\monolib_gridctrl.obj & - $(OBJS)\monolib_gridsel.obj & - $(OBJS)\monolib_helpext.obj & - $(OBJS)\monolib_hyperlinkg.obj & - $(OBJS)\monolib_laywin.obj & - $(OBJS)\monolib_odcombo.obj & - $(OBJS)\monolib_propdlg.obj & - $(OBJS)\monolib_sashwin.obj & - $(OBJS)\monolib_splash.obj & - $(OBJS)\monolib_tipdlg.obj & - $(OBJS)\monolib_wizard.obj & - $(OBJS)\monolib_joystick.obj & - $(OBJS)\monolib_sound.obj -!endif -!ifeq WXUNIV 1 -____ADVANCED_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_animatecmn.obj & - $(OBJS)\monolib_datavcmn.obj & - $(OBJS)\monolib_hyperlnkcmn.obj & - $(OBJS)\monolib_aboutdlgg.obj & - $(OBJS)\monolib_animateg.obj & - $(OBJS)\monolib_bmpcboxg.obj & - $(OBJS)\monolib_calctrl.obj & - $(OBJS)\monolib_datavgen.obj & - $(OBJS)\monolib_datectlg.obj & - $(OBJS)\monolib_editlbox.obj & - $(OBJS)\monolib_grid.obj & - $(OBJS)\monolib_gridctrl.obj & - $(OBJS)\monolib_gridsel.obj & - $(OBJS)\monolib_helpext.obj & - $(OBJS)\monolib_hyperlinkg.obj & - $(OBJS)\monolib_laywin.obj & - $(OBJS)\monolib_odcombo.obj & - $(OBJS)\monolib_propdlg.obj & - $(OBJS)\monolib_sashwin.obj & - $(OBJS)\monolib_splash.obj & - $(OBJS)\monolib_tipdlg.obj & - $(OBJS)\monolib_wizard.obj & - $(OBJS)\monolib_joystick.obj & - $(OBJS)\monolib_sound.obj -!endif -__basedll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -__basedll___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll -!endif -!endif -__baselib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -__baselib___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!endif -____wxbase_namedll_DEP = -!ifeq SHARED 1 -____wxbase_namedll_DEP = $(__basedll___depname) -!endif -____wxbase_namelib_DEP = -!ifeq SHARED 0 -____wxbase_namelib_DEP = $(__baselib___depname) -!endif -__netdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -__netdll___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.dll -!endif -!endif -__netlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -__netlib___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!endif -____wxnet_namedll_DEP = -!ifeq SHARED 1 -____wxnet_namedll_DEP = $(__netdll___depname) -!endif -____wxnet_namelib_DEP = -!ifeq SHARED 0 -____wxnet_namelib_DEP = $(__netlib___depname) -!endif -__coredll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -__coredll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.dll -!endif -!endif -!endif -____CORE_SRC_FILENAMES_2_OBJECTS = -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -____CORE_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\coredll_caret.obj & - $(OBJS)\coredll_colrdlgg.obj & - $(OBJS)\coredll_dirdlgg.obj & - $(OBJS)\coredll_fdrepdlg.obj & - $(OBJS)\coredll_imaglist.obj & - $(OBJS)\coredll_listctrl.obj & - $(OBJS)\coredll_mdig.obj & - $(OBJS)\coredll_prntdlgg.obj & - $(OBJS)\coredll_statusbr.obj & - $(OBJS)\coredll_accel.obj & - $(OBJS)\coredll_app.obj & - $(OBJS)\coredll_bitmap.obj & - $(OBJS)\coredll_bmpbuttn.obj & - $(OBJS)\coredll_brush.obj & - $(OBJS)\coredll_button.obj & - $(OBJS)\coredll_checkbox.obj & - $(OBJS)\coredll_checklst.obj & - $(OBJS)\coredll_choice.obj & - $(OBJS)\coredll_clipbrd.obj & - $(OBJS)\coredll_colour.obj & - $(OBJS)\coredll_combobox.obj & - $(OBJS)\coredll_control.obj & - $(OBJS)\coredll_cursor.obj & - $(OBJS)\coredll_data.obj & - $(OBJS)\coredll_dataobj.obj & - $(OBJS)\coredll_dc.obj & - $(OBJS)\coredll_dcclient.obj & - $(OBJS)\coredll_dcmemory.obj & - $(OBJS)\coredll_dcprint.obj & - $(OBJS)\coredll_dcscreen.obj & - $(OBJS)\coredll_dialog.obj & - $(OBJS)\coredll_dnd.obj & - $(OBJS)\coredll_evtloop.obj & - $(OBJS)\coredll_filedlg.obj & - $(OBJS)\coredll_font.obj & - $(OBJS)\coredll_fontdlg.obj & - $(OBJS)\coredll_fontenum.obj & - $(OBJS)\coredll_fontutil.obj & - $(OBJS)\coredll_frame.obj & - $(OBJS)\coredll_gauge.obj & - $(OBJS)\coredll_gdiimage.obj & - $(OBJS)\coredll_gsockpm.obj & - $(OBJS)\coredll_helpwin.obj & - $(OBJS)\coredll_icon.obj & - $(OBJS)\coredll_iniconf.obj & - $(OBJS)\coredll_listbox.obj & - $(OBJS)\coredll_main.obj & - $(OBJS)\coredll_menu.obj & - $(OBJS)\coredll_menuitem.obj & - $(OBJS)\coredll_metafile.obj & - $(OBJS)\coredll_msgdlg.obj & - $(OBJS)\coredll_nativdlg.obj & - $(OBJS)\coredll_notebook.obj & - $(OBJS)\coredll_ownerdrw.obj & - $(OBJS)\coredll_palette.obj & - $(OBJS)\coredll_pen.obj & - $(OBJS)\coredll_popupwin.obj & - $(OBJS)\coredll_print.obj & - $(OBJS)\coredll_radiobox.obj & - $(OBJS)\coredll_radiobut.obj & - $(OBJS)\coredll_region.obj & - $(OBJS)\coredll_scrolbar.obj & - $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_slider.obj & - $(OBJS)\coredll_spinbutt.obj & - $(OBJS)\coredll_spinctrl.obj & - $(OBJS)\coredll_statbmp.obj & - $(OBJS)\coredll_statbox.obj & - $(OBJS)\coredll_statline.obj & - $(OBJS)\coredll_stattext.obj & - $(OBJS)\coredll_tabctrl.obj & - $(OBJS)\coredll_textctrl.obj & - $(OBJS)\coredll_tglbtn.obj & - $(OBJS)\coredll_timer.obj & - $(OBJS)\coredll_toolbar.obj & - $(OBJS)\coredll_tooltip.obj & - $(OBJS)\coredll_toplevel.obj & - $(OBJS)\coredll_utilsgui.obj & - $(OBJS)\coredll_window.obj & - $(OBJS)\coredll_accelcmn.obj & - $(OBJS)\coredll_accesscmn.obj & - $(OBJS)\coredll_anidecod.obj & - $(OBJS)\coredll_appcmn.obj & - $(OBJS)\coredll_artprov.obj & - $(OBJS)\coredll_artstd.obj & - $(OBJS)\coredll_bmpbase.obj & - $(OBJS)\coredll_bookctrl.obj & - $(OBJS)\coredll_btncmn.obj & - $(OBJS)\coredll_cairo.obj & - $(OBJS)\coredll_choiccmn.obj & - $(OBJS)\coredll_clipcmn.obj & - $(OBJS)\coredll_clrpickercmn.obj & - $(OBJS)\coredll_colourcmn.obj & - $(OBJS)\coredll_combocmn.obj & - $(OBJS)\coredll_cmdproc.obj & - $(OBJS)\coredll_cmndata.obj & - $(OBJS)\coredll_containr.obj & - $(OBJS)\coredll_cshelp.obj & - $(OBJS)\coredll_ctrlcmn.obj & - $(OBJS)\coredll_ctrlsub.obj & - $(OBJS)\coredll_datacmn.obj & - $(OBJS)\coredll_dcbase.obj & - $(OBJS)\coredll_dcbufcmn.obj & - $(OBJS)\coredll_dcgraph.obj & - $(OBJS)\coredll_dcsvg.obj & - $(OBJS)\coredll_dlgcmn.obj & - $(OBJS)\coredll_dndcmn.obj & - $(OBJS)\coredll_dobjcmn.obj & - $(OBJS)\coredll_docmdi.obj & - $(OBJS)\coredll_docview.obj & - $(OBJS)\coredll_dpycmn.obj & - $(OBJS)\coredll_dseldlg.obj & - $(OBJS)\coredll_effects.obj & - $(OBJS)\coredll_fddlgcmn.obj & - $(OBJS)\coredll_filectrlcmn.obj & - $(OBJS)\coredll_filepickercmn.obj & - $(OBJS)\coredll_fontpickercmn.obj & - $(OBJS)\coredll_fldlgcmn.obj & - $(OBJS)\coredll_fontcmn.obj & - $(OBJS)\coredll_fontenumcmn.obj & - $(OBJS)\coredll_fontmap.obj & - $(OBJS)\coredll_fontutilcmn.obj & - $(OBJS)\coredll_framecmn.obj & - $(OBJS)\coredll_gaugecmn.obj & - $(OBJS)\coredll_gbsizer.obj & - $(OBJS)\coredll_gdicmn.obj & - $(OBJS)\coredll_geometry.obj & - $(OBJS)\coredll_gifdecod.obj & - $(OBJS)\coredll_graphcmn.obj & - $(OBJS)\coredll_helpbase.obj & - $(OBJS)\coredll_iconbndl.obj & - $(OBJS)\coredll_imagall.obj & - $(OBJS)\coredll_imagbmp.obj & - $(OBJS)\coredll_image.obj & - $(OBJS)\coredll_imagfill.obj & - $(OBJS)\coredll_imaggif.obj & - $(OBJS)\coredll_imagiff.obj & - $(OBJS)\coredll_imagjpeg.obj & - $(OBJS)\coredll_imagpcx.obj & - $(OBJS)\coredll_imagpng.obj & - $(OBJS)\coredll_imagpnm.obj & - $(OBJS)\coredll_imagtga.obj & - $(OBJS)\coredll_imagtiff.obj & - $(OBJS)\coredll_imagxpm.obj & - $(OBJS)\coredll_layout.obj & - $(OBJS)\coredll_lboxcmn.obj & - $(OBJS)\coredll_listctrlcmn.obj & - $(OBJS)\coredll_matrix.obj & - $(OBJS)\coredll_menucmn.obj & - $(OBJS)\coredll_nbkbase.obj & - $(OBJS)\coredll_overlaycmn.obj & - $(OBJS)\coredll_paper.obj & - $(OBJS)\coredll_pickerbase.obj & - $(OBJS)\coredll_popupcmn.obj & - $(OBJS)\coredll_prntbase.obj & - $(OBJS)\coredll_quantize.obj & - $(OBJS)\coredll_radiocmn.obj & - $(OBJS)\coredll_rendcmn.obj & - $(OBJS)\coredll_rgncmn.obj & - $(OBJS)\coredll_settcmn.obj & - $(OBJS)\coredll_sizer.obj & - $(OBJS)\coredll_srchcmn.obj & - $(OBJS)\coredll_statbar.obj & - $(OBJS)\coredll_stattextcmn.obj & - $(OBJS)\coredll_stockitem.obj & - $(OBJS)\coredll_tbarbase.obj & - $(OBJS)\coredll_textcmn.obj & - $(OBJS)\coredll_textentrycmn.obj & - $(OBJS)\coredll_toplvcmn.obj & - $(OBJS)\coredll_treebase.obj & - $(OBJS)\coredll_valgen.obj & - $(OBJS)\coredll_validate.obj & - $(OBJS)\coredll_valtext.obj & - $(OBJS)\coredll_wincmn.obj & - $(OBJS)\coredll_xpmdecod.obj & - $(OBJS)\coredll_busyinfo.obj & - $(OBJS)\coredll_buttonbar.obj & - $(OBJS)\coredll_choicdgg.obj & - $(OBJS)\coredll_choicbkg.obj & - $(OBJS)\coredll_clrpickerg.obj & - $(OBJS)\coredll_collpaneg.obj & - $(OBJS)\coredll_combog.obj & - $(OBJS)\coredll_dcpsg.obj & - $(OBJS)\coredll_dirctrlg.obj & - $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_filectrlg.obj & - $(OBJS)\coredll_filepickerg.obj & - $(OBJS)\coredll_fontpickerg.obj & - $(OBJS)\coredll_listbkg.obj & - $(OBJS)\coredll_logg.obj & - $(OBJS)\coredll_numdlgg.obj & - $(OBJS)\coredll_panelg.obj & - $(OBJS)\coredll_progdlgg.obj & - $(OBJS)\coredll_printps.obj & - $(OBJS)\coredll_renderg.obj & - $(OBJS)\coredll_scrlwing.obj & - $(OBJS)\coredll_selstore.obj & - $(OBJS)\coredll_spinctlg.obj & - $(OBJS)\coredll_splitter.obj & - $(OBJS)\coredll_srchctlg.obj & - $(OBJS)\coredll_textdlgg.obj & - $(OBJS)\coredll_tipwin.obj & - $(OBJS)\coredll_toolbkg.obj & - $(OBJS)\coredll_treectlg.obj & - $(OBJS)\coredll_treebkg.obj & - $(OBJS)\coredll_vlbox.obj & - $(OBJS)\coredll_vscroll.obj -!endif -!endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -____CORE_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\coredll_accel.obj & - $(OBJS)\coredll_colrdlgg.obj & - $(OBJS)\coredll_dirdlgg.obj & - $(OBJS)\coredll_fdrepdlg.obj & - $(OBJS)\coredll_filedlgg.obj & - $(OBJS)\coredll_fontdlgg.obj & - $(OBJS)\coredll_listctrl.obj & - $(OBJS)\coredll_mdig.obj & - $(OBJS)\coredll_msgdlgg.obj & - $(OBJS)\coredll_prntdlgg.obj & - $(OBJS)\coredll_tabg.obj & - $(OBJS)\coredll_bmpbuttn.obj & - $(OBJS)\coredll_button.obj & - $(OBJS)\coredll_checkbox.obj & - $(OBJS)\coredll_checklst.obj & - $(OBJS)\coredll_choice.obj & - $(OBJS)\coredll_colschem.obj & - $(OBJS)\coredll_combobox.obj & - $(OBJS)\coredll_control.obj & - $(OBJS)\coredll_ctrlrend.obj & - $(OBJS)\coredll_dialog.obj & - $(OBJS)\coredll_framuniv.obj & - $(OBJS)\coredll_gauge.obj & - $(OBJS)\coredll_inpcons.obj & - $(OBJS)\coredll_inphand.obj & - $(OBJS)\coredll_listbox.obj & - $(OBJS)\coredll_menu.obj & - $(OBJS)\coredll_notebook.obj & - $(OBJS)\coredll_radiobox.obj & - $(OBJS)\coredll_radiobut.obj & - $(OBJS)\coredll_scrarrow.obj & - $(OBJS)\coredll_scrolbar.obj & - $(OBJS)\coredll_scrthumb.obj & - $(OBJS)\coredll_slider.obj & - $(OBJS)\coredll_spinbutt.obj & - $(OBJS)\coredll_statbmp.obj & - $(OBJS)\coredll_statbox.obj & - $(OBJS)\coredll_statline.obj & - $(OBJS)\coredll_stattext.obj & - $(OBJS)\coredll_statusbr.obj & - $(OBJS)\coredll_stdrend.obj & - $(OBJS)\coredll_textctrl.obj & - $(OBJS)\coredll_tglbtn.obj & - $(OBJS)\coredll_theme.obj & - $(OBJS)\coredll_toolbar.obj & - $(OBJS)\coredll_topluniv.obj & - $(OBJS)\coredll_winuniv.obj & - $(OBJS)\coredll_gtk.obj & - $(OBJS)\coredll_metal.obj & - $(OBJS)\coredll_mono.obj & - $(OBJS)\coredll_win32.obj & - $(OBJS)\coredll_accelcmn.obj & - $(OBJS)\coredll_accesscmn.obj & - $(OBJS)\coredll_anidecod.obj & - $(OBJS)\coredll_appcmn.obj & - $(OBJS)\coredll_artprov.obj & - $(OBJS)\coredll_artstd.obj & - $(OBJS)\coredll_bmpbase.obj & - $(OBJS)\coredll_bookctrl.obj & - $(OBJS)\coredll_btncmn.obj & - $(OBJS)\coredll_cairo.obj & - $(OBJS)\coredll_choiccmn.obj & - $(OBJS)\coredll_clipcmn.obj & - $(OBJS)\coredll_clrpickercmn.obj & - $(OBJS)\coredll_colourcmn.obj & - $(OBJS)\coredll_combocmn.obj & - $(OBJS)\coredll_cmdproc.obj & - $(OBJS)\coredll_cmndata.obj & - $(OBJS)\coredll_containr.obj & - $(OBJS)\coredll_cshelp.obj & - $(OBJS)\coredll_ctrlcmn.obj & - $(OBJS)\coredll_ctrlsub.obj & - $(OBJS)\coredll_datacmn.obj & - $(OBJS)\coredll_dcbase.obj & - $(OBJS)\coredll_dcbufcmn.obj & - $(OBJS)\coredll_dcgraph.obj & - $(OBJS)\coredll_dcsvg.obj & - $(OBJS)\coredll_dlgcmn.obj & - $(OBJS)\coredll_dndcmn.obj & - $(OBJS)\coredll_dobjcmn.obj & - $(OBJS)\coredll_docmdi.obj & - $(OBJS)\coredll_docview.obj & - $(OBJS)\coredll_dpycmn.obj & - $(OBJS)\coredll_dseldlg.obj & - $(OBJS)\coredll_effects.obj & - $(OBJS)\coredll_fddlgcmn.obj & - $(OBJS)\coredll_filectrlcmn.obj & - $(OBJS)\coredll_filepickercmn.obj & - $(OBJS)\coredll_fontpickercmn.obj & - $(OBJS)\coredll_fldlgcmn.obj & - $(OBJS)\coredll_fontcmn.obj & - $(OBJS)\coredll_fontenumcmn.obj & - $(OBJS)\coredll_fontmap.obj & - $(OBJS)\coredll_fontutilcmn.obj & - $(OBJS)\coredll_framecmn.obj & - $(OBJS)\coredll_gaugecmn.obj & - $(OBJS)\coredll_gbsizer.obj & - $(OBJS)\coredll_gdicmn.obj & - $(OBJS)\coredll_geometry.obj & - $(OBJS)\coredll_gifdecod.obj & - $(OBJS)\coredll_graphcmn.obj & - $(OBJS)\coredll_helpbase.obj & - $(OBJS)\coredll_iconbndl.obj & - $(OBJS)\coredll_imagall.obj & - $(OBJS)\coredll_imagbmp.obj & - $(OBJS)\coredll_image.obj & - $(OBJS)\coredll_imagfill.obj & - $(OBJS)\coredll_imaggif.obj & - $(OBJS)\coredll_imagiff.obj & - $(OBJS)\coredll_imagjpeg.obj & - $(OBJS)\coredll_imagpcx.obj & - $(OBJS)\coredll_imagpng.obj & - $(OBJS)\coredll_imagpnm.obj & - $(OBJS)\coredll_imagtga.obj & - $(OBJS)\coredll_imagtiff.obj & - $(OBJS)\coredll_imagxpm.obj & - $(OBJS)\coredll_layout.obj & - $(OBJS)\coredll_lboxcmn.obj & - $(OBJS)\coredll_listctrlcmn.obj & - $(OBJS)\coredll_matrix.obj & - $(OBJS)\coredll_menucmn.obj & - $(OBJS)\coredll_nbkbase.obj & - $(OBJS)\coredll_overlaycmn.obj & - $(OBJS)\coredll_paper.obj & - $(OBJS)\coredll_pickerbase.obj & - $(OBJS)\coredll_popupcmn.obj & - $(OBJS)\coredll_prntbase.obj & - $(OBJS)\coredll_quantize.obj & - $(OBJS)\coredll_radiocmn.obj & - $(OBJS)\coredll_rendcmn.obj & - $(OBJS)\coredll_rgncmn.obj & - $(OBJS)\coredll_settcmn.obj & - $(OBJS)\coredll_sizer.obj & - $(OBJS)\coredll_srchcmn.obj & - $(OBJS)\coredll_statbar.obj & - $(OBJS)\coredll_stattextcmn.obj & - $(OBJS)\coredll_stockitem.obj & - $(OBJS)\coredll_tbarbase.obj & - $(OBJS)\coredll_textcmn.obj & - $(OBJS)\coredll_textentrycmn.obj & - $(OBJS)\coredll_toplvcmn.obj & - $(OBJS)\coredll_treebase.obj & - $(OBJS)\coredll_valgen.obj & - $(OBJS)\coredll_validate.obj & - $(OBJS)\coredll_valtext.obj & - $(OBJS)\coredll_wincmn.obj & - $(OBJS)\coredll_xpmdecod.obj & - $(OBJS)\coredll_busyinfo.obj & - $(OBJS)\coredll_buttonbar.obj & - $(OBJS)\coredll_choicdgg.obj & - $(OBJS)\coredll_choicbkg.obj & - $(OBJS)\coredll_clrpickerg.obj & - $(OBJS)\coredll_collpaneg.obj & - $(OBJS)\coredll_combog.obj & - $(OBJS)\coredll_dcpsg.obj & - $(OBJS)\coredll_dirctrlg.obj & - $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_filectrlg.obj & - $(OBJS)\coredll_filepickerg.obj & - $(OBJS)\coredll_fontpickerg.obj & - $(OBJS)\coredll_listbkg.obj & - $(OBJS)\coredll_logg.obj & - $(OBJS)\coredll_numdlgg.obj & - $(OBJS)\coredll_panelg.obj & - $(OBJS)\coredll_progdlgg.obj & - $(OBJS)\coredll_printps.obj & - $(OBJS)\coredll_renderg.obj & - $(OBJS)\coredll_scrlwing.obj & - $(OBJS)\coredll_selstore.obj & - $(OBJS)\coredll_spinctlg.obj & - $(OBJS)\coredll_splitter.obj & - $(OBJS)\coredll_srchctlg.obj & - $(OBJS)\coredll_textdlgg.obj & - $(OBJS)\coredll_tipwin.obj & - $(OBJS)\coredll_toolbkg.obj & - $(OBJS)\coredll_treectlg.obj & - $(OBJS)\coredll_treebkg.obj & - $(OBJS)\coredll_vlbox.obj & - $(OBJS)\coredll_vscroll.obj -!endif -!endif -__corelib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -__corelib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!endif -!endif -____CORE_SRC_FILENAMES_3_OBJECTS = -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -____CORE_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\corelib_caret.obj & - $(OBJS)\corelib_colrdlgg.obj & - $(OBJS)\corelib_dirdlgg.obj & - $(OBJS)\corelib_fdrepdlg.obj & - $(OBJS)\corelib_imaglist.obj & - $(OBJS)\corelib_listctrl.obj & - $(OBJS)\corelib_mdig.obj & - $(OBJS)\corelib_prntdlgg.obj & - $(OBJS)\corelib_statusbr.obj & - $(OBJS)\corelib_accel.obj & - $(OBJS)\corelib_app.obj & - $(OBJS)\corelib_bitmap.obj & - $(OBJS)\corelib_bmpbuttn.obj & - $(OBJS)\corelib_brush.obj & - $(OBJS)\corelib_button.obj & - $(OBJS)\corelib_checkbox.obj & - $(OBJS)\corelib_checklst.obj & - $(OBJS)\corelib_choice.obj & - $(OBJS)\corelib_clipbrd.obj & - $(OBJS)\corelib_colour.obj & - $(OBJS)\corelib_combobox.obj & - $(OBJS)\corelib_control.obj & - $(OBJS)\corelib_cursor.obj & - $(OBJS)\corelib_data.obj & - $(OBJS)\corelib_dataobj.obj & - $(OBJS)\corelib_dc.obj & - $(OBJS)\corelib_dcclient.obj & - $(OBJS)\corelib_dcmemory.obj & - $(OBJS)\corelib_dcprint.obj & - $(OBJS)\corelib_dcscreen.obj & - $(OBJS)\corelib_dialog.obj & - $(OBJS)\corelib_dnd.obj & - $(OBJS)\corelib_evtloop.obj & - $(OBJS)\corelib_filedlg.obj & - $(OBJS)\corelib_font.obj & - $(OBJS)\corelib_fontdlg.obj & - $(OBJS)\corelib_fontenum.obj & - $(OBJS)\corelib_fontutil.obj & - $(OBJS)\corelib_frame.obj & - $(OBJS)\corelib_gauge.obj & - $(OBJS)\corelib_gdiimage.obj & - $(OBJS)\corelib_gsockpm.obj & - $(OBJS)\corelib_helpwin.obj & - $(OBJS)\corelib_icon.obj & - $(OBJS)\corelib_iniconf.obj & - $(OBJS)\corelib_listbox.obj & - $(OBJS)\corelib_main.obj & - $(OBJS)\corelib_menu.obj & - $(OBJS)\corelib_menuitem.obj & - $(OBJS)\corelib_metafile.obj & - $(OBJS)\corelib_msgdlg.obj & - $(OBJS)\corelib_nativdlg.obj & - $(OBJS)\corelib_notebook.obj & - $(OBJS)\corelib_ownerdrw.obj & - $(OBJS)\corelib_palette.obj & - $(OBJS)\corelib_pen.obj & - $(OBJS)\corelib_popupwin.obj & - $(OBJS)\corelib_print.obj & - $(OBJS)\corelib_radiobox.obj & - $(OBJS)\corelib_radiobut.obj & - $(OBJS)\corelib_region.obj & - $(OBJS)\corelib_scrolbar.obj & - $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_slider.obj & - $(OBJS)\corelib_spinbutt.obj & - $(OBJS)\corelib_spinctrl.obj & - $(OBJS)\corelib_statbmp.obj & - $(OBJS)\corelib_statbox.obj & - $(OBJS)\corelib_statline.obj & - $(OBJS)\corelib_stattext.obj & - $(OBJS)\corelib_tabctrl.obj & - $(OBJS)\corelib_textctrl.obj & - $(OBJS)\corelib_tglbtn.obj & - $(OBJS)\corelib_timer.obj & - $(OBJS)\corelib_toolbar.obj & - $(OBJS)\corelib_tooltip.obj & - $(OBJS)\corelib_toplevel.obj & - $(OBJS)\corelib_utilsgui.obj & - $(OBJS)\corelib_window.obj & - $(OBJS)\corelib_accelcmn.obj & - $(OBJS)\corelib_accesscmn.obj & - $(OBJS)\corelib_anidecod.obj & - $(OBJS)\corelib_appcmn.obj & - $(OBJS)\corelib_artprov.obj & - $(OBJS)\corelib_artstd.obj & - $(OBJS)\corelib_bmpbase.obj & - $(OBJS)\corelib_bookctrl.obj & - $(OBJS)\corelib_btncmn.obj & - $(OBJS)\corelib_cairo.obj & - $(OBJS)\corelib_choiccmn.obj & - $(OBJS)\corelib_clipcmn.obj & - $(OBJS)\corelib_clrpickercmn.obj & - $(OBJS)\corelib_colourcmn.obj & - $(OBJS)\corelib_combocmn.obj & - $(OBJS)\corelib_cmdproc.obj & - $(OBJS)\corelib_cmndata.obj & - $(OBJS)\corelib_containr.obj & - $(OBJS)\corelib_cshelp.obj & - $(OBJS)\corelib_ctrlcmn.obj & - $(OBJS)\corelib_ctrlsub.obj & - $(OBJS)\corelib_datacmn.obj & - $(OBJS)\corelib_dcbase.obj & - $(OBJS)\corelib_dcbufcmn.obj & - $(OBJS)\corelib_dcgraph.obj & - $(OBJS)\corelib_dcsvg.obj & - $(OBJS)\corelib_dlgcmn.obj & - $(OBJS)\corelib_dndcmn.obj & - $(OBJS)\corelib_dobjcmn.obj & - $(OBJS)\corelib_docmdi.obj & - $(OBJS)\corelib_docview.obj & - $(OBJS)\corelib_dpycmn.obj & - $(OBJS)\corelib_dseldlg.obj & - $(OBJS)\corelib_effects.obj & - $(OBJS)\corelib_fddlgcmn.obj & - $(OBJS)\corelib_filectrlcmn.obj & - $(OBJS)\corelib_filepickercmn.obj & - $(OBJS)\corelib_fontpickercmn.obj & - $(OBJS)\corelib_fldlgcmn.obj & - $(OBJS)\corelib_fontcmn.obj & - $(OBJS)\corelib_fontenumcmn.obj & - $(OBJS)\corelib_fontmap.obj & - $(OBJS)\corelib_fontutilcmn.obj & - $(OBJS)\corelib_framecmn.obj & - $(OBJS)\corelib_gaugecmn.obj & - $(OBJS)\corelib_gbsizer.obj & - $(OBJS)\corelib_gdicmn.obj & - $(OBJS)\corelib_geometry.obj & - $(OBJS)\corelib_gifdecod.obj & - $(OBJS)\corelib_graphcmn.obj & - $(OBJS)\corelib_helpbase.obj & - $(OBJS)\corelib_iconbndl.obj & - $(OBJS)\corelib_imagall.obj & - $(OBJS)\corelib_imagbmp.obj & - $(OBJS)\corelib_image.obj & - $(OBJS)\corelib_imagfill.obj & - $(OBJS)\corelib_imaggif.obj & - $(OBJS)\corelib_imagiff.obj & - $(OBJS)\corelib_imagjpeg.obj & - $(OBJS)\corelib_imagpcx.obj & - $(OBJS)\corelib_imagpng.obj & - $(OBJS)\corelib_imagpnm.obj & - $(OBJS)\corelib_imagtga.obj & - $(OBJS)\corelib_imagtiff.obj & - $(OBJS)\corelib_imagxpm.obj & - $(OBJS)\corelib_layout.obj & - $(OBJS)\corelib_lboxcmn.obj & - $(OBJS)\corelib_listctrlcmn.obj & - $(OBJS)\corelib_matrix.obj & - $(OBJS)\corelib_menucmn.obj & - $(OBJS)\corelib_nbkbase.obj & - $(OBJS)\corelib_overlaycmn.obj & - $(OBJS)\corelib_paper.obj & - $(OBJS)\corelib_pickerbase.obj & - $(OBJS)\corelib_popupcmn.obj & - $(OBJS)\corelib_prntbase.obj & - $(OBJS)\corelib_quantize.obj & - $(OBJS)\corelib_radiocmn.obj & - $(OBJS)\corelib_rendcmn.obj & - $(OBJS)\corelib_rgncmn.obj & - $(OBJS)\corelib_settcmn.obj & - $(OBJS)\corelib_sizer.obj & - $(OBJS)\corelib_srchcmn.obj & - $(OBJS)\corelib_statbar.obj & - $(OBJS)\corelib_stattextcmn.obj & - $(OBJS)\corelib_stockitem.obj & - $(OBJS)\corelib_tbarbase.obj & - $(OBJS)\corelib_textcmn.obj & - $(OBJS)\corelib_textentrycmn.obj & - $(OBJS)\corelib_toplvcmn.obj & - $(OBJS)\corelib_treebase.obj & - $(OBJS)\corelib_valgen.obj & - $(OBJS)\corelib_validate.obj & - $(OBJS)\corelib_valtext.obj & - $(OBJS)\corelib_wincmn.obj & - $(OBJS)\corelib_xpmdecod.obj & - $(OBJS)\corelib_busyinfo.obj & - $(OBJS)\corelib_buttonbar.obj & - $(OBJS)\corelib_choicdgg.obj & - $(OBJS)\corelib_choicbkg.obj & - $(OBJS)\corelib_clrpickerg.obj & - $(OBJS)\corelib_collpaneg.obj & - $(OBJS)\corelib_combog.obj & - $(OBJS)\corelib_dcpsg.obj & - $(OBJS)\corelib_dirctrlg.obj & - $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_filectrlg.obj & - $(OBJS)\corelib_filepickerg.obj & - $(OBJS)\corelib_fontpickerg.obj & - $(OBJS)\corelib_listbkg.obj & - $(OBJS)\corelib_logg.obj & - $(OBJS)\corelib_numdlgg.obj & - $(OBJS)\corelib_panelg.obj & - $(OBJS)\corelib_progdlgg.obj & - $(OBJS)\corelib_printps.obj & - $(OBJS)\corelib_renderg.obj & - $(OBJS)\corelib_scrlwing.obj & - $(OBJS)\corelib_selstore.obj & - $(OBJS)\corelib_spinctlg.obj & - $(OBJS)\corelib_splitter.obj & - $(OBJS)\corelib_srchctlg.obj & - $(OBJS)\corelib_textdlgg.obj & - $(OBJS)\corelib_tipwin.obj & - $(OBJS)\corelib_toolbkg.obj & - $(OBJS)\corelib_treectlg.obj & - $(OBJS)\corelib_treebkg.obj & - $(OBJS)\corelib_vlbox.obj & - $(OBJS)\corelib_vscroll.obj -!endif -!endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -____CORE_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\corelib_accel.obj & - $(OBJS)\corelib_colrdlgg.obj & - $(OBJS)\corelib_dirdlgg.obj & - $(OBJS)\corelib_fdrepdlg.obj & - $(OBJS)\corelib_filedlgg.obj & - $(OBJS)\corelib_fontdlgg.obj & - $(OBJS)\corelib_listctrl.obj & - $(OBJS)\corelib_mdig.obj & - $(OBJS)\corelib_msgdlgg.obj & - $(OBJS)\corelib_prntdlgg.obj & - $(OBJS)\corelib_tabg.obj & - $(OBJS)\corelib_bmpbuttn.obj & - $(OBJS)\corelib_button.obj & - $(OBJS)\corelib_checkbox.obj & - $(OBJS)\corelib_checklst.obj & - $(OBJS)\corelib_choice.obj & - $(OBJS)\corelib_colschem.obj & - $(OBJS)\corelib_combobox.obj & - $(OBJS)\corelib_control.obj & - $(OBJS)\corelib_ctrlrend.obj & - $(OBJS)\corelib_dialog.obj & - $(OBJS)\corelib_framuniv.obj & - $(OBJS)\corelib_gauge.obj & - $(OBJS)\corelib_inpcons.obj & - $(OBJS)\corelib_inphand.obj & - $(OBJS)\corelib_listbox.obj & - $(OBJS)\corelib_menu.obj & - $(OBJS)\corelib_notebook.obj & - $(OBJS)\corelib_radiobox.obj & - $(OBJS)\corelib_radiobut.obj & - $(OBJS)\corelib_scrarrow.obj & - $(OBJS)\corelib_scrolbar.obj & - $(OBJS)\corelib_scrthumb.obj & - $(OBJS)\corelib_slider.obj & - $(OBJS)\corelib_spinbutt.obj & - $(OBJS)\corelib_statbmp.obj & - $(OBJS)\corelib_statbox.obj & - $(OBJS)\corelib_statline.obj & - $(OBJS)\corelib_stattext.obj & - $(OBJS)\corelib_statusbr.obj & - $(OBJS)\corelib_stdrend.obj & - $(OBJS)\corelib_textctrl.obj & - $(OBJS)\corelib_tglbtn.obj & - $(OBJS)\corelib_theme.obj & - $(OBJS)\corelib_toolbar.obj & - $(OBJS)\corelib_topluniv.obj & - $(OBJS)\corelib_winuniv.obj & - $(OBJS)\corelib_gtk.obj & - $(OBJS)\corelib_metal.obj & - $(OBJS)\corelib_mono.obj & - $(OBJS)\corelib_win32.obj & - $(OBJS)\corelib_accelcmn.obj & - $(OBJS)\corelib_accesscmn.obj & - $(OBJS)\corelib_anidecod.obj & - $(OBJS)\corelib_appcmn.obj & - $(OBJS)\corelib_artprov.obj & - $(OBJS)\corelib_artstd.obj & - $(OBJS)\corelib_bmpbase.obj & - $(OBJS)\corelib_bookctrl.obj & - $(OBJS)\corelib_btncmn.obj & - $(OBJS)\corelib_cairo.obj & - $(OBJS)\corelib_choiccmn.obj & - $(OBJS)\corelib_clipcmn.obj & - $(OBJS)\corelib_clrpickercmn.obj & - $(OBJS)\corelib_colourcmn.obj & - $(OBJS)\corelib_combocmn.obj & - $(OBJS)\corelib_cmdproc.obj & - $(OBJS)\corelib_cmndata.obj & - $(OBJS)\corelib_containr.obj & - $(OBJS)\corelib_cshelp.obj & - $(OBJS)\corelib_ctrlcmn.obj & - $(OBJS)\corelib_ctrlsub.obj & - $(OBJS)\corelib_datacmn.obj & - $(OBJS)\corelib_dcbase.obj & - $(OBJS)\corelib_dcbufcmn.obj & - $(OBJS)\corelib_dcgraph.obj & - $(OBJS)\corelib_dcsvg.obj & - $(OBJS)\corelib_dlgcmn.obj & - $(OBJS)\corelib_dndcmn.obj & - $(OBJS)\corelib_dobjcmn.obj & - $(OBJS)\corelib_docmdi.obj & - $(OBJS)\corelib_docview.obj & - $(OBJS)\corelib_dpycmn.obj & - $(OBJS)\corelib_dseldlg.obj & - $(OBJS)\corelib_effects.obj & - $(OBJS)\corelib_fddlgcmn.obj & - $(OBJS)\corelib_filectrlcmn.obj & - $(OBJS)\corelib_filepickercmn.obj & - $(OBJS)\corelib_fontpickercmn.obj & - $(OBJS)\corelib_fldlgcmn.obj & - $(OBJS)\corelib_fontcmn.obj & - $(OBJS)\corelib_fontenumcmn.obj & - $(OBJS)\corelib_fontmap.obj & - $(OBJS)\corelib_fontutilcmn.obj & - $(OBJS)\corelib_framecmn.obj & - $(OBJS)\corelib_gaugecmn.obj & - $(OBJS)\corelib_gbsizer.obj & - $(OBJS)\corelib_gdicmn.obj & - $(OBJS)\corelib_geometry.obj & - $(OBJS)\corelib_gifdecod.obj & - $(OBJS)\corelib_graphcmn.obj & - $(OBJS)\corelib_helpbase.obj & - $(OBJS)\corelib_iconbndl.obj & - $(OBJS)\corelib_imagall.obj & - $(OBJS)\corelib_imagbmp.obj & - $(OBJS)\corelib_image.obj & - $(OBJS)\corelib_imagfill.obj & - $(OBJS)\corelib_imaggif.obj & - $(OBJS)\corelib_imagiff.obj & - $(OBJS)\corelib_imagjpeg.obj & - $(OBJS)\corelib_imagpcx.obj & - $(OBJS)\corelib_imagpng.obj & - $(OBJS)\corelib_imagpnm.obj & - $(OBJS)\corelib_imagtga.obj & - $(OBJS)\corelib_imagtiff.obj & - $(OBJS)\corelib_imagxpm.obj & - $(OBJS)\corelib_layout.obj & - $(OBJS)\corelib_lboxcmn.obj & - $(OBJS)\corelib_listctrlcmn.obj & - $(OBJS)\corelib_matrix.obj & - $(OBJS)\corelib_menucmn.obj & - $(OBJS)\corelib_nbkbase.obj & - $(OBJS)\corelib_overlaycmn.obj & - $(OBJS)\corelib_paper.obj & - $(OBJS)\corelib_pickerbase.obj & - $(OBJS)\corelib_popupcmn.obj & - $(OBJS)\corelib_prntbase.obj & - $(OBJS)\corelib_quantize.obj & - $(OBJS)\corelib_radiocmn.obj & - $(OBJS)\corelib_rendcmn.obj & - $(OBJS)\corelib_rgncmn.obj & - $(OBJS)\corelib_settcmn.obj & - $(OBJS)\corelib_sizer.obj & - $(OBJS)\corelib_srchcmn.obj & - $(OBJS)\corelib_statbar.obj & - $(OBJS)\corelib_stattextcmn.obj & - $(OBJS)\corelib_stockitem.obj & - $(OBJS)\corelib_tbarbase.obj & - $(OBJS)\corelib_textcmn.obj & - $(OBJS)\corelib_textentrycmn.obj & - $(OBJS)\corelib_toplvcmn.obj & - $(OBJS)\corelib_treebase.obj & - $(OBJS)\corelib_valgen.obj & - $(OBJS)\corelib_validate.obj & - $(OBJS)\corelib_valtext.obj & - $(OBJS)\corelib_wincmn.obj & - $(OBJS)\corelib_xpmdecod.obj & - $(OBJS)\corelib_busyinfo.obj & - $(OBJS)\corelib_buttonbar.obj & - $(OBJS)\corelib_choicdgg.obj & - $(OBJS)\corelib_choicbkg.obj & - $(OBJS)\corelib_clrpickerg.obj & - $(OBJS)\corelib_collpaneg.obj & - $(OBJS)\corelib_combog.obj & - $(OBJS)\corelib_dcpsg.obj & - $(OBJS)\corelib_dirctrlg.obj & - $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_filectrlg.obj & - $(OBJS)\corelib_filepickerg.obj & - $(OBJS)\corelib_fontpickerg.obj & - $(OBJS)\corelib_listbkg.obj & - $(OBJS)\corelib_logg.obj & - $(OBJS)\corelib_numdlgg.obj & - $(OBJS)\corelib_panelg.obj & - $(OBJS)\corelib_progdlgg.obj & - $(OBJS)\corelib_printps.obj & - $(OBJS)\corelib_renderg.obj & - $(OBJS)\corelib_scrlwing.obj & - $(OBJS)\corelib_selstore.obj & - $(OBJS)\corelib_spinctlg.obj & - $(OBJS)\corelib_splitter.obj & - $(OBJS)\corelib_srchctlg.obj & - $(OBJS)\corelib_textdlgg.obj & - $(OBJS)\corelib_tipwin.obj & - $(OBJS)\corelib_toolbkg.obj & - $(OBJS)\corelib_treectlg.obj & - $(OBJS)\corelib_treebkg.obj & - $(OBJS)\corelib_vlbox.obj & - $(OBJS)\corelib_vscroll.obj -!endif -!endif -____wxcore_namedll_DEP = -!ifeq SHARED 1 -____wxcore_namedll_DEP = $(__coredll___depname) -!endif -____wxcore_namelib_DEP = -!ifeq SHARED 0 -____wxcore_namelib_DEP = $(__corelib___depname) -!endif -__advdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -__advdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll -!endif -!endif -!endif -____ADVANCED_SRC_FILENAMES_2_OBJECTS = -!ifeq WXUNIV 0 -____ADVANCED_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\advdll_animatecmn.obj & - $(OBJS)\advdll_datavcmn.obj & - $(OBJS)\advdll_hyperlnkcmn.obj & - $(OBJS)\advdll_aboutdlgg.obj & - $(OBJS)\advdll_animateg.obj & - $(OBJS)\advdll_bmpcboxg.obj & - $(OBJS)\advdll_calctrl.obj & - $(OBJS)\advdll_datavgen.obj & - $(OBJS)\advdll_datectlg.obj & - $(OBJS)\advdll_editlbox.obj & - $(OBJS)\advdll_grid.obj & - $(OBJS)\advdll_gridctrl.obj & - $(OBJS)\advdll_gridsel.obj & - $(OBJS)\advdll_helpext.obj & - $(OBJS)\advdll_hyperlinkg.obj & - $(OBJS)\advdll_laywin.obj & - $(OBJS)\advdll_odcombo.obj & - $(OBJS)\advdll_propdlg.obj & - $(OBJS)\advdll_sashwin.obj & - $(OBJS)\advdll_splash.obj & - $(OBJS)\advdll_tipdlg.obj & - $(OBJS)\advdll_wizard.obj & - $(OBJS)\advdll_joystick.obj & - $(OBJS)\advdll_sound.obj -!endif -!ifeq WXUNIV 1 -____ADVANCED_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\advdll_animatecmn.obj & - $(OBJS)\advdll_datavcmn.obj & - $(OBJS)\advdll_hyperlnkcmn.obj & - $(OBJS)\advdll_aboutdlgg.obj & - $(OBJS)\advdll_animateg.obj & - $(OBJS)\advdll_bmpcboxg.obj & - $(OBJS)\advdll_calctrl.obj & - $(OBJS)\advdll_datavgen.obj & - $(OBJS)\advdll_datectlg.obj & - $(OBJS)\advdll_editlbox.obj & - $(OBJS)\advdll_grid.obj & - $(OBJS)\advdll_gridctrl.obj & - $(OBJS)\advdll_gridsel.obj & - $(OBJS)\advdll_helpext.obj & - $(OBJS)\advdll_hyperlinkg.obj & - $(OBJS)\advdll_laywin.obj & - $(OBJS)\advdll_odcombo.obj & - $(OBJS)\advdll_propdlg.obj & - $(OBJS)\advdll_sashwin.obj & - $(OBJS)\advdll_splash.obj & - $(OBJS)\advdll_tipdlg.obj & - $(OBJS)\advdll_wizard.obj & - $(OBJS)\advdll_joystick.obj & - $(OBJS)\advdll_sound.obj -!endif -__advlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -__advlib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!endif -!endif -____ADVANCED_SRC_FILENAMES_3_OBJECTS = -!ifeq WXUNIV 0 -____ADVANCED_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\advlib_animatecmn.obj & - $(OBJS)\advlib_datavcmn.obj & - $(OBJS)\advlib_hyperlnkcmn.obj & - $(OBJS)\advlib_aboutdlgg.obj & - $(OBJS)\advlib_animateg.obj & - $(OBJS)\advlib_bmpcboxg.obj & - $(OBJS)\advlib_calctrl.obj & - $(OBJS)\advlib_datavgen.obj & - $(OBJS)\advlib_datectlg.obj & - $(OBJS)\advlib_editlbox.obj & - $(OBJS)\advlib_grid.obj & - $(OBJS)\advlib_gridctrl.obj & - $(OBJS)\advlib_gridsel.obj & - $(OBJS)\advlib_helpext.obj & - $(OBJS)\advlib_hyperlinkg.obj & - $(OBJS)\advlib_laywin.obj & - $(OBJS)\advlib_odcombo.obj & - $(OBJS)\advlib_propdlg.obj & - $(OBJS)\advlib_sashwin.obj & - $(OBJS)\advlib_splash.obj & - $(OBJS)\advlib_tipdlg.obj & - $(OBJS)\advlib_wizard.obj & - $(OBJS)\advlib_joystick.obj & - $(OBJS)\advlib_sound.obj -!endif -!ifeq WXUNIV 1 -____ADVANCED_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\advlib_animatecmn.obj & - $(OBJS)\advlib_datavcmn.obj & - $(OBJS)\advlib_hyperlnkcmn.obj & - $(OBJS)\advlib_aboutdlgg.obj & - $(OBJS)\advlib_animateg.obj & - $(OBJS)\advlib_bmpcboxg.obj & - $(OBJS)\advlib_calctrl.obj & - $(OBJS)\advlib_datavgen.obj & - $(OBJS)\advlib_datectlg.obj & - $(OBJS)\advlib_editlbox.obj & - $(OBJS)\advlib_grid.obj & - $(OBJS)\advlib_gridctrl.obj & - $(OBJS)\advlib_gridsel.obj & - $(OBJS)\advlib_helpext.obj & - $(OBJS)\advlib_hyperlinkg.obj & - $(OBJS)\advlib_laywin.obj & - $(OBJS)\advlib_odcombo.obj & - $(OBJS)\advlib_propdlg.obj & - $(OBJS)\advlib_sashwin.obj & - $(OBJS)\advlib_splash.obj & - $(OBJS)\advlib_tipdlg.obj & - $(OBJS)\advlib_wizard.obj & - $(OBJS)\advlib_joystick.obj & - $(OBJS)\advlib_sound.obj -!endif -____wxadv_namedll_DEP = -!ifeq SHARED 1 -____wxadv_namedll_DEP = $(__advdll___depname) -!endif -____wxadv_namelib_DEP = -!ifeq SHARED 0 -____wxadv_namelib_DEP = $(__advlib___depname) -!endif -__mediadll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -__mediadll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll -!endif -!endif -!endif -!endif -__medialib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -__medialib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!endif -!endif -!endif -____wxmedia_namedll_DEP = -!ifeq SHARED 1 -____wxmedia_namedll_DEP = $(__mediadll___depname) -!endif -____wxmedia_namelib_DEP = -!ifeq SHARED 0 -____wxmedia_namelib_DEP = $(__medialib___depname) -!endif -__htmldll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -__htmldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll -!endif -!endif -!endif -!endif -__htmllib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -__htmllib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!endif -!endif -!endif -____wxhtml_namedll_DEP = -!ifeq SHARED 1 -____wxhtml_namedll_DEP = $(__htmldll___depname) -!endif -____wxhtml_namelib_DEP = -!ifeq SHARED 0 -____wxhtml_namelib_DEP = $(__htmllib___depname) -!endif -__qadll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_QA 1 -__qadll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.dll -!endif -!endif -!endif -!endif -__qalib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_QA 1 -__qalib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib -!endif -!endif -!endif -!endif -____wxqa_namedll_DEP = -!ifeq SHARED 1 -____wxqa_namedll_DEP = $(__qadll___depname) -!endif -____wxqa_namelib_DEP = -!ifeq SHARED 0 -____wxqa_namelib_DEP = $(__qalib___depname) -!endif -__xmldll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -__xmldll___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.dll -!endif -!endif -__xmllib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -__xmllib___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!endif -____wxxml_namedll_DEP = -!ifeq SHARED 1 -____wxxml_namedll_DEP = $(__xmldll___depname) -!endif -____wxxml_namelib_DEP = -!ifeq SHARED 0 -____wxxml_namelib_DEP = $(__xmllib___depname) -!endif -__xrcdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_XRC 1 -__xrcdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.dll -!endif -!endif -!endif -__xrclib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_XRC 1 -__xrclib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -!endif -!endif -!endif -____wxxrc_namedll_DEP = -!ifeq SHARED 1 -____wxxrc_namedll_DEP = $(__xrcdll___depname) -!endif -____wxxrc_namelib_DEP = -!ifeq SHARED 0 -____wxxrc_namelib_DEP = $(__xrclib___depname) -!endif -__auidll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_AUI 1 -__auidll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll -!endif -!endif -!endif -__auilib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_AUI 1 -__auilib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -!endif -!endif -____wxaui_namedll_DEP = -!ifeq SHARED 1 -____wxaui_namedll_DEP = $(__auidll___depname) -!endif -____wxaui_namelib_DEP = -!ifeq SHARED 0 -____wxaui_namelib_DEP = $(__auilib___depname) -!endif -__richtextdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_RICHTEXT 1 -__richtextdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll -!endif -!endif -!endif -__richtextlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_RICHTEXT 1 -__richtextlib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -!endif -!endif -____wxrichtext_namedll_DEP = -!ifeq SHARED 1 -____wxrichtext_namedll_DEP = $(__richtextdll___depname) -!endif -____wxrichtext_namelib_DEP = -!ifeq SHARED 0 -____wxrichtext_namelib_DEP = $(__richtextlib___depname) -!endif -__stcdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_STC 1 -__stcdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll -!endif -!endif -!endif -__stclib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_STC 1 -__stclib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -!endif -!endif -!endif -____wxstc_namedll_DEP = -!ifeq SHARED 1 -____wxstc_namedll_DEP = $(__stcdll___depname) -!endif -____wxstc_namelib_DEP = -!ifeq SHARED 0 -____wxstc_namelib_DEP = $(__stclib___depname) -!endif -__gldll___depname = -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -__gldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll -!endif -!endif -!endif -__WXLIBGLDEP_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIBGLDEP_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIBGLDEP_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIBGLDEP_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__gllib___depname = -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -__gllib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -!endif -!endif -!endif -____wxgl_namedll_DEP = -!ifeq SHARED 1 -____wxgl_namedll_DEP = $(__gldll___depname) -!endif -____wxgl_namelib_DEP = -!ifeq SHARED 0 -____wxgl_namelib_DEP = $(__gllib___depname) -!endif -__wxscintilla = -!ifeq USE_STC 1 -__wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib -!endif -__htmldll_library_link_DEP = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -__htmldll_library_link_DEP = $(__htmldll___depname) -!endif -!endif -!endif -!endif -__htmldll_library_link_LIBR = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -__htmldll_library_link_LIBR = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!endif -!endif -!endif -__DEBUGINFO_3 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_3 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_3 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_3 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_3 = debug all -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__DEBUGINFO = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO = -d2 -!endif -__OPTIMIZEFLAG = -!ifeq BUILD debug -__OPTIMIZEFLAG = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG = -ot -ox -!endif -__THREADSFLAG = -!ifeq USE_THREADS 0 -__THREADSFLAG = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG = -bm -!endif -__RUNTIME_LIBS = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS = -!endif -__RTTIFLAG = -!ifeq USE_RTTI 0 -__RTTIFLAG = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG = -xr -!endif -__EXCEPTIONSFLAG = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__SETUP_H_SUBDIR_FILENAMES = -!ifeq WXUNIV 0 -__SETUP_H_SUBDIR_FILENAMES = os2 -!endif -!ifeq WXUNIV 1 -__SETUP_H_SUBDIR_FILENAMES = univ -!endif - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & - RUNTIME_LIBS="$(RUNTIME_LIBS)" -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -i=..\..\include -i=$(SETUPHDIR) -d__WXPM__ & - $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) -WXREGEX_OBJECTS = & - $(OBJS)\wxregex_regcomp.obj & - $(OBJS)\wxregex_regexec.obj & - $(OBJS)\wxregex_regerror.obj & - $(OBJS)\wxregex_regfree.obj -WXZLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) $(CPPFLAGS) $(CFLAGS) -WXZLIB_OBJECTS = & - $(OBJS)\wxzlib_adler32.obj & - $(OBJS)\wxzlib_compress.obj & - $(OBJS)\wxzlib_crc32.obj & - $(OBJS)\wxzlib_gzio.obj & - $(OBJS)\wxzlib_uncompr.obj & - $(OBJS)\wxzlib_deflate.obj & - $(OBJS)\wxzlib_trees.obj & - $(OBJS)\wxzlib_zutil.obj & - $(OBJS)\wxzlib_inflate.obj & - $(OBJS)\wxzlib_infback.obj & - $(OBJS)\wxzlib_inftrees.obj & - $(OBJS)\wxzlib_inffast.obj -WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -i=..\..\src\zlib -wcd=124 $(CPPFLAGS) $(CFLAGS) -WXPNG_OBJECTS = & - $(OBJS)\wxpng_png.obj & - $(OBJS)\wxpng_pngerror.obj & - $(OBJS)\wxpng_pnggccrd.obj & - $(OBJS)\wxpng_pngget.obj & - $(OBJS)\wxpng_pngmem.obj & - $(OBJS)\wxpng_pngpread.obj & - $(OBJS)\wxpng_pngread.obj & - $(OBJS)\wxpng_pngrio.obj & - $(OBJS)\wxpng_pngrtran.obj & - $(OBJS)\wxpng_pngrutil.obj & - $(OBJS)\wxpng_pngset.obj & - $(OBJS)\wxpng_pngtrans.obj & - $(OBJS)\wxpng_pngvcrd.obj & - $(OBJS)\wxpng_pngwio.obj & - $(OBJS)\wxpng_pngwrite.obj & - $(OBJS)\wxpng_pngwtran.obj & - $(OBJS)\wxpng_pngwutil.obj -WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -i=$(SETUPHDIR) -wcd=136 $(CPPFLAGS) $(CFLAGS) -WXJPEG_OBJECTS = & - $(OBJS)\wxjpeg_jcomapi.obj & - $(OBJS)\wxjpeg_jutils.obj & - $(OBJS)\wxjpeg_jerror.obj & - $(OBJS)\wxjpeg_jmemmgr.obj & - $(OBJS)\wxjpeg_jmemnobs.obj & - $(OBJS)\wxjpeg_jcapimin.obj & - $(OBJS)\wxjpeg_jcapistd.obj & - $(OBJS)\wxjpeg_jctrans.obj & - $(OBJS)\wxjpeg_jcparam.obj & - $(OBJS)\wxjpeg_jdatadst.obj & - $(OBJS)\wxjpeg_jcinit.obj & - $(OBJS)\wxjpeg_jcmaster.obj & - $(OBJS)\wxjpeg_jcmarker.obj & - $(OBJS)\wxjpeg_jcmainct.obj & - $(OBJS)\wxjpeg_jcprepct.obj & - $(OBJS)\wxjpeg_jccoefct.obj & - $(OBJS)\wxjpeg_jccolor.obj & - $(OBJS)\wxjpeg_jcsample.obj & - $(OBJS)\wxjpeg_jchuff.obj & - $(OBJS)\wxjpeg_jcphuff.obj & - $(OBJS)\wxjpeg_jcdctmgr.obj & - $(OBJS)\wxjpeg_jfdctfst.obj & - $(OBJS)\wxjpeg_jfdctflt.obj & - $(OBJS)\wxjpeg_jfdctint.obj & - $(OBJS)\wxjpeg_jdapimin.obj & - $(OBJS)\wxjpeg_jdapistd.obj & - $(OBJS)\wxjpeg_jdtrans.obj & - $(OBJS)\wxjpeg_jdatasrc.obj & - $(OBJS)\wxjpeg_jdmaster.obj & - $(OBJS)\wxjpeg_jdinput.obj & - $(OBJS)\wxjpeg_jdmarker.obj & - $(OBJS)\wxjpeg_jdhuff.obj & - $(OBJS)\wxjpeg_jdphuff.obj & - $(OBJS)\wxjpeg_jdmainct.obj & - $(OBJS)\wxjpeg_jdcoefct.obj & - $(OBJS)\wxjpeg_jdpostct.obj & - $(OBJS)\wxjpeg_jddctmgr.obj & - $(OBJS)\wxjpeg_jidctfst.obj & - $(OBJS)\wxjpeg_jidctflt.obj & - $(OBJS)\wxjpeg_jidctint.obj & - $(OBJS)\wxjpeg_jidctred.obj & - $(OBJS)\wxjpeg_jdsample.obj & - $(OBJS)\wxjpeg_jdcolor.obj & - $(OBJS)\wxjpeg_jquant1.obj & - $(OBJS)\wxjpeg_jquant2.obj & - $(OBJS)\wxjpeg_jdmerge.obj -WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -i=..\..\src\zlib -i=..\..\src\jpeg & - -i=..\..\src\tiff\libtiff -dOS2_32 -wcd=124 $(CPPFLAGS) $(CFLAGS) -WXTIFF_OBJECTS = & - $(OBJS)\wxtiff_tif_unix.obj & - $(OBJS)\wxtiff_tif_aux.obj & - $(OBJS)\wxtiff_tif_close.obj & - $(OBJS)\wxtiff_tif_codec.obj & - $(OBJS)\wxtiff_tif_color.obj & - $(OBJS)\wxtiff_tif_compress.obj & - $(OBJS)\wxtiff_tif_dir.obj & - $(OBJS)\wxtiff_tif_dirinfo.obj & - $(OBJS)\wxtiff_tif_dirread.obj & - $(OBJS)\wxtiff_tif_dirwrite.obj & - $(OBJS)\wxtiff_tif_dumpmode.obj & - $(OBJS)\wxtiff_tif_error.obj & - $(OBJS)\wxtiff_tif_extension.obj & - $(OBJS)\wxtiff_tif_fax3.obj & - $(OBJS)\wxtiff_tif_fax3sm.obj & - $(OBJS)\wxtiff_tif_flush.obj & - $(OBJS)\wxtiff_tif_getimage.obj & - $(OBJS)\wxtiff_tif_jpeg.obj & - $(OBJS)\wxtiff_tif_luv.obj & - $(OBJS)\wxtiff_tif_lzw.obj & - $(OBJS)\wxtiff_tif_next.obj & - $(OBJS)\wxtiff_tif_ojpeg.obj & - $(OBJS)\wxtiff_tif_open.obj & - $(OBJS)\wxtiff_tif_packbits.obj & - $(OBJS)\wxtiff_tif_pixarlog.obj & - $(OBJS)\wxtiff_tif_predict.obj & - $(OBJS)\wxtiff_tif_print.obj & - $(OBJS)\wxtiff_tif_read.obj & - $(OBJS)\wxtiff_tif_strip.obj & - $(OBJS)\wxtiff_tif_swab.obj & - $(OBJS)\wxtiff_tif_thunder.obj & - $(OBJS)\wxtiff_tif_tile.obj & - $(OBJS)\wxtiff_tif_version.obj & - $(OBJS)\wxtiff_tif_warning.obj & - $(OBJS)\wxtiff_tif_write.obj & - $(OBJS)\wxtiff_tif_zip.obj -WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -i=$(LIBDIRNAME) -dOS2_32 $(CPPFLAGS) $(CFLAGS) -WXEXPAT_OBJECTS = & - $(OBJS)\wxexpat_xmlparse.obj & - $(OBJS)\wxexpat_xmlrole.obj & - $(OBJS)\wxexpat_xmltok.obj -WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -i=..\..\src\stc\scintilla\include & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -WXSCINTILLA_OBJECTS = & - $(OBJS)\wxscintilla_AutoComplete.obj & - $(OBJS)\wxscintilla_CallTip.obj & - $(OBJS)\wxscintilla_CellBuffer.obj & - $(OBJS)\wxscintilla_CharClassify.obj & - $(OBJS)\wxscintilla_ContractionState.obj & - $(OBJS)\wxscintilla_Document.obj & - $(OBJS)\wxscintilla_DocumentAccessor.obj & - $(OBJS)\wxscintilla_Editor.obj & - $(OBJS)\wxscintilla_ExternalLexer.obj & - $(OBJS)\wxscintilla_Indicator.obj & - $(OBJS)\wxscintilla_KeyMap.obj & - $(OBJS)\wxscintilla_KeyWords.obj & - $(OBJS)\wxscintilla_LexAPDL.obj & - $(OBJS)\wxscintilla_LexAU3.obj & - $(OBJS)\wxscintilla_LexAVE.obj & - $(OBJS)\wxscintilla_LexAda.obj & - $(OBJS)\wxscintilla_LexAsm.obj & - $(OBJS)\wxscintilla_LexAsn1.obj & - $(OBJS)\wxscintilla_LexBaan.obj & - $(OBJS)\wxscintilla_LexBash.obj & - $(OBJS)\wxscintilla_LexBasic.obj & - $(OBJS)\wxscintilla_LexBullant.obj & - $(OBJS)\wxscintilla_LexCLW.obj & - $(OBJS)\wxscintilla_LexCPP.obj & - $(OBJS)\wxscintilla_LexCSS.obj & - $(OBJS)\wxscintilla_LexCaml.obj & - $(OBJS)\wxscintilla_LexCsound.obj & - $(OBJS)\wxscintilla_LexConf.obj & - $(OBJS)\wxscintilla_LexCrontab.obj & - $(OBJS)\wxscintilla_LexEScript.obj & - $(OBJS)\wxscintilla_LexEiffel.obj & - $(OBJS)\wxscintilla_LexErlang.obj & - $(OBJS)\wxscintilla_LexFlagship.obj & - $(OBJS)\wxscintilla_LexForth.obj & - $(OBJS)\wxscintilla_LexFortran.obj & - $(OBJS)\wxscintilla_LexGui4Cli.obj & - $(OBJS)\wxscintilla_LexHTML.obj & - $(OBJS)\wxscintilla_LexHaskell.obj & - $(OBJS)\wxscintilla_LexInno.obj & - $(OBJS)\wxscintilla_LexKix.obj & - $(OBJS)\wxscintilla_LexLisp.obj & - $(OBJS)\wxscintilla_LexLout.obj & - $(OBJS)\wxscintilla_LexLua.obj & - $(OBJS)\wxscintilla_LexMMIXAL.obj & - $(OBJS)\wxscintilla_LexMPT.obj & - $(OBJS)\wxscintilla_LexMSSQL.obj & - $(OBJS)\wxscintilla_LexMatlab.obj & - $(OBJS)\wxscintilla_LexMetapost.obj & - $(OBJS)\wxscintilla_LexNsis.obj & - $(OBJS)\wxscintilla_LexOpal.obj & - $(OBJS)\wxscintilla_LexOthers.obj & - $(OBJS)\wxscintilla_LexPB.obj & - $(OBJS)\wxscintilla_LexPOV.obj & - $(OBJS)\wxscintilla_LexPS.obj & - $(OBJS)\wxscintilla_LexPascal.obj & - $(OBJS)\wxscintilla_LexPerl.obj & - $(OBJS)\wxscintilla_LexPython.obj & - $(OBJS)\wxscintilla_LexRebol.obj & - $(OBJS)\wxscintilla_LexRuby.obj & - $(OBJS)\wxscintilla_LexSQL.obj & - $(OBJS)\wxscintilla_LexSmalltalk.obj & - $(OBJS)\wxscintilla_LexTADS3.obj & - $(OBJS)\wxscintilla_LexScriptol.obj & - $(OBJS)\wxscintilla_LexSpecman.obj & - $(OBJS)\wxscintilla_LexSpice.obj & - $(OBJS)\wxscintilla_LexTCL.obj & - $(OBJS)\wxscintilla_LexTeX.obj & - $(OBJS)\wxscintilla_LexVB.obj & - $(OBJS)\wxscintilla_LexVHDL.obj & - $(OBJS)\wxscintilla_LexVerilog.obj & - $(OBJS)\wxscintilla_LexYAML.obj & - $(OBJS)\wxscintilla_LineMarker.obj & - $(OBJS)\wxscintilla_PropSet.obj & - $(OBJS)\wxscintilla_RESearch.obj & - $(OBJS)\wxscintilla_ScintillaBase.obj & - $(OBJS)\wxscintilla_Style.obj & - $(OBJS)\wxscintilla_StyleContext.obj & - $(OBJS)\wxscintilla_UniConversion.obj & - $(OBJS)\wxscintilla_ViewStyle.obj & - $(OBJS)\wxscintilla_WindowAccessor.obj & - $(OBJS)\wxscintilla_XPM.obj -MONODLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL & - -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ & - -dSCI_LEXER -dLINK_LEXERS $(CPPFLAGS) $(CFLAGS) -MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL & - -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ & - -dSCI_LEXER -dLINK_LEXERS /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -MONODLL_OBJECTS = & - $(OBJS)\monodll_dummy.obj & - $(OBJS)\monodll_appbase.obj & - $(OBJS)\monodll_arcall.obj & - $(OBJS)\monodll_arcfind.obj & - $(OBJS)\monodll_archive.obj & - $(OBJS)\monodll_arrstr.obj & - $(OBJS)\monodll_base64.obj & - $(OBJS)\monodll_clntdata.obj & - $(OBJS)\monodll_cmdline.obj & - $(OBJS)\monodll_config.obj & - $(OBJS)\monodll_convauto.obj & - $(OBJS)\monodll_datetime.obj & - $(OBJS)\monodll_datstrm.obj & - $(OBJS)\monodll_dircmn.obj & - $(OBJS)\monodll_dynarray.obj & - $(OBJS)\monodll_dynlib.obj & - $(OBJS)\monodll_dynload.obj & - $(OBJS)\monodll_encconv.obj & - $(OBJS)\monodll_evtloopcmn.obj & - $(OBJS)\monodll_extended.obj & - $(OBJS)\monodll_ffile.obj & - $(OBJS)\monodll_file.obj & - $(OBJS)\monodll_fileback.obj & - $(OBJS)\monodll_fileconf.obj & - $(OBJS)\monodll_filefn.obj & - $(OBJS)\monodll_filename.obj & - $(OBJS)\monodll_filesys.obj & - $(OBJS)\monodll_filtall.obj & - $(OBJS)\monodll_filtfind.obj & - $(OBJS)\monodll_fmapbase.obj & - $(OBJS)\monodll_fs_arc.obj & - $(OBJS)\monodll_fs_filter.obj & - $(OBJS)\monodll_hash.obj & - $(OBJS)\monodll_hashmap.obj & - $(OBJS)\monodll_init.obj & - $(OBJS)\monodll_intl.obj & - $(OBJS)\monodll_ipcbase.obj & - $(OBJS)\monodll_list.obj & - $(OBJS)\monodll_log.obj & - $(OBJS)\monodll_longlong.obj & - $(OBJS)\monodll_memory.obj & - $(OBJS)\monodll_mimecmn.obj & - $(OBJS)\monodll_module.obj & - $(OBJS)\monodll_mstream.obj & - $(OBJS)\monodll_object.obj & - $(OBJS)\monodll_platinfo.obj & - $(OBJS)\monodll_powercmn.obj & - $(OBJS)\monodll_process.obj & - $(OBJS)\monodll_regex.obj & - $(OBJS)\monodll_stdpbase.obj & - $(OBJS)\monodll_sstream.obj & - $(OBJS)\monodll_stopwatch.obj & - $(OBJS)\monodll_strconv.obj & - $(OBJS)\monodll_stream.obj & - $(OBJS)\monodll_string.obj & - $(OBJS)\monodll_stringimpl.obj & - $(OBJS)\monodll_stringops.obj & - $(OBJS)\monodll_strvararg.obj & - $(OBJS)\monodll_sysopt.obj & - $(OBJS)\monodll_tarstrm.obj & - $(OBJS)\monodll_textbuf.obj & - $(OBJS)\monodll_textfile.obj & - $(OBJS)\monodll_timercmn.obj & - $(OBJS)\monodll_timerimpl.obj & - $(OBJS)\monodll_tokenzr.obj & - $(OBJS)\monodll_txtstrm.obj & - $(OBJS)\monodll_unichar.obj & - $(OBJS)\monodll_uri.obj & - $(OBJS)\monodll_variant.obj & - $(OBJS)\monodll_wfstream.obj & - $(OBJS)\monodll_wxcrt.obj & - $(OBJS)\monodll_wxprintf.obj & - $(OBJS)\monodll_xti.obj & - $(OBJS)\monodll_xtistrm.obj & - $(OBJS)\monodll_zipstrm.obj & - $(OBJS)\monodll_zstream.obj & - $(OBJS)\monodll_dir.obj & - $(OBJS)\monodll_mimetype.obj & - $(OBJS)\monodll_stdpaths.obj & - $(OBJS)\monodll_thread.obj & - $(OBJS)\monodll_utils.obj & - $(OBJS)\monodll_utilsexc.obj & - $(OBJS)\monodll_event.obj & - $(OBJS)\monodll_fs_mem.obj & - $(OBJS)\monodll_msgout.obj & - $(OBJS)\monodll_utilscmn.obj & - $(OBJS)\monodll_fs_inet.obj & - $(OBJS)\monodll_ftp.obj & - $(OBJS)\monodll_http.obj & - $(OBJS)\monodll_protocol.obj & - $(OBJS)\monodll_sckaddr.obj & - $(OBJS)\monodll_sckfile.obj & - $(OBJS)\monodll_sckipc.obj & - $(OBJS)\monodll_sckstrm.obj & - $(OBJS)\monodll_socket.obj & - $(OBJS)\monodll_url.obj & - $(OBJS)\monodll_gsocket.obj & - $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) & - $(OBJS)\monodll_xml.obj & - $(OBJS)\monodll_xtixml.obj -MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=1 -i=..\..\src\stc\scintilla\include & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - $(CPPFLAGS) $(CFLAGS) -MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=1 -i=..\..\src\stc\scintilla\include & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - /fh=$(OBJS)\wxprec_monolib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -MONOLIB_OBJECTS = & - $(OBJS)\monolib_dummy.obj & - $(OBJS)\monolib_appbase.obj & - $(OBJS)\monolib_arcall.obj & - $(OBJS)\monolib_arcfind.obj & - $(OBJS)\monolib_archive.obj & - $(OBJS)\monolib_arrstr.obj & - $(OBJS)\monolib_base64.obj & - $(OBJS)\monolib_clntdata.obj & - $(OBJS)\monolib_cmdline.obj & - $(OBJS)\monolib_config.obj & - $(OBJS)\monolib_convauto.obj & - $(OBJS)\monolib_datetime.obj & - $(OBJS)\monolib_datstrm.obj & - $(OBJS)\monolib_dircmn.obj & - $(OBJS)\monolib_dynarray.obj & - $(OBJS)\monolib_dynlib.obj & - $(OBJS)\monolib_dynload.obj & - $(OBJS)\monolib_encconv.obj & - $(OBJS)\monolib_evtloopcmn.obj & - $(OBJS)\monolib_extended.obj & - $(OBJS)\monolib_ffile.obj & - $(OBJS)\monolib_file.obj & - $(OBJS)\monolib_fileback.obj & - $(OBJS)\monolib_fileconf.obj & - $(OBJS)\monolib_filefn.obj & - $(OBJS)\monolib_filename.obj & - $(OBJS)\monolib_filesys.obj & - $(OBJS)\monolib_filtall.obj & - $(OBJS)\monolib_filtfind.obj & - $(OBJS)\monolib_fmapbase.obj & - $(OBJS)\monolib_fs_arc.obj & - $(OBJS)\monolib_fs_filter.obj & - $(OBJS)\monolib_hash.obj & - $(OBJS)\monolib_hashmap.obj & - $(OBJS)\monolib_init.obj & - $(OBJS)\monolib_intl.obj & - $(OBJS)\monolib_ipcbase.obj & - $(OBJS)\monolib_list.obj & - $(OBJS)\monolib_log.obj & - $(OBJS)\monolib_longlong.obj & - $(OBJS)\monolib_memory.obj & - $(OBJS)\monolib_mimecmn.obj & - $(OBJS)\monolib_module.obj & - $(OBJS)\monolib_mstream.obj & - $(OBJS)\monolib_object.obj & - $(OBJS)\monolib_platinfo.obj & - $(OBJS)\monolib_powercmn.obj & - $(OBJS)\monolib_process.obj & - $(OBJS)\monolib_regex.obj & - $(OBJS)\monolib_stdpbase.obj & - $(OBJS)\monolib_sstream.obj & - $(OBJS)\monolib_stopwatch.obj & - $(OBJS)\monolib_strconv.obj & - $(OBJS)\monolib_stream.obj & - $(OBJS)\monolib_string.obj & - $(OBJS)\monolib_stringimpl.obj & - $(OBJS)\monolib_stringops.obj & - $(OBJS)\monolib_strvararg.obj & - $(OBJS)\monolib_sysopt.obj & - $(OBJS)\monolib_tarstrm.obj & - $(OBJS)\monolib_textbuf.obj & - $(OBJS)\monolib_textfile.obj & - $(OBJS)\monolib_timercmn.obj & - $(OBJS)\monolib_timerimpl.obj & - $(OBJS)\monolib_tokenzr.obj & - $(OBJS)\monolib_txtstrm.obj & - $(OBJS)\monolib_unichar.obj & - $(OBJS)\monolib_uri.obj & - $(OBJS)\monolib_variant.obj & - $(OBJS)\monolib_wfstream.obj & - $(OBJS)\monolib_wxcrt.obj & - $(OBJS)\monolib_wxprintf.obj & - $(OBJS)\monolib_xti.obj & - $(OBJS)\monolib_xtistrm.obj & - $(OBJS)\monolib_zipstrm.obj & - $(OBJS)\monolib_zstream.obj & - $(OBJS)\monolib_dir.obj & - $(OBJS)\monolib_mimetype.obj & - $(OBJS)\monolib_stdpaths.obj & - $(OBJS)\monolib_thread.obj & - $(OBJS)\monolib_utils.obj & - $(OBJS)\monolib_utilsexc.obj & - $(OBJS)\monolib_event.obj & - $(OBJS)\monolib_fs_mem.obj & - $(OBJS)\monolib_msgout.obj & - $(OBJS)\monolib_utilscmn.obj & - $(OBJS)\monolib_fs_inet.obj & - $(OBJS)\monolib_ftp.obj & - $(OBJS)\monolib_http.obj & - $(OBJS)\monolib_protocol.obj & - $(OBJS)\monolib_sckaddr.obj & - $(OBJS)\monolib_sckfile.obj & - $(OBJS)\monolib_sckipc.obj & - $(OBJS)\monolib_sckstrm.obj & - $(OBJS)\monolib_socket.obj & - $(OBJS)\monolib_url.obj & - $(OBJS)\monolib_gsocket.obj & - $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) & - $(OBJS)\monolib_xml.obj & - $(OBJS)\monolib_xtixml.obj -BASEDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 & - $(CPPFLAGS) $(CFLAGS) -BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 & - /fh=$(OBJS)\wxprec_basedll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -BASEDLL_OBJECTS = & - $(OBJS)\basedll_dummy.obj & - $(OBJS)\basedll_appbase.obj & - $(OBJS)\basedll_arcall.obj & - $(OBJS)\basedll_arcfind.obj & - $(OBJS)\basedll_archive.obj & - $(OBJS)\basedll_arrstr.obj & - $(OBJS)\basedll_base64.obj & - $(OBJS)\basedll_clntdata.obj & - $(OBJS)\basedll_cmdline.obj & - $(OBJS)\basedll_config.obj & - $(OBJS)\basedll_convauto.obj & - $(OBJS)\basedll_datetime.obj & - $(OBJS)\basedll_datstrm.obj & - $(OBJS)\basedll_dircmn.obj & - $(OBJS)\basedll_dynarray.obj & - $(OBJS)\basedll_dynlib.obj & - $(OBJS)\basedll_dynload.obj & - $(OBJS)\basedll_encconv.obj & - $(OBJS)\basedll_evtloopcmn.obj & - $(OBJS)\basedll_extended.obj & - $(OBJS)\basedll_ffile.obj & - $(OBJS)\basedll_file.obj & - $(OBJS)\basedll_fileback.obj & - $(OBJS)\basedll_fileconf.obj & - $(OBJS)\basedll_filefn.obj & - $(OBJS)\basedll_filename.obj & - $(OBJS)\basedll_filesys.obj & - $(OBJS)\basedll_filtall.obj & - $(OBJS)\basedll_filtfind.obj & - $(OBJS)\basedll_fmapbase.obj & - $(OBJS)\basedll_fs_arc.obj & - $(OBJS)\basedll_fs_filter.obj & - $(OBJS)\basedll_hash.obj & - $(OBJS)\basedll_hashmap.obj & - $(OBJS)\basedll_init.obj & - $(OBJS)\basedll_intl.obj & - $(OBJS)\basedll_ipcbase.obj & - $(OBJS)\basedll_list.obj & - $(OBJS)\basedll_log.obj & - $(OBJS)\basedll_longlong.obj & - $(OBJS)\basedll_memory.obj & - $(OBJS)\basedll_mimecmn.obj & - $(OBJS)\basedll_module.obj & - $(OBJS)\basedll_mstream.obj & - $(OBJS)\basedll_object.obj & - $(OBJS)\basedll_platinfo.obj & - $(OBJS)\basedll_powercmn.obj & - $(OBJS)\basedll_process.obj & - $(OBJS)\basedll_regex.obj & - $(OBJS)\basedll_stdpbase.obj & - $(OBJS)\basedll_sstream.obj & - $(OBJS)\basedll_stopwatch.obj & - $(OBJS)\basedll_strconv.obj & - $(OBJS)\basedll_stream.obj & - $(OBJS)\basedll_string.obj & - $(OBJS)\basedll_stringimpl.obj & - $(OBJS)\basedll_stringops.obj & - $(OBJS)\basedll_strvararg.obj & - $(OBJS)\basedll_sysopt.obj & - $(OBJS)\basedll_tarstrm.obj & - $(OBJS)\basedll_textbuf.obj & - $(OBJS)\basedll_textfile.obj & - $(OBJS)\basedll_timercmn.obj & - $(OBJS)\basedll_timerimpl.obj & - $(OBJS)\basedll_tokenzr.obj & - $(OBJS)\basedll_txtstrm.obj & - $(OBJS)\basedll_unichar.obj & - $(OBJS)\basedll_uri.obj & - $(OBJS)\basedll_variant.obj & - $(OBJS)\basedll_wfstream.obj & - $(OBJS)\basedll_wxcrt.obj & - $(OBJS)\basedll_wxprintf.obj & - $(OBJS)\basedll_xti.obj & - $(OBJS)\basedll_xtistrm.obj & - $(OBJS)\basedll_zipstrm.obj & - $(OBJS)\basedll_zstream.obj & - $(OBJS)\basedll_dir.obj & - $(OBJS)\basedll_mimetype.obj & - $(OBJS)\basedll_stdpaths.obj & - $(OBJS)\basedll_thread.obj & - $(OBJS)\basedll_utils.obj & - $(OBJS)\basedll_utilsexc.obj & - $(OBJS)\basedll_event.obj & - $(OBJS)\basedll_fs_mem.obj & - $(OBJS)\basedll_msgout.obj & - $(OBJS)\basedll_utilscmn.obj -BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 & - /fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -BASELIB_OBJECTS = & - $(OBJS)\baselib_dummy.obj & - $(OBJS)\baselib_appbase.obj & - $(OBJS)\baselib_arcall.obj & - $(OBJS)\baselib_arcfind.obj & - $(OBJS)\baselib_archive.obj & - $(OBJS)\baselib_arrstr.obj & - $(OBJS)\baselib_base64.obj & - $(OBJS)\baselib_clntdata.obj & - $(OBJS)\baselib_cmdline.obj & - $(OBJS)\baselib_config.obj & - $(OBJS)\baselib_convauto.obj & - $(OBJS)\baselib_datetime.obj & - $(OBJS)\baselib_datstrm.obj & - $(OBJS)\baselib_dircmn.obj & - $(OBJS)\baselib_dynarray.obj & - $(OBJS)\baselib_dynlib.obj & - $(OBJS)\baselib_dynload.obj & - $(OBJS)\baselib_encconv.obj & - $(OBJS)\baselib_evtloopcmn.obj & - $(OBJS)\baselib_extended.obj & - $(OBJS)\baselib_ffile.obj & - $(OBJS)\baselib_file.obj & - $(OBJS)\baselib_fileback.obj & - $(OBJS)\baselib_fileconf.obj & - $(OBJS)\baselib_filefn.obj & - $(OBJS)\baselib_filename.obj & - $(OBJS)\baselib_filesys.obj & - $(OBJS)\baselib_filtall.obj & - $(OBJS)\baselib_filtfind.obj & - $(OBJS)\baselib_fmapbase.obj & - $(OBJS)\baselib_fs_arc.obj & - $(OBJS)\baselib_fs_filter.obj & - $(OBJS)\baselib_hash.obj & - $(OBJS)\baselib_hashmap.obj & - $(OBJS)\baselib_init.obj & - $(OBJS)\baselib_intl.obj & - $(OBJS)\baselib_ipcbase.obj & - $(OBJS)\baselib_list.obj & - $(OBJS)\baselib_log.obj & - $(OBJS)\baselib_longlong.obj & - $(OBJS)\baselib_memory.obj & - $(OBJS)\baselib_mimecmn.obj & - $(OBJS)\baselib_module.obj & - $(OBJS)\baselib_mstream.obj & - $(OBJS)\baselib_object.obj & - $(OBJS)\baselib_platinfo.obj & - $(OBJS)\baselib_powercmn.obj & - $(OBJS)\baselib_process.obj & - $(OBJS)\baselib_regex.obj & - $(OBJS)\baselib_stdpbase.obj & - $(OBJS)\baselib_sstream.obj & - $(OBJS)\baselib_stopwatch.obj & - $(OBJS)\baselib_strconv.obj & - $(OBJS)\baselib_stream.obj & - $(OBJS)\baselib_string.obj & - $(OBJS)\baselib_stringimpl.obj & - $(OBJS)\baselib_stringops.obj & - $(OBJS)\baselib_strvararg.obj & - $(OBJS)\baselib_sysopt.obj & - $(OBJS)\baselib_tarstrm.obj & - $(OBJS)\baselib_textbuf.obj & - $(OBJS)\baselib_textfile.obj & - $(OBJS)\baselib_timercmn.obj & - $(OBJS)\baselib_timerimpl.obj & - $(OBJS)\baselib_tokenzr.obj & - $(OBJS)\baselib_txtstrm.obj & - $(OBJS)\baselib_unichar.obj & - $(OBJS)\baselib_uri.obj & - $(OBJS)\baselib_variant.obj & - $(OBJS)\baselib_wfstream.obj & - $(OBJS)\baselib_wxcrt.obj & - $(OBJS)\baselib_wxprintf.obj & - $(OBJS)\baselib_xti.obj & - $(OBJS)\baselib_xtistrm.obj & - $(OBJS)\baselib_zipstrm.obj & - $(OBJS)\baselib_zstream.obj & - $(OBJS)\baselib_dir.obj & - $(OBJS)\baselib_mimetype.obj & - $(OBJS)\baselib_stdpaths.obj & - $(OBJS)\baselib_thread.obj & - $(OBJS)\baselib_utils.obj & - $(OBJS)\baselib_utilsexc.obj & - $(OBJS)\baselib_event.obj & - $(OBJS)\baselib_fs_mem.obj & - $(OBJS)\baselib_msgout.obj & - $(OBJS)\baselib_utilscmn.obj -NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET & - /fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -NETDLL_OBJECTS = & - $(OBJS)\netdll_dummy.obj & - $(OBJS)\netdll_fs_inet.obj & - $(OBJS)\netdll_ftp.obj & - $(OBJS)\netdll_http.obj & - $(OBJS)\netdll_protocol.obj & - $(OBJS)\netdll_sckaddr.obj & - $(OBJS)\netdll_sckfile.obj & - $(OBJS)\netdll_sckipc.obj & - $(OBJS)\netdll_sckstrm.obj & - $(OBJS)\netdll_socket.obj & - $(OBJS)\netdll_url.obj & - $(OBJS)\netdll_gsocket.obj -NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_netlib.pch & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -NETLIB_OBJECTS = & - $(OBJS)\netlib_dummy.obj & - $(OBJS)\netlib_fs_inet.obj & - $(OBJS)\netlib_ftp.obj & - $(OBJS)\netlib_http.obj & - $(OBJS)\netlib_protocol.obj & - $(OBJS)\netlib_sckaddr.obj & - $(OBJS)\netlib_sckfile.obj & - $(OBJS)\netlib_sckipc.obj & - $(OBJS)\netlib_sckstrm.obj & - $(OBJS)\netlib_socket.obj & - $(OBJS)\netlib_url.obj & - $(OBJS)\netlib_gsocket.obj -COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 & - /fh=$(OBJS)\wxprec_coredll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -COREDLL_OBJECTS = & - $(OBJS)\coredll_dummy.obj & - $(OBJS)\coredll_event.obj & - $(OBJS)\coredll_fs_mem.obj & - $(OBJS)\coredll_msgout.obj & - $(OBJS)\coredll_utilscmn.obj & - $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=0 /fh=$(OBJS)\wxprec_corelib.pch & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -CORELIB_OBJECTS = & - $(OBJS)\corelib_dummy.obj & - $(OBJS)\corelib_event.obj & - $(OBJS)\corelib_fs_mem.obj & - $(OBJS)\corelib_msgout.obj & - $(OBJS)\corelib_utilscmn.obj & - $(____CORE_SRC_FILENAMES_3_OBJECTS) -ADVDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV & - /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -ADVDLL_OBJECTS = & - $(OBJS)\advdll_dummy.obj & - $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) -ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -ADVLIB_OBJECTS = & - $(OBJS)\advlib_dummy.obj & - $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) -MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA & - /fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -MEDIADLL_OBJECTS = & - $(OBJS)\mediadll_dummy.obj & - $(OBJS)\mediadll_mediactrlcmn.obj -MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -MEDIALIB_OBJECTS = & - $(OBJS)\medialib_dummy.obj & - $(OBJS)\medialib_mediactrlcmn.obj -HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML & - /fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -HTMLDLL_OBJECTS = & - $(OBJS)\htmldll_dummy.obj & - $(OBJS)\htmldll_helpctrl.obj & - $(OBJS)\htmldll_helpdata.obj & - $(OBJS)\htmldll_helpdlg.obj & - $(OBJS)\htmldll_helpfrm.obj & - $(OBJS)\htmldll_helpwnd.obj & - $(OBJS)\htmldll_htmlcell.obj & - $(OBJS)\htmldll_htmlfilt.obj & - $(OBJS)\htmldll_htmlpars.obj & - $(OBJS)\htmldll_htmltag.obj & - $(OBJS)\htmldll_htmlwin.obj & - $(OBJS)\htmldll_htmprint.obj & - $(OBJS)\htmldll_m_dflist.obj & - $(OBJS)\htmldll_m_fonts.obj & - $(OBJS)\htmldll_m_hline.obj & - $(OBJS)\htmldll_m_image.obj & - $(OBJS)\htmldll_m_layout.obj & - $(OBJS)\htmldll_m_links.obj & - $(OBJS)\htmldll_m_list.obj & - $(OBJS)\htmldll_m_pre.obj & - $(OBJS)\htmldll_m_style.obj & - $(OBJS)\htmldll_m_tables.obj & - $(OBJS)\htmldll_winpars.obj & - $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -HTMLLIB_OBJECTS = & - $(OBJS)\htmllib_dummy.obj & - $(OBJS)\htmllib_helpctrl.obj & - $(OBJS)\htmllib_helpdata.obj & - $(OBJS)\htmllib_helpdlg.obj & - $(OBJS)\htmllib_helpfrm.obj & - $(OBJS)\htmllib_helpwnd.obj & - $(OBJS)\htmllib_htmlcell.obj & - $(OBJS)\htmllib_htmlfilt.obj & - $(OBJS)\htmllib_htmlpars.obj & - $(OBJS)\htmllib_htmltag.obj & - $(OBJS)\htmllib_htmlwin.obj & - $(OBJS)\htmllib_htmprint.obj & - $(OBJS)\htmllib_m_dflist.obj & - $(OBJS)\htmllib_m_fonts.obj & - $(OBJS)\htmllib_m_hline.obj & - $(OBJS)\htmllib_m_image.obj & - $(OBJS)\htmllib_m_layout.obj & - $(OBJS)\htmllib_m_links.obj & - $(OBJS)\htmllib_m_list.obj & - $(OBJS)\htmllib_m_pre.obj & - $(OBJS)\htmllib_m_style.obj & - $(OBJS)\htmllib_m_tables.obj & - $(OBJS)\htmllib_winpars.obj & - $(OBJS)\htmllib_htmllbox.obj -QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA & - /fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -QADLL_OBJECTS = & - $(OBJS)\qadll_dummy.obj & - $(OBJS)\qadll_debugrpt.obj & - $(OBJS)\qadll_dbgrptg.obj -QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -QALIB_OBJECTS = & - $(OBJS)\qalib_dummy.obj & - $(OBJS)\qalib_debugrpt.obj & - $(OBJS)\qalib_dbgrptg.obj -XMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML & - /fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -XMLDLL_OBJECTS = & - $(OBJS)\xmldll_dummy.obj & - $(OBJS)\xmldll_xml.obj & - $(OBJS)\xmldll_xtixml.obj -XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_xmllib.pch & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -XMLLIB_OBJECTS = & - $(OBJS)\xmllib_dummy.obj & - $(OBJS)\xmllib_xml.obj & - $(OBJS)\xmllib_xtixml.obj -XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC & - /fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -XRCDLL_OBJECTS = & - $(OBJS)\xrcdll_dummy.obj & - $(OBJS)\xrcdll_xh_animatctrl.obj & - $(OBJS)\xrcdll_xh_bmp.obj & - $(OBJS)\xrcdll_xh_bmpcbox.obj & - $(OBJS)\xrcdll_xh_bmpbt.obj & - $(OBJS)\xrcdll_xh_bttn.obj & - $(OBJS)\xrcdll_xh_cald.obj & - $(OBJS)\xrcdll_xh_chckb.obj & - $(OBJS)\xrcdll_xh_chckl.obj & - $(OBJS)\xrcdll_xh_choic.obj & - $(OBJS)\xrcdll_xh_choicbk.obj & - $(OBJS)\xrcdll_xh_clrpicker.obj & - $(OBJS)\xrcdll_xh_collpane.obj & - $(OBJS)\xrcdll_xh_combo.obj & - $(OBJS)\xrcdll_xh_datectrl.obj & - $(OBJS)\xrcdll_xh_dirpicker.obj & - $(OBJS)\xrcdll_xh_dlg.obj & - $(OBJS)\xrcdll_xh_frame.obj & - $(OBJS)\xrcdll_xh_mdi.obj & - $(OBJS)\xrcdll_xh_filepicker.obj & - $(OBJS)\xrcdll_xh_fontpicker.obj & - $(OBJS)\xrcdll_xh_gauge.obj & - $(OBJS)\xrcdll_xh_gdctl.obj & - $(OBJS)\xrcdll_xh_grid.obj & - $(OBJS)\xrcdll_xh_html.obj & - $(OBJS)\xrcdll_xh_hyperlink.obj & - $(OBJS)\xrcdll_xh_listb.obj & - $(OBJS)\xrcdll_xh_listbk.obj & - $(OBJS)\xrcdll_xh_listc.obj & - $(OBJS)\xrcdll_xh_menu.obj & - $(OBJS)\xrcdll_xh_notbk.obj & - $(OBJS)\xrcdll_xh_odcombo.obj & - $(OBJS)\xrcdll_xh_panel.obj & - $(OBJS)\xrcdll_xh_propdlg.obj & - $(OBJS)\xrcdll_xh_radbt.obj & - $(OBJS)\xrcdll_xh_radbx.obj & - $(OBJS)\xrcdll_xh_scrol.obj & - $(OBJS)\xrcdll_xh_scwin.obj & - $(OBJS)\xrcdll_xh_htmllbox.obj & - $(OBJS)\xrcdll_xh_sizer.obj & - $(OBJS)\xrcdll_xh_slidr.obj & - $(OBJS)\xrcdll_xh_spin.obj & - $(OBJS)\xrcdll_xh_split.obj & - $(OBJS)\xrcdll_xh_srchctrl.obj & - $(OBJS)\xrcdll_xh_statbar.obj & - $(OBJS)\xrcdll_xh_stbmp.obj & - $(OBJS)\xrcdll_xh_stbox.obj & - $(OBJS)\xrcdll_xh_stlin.obj & - $(OBJS)\xrcdll_xh_sttxt.obj & - $(OBJS)\xrcdll_xh_text.obj & - $(OBJS)\xrcdll_xh_tglbtn.obj & - $(OBJS)\xrcdll_xh_toolb.obj & - $(OBJS)\xrcdll_xh_tree.obj & - $(OBJS)\xrcdll_xh_treebk.obj & - $(OBJS)\xrcdll_xh_unkwn.obj & - $(OBJS)\xrcdll_xh_wizrd.obj & - $(OBJS)\xrcdll_xmlres.obj & - $(OBJS)\xrcdll_xmlrsall.obj -XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -XRCLIB_OBJECTS = & - $(OBJS)\xrclib_dummy.obj & - $(OBJS)\xrclib_xh_animatctrl.obj & - $(OBJS)\xrclib_xh_bmp.obj & - $(OBJS)\xrclib_xh_bmpcbox.obj & - $(OBJS)\xrclib_xh_bmpbt.obj & - $(OBJS)\xrclib_xh_bttn.obj & - $(OBJS)\xrclib_xh_cald.obj & - $(OBJS)\xrclib_xh_chckb.obj & - $(OBJS)\xrclib_xh_chckl.obj & - $(OBJS)\xrclib_xh_choic.obj & - $(OBJS)\xrclib_xh_choicbk.obj & - $(OBJS)\xrclib_xh_clrpicker.obj & - $(OBJS)\xrclib_xh_collpane.obj & - $(OBJS)\xrclib_xh_combo.obj & - $(OBJS)\xrclib_xh_datectrl.obj & - $(OBJS)\xrclib_xh_dirpicker.obj & - $(OBJS)\xrclib_xh_dlg.obj & - $(OBJS)\xrclib_xh_frame.obj & - $(OBJS)\xrclib_xh_mdi.obj & - $(OBJS)\xrclib_xh_filepicker.obj & - $(OBJS)\xrclib_xh_fontpicker.obj & - $(OBJS)\xrclib_xh_gauge.obj & - $(OBJS)\xrclib_xh_gdctl.obj & - $(OBJS)\xrclib_xh_grid.obj & - $(OBJS)\xrclib_xh_html.obj & - $(OBJS)\xrclib_xh_hyperlink.obj & - $(OBJS)\xrclib_xh_listb.obj & - $(OBJS)\xrclib_xh_listbk.obj & - $(OBJS)\xrclib_xh_listc.obj & - $(OBJS)\xrclib_xh_menu.obj & - $(OBJS)\xrclib_xh_notbk.obj & - $(OBJS)\xrclib_xh_odcombo.obj & - $(OBJS)\xrclib_xh_panel.obj & - $(OBJS)\xrclib_xh_propdlg.obj & - $(OBJS)\xrclib_xh_radbt.obj & - $(OBJS)\xrclib_xh_radbx.obj & - $(OBJS)\xrclib_xh_scrol.obj & - $(OBJS)\xrclib_xh_scwin.obj & - $(OBJS)\xrclib_xh_htmllbox.obj & - $(OBJS)\xrclib_xh_sizer.obj & - $(OBJS)\xrclib_xh_slidr.obj & - $(OBJS)\xrclib_xh_spin.obj & - $(OBJS)\xrclib_xh_split.obj & - $(OBJS)\xrclib_xh_srchctrl.obj & - $(OBJS)\xrclib_xh_statbar.obj & - $(OBJS)\xrclib_xh_stbmp.obj & - $(OBJS)\xrclib_xh_stbox.obj & - $(OBJS)\xrclib_xh_stlin.obj & - $(OBJS)\xrclib_xh_sttxt.obj & - $(OBJS)\xrclib_xh_text.obj & - $(OBJS)\xrclib_xh_tglbtn.obj & - $(OBJS)\xrclib_xh_toolb.obj & - $(OBJS)\xrclib_xh_tree.obj & - $(OBJS)\xrclib_xh_treebk.obj & - $(OBJS)\xrclib_xh_unkwn.obj & - $(OBJS)\xrclib_xh_wizrd.obj & - $(OBJS)\xrclib_xmlres.obj & - $(OBJS)\xrclib_xmlrsall.obj -AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI & - /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -AUIDLL_OBJECTS = & - $(OBJS)\auidll_dummy.obj & - $(OBJS)\auidll_framemanager.obj & - $(OBJS)\auidll_dockart.obj & - $(OBJS)\auidll_floatpane.obj & - $(OBJS)\auidll_auibook.obj & - $(OBJS)\auidll_tabmdi.obj -AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -AUILIB_OBJECTS = & - $(OBJS)\auilib_dummy.obj & - $(OBJS)\auilib_framemanager.obj & - $(OBJS)\auilib_dockart.obj & - $(OBJS)\auilib_floatpane.obj & - $(OBJS)\auilib_auibook.obj & - $(OBJS)\auilib_tabmdi.obj -RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT & - /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) $(__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_richtextformatdlg.obj & - $(OBJS)\richtextdll_richtextsymboldlg.obj & - $(OBJS)\richtextdll_richtextstyledlg.obj & - $(OBJS)\richtextdll_richtextprint.obj -RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(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_richtextformatdlg.obj & - $(OBJS)\richtextlib_richtextsymboldlg.obj & - $(OBJS)\richtextlib_richtextstyledlg.obj & - $(OBJS)\richtextlib_richtextprint.obj -STCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -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__ -dSCI_LEXER -dLINK_LEXERS & - -dWXUSINGDLL -dWXMAKINGDLL_STC /fh=$(OBJS)\wxprec_stcdll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -STCDLL_OBJECTS = & - $(OBJS)\stcdll_dummy.obj & - $(OBJS)\stcdll_stc.obj & - $(OBJS)\stcdll_PlatWX.obj & - $(OBJS)\stcdll_ScintillaWX.obj -STCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -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__ -dSCI_LEXER -dLINK_LEXERS & - /fh=$(OBJS)\wxprec_stclib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -STCLIB_OBJECTS = & - $(OBJS)\stclib_dummy.obj & - $(OBJS)\stclib_stc.obj & - $(OBJS)\stclib_PlatWX.obj & - $(OBJS)\stclib_ScintillaWX.obj -GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL & - /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -GLDLL_OBJECTS = & - $(OBJS)\gldll_dummy.obj & - $(OBJS)\gldll_glcmn.obj & - $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff & - -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -GLLIB_OBJECTS = & - $(OBJS)\gllib_dummy.obj & - $(OBJS)\gllib_glcmn.obj & - $(OBJS)\gllib_glcanvas.obj -BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib - -del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib - -del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib - -del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib - -del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib - -del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.dll - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.dll - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib - -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib - -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib - cd ..\..\samples - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - -setup_h : .SYMBOLIC $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h - -$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(WXREGEX_OBJECTS) - @%create $(OBJS)\wxregex.lbc - @for %i in ($(WXREGEX_OBJECTS)) do @%append $(OBJS)\wxregex.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxregex.lbc - -$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib : $(WXZLIB_OBJECTS) - @%create $(OBJS)\wxzlib.lbc - @for %i in ($(WXZLIB_OBJECTS)) do @%append $(OBJS)\wxzlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxzlib.lbc - -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib : $(WXPNG_OBJECTS) - @%create $(OBJS)\wxpng.lbc - @for %i in ($(WXPNG_OBJECTS)) do @%append $(OBJS)\wxpng.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxpng.lbc -!endif - -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib : $(WXJPEG_OBJECTS) - @%create $(OBJS)\wxjpeg.lbc - @for %i in ($(WXJPEG_OBJECTS)) do @%append $(OBJS)\wxjpeg.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxjpeg.lbc -!endif - -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib : $(WXTIFF_OBJECTS) - @%create $(OBJS)\wxtiff.lbc - @for %i in ($(WXTIFF_OBJECTS)) do @%append $(OBJS)\wxtiff.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxtiff.lbc -!endif - -$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib : $(WXEXPAT_OBJECTS) - @%create $(OBJS)\wxexpat.lbc - @for %i in ($(WXEXPAT_OBJECTS)) do @%append $(OBJS)\wxexpat.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxexpat.lbc - -!ifeq USE_STC 1 -$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib : $(WXSCINTILLA_OBJECTS) - @%create $(OBJS)\wxscintilla.lbc - @for %i in ($(WXSCINTILLA_OBJECTS)) do @%append $(OBJS)\wxscintilla.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxscintilla.lbc -!endif - -!ifeq MONOLITHIC 1 -!ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla_library_link_DEP) - @%create $(OBJS)\monodll.lbc - @%append $(OBJS)\monodll.lbc option quiet - @%append $(OBJS)\monodll.lbc name $^@ - @%append $(OBJS)\monodll.lbc option caseexact - @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__wxscintilla)) do @%append $(OBJS)\monodll.lbc library %i - @%append $(OBJS)\monodll.lbc - @%append $(OBJS)\monodll.lbc system os2v2 dll - wlink @$(OBJS)\monodll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +$^@ -!endif -!endif - -!ifeq MONOLITHIC 1 -!ifeq SHARED 0 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib : $(MONOLIB_OBJECTS) - @%create $(OBJS)\monolib.lbc - @for %i in ($(MONOLIB_OBJECTS)) do @%append $(OBJS)\monolib.lbc +%i - wlib -q -p8192 -n -b $^@ @$(OBJS)\monolib.lbc -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - @%create $(OBJS)\basedll.lbc - @%append $(OBJS)\basedll.lbc option quiet - @%append $(OBJS)\basedll.lbc name $^@ - @%append $(OBJS)\basedll.lbc option caseexact - @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\basedll.lbc library %i - @%append $(OBJS)\basedll.lbc - @%append $(OBJS)\basedll.lbc system os2v2 dll - wlink @$(OBJS)\basedll.lbc - wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +$^@ -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib : $(BASELIB_OBJECTS) - @%create $(OBJS)\baselib.lbc - @for %i in ($(BASELIB_OBJECTS)) do @%append $(OBJS)\baselib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\baselib.lbc -!endif -!endif - -!ifeq MONOLITHIC 0 -wxbase : .SYMBOLIC $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) - @%create $(OBJS)\netdll.lbc - @%append $(OBJS)\netdll.lbc option quiet - @%append $(OBJS)\netdll.lbc name $^@ - @%append $(OBJS)\netdll.lbc option caseexact - @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i - @%append $(OBJS)\netdll.lbc - @%append $(OBJS)\netdll.lbc system os2v2 dll - wlink @$(OBJS)\netdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +$^@ -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib : $(NETLIB_OBJECTS) - @%create $(OBJS)\netlib.lbc - @for %i in ($(NETLIB_OBJECTS)) do @%append $(OBJS)\netlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\netlib.lbc -!endif -!endif - -!ifeq MONOLITHIC 0 -wxnet : .SYMBOLIC $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.dll : $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) - @%create $(OBJS)\coredll.lbc - @%append $(OBJS)\coredll.lbc option quiet - @%append $(OBJS)\coredll.lbc name $^@ - @%append $(OBJS)\coredll.lbc option caseexact - @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i - @%append $(OBJS)\coredll.lbc - @%append $(OBJS)\coredll.lbc system os2v2 dll - wlink @$(OBJS)\coredll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib : $(CORELIB_OBJECTS) - @%create $(OBJS)\corelib.lbc - @for %i in ($(CORELIB_OBJECTS)) do @%append $(OBJS)\corelib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\corelib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_GUI 1 -wxcore : .SYMBOLIC $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\advdll.lbc - @%append $(OBJS)\advdll.lbc option quiet - @%append $(OBJS)\advdll.lbc name $^@ - @%append $(OBJS)\advdll.lbc option caseexact - @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i - @%append $(OBJS)\advdll.lbc - @%append $(OBJS)\advdll.lbc system os2v2 dll - wlink @$(OBJS)\advdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib : $(ADVLIB_OBJECTS) - @%create $(OBJS)\advlib.lbc - @for %i in ($(ADVLIB_OBJECTS)) do @%append $(OBJS)\advlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\advlib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_GUI 1 -wxadv : .SYMBOLIC $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll : $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\mediadll.lbc - @%append $(OBJS)\mediadll.lbc option quiet - @%append $(OBJS)\mediadll.lbc name $^@ - @%append $(OBJS)\mediadll.lbc option caseexact - @%append $(OBJS)\mediadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(MEDIADLL_OBJECTS)) do @%append $(OBJS)\mediadll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\mediadll.lbc library %i - @%append $(OBJS)\mediadll.lbc - @%append $(OBJS)\mediadll.lbc system os2v2 dll - wlink @$(OBJS)\mediadll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib +$^@ -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib : $(MEDIALIB_OBJECTS) - @%create $(OBJS)\medialib.lbc - @for %i in ($(MEDIALIB_OBJECTS)) do @%append $(OBJS)\medialib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\medialib.lbc -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -wxmedia : .SYMBOLIC $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll : $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\htmldll.lbc - @%append $(OBJS)\htmldll.lbc option quiet - @%append $(OBJS)\htmldll.lbc name $^@ - @%append $(OBJS)\htmldll.lbc option caseexact - @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i - @%append $(OBJS)\htmldll.lbc - @%append $(OBJS)\htmldll.lbc system os2v2 dll - wlink @$(OBJS)\htmldll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +$^@ -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib : $(HTMLLIB_OBJECTS) - @%create $(OBJS)\htmllib.lbc - @for %i in ($(HTMLLIB_OBJECTS)) do @%append $(OBJS)\htmllib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\htmllib.lbc -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_HTML 1 -wxhtml : .SYMBOLIC $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_QA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.dll : $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - @%create $(OBJS)\qadll.lbc - @%append $(OBJS)\qadll.lbc option quiet - @%append $(OBJS)\qadll.lbc name $^@ - @%append $(OBJS)\qadll.lbc option caseexact - @%append $(OBJS)\qadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i - @%append $(OBJS)\qadll.lbc - @%append $(OBJS)\qadll.lbc system os2v2 dll - wlink @$(OBJS)\qadll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib +$^@ -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_QA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib : $(QALIB_OBJECTS) - @%create $(OBJS)\qalib.lbc - @for %i in ($(QALIB_OBJECTS)) do @%append $(OBJS)\qalib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\qalib.lbc -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_QA 1 -wxqa : .SYMBOLIC $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.dll : $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) - @%create $(OBJS)\xmldll.lbc - @%append $(OBJS)\xmldll.lbc option quiet - @%append $(OBJS)\xmldll.lbc name $^@ - @%append $(OBJS)\xmldll.lbc option caseexact - @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i - @%append $(OBJS)\xmldll.lbc - @%append $(OBJS)\xmldll.lbc system os2v2 dll - wlink @$(OBJS)\xmldll.lbc - wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +$^@ -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib : $(XMLLIB_OBJECTS) - @%create $(OBJS)\xmllib.lbc - @for %i in ($(XMLLIB_OBJECTS)) do @%append $(OBJS)\xmllib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\xmllib.lbc -!endif -!endif - -!ifeq MONOLITHIC 0 -wxxml : .SYMBOLIC $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_XRC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.dll : $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - @%create $(OBJS)\xrcdll.lbc - @%append $(OBJS)\xrcdll.lbc option quiet - @%append $(OBJS)\xrcdll.lbc name $^@ - @%append $(OBJS)\xrcdll.lbc option caseexact - @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i - @%append $(OBJS)\xrcdll.lbc - @%append $(OBJS)\xrcdll.lbc system os2v2 dll - wlink @$(OBJS)\xrcdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_XRC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib : $(XRCLIB_OBJECTS) - @%create $(OBJS)\xrclib.lbc - @for %i in ($(XRCLIB_OBJECTS)) do @%append $(OBJS)\xrclib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\xrclib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_XRC 1 -wxxrc : .SYMBOLIC $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_AUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll : $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\auidll.lbc - @%append $(OBJS)\auidll.lbc option quiet - @%append $(OBJS)\auidll.lbc name $^@ - @%append $(OBJS)\auidll.lbc option caseexact - @%append $(OBJS)\auidll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(AUIDLL_OBJECTS)) do @%append $(OBJS)\auidll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i - @%append $(OBJS)\auidll.lbc - @%append $(OBJS)\auidll.lbc system os2v2 dll - wlink @$(OBJS)\auidll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_AUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib : $(AUILIB_OBJECTS) - @%create $(OBJS)\auilib.lbc - @for %i in ($(AUILIB_OBJECTS)) do @%append $(OBJS)\auilib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\auilib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_AUI 1 -wxaui : .SYMBOLIC $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_RICHTEXT 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll : $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\richtextdll.lbc - @%append $(OBJS)\richtextdll.lbc option quiet - @%append $(OBJS)\richtextdll.lbc name $^@ - @%append $(OBJS)\richtextdll.lbc option caseexact - @%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i - @%append $(OBJS)\richtextdll.lbc - @%append $(OBJS)\richtextdll.lbc system os2v2 dll - wlink @$(OBJS)\richtextdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_RICHTEXT 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib : $(RICHTEXTLIB_OBJECTS) - @%create $(OBJS)\richtextlib.lbc - @for %i in ($(RICHTEXTLIB_OBJECTS)) do @%append $(OBJS)\richtextlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\richtextlib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_RICHTEXT 1 -wxrichtext : .SYMBOLIC $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_STC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.dll : $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\stcdll.lbc - @%append $(OBJS)\stcdll.lbc option quiet - @%append $(OBJS)\stcdll.lbc name $^@ - @%append $(OBJS)\stcdll.lbc option caseexact - @%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\stcdll.lbc library %i - @%append $(OBJS)\stcdll.lbc - @%append $(OBJS)\stcdll.lbc system os2v2 dll - wlink @$(OBJS)\stcdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_STC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib : $(STCLIB_OBJECTS) $(__wxscintilla) - @%create $(OBJS)\stclib.lbc - @for %i in ($(STCLIB_OBJECTS)) do @%append $(OBJS)\stclib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\stclib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_STC 1 -wxstc : .SYMBOLIC $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) -!endif -!endif - -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname) - @%create $(OBJS)\gldll.lbc - @%append $(OBJS)\gldll.lbc option quiet - @%append $(OBJS)\gldll.lbc name $^@ - @%append $(OBJS)\gldll.lbc option caseexact - @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) - @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) ) do @%append $(OBJS)\gldll.lbc library %i - @%append $(OBJS)\gldll.lbc - @%append $(OBJS)\gldll.lbc system os2v2 dll - wlink @$(OBJS)\gldll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib +$^@ -!endif -!endif -!endif - -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib : $(GLLIB_OBJECTS) - @%create $(OBJS)\gllib.lbc - @for %i in ($(GLLIB_OBJECTS)) do @%append $(OBJS)\gllib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\gllib.lbc -!endif -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -wxgl : .SYMBOLIC $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) -!endif -!endif - -samples : .SYMBOLIC - cd ..\..\samples - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -$(LIBDIRNAME) : - if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) - -$(SETUPHDIR) : $(LIBDIRNAME) - if not exist $(SETUPHDIR) mkdir $(SETUPHDIR) - -$(SETUPHDIR)\wx : $(SETUPHDIR) - if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx - -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h : - if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h - -$(SETUPHDIR)\wx\setup.h : - if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h - -build_cfg_file : .SYMBOLIC $(SETUPHDIR) - @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) - @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) - @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) - @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) - @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) - @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE) - @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE) - @echo CFG=$(CFG) >>$(BUILD_CFG_FILE) - @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE) - @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE) - @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE) - @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE) - @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) - @echo MSLU=0 >>$(BUILD_CFG_FILE) - @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE) - @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) - @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) - @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) - @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) - @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) - @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) - @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE) - @echo COMPILER=wat >>$(BUILD_CFG_FILE) - @echo CC=$(CC) >>$(BUILD_CFG_FILE) - @echo CXX=$(CXX) >>$(BUILD_CFG_FILE) - @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE) - @echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE) - @echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE) - @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE) - -$(OBJS)\wxregex_regcomp.obj : .AUTODEPEND ..\..\src\regex\regcomp.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXREGEX_CFLAGS) $< - -$(OBJS)\wxregex_regexec.obj : .AUTODEPEND ..\..\src\regex\regexec.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXREGEX_CFLAGS) $< - -$(OBJS)\wxregex_regerror.obj : .AUTODEPEND ..\..\src\regex\regerror.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXREGEX_CFLAGS) $< - -$(OBJS)\wxregex_regfree.obj : .AUTODEPEND ..\..\src\regex\regfree.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXREGEX_CFLAGS) $< - -$(OBJS)\wxzlib_adler32.obj : .AUTODEPEND ..\..\src\zlib\adler32.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_compress.obj : .AUTODEPEND ..\..\src\zlib\compress.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_crc32.obj : .AUTODEPEND ..\..\src\zlib\crc32.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_gzio.obj : .AUTODEPEND ..\..\src\zlib\gzio.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_uncompr.obj : .AUTODEPEND ..\..\src\zlib\uncompr.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_deflate.obj : .AUTODEPEND ..\..\src\zlib\deflate.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_trees.obj : .AUTODEPEND ..\..\src\zlib\trees.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_zutil.obj : .AUTODEPEND ..\..\src\zlib\zutil.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_inflate.obj : .AUTODEPEND ..\..\src\zlib\inflate.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_infback.obj : .AUTODEPEND ..\..\src\zlib\infback.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_inftrees.obj : .AUTODEPEND ..\..\src\zlib\inftrees.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_inffast.obj : .AUTODEPEND ..\..\src\zlib\inffast.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxpng_png.obj : .AUTODEPEND ..\..\src\png\png.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngerror.obj : .AUTODEPEND ..\..\src\png\pngerror.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pnggccrd.obj : .AUTODEPEND ..\..\src\png\pnggccrd.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngget.obj : .AUTODEPEND ..\..\src\png\pngget.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngmem.obj : .AUTODEPEND ..\..\src\png\pngmem.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngpread.obj : .AUTODEPEND ..\..\src\png\pngpread.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngread.obj : .AUTODEPEND ..\..\src\png\pngread.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngrio.obj : .AUTODEPEND ..\..\src\png\pngrio.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngrtran.obj : .AUTODEPEND ..\..\src\png\pngrtran.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngrutil.obj : .AUTODEPEND ..\..\src\png\pngrutil.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngset.obj : .AUTODEPEND ..\..\src\png\pngset.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngtrans.obj : .AUTODEPEND ..\..\src\png\pngtrans.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngvcrd.obj : .AUTODEPEND ..\..\src\png\pngvcrd.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngwio.obj : .AUTODEPEND ..\..\src\png\pngwio.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngwrite.obj : .AUTODEPEND ..\..\src\png\pngwrite.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngwtran.obj : .AUTODEPEND ..\..\src\png\pngwtran.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngwutil.obj : .AUTODEPEND ..\..\src\png\pngwutil.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcomapi.obj : .AUTODEPEND ..\..\src\jpeg\jcomapi.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jutils.obj : .AUTODEPEND ..\..\src\jpeg\jutils.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jerror.obj : .AUTODEPEND ..\..\src\jpeg\jerror.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jmemmgr.obj : .AUTODEPEND ..\..\src\jpeg\jmemmgr.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jmemnobs.obj : .AUTODEPEND ..\..\src\jpeg\jmemnobs.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcapimin.obj : .AUTODEPEND ..\..\src\jpeg\jcapimin.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcapistd.obj : .AUTODEPEND ..\..\src\jpeg\jcapistd.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jctrans.obj : .AUTODEPEND ..\..\src\jpeg\jctrans.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcparam.obj : .AUTODEPEND ..\..\src\jpeg\jcparam.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdatadst.obj : .AUTODEPEND ..\..\src\jpeg\jdatadst.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcinit.obj : .AUTODEPEND ..\..\src\jpeg\jcinit.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcmaster.obj : .AUTODEPEND ..\..\src\jpeg\jcmaster.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcmarker.obj : .AUTODEPEND ..\..\src\jpeg\jcmarker.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcmainct.obj : .AUTODEPEND ..\..\src\jpeg\jcmainct.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcprepct.obj : .AUTODEPEND ..\..\src\jpeg\jcprepct.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jccoefct.obj : .AUTODEPEND ..\..\src\jpeg\jccoefct.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jccolor.obj : .AUTODEPEND ..\..\src\jpeg\jccolor.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcsample.obj : .AUTODEPEND ..\..\src\jpeg\jcsample.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jchuff.obj : .AUTODEPEND ..\..\src\jpeg\jchuff.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcphuff.obj : .AUTODEPEND ..\..\src\jpeg\jcphuff.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcdctmgr.obj : .AUTODEPEND ..\..\src\jpeg\jcdctmgr.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jfdctfst.obj : .AUTODEPEND ..\..\src\jpeg\jfdctfst.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jfdctflt.obj : .AUTODEPEND ..\..\src\jpeg\jfdctflt.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jfdctint.obj : .AUTODEPEND ..\..\src\jpeg\jfdctint.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdapimin.obj : .AUTODEPEND ..\..\src\jpeg\jdapimin.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdapistd.obj : .AUTODEPEND ..\..\src\jpeg\jdapistd.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdtrans.obj : .AUTODEPEND ..\..\src\jpeg\jdtrans.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdatasrc.obj : .AUTODEPEND ..\..\src\jpeg\jdatasrc.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdmaster.obj : .AUTODEPEND ..\..\src\jpeg\jdmaster.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdinput.obj : .AUTODEPEND ..\..\src\jpeg\jdinput.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdmarker.obj : .AUTODEPEND ..\..\src\jpeg\jdmarker.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdhuff.obj : .AUTODEPEND ..\..\src\jpeg\jdhuff.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdphuff.obj : .AUTODEPEND ..\..\src\jpeg\jdphuff.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdmainct.obj : .AUTODEPEND ..\..\src\jpeg\jdmainct.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdcoefct.obj : .AUTODEPEND ..\..\src\jpeg\jdcoefct.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdpostct.obj : .AUTODEPEND ..\..\src\jpeg\jdpostct.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jddctmgr.obj : .AUTODEPEND ..\..\src\jpeg\jddctmgr.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jidctfst.obj : .AUTODEPEND ..\..\src\jpeg\jidctfst.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jidctflt.obj : .AUTODEPEND ..\..\src\jpeg\jidctflt.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jidctint.obj : .AUTODEPEND ..\..\src\jpeg\jidctint.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jidctred.obj : .AUTODEPEND ..\..\src\jpeg\jidctred.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdsample.obj : .AUTODEPEND ..\..\src\jpeg\jdsample.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdcolor.obj : .AUTODEPEND ..\..\src\jpeg\jdcolor.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jquant1.obj : .AUTODEPEND ..\..\src\jpeg\jquant1.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jquant2.obj : .AUTODEPEND ..\..\src\jpeg\jquant2.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdmerge.obj : .AUTODEPEND ..\..\src\jpeg\jdmerge.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxtiff_tif_unix.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_unix.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_aux.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_aux.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_close.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_close.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_codec.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_codec.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_color.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_color.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_compress.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_compress.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dir.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dir.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dirinfo.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirinfo.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dirread.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirread.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dirwrite.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirwrite.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dumpmode.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dumpmode.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_error.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_error.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_extension.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_extension.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_fax3.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_fax3.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_fax3sm.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_fax3sm.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_flush.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_flush.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_getimage.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_getimage.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_jpeg.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_jpeg.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_luv.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_luv.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_lzw.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_lzw.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_next.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_next.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_ojpeg.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_ojpeg.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_open.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_open.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_packbits.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_packbits.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_pixarlog.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_pixarlog.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_predict.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_predict.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_print.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_print.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_read.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_read.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_strip.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_strip.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_swab.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_swab.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_thunder.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_thunder.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_tile.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_tile.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_version.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_version.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_warning.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_warning.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_write.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_write.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_zip.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_zip.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxexpat_xmlparse.obj : .AUTODEPEND ..\..\src\expat\lib\xmlparse.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXEXPAT_CFLAGS) $< - -$(OBJS)\wxexpat_xmlrole.obj : .AUTODEPEND ..\..\src\expat\lib\xmlrole.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXEXPAT_CFLAGS) $< - -$(OBJS)\wxexpat_xmltok.obj : .AUTODEPEND ..\..\src\expat\lib\xmltok.c - $(CC) -bt=os2 -zq -fo=$^@ $(WXEXPAT_CFLAGS) $< - -$(OBJS)\wxscintilla_AutoComplete.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\AutoComplete.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_CallTip.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CallTip.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_CellBuffer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CellBuffer.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_CharClassify.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CharClassify.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_ContractionState.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ContractionState.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Document.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Document.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_DocumentAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\DocumentAccessor.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Editor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Editor.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_ExternalLexer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ExternalLexer.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Indicator.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Indicator.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_KeyMap.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyMap.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_KeyWords.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyWords.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAPDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAPDL.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAU3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAU3.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAVE.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAVE.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAda.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAda.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAsm.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsm.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAsn1.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexAsn1.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexBaan.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBaan.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexBash.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBash.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexBasic.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBasic.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexBullant.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexBullant.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCLW.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCLW.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCPP.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCPP.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCSS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCSS.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCaml.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCaml.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCsound.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCsound.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexConf.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexConf.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCrontab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexCrontab.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexEScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEScript.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexEiffel.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexEiffel.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexErlang.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexErlang.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexFlagship.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFlagship.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexForth.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexForth.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexFortran.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexFortran.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexGui4Cli.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexGui4Cli.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexHTML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHTML.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexHaskell.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexHaskell.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexInno.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexInno.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexKix.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexKix.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexLisp.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLisp.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexLout.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLout.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexLua.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexLua.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMMIXAL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMMIXAL.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMPT.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMPT.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMSSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMSSQL.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMatlab.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMatlab.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMetapost.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexMetapost.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexNsis.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexNsis.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexOpal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOpal.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexOthers.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexOthers.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPB.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPOV.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPOV.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPS.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPS.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPascal.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPascal.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPerl.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPerl.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPython.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexPython.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexRebol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRebol.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexRuby.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexRuby.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSQL.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSmalltalk.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSmalltalk.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTADS3.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTADS3.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexScriptol.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexScriptol.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSpecman.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpecman.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSpice.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexSpice.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTCL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTCL.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTeX.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexTeX.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexVB.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVB.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexVHDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVHDL.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexVerilog.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexVerilog.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexYAML.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LexYAML.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LineMarker.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LineMarker.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_PropSet.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PropSet.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_RESearch.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RESearch.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_ScintillaBase.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ScintillaBase.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Style.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Style.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_StyleContext.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\StyleContext.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_UniConversion.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\UniConversion.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_ViewStyle.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ViewStyle.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_WindowAccessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\WindowAccessor.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_XPM.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\XPM.cxx - $(CXX) -bt=os2 -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\monodll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_config.obj : .AUTODEPEND ..\..\src\common\config.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dircmn.obj : .AUTODEPEND ..\..\src\common\dircmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dynarray.obj : .AUTODEPEND ..\..\src\common\dynarray.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dynlib.obj : .AUTODEPEND ..\..\src\common\dynlib.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_extended.obj : .AUTODEPEND ..\..\src\common\extended.c - $(CC) -bt=os2 -zq -fo=$^@ $(MONODLL_CFLAGS) $< - -$(OBJS)\monodll_ffile.obj : .AUTODEPEND ..\..\src\common\ffile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_file.obj : .AUTODEPEND ..\..\src\common\file.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fileback.obj : .AUTODEPEND ..\..\src\common\fileback.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fileconf.obj : .AUTODEPEND ..\..\src\common\fileconf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filefn.obj : .AUTODEPEND ..\..\src\common\filefn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filename.obj : .AUTODEPEND ..\..\src\common\filename.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filesys.obj : .AUTODEPEND ..\..\src\common\filesys.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filtall.obj : .AUTODEPEND ..\..\src\common\filtall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filtfind.obj : .AUTODEPEND ..\..\src\common\filtfind.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_hashmap.obj : .AUTODEPEND ..\..\src\common\hashmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_init.obj : .AUTODEPEND ..\..\src\common\init.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_intl.obj : .AUTODEPEND ..\..\src\common\intl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ipcbase.obj : .AUTODEPEND ..\..\src\common\ipcbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_list.obj : .AUTODEPEND ..\..\src\common\list.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_log.obj : .AUTODEPEND ..\..\src\common\log.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_longlong.obj : .AUTODEPEND ..\..\src\common\longlong.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_memory.obj : .AUTODEPEND ..\..\src\common\memory.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mimecmn.obj : .AUTODEPEND ..\..\src\common\mimecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_module.obj : .AUTODEPEND ..\..\src\common\module.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_object.obj : .AUTODEPEND ..\..\src\common\object.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_process.obj : .AUTODEPEND ..\..\src\common\process.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_string.obj : .AUTODEPEND ..\..\src\common\string.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_zstream.obj : .AUTODEPEND ..\..\src\common\zstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dir.obj : .AUTODEPEND ..\..\src\os2\dir.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mimetype.obj : .AUTODEPEND ..\..\src\os2\mimetype.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stdpaths.obj : .AUTODEPEND ..\..\src\os2\stdpaths.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_thread.obj : .AUTODEPEND ..\..\src\os2\thread.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_utils.obj : .AUTODEPEND ..\..\src\os2\utils.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_utilsexc.obj : .AUTODEPEND ..\..\src\os2\utilsexc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ftp.obj : .AUTODEPEND ..\..\src\common\ftp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_http.obj : .AUTODEPEND ..\..\src\common\http.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_protocol.obj : .AUTODEPEND ..\..\src\common\protocol.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sckaddr.obj : .AUTODEPEND ..\..\src\common\sckaddr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sckfile.obj : .AUTODEPEND ..\..\src\common\sckfile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sckipc.obj : .AUTODEPEND ..\..\src\common\sckipc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sckstrm.obj : .AUTODEPEND ..\..\src\common\sckstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\unix\gsocket.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_app.obj : .AUTODEPEND ..\..\src\os2\app.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_bitmap.obj : .AUTODEPEND ..\..\src\os2\bitmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_brush.obj : .AUTODEPEND ..\..\src\os2\brush.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_clipbrd.obj : .AUTODEPEND ..\..\src\os2\clipbrd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_colour.obj : .AUTODEPEND ..\..\src\os2\colour.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_cursor.obj : .AUTODEPEND ..\..\src\os2\cursor.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_data.obj : .AUTODEPEND ..\..\src\os2\data.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dataobj.obj : .AUTODEPEND ..\..\src\os2\dataobj.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dc.obj : .AUTODEPEND ..\..\src\os2\dc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dcclient.obj : .AUTODEPEND ..\..\src\os2\dcclient.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dcmemory.obj : .AUTODEPEND ..\..\src\os2\dcmemory.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dcprint.obj : .AUTODEPEND ..\..\src\os2\dcprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dcscreen.obj : .AUTODEPEND ..\..\src\os2\dcscreen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dnd.obj : .AUTODEPEND ..\..\src\os2\dnd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_evtloop.obj : .AUTODEPEND ..\..\src\os2\evtloop.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filedlg.obj : .AUTODEPEND ..\..\src\os2\filedlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_font.obj : .AUTODEPEND ..\..\src\os2\font.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fontdlg.obj : .AUTODEPEND ..\..\src\os2\fontdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fontenum.obj : .AUTODEPEND ..\..\src\os2\fontenum.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fontutil.obj : .AUTODEPEND ..\..\src\os2\fontutil.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_frame.obj : .AUTODEPEND ..\..\src\os2\frame.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_gdiimage.obj : .AUTODEPEND ..\..\src\os2\gdiimage.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_gsockpm.obj : .AUTODEPEND ..\..\src\os2\gsockpm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\os2\helpwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_icon.obj : .AUTODEPEND ..\..\src\os2\icon.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_iniconf.obj : .AUTODEPEND ..\..\src\os2\iniconf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_main.obj : .AUTODEPEND ..\..\src\os2\main.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_menuitem.obj : .AUTODEPEND ..\..\src\os2\menuitem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_metafile.obj : .AUTODEPEND ..\..\src\os2\metafile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msgdlg.obj : .AUTODEPEND ..\..\src\os2\msgdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_nativdlg.obj : .AUTODEPEND ..\..\src\os2\nativdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\os2\ownerdrw.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_palette.obj : .AUTODEPEND ..\..\src\os2\palette.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_pen.obj : .AUTODEPEND ..\..\src\os2\pen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_popupwin.obj : .AUTODEPEND ..\..\src\os2\popupwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_print.obj : .AUTODEPEND ..\..\src\os2\print.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_region.obj : .AUTODEPEND ..\..\src\os2\region.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_settings.obj : .AUTODEPEND ..\..\src\os2\settings.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_spinctrl.obj : .AUTODEPEND ..\..\src\os2\spinctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tabctrl.obj : .AUTODEPEND ..\..\src\os2\tabctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_timer.obj : .AUTODEPEND ..\..\src\os2\timer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tooltip.obj : .AUTODEPEND ..\..\src\os2\tooltip.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_toplevel.obj : .AUTODEPEND ..\..\src\os2\toplevel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_utilsgui.obj : .AUTODEPEND ..\..\src\os2\utilsgui.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_window.obj : .AUTODEPEND ..\..\src\os2\window.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_winuniv.obj : .AUTODEPEND ..\..\src\univ\winuniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpctrl.obj : .AUTODEPEND ..\..\src\html\helpctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpdata.obj : .AUTODEPEND ..\..\src\html\helpdata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmlfilt.obj : .AUTODEPEND ..\..\src\html\htmlfilt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmlpars.obj : .AUTODEPEND ..\..\src\html\htmlpars.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmltag.obj : .AUTODEPEND ..\..\src\html\htmltag.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmlwin.obj : .AUTODEPEND ..\..\src\html\htmlwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmprint.obj : .AUTODEPEND ..\..\src\html\htmprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_dflist.obj : .AUTODEPEND ..\..\src\html\m_dflist.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_fonts.obj : .AUTODEPEND ..\..\src\html\m_fonts.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_hline.obj : .AUTODEPEND ..\..\src\html\m_hline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_image.obj : .AUTODEPEND ..\..\src\html\m_image.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_layout.obj : .AUTODEPEND ..\..\src\html\m_layout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_links.obj : .AUTODEPEND ..\..\src\html\m_links.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bmpcbox.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_choicbk.obj : .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_clrpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -!ifeq USE_GUI 1 -$(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monodll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_anidecod.obj : .AUTODEPEND ..\..\src\common\anidecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_appcmn.obj : .AUTODEPEND ..\..\src\common\appcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_artprov.obj : .AUTODEPEND ..\..\src\common\artprov.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_artstd.obj : .AUTODEPEND ..\..\src\common\artstd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_clrpickercmn.obj : .AUTODEPEND ..\..\src\common\clrpickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cmndata.obj : .AUTODEPEND ..\..\src\common\cmndata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_containr.obj : .AUTODEPEND ..\..\src\common\containr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cshelp.obj : .AUTODEPEND ..\..\src\common\cshelp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_ctrlcmn.obj : .AUTODEPEND ..\..\src\common\ctrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_ctrlsub.obj : .AUTODEPEND ..\..\src\common\ctrlsub.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_datacmn.obj : .AUTODEPEND ..\..\src\common\datacmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcbase.obj : .AUTODEPEND ..\..\src\common\dcbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dndcmn.obj : .AUTODEPEND ..\..\src\common\dndcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dobjcmn.obj : .AUTODEPEND ..\..\src\common\dobjcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_docmdi.obj : .AUTODEPEND ..\..\src\common\docmdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_docview.obj : .AUTODEPEND ..\..\src\common\docview.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dpycmn.obj : .AUTODEPEND ..\..\src\common\dpycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dseldlg.obj : .AUTODEPEND ..\..\src\common\dseldlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filepickercmn.obj : .AUTODEPEND ..\..\src\common\filepickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontpickercmn.obj : .AUTODEPEND ..\..\src\common\fontpickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fldlgcmn.obj : .AUTODEPEND ..\..\src\common\fldlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gaugecmn.obj : .AUTODEPEND ..\..\src\common\gaugecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gbsizer.obj : .AUTODEPEND ..\..\src\common\gbsizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gdicmn.obj : .AUTODEPEND ..\..\src\common\gdicmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_geometry.obj : .AUTODEPEND ..\..\src\common\geometry.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_iconbndl.obj : .AUTODEPEND ..\..\src\common\iconbndl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagall.obj : .AUTODEPEND ..\..\src\common\imagall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagbmp.obj : .AUTODEPEND ..\..\src\common\imagbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_image.obj : .AUTODEPEND ..\..\src\common\image.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagfill.obj : .AUTODEPEND ..\..\src\common\imagfill.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imaggif.obj : .AUTODEPEND ..\..\src\common\imaggif.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagiff.obj : .AUTODEPEND ..\..\src\common\imagiff.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagjpeg.obj : .AUTODEPEND ..\..\src\common\imagjpeg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagpcx.obj : .AUTODEPEND ..\..\src\common\imagpcx.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagpng.obj : .AUTODEPEND ..\..\src\common\imagpng.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagpnm.obj : .AUTODEPEND ..\..\src\common\imagpnm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagtga.obj : .AUTODEPEND ..\..\src\common\imagtga.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagtiff.obj : .AUTODEPEND ..\..\src\common\imagtiff.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagxpm.obj : .AUTODEPEND ..\..\src\common\imagxpm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_layout.obj : .AUTODEPEND ..\..\src\common\layout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_popupcmn.obj : .AUTODEPEND ..\..\src\common\popupcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_treebase.obj : .AUTODEPEND ..\..\src\common\treebase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_valgen.obj : .AUTODEPEND ..\..\src\common\valgen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_validate.obj : .AUTODEPEND ..\..\src\common\validate.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_valtext.obj : .AUTODEPEND ..\..\src\common\valtext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dirctrlg.obj : .AUTODEPEND ..\..\src\generic\dirctrlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_printps.obj : .AUTODEPEND ..\..\src\generic\printps.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_selstore.obj : .AUTODEPEND ..\..\src\generic\selstore.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_spinctlg.obj : .AUTODEPEND ..\..\src\generic\spinctlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_sashwin.obj : .AUTODEPEND ..\..\src\generic\sashwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_sound.obj : .AUTODEPEND ..\..\src\os2\sound.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -$(OBJS)\monolib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_config.obj : .AUTODEPEND ..\..\src\common\config.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dircmn.obj : .AUTODEPEND ..\..\src\common\dircmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dynarray.obj : .AUTODEPEND ..\..\src\common\dynarray.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dynlib.obj : .AUTODEPEND ..\..\src\common\dynlib.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_extended.obj : .AUTODEPEND ..\..\src\common\extended.c - $(CC) -bt=os2 -zq -fo=$^@ $(MONOLIB_CFLAGS) $< - -$(OBJS)\monolib_ffile.obj : .AUTODEPEND ..\..\src\common\ffile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_file.obj : .AUTODEPEND ..\..\src\common\file.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fileback.obj : .AUTODEPEND ..\..\src\common\fileback.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fileconf.obj : .AUTODEPEND ..\..\src\common\fileconf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filefn.obj : .AUTODEPEND ..\..\src\common\filefn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filename.obj : .AUTODEPEND ..\..\src\common\filename.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filesys.obj : .AUTODEPEND ..\..\src\common\filesys.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filtall.obj : .AUTODEPEND ..\..\src\common\filtall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filtfind.obj : .AUTODEPEND ..\..\src\common\filtfind.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_hashmap.obj : .AUTODEPEND ..\..\src\common\hashmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_init.obj : .AUTODEPEND ..\..\src\common\init.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_intl.obj : .AUTODEPEND ..\..\src\common\intl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ipcbase.obj : .AUTODEPEND ..\..\src\common\ipcbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_list.obj : .AUTODEPEND ..\..\src\common\list.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_log.obj : .AUTODEPEND ..\..\src\common\log.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_longlong.obj : .AUTODEPEND ..\..\src\common\longlong.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_memory.obj : .AUTODEPEND ..\..\src\common\memory.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mimecmn.obj : .AUTODEPEND ..\..\src\common\mimecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_module.obj : .AUTODEPEND ..\..\src\common\module.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_object.obj : .AUTODEPEND ..\..\src\common\object.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_process.obj : .AUTODEPEND ..\..\src\common\process.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_zstream.obj : .AUTODEPEND ..\..\src\common\zstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dir.obj : .AUTODEPEND ..\..\src\os2\dir.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mimetype.obj : .AUTODEPEND ..\..\src\os2\mimetype.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stdpaths.obj : .AUTODEPEND ..\..\src\os2\stdpaths.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_thread.obj : .AUTODEPEND ..\..\src\os2\thread.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_utils.obj : .AUTODEPEND ..\..\src\os2\utils.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_utilsexc.obj : .AUTODEPEND ..\..\src\os2\utilsexc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ftp.obj : .AUTODEPEND ..\..\src\common\ftp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_http.obj : .AUTODEPEND ..\..\src\common\http.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_protocol.obj : .AUTODEPEND ..\..\src\common\protocol.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sckaddr.obj : .AUTODEPEND ..\..\src\common\sckaddr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sckfile.obj : .AUTODEPEND ..\..\src\common\sckfile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sckipc.obj : .AUTODEPEND ..\..\src\common\sckipc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sckstrm.obj : .AUTODEPEND ..\..\src\common\sckstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\unix\gsocket.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_app.obj : .AUTODEPEND ..\..\src\os2\app.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_bitmap.obj : .AUTODEPEND ..\..\src\os2\bitmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_brush.obj : .AUTODEPEND ..\..\src\os2\brush.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_clipbrd.obj : .AUTODEPEND ..\..\src\os2\clipbrd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_colour.obj : .AUTODEPEND ..\..\src\os2\colour.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_cursor.obj : .AUTODEPEND ..\..\src\os2\cursor.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_data.obj : .AUTODEPEND ..\..\src\os2\data.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dataobj.obj : .AUTODEPEND ..\..\src\os2\dataobj.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dc.obj : .AUTODEPEND ..\..\src\os2\dc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dcclient.obj : .AUTODEPEND ..\..\src\os2\dcclient.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dcmemory.obj : .AUTODEPEND ..\..\src\os2\dcmemory.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dcprint.obj : .AUTODEPEND ..\..\src\os2\dcprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dcscreen.obj : .AUTODEPEND ..\..\src\os2\dcscreen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dnd.obj : .AUTODEPEND ..\..\src\os2\dnd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_evtloop.obj : .AUTODEPEND ..\..\src\os2\evtloop.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filedlg.obj : .AUTODEPEND ..\..\src\os2\filedlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_font.obj : .AUTODEPEND ..\..\src\os2\font.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fontdlg.obj : .AUTODEPEND ..\..\src\os2\fontdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fontenum.obj : .AUTODEPEND ..\..\src\os2\fontenum.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fontutil.obj : .AUTODEPEND ..\..\src\os2\fontutil.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_frame.obj : .AUTODEPEND ..\..\src\os2\frame.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gdiimage.obj : .AUTODEPEND ..\..\src\os2\gdiimage.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gsockpm.obj : .AUTODEPEND ..\..\src\os2\gsockpm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\os2\helpwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_icon.obj : .AUTODEPEND ..\..\src\os2\icon.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_iniconf.obj : .AUTODEPEND ..\..\src\os2\iniconf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_main.obj : .AUTODEPEND ..\..\src\os2\main.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_menuitem.obj : .AUTODEPEND ..\..\src\os2\menuitem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_metafile.obj : .AUTODEPEND ..\..\src\os2\metafile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msgdlg.obj : .AUTODEPEND ..\..\src\os2\msgdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_nativdlg.obj : .AUTODEPEND ..\..\src\os2\nativdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\os2\ownerdrw.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_palette.obj : .AUTODEPEND ..\..\src\os2\palette.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_pen.obj : .AUTODEPEND ..\..\src\os2\pen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_popupwin.obj : .AUTODEPEND ..\..\src\os2\popupwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_print.obj : .AUTODEPEND ..\..\src\os2\print.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_region.obj : .AUTODEPEND ..\..\src\os2\region.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_settings.obj : .AUTODEPEND ..\..\src\os2\settings.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_spinctrl.obj : .AUTODEPEND ..\..\src\os2\spinctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tabctrl.obj : .AUTODEPEND ..\..\src\os2\tabctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_timer.obj : .AUTODEPEND ..\..\src\os2\timer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tooltip.obj : .AUTODEPEND ..\..\src\os2\tooltip.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_toplevel.obj : .AUTODEPEND ..\..\src\os2\toplevel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_utilsgui.obj : .AUTODEPEND ..\..\src\os2\utilsgui.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_window.obj : .AUTODEPEND ..\..\src\os2\window.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_winuniv.obj : .AUTODEPEND ..\..\src\univ\winuniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpctrl.obj : .AUTODEPEND ..\..\src\html\helpctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpdata.obj : .AUTODEPEND ..\..\src\html\helpdata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmlfilt.obj : .AUTODEPEND ..\..\src\html\htmlfilt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmlpars.obj : .AUTODEPEND ..\..\src\html\htmlpars.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmltag.obj : .AUTODEPEND ..\..\src\html\htmltag.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmlwin.obj : .AUTODEPEND ..\..\src\html\htmlwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmprint.obj : .AUTODEPEND ..\..\src\html\htmprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_dflist.obj : .AUTODEPEND ..\..\src\html\m_dflist.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_fonts.obj : .AUTODEPEND ..\..\src\html\m_fonts.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_hline.obj : .AUTODEPEND ..\..\src\html\m_hline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_image.obj : .AUTODEPEND ..\..\src\html\m_image.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_layout.obj : .AUTODEPEND ..\..\src\html\m_layout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_links.obj : .AUTODEPEND ..\..\src\html\m_links.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bmpcbox.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_choicbk.obj : .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_clrpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -!ifeq USE_GUI 1 -$(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\monolib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_anidecod.obj : .AUTODEPEND ..\..\src\common\anidecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_appcmn.obj : .AUTODEPEND ..\..\src\common\appcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_artprov.obj : .AUTODEPEND ..\..\src\common\artprov.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_artstd.obj : .AUTODEPEND ..\..\src\common\artstd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_clrpickercmn.obj : .AUTODEPEND ..\..\src\common\clrpickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cmndata.obj : .AUTODEPEND ..\..\src\common\cmndata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_containr.obj : .AUTODEPEND ..\..\src\common\containr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cshelp.obj : .AUTODEPEND ..\..\src\common\cshelp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_ctrlcmn.obj : .AUTODEPEND ..\..\src\common\ctrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_ctrlsub.obj : .AUTODEPEND ..\..\src\common\ctrlsub.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_datacmn.obj : .AUTODEPEND ..\..\src\common\datacmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcbase.obj : .AUTODEPEND ..\..\src\common\dcbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dndcmn.obj : .AUTODEPEND ..\..\src\common\dndcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dobjcmn.obj : .AUTODEPEND ..\..\src\common\dobjcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_docmdi.obj : .AUTODEPEND ..\..\src\common\docmdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_docview.obj : .AUTODEPEND ..\..\src\common\docview.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dpycmn.obj : .AUTODEPEND ..\..\src\common\dpycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dseldlg.obj : .AUTODEPEND ..\..\src\common\dseldlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filepickercmn.obj : .AUTODEPEND ..\..\src\common\filepickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontpickercmn.obj : .AUTODEPEND ..\..\src\common\fontpickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fldlgcmn.obj : .AUTODEPEND ..\..\src\common\fldlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gaugecmn.obj : .AUTODEPEND ..\..\src\common\gaugecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gbsizer.obj : .AUTODEPEND ..\..\src\common\gbsizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gdicmn.obj : .AUTODEPEND ..\..\src\common\gdicmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_geometry.obj : .AUTODEPEND ..\..\src\common\geometry.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_iconbndl.obj : .AUTODEPEND ..\..\src\common\iconbndl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagall.obj : .AUTODEPEND ..\..\src\common\imagall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagbmp.obj : .AUTODEPEND ..\..\src\common\imagbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_image.obj : .AUTODEPEND ..\..\src\common\image.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagfill.obj : .AUTODEPEND ..\..\src\common\imagfill.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imaggif.obj : .AUTODEPEND ..\..\src\common\imaggif.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagiff.obj : .AUTODEPEND ..\..\src\common\imagiff.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagjpeg.obj : .AUTODEPEND ..\..\src\common\imagjpeg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagpcx.obj : .AUTODEPEND ..\..\src\common\imagpcx.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagpng.obj : .AUTODEPEND ..\..\src\common\imagpng.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagpnm.obj : .AUTODEPEND ..\..\src\common\imagpnm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagtga.obj : .AUTODEPEND ..\..\src\common\imagtga.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagtiff.obj : .AUTODEPEND ..\..\src\common\imagtiff.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagxpm.obj : .AUTODEPEND ..\..\src\common\imagxpm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_layout.obj : .AUTODEPEND ..\..\src\common\layout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_popupcmn.obj : .AUTODEPEND ..\..\src\common\popupcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_treebase.obj : .AUTODEPEND ..\..\src\common\treebase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_valgen.obj : .AUTODEPEND ..\..\src\common\valgen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_validate.obj : .AUTODEPEND ..\..\src\common\validate.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_valtext.obj : .AUTODEPEND ..\..\src\common\valtext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dirctrlg.obj : .AUTODEPEND ..\..\src\generic\dirctrlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_printps.obj : .AUTODEPEND ..\..\src\generic\printps.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_selstore.obj : .AUTODEPEND ..\..\src\generic\selstore.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_spinctlg.obj : .AUTODEPEND ..\..\src\generic\spinctlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_sashwin.obj : .AUTODEPEND ..\..\src\generic\sashwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_sound.obj : .AUTODEPEND ..\..\src\os2\sound.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -$(OBJS)\basedll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_config.obj : .AUTODEPEND ..\..\src\common\config.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dircmn.obj : .AUTODEPEND ..\..\src\common\dircmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dynarray.obj : .AUTODEPEND ..\..\src\common\dynarray.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dynlib.obj : .AUTODEPEND ..\..\src\common\dynlib.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_extended.obj : .AUTODEPEND ..\..\src\common\extended.c - $(CC) -bt=os2 -zq -fo=$^@ $(BASEDLL_CFLAGS) $< - -$(OBJS)\basedll_ffile.obj : .AUTODEPEND ..\..\src\common\ffile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_file.obj : .AUTODEPEND ..\..\src\common\file.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fileback.obj : .AUTODEPEND ..\..\src\common\fileback.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fileconf.obj : .AUTODEPEND ..\..\src\common\fileconf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filefn.obj : .AUTODEPEND ..\..\src\common\filefn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filename.obj : .AUTODEPEND ..\..\src\common\filename.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filesys.obj : .AUTODEPEND ..\..\src\common\filesys.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filtall.obj : .AUTODEPEND ..\..\src\common\filtall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filtfind.obj : .AUTODEPEND ..\..\src\common\filtfind.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_hashmap.obj : .AUTODEPEND ..\..\src\common\hashmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_init.obj : .AUTODEPEND ..\..\src\common\init.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_intl.obj : .AUTODEPEND ..\..\src\common\intl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_ipcbase.obj : .AUTODEPEND ..\..\src\common\ipcbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_list.obj : .AUTODEPEND ..\..\src\common\list.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_log.obj : .AUTODEPEND ..\..\src\common\log.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_longlong.obj : .AUTODEPEND ..\..\src\common\longlong.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_memory.obj : .AUTODEPEND ..\..\src\common\memory.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_mimecmn.obj : .AUTODEPEND ..\..\src\common\mimecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_module.obj : .AUTODEPEND ..\..\src\common\module.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_object.obj : .AUTODEPEND ..\..\src\common\object.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_process.obj : .AUTODEPEND ..\..\src\common\process.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_string.obj : .AUTODEPEND ..\..\src\common\string.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_zstream.obj : .AUTODEPEND ..\..\src\common\zstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dir.obj : .AUTODEPEND ..\..\src\os2\dir.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_mimetype.obj : .AUTODEPEND ..\..\src\os2\mimetype.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stdpaths.obj : .AUTODEPEND ..\..\src\os2\stdpaths.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_thread.obj : .AUTODEPEND ..\..\src\os2\thread.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_utils.obj : .AUTODEPEND ..\..\src\os2\utils.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_utilsexc.obj : .AUTODEPEND ..\..\src\os2\utilsexc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\baselib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_config.obj : .AUTODEPEND ..\..\src\common\config.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dircmn.obj : .AUTODEPEND ..\..\src\common\dircmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dynarray.obj : .AUTODEPEND ..\..\src\common\dynarray.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dynlib.obj : .AUTODEPEND ..\..\src\common\dynlib.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_extended.obj : .AUTODEPEND ..\..\src\common\extended.c - $(CC) -bt=os2 -zq -fo=$^@ $(BASELIB_CFLAGS) $< - -$(OBJS)\baselib_ffile.obj : .AUTODEPEND ..\..\src\common\ffile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_file.obj : .AUTODEPEND ..\..\src\common\file.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fileback.obj : .AUTODEPEND ..\..\src\common\fileback.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fileconf.obj : .AUTODEPEND ..\..\src\common\fileconf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filefn.obj : .AUTODEPEND ..\..\src\common\filefn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filename.obj : .AUTODEPEND ..\..\src\common\filename.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filesys.obj : .AUTODEPEND ..\..\src\common\filesys.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filtall.obj : .AUTODEPEND ..\..\src\common\filtall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filtfind.obj : .AUTODEPEND ..\..\src\common\filtfind.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_hashmap.obj : .AUTODEPEND ..\..\src\common\hashmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_init.obj : .AUTODEPEND ..\..\src\common\init.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_intl.obj : .AUTODEPEND ..\..\src\common\intl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_ipcbase.obj : .AUTODEPEND ..\..\src\common\ipcbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_list.obj : .AUTODEPEND ..\..\src\common\list.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_log.obj : .AUTODEPEND ..\..\src\common\log.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_longlong.obj : .AUTODEPEND ..\..\src\common\longlong.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_memory.obj : .AUTODEPEND ..\..\src\common\memory.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_mimecmn.obj : .AUTODEPEND ..\..\src\common\mimecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_module.obj : .AUTODEPEND ..\..\src\common\module.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_object.obj : .AUTODEPEND ..\..\src\common\object.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_process.obj : .AUTODEPEND ..\..\src\common\process.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_zstream.obj : .AUTODEPEND ..\..\src\common\zstream.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dir.obj : .AUTODEPEND ..\..\src\os2\dir.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_mimetype.obj : .AUTODEPEND ..\..\src\os2\mimetype.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stdpaths.obj : .AUTODEPEND ..\..\src\os2\stdpaths.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_thread.obj : .AUTODEPEND ..\..\src\os2\thread.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_utils.obj : .AUTODEPEND ..\..\src\os2\utils.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_utilsexc.obj : .AUTODEPEND ..\..\src\os2\utilsexc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\netdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_ftp.obj : .AUTODEPEND ..\..\src\common\ftp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_http.obj : .AUTODEPEND ..\..\src\common\http.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_protocol.obj : .AUTODEPEND ..\..\src\common\protocol.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sckaddr.obj : .AUTODEPEND ..\..\src\common\sckaddr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sckfile.obj : .AUTODEPEND ..\..\src\common\sckfile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sckipc.obj : .AUTODEPEND ..\..\src\common\sckipc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sckstrm.obj : .AUTODEPEND ..\..\src\common\sckstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_gsocket.obj : .AUTODEPEND ..\..\src\unix\gsocket.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_ftp.obj : .AUTODEPEND ..\..\src\common\ftp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_http.obj : .AUTODEPEND ..\..\src\common\http.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_protocol.obj : .AUTODEPEND ..\..\src\common\protocol.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sckaddr.obj : .AUTODEPEND ..\..\src\common\sckaddr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sckfile.obj : .AUTODEPEND ..\..\src\common\sckfile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sckipc.obj : .AUTODEPEND ..\..\src\common\sckipc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sckstrm.obj : .AUTODEPEND ..\..\src\common\sckstrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_gsocket.obj : .AUTODEPEND ..\..\src\unix\gsocket.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\coredll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_app.obj : .AUTODEPEND ..\..\src\os2\app.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_bitmap.obj : .AUTODEPEND ..\..\src\os2\bitmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_brush.obj : .AUTODEPEND ..\..\src\os2\brush.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_clipbrd.obj : .AUTODEPEND ..\..\src\os2\clipbrd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_colour.obj : .AUTODEPEND ..\..\src\os2\colour.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_cursor.obj : .AUTODEPEND ..\..\src\os2\cursor.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_data.obj : .AUTODEPEND ..\..\src\os2\data.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dataobj.obj : .AUTODEPEND ..\..\src\os2\dataobj.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dc.obj : .AUTODEPEND ..\..\src\os2\dc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dcclient.obj : .AUTODEPEND ..\..\src\os2\dcclient.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dcmemory.obj : .AUTODEPEND ..\..\src\os2\dcmemory.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dcprint.obj : .AUTODEPEND ..\..\src\os2\dcprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dcscreen.obj : .AUTODEPEND ..\..\src\os2\dcscreen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dnd.obj : .AUTODEPEND ..\..\src\os2\dnd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_evtloop.obj : .AUTODEPEND ..\..\src\os2\evtloop.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_filedlg.obj : .AUTODEPEND ..\..\src\os2\filedlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_font.obj : .AUTODEPEND ..\..\src\os2\font.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fontdlg.obj : .AUTODEPEND ..\..\src\os2\fontdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fontenum.obj : .AUTODEPEND ..\..\src\os2\fontenum.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fontutil.obj : .AUTODEPEND ..\..\src\os2\fontutil.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_frame.obj : .AUTODEPEND ..\..\src\os2\frame.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_gdiimage.obj : .AUTODEPEND ..\..\src\os2\gdiimage.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_gsockpm.obj : .AUTODEPEND ..\..\src\os2\gsockpm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_helpwin.obj : .AUTODEPEND ..\..\src\os2\helpwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_icon.obj : .AUTODEPEND ..\..\src\os2\icon.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_iniconf.obj : .AUTODEPEND ..\..\src\os2\iniconf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_main.obj : .AUTODEPEND ..\..\src\os2\main.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_menuitem.obj : .AUTODEPEND ..\..\src\os2\menuitem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_metafile.obj : .AUTODEPEND ..\..\src\os2\metafile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msgdlg.obj : .AUTODEPEND ..\..\src\os2\msgdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_nativdlg.obj : .AUTODEPEND ..\..\src\os2\nativdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\os2\ownerdrw.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_palette.obj : .AUTODEPEND ..\..\src\os2\palette.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_pen.obj : .AUTODEPEND ..\..\src\os2\pen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_popupwin.obj : .AUTODEPEND ..\..\src\os2\popupwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_print.obj : .AUTODEPEND ..\..\src\os2\print.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_region.obj : .AUTODEPEND ..\..\src\os2\region.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_settings.obj : .AUTODEPEND ..\..\src\os2\settings.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_spinctrl.obj : .AUTODEPEND ..\..\src\os2\spinctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_tabctrl.obj : .AUTODEPEND ..\..\src\os2\tabctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_timer.obj : .AUTODEPEND ..\..\src\os2\timer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_tooltip.obj : .AUTODEPEND ..\..\src\os2\tooltip.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_toplevel.obj : .AUTODEPEND ..\..\src\os2\toplevel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_utilsgui.obj : .AUTODEPEND ..\..\src\os2\utilsgui.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_window.obj : .AUTODEPEND ..\..\src\os2\window.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_winuniv.obj : .AUTODEPEND ..\..\src\univ\winuniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -!ifeq USE_GUI 1 -$(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\coredll_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_anidecod.obj : .AUTODEPEND ..\..\src\common\anidecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_appcmn.obj : .AUTODEPEND ..\..\src\common\appcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_artprov.obj : .AUTODEPEND ..\..\src\common\artprov.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_artstd.obj : .AUTODEPEND ..\..\src\common\artstd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_clrpickercmn.obj : .AUTODEPEND ..\..\src\common\clrpickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cmndata.obj : .AUTODEPEND ..\..\src\common\cmndata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_containr.obj : .AUTODEPEND ..\..\src\common\containr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cshelp.obj : .AUTODEPEND ..\..\src\common\cshelp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_ctrlcmn.obj : .AUTODEPEND ..\..\src\common\ctrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_ctrlsub.obj : .AUTODEPEND ..\..\src\common\ctrlsub.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_datacmn.obj : .AUTODEPEND ..\..\src\common\datacmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcbase.obj : .AUTODEPEND ..\..\src\common\dcbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dndcmn.obj : .AUTODEPEND ..\..\src\common\dndcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dobjcmn.obj : .AUTODEPEND ..\..\src\common\dobjcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_docmdi.obj : .AUTODEPEND ..\..\src\common\docmdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_docview.obj : .AUTODEPEND ..\..\src\common\docview.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dpycmn.obj : .AUTODEPEND ..\..\src\common\dpycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dseldlg.obj : .AUTODEPEND ..\..\src\common\dseldlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filepickercmn.obj : .AUTODEPEND ..\..\src\common\filepickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontpickercmn.obj : .AUTODEPEND ..\..\src\common\fontpickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fldlgcmn.obj : .AUTODEPEND ..\..\src\common\fldlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gaugecmn.obj : .AUTODEPEND ..\..\src\common\gaugecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gbsizer.obj : .AUTODEPEND ..\..\src\common\gbsizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gdicmn.obj : .AUTODEPEND ..\..\src\common\gdicmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_geometry.obj : .AUTODEPEND ..\..\src\common\geometry.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_iconbndl.obj : .AUTODEPEND ..\..\src\common\iconbndl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagall.obj : .AUTODEPEND ..\..\src\common\imagall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagbmp.obj : .AUTODEPEND ..\..\src\common\imagbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_image.obj : .AUTODEPEND ..\..\src\common\image.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagfill.obj : .AUTODEPEND ..\..\src\common\imagfill.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imaggif.obj : .AUTODEPEND ..\..\src\common\imaggif.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagiff.obj : .AUTODEPEND ..\..\src\common\imagiff.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagjpeg.obj : .AUTODEPEND ..\..\src\common\imagjpeg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagpcx.obj : .AUTODEPEND ..\..\src\common\imagpcx.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagpng.obj : .AUTODEPEND ..\..\src\common\imagpng.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagpnm.obj : .AUTODEPEND ..\..\src\common\imagpnm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagtga.obj : .AUTODEPEND ..\..\src\common\imagtga.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagtiff.obj : .AUTODEPEND ..\..\src\common\imagtiff.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagxpm.obj : .AUTODEPEND ..\..\src\common\imagxpm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_layout.obj : .AUTODEPEND ..\..\src\common\layout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_popupcmn.obj : .AUTODEPEND ..\..\src\common\popupcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_treebase.obj : .AUTODEPEND ..\..\src\common\treebase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_valgen.obj : .AUTODEPEND ..\..\src\common\valgen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_validate.obj : .AUTODEPEND ..\..\src\common\validate.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_valtext.obj : .AUTODEPEND ..\..\src\common\valtext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dirctrlg.obj : .AUTODEPEND ..\..\src\generic\dirctrlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_printps.obj : .AUTODEPEND ..\..\src\generic\printps.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_selstore.obj : .AUTODEPEND ..\..\src\generic\selstore.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_spinctlg.obj : .AUTODEPEND ..\..\src\generic\spinctlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -$(OBJS)\corelib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_imaglist.obj : .AUTODEPEND ..\..\src\generic\imaglist.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_app.obj : .AUTODEPEND ..\..\src\os2\app.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_bitmap.obj : .AUTODEPEND ..\..\src\os2\bitmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_brush.obj : .AUTODEPEND ..\..\src\os2\brush.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_clipbrd.obj : .AUTODEPEND ..\..\src\os2\clipbrd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_colour.obj : .AUTODEPEND ..\..\src\os2\colour.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_cursor.obj : .AUTODEPEND ..\..\src\os2\cursor.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_data.obj : .AUTODEPEND ..\..\src\os2\data.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dataobj.obj : .AUTODEPEND ..\..\src\os2\dataobj.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dc.obj : .AUTODEPEND ..\..\src\os2\dc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dcclient.obj : .AUTODEPEND ..\..\src\os2\dcclient.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dcmemory.obj : .AUTODEPEND ..\..\src\os2\dcmemory.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dcprint.obj : .AUTODEPEND ..\..\src\os2\dcprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dcscreen.obj : .AUTODEPEND ..\..\src\os2\dcscreen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dnd.obj : .AUTODEPEND ..\..\src\os2\dnd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_evtloop.obj : .AUTODEPEND ..\..\src\os2\evtloop.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_filedlg.obj : .AUTODEPEND ..\..\src\os2\filedlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_font.obj : .AUTODEPEND ..\..\src\os2\font.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fontdlg.obj : .AUTODEPEND ..\..\src\os2\fontdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fontenum.obj : .AUTODEPEND ..\..\src\os2\fontenum.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fontutil.obj : .AUTODEPEND ..\..\src\os2\fontutil.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_frame.obj : .AUTODEPEND ..\..\src\os2\frame.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_gdiimage.obj : .AUTODEPEND ..\..\src\os2\gdiimage.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_gsockpm.obj : .AUTODEPEND ..\..\src\os2\gsockpm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_helpwin.obj : .AUTODEPEND ..\..\src\os2\helpwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_icon.obj : .AUTODEPEND ..\..\src\os2\icon.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_iniconf.obj : .AUTODEPEND ..\..\src\os2\iniconf.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_main.obj : .AUTODEPEND ..\..\src\os2\main.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_menuitem.obj : .AUTODEPEND ..\..\src\os2\menuitem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_metafile.obj : .AUTODEPEND ..\..\src\os2\metafile.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msgdlg.obj : .AUTODEPEND ..\..\src\os2\msgdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_nativdlg.obj : .AUTODEPEND ..\..\src\os2\nativdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\os2\ownerdrw.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_palette.obj : .AUTODEPEND ..\..\src\os2\palette.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_pen.obj : .AUTODEPEND ..\..\src\os2\pen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_popupwin.obj : .AUTODEPEND ..\..\src\os2\popupwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_print.obj : .AUTODEPEND ..\..\src\os2\print.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_region.obj : .AUTODEPEND ..\..\src\os2\region.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_settings.obj : .AUTODEPEND ..\..\src\os2\settings.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_spinctrl.obj : .AUTODEPEND ..\..\src\os2\spinctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_tabctrl.obj : .AUTODEPEND ..\..\src\os2\tabctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_timer.obj : .AUTODEPEND ..\..\src\os2\timer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_tooltip.obj : .AUTODEPEND ..\..\src\os2\tooltip.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_toplevel.obj : .AUTODEPEND ..\..\src\os2\toplevel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_utilsgui.obj : .AUTODEPEND ..\..\src\os2\utilsgui.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_window.obj : .AUTODEPEND ..\..\src\os2\window.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_tabg.obj : .AUTODEPEND ..\..\src\generic\tabg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_colschem.obj : .AUTODEPEND ..\..\src\univ\colschem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_winuniv.obj : .AUTODEPEND ..\..\src\univ\winuniv.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -!ifeq USE_GUI 1 -$(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_accel.obj : .AUTODEPEND ..\..\src\os2\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_bmpbuttn.obj : .AUTODEPEND ..\..\src\os2\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_button.obj : .AUTODEPEND ..\..\src\os2\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_checkbox.obj : .AUTODEPEND ..\..\src\os2\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_checklst.obj : .AUTODEPEND ..\..\src\os2\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_choice.obj : .AUTODEPEND ..\..\src\os2\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_combobox.obj : .AUTODEPEND ..\..\src\os2\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_control.obj : .AUTODEPEND ..\..\src\os2\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_dialog.obj : .AUTODEPEND ..\..\src\os2\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\os2\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_listbox.obj : .AUTODEPEND ..\..\src\os2\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_menu.obj : .AUTODEPEND ..\..\src\os2\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_notebook.obj : .AUTODEPEND ..\..\src\os2\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_radiobox.obj : .AUTODEPEND ..\..\src\os2\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_radiobut.obj : .AUTODEPEND ..\..\src\os2\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_scrolbar.obj : .AUTODEPEND ..\..\src\os2\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\os2\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_spinbutt.obj : .AUTODEPEND ..\..\src\os2\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_statbmp.obj : .AUTODEPEND ..\..\src\os2\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_statbox.obj : .AUTODEPEND ..\..\src\os2\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_statline.obj : .AUTODEPEND ..\..\src\os2\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_stattext.obj : .AUTODEPEND ..\..\src\os2\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\os2\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_tglbtn.obj : .AUTODEPEND ..\..\src\os2\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\os2\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -$(OBJS)\corelib_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_anidecod.obj : .AUTODEPEND ..\..\src\common\anidecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_appcmn.obj : .AUTODEPEND ..\..\src\common\appcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_artprov.obj : .AUTODEPEND ..\..\src\common\artprov.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_artstd.obj : .AUTODEPEND ..\..\src\common\artstd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_clrpickercmn.obj : .AUTODEPEND ..\..\src\common\clrpickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cmndata.obj : .AUTODEPEND ..\..\src\common\cmndata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_containr.obj : .AUTODEPEND ..\..\src\common\containr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cshelp.obj : .AUTODEPEND ..\..\src\common\cshelp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_ctrlcmn.obj : .AUTODEPEND ..\..\src\common\ctrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_ctrlsub.obj : .AUTODEPEND ..\..\src\common\ctrlsub.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_datacmn.obj : .AUTODEPEND ..\..\src\common\datacmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcbase.obj : .AUTODEPEND ..\..\src\common\dcbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dndcmn.obj : .AUTODEPEND ..\..\src\common\dndcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dobjcmn.obj : .AUTODEPEND ..\..\src\common\dobjcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_docmdi.obj : .AUTODEPEND ..\..\src\common\docmdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_docview.obj : .AUTODEPEND ..\..\src\common\docview.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dpycmn.obj : .AUTODEPEND ..\..\src\common\dpycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dseldlg.obj : .AUTODEPEND ..\..\src\common\dseldlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filepickercmn.obj : .AUTODEPEND ..\..\src\common\filepickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontpickercmn.obj : .AUTODEPEND ..\..\src\common\fontpickercmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fldlgcmn.obj : .AUTODEPEND ..\..\src\common\fldlgcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gaugecmn.obj : .AUTODEPEND ..\..\src\common\gaugecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gbsizer.obj : .AUTODEPEND ..\..\src\common\gbsizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gdicmn.obj : .AUTODEPEND ..\..\src\common\gdicmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_geometry.obj : .AUTODEPEND ..\..\src\common\geometry.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_iconbndl.obj : .AUTODEPEND ..\..\src\common\iconbndl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagall.obj : .AUTODEPEND ..\..\src\common\imagall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagbmp.obj : .AUTODEPEND ..\..\src\common\imagbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_image.obj : .AUTODEPEND ..\..\src\common\image.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagfill.obj : .AUTODEPEND ..\..\src\common\imagfill.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imaggif.obj : .AUTODEPEND ..\..\src\common\imaggif.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagiff.obj : .AUTODEPEND ..\..\src\common\imagiff.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagjpeg.obj : .AUTODEPEND ..\..\src\common\imagjpeg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagpcx.obj : .AUTODEPEND ..\..\src\common\imagpcx.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagpng.obj : .AUTODEPEND ..\..\src\common\imagpng.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagpnm.obj : .AUTODEPEND ..\..\src\common\imagpnm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagtga.obj : .AUTODEPEND ..\..\src\common\imagtga.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagtiff.obj : .AUTODEPEND ..\..\src\common\imagtiff.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagxpm.obj : .AUTODEPEND ..\..\src\common\imagxpm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_layout.obj : .AUTODEPEND ..\..\src\common\layout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_popupcmn.obj : .AUTODEPEND ..\..\src\common\popupcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_treebase.obj : .AUTODEPEND ..\..\src\common\treebase.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_valgen.obj : .AUTODEPEND ..\..\src\common\valgen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_validate.obj : .AUTODEPEND ..\..\src\common\validate.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_valtext.obj : .AUTODEPEND ..\..\src\common\valtext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dirctrlg.obj : .AUTODEPEND ..\..\src\generic\dirctrlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_printps.obj : .AUTODEPEND ..\..\src\generic\printps.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_selstore.obj : .AUTODEPEND ..\..\src\generic\selstore.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_spinctlg.obj : .AUTODEPEND ..\..\src\generic\spinctlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -$(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_sashwin.obj : .AUTODEPEND ..\..\src\generic\sashwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_sound.obj : .AUTODEPEND ..\..\src\os2\sound.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_sashwin.obj : .AUTODEPEND ..\..\src\generic\sashwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_sound.obj : .AUTODEPEND ..\..\src\os2\sound.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\mediadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< - -$(OBJS)\mediadll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< - -$(OBJS)\medialib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< - -$(OBJS)\medialib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< - -$(OBJS)\htmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpctrl.obj : .AUTODEPEND ..\..\src\html\helpctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpdata.obj : .AUTODEPEND ..\..\src\html\helpdata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmlfilt.obj : .AUTODEPEND ..\..\src\html\htmlfilt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmlpars.obj : .AUTODEPEND ..\..\src\html\htmlpars.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmltag.obj : .AUTODEPEND ..\..\src\html\htmltag.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmlwin.obj : .AUTODEPEND ..\..\src\html\htmlwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmprint.obj : .AUTODEPEND ..\..\src\html\htmprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_dflist.obj : .AUTODEPEND ..\..\src\html\m_dflist.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_fonts.obj : .AUTODEPEND ..\..\src\html\m_fonts.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_hline.obj : .AUTODEPEND ..\..\src\html\m_hline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_image.obj : .AUTODEPEND ..\..\src\html\m_image.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_layout.obj : .AUTODEPEND ..\..\src\html\m_layout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_links.obj : .AUTODEPEND ..\..\src\html\m_links.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpctrl.obj : .AUTODEPEND ..\..\src\html\helpctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpdata.obj : .AUTODEPEND ..\..\src\html\helpdata.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmlfilt.obj : .AUTODEPEND ..\..\src\html\htmlfilt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmlpars.obj : .AUTODEPEND ..\..\src\html\htmlpars.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmltag.obj : .AUTODEPEND ..\..\src\html\htmltag.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmlwin.obj : .AUTODEPEND ..\..\src\html\htmlwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmprint.obj : .AUTODEPEND ..\..\src\html\htmprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_dflist.obj : .AUTODEPEND ..\..\src\html\m_dflist.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_fonts.obj : .AUTODEPEND ..\..\src\html\m_fonts.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_hline.obj : .AUTODEPEND ..\..\src\html\m_hline.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_image.obj : .AUTODEPEND ..\..\src\html\m_image.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_layout.obj : .AUTODEPEND ..\..\src\html\m_layout.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_links.obj : .AUTODEPEND ..\..\src\html\m_links.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\qadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(QADLL_CXXFLAGS) $< - -$(OBJS)\qadll_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(QADLL_CXXFLAGS) $< - -$(OBJS)\qadll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(QADLL_CXXFLAGS) $< - -$(OBJS)\qalib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(QALIB_CXXFLAGS) $< - -$(OBJS)\qalib_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(QALIB_CXXFLAGS) $< - -$(OBJS)\qalib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(QALIB_CXXFLAGS) $< - -$(OBJS)\xmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< - -$(OBJS)\xmldll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< - -$(OBJS)\xmldll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< - -$(OBJS)\xmllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< - -$(OBJS)\xmllib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< - -$(OBJS)\xmllib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< - -$(OBJS)\xrcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bmpcbox.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_choicbk.obj : .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_clrpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bmpcbox.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_choicbk.obj : .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_clrpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\auidll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\richtextdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\stcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stcdll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stcdll_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stcdll_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< - -$(OBJS)\stclib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< - -$(OBJS)\stclib_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< - -$(OBJS)\stclib_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< - -$(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< - -$(OBJS)\gldll_glcmn.obj : .AUTODEPEND ..\..\src\common\glcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< - -$(OBJS)\gldll_glcanvas.obj : .AUTODEPEND ..\..\src\os2\glcanvas.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< - -$(OBJS)\gllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(GLLIB_CXXFLAGS) $< - -$(OBJS)\gllib_glcmn.obj : .AUTODEPEND ..\..\src\common\glcmn.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(GLLIB_CXXFLAGS) $< - -$(OBJS)\gllib_glcanvas.obj : .AUTODEPEND ..\..\src\os2\glcanvas.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(GLLIB_CXXFLAGS) $< - diff --git a/build/script/rebuild-makefiles.sh b/build/script/rebuild-makefiles.sh index 7dafec203a..85153996c9 100755 --- a/build/script/rebuild-makefiles.sh +++ b/build/script/rebuild-makefiles.sh @@ -63,8 +63,6 @@ package_makefiles() do_package zip msvc6prj '*.dsp' '*.dsw' do_package zip msvc7-8prj '*.vcproj' '*.sln' do_package zip evcprj '*.vcp' '*.vcw' - (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen -f watcom -d ../os2/Bakefiles.os2.bkgen) - do_package zip watcom_os2 makefile.wat config.wat } copy_files () diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss index 4fee20f424..be3ad42a07 100644 --- a/build/tools/wxwidgets.iss +++ b/build/tools/wxwidgets.iss @@ -44,7 +44,7 @@ SolidCompression=yes [Files] ; source files -Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,msdos,os2,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Excludes: "cocoa,dfb,gtk,gtk1,motif,msdos,osx,wxWindows.xcod*,x11,distrib"; Flags: ignoreversion recursesubdirs createallsubdirs [INI] Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org" diff --git a/build/update-setup-h b/build/update-setup-h index 48efdd89cf..805ae2e11b 100755 --- a/build/update-setup-h +++ b/build/update-setup-h @@ -100,7 +100,6 @@ update_common_setup_h include/wx/msw/setup0.h update_common_setup_h include/wx/msw/wince/setup.h update_common_setup_h include/wx/gtk/setup0.h update_common_setup_h include/wx/osx/setup0.h -update_common_setup_h include/wx/os2/setup0.h update_common_setup_h include/wx/univ/setup0.h update_common_setup_h setup.h.in diff --git a/configure b/configure index 5eb0d307ab..b314841c5e 100755 --- a/configure +++ b/configure @@ -709,9 +709,6 @@ COND_TOOLKIT_WINCE_WXUNIV_0 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE -COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 -COND_TOOLKIT_PM_USE_GUI_1 -COND_TOOLKIT_PM COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_OSX_IPHONE_USE_GUI_1 COND_TOOLKIT_OSX_IPHONE @@ -889,7 +886,6 @@ DLLIMP_SUFFIX SO_SUFFIX_MODULE SO_SUFFIX PLATFORM_BEOS -PLATFORM_OS2 PLATFORM_MACOSX PLATFORM_MACOS PLATFORM_MAC @@ -1088,7 +1084,6 @@ with_mac with_old_cocoa with_wine with_msw -with_pm with_directfb with_microwin with_x11 @@ -1131,7 +1126,6 @@ enable_mslu enable_utf8 enable_utf8only enable_extended_rtti -enable_omf enable_optimise enable_profile enable_no_rtti @@ -2062,7 +2056,6 @@ Optional Features: --enable-utf8 use UTF-8 representation for strings (Unix only) --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) --enable-extended_rtti use extended RTTI (XTI) - --enable-omf use OMF object format --disable-optimise compile without optimisations --enable-profile create code with profiling information --enable-no_rtti create code without RTTI information @@ -2291,7 +2284,6 @@ Optional Features: --disable-gtktest do not try to compile and run a test GTK+ program --disable-gtktest Do not try to compile and run a test GTK program --disable-sdltest Do not try to compile and run a test SDL program - --enable-omf use OMF object format (OS/2) --disable-dependency-tracking don't use dependency tracking even if the compiler can @@ -2317,7 +2309,6 @@ Optional Packages: --with-old_cocoa use old, deprecated, Cocoa port --with-wine use Wine --with-msw use MS-Windows - --with-pm use OS/2 Presentation Manager --with-directfb use DirectFB --with-microwin use MicroWindows --with-x11 use X11 @@ -2706,6 +2697,37 @@ fi } # ac_fn_cxx_try_link +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_run LINENO # ---------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -2748,37 +2770,6 @@ fi } # ac_fn_c_try_run -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES # --------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -3820,7 +3811,6 @@ wx_top_builddir="`pwd`" USE_UNIX=1 -USE_OS2=0 USE_WIN32=0 USE_DOS=0 USE_BEOS=0 @@ -3841,7 +3831,7 @@ USE_ALPHA= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB" +ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW X11 DFB" DEFAULT_wxUSE_OLD_COCOA=0 DEFAULT_wxUSE_GTK=0 @@ -3851,7 +3841,6 @@ DEFAULT_wxUSE_OSX_IPHONE=0 DEFAULT_wxUSE_MICROWIN=0 DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MSW=0 -DEFAULT_wxUSE_PM=0 DEFAULT_wxUSE_X11=0 DEFAULT_wxUSE_DFB=0 @@ -3863,7 +3852,6 @@ DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0 DEFAULT_DEFAULT_wxUSE_MICROWIN=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 DEFAULT_DEFAULT_wxUSE_MSW=0 -DEFAULT_DEFAULT_wxUSE_PM=0 DEFAULT_DEFAULT_wxUSE_X11=0 DEFAULT_DEFAULT_wxUSE_DFB=0 @@ -4038,34 +4026,6 @@ case "${host}" in PROGRAM_EXT=".exe" ;; - *-pc-os2_emx | *-pc-os2-emx ) - $as_echo "#define __EMX__ 1" >>confdefs.h - - USE_OS2=1 - $as_echo "#define __OS2__ 1" >>confdefs.h - - PROGRAM_EXT=".exe" - DEFAULT_DEFAULT_wxUSE_PM=1 - CXX=gcc - LDFLAGS="$LDFLAGS -Zcrtdll" - ac_executable_extensions=".exe" - export ac_executable_extensions - ac_save_IFS="$IFS" - IFS='\\' - ac_TEMP_PATH= - for ac_dir in $PATH; do - IFS=$ac_save_IFS - if test -z "$ac_TEMP_PATH"; then - ac_TEMP_PATH="$ac_dir" - else - ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir" - fi - done - export PATH="$ac_TEMP_PATH" - unset ac_TEMP_PATH - DEFAULT_STD_FLAG=no - ;; - arm-apple-darwin*) USE_BSD=1 USE_DARWIN=1 @@ -4562,12 +4522,6 @@ if test "${with_msw+set}" = set; then : fi -# Check whether --with-pm was given. -if test "${with_pm+set}" = set; then : - withval=$with_pm; wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1 -fi - - # Check whether --with-directfb was given. if test "${with_directfb+set}" = set; then : withval=$with_directfb; wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1 @@ -4722,11 +4676,6 @@ if test "$wxUSE_GUI" = "yes"; then + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \ + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - esac - case "$NUM_TOOLKITS" in 1) ;; @@ -6322,53 +6271,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 $as_echo "$result" >&6; } -if test "$USE_OS2" = 1; then - DEFAULT_wxUSE_OMF=no - - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-omf" >&5 -$as_echo_n "checking for --${enablestring:-enable}-omf... " >&6; } - # Check whether --enable-omf was given. -if test "${enable_omf+set}" = set; then : - enableval=$enable_omf; - if test "$enableval" = yes; then - wx_cv_use_omf='wxUSE_OMF=yes' - else - wx_cv_use_omf='wxUSE_OMF=no' - fi - -else - - wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" - -fi - - - eval "$wx_cv_use_omf" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_OMF = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_OMF - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 -$as_echo "$result" >&6; } - -fi enablestring=disable @@ -19763,117 +19665,6 @@ if test "$USE_UNIX" = 1 ; then fi -case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for drand48 in -lcExt" >&5 -$as_echo_n "checking for drand48 in -lcExt... " >&6; } -if ${ac_cv_lib_cExt_drand48+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcExt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char drand48 (); -int -main () -{ -return drand48 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cExt_drand48=yes -else - ac_cv_lib_cExt_drand48=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cExt_drand48" >&5 -$as_echo "$ac_cv_lib_cExt_drand48" >&6; } -if test "x$ac_cv_lib_cExt_drand48" = xyes; then : - LIBS="$LIBS -lcExt" -fi - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5 -$as_echo_n "checking for gcc/libc version... " >&6; } -if ${wx_cv_gccversion+:} false; then : - $as_echo_n "(cached) " >&6 -else - - if test "$cross_compiling" = yes; then : - wx_cv_gccversion="EMX2" - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - - int main() - { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, - #if (__GNUC__ < 3) - "EMX2" - #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) - "EMX3" - #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2) - "Innotek5" - #else - "Innotek6" - #endif - ); - exit(0); - } - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - wx_cv_gccversion=`cat conftestval` -else - wx_cv_gccversion="EMX2" -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gccversion" >&5 -$as_echo "$wx_cv_gccversion" >&6; } - if test "$wx_cv_gccversion" = "EMX2"; then - LIBS="$LIBS -lstdcpp" - LDFLAGS="$LDFLAGS -Zsysv-signals" - else - if test "$wx_cv_gccversion" = "EMX3"; then - LIBS="$LIBS -lstdcxx -lgcc" - LDFLAGS="$LDFLAGS -Zsysv-signals" - else - LIBS="$LIBS -lstdc++" - fi - fi - if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building DLLs requires OMF mode, enabled" >&5 -$as_echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;} - wxUSE_OMF=yes - enable_omf=yes - fi - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } @@ -20035,17 +19826,6 @@ done fi -case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - if test $ac_cv_header_langinfo_h = "yes" \ - -a \( "$wx_cv_gccversion" = "EMX2" \ - -o "$wx_cv_gccversion" = "EMX3" \ - -o "$wx_cv_gccversion" = "Innotek5" \); then - LIBS="$LIBS -lintl" - fi - ;; -esac - if test "$USE_UNIX" = 1 ; then for ac_header in sys/select.h do : @@ -26382,55 +26162,7 @@ $as_echo "none" >&6; } GUIDIST=COCOA_DIST fi - if test "$wxUSE_PM" = 1; then - TOOLKIT=PM - GUIDIST=PM_DIST - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type SPBCDATA" >&5 -$as_echo_n "checking for type SPBCDATA... " >&6; } -if ${wx_cv_spbcdata+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #define INCL_PM - #include - -int -main () -{ - - SPBCDATA test; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - wx_cv_spbcdata=yes -else - wx_cv_spbcdata=no - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_spbcdata" >&5 -$as_echo "$wx_cv_spbcdata" >&6; } - - if test $wx_cv_spbcdata = "yes"; then - $as_echo "#define HAVE_SPBCDATA 1" >>confdefs.h - - fi - fi - - if test "$TOOLKIT" = "PM" ; then - TOOLKIT_DIR="os2" - else TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'` - fi if test "$wxUSE_UNIVERSAL" = "yes"; then TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__" @@ -26455,7 +26187,7 @@ fi if test "$wxUSE_GUI" = "yes"; then - if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then + if test "$wxUSE_UNIX" = "yes"; then for ac_header in X11/Xlib.h do : ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" " @@ -29252,11 +28984,7 @@ if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" else WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" fi -if test "${TOOLKIT_DIR}" = "os2"; then - WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" -else - WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" -fi +WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" @@ -31823,7 +31551,7 @@ fi rm -f confcache -if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then +if test "$TOOLKIT" != "MSW"; then THREADS_LINK= @@ -32624,10 +32352,6 @@ $as_echo "$wx_cv_cflags_mthread" >&6; } CFLAGS="$CFLAGS_OLD" fi ;; - *-pc-os2*emx ) - WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__" - LDFLAGS="$LDFLAGS -Zmt" - ;; esac fi fi @@ -33113,14 +32837,7 @@ else fi else if test "$GCC" = yes ; then - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - OPTIMISE_CFLAGS="-O2" - ;; - *) - OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing" - ;; - esac + OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing" else OPTIMISE_CFLAGS="-O" fi @@ -33154,7 +32871,7 @@ if test "$wxUSE_UNIX" = "yes"; then fi -if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then +if test "$TOOLKIT" != "MSW"; then HAVE_DL_FUNCS=0 HAVE_SHL_FUNCS=0 @@ -35786,13 +35503,13 @@ fi if test "$wxUSE_METAFILE" = "yes"; then - if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_PM" != 1; then + if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMetafile is not available on this system... disabled" >&5 $as_echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;} wxUSE_METAFILE=no fi elif test "$wxUSE_METAFILE" = "auto"; then - if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then + if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1; then wxUSE_METAFILE=yes fi fi @@ -36414,16 +36131,11 @@ if test "$wxUSE_POPUPWIN" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5 $as_echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;} else - if test "$wxUSE_PM" = 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxPopupWindow not yet supported under PM... disabled" >&5 -$as_echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" >&2;} - else - $as_echo "#define wxUSE_POPUPWIN 1" >>confdefs.h + $as_echo "#define wxUSE_POPUPWIN 1" >>confdefs.h - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup" - USES_CONTROLS=1 - fi + USES_CONTROLS=1 fi fi @@ -36445,13 +36157,8 @@ $as_echo "$as_me: WARNING: Dialup manager not supported on this platform... disa fi if test "$wxUSE_TIPWINDOW" = "yes"; then - if test "$wxUSE_PM" = 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTipWindow not yet supported under PM... disabled" >&5 -$as_echo "$as_me: WARNING: wxTipWindow not yet supported under PM... disabled" >&2;} - else - $as_echo "#define wxUSE_TIPWINDOW 1" >>confdefs.h + $as_echo "#define wxUSE_TIPWINDOW 1" >>confdefs.h - fi fi if test "$USES_CONTROLS" = 1; then @@ -36958,7 +36665,7 @@ if test "$wxUSE_WIZARDDLG" = "yes"; then fi -if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then +if test "$wxUSE_MSW" = 1; then if test "$wxUSE_OWNER_DRAWN" = "yes"; then $as_echo "#define wxUSE_OWNER_DRAWN 1" >>confdefs.h @@ -37548,9 +37255,6 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll" fi fi - if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw" - fi else SAMPLES_SUBDIRS="console" if test "$wxUSE_SOCKETS" = "yes" ; then @@ -38464,7 +38168,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; } PLATFORM_MAC=0 PLATFORM_MACOS=0 PLATFORM_MACOSX=0 - PLATFORM_OS2=0 PLATFORM_BEOS=0 if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then @@ -38475,9 +38178,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; } *-pc-msdosdjgpp ) PLATFORM_MSDOS=1 ;; - *-pc-os2_emx | *-pc-os2-emx ) - PLATFORM_OS2=1 - ;; *-*-darwin* ) PLATFORM_MAC=1 PLATFORM_MACOSX=1 @@ -38501,9 +38201,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; } msdos ) PLATFORM_MSDOS=1 ;; - os2 ) - PLATFORM_OS2=1 - ;; darwin ) PLATFORM_MAC=1 PLATFORM_MACOSX=1 @@ -38529,13 +38226,6 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; } - - # Check whether --enable-omf was given. -if test "${enable_omf+set}" = set; then : - enableval=$enable_omf; bk_os2_use_omf="$enableval" -fi - - case "${BAKEFILE_HOST}" in *-*-darwin* ) if test "x$GCC" = "xyes"; then @@ -38548,19 +38238,6 @@ fi fi ;; - *-pc-os2_emx | *-pc-os2-emx ) - if test "x$bk_os2_use_omf" = "xyes" ; then - AR=emxomfar - RANLIB=: - LDFLAGS="-Zomf $LDFLAGS" - CFLAGS="-Zomf $CFLAGS" - CXXFLAGS="-Zomf $CXXFLAGS" - OS2_LIBEXT="lib" - else - OS2_LIBEXT="a" - fi - ;; - i*86-*-beos* ) LDFLAGS="-L/boot/develop/lib/x86 $LDFLAGS" ;; @@ -38609,16 +38286,6 @@ fi DLLPREFIX="" dlldir="$bindir" ;; - *-pc-os2_emx | *-pc-os2-emx ) - SO_SUFFIX="dll" - SO_SUFFIX_MODULE="dll" - DLLIMP_SUFFIX=$OS2_LIBEXT - EXEEXT=".exe" - DLLPREFIX="" - LIBPREFIX="" - LIBEXT=".$OS2_LIBEXT" - dlldir="$bindir" - ;; *-*-darwin* ) SO_SUFFIX="dylib" SO_SUFFIX_MODULE="bundle" @@ -38917,491 +38584,6 @@ fi WINDOWS_IMPLIB=1 ;; - *-pc-os2_emx | *-pc-os2-emx ) - SHARED_LD_CC="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - SHARED_LD_CXX="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - PIC_FLAG="" - -D='$' -cat <dllar.sh -#!/bin/sh -# -# dllar - a tool to build both a .dll and an .a file -# from a set of object (.o) files for EMX/OS2. -# -# Written by Andrew Zabolotny, bit@freya.etu.ru -# Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de -# -# This script will accept a set of files on the command line. -# All the public symbols from the .o files will be exported into -# a .DEF file, then linker will be run (through gcc) against them to -# build a shared library consisting of all given .o files. All libraries -# (.a) will be first decompressed into component .o files then act as -# described above. You can optionally give a description (-d "description") -# which will be put into .DLL. To see the list of accepted options (as well -# as command-line format) simply run this program without options. The .DLL -# is built to be imported by name (there is no guarantee that new versions -# of the library you build will have same ordinals for same symbols). -# -# dllar is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# dllar is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with dllar; see the file COPYING. If not, write to the Free -# Software Foundation, 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# To successfuly run this program you will need: -# - Current drive should have LFN support (HPFS, ext2, network, etc) -# (Sometimes dllar generates filenames which won't fit 8.3 scheme) -# - gcc -# (used to build the .dll) -# - emxexp -# (used to create .def file from .o files) -# - emximp -# (used to create .a file from .def file) -# - GNU text utilites (cat, sort, uniq) -# used to process emxexp output -# - GNU file utilities (mv, rm) -# - GNU sed -# - lxlite (optional, see flag below) -# (used for general .dll cleanup) -# - -flag_USE_LXLITE=1; - -# -# helper functions -# basnam, variant of basename, which does _not_ remove the path, _iff_ -# second argument (suffix to remove) is given -basnam(){ - case ${D}# in - 1) - echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//' - ;; - 2) - echo ${D}1 | sed 's/'${D}2'${D}//' - ;; - *) - echo "error in basnam ${D}*" - exit 8 - ;; - esac -} - -# Cleanup temporary files and output -CleanUp() { - cd ${D}curDir - for i in ${D}inputFiles ; do - case ${D}i in - *!) - rm -rf \`basnam ${D}i !\` - ;; - *) - ;; - esac - done - - # Kill result in case of failure as there is just to many stupid make/nmake - # things out there which doesn't do this. - if [ ${D}# -eq 0 ]; then - rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile - fi -} - -# Print usage and exit script with rc=1. -PrintHelp() { - echo 'Usage: dllar.sh [-o[utput] output_file] [-i[mport] importlib_name]' - echo ' [-name-mangler-script script.sh]' - echo ' [-d[escription] "dll descrption"] [-cc "CC"] [-f[lags] "CFLAGS"]' - echo ' [-ord[inals]] -ex[clude] "symbol(s)"' - echo ' [-libf[lags] "{INIT|TERM}{GLOBAL|INSTANCE}"] [-nocrt[dll]] [-nolxl[ite]]' - echo ' [*.o] [*.a]' - echo '*> "output_file" should have no extension.' - echo ' If it has the .o, .a or .dll extension, it is automatically removed.' - echo ' The import library name is derived from this and is set to "name".a,' - echo ' unless overridden by -import' - echo '*> "importlib_name" should have no extension.' - echo ' If it has the .o, or .a extension, it is automatically removed.' - echo ' This name is used as the import library name and may be longer and' - echo ' more descriptive than the DLL name which has to follow the old ' - echo ' 8.3 convention of FAT.' - echo '*> "script.sh may be given to override the output_file name by a' - echo ' different name. It is mainly useful if the regular make process' - echo ' of some package does not take into account OS/2 restriction of' - echo ' DLL name lengths. It takes the importlib name as input and is' - echo ' supposed to procude a shorter name as output. The script should' - echo ' expect to get importlib_name without extension and should produce' - echo ' a (max.) 8 letter name without extension.' - echo '*> "cc" is used to use another GCC executable. (default: gcc.exe)' - echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)' - echo ' These flags will be put at the start of GCC command line.' - echo '*> -ord[inals] tells dllar to export entries by ordinals. Be careful.' - echo '*> -ex[clude] defines symbols which will not be exported. You can define' - echo ' multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".' - echo ' If the last character of a symbol is "*", all symbols beginning' - echo ' with the prefix before "*" will be exclude, (see _GLOBAL* above).' - echo '*> -libf[lags] can be used to add INITGLOBAL/INITINSTANCE and/or' - echo ' TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.' - echo '*> -nocrt[dll] switch will disable linking the library against emx''s' - echo ' C runtime DLLs.' - echo '*> -nolxl[ite] switch will disable running lxlite on the resulting DLL.' - echo '*> All other switches (for example -L./ or -lmylib) will be passed' - echo ' unchanged to GCC at the end of command line.' - echo '*> If you create a DLL from a library and you do not specify -o,' - echo ' the basename for DLL and import library will be set to library name,' - echo ' the initial library will be renamed to 'name'_s.a (_s for static)' - echo ' i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial' - echo ' library will be renamed into gcc_s.a.' - echo '--------' - echo 'Example:' - echo ' dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord' - echo ' -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"' - CleanUp - exit 1 -} - -# Execute a command. -# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script. -# @Uses Whatever CleanUp() uses. -doCommand() { - echo "${D}*" - eval ${D}* - rcCmd=${D}? - - if [ ${D}rcCmd -ne 0 ]; then - echo "command failed, exit code="${D}rcCmd - CleanUp - exit ${D}rcCmd - fi -} - -# main routine -# setup globals -cmdLine=${D}* -outFile="" -outimpFile="" -inputFiles="" -renameScript="" -description="" -CC=gcc.exe -CFLAGS="-s -Zcrtdll" -EXTRA_CFLAGS="" -EXPORT_BY_ORDINALS=0 -exclude_symbols="" -library_flags="" -curDir=\`pwd\` -curDirS=curDir -case ${D}curDirS in -*/) - ;; -*) - curDirS=${D}{curDirS}"/" - ;; -esac -# Parse commandline -libsToLink=0 -omfLinking=0 -while [ ${D}1 ]; do - case ${D}1 in - -ord*) - EXPORT_BY_ORDINALS=1; - ;; - -o*) - shift - outFile=${D}1 - ;; - -i*) - shift - outimpFile=${D}1 - ;; - -name-mangler-script) - shift - renameScript=${D}1 - ;; - -d*) - shift - description=${D}1 - ;; - -f*) - shift - CFLAGS=${D}1 - ;; - -c*) - shift - CC=${D}1 - ;; - -h*) - PrintHelp - ;; - -ex*) - shift - exclude_symbols=${D}{exclude_symbols}${D}1" " - ;; - -libf*) - shift - library_flags=${D}{library_flags}${D}1" " - ;; - -nocrt*) - CFLAGS="-s" - ;; - -nolxl*) - flag_USE_LXLITE=0 - ;; - -* | /*) - case ${D}1 in - -L* | -l*) - libsToLink=1 - ;; - -Zomf) - omfLinking=1 - ;; - *) - ;; - esac - EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1 - ;; - *.dll) - EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`" - if [ ${D}omfLinking -eq 1 ]; then - EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib" - else - EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a" - fi - ;; - *) - found=0; - if [ ${D}libsToLink -ne 0 ]; then - EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1 - else - for file in ${D}1 ; do - if [ -f ${D}file ]; then - inputFiles="${D}{inputFiles} ${D}file" - found=1 - fi - done - if [ ${D}found -eq 0 ]; then - echo "ERROR: No file(s) found: "${D}1 - exit 8 - fi - fi - ;; - esac - shift -done # iterate cmdline words - -# -if [ -z "${D}inputFiles" ]; then - echo "dllar: no input files" - PrintHelp -fi - -# Now extract all .o files from .a files -newInputFiles="" -for file in ${D}inputFiles ; do - case ${D}file in - *.a | *.lib) - case ${D}file in - *.a) - suffix=".a" - AR="ar" - ;; - *.lib) - suffix=".lib" - AR="emxomfar" - EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf" - ;; - *) - ;; - esac - dirname=\`basnam ${D}file ${D}suffix\`"_%" - mkdir ${D}dirname - if [ ${D}? -ne 0 ]; then - echo "Failed to create subdirectory ./${D}dirname" - CleanUp - exit 8; - fi - # Append '!' to indicate archive - newInputFiles="${D}newInputFiles ${D}{dirname}!" - doCommand "cd ${D}dirname; ${D}AR x ../${D}file" - cd ${D}curDir - found=0; - for subfile in ${D}dirname/*.o* ; do - if [ -f ${D}subfile ]; then - found=1 - if [ -s ${D}subfile ]; then - # FIXME: This should be: is file size > 32 byte, _not_ > 0! - newInputFiles="${D}newInputFiles ${D}subfile" - fi - fi - done - if [ ${D}found -eq 0 ]; then - echo "WARNING: there are no files in archive \\'${D}file\\'" - fi - ;; - *) - newInputFiles="${D}{newInputFiles} ${D}file" - ;; - esac -done -inputFiles="${D}newInputFiles" - -# Output filename(s). -do_backup=0; -if [ -z ${D}outFile ]; then - do_backup=1; - set outFile ${D}inputFiles; outFile=${D}2 -fi - -# If it is an archive, remove the '!' and the '_%' suffixes -case ${D}outFile in -*_%!) - outFile=\`basnam ${D}outFile _%!\` - ;; -*) - ;; -esac -case ${D}outFile in -*.dll) - outFile=\`basnam ${D}outFile .dll\` - ;; -*.DLL) - outFile=\`basnam ${D}outFile .DLL\` - ;; -*.o) - outFile=\`basnam ${D}outFile .o\` - ;; -*.obj) - outFile=\`basnam ${D}outFile .obj\` - ;; -*.a) - outFile=\`basnam ${D}outFile .a\` - ;; -*.lib) - outFile=\`basnam ${D}outFile .lib\` - ;; -*) - ;; -esac -case ${D}outimpFile in -*.a) - outimpFile=\`basnam ${D}outimpFile .a\` - ;; -*.lib) - outimpFile=\`basnam ${D}outimpFile .lib\` - ;; -*) - ;; -esac -if [ -z ${D}outimpFile ]; then - outimpFile=${D}outFile -fi -defFile="${D}{outFile}.def" -arcFile="${D}{outimpFile}.a" -arcFile2="${D}{outimpFile}.lib" - -#create ${D}dllFile as something matching 8.3 restrictions, -if [ -z ${D}renameScript ] ; then - dllFile="${D}outFile" -else - dllFile=\`${D}renameScript ${D}outimpFile\` -fi - -if [ ${D}do_backup -ne 0 ] ; then - if [ -f ${D}arcFile ] ; then - doCommand "mv ${D}arcFile ${D}{outFile}_s.a" - fi - if [ -f ${D}arcFile2 ] ; then - doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib" - fi -fi - -# Extract public symbols from all the object files. -tmpdefFile=${D}{defFile}_% -rm -f ${D}tmpdefFile -for file in ${D}inputFiles ; do - case ${D}file in - *!) - ;; - *) - doCommand "emxexp -u ${D}file >> ${D}tmpdefFile" - ;; - esac -done - -# Create the def file. -rm -f ${D}defFile -echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile -dllFile="${D}{dllFile}.dll" -if [ ! -z ${D}description ]; then - echo "DESCRIPTION \\"${D}{description}\\"" >> ${D}defFile -fi -echo "EXPORTS" >> ${D}defFile - -doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%" -grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile - -# Checks if the export is ok or not. -for word in ${D}exclude_symbols; do - grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}% - mv ${D}{tmpdefFile}% ${D}tmpdefFile -done - - -if [ ${D}EXPORT_BY_ORDINALS -ne 0 ]; then - sed "=" < ${D}tmpdefFile | \\ - sed ' - N - : loop - s/^\\([0-9]\\+\\)\\([^;]*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/ - t loop - ' > ${D}{tmpdefFile}% - grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile -else - rm -f ${D}{tmpdefFile}% -fi -cat ${D}tmpdefFile >> ${D}defFile -rm -f ${D}tmpdefFile - -# Do linking, create implib, and apply lxlite. -gccCmdl=""; -for file in ${D}inputFiles ; do - case ${D}file in - *!) - ;; - *) - gccCmdl="${D}gccCmdl ${D}file" - ;; - esac -done -doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS" -touch "${D}{outFile}.dll" - -doCommand "emximp -o ${D}arcFile ${D}defFile" -if [ ${D}flag_USE_LXLITE -ne 0 ]; then - add_flags=""; - if [ ${D}EXPORT_BY_ORDINALS -ne 0 ]; then - add_flags="-ynd" - fi - doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile" -fi -doCommand "emxomf -s -l ${D}arcFile" - -# Successful exit. -CleanUp 1 -exit 0 -EOF - - chmod +x dllar.sh - ;; - powerpc-apple-macos* | \ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ *-*-mirbsd* | \ @@ -40733,21 +39915,6 @@ EOF COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_PM="#" - if test "x$TOOLKIT" = "xPM" ; then - COND_TOOLKIT_PM="" - fi - - COND_TOOLKIT_PM_USE_GUI_1="#" - if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_PM_USE_GUI_1="" - fi - - COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="" - fi - COND_TOOLKIT_WINCE="#" if test "x$TOOLKIT" = "xWINCE" ; then COND_TOOLKIT_WINCE="" @@ -41062,15 +40229,7 @@ fi else MACSETFILE="@true" - - if test "$wxUSE_PM" = 1; then - RESCOMP="emxbind" - WXCONFIG_RESFLAGS="-ep" - - POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS" - else - POSTLINK_COMMAND="@true" - fi + POSTLINK_COMMAND="@true" fi fi @@ -41105,26 +40264,6 @@ if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then fi fi -if test "$wxUSE_SHARED" = "yes"; then - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - SHARED_LD_CXX="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - cp -p ${srcdir}/src/os2/dllnames.sh . - cp -p ${srcdir}/src/os2/dllar.sh . - ;; - esac -fi -if test "$wxUSE_OMF" = "yes"; then - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - LDFLAGS="$LDFLAGS -Zlinker /EXEPACK" - LDFLAGS_GUI="-Zlinker /PMTYPE:PM" - WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM" - ;; - esac -fi - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" diff --git a/configure.in b/configure.in index 98fd07171f..e2b417616c 100644 --- a/configure.in +++ b/configure.in @@ -62,7 +62,6 @@ dnl ------------------------------------------------------------------------ dnl OS (assume Unix) USE_UNIX=1 -USE_OS2=0 USE_WIN32=0 USE_DOS=0 USE_BEOS=0 @@ -100,7 +99,7 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0 dnl the list of all available toolkits dnl dnl update NUM_TOOLKITS calculation below when adding a new toolkit here! -ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB" +ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW X11 DFB" dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones dnl which are either yes or no @@ -112,7 +111,6 @@ DEFAULT_wxUSE_OSX_IPHONE=0 DEFAULT_wxUSE_MICROWIN=0 DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MSW=0 -DEFAULT_wxUSE_PM=0 DEFAULT_wxUSE_X11=0 DEFAULT_wxUSE_DFB=0 @@ -127,7 +125,6 @@ DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0 DEFAULT_DEFAULT_wxUSE_MICROWIN=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 DEFAULT_DEFAULT_wxUSE_MSW=0 -DEFAULT_DEFAULT_wxUSE_PM=0 DEFAULT_DEFAULT_wxUSE_X11=0 DEFAULT_DEFAULT_wxUSE_DFB=0 @@ -283,40 +280,6 @@ case "${host}" in PROGRAM_EXT=".exe" ;; - *-pc-os2_emx | *-pc-os2-emx ) - AC_DEFINE(__EMX__) - USE_OS2=1 - AC_DEFINE(__OS2__) - PROGRAM_EXT=".exe" - DEFAULT_DEFAULT_wxUSE_PM=1 - dnl "c++" wrapper is not always available, so always use plain gcc. - CXX=gcc - LDFLAGS="$LDFLAGS -Zcrtdll" - dnl - dnl Some special code that's automatically added by autoconf-2.57 for OS/2 - dnl and hopefully also by autoconf-2.58 and newer on all other platforms. - dnl For now however, we still need it to make sure the configure script - dnl works on OS/2 no matter what platform it is generated on. - ac_executable_extensions=".exe" - export ac_executable_extensions - dnl This strange code is necessary to deal with handling of - dnl backslashes by ksh and pdksh's sh variant. - ac_save_IFS="$IFS" - IFS='\\' - ac_TEMP_PATH= - for ac_dir in $PATH; do - IFS=$ac_save_IFS - if test -z "$ac_TEMP_PATH"; then - ac_TEMP_PATH="$ac_dir" - else - ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir" - fi - done - export PATH="$ac_TEMP_PATH" - unset ac_TEMP_PATH - DEFAULT_STD_FLAG=no - ;; - arm-apple-darwin*) dnl iPhone USE_BSD=1 @@ -476,7 +439,6 @@ AC_ARG_WITH(mac, [ --with-mac same as --with-osx], [wxUS AC_ARG_WITH(old_cocoa, [ --with-old_cocoa use old, deprecated, Cocoa port], [wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(wine, [ --with-wine use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1]) AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1]) -AC_ARG_WITH(pm, [ --with-pm use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(directfb, [ --with-directfb use DirectFB], [wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(microwin, [ --with-microwin use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1]) @@ -536,12 +498,6 @@ if test "$wxUSE_GUI" = "yes"; then + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \ + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` - dnl Allow wxUSE_PM only for OS/2 with EMX. - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - esac - case "$NUM_TOOLKITS" in 1) ;; @@ -698,10 +654,6 @@ WX_ARG_ENABLE(mslu, [ --enable-mslu use MS Layer for Unicode WX_ARG_ENABLE_PARAM(utf8, [ --enable-utf8 use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8) WX_ARG_ENABLE(utf8only, [ --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)], wxUSE_UNICODE_UTF8_LOCALE) WX_ARG_ENABLE(extended_rtti, [ --enable-extended_rtti use extended RTTI (XTI)], wxUSE_EXTENDED_RTTI) -if test "$USE_OS2" = 1; then - DEFAULT_wxUSE_OMF=no - WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF) -fi WX_ARG_DISABLE(optimise, [ --disable-optimise compile without optimisations], wxUSE_OPTIMISE) @@ -1446,77 +1398,6 @@ if test "$USE_UNIX" = 1 ; then AC_DEFINE(__UNIX__) fi -dnl This case is for OS/2 vs. everything else -case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - dnl --------------------------------------------------------------------- - dnl When we are using gcc on OS/2, we want to be either using resources - dnl (PM) or a more complete POSIX emulation for Motif/GTK+/X11. - dnl Moreover we need to link explicitly against either stdcpp.a or - dnl stdcxx.a (depending on compiler version), since we are using "gcc", - dnl not "g++/c++". - dnl --------------------------------------------------------------------- - dnl (OS/2-only piece) - if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then - dnl More complete Unix emulation for unix-like ports - dnl by linking in POSIX/2's cExt (if available). - AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt") - fi - dnl Check for the gcc version (and thereby for the C runtime library). - dnl wx_cv_gccversion = EMX2 -> Standard EMX environment - dnl wx_cv_gccversion = EMX3 -> EMX with gcc-3.0.3 or gcc-3.2.1 - dnl wx_cv_gccversion = Innotek5 -> gcc-3.2.2 with Innotek libc5 - dnl wx_cv_gccversion = Innotek6 -> gcc-3.3.5 with Innotek libc6. - AC_CACHE_CHECK([for gcc/libc version], wx_cv_gccversion,[ - AC_TRY_RUN( - dnl Check the gcc version macro. - [ - #include - - int main() - { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, - #if (__GNUC__ < 3) - "EMX2" - #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) - "EMX3" - #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2) - "Innotek5" - #else - "Innotek6" - #endif - ); - exit(0); - } - ], - wx_cv_gccversion=`cat conftestval`, - wx_cv_gccversion="EMX2", - dnl Compilation error: Assuming standard EMX environment - wx_cv_gccversion="EMX2" - ) - ]) - if test "$wx_cv_gccversion" = "EMX2"; then - LIBS="$LIBS -lstdcpp" - LDFLAGS="$LDFLAGS -Zsysv-signals" - else - if test "$wx_cv_gccversion" = "EMX3"; then - LIBS="$LIBS -lstdcxx -lgcc" - LDFLAGS="$LDFLAGS -Zsysv-signals" - else - LIBS="$LIBS -lstdc++" - fi - fi - if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then - AC_MSG_WARN([Building DLLs requires OMF mode, enabled]) - wxUSE_OMF=yes - enable_omf=yes - fi - dnl (end of OS/2-only piece) - ;; -esac - dnl ------------------------------------------------------------------------ dnl Check for headers dnl ------------------------------------------------------------------------ @@ -1530,19 +1411,6 @@ if test "$ac_cv_header_wchar_h" != "yes"; then AC_CHECK_HEADERS([wcstr.h],,, [AC_INCLUDES_DEFAULT()]) fi -case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - dnl Explicitly link -lintl if langinfo.h is available - dnl and intl not yet included in libc - if test $ac_cv_header_langinfo_h = "yes" \ - -a \( "$wx_cv_gccversion" = "EMX2" \ - -o "$wx_cv_gccversion" = "EMX3" \ - -o "$wx_cv_gccversion" = "Innotek5" \); then - LIBS="$LIBS -lintl" - fi - ;; -esac - if test "$USE_UNIX" = 1 ; then dnl POSIX needs this for select(), but old systems don't have it AC_CHECK_HEADERS([sys/select.h],,, [AC_INCLUDES_DEFAULT()]) @@ -3440,37 +3308,8 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config GUIDIST=COCOA_DIST fi - if test "$wxUSE_PM" = 1; then - TOOLKIT=PM - GUIDIST=PM_DIST - AC_CACHE_CHECK([for type SPBCDATA], - wx_cv_spbcdata, - [ - AC_TRY_COMPILE( - [ - #define INCL_PM - #include - ], - [ - SPBCDATA test; - ], - wx_cv_spbcdata=yes, - wx_cv_spbcdata=no - ) - ] - ) - - if test $wx_cv_spbcdata = "yes"; then - AC_DEFINE(HAVE_SPBCDATA) - fi - fi - dnl the name of the directory where the files for this toolkit live - if test "$TOOLKIT" = "PM" ; then - TOOLKIT_DIR="os2" - else - TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'` - fi + TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'` if test "$wxUSE_UNIVERSAL" = "yes"; then TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__" @@ -3506,7 +3345,7 @@ dnl --------------------------------------------------------------------------- dnl do this after test for X11 above so that we have a chance of finding Xlib.h if test "$wxUSE_GUI" = "yes"; then - if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then + if test "$wxUSE_UNIX" = "yes"; then dnl defines HAVE_X11_XKBLIB_H AC_CHECK_HEADERS([X11/Xlib.h],,, [ ]) AC_CHECK_HEADERS([X11/XKBlib.h],,, @@ -3861,11 +3700,7 @@ if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" else WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" fi -if test "${TOOLKIT_DIR}" = "os2"; then - WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" -else - WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" -fi +WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" @@ -4679,7 +4514,7 @@ dnl the next matching "else") dnl --------------------------------------------------------------------------- dnl under MSW (except mingw32) we always have thread support -if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then +if test "$TOOLKIT" != "MSW"; then dnl the code below: dnl @@ -5144,10 +4979,6 @@ else CFLAGS="$CFLAGS_OLD" fi ;; - *-pc-os2*emx ) - WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__" - LDFLAGS="$LDFLAGS -Zmt" - ;; esac fi fi @@ -5326,19 +5157,10 @@ else fi else if test "$GCC" = yes ; then - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - dnl Not all of the supported gcc versions understand - dnl -fstrict-aliasing and none actually needs it (yet). - OPTIMISE_CFLAGS="-O2" - ;; - *) - dnl Switch on optimisation but keep strict-aliasing off for - dnl now (see -fstrict-aliasing in the gcc manual). When it is - dnl switched back on consider using -Wstrict-aliasing=2. - OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing" - ;; - esac + dnl Switch on optimisation but keep strict-aliasing off for + dnl now (see -fstrict-aliasing in the gcc manual). When it is + dnl switched back on consider using -Wstrict-aliasing=2. + OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing" else OPTIMISE_CFLAGS="-O" fi @@ -5392,7 +5214,7 @@ dnl DLL support dnl ------------------------------------------------------------------------ dnl under MSW we always have LoadLibrary/GetProcAddress -if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then +if test "$TOOLKIT" != "MSW"; then HAVE_DL_FUNCS=0 HAVE_SHL_FUNCS=0 @@ -6489,12 +6311,12 @@ dnl wxMetafile dnl --------------------------------------------------------------------------- if test "$wxUSE_METAFILE" = "yes"; then - if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_PM" != 1; then + if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1; then AC_MSG_WARN([wxMetafile is not available on this system... disabled]) wxUSE_METAFILE=no fi elif test "$wxUSE_METAFILE" = "auto"; then - if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then + if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1; then wxUSE_METAFILE=yes fi fi @@ -7011,14 +6833,10 @@ if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_OLD_COCOA" = 1 ; then AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled]) else - if test "$wxUSE_PM" = 1; then - AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled]) - else - AC_DEFINE(wxUSE_POPUPWIN) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup" + AC_DEFINE(wxUSE_POPUPWIN) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup" - USES_CONTROLS=1 - fi + USES_CONTROLS=1 fi fi @@ -7037,11 +6855,7 @@ if test "$wxUSE_DIALUP_MANAGER" = "yes"; then fi if test "$wxUSE_TIPWINDOW" = "yes"; then - if test "$wxUSE_PM" = 1; then - AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled]) - else - AC_DEFINE(wxUSE_TIPWINDOW) - fi + AC_DEFINE(wxUSE_TIPWINDOW) fi if test "$USES_CONTROLS" = 1; then @@ -7400,7 +7214,7 @@ dnl --------------------------------------------------------------------------- dnl options used under wxMSW and wxPM dnl --------------------------------------------------------------------------- -if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then +if test "$wxUSE_MSW" = 1; then if test "$wxUSE_OWNER_DRAWN" = "yes"; then AC_DEFINE(wxUSE_OWNER_DRAWN) fi @@ -7775,9 +7589,6 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll" fi fi - if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw" - fi else SAMPLES_SUBDIRS="console" if test "$wxUSE_SOCKETS" = "yes" ; then @@ -8145,16 +7956,7 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then else dnl default value is to (silently) do nothing in the makefile MACSETFILE="@true" - - if test "$wxUSE_PM" = 1; then - RESCOMP="emxbind" - WXCONFIG_RESFLAGS="-ep" - - dnl Is this one really used anywhere for pm? - POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS" - else - POSTLINK_COMMAND="@true" - fi + POSTLINK_COMMAND="@true" fi fi @@ -8195,29 +7997,6 @@ if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then fi fi -if test "$wxUSE_SHARED" = "yes"; then - dnl Need addtional flag on OS/2, so override bakefiles value - dnl (there currently is no suitable variable to which the - dnl missing flags could be added, AFAICS. SN, 18.12.2004. ) - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - SHARED_LD_CXX="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - cp -p ${srcdir}/src/os2/dllnames.sh . - cp -p ${srcdir}/src/os2/dllar.sh . - ;; - esac -fi -if test "$wxUSE_OMF" = "yes"; then - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - LDFLAGS="$LDFLAGS -Zlinker /EXEPACK" - LDFLAGS_GUI="-Zlinker /PMTYPE:PM" - WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM" - ;; - esac -fi - dnl TOOLCHAIN_DEFS should be used for both wx and client code WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 3ae3ff2574..0636f1e4d9 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -48,7 +48,6 @@ BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = \ - $(__bombs_os2_lib_res) \ bombs_bombs.o \ bombs_bombs1.o \ bombs_game.o \ @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd = $(NM) bombs$(EXEEXT) | if grep -q @COND_PLATFORM_OS2_1@__bombs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__bombs_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__bombs_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = bombs.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__bombs_bundle___depname = bombs_bundle diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 8626a2253c..28918867c5 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -50,7 +50,6 @@ FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = \ - $(__forty_os2_lib_res) \ forty_forty.o \ forty_canvas.o \ forty_card.o \ @@ -97,8 +96,6 @@ COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q @COND_PLATFORM_OS2_1@__forty___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___forty___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__forty_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__forty_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = forty.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 1464ed100f..f7c6450b87 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -48,7 +48,6 @@ FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = \ - $(__fractal_os2_lib_res) \ fractal_fractal.o \ $(__fractal___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd = $(NM) fractal$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__fractal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__fractal_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__fractal_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = fractal.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__fractal_bundle___depname = fractal_bundle diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index 3c41ad9507..460246c365 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -48,7 +48,6 @@ LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) LIFE_OBJECTS = \ - $(__life_os2_lib_res) \ life_life.o \ life_dialogs.o \ life_game.o \ @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___life___os2_emxbindcmd = $(NM) life$(EXEEXT) | if grep -q \ @COND_PLATFORM_OS2_1@__life___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___life___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__life_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__life_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = life.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__life_bundle___depname = life_bundle diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 0671c58ec0..c431af5df9 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -49,7 +49,6 @@ WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = \ - $(__wxpoem_os2_lib_res) \ wxpoem_wxpoem.o \ $(__wxpoem___win32rc) @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd = $(NM) wxpoem$(EXEEXT) | if grep @COND_PLATFORM_OS2_1@__wxpoem___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__wxpoem_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__wxpoem_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = wxpoem.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__wxpoem_bundle___depname = wxpoem_bundle diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 9ae6d42f4f..2f2bc661f7 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -47,7 +47,7 @@ while @c __WINDOWS__ should be used for the platform tests.} @itemdef{__WXOSX_MAC__, Mac OS X (Carbon or Cocoa)} @itemdef{__WXOSX_OR_COCOA__, Any Mac OS X port (wxOSX-Carbon, wxOSX-Cocoa or wxCocoa)} -@itemdef{__WXPM__, OS/2 native Presentation Manager} +@itemdef{__WXPM__, OS/2 native Presentation Manager (not used any longer).} @itemdef{__WXSTUBS__, Stubbed version ('template' wxWin implementation)} @itemdef{__WXXT__, Xt; mutually exclusive with WX_MOTIF, not implemented in wxWidgets 2.x} @itemdef{__WXX11__, wxX11 (__WXUNIVERSAL__ will be also defined)} @@ -157,7 +157,7 @@ compiler used. @itemdef{__MINGW64_TOOLCHAIN__, MinGW-w64 in either 32 or 64 bit builds} @itemdef{__SUNCC__, Sun CC, see also wxCHECK_SUNCC_VERSION} @itemdef{__SYMANTECC__, Symantec C++} -@itemdef{__VISAGECPP__, IBM Visual Age (OS/2)} +@itemdef{__VISAGECPP__, IBM Visual Age (OS/2) (not used any more).} @itemdef{__VISUALC__, Microsoft Visual C++, see also ::wxCHECK_VISUALC_VERSION. The value of this macro corresponds to the compiler version: @c 1020 for @c 4.2 (the first supported version), @c 1100 for diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h index 3430512635..b109c043d6 100644 --- a/docs/doxygen/mainpages/const_wxusedef.h +++ b/docs/doxygen/mainpages/const_wxusedef.h @@ -312,18 +312,6 @@ library: @endDefList -@section page_wxusedef_os2 OS2 Symbols - -@beginDefList -@itemdef{wxUSE_CONSOLEDEBUG, See src/os2/app.cpp file.} -@itemdef{wxUSE_DDE, See src/os2/mimetype.cpp file.} -@itemdef{wxUSE_IMAGE_LOADING_IN_MSW, See src/os2/clipbrd.cpp file.} -@itemdef{wxUSE_IMAGE_LOADING_IN_OS2, See src/os2/gdiimage.cpp file.} -@itemdef{wxUSE_NET_API, Use NetBios32GetInfo API call.} -@itemdef{wxUSE_RESOURCE_LOADING_IN_OS2, See src/os2/gdiimage.cpp file.} -@endDefList - - @section page_wxusedef_msw wxMSW Symbols @beginDefList diff --git a/docs/doxygen/mainpages/platdetails.h b/docs/doxygen/mainpages/platdetails.h index 717a7b908e..6f0c467feb 100644 --- a/docs/doxygen/mainpages/platdetails.h +++ b/docs/doxygen/mainpages/platdetails.h @@ -101,16 +101,6 @@ docs for it are available in @c docs/cocoa in the distribution. -@section page_port_wxos2 wxOS2 - -wxOS2 is a port of wxWidgets for the IBM OS/2 Warp3 and Warp4 platforms. -This port is currently under construction and in beta phase. - -For further information, please see the files in @c docs/os2 -in the distribution. - - - @section page_port_wxx11 wxX11 wxX11 is a port of wxWidgets using X11 (The X Window System) as the underlying diff --git a/docs/doxygen/overviews/bitmap.h b/docs/doxygen/overviews/bitmap.h index 8114201189..46c0ab0b3e 100644 --- a/docs/doxygen/overviews/bitmap.h +++ b/docs/doxygen/overviews/bitmap.h @@ -54,7 +54,7 @@ wxIcon icon(wxICON(sample)); There is also a corresponding wxBITMAP() macro which allows to create the bitmaps in much the same way as wxICON() creates icons. It assumes that bitmaps -live in resources under Windows or OS2 and XPM files under all other platforms +live in resources under Windows and XPM files under all other platforms (for XPMs, the corresponding file must be included before this macro is used, of course, and the name of the bitmap should be the same as the resource name under Windows with @c _xpm suffix). For example: @@ -64,7 +64,7 @@ under Windows with @c _xpm suffix). For example: wxBitmap bmp(wxBITMAP(bmpname)); // which is roughly equivalent to the following -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WXMSW__) wxBitmap bmp("bmpname", wxBITMAP_TYPE_BMP_RESOURCE); #else // Unix wxBitmap bmp(bmpname_xpm, wxBITMAP_TYPE_XPM); diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index 9b55c0fe30..5e7190977d 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -2415,7 +2415,6 @@ Possible elemental values are: @itemdef{ @c win, Windows } @itemdef{ @c mac, Mac OS X (or Mac Classic in wxWidgets version supporting it) } @itemdef{ @c unix, Any Unix platform @em except OS X } -@itemdef{ @c os2, OS/2 } @endDefList Examples: diff --git a/docs/index.htm b/docs/index.htm index eeaca002c4..a96ac1de06 100644 --- a/docs/index.htm +++ b/docs/index.htm @@ -57,7 +57,6 @@ wxX11, wxMac, wxCocoa, - wxOS2
  • General change log
  • Licence: diff --git a/docs/os2/install.txt b/docs/os2/install.txt deleted file mode 100644 index 8b6882207a..0000000000 --- a/docs/os2/install.txt +++ /dev/null @@ -1,224 +0,0 @@ -Installing wxWidgets --------------------- - -This is wxWidgets for IBM OS/2 Warp3 and Warp4. This is an unstable -development release and OS/2 is considered to be in beta. - -IMPORTANT NOTE: If you experience problems installing, please -re-read this instructions and other related files (changes.txt, -readme.txt, notes on the Web site) carefully before mailing -wx-users or the author. Preferably, try to fix the problem first and -then send a patch to the author. Please report bugs using the -bug report form on the wxWidgets web site. - -Unarchiving ------------ - -At this time there is no comprehensive setup.exe type installation program. -wxWidgets for OS/2 requires you download various .zip files and unpack them -to your desired location on your system. Pick a location say, -C:\wx\wxWidgets-2.8.0, copy the .zip files to there and unzip them ensuring you -unzip the subdirectories as well. You will need: - -- All common, generic and OS2-specific wxWidgets source; -- samples; -- documentation in HTML Help format; -- makefiles for VisualAge V3.0 (possibly for EMX and Watcom C++); -- JPEG, TIFF, PNG, ZLIB, wxSTC, REGEX, EXPAT library sources. - -All but the documentation is included in wxOS2-2.8.0.zip, documentation -must be downloaded separately from the wxWidgets Web site. - - -General installation notes --------------------------- - -After unzipping everything your directory tree should look something like -this: - -x:\wx\wxWidgets-2.8.0\docs (your HTML reference manual) -x:\wx\wxWidgets-2.8.0\include\wx -x:\wx\wxWidgets-2.8.0\include\wx\generic -x:\wx\wxWidgets-2.8.0\include\wx\html -x:\wx\wxWidgets-2.8.0\include\wx\os2 -x:\wx\wxWidgets-2.8.0\samples\.... (all the sample directories) -x:\wx\wxWidgets-2.8.0\src -x:\wx\wxWidgets-2.8.0\src\common -x:\wx\wxWidgets-2.8.0\src\generic -x:\wx\wxWidgets-2.8.0\src\html -x:\wx\wxWidgets-2.8.0\src\jpeg -x:\wx\wxWidgets-2.8.0\src\os2 -x:\wx\wxWidgets-2.8.0\src\png -x:\wx\wxWidgets-2.8.0\src\tiff -x:\wx\wxWidgets-2.8.0\src\zlib - -If you are using VisualAge, you will also need to ensure you have a -\lib directory as well, x:\wx\wxWidgets-2.8.0\lib -and you will have to set a WXWIN environment variable in your -config.sys, -SET WXWIN=X:\WX\WXWINDOWS-2.8.0; - -Compilation ------------ - -For now, only VisualAge V3.0 FP 8 and EMX-0.9d (with fix4) are supported. -However, the library has been successfully compiled with Watcom C++ as -well. As those build environments get a bit more "formalized", I will add -them here. - -Compilation with VisualAge on the one hand and EMX on the other hand are -rather different, VisualAge is essentially following Windows' way of doing -it, EMX is following the example of the unix ports. - -Compilation with VisualAge --------------------------- - -In addition to VisualAge V3.0 Fixpack 8 you will need the following in order -to successfully build and use wxWidgets for OS/2: - -1. IBM OS/2 Toolkit Version 4.5 or later -2. IBM TCPIP V4.0 or later -3. You will need the IBMLAN Lan Requester service and UPM if you wish to use - network based components of the library (generally a standard part of any - Warp Connect 3.0 or Warp 4.0 installation. -4. I strongly suggest that you have the latest IBM fixpacks installed for - all your components. - -Go to the \src directory and open the file, makeva.env (there should be a -.env for each supported compiler when they are fully supported), for edit. -This is where the "make" environment for wxOS2 is set. Locate UMPLIB, NETLIB, -and TCPIP environment variables about 20 lines down. Set these to match -your system. - -There are number of possible outputs you can produce. There is a static -lib and a dynamically linked lib, and both can be built in debug or release -mode. Since wxOS2 is a beta and a rough one at that, I suggest, for now, -you stick to the debug builds. The resultant linkable binaries will be -output to the \lib directory as will the .dll files. The statically linked -lib will be named wx.lib. Each of the third party libs will be there as well, -including png.lib, jpeg.lib, tiff.lib, and zlib.lib. For DLL builds the -import libs will have the same name, only with a 'd' appended. Thus the -import library for the main lib in a dll build is wxd.lib. - -Object modules will be output into paths dictated by the build mode. For -example, for debug static the outputs will be in DebugOS2, for DLLs in -DebugOS2DLL. - -For your first build, you can directly build the library. For subsequent -builds you will want to "clean" the output paths. To build the static library -go to \src and execute nmake all -f makefile.va. To clean out the outputs -execute nmake clean -f makefile.va. - -To build the wx.dll execut nmake all -f makefile.va WXMAKINGDLL=1. To clean -the outputs execute namek clean -f makefile.va WXMAKINGDLL=1. For -VisualAge 3.0 we use the module definition file method. - -If, for some reason you encounter linking problems with your dll build you may -need to rebuild the module definition file, wx23.def, found in \src\os2. To -do this you need to have a static version built. Go to the \lib directoy and -execute CPPFILT /B /P wx.lib>temp.def. Copy this file to \src\os2. Delete -the temp.def from your \lib directory. - -I find the following to be the easiest to reconstruct the .def file. Open -both the wx23.def and the temp.def file. Copy the header of the wx23.def to -the clipboard and paste it into the top of the temp.def file. If you have -a valid SQL database client with its SDK on your system you can skip the next -step. wxWidgets included some ODBC and SQL modules. They expect the standard -sql.h and such to available. If you do not have a database client with its -SDK (such as DB/2) then for the .dll build you need to delete the exports for -the following three modules from your temp.def file, db.cpp, dbgrid.cpp and -dbtable.cpp. save you changes to temp.def. Delete wx23.def and rename your -temp.def to wx23.def and you are ready to go. - -I hope to clean up the .dll builds at some point before the library is -a full fledged production caliber product. Fortunately EMX and Watcom can use -the import and export pragmas successfully negating the need for manual .def -files. VA 3.0, unfortunately in C++ does not properly export the mangled -names so we are stuck with the CPPFILT .def file method of .dll builds for -now. - -When building an application that uses the wx.dll you need to build it using -the WXUSINGDLL=1 macro. For example to build the minimal sample you would -go to \samples\minimal and execute nmake all -f makefile.va WXUSINGDLL=1. - -I strongly suggest when developing apps using wxWidgets for OS/2 under old -VisualAge 3.0, that you use the dynamically linked library. The library is -very large and even the most trivial statically linked .exe can be very -large and take a long time to link. The release builds are much smaller, -however. Fortunately, EMX seems to build much smaller static executables. - -Compilation using EMX ---------------------- - -In addition to EMX-0.9d you will need a rather complete Unix-like -environment, starting with a shell (e.g. ash) and most of the -GNU file/text/shell utilities, but also flex, bison, sed, grep, awk -and GNU make. Particularly note that uname is relevant to get the -configure script working - the one from GNU shell utilities 1.12 -does work (check that uname -s returns "OS/2" and uname -m returns "i386" -and you should be mostly fine. - -The first thing to do is to decide on a build directory. You can either -do in-tree builds or you can do the build in a directory separated from -the source directory. The later has the advantage, that it is much easier -to compile and maintain several ports of wxWidgets on OS/2 - if you are -developping cross-platform applications you might want to compile (and -update) e.g. wxGTK or wxX11 as well. - -In the following, let's assume you decided to build in -\wx\wxWidgets-2.8.0\build\pm. Now we need to set some environment -variables, namely MAKESHELL (to a Unix like shell, let's assume ash) -and INSTALL (to point to the install script. If you omit this, configure -might find something like the system's tcpip\pcomos\install.exe which will -not do the thing you want), e.g. -SET MAKESHELL=ash -SET INSTALL=/wx/wxWidgets-2.8.0/install-sh -c - -Be warned that depending on the precise version of your make, the -variable that needs to be set might be MAKE_SHELL instead of MAKESHELL. -If you have a really deficient version of GNU make, it might even be -necessary to set SHELL or even COMSPEC to a unix like shell as well. - -Now run the provided configure script by executing e.g. -`ash -c "../../configure \ - --prefix=directory_where_you_want_wxWidgets_to_be_installed"' -from within the build directory (the relative path might be different -depending on the build directory you selected). -If you are already running some unix-like shell and not cmd, you may -of course ommit the `ash -c' part in the above command. -This will create a whole directory structure containing lib and sample -directories which each essentially contain a suitable makefile. - -Calling `make' now should start a compile run which hopefully ends -with a library being placed in the lib subdirectory. - -Now you can change in the samples subdirectory and call make to compile -all samples, however currently not all will work on OS/2, so you might -prefer to change into the directory of a specific sample -(e.g. samples\minimal) and call make there to just build this one example. -Essentially, each sample that's not working indicates an area, where help -in porting wxWidgets to OS/2 would be appreciated. - -Finally, you can run `make install' which should install wxWidgets to -the desired place. -Note that we also install the wx-config script which wants to help you -compiling your own applications, e.g. `wx-config --cxxflags` will emit the -flags that are needed for compiling source code which includes wxWidgets -headers, `wx-config --libs` will emit the flags needed for linking against -wxWidgets (wx-config is assuming you are calling it from a unix-like shell!). - -For building a DLL, the only supported way currently is to first build the -static library and then use Andrew Zabolotny's dllar.cmd. However, this -works quite nicely. - -Finally, if you also want to build a different port, e.g. wxGTK, you -essentially have to use the procedure described above, the only difference -being that you have to pass a switch to configure indicating which port -to build. If you do not do this in a separate build directory (e.g. -\wxWidgets-2.8.0\build\gtk), you'll have to do a `make clean' first. -The magical switches that have to be passed to configure for the various -ports are --with-gtk (wxGTK), --with-motif (wxMotif), --with-x11 (wxX11), -and --disable-gui (wxBase). Note that contrary to the native, PM based -OS/2 port, all of those ports work slightly better with POSIX/2's cExt -library. If include and library path include the suitable paths, -lcExt -is automatically appended to the linker flags by the configure script. diff --git a/docs/tech/tn0012.txt b/docs/tech/tn0012.txt index 95657bf4db..3115bbace1 100644 --- a/docs/tech/tn0012.txt +++ b/docs/tech/tn0012.txt @@ -43,8 +43,6 @@ $toolkit must currently be one of the following: gtk base mac - os2 - pm motif -------------------------------------------------------------------- diff --git a/include/wx/accel.h b/include/wx/accel.h index 5226b8b35a..3314be908e 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -166,8 +166,6 @@ private: #include "wx/osx/accel.h" #elif defined(__WXCOCOA__) #include "wx/generic/accel.h" -#elif defined(__WXPM__) - #include "wx/os2/accel.h" #endif extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable; diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h index 3e78fdf0aa..d12c220844 100644 --- a/include/wx/anybutton.h +++ b/include/wx/anybutton.h @@ -188,8 +188,6 @@ protected: #include "wx/osx/anybutton.h" //#elif defined(__WXCOCOA__) // #include "wx/cocoa/anybutton.h" -//#elif defined(__WXPM__) -// #include "wx/os2/anybutton.h" #else typedef wxAnyButtonBase wxAnyButton; #endif diff --git a/include/wx/app.h b/include/wx/app.h index 9540f6e392..67f500de2f 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -708,8 +708,6 @@ protected: #include "wx/osx/app.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/app.h" -#elif defined(__WXPM__) - #include "wx/os2/app.h" #endif #else // !GUI diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index c6c15cea14..7254170a1e 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -172,10 +172,8 @@ private: // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port #if defined(__WIN32__) #include "wx/msw/apptbase.h" -#elif defined(__UNIX__) && !defined(__EMX__) +#elif defined(__UNIX__) #include "wx/unix/apptbase.h" -#elif defined(__OS2__) - #include "wx/os2/apptbase.h" #else // no platform-specific methods to add to wxAppTraits // wxAppTraits must be a class because it was forward declared as class class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase @@ -267,8 +265,6 @@ public: // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port #if defined(__WIN32__) #include "wx/msw/apptrait.h" -#elif defined(__OS2__) - #include "wx/os2/apptrait.h" #elif defined(__UNIX__) #include "wx/unix/apptrait.h" #elif defined(__DOS__) diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index cc602f71fb..f0107d613e 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -100,8 +100,8 @@ public: }; -// All ports except wxMSW and wxOS2 use wxBitmapHandler and wxBitmapBase as -// base class for wxBitmapHandler; wxMSW and wxOS2 use wxGDIImageHandler as +// All ports except wxMSW use wxBitmapHandler and wxBitmapBase as +// base class for wxBitmapHandler; wxMSW uses wxGDIImageHandler as // base class since it allows some code reuse there. #if wxUSE_BITMAP_BASE @@ -290,9 +290,6 @@ protected: #elif defined(__WXCOCOA__) #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE #include "wx/cocoa/bitmap.h" -#elif defined(__WXPM__) - #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE - #include "wx/os2/bitmap.h" #endif #if wxUSE_IMAGE diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 576c4d4aa3..c9edaa5364 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -125,8 +125,6 @@ protected: #include "wx/osx/bmpbuttn.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/bmpbuttn.h" -#elif defined(__WXPM__) - #include "wx/os2/bmpbuttn.h" #endif #endif // wxUSE_BMPBUTTON diff --git a/include/wx/brush.h b/include/wx/brush.h index 78a47da63e..89046ad4cb 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -83,8 +83,6 @@ public: #include "wx/osx/brush.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/brush.h" -#elif defined(__WXPM__) - #include "wx/os2/brush.h" #endif class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase diff --git a/include/wx/button.h b/include/wx/button.h index ccea9e76e8..7594a9c758 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -60,8 +60,6 @@ protected: #include "wx/osx/button.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/button.h" -#elif defined(__WXPM__) - #include "wx/os2/button.h" #endif #endif // wxUSE_BUTTON diff --git a/include/wx/chartype.h b/include/wx/chartype.h index 5217258d1b..7966451275 100644 --- a/include/wx/chartype.h +++ b/include/wx/chartype.h @@ -28,8 +28,6 @@ #define wxUSE_WCHAR_T 0 #elif defined(__WATCOMC__) #define wxUSE_WCHAR_T 0 - #elif defined(__VISAGECPP__) && (__IBMCPP__ < 400) - #define wxUSE_WCHAR_T 0 #else /* add additional compiler checks if this fails */ #define wxUSE_WCHAR_T 1 @@ -47,7 +45,7 @@ Actually MinGW has tchar.h, but it does not include wchar.h */ -#if defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__) +#if defined(__MINGW32__) || defined(__WATCOMC__) #ifndef HAVE_WCHAR_H #define HAVE_WCHAR_H #endif @@ -74,7 +72,7 @@ #elif defined(HAVE_WCSTR_H) /* old compilers have relevant declarations here */ #include -#elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__) +#elif defined(__FreeBSD__) || defined(__DARWIN__) /* include stdlib.h for wchar_t */ #include #endif /* HAVE_WCHAR_H */ @@ -104,15 +102,6 @@ #include #include #include -#elif 0 && defined(__VISAGECPP__) && (__IBMCPP__ >= 400) - /* VZ: the old VisualAge definitions were completely wrong and had no */ - /* chance at all to work in Unicode build anyhow so let's pretend */ - /* that VisualAge does _not_ support TCHAR for the moment (as */ - /* indicated by "0 &&" above) until someone really has time to delve */ - /* into Unicode issues under OS/2 */ - - /* VisualAge 4.0+ supports TCHAR */ - #define wxHAVE_TCHAR_SUPPORT #endif /* compilers with (good) TCHAR support */ #ifdef wxHAVE_TCHAR_SUPPORT diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 3d355ee605..aea711e67e 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -180,9 +180,6 @@ private: #include "wx/osx/checkbox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/checkbox.h" -#elif defined(__WXPM__) - #undef wxHAS_3STATE_CHECKBOX - #include "wx/os2/checkbox.h" #endif #endif // wxUSE_CHECKBOX diff --git a/include/wx/checklst.h b/include/wx/checklst.h index 3c54304d0e..baa0539b01 100644 --- a/include/wx/checklst.h +++ b/include/wx/checklst.h @@ -57,8 +57,6 @@ public: #include "wx/osx/checklst.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/checklst.h" -#elif defined(__WXPM__) - #include "wx/os2/checklst.h" #endif #endif // wxUSE_CHECKLISTBOX diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index f5ddfdfc29..a81325b2cd 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -1229,8 +1229,6 @@ # include "wx/cocoa/chkconf.h" #elif defined(__WXMAC__) # include "wx/osx/chkconf.h" -#elif defined(__OS2__) -# include "wx/os2/chkconf.h" #elif defined(__WXDFB__) # include "wx/dfb/chkconf.h" #elif defined(__WXMOTIF__) diff --git a/include/wx/choice.h b/include/wx/choice.h index 25b651ef37..98c059bfcf 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -88,8 +88,6 @@ private: #include "wx/osx/choice.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/choice.h" -#elif defined(__WXPM__) - #include "wx/os2/choice.h" #endif #endif // wxUSE_CHOICE diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 4fd6f80414..b4bf508296 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -163,8 +163,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); #include "wx/osx/clipbrd.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/clipbrd.h" -#elif defined(__WXPM__) - #include "wx/os2/clipbrd.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/colour.h b/include/wx/colour.h index ce946c8ecb..7596db8b0e 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -65,7 +65,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE) not need the wxGDIObject machinery to handle colors, please add it to the list of ports which do not need it. */ -#if defined( __WXMAC__ ) || defined( __WXMSW__ ) || defined( __WXPM__ ) || defined( __WXCOCOA__ ) +#if defined( __WXMAC__ ) || defined( __WXMSW__ ) || defined( __WXCOCOA__ ) #define wxCOLOUR_IS_GDIOBJECT 0 #else #define wxCOLOUR_IS_GDIOBJECT 1 @@ -221,8 +221,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col); #include "wx/osx/colour.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/colour.h" -#elif defined(__WXPM__) - #include "wx/os2/colour.h" #endif #define wxColor wxColour diff --git a/include/wx/combobox.h b/include/wx/combobox.h index e4154342a7..5bf6d96af4 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -83,8 +83,6 @@ public: #include "wx/osx/combobox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/combobox.h" -#elif defined(__WXPM__) - #include "wx/os2/combobox.h" #endif #endif // wxUSE_COMBOBOX diff --git a/include/wx/config.h b/include/wx/config.h index 4df4b8dd08..2a28e0715a 100644 --- a/include/wx/config.h +++ b/include/wx/config.h @@ -24,9 +24,6 @@ #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE #include "wx/msw/regconf.h" #define wxConfig wxRegConfig -#elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE - #include "wx/os2/iniconf.h" - #define wxConfig wxIniConfig #else // either we're under Unix or wish to always use config files #include "wx/fileconf.h" #define wxConfig wxFileConfig diff --git a/include/wx/control.h b/include/wx/control.h index f3e22f26fd..1bf589f091 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -238,8 +238,6 @@ protected: #include "wx/osx/control.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/control.h" -#elif defined(__WXPM__) - #include "wx/os2/control.h" #endif #endif // wxUSE_CONTROLS diff --git a/include/wx/cursor.h b/include/wx/cursor.h index bdde8cdf66..5317a40e31 100644 --- a/include/wx/cursor.h +++ b/include/wx/cursor.h @@ -61,9 +61,6 @@ public: #elif defined(__WXCOCOA__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE #include "wx/cocoa/cursor.h" -#elif defined(__WXPM__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE - #include "wx/os2/cursor.h" #endif #include "wx/utils.h" diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index 30ee857670..2b6576a7e5 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -85,8 +85,6 @@ public: #include "wx/osx/dataform.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/dataform.h" -#elif defined(__WXPM__) - #include "wx/os2/dataform.h" #endif // the value for default argument to some functions (corresponds to @@ -173,8 +171,6 @@ public: #include "wx/osx/dataobj.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/dataobj.h" -#elif defined(__WXPM__) - #include "wx/os2/dataobj.h" #endif // ---------------------------------------------------------------------------- @@ -566,8 +562,6 @@ private: #include "wx/osx/dataobj2.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/dataobj2.h" - #elif defined(__WXPM__) - #include "wx/os2/dataobj2.h" #endif // wxURLDataObject is simply wxTextDataObject with a different name diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 2c56bb9ae2..506a10d1a8 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -462,10 +462,7 @@ public: wxDateTime() { m_time = wxLongLong(wxINT32_MIN, 0); } // from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970) -#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400)) -// VA C++ confuses this with wxDateTime(double jdn) thinking it is a duplicate declaration inline wxDateTime(time_t timet); -#endif // from broken down time/date (only for standard Unix range) inline wxDateTime(const struct tm& tm); // from broken down time/date (any range) @@ -506,11 +503,8 @@ public: // set to the current time inline wxDateTime& SetToCurrent(); -#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400)) -// VA C++ confuses this with wxDateTime(double jdn) thinking it is a duplicate declaration // set to given time_t value inline wxDateTime& Set(time_t timet); -#endif // set to given broken down time/date wxDateTime& Set(const struct tm& tm); @@ -1636,7 +1630,6 @@ inline wxDateTime wxDateTime::Today() return dt; } -#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400)) inline wxDateTime& wxDateTime::Set(time_t timet) { if ( timet == (time_t)-1 ) @@ -1652,7 +1645,6 @@ inline wxDateTime& wxDateTime::Set(time_t timet) return *this; } -#endif inline wxDateTime& wxDateTime::SetToCurrent() { @@ -1660,12 +1652,10 @@ inline wxDateTime& wxDateTime::SetToCurrent() return *this; } -#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400)) inline wxDateTime::wxDateTime(time_t timet) { Set(timet); } -#endif inline wxDateTime::wxDateTime(const struct tm& tm) { diff --git a/include/wx/defs.h b/include/wx/defs.h index 80cfd66de3..19bd9acfda 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -26,7 +26,6 @@ # elif !defined(__WXMOTIF__) && \ !defined(__WXMSW__) && \ !defined(__WXGTK__) && \ - !defined(__WXPM__) && \ !defined(__WXOSX_CARBON__) && \ !defined(__WXOSX_COCOA__) && \ !defined(__WXOSX_IPHONE__) && \ @@ -533,8 +532,6 @@ typedef short int WXTYPE; #if defined(__VISUALC__) #define wxC_CALLING_CONV _cdecl -#elif defined(__VISAGECPP__) - #define wxC_CALLING_CONV _Optlink #else /* !Visual C++ */ #define wxC_CALLING_CONV #endif /* compiler */ @@ -1131,7 +1128,7 @@ typedef wxUint32 wxDword; #define wxLongLong_t __int64 #define wxLongLongSuffix i64 #define wxLongLongFmtSpec "L" -#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__))) +#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__))) #define wxLongLong_t __int64 #define wxLongLongSuffix i64 #define wxLongLongFmtSpec "L" @@ -1143,8 +1140,6 @@ typedef wxUint32 wxDword; #define wxLongLong_t long long #define wxLongLongSuffix ll #define wxLongLongFmtSpec "I64" -#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 - #define wxLongLong_t long long #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ defined(__GNUC__) || \ defined(__CYGWIN__) || \ @@ -2895,7 +2890,7 @@ typedef int (* LINKAGEMODE wxListIterateFunction)(void *current); #endif /* macro to specify "All Files" on different platforms */ -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WXMSW__) # define wxALL_FILES_PATTERN wxT("*.*") # define wxALL_FILES gettext_noop("All files (*.*)|*.*") #else @@ -3209,115 +3204,6 @@ typedef int (__stdcall *WXFARPROC)(); #endif /* __WIN32__ */ -#if defined(__OS2__) -typedef unsigned long DWORD; -typedef unsigned short WORD; -#endif - -#if defined(__WXPM__) || defined(__EMX__) -#ifdef __WXPM__ -/* Stand-ins for OS/2 types, to avoid #including all of os2.h */ -typedef unsigned long WXHWND; -typedef unsigned long WXHANDLE; -typedef unsigned long WXHICON; -typedef unsigned long WXHFONT; -typedef unsigned long WXHMENU; -typedef unsigned long WXHPEN; -typedef unsigned long WXHBRUSH; -typedef unsigned long WXHPALETTE; -typedef unsigned long WXHCURSOR; -typedef unsigned long WXHRGN; -typedef unsigned long WXHACCEL; -typedef unsigned long WXHINSTANCE; -typedef unsigned long WXHMODULE; -typedef unsigned long WXHBITMAP; -typedef unsigned long WXHDC; -typedef unsigned int WXUINT; -typedef unsigned long WXDWORD; -typedef unsigned short WXWORD; - -typedef unsigned long WXCOLORREF; -typedef void * WXMSG; -typedef unsigned long WXHTREEITEM; - -typedef void * WXDRAWITEMSTRUCT; -typedef void * WXMEASUREITEMSTRUCT; -typedef void * WXLPCREATESTRUCT; - -typedef WXHWND WXWidget; -#endif -#ifdef __EMX__ -/* Need a well-known type for WXFARPROC - below. MPARAM is typedef'ed too late. */ -#define WXWPARAM void * -#define WXLPARAM void * -#else -#define WXWPARAM MPARAM -#define WXLPARAM MPARAM -#endif -#define RECT RECTL -#define LOGFONT FATTRS -#define LOWORD SHORT1FROMMP -#define HIWORD SHORT2FROMMP - -typedef unsigned long WXMPARAM; -typedef unsigned long WXMSGID; -typedef void* WXRESULT; -/* typedef int (*WXFARPROC)(); */ -/* some windows handles not defined by PM */ -typedef unsigned long HANDLE; -typedef unsigned long HICON; -typedef unsigned long HFONT; -typedef unsigned long HMENU; -typedef unsigned long HPEN; -typedef unsigned long HBRUSH; -typedef unsigned long HPALETTE; -typedef unsigned long HCURSOR; -typedef unsigned long HINSTANCE; -typedef unsigned long HIMAGELIST; -typedef unsigned long HGLOBAL; -#endif /* WXPM || EMX */ - -#if defined (__WXPM__) -/* WIN32 graphics types for OS/2 GPI */ - -/* RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def */ -#define OS2RGB(r,g,b) ((DWORD)((unsigned char)(b) | ((unsigned char)(g) << 8)) | ((unsigned char)(r) << 16)) - -typedef unsigned long COLORREF; -#define GetRValue(rgb) ((unsigned char)((rgb) >> 16)) -#define GetGValue(rgb) ((unsigned char)(((unsigned short)(rgb)) >> 8)) -#define GetBValue(rgb) ((unsigned char)(rgb)) -#define PALETTEINDEX(i) ((COLORREF)(0x01000000 | (DWORD)(WORD)(i))) -#define PALETTERGB(r,g,b) (0x02000000 | OS2RGB(r,g,b)) -/* OS2's RGB/RGB2 is backwards from this */ -typedef struct tagPALETTEENTRY -{ - char bRed; - char bGreen; - char bBlue; - char bFlags; -} PALETTEENTRY; -typedef struct tagLOGPALETTE -{ - WORD palVersion; - WORD palNumentries; - WORD PALETTEENTRY[1]; -} LOGPALETTE; - -#if (defined(__VISAGECPP__) && (__IBMCPP__ < 400)) || defined (__WATCOMC__) - /* VA 3.0 for some reason needs base data types when typedefing a proc proto??? */ -typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*); -#else -#if defined(__EMX__) && !defined(_System) -#define _System -#endif -typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM); -#endif - -#endif /* __WXPM__ */ - - #if defined(__WXMOTIF__) || defined(__WXX11__) /* Stand-ins for X/Xt/Motif types */ typedef void* WXWindow; diff --git a/include/wx/dialog.h b/include/wx/dialog.h index d874da756a..865e57df09 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -362,8 +362,6 @@ public: #include "wx/osx/dialog.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/dialog.h" - #elif defined(__WXPM__) - #include "wx/os2/dialog.h" #endif #endif diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 3d82f90778..e5bae293e4 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -108,8 +108,7 @@ protected: #include "wx/cocoa/dirdlg.h" // Native Cocoa #elif defined(__WXMOTIF__) || \ defined(__WXX11__) || \ - defined(__WXCOCOA__) || \ - defined(__WXPM__) + defined(__WXCOCOA__) #include "wx/generic/dirdlgg.h" // Other ports use generic implementation #define wxDirDialog wxGenericDirDialog #endif diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index b696e45242..f5c2a14c53 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -41,21 +41,6 @@ # define WXEXPORT __attribute__((dllexport)) # define WXIMPORT __attribute__((dllimport)) # endif -#elif defined(__WXPM__) -# if defined (__WATCOMC__) -# define WXEXPORT __declspec(dllexport) - /* - __declspec(dllimport) prepends __imp to imported symbols. We do NOT - want that! - */ -# define WXIMPORT -# elif defined(__EMX__) -# define WXEXPORT -# define WXIMPORT -# elif (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) -# define WXEXPORT _Export -# define WXIMPORT _Export -# endif #elif defined(__CYGWIN__) # define WXEXPORT __declspec(dllexport) # define WXIMPORT __declspec(dllimport) diff --git a/include/wx/dnd.h b/include/wx/dnd.h index 80fbda1372..ab283435bb 100644 --- a/include/wx/dnd.h +++ b/include/wx/dnd.h @@ -222,8 +222,6 @@ protected: #include "wx/gtk1/dnd.h" #elif defined(__WXMAC__) #include "wx/osx/dnd.h" -#elif defined(__WXPM__) - #include "wx/os2/dnd.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h index 4143ca8898..cc3e88d04d 100644 --- a/include/wx/dragimag.h +++ b/include/wx/dragimag.h @@ -41,10 +41,6 @@ class WXDLLIMPEXP_FWD_CORE wxDC; # include "wx/generic/dragimgg.h" # define wxDragImage wxGenericDragImage -#elif defined(__WXPM__) -# include "wx/generic/dragimgg.h" -# define wxDragImage wxGenericDragImage - #endif #endif // wxUSE_DRAGIMAGE diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index 1a91e07193..0f035d904f 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -19,7 +19,7 @@ #include "wx/dynarray.h" // note that we have our own dlerror() implementation under Darwin -#if (defined(HAVE_DLERROR) && !defined(__EMX__)) || defined(__DARWIN__) +#if defined(HAVE_DLERROR) || defined(__DARWIN__) #define wxHAVE_DYNLIB_ERROR #endif @@ -29,9 +29,7 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator; // conditional compilation // ---------------------------------------------------------------------------- -// Note: __OS2__/EMX has to be tested first, since we want to use -// native version, even if configure detected presence of DLOPEN. -#if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__) +#if defined(__WINDOWS__) typedef WXHMODULE wxDllType; #elif defined(__DARWIN__) // Don't include dlfcn.h on Darwin, we may be using our own replacements. @@ -296,11 +294,7 @@ public: static void *RawGetSymbol(wxDllType handle, const wxString& name); void *RawGetSymbol(const wxString& name) const { -#if defined (__WXPM__) || defined(__EMX__) - return GetSymbol(name); -#else return RawGetSymbol(m_handle, name); -#endif } #ifdef __WINDOWS__ diff --git a/include/wx/encconv.h b/include/wx/encconv.h index bc464785c8..7c49465f51 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -33,7 +33,6 @@ enum wxPLATFORM_UNIX = 0, wxPLATFORM_WINDOWS, - wxPLATFORM_OS2, wxPLATFORM_MAC }; diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index 27b1453847..46cfb7dfc1 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -37,7 +37,6 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo wxFontEncoding encoding; // so that we know what this struct represents #if defined(__WXMSW__) || \ - defined(__WXPM__) || \ defined(__WXMAC__) || \ defined(__WXCOCOA__) // FIXME: __WXCOCOA__ diff --git a/include/wx/event.h b/include/wx/event.h index 1f8818649e..5e1d7b305b 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -2101,10 +2101,10 @@ private: wxEVT_NC_PAINT */ -#if wxDEBUG_LEVEL && (defined(__WXMSW__) || defined(__WXPM__)) +#if wxDEBUG_LEVEL && defined(__WXMSW__) #define wxHAS_PAINT_DEBUG - // see comments in src/msw|os2/dcclient.cpp where g_isPainting is defined + // see comments in src/msw/dcclient.cpp where g_isPainting is defined extern WXDLLIMPEXP_CORE int g_isPainting; #endif // debug diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index deed9d1e15..1e6611c5d5 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -220,8 +220,6 @@ wxSaveFileSelector(const wxString& what, #include "wx/osx/filedlg.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/filedlg.h" -#elif defined(__WXPM__) - #include "wx/os2/filedlg.h" #endif #endif // wxUSE_FILEDLG diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 4e89e20623..2b2d6d39d3 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -26,19 +26,7 @@ #include #endif -#ifdef __OS2__ -// need to check for __OS2__ first since currently both -// __OS2__ and __UNIX__ are defined. - #include - #include "wx/os2/private.h" - #ifdef __WATCOMC__ - #include - #endif - #include - #ifdef __EMX__ - #include - #endif -#elif defined(__UNIX__) +#if defined(__UNIX__) #include #include #endif @@ -185,7 +173,7 @@ enum wxPosixPermissions #define wxCRT_RmDir _wrmdir #define wxCRT_Stat _wstat #define wxStructStat struct _stat -#elif (defined(__WINDOWS__) || defined(__OS2__)) && \ +#elif defined(__WINDOWS__) && \ ( \ defined(__VISUALC__) || \ defined(__MINGW64__) || \ @@ -343,12 +331,7 @@ enum wxPosixPermissions #define wxCRT_StatA wxPOSIX_IDENT(stati64) #endif #else - // Unfortunately Watcom is not consistent - #if defined(__OS2__) && defined(__WATCOMC__) - #define wxCRT_StatA _stat - #else - #define wxCRT_StatA wxPOSIX_IDENT(stat) - #endif + #define wxCRT_StatA wxPOSIX_IDENT(stat) #endif // then wide char ones @@ -522,8 +505,7 @@ inline int wxLstat(const wxString& path, wxStructStat *buf) { return wxCRT_Lstat(path.fn_str(), buf); } inline int wxRmDir(const wxString& path) { return wxCRT_RmDir(path.fn_str()); } -#if (defined(__WINDOWS__) && !defined(__CYGWIN__)) \ - || (defined(__OS2__) && defined(__WATCOMC__)) +#if (defined(__WINDOWS__) && !defined(__CYGWIN__)) inline int wxMkDir(const wxString& path, mode_t WXUNUSED(mode) = 0) { return wxCRT_MkDir(path.fn_str()); } #else @@ -538,15 +520,7 @@ inline int wxMkDir(const wxString& path, mode_t mode) #define wxO_BINARY 0 #endif -#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 -// -// VisualAge C++ V4.0 cannot have any external linkage const decs -// in headers included by more than one primary source -// -extern const int wxInvalidOffset; -#else const int wxInvalidOffset = -1; -#endif // ---------------------------------------------------------------------------- // functions @@ -686,7 +660,7 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path); #define wxPATH_SEP_MAC wxT(";") // platform independent versions -#if defined(__UNIX__) && !defined(__OS2__) +#if defined(__UNIX__) // CYGWIN also uses UNIX settings #define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX #define wxPATH_SEP wxPATH_SEP_UNIX @@ -700,7 +674,7 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path); // this is useful for wxString::IsSameAs(): to compare two file names use // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE) -#if defined(__UNIX__) && !defined(__DARWIN__) && !defined(__OS2__) +#if defined(__UNIX__) && !defined(__DARWIN__) #define wxARE_FILENAMES_CASE_SENSITIVE true #else // Windows, Mac OS and OS/2 #define wxARE_FILENAMES_CASE_SENSITIVE false @@ -710,7 +684,7 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path); inline bool wxIsPathSeparator(wxChar c) { // under DOS/Windows we should understand both Unix and DOS file separators -#if ( defined(__UNIX__) && !defined(__OS2__) )|| defined(__MAC__) +#if defined(__UNIX__) || defined(__MAC__) return c == wxFILE_SEP_PATH; #else return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; diff --git a/include/wx/filename.h b/include/wx/filename.h index 1a16e14050..cd4fe420e5 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_BASE wxFFile; // this symbol is defined for the platforms where file systems use volumes in // paths -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__DOS__) #define wxHAS_FILESYSTEM_VOLUMES #endif diff --git a/include/wx/font.h b/include/wx/font.h index d52ed70d9d..f150e1e385 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -532,8 +532,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font); #include "wx/osx/font.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/font.h" -#elif defined(__WXPM__) - #include "wx/os2/font.h" #endif class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index 41366934c2..53b3f20b86 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -77,8 +77,6 @@ protected: #include "wx/gtk/fontdlg.h" #elif defined(__WXGTK__) #include "wx/gtk1/fontdlg.h" -#elif defined(__WXPM__) - #include "wx/os2/fontdlg.h" #elif defined(__WXMAC__) #include "wx/osx/fontdlg.h" #endif diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 0915e63dc0..b0e6c44c5d 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -113,11 +113,6 @@ public: wxNativeFontInfo(const LOGFONT& lf_) : lf(lf_) { } LOGFONT lf; -#elif defined(__WXPM__) - // OS/2 native structures that define a font - FATTRS fa; - FONTMETRICS fm; - FACENAMEDESC fn; #elif defined(__WXOSX__) public: wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); } diff --git a/include/wx/frame.h b/include/wx/frame.h index d7c570cb07..d63f32afdd 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -266,8 +266,6 @@ protected: #include "wx/osx/frame.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/frame.h" - #elif defined(__WXPM__) - #include "wx/os2/frame.h" #endif #endif diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 0141451726..ebf7dd250d 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -111,8 +111,6 @@ protected: #include "wx/osx/gauge.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/gauge.h" -#elif defined(__WXPM__) - #include "wx/os2/gauge.h" #endif #endif // wxUSE_GAUGE diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 8bf66b170a..cdbaae2698 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -159,7 +159,7 @@ enum wxStockCursor // macros // --------------------------------------------------------------------------- -#if defined(__WINDOWS__) || defined(__WXPM__) +#if defined(__WINDOWS__) #define wxHAS_IMAGES_IN_RESOURCES #endif @@ -176,9 +176,6 @@ enum wxStockCursor #ifdef __WINDOWS__ // Load from a resource #define wxICON(X) wxIcon(wxT(#X)) -#elif defined(__WXPM__) - // Load from a resource - #define wxICON(X) wxIcon(wxT(#X)) #elif defined(__WXDFB__) // Initialize from an included XPM #define wxICON(X) wxIcon( X##_xpm ) @@ -203,7 +200,7 @@ enum wxStockCursor under Unix bitmaps live in XPMs and under Windows they're in ressources. */ -#if defined(__WINDOWS__) || defined(__WXPM__) +#if defined(__WINDOWS__) #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE) #elif defined(__WXGTK__) || \ defined(__WXMOTIF__) || \ @@ -889,12 +886,6 @@ public: // add a new colour to the database void AddColour(const wxString& name, const wxColour& colour); -#ifdef __WXPM__ - // PM keeps its own type of colour table - long* m_palTable; - size_t m_nSize; -#endif - private: // load the database with the built in colour values when called for the // first time, do nothing after this diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h index a23bbe3fb3..3d9675dcd8 100644 --- a/include/wx/gdiobj.h +++ b/include/wx/gdiobj.h @@ -56,7 +56,7 @@ public: // because it's still widely used) bool Ok() const { return IsOk(); } -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WXMSW__) // Creates the resource virtual bool RealizeResource() { return false; } @@ -67,7 +67,7 @@ public: // Returns handle. virtual WXHANDLE GetResourceHandle() const { return 0; } -#endif // defined(__WXMSW__) || defined(__WXPM__) +#endif // defined(__WXMSW__) protected: // replace base class functions using wxObjectRefData with our own which diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h index f271563ae2..4542e2f43d 100644 --- a/include/wx/generic/combo.h +++ b/include/wx/generic/combo.h @@ -93,8 +93,6 @@ protected: #endif #elif defined(__WXMAC__) // Looks like there's nothing we need to override here -#elif defined(__WXPM__) - virtual WXHWND GetEditHWND() const { return NULL; } #endif // For better transparent background rendering diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index bdaa3df33b..b165a11c75 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -258,7 +258,7 @@ protected: wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl); }; -#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__) +#if !defined(__WXMSW__) && !defined(__WXMAC__) #define wxDirCtrl wxGenericDirCtrl #endif diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 8e7f6e93ca..5c930ac313 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -134,7 +134,7 @@ protected: // the maximum value int m_maximum; -#if defined(__WXMSW__ ) || defined(__WXPM__) +#if defined(__WXMSW__) // the factor we use to always keep the value in 16 bit range as the native // control only supports ranges from 0 to 65,535 size_t m_factor; diff --git a/include/wx/helpwin.h b/include/wx/helpwin.h index b73a62ebaf..599d62a410 100644 --- a/include/wx/helpwin.h +++ b/include/wx/helpwin.h @@ -13,8 +13,6 @@ #if defined(__WXMSW__) #include "wx/msw/helpwin.h" -#elif defined(__WXPM__) -#include "wx/os2/helpwin.h" #endif #endif diff --git a/include/wx/icon.h b/include/wx/icon.h index 27bb3e6921..84e3fba512 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -55,9 +55,6 @@ #elif defined(__WXCOCOA__) #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE #include "wx/cocoa/icon.h" -#elif defined(__WXPM__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE - #include "wx/os2/icon.h" #endif //----------------------------------------------------------------------------- diff --git a/include/wx/joystick.h b/include/wx/joystick.h index 733ad7de8a..562f564f6e 100644 --- a/include/wx/joystick.h +++ b/include/wx/joystick.h @@ -27,8 +27,6 @@ #include "wx/osx/core/joystick.h" #elif defined(__WXMAC__) #include "wx/osx/joystick.h" -#elif defined(__WXPM__) -#include "wx/os2/joystick.h" #endif #endif // wxUSE_JOYSTICK diff --git a/include/wx/listbase.h b/include/wx/listbase.h index b8b7e2b344..49f7252e55 100644 --- a/include/wx/listbase.h +++ b/include/wx/listbase.h @@ -83,11 +83,11 @@ int (wxCALLBACK *wxListCtrlCompare)(wxIntPtr item1, wxIntPtr item2, wxIntPtr sor #define wxLIST_STATE_FOCUSED 0x0002 #define wxLIST_STATE_SELECTED 0x0004 #define wxLIST_STATE_CUT 0x0008 // MSW only -#define wxLIST_STATE_DISABLED 0x0010 // OS2 only -#define wxLIST_STATE_FILTERED 0x0020 // OS2 only -#define wxLIST_STATE_INUSE 0x0040 // OS2 only -#define wxLIST_STATE_PICKED 0x0080 // OS2 only -#define wxLIST_STATE_SOURCE 0x0100 // OS2 only +#define wxLIST_STATE_DISABLED 0x0010 // Not used +#define wxLIST_STATE_FILTERED 0x0020 // Not used +#define wxLIST_STATE_INUSE 0x0040 // Not used +#define wxLIST_STATE_PICKED 0x0080 // Not used +#define wxLIST_STATE_SOURCE 0x0100 // Not used // Hit test flags, used in HitTest #define wxLIST_HITTEST_ABOVE 0x0001 // Above the client area. @@ -339,10 +339,6 @@ public: int m_format; // left, right, centre int m_width; // width of column -#ifdef __WXPM__ - int m_miniImage; // handle to the mini image for OS/2 -#endif - protected: // creates m_attr if we don't have it yet wxListItemAttr& Attributes() diff --git a/include/wx/listbox.h b/include/wx/listbox.h index f6e4dc6afc..1981281c91 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -153,8 +153,6 @@ private: #include "wx/gtk1/listbox.h" #elif defined(__WXMAC__) #include "wx/osx/listbox.h" -#elif defined(__WXPM__) - #include "wx/os2/listbox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/listbox.h" #endif diff --git a/include/wx/longlong.h b/include/wx/longlong.h index 4d4b91451a..56cffba8b4 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -46,7 +46,7 @@ "integers, using emulation class instead.\n" \ "Please report your compiler version to " \ "wx-dev@lists.wxwidgets.org!" - #elif !(defined(__WATCOMC__) || defined(__VISAGECPP__)) + #elif !defined(__WATCOMC__) #pragma warning "Your compiler does not appear to support 64 bit "\ "integers, using emulation class instead.\n" \ "Please report your compiler version to " \ diff --git a/include/wx/mdi.h b/include/wx/mdi.h index 69db24a917..6fcb6d467a 100644 --- a/include/wx/mdi.h +++ b/include/wx/mdi.h @@ -350,7 +350,6 @@ public: // probably not functional?) #if defined(__WXCOCOA__) || \ defined(__WXMOTIF__) || \ - defined(__WXPM__) || \ defined(__WXUNIVERSAL__) #define wxUSE_GENERIC_MDI_AS_NATIVE 1 #else diff --git a/include/wx/menu.h b/include/wx/menu.h index f02280cb9b..5ea13d01ff 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -591,8 +591,6 @@ protected: #include "wx/osx/menu.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/menu.h" -#elif defined(__WXPM__) - #include "wx/os2/menu.h" #endif #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index 4eb80b7b5b..372e5e75eb 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -206,8 +206,6 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); #include "wx/osx/menuitem.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/menuitem.h" -#elif defined(__WXPM__) - #include "wx/os2/menuitem.h" #endif #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY diff --git a/include/wx/metafile.h b/include/wx/metafile.h index c34d8acef3..e5e6dd03da 100644 --- a/include/wx/metafile.h +++ b/include/wx/metafile.h @@ -42,8 +42,6 @@ #else // !wxUSE_ENH_METAFILE #include "wx/msw/metafile.h" #endif -#elif defined(__WXPM__) - #include "wx/os2/metafile.h" #elif defined(__WXMAC__) #include "wx/osx/metafile.h" #endif diff --git a/include/wx/minifram.h b/include/wx/minifram.h index f769c5a691..5f5ff7dc2f 100644 --- a/include/wx/minifram.h +++ b/include/wx/minifram.h @@ -27,8 +27,6 @@ #include "wx/x11/minifram.h" #elif defined(__WXMAC__) #include "wx/osx/minifram.h" -#elif defined(__WXPM__) -#include "wx/os2/minifram.h" #else // TODO: it seems that wxMiniFrame could be just defined here generically // instead of having all the above port-specific headers diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 8a234ac48f..97685be73a 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -302,8 +302,6 @@ private: #include "wx/gtk/msgdlg.h" #elif defined(__WXMAC__) #include "wx/osx/msgdlg.h" -#elif defined(__WXPM__) - #include "wx/os2/msgdlg.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 7b82fbb2c5..02221a654a 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -195,8 +195,6 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTEBOOK_PAGE_CHANGING, wxBook #include "wx/osx/notebook.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/notebook.h" -#elif defined(__WXPM__) - #include "wx/os2/notebook.h" #endif // old wxEVT_COMMAND_* constants diff --git a/include/wx/object.h b/include/wx/object.h index 9886d64479..5b765fdd52 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -170,7 +170,6 @@ inline T *wxCheckCast(const void *ptr) _WX_WANT_NEW_SIZET_WXCHAR_INT = void *operator new (size_t size, wxChar *fileName = 0, int lineNum = 0) _WX_WANT_DELETE_VOID = void operator delete (void * buf) - _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET = void operator delete (void *buf, const char *_fname, size_t _line) _WX_WANT_DELETE_VOID_WXCHAR_INT = void operator delete(void *buf, wxChar*, int) _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT = void *operator new[] (size_t size, wxChar *fileName , int lineNum = 0) _WX_WANT_ARRAY_DELETE_VOID = void operator delete[] (void *buf) @@ -179,18 +178,9 @@ inline T *wxCheckCast(const void *ptr) #if wxUSE_MEMORY_TRACING -// All compilers get this one +// All compilers get these ones #define _WX_WANT_NEW_SIZET_WXCHAR_INT - -// Everyone except Visage gets the next one -#ifndef __VISAGECPP__ - #define _WX_WANT_DELETE_VOID -#endif - -// Only visage gets this one under the correct circumstances -#if defined(__VISAGECPP__) && __DEBUG_ALLOC__ - #define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET -#endif +#define _WX_WANT_DELETE_VOID #if defined(__VISUALC__) #define _WX_WANT_DELETE_VOID_WXCHAR_INT @@ -386,10 +376,6 @@ public: void operator delete ( void * buf ); #endif -#ifdef _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET - void operator delete ( void *buf, const char *_fname, size_t _line ); -#endif - #ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT void operator delete ( void *buf, const wxChar*, int ); #endif diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h deleted file mode 100644 index 0b9bde6dcc..0000000000 --- a/include/wx/os2/accel.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/accel.h -// Purpose: wxAcceleratorTable class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ACCEL_H_ -#define _WX_ACCEL_H_ - -#include "wx/object.h" - -class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable; - -// Hold Ctrl key down -#define wxACCEL_ALT 0x01 - -// Hold Ctrl key down -#define wxACCEL_CTRL 0x02 - - // Hold Shift key down -#define wxACCEL_SHIFT 0x04 - - // Hold no key down -#define wxACCEL_NORMAL 0x00 - -class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject -{ -DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) -public: - wxAcceleratorTable(); - wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource - wxAcceleratorTable( int n - ,const wxAcceleratorEntry vaEntries[] - ); // Load from array - - virtual ~wxAcceleratorTable(); - - bool Ok() const { return IsOk(); } - bool IsOk() const; - void SetHACCEL(WXHACCEL hAccel); - WXHACCEL GetHACCEL(void) const; - - // translate the accelerator, return TRUE if done - bool Translate( WXHWND hWnd - ,WXMSG* pMsg - ) const; -}; - -WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable; - -WXDLLIMPEXP_CORE wxString wxPMTextToLabel(const wxString& rsTitle); -#endif - // _WX_ACCEL_H_ diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h deleted file mode 100644 index 984783963d..0000000000 --- a/include/wx/os2/app.h +++ /dev/null @@ -1,121 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/app.h -// Purpose: wxApp class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_APP_H_ -#define _WX_APP_H_ - -#ifdef __WATCOMC__ - -#include -#include -#include - -#else - -#include -#include - -#ifdef __EMX__ -#include -#else -#include -#undef BYTE_ORDER -#include -#define INCL_ORDERS -#endif - -#endif - -#include "wx/event.h" -#include "wx/icon.h" - -class WXDLLIMPEXP_FWD_CORE wxFrame; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxApp; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_BASE wxLog; - -WXDLLIMPEXP_DATA_CORE(extern wxApp*) wxTheApp; -WXDLLIMPEXP_DATA_CORE(extern HAB) vHabmain; - -// Force an exit from main loop -void WXDLLIMPEXP_CORE wxExit(void); - -// Yield to other apps/messages -bool WXDLLIMPEXP_CORE wxYield(void); - -extern MRESULT EXPENTRY wxWndProc( HWND - ,ULONG - ,MPARAM - ,MPARAM - ); - - -// Represents the application. Derive OnInit and declare -// a new App object to start application -class WXDLLIMPEXP_CORE wxApp : public wxAppBase -{ - DECLARE_DYNAMIC_CLASS(wxApp) - -public: - wxApp(); - virtual ~wxApp(); - - // override base class (pure) virtuals - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(void); - - virtual bool OnInitGui(void); - - virtual void WakeUpIdle(void); - - virtual void SetPrintMode(int mode) { m_nPrintMode = mode; } - virtual int GetPrintMode(void) const { return m_nPrintMode; } - - // implementation only - void OnIdle(wxIdleEvent& rEvent); - void OnEndSession(wxCloseEvent& rEvent); - void OnQueryEndSession(wxCloseEvent& rEvent); - - int AddSocketHandler(int handle, int mask, - void (*callback)(void*), void * gsock); - void RemoveSocketHandler(int handle); - void HandleSockets(); - -protected: - bool m_bShowOnInit; - int m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT - - // - // PM-specific wxApp definitions */ - // -private: - int m_maxSocketHandles; - int m_maxSocketNr; - int m_lastUsedHandle; - fd_set m_readfds; - fd_set m_writefds; - void* m_sockCallbackInfo; - -public: - - // Implementation - static bool RegisterWindowClasses(HAB vHab); - -public: - int m_nCmdShow; - HMQ m_hMq; - -protected: - DECLARE_EVENT_TABLE() - wxDECLARE_NO_COPY_CLASS(wxApp); -}; -#endif - // _WX_APP_H_ diff --git a/include/wx/os2/apptbase.h b/include/wx/os2/apptbase.h deleted file mode 100644 index d4476b649a..0000000000 --- a/include/wx/os2/apptbase.h +++ /dev/null @@ -1,35 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/apptbase.h -// Purpose: declaration of wxAppTraits for OS2 -// Author: Stefan Neis -// Modified by: -// Created: 22.09.2003 -// Copyright: (c) 2003 Stefan Neis -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_APPTBASE_H_ -#define _WX_OS2_APPTBASE_H_ - -// ---------------------------------------------------------------------------- -// wxAppTraits: the OS2 version adds extra hooks needed by OS2-only code -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase -{ -public: - // wxThread helpers - // ---------------- - - // Initialize PM facilities to enable GUI access - virtual void InitializeGui(unsigned long &ulHab); - - // Clean up message queue. - virtual void TerminateGui(unsigned long ulHab); - -#if wxUSE_SOCKETS - virtual wxFDIOManager *GetFDIOManager(); -#endif -}; - -#endif // _WX_OS2_APPTBASE_H_ diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h deleted file mode 100644 index d9d1cd8aed..0000000000 --- a/include/wx/os2/apptrait.h +++ /dev/null @@ -1,68 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/apptrait.h -// Purpose: class implementing wxAppTraits for OS/2 -// Author: Stefan Neis -// Modified by: -// Created: 22.09.2003 -// Copyright: (c) 2003 Stefan Neis -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_APPTRAIT_H_ -#define _WX_OS2_APPTRAIT_H_ - -// ---------------------------------------------------------------------------- -// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase -{ -public: -#if wxUSE_CONSOLE_EVENTLOOP - virtual wxEventLoopBase *CreateEventLoop(); -#endif // wxUSE_CONSOLE_EVENTLOOP -#if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); -#endif -}; - -#if wxUSE_GUI - -class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase -{ -public: - virtual wxEventLoopBase *CreateEventLoop(); -#if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); -#endif - virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const; - - // wxThread helpers - // ---------------- - - // Initialize PM facilities to enable GUI access - virtual void InitializeGui(unsigned long &ulHab); - - // Clean up message queue. - virtual void TerminateGui(unsigned long ulHab); -#ifdef __WXGTK__ - virtual wxString GetDesktopEnvironment() const; -#endif -#if wxUSE_SOCKETS - virtual wxFDIOManager *GetFDIOManager(); -#endif -}; - -#ifndef __WXPM__ -inline void wxGUIAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab)) -{ -} - -inline void wxGUIAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab)) -{ -} -#endif - -#endif // wxUSE_GUI - -#endif // _WX_OS2_APPTRAIT_H_ diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h deleted file mode 100644 index b4c1642395..0000000000 --- a/include/wx/os2/bitmap.h +++ /dev/null @@ -1,374 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/bitmap.h -// Purpose: wxBitmap class -// Author: David Webster -// Modified by: -// Created: 11/28/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BITMAP_H_ -#define _WX_BITMAP_H_ - -#include "wx/os2/private.h" -#include "wx/os2/gdiimage.h" -#include "wx/gdicmn.h" -#include "wx/palette.h" - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxControl; -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxMask; -class WXDLLIMPEXP_FWD_CORE wxCursor; -class WXDLLIMPEXP_FWD_CORE wxControl; -class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; - -// ---------------------------------------------------------------------------- -// Bitmap data -// -// NB: this class is private, but declared here to make it possible inline -// wxBitmap functions accessing it -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapRefData : public wxGDIImageRefData -{ -public: - wxBitmapRefData(); - wxBitmapRefData(const wxBitmapRefData &tocopy); - virtual ~wxBitmapRefData() { Free(); } - - virtual void Free(); - -public: - int m_nNumColors; - wxPalette m_vBitmapPalette; - int m_nQuality; - - // OS2-specific - // ------------ - - wxDC* m_pSelectedInto; - - // - // Optional mask for transparent drawing - // - wxMask* m_pBitmapMask; -}; // end of CLASS wxBitmapRefData - -// ---------------------------------------------------------------------------- -// wxBitmap: a mono or colour bitmap -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage, - public wxBitmapHelpers -{ -public: - // default ctor creates an invalid bitmap, you must Create() it later - wxBitmap() { Init(); } - - // Copy constructors - inline wxBitmap(const wxBitmap& rBitmap) - : wxGDIImage(rBitmap) - { - Init(); - SetHandle(rBitmap.GetHandle()); - } - - // Initialize with raw data - wxBitmap( const char bits[] - ,int nWidth - ,int nHeight - ,int nDepth = 1 - ); - - // Initialize with XPM data - wxBitmap(const char* const* bits); -#ifdef wxNEEDS_CHARPP - // needed for old GCC - wxBitmap(char** data) - { - *this = wxBitmap(const_cast(data)); - } -#endif - - // Load a resource - wxBitmap( int nId - ,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE - ); - - // For compatiability with other ports, under OS/2 does same as default ctor - inline wxBitmap( const wxString& WXUNUSED(rFilename) - ,wxBitmapType WXUNUSED(lType) - ) - { Init(); } - // New constructor for generalised creation from data - wxBitmap( const void* pData - ,wxBitmapType lType - ,int nWidth - ,int nHeight - ,int nDepth = 1 - ); - - // If depth is omitted, will create a bitmap compatible with the display - wxBitmap( int nWidth, int nHeight, int nDepth = -1 ) - { - Init(); - (void)Create(nWidth, nHeight, nDepth); - } - wxBitmap( const wxSize& sz, int nDepth = -1 ) - { - Init(); - (void)Create(sz, nDepth); - } - - wxBitmap( const wxImage& image, int depth = -1 ) - { (void)CreateFromImage(image, depth); } - - // we must have this, otherwise icons are silently copied into bitmaps using - // the copy ctor but the resulting bitmap is invalid! - inline wxBitmap(const wxIcon& rIcon) - { Init(); CopyFromIcon(rIcon); } - - wxBitmap& operator=(const wxIcon& rIcon) - { - (void)CopyFromIcon(rIcon); - - return(*this); - } - - wxBitmap& operator=(const wxCursor& rCursor) - { - (void)CopyFromCursor(rCursor); - return (*this); - } - - virtual ~wxBitmap(); - - wxImage ConvertToImage() const; - wxBitmap ConvertToDisabled(unsigned char brightness = 255) const; - - // get the given part of bitmap - wxBitmap GetSubBitmap(const wxRect& rRect) const; - - // copies the contents and mask of the given (colour) icon to the bitmap - bool CopyFromIcon(const wxIcon& rIcon); - - // copies the contents and mask of the given cursor to the bitmap - bool CopyFromCursor(const wxCursor& rCursor); - - virtual bool Create( int nWidth - ,int nHeight - ,int nDepth = wxBITMAP_SCREEN_DEPTH - ); - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - virtual bool Create(int width, int height, const wxDC& WXUNUSED(dc)) - { return Create(width,height); } - - virtual bool Create( const void* pData - ,wxBitmapType lType - ,int nWidth - ,int nHeight - ,int nDepth = 1 - ); - virtual bool LoadFile( int nId - ,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE - ); - virtual bool LoadFile( const wxString& rName - ,wxBitmapType lType = wxBITMAP_DEFAULT_TYPE - ); - virtual bool SaveFile( const wxString& rName - ,wxBitmapType lType - ,const wxPalette* pCmap = NULL - ); - - inline wxBitmapRefData* GetBitmapData() const - { return (wxBitmapRefData *)m_refData; } - - // raw bitmap access support functions - void *GetRawData(wxPixelDataBase& data, int bpp); - void UngetRawData(wxPixelDataBase& data); - - inline int GetQuality() const - { return (GetBitmapData() ? GetBitmapData()->m_nQuality : 0); } - - void SetQuality(int nQ); - - wxPalette* GetPalette() const - { return (GetBitmapData() ? (& GetBitmapData()->m_vBitmapPalette) : NULL); } - - void SetPalette(const wxPalette& rPalette); - - inline wxMask* GetMask() const - { return (GetBitmapData() ? GetBitmapData()->m_pBitmapMask : NULL); } - - void SetMask(wxMask* pMask) ; - - // Implementation -public: - inline void SetHBITMAP(WXHBITMAP hBmp) - { SetHandle((WXHANDLE)hBmp); } - - inline WXHBITMAP GetHBITMAP() const - { return (WXHBITMAP)GetHandle(); } - - inline void SetSelectedInto(wxDC* pDc) - { if (GetBitmapData()) GetBitmapData()->m_pSelectedInto = pDc; } - - inline wxDC* GetSelectedInto() const - { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : NULL); } - - inline bool IsMono(void) const { return m_bIsMono; } - - // An OS/2 version that probably doesn't do anything like the msw version - wxBitmap GetBitmapForDC(wxDC& rDc) const; - -protected: - // common part of all ctors - void Init(); - - inline virtual wxGDIImageRefData* CreateData() const - { return new wxBitmapRefData; } - - bool CreateFromImage(const wxImage& image, int depth); - - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - bool CopyFromIconOrCursor(const wxGDIImage& rIcon); - - bool m_bIsMono; - DECLARE_DYNAMIC_CLASS(wxBitmap) -}; // end of CLASS wxBitmap - -// ---------------------------------------------------------------------------- -// wxMask: a mono bitmap used for drawing bitmaps transparently. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMask : public wxObject -{ -public: - wxMask(); - wxMask( const wxMask& tocopy); - - // Construct a mask from a bitmap and a colour indicating the transparent - // area - wxMask( const wxBitmap& rBitmap - ,const wxColour& rColour - ); - - // Construct a mask from a bitmap and a palette index indicating the - // transparent area - wxMask( const wxBitmap& rBitmap - ,int nPaletteIndex - ); - - // Construct a mask from a mono bitmap (copies the bitmap). - wxMask(const wxBitmap& rBitmap); - - // construct a mask from the givne bitmap handle - wxMask(WXHBITMAP hBmp) - { m_hMaskBitmap = hBmp; } - - virtual ~wxMask(); - - bool Create( const wxBitmap& bitmap - ,const wxColour& rColour - ); - bool Create( const wxBitmap& rBitmap - ,int nPaletteIndex - ); - bool Create(const wxBitmap& rBitmap); - - // Implementation - WXHBITMAP GetMaskBitmap() const - { return m_hMaskBitmap; } - void SetMaskBitmap(WXHBITMAP hBmp) - { m_hMaskBitmap = hBmp; } - -protected: - WXHBITMAP m_hMaskBitmap; - DECLARE_DYNAMIC_CLASS(wxMask) -}; // end of CLASS wxMask - -// ---------------------------------------------------------------------------- -// wxBitmapHandler is a class which knows how to load/save bitmaps to/from file -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler -{ -public: - inline wxBitmapHandler() - { m_lType = wxBITMAP_TYPE_INVALID; } - - inline wxBitmapHandler( const wxString& rName - ,const wxString& rExt - ,wxBitmapType lType - ) - : wxGDIImageHandler( rName - ,rExt - ,lType) - { - } - - // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the - // old class which worked only with bitmaps - virtual bool Create( wxBitmap* pBitmap - ,const void* pData - ,wxBitmapType lType - ,int nWidth - ,int nHeight - ,int nDepth = 1 - ); - virtual bool LoadFile( wxBitmap* pBitmap - ,int nId - ,wxBitmapType lType - ,int nDesiredWidth - ,int nDesiredHeight - ); - virtual bool LoadFile( wxBitmap* pBitmap - ,const wxString& rName - ,wxBitmapType lType - ,int nDesiredWidth - ,int nDesiredHeight - ); - virtual bool SaveFile( wxBitmap* pBitmap - ,const wxString& rName - ,wxBitmapType lType - ,const wxPalette* pPalette = NULL - ) const; - - virtual bool Create( wxGDIImage* pImage - ,const void* pData - ,wxBitmapType lFlags - ,int nWidth - ,int nHeight - ,int nDepth = 1 - ); - virtual bool Load( wxGDIImage* pImage - ,int nId - ,wxBitmapType lFlags - ,int nDesiredWidth - ,int nDesiredHeight - ); - virtual bool Save( const wxGDIImage* pImage - ,const wxString& rName - ,wxBitmapType lType - ) const; -private: - inline virtual bool Load( wxGDIImage* WXUNUSED(pImage) - ,const wxString& WXUNUSED(rName) - ,WXHANDLE WXUNUSED(hPs) - ,wxBitmapType WXUNUSED(lFlags) - ,int WXUNUSED(nDesiredWidth) - ,int WXUNUSED(nDesiredHeight) - ) - { return false; } - DECLARE_DYNAMIC_CLASS(wxBitmapHandler) -}; // end of CLASS wxBitmapHandler - -#endif - // _WX_BITMAP_H_ diff --git a/include/wx/os2/blank.ptr b/include/wx/os2/blank.ptr deleted file mode 100644 index bc209be62b..0000000000 Binary files a/include/wx/os2/blank.ptr and /dev/null differ diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h deleted file mode 100644 index 1b7c5ab278..0000000000 --- a/include/wx/os2/bmpbuttn.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/bmpbuttn.h -// Purpose: wxBitmapButton class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BMPBUTTN_H_ -#define _WX_BMPBUTTN_H_ - -#include "wx/button.h" -#include "wx/dcclient.h" - -WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; - -#define wxDEFAULT_BUTTON_MARGIN 4 - -class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase -{ -public: - inline wxBitmapButton() - { - m_marginX = wxDEFAULT_BUTTON_MARGIN; - m_marginY = wxDEFAULT_BUTTON_MARGIN; - } - inline wxBitmapButton( wxWindow* pParent - ,wxWindowID vId - ,const wxBitmap& rBitmap - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxBU_AUTODRAW - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxButtonNameStr - ) - { - Create( pParent - ,vId - ,rBitmap - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxBitmap& rBitmap - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxBU_AUTODRAW - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxButtonNameStr - ); - - virtual void SetLabel(const wxBitmap& rBitmap) - { - SetBitmapLabel(rBitmap); - } - - // - // Implementation - // - virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem); - -private: - - virtual void DrawFace( wxClientDC& rDC - ,bool bSel - ); - virtual void DrawButtonFocus(wxClientDC& rDC); - virtual void DrawButtonDisable( wxClientDC& rDC - ,wxBitmap& rBmp - ); - DECLARE_DYNAMIC_CLASS(wxBitmapButton) - - virtual void SetLabel(const wxString& rsString) - { - wxButton::SetLabel(rsString); - } -}; // end of CLASS wxBitmapButton - -#endif // _WX_BMPBUTTN_H_ - diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h deleted file mode 100644 index 6b049b271d..0000000000 --- a/include/wx/os2/brush.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/brush.h -// Purpose: wxBrush class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BRUSH_H_ -#define _WX_BRUSH_H_ - -#include "wx/bitmap.h" - -// Brush -class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase -{ -public: - wxBrush(); - wxBrush(const wxColour& rCol, wxBrushStyle nStyle = wxBRUSHSTYLE_SOLID); - wxBrush(const wxBitmap& rStipple); - virtual ~wxBrush(); - - bool operator == (const wxBrush& rBrush) const; - inline bool operator != (const wxBrush& rBrush) const { return !(*this == rBrush); } - - virtual void SetColour(const wxColour& rColour); - virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush); - virtual void SetPS(HPS hPS); - virtual void SetStyle(wxBrushStyle nStyle); - virtual void SetStipple(const wxBitmap& rStipple); - - wxColour GetColour(void) const; - wxBrushStyle GetStyle(void) const; - wxBitmap* GetStipple(void) const; - int GetPS(void) const; - - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - wxBrush(const wxColour& col, int style); - - wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxBrushStyle)style); } - - // - // Implementation - // - - // - // Useful helper: create the brush resource - // - bool RealizeResource(void); - virtual WXHANDLE GetResourceHandle(void) const; - bool FreeResource(bool bForce = false); - bool IsFree(void) const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - DECLARE_DYNAMIC_CLASS(wxBrush) -}; // end of CLASS wxBrush - -#endif - // _WX_BRUSH_H_ diff --git a/include/wx/os2/bullseye.ptr b/include/wx/os2/bullseye.ptr deleted file mode 100644 index ce684b465b..0000000000 Binary files a/include/wx/os2/bullseye.ptr and /dev/null differ diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h deleted file mode 100644 index 134c4ce017..0000000000 --- a/include/wx/os2/button.h +++ /dev/null @@ -1,95 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/button.h -// Purpose: wxButton class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_BUTTON_H_ -#define _WX_BUTTON_H_ - -#include "wx/control.h" - -// Pushbutton -class WXDLLIMPEXP_CORE wxButton: public wxButtonBase -{ -public: - inline wxButton() {} - inline wxButton( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel = wxEmptyString - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxButtonNameStr - ) - { - Create( pParent - ,vId - ,rsLabel - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel = wxEmptyString - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxButtonNameStr - ); - - virtual ~wxButton(); - - virtual wxWindow *SetDefault(); - - static wxSize GetDefaultSize(void); - virtual void Command(wxCommandEvent& rEvent); - virtual bool OS2Command( WXUINT uParam - ,WXWORD vId - ); - virtual WXHBRUSH OnCtlColor( WXHDC hDC - ,WXHWND hWnd - ,WXUINT uCtlColor - ,WXUINT uMessage - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - void MakeOwnerDrawn(void); - - virtual MRESULT WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - -protected: - - bool SendClickEvent(void); - void SetTmpDefault(void); - void UnsetTmpDefault(void); - - static void SetDefaultStyle( wxButton* pButton - ,bool bOn - ); - - virtual wxSize DoGetBestSize(void) const; - virtual WXDWORD OS2GetStyle( long style - ,WXDWORD* exstyle - ) const; -private: - DECLARE_DYNAMIC_CLASS(wxButton) -}; // end of CLASS wxButton - -#endif - // _WX_BUTTON_H_ - diff --git a/include/wx/os2/cdrom.ico b/include/wx/os2/cdrom.ico deleted file mode 100644 index e9e2364af1..0000000000 Binary files a/include/wx/os2/cdrom.ico and /dev/null differ diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h deleted file mode 100644 index 6514fdd2d5..0000000000 --- a/include/wx/os2/checkbox.h +++ /dev/null @@ -1,116 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/checkbox.h -// Purpose: wxCheckBox class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHECKBOX_H_ -#define _WX_CHECKBOX_H_ - -#include "wx/control.h" - -// Checkbox item (single checkbox) -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase -{ - public: - inline wxCheckBox() { } - inline wxCheckBox( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxCheckBoxNameStr - ) - { - Create( pParent - ,vId - ,rsLabel - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxCheckBoxNameStr - ); - - virtual void SetValue(bool bValue); - virtual bool GetValue(void) const ; - - virtual bool OS2Command( WXUINT uParam - ,WXWORD wId - ); - virtual void SetLabel(const wxString& rsLabel); - virtual void Command(wxCommandEvent& rEvent); - -protected: - virtual wxSize DoGetBestSize(void) const; -private: - DECLARE_DYNAMIC_CLASS(wxCheckBox) -}; - -class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox -{ - public: - - inline wxBitmapCheckBox() { m_nCheckWidth = -1; m_nCheckHeight = -1; } - inline wxBitmapCheckBox( wxWindow* pParent - ,wxWindowID vId - ,const wxBitmap* pLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxCheckBoxNameStr - ) - { - Create( pParent - ,vId - ,pLabel - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxBitmap* pLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxCheckBoxNameStr - ); - - virtual void SetLabel(const wxBitmap& rBitmap); - - int m_nCheckWidth; - int m_nCheckHeight; - -private: - - virtual void SetLabel(const wxString& rsString) - { wxCheckBox::SetLabel(rsString); } - DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox) -}; -#endif - // _WX_CHECKBOX_H_ diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h deleted file mode 100644 index 04e5249509..0000000000 --- a/include/wx/os2/checklst.h +++ /dev/null @@ -1,88 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/checklst.h -// Purpose: wxCheckListBox class - a listbox with checkable items -// Note: this is an optional class. -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHECKLST_H_ -#define _WX_CHECKLST_H_ - -#include - -#include "wx/defs.h" - -class wxOwnerDrawn; // so the compiler knows, it is a class. - -class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase -{ -public: - // - // Ctors - // - wxCheckListBox(); - wxCheckListBox( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& vSize = wxDefaultSize - ,int nStrings = 0 - ,const wxString asChoices[] = NULL - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxListBoxNameStr - ); - wxCheckListBox( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos - ,const wxSize& vSize - ,const wxArrayString& asChoices - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxListBoxNameStr - ); - - // - // Override base class virtuals - // - virtual void Delete(unsigned int n); - - virtual bool SetFont(const wxFont &rFont); - - // - // Items may be checked - // - bool IsChecked(unsigned int uiIndex) const; - void Check(unsigned int uiIndex, bool bCheck = true); - - // - // Accessors - // - size_t GetItemHeight(void) const { return m_nItemHeight; } - -protected: - // - // We create our items ourselves and they have non-standard size, - // so we need to override these functions - // - virtual wxOwnerDrawn* CreateItem(size_t n); - virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem); - - // - // Pressing space or clicking the check box toggles the item - // - void OnChar(wxKeyEvent& rEvent); - void OnLeftClick(wxMouseEvent& rEvent); - -private: - size_t m_nItemHeight; // height of checklistbox items (the same for all) - - DECLARE_DYNAMIC_CLASS(wxCheckListBox) - DECLARE_EVENT_TABLE() -}; // end of CLASS wxCheckListBox - -#endif - // _WX_CHECKLST_H_ diff --git a/include/wx/os2/child.ico b/include/wx/os2/child.ico deleted file mode 100644 index 6d94514c93..0000000000 Binary files a/include/wx/os2/child.ico and /dev/null differ diff --git a/include/wx/os2/chkconf.h b/include/wx/os2/chkconf.h deleted file mode 100644 index 3a9151853b..0000000000 --- a/include/wx/os2/chkconf.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Name: wx/os2/chkconf.h - * Purpose: Compiler-specific configuration checking - * Author: Julian Smart - * Modified by: - * Created: 01/02/97 - * Copyright: (c) Julian Smart - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_OS2_CHKCONF_H_ -#define _WX_OS2_CHKCONF_H_ - -/* - wxDisplay is not implemented for OS/2, use stub common version instead. - */ -#if wxUSE_DISPLAY -# undef wxUSE_DISPLAY -# define wxUSE_DISPLAY 0 -#endif /* wxUSE_DISPLAY */ - -/* Watcom builds for OS/2 port are setup.h driven and setup.h is - automatically generated from include/wx/setup_inc.h so we have - to disable here features not supported currently or enable - features required */ -#ifdef __WATCOMC__ - -#if wxUSE_STACKWALKER -# undef wxUSE_STACKWALKER -# define wxUSE_STACKWALKER 0 -#endif /* wxUSE_STACKWALKER */ - -#if !wxUSE_POSTSCRIPT -# undef wxUSE_POSTSCRIPT -# define wxUSE_POSTSCRIPT 1 -#endif - -#if wxUSE_MS_HTML_HELP -# undef wxUSE_MS_HTML_HELP -# define wxUSE_MS_HTML_HELP 0 -#endif - -#endif /* __WATCOM__ */ - -#endif /* _WX_OS2_CHKCONF_H_ */ diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h deleted file mode 100644 index 2a5e3ae4cc..0000000000 --- a/include/wx/os2/choice.h +++ /dev/null @@ -1,134 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/choice.h -// Purpose: wxChoice class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CHOICE_H_ -#define _WX_CHOICE_H_ - -// ---------------------------------------------------------------------------- -// Choice item -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase -{ - DECLARE_DYNAMIC_CLASS(wxChoice) - -public: - // ctors - inline wxChoice() { } - virtual ~wxChoice(); - - inline wxChoice( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,int n = 0 - ,const wxString asChoices[] = NULL - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxChoiceNameStr - ) - { - Create( pParent - ,vId - ,rPos - ,rSize - ,n - ,asChoices - ,lStyle - ,rValidator - ,rsName - ); - } - - inline wxChoice( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos - ,const wxSize& rSize - ,const wxArrayString& asChoices - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxChoiceNameStr - ) - { - Create( pParent - ,vId - ,rPos - ,rSize - ,asChoices - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,int n = 0 - ,const wxString asChoices[] = NULL - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxChoiceNameStr - ); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos - ,const wxSize& rSize - ,const wxArrayString& asChoices - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxChoiceNameStr - ); - - // - // Implement base class virtuals - // - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(void); - - virtual unsigned int GetCount() const; - virtual int GetSelection(void) const; - virtual void SetSelection(int n); - - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& rsStr); - - // - // OS2 only - // - virtual bool OS2Command( WXUINT uParam - ,WXWORD wId - ); - MRESULT OS2WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - -protected: - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, - wxClientDataType type); - - virtual void DoSetItemClientData(unsigned int n, void* pClientData); - virtual void* DoGetItemClientData(unsigned int n) const; - virtual wxSize DoGetBestSize(void) const; - virtual void DoSetSize( int nX - ,int nY - ,int nWidth - ,int nHeight - ,int nsizeFlags = wxSIZE_AUTO - ); - void Free(void); -}; // end of CLASS wxChoice - -#endif // _WX_CHOICE_H_ diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h deleted file mode 100644 index ddd31b872c..0000000000 --- a/include/wx/os2/clipbrd.h +++ /dev/null @@ -1,95 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/clipbrd.h -// Purpose: Clipboard functionality. -// Note: this functionality is under review, and -// is derived from wxWidgets 1.xx code. Please contact -// the wxWidgets developers for further information. -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CLIPBRD_H_ -#define _WX_CLIPBRD_H_ - -#if wxUSE_CLIPBOARD - -#include "wx/list.h" -#include "wx/module.h" -#include "wx/dataobj.h" // for wxDataFormat - -// These functions superceded by wxClipboard, but retained in order to -// implement wxClipboard, and for compatibility. - -// open/close the clipboard -WXDLLIMPEXP_CORE bool wxOpenClipboard(); -WXDLLIMPEXP_CORE bool wxIsClipboardOpened(); -#define wxClipboardOpen wxIsClipboardOpened -WXDLLIMPEXP_CORE bool wxCloseClipboard(); - -// get/set data -WXDLLIMPEXP_CORE bool wxEmptyClipboard(); -WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, - const void *data, - int width = 0, int height = 0); -WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat, - long *len = NULL); - -// clipboard formats -WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); -WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); -WXDLLIMPEXP_CORE int wxRegisterClipboardFormat(wxChar *formatName); -WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, - wxChar *formatName, - int maxCount); - -//----------------------------------------------------------------------------- -// wxClipboard -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDataObject; -class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase -{ - DECLARE_DYNAMIC_CLASS(wxClipboard) - -public: - wxClipboard(); - virtual ~wxClipboard(); - - // open the clipboard before SetData() and GetData() - virtual bool Open(); - - // close the clipboard after SetData() and GetData() - virtual void Close(); - - // query whether the clipboard is opened - virtual bool IsOpened() const; - - // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ); - - // add to the clipboard data. - virtual bool AddData( wxDataObject *data ); - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ); - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ); - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear(); - - // flushes the clipboard: this means that the data which is currently on - // clipboard will stay available even after the application exits (possibly - // eating memory), otherwise the clipboard will be emptied on exit - virtual bool Flush(); - -private: - bool m_clearOnExit; -}; - -#endif // wxUSE_CLIPBOARD -#endif // _WX_CLIPBRD_H_ diff --git a/include/wx/os2/clock.ptr b/include/wx/os2/clock.ptr deleted file mode 100644 index 45ac051667..0000000000 Binary files a/include/wx/os2/clock.ptr and /dev/null differ diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h deleted file mode 100644 index 857e533c41..0000000000 --- a/include/wx/os2/colour.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/colour.h -// Purpose: wxColour class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLOUR_H_ -#define _WX_COLOUR_H_ - -#include "wx/object.h" - -// Colour -class WXDLLIMPEXP_CORE wxColour: public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - // Copy ctors and assignment operators - wxColour(const wxColour& rCol); - wxColour(const wxColour* pCol); - wxColour&operator = (const wxColour& rCol); - - // Dtor - virtual ~wxColour(); - - // Accessors - virtual bool IsOk(void) const { return m_bIsInit; } - - unsigned char Red(void) const { return m_cRed; } - unsigned char Green(void) const { return m_cGreen; } - unsigned char Blue(void) const { return m_cBlue; } - - // Comparison - bool operator == (const wxColour& rColour) const - { - return (m_bIsInit == rColour.m_bIsInit - && m_cRed == rColour.m_cRed - && m_cGreen == rColour.m_cGreen - && m_cBlue == rColour.m_cBlue - ); - } - - bool operator != (const wxColour& rColour) const { return !(*this == rColour); } - - WXCOLORREF GetPixel(void) const { return m_vPixel; } - - -private: - - // Helper function - void Init(); - - bool m_bIsInit; - unsigned char m_cRed; - unsigned char m_cBlue; - unsigned char m_cGreen; - - virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - -public: - WXCOLORREF m_vPixel ; -private: - DECLARE_DYNAMIC_CLASS(wxColour) -}; // end of class wxColour - -#endif - // _WX_COLOUR_H_ diff --git a/include/wx/os2/colours.bmp b/include/wx/os2/colours.bmp deleted file mode 100644 index 62d1f8045f..0000000000 Binary files a/include/wx/os2/colours.bmp and /dev/null differ diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h deleted file mode 100644 index 0678cd791c..0000000000 --- a/include/wx/os2/combobox.h +++ /dev/null @@ -1,137 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/combobox.h -// Purpose: wxComboBox class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COMBOBOX_H_ -#define _WX_COMBOBOX_H_ - -#include "wx/choice.h" -#include "wx/textentry.h" - -#if wxUSE_COMBOBOX - -// Combobox item -class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, - public wxTextEntry -{ - - public: - inline wxComboBox() {} - - inline wxComboBox( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsValue = wxEmptyString - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,int n = 0 - ,const wxString asChoices[] = NULL - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxComboBoxNameStr - ) - { - Create( pParent - ,vId - ,rsValue - ,rPos - ,rSize - ,n - ,asChoices - ,lStyle - ,rValidator - ,rsName - ); - } - - inline wxComboBox( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsValue - ,const wxPoint& rPos - ,const wxSize& rSize - ,const wxArrayString& asChoices - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxComboBoxNameStr - ) - { - Create( pParent - ,vId - ,rsValue - ,rPos - ,rSize - ,asChoices - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsValue = wxEmptyString - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,int n = 0 - ,const wxString asChoices[] = NULL - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxComboBoxNameStr - ); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsValue - ,const wxPoint& rPos - ,const wxSize& rSize - ,const wxArrayString& asChoices - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxComboBoxNameStr - ); - - // See wxComboBoxBase discussion of IsEmpty(). - bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } - bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } - - // resolve ambiguities among virtual functions inherited from both base - // classes - virtual void Clear(); - virtual wxString GetValue() const; - virtual void SetValue(const wxString& value); - virtual wxString GetStringSelection() const - { return wxChoice::GetStringSelection(); } - - inline virtual void SetSelection(int n) { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to) - { wxTextEntry::SetSelection(from, to); } - virtual int GetSelection() const { return wxChoice::GetSelection(); } - virtual void GetSelection(long *from, long *to) const - { wxTextEntry::GetSelection(from, to); } - - virtual bool IsEditable() const; - - virtual bool OS2Command( WXUINT uParam - ,WXWORD wId - ); - bool ProcessEditMsg( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - -private: - // implement wxTextEntry pure virtual methods - virtual wxWindow *GetEditableWindow() { return this; } - virtual WXHWND GetEditHWND() const { return m_hWnd; } - - DECLARE_DYNAMIC_CLASS(wxComboBox) -}; // end of CLASS wxComboBox - -#endif // wxUSE_COMBOBOX -#endif - // _WX_COMBOBOX_H_ diff --git a/include/wx/os2/computer.ico b/include/wx/os2/computer.ico deleted file mode 100644 index 07d8e0e29a..0000000000 Binary files a/include/wx/os2/computer.ico and /dev/null differ diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h deleted file mode 100644 index 0d799ed1cc..0000000000 --- a/include/wx/os2/control.h +++ /dev/null @@ -1,129 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/control.h -// Purpose: wxControl class -// Author: David Webster -// Modified by: -// Created: 09/17/99 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CONTROL_H_ -#define _WX_CONTROL_H_ - -#include "wx/dynarray.h" - -// General item class -class WXDLLIMPEXP_CORE wxControl : public wxControlBase -{ - DECLARE_ABSTRACT_CLASS(wxControl) - -public: - wxControl(); - wxControl( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxControlNameStr - ) - { - Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxControlNameStr - ); - - virtual void SetLabel(const wxString& rsLabel); - virtual wxString GetLabel() const { return m_label; } - - // - // Simulates an event - // - virtual void Command(wxCommandEvent& rEvent) { ProcessCommand(rEvent); } - - // - // Implementation from now on - // -------------------------- - // - - // - // Calls the callback and appropriate event handlers - // - bool ProcessCommand(wxCommandEvent& rEvent); - - // - // For ownerdraw items - // - virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; } - virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; } - - wxArrayLong& GetSubcontrols() { return m_aSubControls; } - void OnEraseBackground(wxEraseEvent& rEvent); - virtual WXHBRUSH OnCtlColor( WXHDC hDC - ,WXHWND pWnd - ,WXUINT nCtlColor - ,WXUINT uMessage - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - -public: - // - // For controls like radiobuttons which are really composite - // - wxArrayLong m_aSubControls; - - virtual wxSize DoGetBestSize(void) const; - - // - // Create the control of the given PM class - // - bool OS2CreateControl( const wxChar* zClassname - ,const wxString& rsLabel - ,const wxPoint& rPos - ,const wxSize& rSize - ,long lStyle - ); - // - // Create the control of the given class with the given style, returns false - // if creation failed. - // - bool OS2CreateControl( const wxChar* zClassname - ,WXDWORD dwStyle - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,const wxString& rsLabel = wxEmptyString - ,WXDWORD dwExstyle = (WXDWORD)-1 - ); - - // - // Default style for the control include WS_TABSTOP if it AcceptsFocus() - // - virtual WXDWORD OS2GetStyle( long lStyle - ,WXDWORD* pdwExstyle - ) const; - - inline int GetXComp(void) const {return m_nXComp;} - inline int GetYComp(void) const {return m_nYComp;} - inline void SetXComp(const int nXComp) {m_nXComp = nXComp;} - inline void SetYComp(const int nYComp) {m_nYComp = nYComp;} - -private: - int m_nXComp; - int m_nYComp; - - wxString m_label; - WXDWORD m_dwStyle; - - DECLARE_EVENT_TABLE() -}; // end of wxControl - -#endif // _WX_CONTROL_H_ diff --git a/include/wx/os2/cross.bmp b/include/wx/os2/cross.bmp deleted file mode 100644 index 079cb0dd58..0000000000 Binary files a/include/wx/os2/cross.bmp and /dev/null differ diff --git a/include/wx/os2/csquery.bmp b/include/wx/os2/csquery.bmp deleted file mode 100644 index 7a63555268..0000000000 Binary files a/include/wx/os2/csquery.bmp and /dev/null differ diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h deleted file mode 100644 index 8dd6b02780..0000000000 --- a/include/wx/os2/cursor.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/cursor.h -// Purpose: wxCursor class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_CURSOR_H_ -#define _WX_CURSOR_H_ - -#include "wx/bitmap.h" - -class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData -{ -public: - wxCursorRefData(); - virtual ~wxCursorRefData() { Free(); } - virtual void Free(void); - bool m_bDestroyCursor; -}; // end of CLASS wxCursorRefData - -#define M_CURSORDATA ((wxCursorRefData *)m_refData) -#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData) - -// Cursor -class WXDLLIMPEXP_CORE wxCursor: public wxBitmap -{ -public: - wxCursor(); - - wxCursor(const wxImage& rImage); - - wxCursor( const wxString& rsName - ,wxBitmapType lType = wxCURSOR_DEFAULT_TYPE - ,int nHotSpotX = 0 - ,int nHotSpotY = 0 - ); - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif - inline ~wxCursor() { } - - inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); } - inline void SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); } - -protected: - void InitFromStock(wxStockCursor); - inline virtual wxGDIImageRefData* CreateData(void) const { return (new wxCursorRefData); } - -private: - DECLARE_DYNAMIC_CLASS(wxCursor) -}; // end of CLASS wxCursor - -#endif - // _WX_CURSOR_H_ diff --git a/include/wx/os2/dataform.h b/include/wx/os2/dataform.h deleted file mode 100644 index 1d6896c247..0000000000 --- a/include/wx/os2/dataform.h +++ /dev/null @@ -1,50 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dataform.h -// Purpose: declaration of the wxDataFormat class -// Author: Stefan Csomor -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1999 Stefan Csomor -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_DATAFORM_H -#define _WX_OS2_DATAFORM_H - -class wxDataFormat -{ -public: - wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; } - wxDataFormat(const wxString& zFormat) { SetId(zFormat); } - - wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); } - wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); } - - // - // Comparison (must have both versions) - // - bool operator==(wxDataFormatId eFormat) const { return (m_uFormat == (unsigned int)eFormat); } - bool operator!=(wxDataFormatId eFormat) const { return (m_uFormat != (unsigned int)eFormat); } - bool operator==(const wxDataFormat& rFormat) const { return (m_uFormat == rFormat.m_uFormat); } - bool operator!=(const wxDataFormat& rFormat) const { return (m_uFormat != rFormat.m_uFormat); } - operator unsigned int(void) const { return m_uFormat; } - - unsigned int GetFormatId(void) const { return (unsigned int)m_uFormat; } - unsigned int GetType(void) const { return (unsigned int)m_uFormat; } - - bool IsStandard(void) const; - - void SetType(unsigned int uType){ m_uFormat = uType; } - - // - // String ids are used for custom types - this SetId() must be used for - // application-specific formats - // - wxString GetId(void) const; - void SetId(const wxString& pId); - -private: - unsigned int m_uFormat; -}; // end of CLASS wxDataFormat - -#endif // _WX_GTK_DATAFORM_H diff --git a/include/wx/os2/dataobj.h b/include/wx/os2/dataobj.h deleted file mode 100644 index e83ded21bb..0000000000 --- a/include/wx/os2/dataobj.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dataobj.h -// Purpose: declaration of the wxDataObject -// Author: Stefan Csomor -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_DATAOBJ_H_ -#define _WX_OS2_DATAOBJ_H_ - -// ---------------------------------------------------------------------------- -// wxDataObject is the same as wxDataObjectBase under wxGTK -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -{ -public: - wxDataObject(); - virtual ~wxDataObject(); - - virtual bool IsSupportedFormat( const wxDataFormat& eFormat - ,Direction eDir = Get - ) const - { - return(IsSupported( eFormat - ,eDir - )); - } - - PDRAGITEM GetInterface(void) const {return m_pDataObject;} -private: - PDRAGITEM m_pDataObject; -}; - -#endif // _WX_OS2_DATAOBJ_H_ diff --git a/include/wx/os2/dataobj2.h b/include/wx/os2/dataobj2.h deleted file mode 100644 index b3e3d319d4..0000000000 --- a/include/wx/os2/dataobj2.h +++ /dev/null @@ -1,84 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dataobj2.h -// Purpose: declaration of standard wxDataObjectSimple-derived classes -// Author: Stefan Csomor (adapted from Robert Roebling's gtk port -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_DATAOBJ2_H_ -#define _WX_OS2_DATAOBJ2_H_ - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject is a specialization of wxDataObject for bitmaps -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject(); - wxBitmapDataObject(const wxBitmap& bitmap); - - // destr - virtual ~wxBitmapDataObject(); - - // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap); - - // implement base class pure virtuals - // ---------------------------------- - - virtual size_t GetDataSize() const { return m_pngSize; } - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - -protected: - void Init() { m_pngData = NULL; m_pngSize = 0; } - void Clear() { free(m_pngData); } - void ClearAll() { Clear(); Init(); } - - size_t m_pngSize; - void *m_pngData; - - void DoConvertToPng(); - -private: - // Virtual function hiding supression - size_t GetDataSize(const wxDataFormat& rFormat) const - { return(wxDataObjectSimple::GetDataSize(rFormat)); } - bool GetDataHere(const wxDataFormat& rFormat, void* pBuf) const - { return(wxDataObjectSimple::GetDataHere(rFormat, pBuf)); } - bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf) - { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); } -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject is a specialization of wxDataObject for file names -// ---------------------------------------------------------------------------- - -class wxFileDataObject : public wxFileDataObjectBase -{ -public: - // implement base class pure virtuals - // ---------------------------------- - - void AddFile( const wxString &filename ); - - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - -private: - // Virtual function hiding supression - size_t GetDataSize(const wxDataFormat& rFormat) const - { return(wxDataObjectSimple::GetDataSize(rFormat)); } - bool GetDataHere(const wxDataFormat& rFormat, void* pBuf) const - { return(wxDataObjectSimple::GetDataHere(rFormat, pBuf)); } - bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf) - { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); } -}; - -#endif // _WX_OS2_DATAOBJ2_H_ diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h deleted file mode 100644 index 3db23c71b5..0000000000 --- a/include/wx/os2/dc.h +++ /dev/null @@ -1,407 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dc.h -// Purpose: wxDC class -// Author: David Webster -// Modified by: -// Created: 08/26/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DC_H_ -#define _WX_DC_H_ - -#include "wx/defs.h" -#include "wx/dc.h" - -// --------------------------------------------------------------------------- -// macros -// --------------------------------------------------------------------------- - -// Logical to device -// Absolute -#define XLOG2DEV(x) (x) -#define YLOG2DEV(y) (y) - -// Relative -#define XLOG2DEVREL(x) (x) -#define YLOG2DEVREL(y) (y) - -// Device to logical -// Absolute -#define XDEV2LOG(x) (x) - -#define YDEV2LOG(y) (y) - -// Relative -#define XDEV2LOGREL(x) (x) -#define YDEV2LOGREL(y) (y) - -/* - * Have the same macros as for XView but not for every operation: - * just for calculating window/viewport extent (a better way of scaling). - */ - -// Logical to device -// Absolute -#define MS_XLOG2DEV(x) LogicalToDevice(x) - -#define MS_YLOG2DEV(y) LogicalToDevice(y) - -// Relative -#define MS_XLOG2DEVREL(x) LogicalToDeviceXRel(x) -#define MS_YLOG2DEVREL(y) LogicalToDeviceYRel(y) - -// Device to logical -// Absolute -#define MS_XDEV2LOG(x) DeviceToLogicalX(x) - -#define MS_YDEV2LOG(y) DeviceToLogicalY(y) - -// Relative -#define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x) -#define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y) - -#define YSCALE(y) (yorigin - (y)) - -#define wx_round(a) (int)((a)+.5) - -#if wxUSE_DC_CACHEING -/* - * Cached blitting, maintaining a cache - * of bitmaps required for transparent blitting - * instead of constant creation/deletion - */ - -class wxDCCacheEntry : public wxObject -{ -public: - wxDCCacheEntry( WXHBITMAP hBitmap - ,int nWidth - ,int nHeight - ,int nDepth - ); - wxDCCacheEntry( HPS hPS - ,int nDepth - ); - virtual ~wxDCCacheEntry(); - - WXHBITMAP m_hBitmap; - HPS m_hPS; - int m_nWidth; - int m_nHeight; - int m_nDepth; -}; // end of CLASS wxDCCacheEntry -#endif - -// this is an ABC: use one of the derived classes to create a DC associated -// with a window, screen, printer and so on -class WXDLLIMPEXP_CORE wxPMDCImpl : public wxDCImpl -{ - DECLARE_DYNAMIC_CLASS(wxDC) - -public: - wxPMDCImpl(wxDC *owner, WXHDC hDC); - virtual ~wxPMDCImpl(); - - // implement base class pure virtuals - // ---------------------------------- - - virtual void Clear(); - - virtual bool StartDoc(const wxString& rsMessage); - virtual void EndDoc(); - - virtual void StartPage(); - virtual void EndPage(); - - virtual void SetFont(const wxFont& rFont); - virtual void SetPen(const wxPen& rPen); - virtual void SetBrush(const wxBrush& rBrush); - virtual void SetBackground(const wxBrush& rBrush); - virtual void SetBackgroundMode(int nMode); - virtual void SetPalette(const wxPalette& rPalette); - - virtual void DestroyClippingRegion(); - - virtual wxCoord GetCharHeight() const; - virtual wxCoord GetCharWidth() const; - - virtual bool CanDrawBitmap() const; - virtual bool CanGetTextExtent() const; - virtual int GetDepth() const; - virtual wxSize GetPPI() const; - - virtual void SetMapMode(wxMappingMode nMode); - virtual void SetUserScale( double dX - ,double dY - ); - virtual void SetLogicalScale( double dX - ,double dY - ); - virtual void SetLogicalOrigin( wxCoord vX - ,wxCoord vY - ); - virtual void SetDeviceOrigin( wxCoord vX - ,wxCoord vY - ); - virtual void SetAxisOrientation( bool bXLeftRight - ,bool bYBottomUp - ); - virtual void SetLogicalFunction(wxRasterOperationMode nFunction); - - // implementation from now on - // -------------------------- - - virtual void SetRop(WXHDC hCdc); - virtual void SelectOldObjects(WXHDC hDc); - - wxWindow* GetWindow() const { return m_pCanvas; } - void SetWindow(wxWindow* pWin) { m_pCanvas = pWin; } - - WXHDC GetHDC() const { return m_hDC; } - void SetHDC( WXHDC hDc - ,bool bOwnsDC = FALSE - ) - { - m_hDC = hDc; - m_bOwnsDC = bOwnsDC; - } - - HPS GetHPS() const { return m_hPS; } - void SetHPS(HPS hPS) - { - m_hPS = hPS; - } - const wxBitmap& GetSelectedBitmap() const { return m_vSelectedBitmap; } - wxBitmap& GetSelectedBitmap() { return m_vSelectedBitmap; } - - void UpdateClipBox(); - -#if wxUSE_DC_CACHEING - static wxDCCacheEntry* FindBitmapInCache( HPS hPS - ,int nWidth - ,int nHeight - ); - static wxDCCacheEntry* FindDCInCache( wxDCCacheEntry* pNotThis - ,HPS hPS - ); - - static void AddToBitmapCache(wxDCCacheEntry* pEntry); - static void AddToDCCache(wxDCCacheEntry* pEntry); - static void ClearCache(); -#endif - -protected: - void Init() - { - m_pCanvas = NULL; - m_hOldBitmap = 0; - m_hOldPen = 0; - m_hOldBrush = 0; - m_hOldFont = 0; -#if wxUSE_PALETTE - m_hOldPalette = 0; -#endif // wxUSE_PALETTE - - m_bOwnsDC = false; - m_hDC = 0; - m_hOldPS = NULL; - m_hPS = NULL; - m_bIsPaintTime = false; // True at Paint Time - - m_pen.SetColour(*wxBLACK); - m_brush.SetColour(*wxWHITE); - } - - // create an uninitialized DC: this should be only used by the derived - // classes - wxPMDCImpl( wxDC *owner ) : wxDCImpl( owner ) { Init(); } - -public: - virtual void DoGetTextExtent( const wxString& rsString - ,wxCoord* pX - ,wxCoord* pY - ,wxCoord* pDescent = NULL - ,wxCoord* pExternalLeading = NULL - ,const wxFont* pTheFont = NULL - ) const; - virtual bool DoFloodFill( wxCoord vX - ,wxCoord vY - ,const wxColour& rCol - ,wxFloodFillStyle nStyle = wxFLOOD_SURFACE - ); - - virtual bool DoGetPixel( wxCoord vX - ,wxCoord vY - ,wxColour* pCol - ) const; - - virtual void DoDrawPoint( wxCoord vX - ,wxCoord vY - ); - virtual void DoDrawLine( wxCoord vX1 - ,wxCoord vY1 - ,wxCoord vX2 - ,wxCoord vY2 - ); - - virtual void DoDrawArc( wxCoord vX1 - ,wxCoord vY1 - ,wxCoord vX2 - ,wxCoord vY2 - ,wxCoord vXc - ,wxCoord vYc - ); - virtual void DoDrawCheckMark( wxCoord vX - ,wxCoord vY - ,wxCoord vWidth - ,wxCoord vHeight - ); - virtual void DoDrawEllipticArc( wxCoord vX - ,wxCoord vY - ,wxCoord vW - ,wxCoord vH - ,double dSa - ,double dEa - ); - - virtual void DoDrawRectangle( wxCoord vX - ,wxCoord vY - ,wxCoord vWidth - ,wxCoord vHeight - ); - virtual void DoDrawRoundedRectangle( wxCoord vX - ,wxCoord vY - ,wxCoord vWidth - ,wxCoord vHeight - ,double dRadius - ); - virtual void DoDrawEllipse( wxCoord vX - ,wxCoord vY - ,wxCoord vWidth - ,wxCoord vHeight - ); - - virtual void DoCrossHair( wxCoord vX - ,wxCoord vY - ); - - virtual void DoDrawIcon( const wxIcon& rIcon - ,wxCoord vX - ,wxCoord vY - ); - virtual void DoDrawBitmap( const wxBitmap& rBmp - ,wxCoord vX - ,wxCoord vY - ,bool bUseMask = FALSE - ); - - virtual void DoDrawText( const wxString& rsText - ,wxCoord vX - ,wxCoord vY - ); - virtual void DoDrawRotatedText( const wxString& rsText - ,wxCoord vX - ,wxCoord vY - ,double dAngle - ); - - virtual bool DoBlit( wxCoord vXdest - ,wxCoord vYdest - ,wxCoord vWidth - ,wxCoord vHeight - ,wxDC* pSource - ,wxCoord vXsrc - ,wxCoord vYsrc - ,wxRasterOperationMode nRop = wxCOPY - ,bool bUseMask = FALSE - ,wxCoord vXsrcMask = -1 - ,wxCoord vYsrcMask = -1 - ); - - virtual void DoSetClippingRegion( wxCoord vX - ,wxCoord vY - ,wxCoord vWidth - ,wxCoord vHeight - ); - virtual void DoSetDeviceClippingRegion(const wxRegion& rRegion); - - virtual void DoGetSize( int* pWidth - ,int* pHeight - ) const; - virtual void DoGetSizeMM( int* pWidth - ,int* pHeight - ) const; - - virtual void DoDrawLines( int n - ,const wxPoint vaPoints[] - ,wxCoord vXoffset - ,wxCoord yYoffset - ); - virtual void DoDrawPolygon( int n - ,const wxPoint vaPoints[] - ,wxCoord vXoffset - ,wxCoord vYoffset - ,wxPolygonFillMode nFillStyle = wxODDEVEN_RULE - ); - -#if wxUSE_PALETTE - void DoSelectPalette(bool bRealize = FALSE); - void InitializePalette(); -#endif // wxUSE_PALETTE - -protected: - // - // common part of DoDrawText() and DoDrawRotatedText() - // - void DrawAnyText( const wxString& rsText - ,wxCoord vX - ,wxCoord vY - ); - - // OS2-specific member variables ?? do we even need this under OS/2? - int m_nWindowExtX; - int m_nWindowExtY; - - // - // the window associated with this DC (may be NULL) - // - wxWindow* m_pCanvas; - wxBitmap m_vSelectedBitmap; - -public: - // PM specific stuff - HPS m_hPS; - HPS m_hOldPS; // old hPS, if any - bool m_bIsPaintTime;// True at Paint Time - - RECTL m_vRclPaint; // Bounding rectangle at Paint time etc. - // - // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it - // - bool m_bOwnsDC:1; - - // - // our HDC - // - WXHDC m_hDC; - - // - // Store all old GDI objects when do a SelectObject, so we can select them - // back in (this unselecting user's objects) so we can safely delete the - // DC. - // - WXHBITMAP m_hOldBitmap; - WXHPEN m_hOldPen; - WXHBRUSH m_hOldBrush; - WXHFONT m_hOldFont; - WXHPALETTE m_hOldPalette; - -#if wxUSE_DC_CACHEING - static wxList m_svBitmapCache; - static wxList m_svDCCache; -#endif -}; // end of CLASS wxDC -#endif - // _WX_DC_H_ diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h deleted file mode 100644 index 1770285489..0000000000 --- a/include/wx/os2/dcclient.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dcclient.h -// Purpose: wxClientDC class -// Author: David Webster -// Modified by: -// Created: 09/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCCLIENT_H_ -#define _WX_DCCLIENT_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/dc.h" -#include "wx/os2/dc.h" -#include "wx/dcclient.h" -#include "wx/dynarray.h" - -// ---------------------------------------------------------------------------- -// array types -// ---------------------------------------------------------------------------- - -// this one if used by wxPaintDC only -struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo; - -WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); - -// ---------------------------------------------------------------------------- -// DC classes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxPMDCImpl -{ -public: - // default ctor - wxWindowDCImpl( wxDC *owner ); - - // Create a DC corresponding to the whole window - wxWindowDCImpl( wxDC *owner, wxWindow *pWin ); - - virtual void DoGetSize(int *pWidth, int *pHeight) const; - -protected: - // initialize the newly created DC - void InitDC(void); - -private: - SIZEL m_PageSize; - DECLARE_CLASS(wxWindowDCImpl) - wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); -}; // end of CLASS wxWindowDC - -class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl -{ -public: - // default ctor - wxClientDCImpl( wxDC *owner ); - - // Create a DC corresponding to the client area of the window - wxClientDCImpl( wxDC *owner, wxWindow *pWin ); - - virtual ~wxClientDCImpl(); - - virtual void DoGetSize(int *pWidth, int *pHeight) const; - -protected: - void InitDC(void); - -private: - DECLARE_CLASS(wxClientDCImpl) - wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); -}; // end of CLASS wxClientDC - -class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl -{ -public: - wxPaintDCImpl( wxDC *owner ); - - // Create a DC corresponding for painting the window in OnPaint() - wxPaintDCImpl( wxDC *owner, wxWindow *pWin ); - - virtual ~wxPaintDCImpl(); - - // find the entry for this DC in the cache (keyed by the window) - static WXHDC FindDCInCache(wxWindow* pWin); - -protected: - static wxArrayDCInfo ms_cache; - - // find the entry for this DC in the cache (keyed by the window) - wxPaintDCInfo* FindInCache(size_t* pIndex = NULL) const; -private: - DECLARE_CLASS(wxPaintDCImpl) - wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); -}; // end of wxPaintDC - -#endif - // _WX_DCCLIENT_H_ diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h deleted file mode 100644 index fb22f0a4d7..0000000000 --- a/include/wx/os2/dcmemory.h +++ /dev/null @@ -1,43 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dcmemory.h -// Purpose: wxMemoryDC class -// Author: David Webster -// Modified by: -// Created: 09/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCMEMORY_H_ -#define _WX_DCMEMORY_H_ - -#include "wx/dcmemory.h" -#include "wx/os2/dc.h" - -class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPMDCImpl -{ -public: - wxMemoryDCImpl( wxMemoryDC *owner ); - wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ); - wxMemoryDCImpl( wxMemoryDC *owner, wxDC* pDC); // Create compatible DC - - // override some base class virtuals - virtual void DoGetSize(int* pWidth, int* pHeight) const; - virtual void DoSelect(const wxBitmap& bitmap); - - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const - { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect);} - -protected: - // create DC compatible with the given one or screen if dc == NULL - bool CreateCompatible(wxDC* pDC); - - // initialize the newly created DC - void Init(void); -private: - DECLARE_CLASS(wxMemoryDCImpl) - wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl); -}; // end of CLASS wxMemoryDCImpl - -#endif - // _WX_DCMEMORY_H_ diff --git a/include/wx/os2/dcprint.h b/include/wx/os2/dcprint.h deleted file mode 100644 index 7baef4a679..0000000000 --- a/include/wx/os2/dcprint.h +++ /dev/null @@ -1,72 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dcprint.h -// Purpose: wxPrinterDC class -// Author: David Webster -// Modified by: -// Created: 09/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DCPRINT_H_ -#define _WX_DCPRINT_H_ - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/dc.h" -#include "wx/cmndata.h" -#include "wx/os2/dc.h" - -class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxPMDCImpl -{ - public: - // Create a printer DC - - // Create from print data - wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& rData ); - wxPrinterDCImpl( wxPrinterDC *owner, WXHDC hTheDC); - - // override some base class virtuals - virtual bool StartDoc(const wxString& rsMessage); - virtual void EndDoc(void); - virtual void StartPage(void); - virtual void EndPage(void); - - virtual wxRect GetPaperRect() const; - -protected: - virtual void DoDrawBitmap( const wxBitmap& rBmp - ,wxCoord vX - ,wxCoord vY - ,bool bUseMask = FALSE - ); - virtual bool DoBlit( wxCoord vXdest - ,wxCoord vYdest - ,wxCoord vWidth - ,wxCoord vHeight - ,wxDC* pSource - ,wxCoord vXsrc - ,wxCoord vYsrc - ,wxRasterOperationMode nRop = wxCOPY - ,bool bUseMask = FALSE - ,wxCoord vXsrcMask = -1 - ,wxCoord vYsrcMask = -1 - ); - - // init the dc - void Init(void); - - wxPrintData m_printData; -private: - DECLARE_CLASS(wxPrinterDCImpl) - wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl); -}; // end of CLASS wxPrinterDC - -// Gets an HDC for the specified printer configuration -WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& rData); - -#endif // wxUSE_PRINTING_ARCHITECTURE - -#endif - // _WX_DCPRINT_H_ - diff --git a/include/wx/os2/dcscreen.h b/include/wx/os2/dcscreen.h deleted file mode 100644 index 76b7243f68..0000000000 --- a/include/wx/os2/dcscreen.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dcscreen.h -// Purpose: wxScreenDC class -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_DCSCREEN_H_ -#define _WX_OS2_DCSCREEN_H_ - -#include "wx/dcscreen.h" -#include "wx/os2/dc.h" - -class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxPMDCImpl -{ - public: - // Create a DC representing the whole screen - wxScreenDCImpl( wxScreenDC *owner ); - - virtual void DoGetSize( int* pnWidth - ,int* pnHeight - ) const; - -private: - DECLARE_CLASS(wxScreenDCImpl) - wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); -}; // end of CLASS wxScreenDC - -#endif - // _WX_DCSCREEN_H_ diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h deleted file mode 100644 index fb6d3ab50b..0000000000 --- a/include/wx/os2/dialog.h +++ /dev/null @@ -1,97 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dialog.h -// Purpose: wxDialog class -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIALOG_H_ -#define _WX_DIALOG_H_ - -#include "wx/panel.h" - -WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[]; - -class WXDLLIMPEXP_FWD_CORE wxDialogModalData; - -// -// Dialog boxes -// -class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase -{ -public: - - inline wxDialog() { Init(); } - - // full ctor - wxDialog(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, style, name); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxDEFAULT_DIALOG_STYLE - ,const wxString& rsName = wxDialogNameStr - ); - virtual ~wxDialog(); - - // return true if we're showing the dialog modally - virtual bool IsModal() const { return m_modalData != NULL; } - - // show the dialog modally and return the value passed to EndModal() - virtual int ShowModal(); - - // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode); - - // implementation only from now on - // ------------------------------- - - // override some base class virtuals - virtual bool Show(bool show = true); - - // - // Callbacks - // - virtual MRESULT OS2WindowProc( WXUINT uMessage - ,WXWPARAM wParam - ,WXLPARAM lParam - ); -protected: - // - // Common part of all ctors - // - void Init(void); - -private: - wxWindow* m_pOldFocus; - bool m_endModalCalled; // allow for closing within InitDialog - - // this pointer is non-NULL only while the modal event loop is running - wxDialogModalData *m_modalData; - - // - // While we are showing a modal dialog we disable the other windows using - // this object - // - class wxWindowDisabler* m_pWindowDisabler; - - DECLARE_DYNAMIC_CLASS(wxDialog) - wxDECLARE_NO_COPY_CLASS(wxDialog); -}; // end of CLASS wxDialog - -#endif // _WX_DIALOG_H_ diff --git a/include/wx/os2/dirdlg.h b/include/wx/os2/dirdlg.h deleted file mode 100644 index fa53c6857f..0000000000 --- a/include/wx/os2/dirdlg.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dirdlg.h -// Purpose: wxDirDialog class -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DIRDLG_H_ -#define _WX_DIRDLG_H_ - -#include "wx/dialog.h" - -WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxFileSelectorPromptStr[]; - -class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase -{ - DECLARE_DYNAMIC_CLASS(wxDirDialog) -public: - wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultPath = "", - long style = 0, const wxPoint& pos = wxDefaultPosition); - - int ShowModal(); - -protected: - wxWindow * m_parent; -}; - -#endif - // _WX_DIRDLG_H_ diff --git a/include/wx/os2/disable.bmp b/include/wx/os2/disable.bmp deleted file mode 100644 index 8859e1b9ae..0000000000 Binary files a/include/wx/os2/disable.bmp and /dev/null differ diff --git a/include/wx/os2/dnd.h b/include/wx/os2/dnd.h deleted file mode 100644 index c70a0d3e53..0000000000 --- a/include/wx/os2/dnd.h +++ /dev/null @@ -1,98 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/dnd.h -// Purpose: declaration of the wxDropTarget class -// Author: David Webster -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1999 David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - - -#ifndef __OS2DNDH__ -#define __OS2DNDH__ - -#if !wxUSE_DRAG_AND_DROP - #error "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!" -#endif //WX_DRAG_DROP - -#define INCL_WINSTDDRAG -#include -#ifndef __EMX__ -#include -#endif - -class CIDropTarget; - -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase -{ -public: - /* constructor. set data later with SetData() */ - wxDropSource(wxWindow* pWin); - - /* constructor for setting one data object */ - wxDropSource( wxDataObject& rData, - wxWindow* pWin - ); - virtual ~wxDropSource(); - - /* start drag action */ - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); - virtual bool GiveFeedback(wxDragResult eEffect); - -protected: - void Init(void); - - ULONG m_ulItems; - PDRAGINFO m_pDragInfo; - DRAGIMAGE m_vDragImage; - PDRAGITEM m_pDragItem; - wxWindow* m_pWindow; -}; // end of CLASS wxDropSource - -//------------------------------------------------------------------------- -// wxDropTarget -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase -{ -public: - wxDropTarget(wxDataObject* pDataObject = NULL); - virtual ~wxDropTarget(); - - // - // These functions are called when data is moved over position (x, y) and - // may return either wxDragCopy, wxDragMove or wxDragNone depending on - // what would happen if the data were dropped here. - // - // The last parameter is what would happen by default and is determined by - // the platform-specific logic (for example, under Windows it's wxDragCopy - // if Ctrl key is pressed and wxDragMove otherwise) except that it will - // always be wxDragNone if the carried data is in an unsupported format. - // - // OnData must be implemented and other should be overridden by derived classes - // - virtual wxDragResult OnData( wxCoord vX - ,wxCoord vY - ,wxDragResult eResult - ); - virtual bool OnDrop( wxCoord vX - ,wxCoord vY - ); - bool IsAcceptedData(PDRAGINFO pDataSource) const; - -protected: - virtual bool GetData(void); - wxDataFormat GetSupportedFormat(PDRAGINFO pDataSource) const; - void Release(void); - -private: - CIDropTarget* m_pDropTarget; -}; // end of CLASS wxDropTarget - -#endif //__OS2DNDH__ - diff --git a/include/wx/os2/drive.ico b/include/wx/os2/drive.ico deleted file mode 100644 index 06ed593368..0000000000 Binary files a/include/wx/os2/drive.ico and /dev/null differ diff --git a/include/wx/os2/error.ico b/include/wx/os2/error.ico deleted file mode 100644 index d921d22f7a..0000000000 Binary files a/include/wx/os2/error.ico and /dev/null differ diff --git a/include/wx/os2/file.ico b/include/wx/os2/file.ico deleted file mode 100644 index a0769fac51..0000000000 Binary files a/include/wx/os2/file.ico and /dev/null differ diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h deleted file mode 100644 index 74c789dbf0..0000000000 --- a/include/wx/os2/filedlg.h +++ /dev/null @@ -1,41 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/filedlg.h -// Purpose: wxFileDialog class -// Author: David Webster -// Modified by: -// Created: 10/05/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FILEDLG_H_ -#define _WX_FILEDLG_H_ - -//------------------------------------------------------------------------- -// wxFileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase -{ -DECLARE_DYNAMIC_CLASS(wxFileDialog) -public: - wxFileDialog( wxWindow* pParent - ,const wxString& rsMessage = wxFileSelectorPromptStr - ,const wxString& rsDefaultDir = wxEmptyString - ,const wxString& rsDefaultFile = wxEmptyString - ,const wxString& rsWildCard = wxFileSelectorDefaultWildcardStr - ,long lStyle = wxFD_DEFAULT_STYLE - ,const wxPoint& rPos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr - ); - - virtual void GetPaths(wxArrayString& rasPath) const; - - int ShowModal(); - -protected: - wxArrayString m_fileNames; -}; // end of CLASS wxFileDialog - -#endif // _WX_FILEDLG_H_ diff --git a/include/wx/os2/floppy.ico b/include/wx/os2/floppy.ico deleted file mode 100644 index 823094f1e5..0000000000 Binary files a/include/wx/os2/floppy.ico and /dev/null differ diff --git a/include/wx/os2/folder.ico b/include/wx/os2/folder.ico deleted file mode 100644 index 317fe37393..0000000000 Binary files a/include/wx/os2/folder.ico and /dev/null differ diff --git a/include/wx/os2/folder1.ico b/include/wx/os2/folder1.ico deleted file mode 100644 index 317fe37393..0000000000 Binary files a/include/wx/os2/folder1.ico and /dev/null differ diff --git a/include/wx/os2/folder2.ico b/include/wx/os2/folder2.ico deleted file mode 100644 index b35a1469ec..0000000000 Binary files a/include/wx/os2/folder2.ico and /dev/null differ diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h deleted file mode 100644 index d79b02bf76..0000000000 --- a/include/wx/os2/font.h +++ /dev/null @@ -1,156 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/font.h -// Purpose: wxFont class -// Author: David Webster -// Modified by: -// Created: 10/06/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONT_H_ -#define _WX_FONT_H_ - -#include "wx/gdiobj.h" -#include "wx/os2/private.h" - -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxEmptyString; - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ -public: - // ctors and such - wxFont() { } - - wxFont(const wxFontInfo& info) - { - Create(info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.IsUnderlined(), - info.GetFaceName(), - info.GetEncoding()); - - if ( info.IsUsingSizeInPixels() ) - SetPixelSize(info.GetPixelSize()); - } - - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(size, family, style, weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - wxFont( const wxNativeFontInfo& rInfo - ,WXHFONT hFont = 0 - ) - - { - (void)Create( rInfo - ,hFont - ); - } - - wxFont(const wxString& rsFontDesc); - - bool Create( const wxNativeFontInfo& rInfo - ,WXHFONT hFont = 0 - ); - - virtual ~wxFont(); - - // - // Implement base class pure virtuals - // - virtual int GetPointSize(void) const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual bool GetUnderlined(void) const; - virtual wxString GetFaceName(void) const; - virtual wxFontEncoding GetEncoding(void) const; - virtual const wxNativeFontInfo* GetNativeFontInfo() const; - - virtual void SetPointSize(int nPointSize); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName(const wxString& rsFaceName); - virtual void SetUnderlined(bool bUnderlined); - virtual void SetEncoding(wxFontEncoding vEncoding); - - wxDECLARE_COMMON_FONT_METHODS(); - - wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants") - wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } - - - // - // For internal use only! - // - void SetPS(HPS hPS); - void SetFM( PFONTMETRICS pFM - ,int nNumFonts - ); - // - // Implementation only from now on - // ------------------------------- - // - virtual bool IsFree(void) const; - virtual bool RealizeResource(void); - virtual WXHANDLE GetResourceHandle(void) const; - virtual bool FreeResource(bool bForce = false); - - WXHFONT GetHFONT(void) const; - -protected: - virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo); - virtual wxFontFamily DoGetFamily() const; - - // implement wxObject virtuals which are used by AllocExclusive() - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - DECLARE_DYNAMIC_CLASS(wxFont) -}; // end of wxFont - -#endif // _WX_FONT_H_ diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h deleted file mode 100644 index 19ca61cc17..0000000000 --- a/include/wx/os2/fontdlg.h +++ /dev/null @@ -1,45 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/fontdlg.h -// Purpose: wxFontDialog class. Use generic version if no -// platform-specific implementation. -// Author: David Webster -// Modified by: -// Created: 10/06/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONTDLG_H_ -#define _WX_FONTDLG_H_ - -#include "wx/dialog.h" - -/* - * Font dialog - */ - -class WXDLLIMPEXP_CORE wxFontDialog: public wxFontDialogBase -{ -public: - wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } - wxFontDialog (wxWindow* pParent) : wxFontDialogBase(pParent) { Create(pParent); } - wxFontDialog( wxWindow* pParent - ,const wxFontData& rData - ) - : wxFontDialogBase( pParent - ,rData - ) - { - Create( pParent - ,rData - ); - } - - virtual int ShowModal(); - -protected: - DECLARE_DYNAMIC_CLASS(wxFontDialog) -}; // end of CLASS wxFontDialog - -#endif - // _WX_FONTDLG_H_ diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h deleted file mode 100644 index e337086b95..0000000000 --- a/include/wx/os2/frame.h +++ /dev/null @@ -1,221 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/frame.h -// Purpose: wxFrame class -// Author: David Webster -// Modified by: -// Created: 10/27/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FRAME_H_ -#define _WX_FRAME_H_ - -// -// Get the default resource ID's for frames -// -#include "wx/os2/wxrsc.h" - -class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase -{ -public: - // construction - wxFrame() { Init(); } - wxFrame( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxDEFAULT_FRAME_STYLE - ,const wxString& rsName = wxFrameNameStr - ) - { - Init(); - - Create(pParent, vId, rsTitle, rPos, rSize, lStyle, rsName); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxDEFAULT_FRAME_STYLE - ,const wxString& rsName = wxFrameNameStr - ); - - virtual ~wxFrame(); - - // implement base class pure virtuals -#if wxUSE_MENUS_NATIVE - virtual void SetMenuBar(wxMenuBar* pMenubar); -#endif - virtual bool ShowFullScreen( bool bShow - ,long lStyle = wxFULLSCREEN_ALL - ); - - - // implementation only from now on - // ------------------------------- - - virtual void Raise(void); - - // event handlers - void OnSysColourChanged(wxSysColourChangedEvent& rEvent); - - // Toolbar -#if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar( long lStyle = -1 - ,wxWindowID vId = -1 - ,const wxString& rsName = wxToolBarNameStr - ); - - virtual wxToolBar* OnCreateToolBar( long lStyle - ,wxWindowID vId - ,const wxString& rsName - ); - virtual void PositionToolBar(void); -#endif // wxUSE_TOOLBAR - - // Status bar -#if wxUSE_STATUSBAR - virtual wxStatusBar* OnCreateStatusBar( int nNumber = 1 - ,long lStyle = wxSTB_DEFAULT_STYLE - ,wxWindowID vId = 0 - ,const wxString& rsName = wxStatusLineNameStr - ); - virtual void PositionStatusBar(void); - - // Hint to tell framework which status bar to use: the default is to use - // native one for the platforms which support it (Win32), the generic one - // otherwise - - // TODO: should this go into a wxFrameworkSettings class perhaps? - static void UseNativeStatusBar(bool bUseNative) - { m_bUseNativeStatusBar = bUseNative; } - static bool UsesNativeStatusBar() - { return m_bUseNativeStatusBar; } -#endif // wxUSE_STATUSBAR - - WXHMENU GetWinMenu() const { return m_hMenu; } - - // Returns the origin of client area (may be different from (0,0) if the - // frame has a toolbar) - virtual wxPoint GetClientAreaOrigin() const; - - // event handlers - bool HandlePaint(void); - bool HandleSize( int nX - ,int nY - ,WXUINT uFlag - ); - bool HandleCommand( WXWORD wId - ,WXWORD wCmd - ,WXHWND wControl - ); - bool HandleMenuSelect( WXWORD wItem - ,WXWORD wFlags - ,WXHMENU hMenu - ); - - // tooltip management -#if wxUSE_TOOLTIPS - WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; } - void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; } -#endif // tooltips - - void SetClient(WXHWND c_Hwnd); - void SetClient(wxWindow* c_Window); - wxWindow *GetClient(); - - friend MRESULT EXPENTRY wxFrameWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam); - friend MRESULT EXPENTRY wxFrameMainWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam); - -protected: - // common part of all ctors - void Init(void); - - virtual WXHICON GetDefaultIcon(void) const; - // override base class virtuals - virtual void DoGetClientSize( int* pWidth - ,int* pHeight - ) const; - virtual void DoSetClientSize( int nWidth - ,int nWeight - ); - inline virtual bool IsMDIChild(void) const { return FALSE; } - -#if wxUSE_MENUS_NATIVE - // helper - void DetachMenuBar(void); - // perform MSW-specific action when menubar is changed - virtual void AttachMenuBar(wxMenuBar* pMenubar); - // a plug in for MDI frame classes which need to do something special when - // the menubar is set - virtual void InternalSetMenuBar(void); -#endif - // propagate our state change to all child frames - void IconizeChildFrames(bool bIconize); - - // we add menu bar accel processing - bool OS2TranslateMessage(WXMSG* pMsg); - - // window proc for the frames - MRESULT OS2WindowProc( WXUINT uMessage - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - - bool m_bIconized; - WXHICON m_hDefaultIcon; - -#if wxUSE_STATUSBAR - static bool m_bUseNativeStatusBar; -#endif // wxUSE_STATUSBAR - - // Data to save/restore when calling ShowFullScreen - long m_lFsStyle; // Passed to ShowFullScreen - wxRect m_vFsOldSize; - long m_lFsOldWindowStyle; - int m_nFsStatusBarFields; // 0 for no status bar - int m_nFsStatusBarHeight; - int m_nFsToolBarHeight; - bool m_bFsIsMaximized; - bool m_bFsIsShowing; - bool m_bWasMinimized; - bool m_bIsShown; - -private: -#if wxUSE_TOOLTIPS - WXHWND m_hWndToolTip; -#endif // tooltips - - // - // Handles to child windows of the Frame, and the frame itself, - // that we don't have child objects for (m_hWnd in wxWindow is the - // handle of the Frame's client window! - // - WXHWND m_hTitleBar; - WXHWND m_hHScroll; - WXHWND m_hVScroll; - - // - // Swp structures for various client data - // DW: Better off in attached RefData? - // - SWP m_vSwpTitleBar; - SWP m_vSwpMenuBar; - SWP m_vSwpHScroll; - SWP m_vSwpVScroll; - SWP m_vSwpStatusBar; - SWP m_vSwpToolBar; - - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxFrame) -}; - -MRESULT EXPENTRY wxFrameWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam); -MRESULT EXPENTRY wxFrameMainWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam); -#endif - // _WX_FRAME_H_ - diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h deleted file mode 100644 index faac3db4b8..0000000000 --- a/include/wx/os2/gauge.h +++ /dev/null @@ -1,77 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/gauge.h -// Purpose: wxGauge class -// Author: David Webster -// Modified by: -// Created: 10/06/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GAUGE_H_ -#define _WX_GAUGE_H_ - -class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase -{ -public: - inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; } - - inline wxGauge( wxWindow* pParent - ,wxWindowID vId - ,int nRange - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxGA_HORIZONTAL - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxGaugeNameStr - ) - { - Create( pParent - ,vId - ,nRange - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,int nRange - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxGA_HORIZONTAL - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxGaugeNameStr - ); - - int GetShadowWidth(void) const; - int GetBezelFace(void) const; - int GetRange(void) const; - int GetValue(void) const; - - bool SetBackgroundColour(const wxColour& rColour); - void SetBezelFace(int nWidth); - bool SetForegroundColour(const wxColour& rColour); - void SetRange(int nRange); - void SetShadowWidth(int nWidth); - void SetValue(int nPos); - - inline virtual bool AcceptsFocus(void) const { return FALSE; } - inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {} - -protected: - int m_nRangeMax; - int m_nGaugePos; - int m_nWidth; - int m_nHeight; - - wxSize DoGetBestSize(void) const; - -private: - DECLARE_DYNAMIC_CLASS(wxGauge) -}; // end of CLASS wxGauge - -#endif // _WX_GAUGE_H_ diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h deleted file mode 100644 index 45814eb0ec..0000000000 --- a/include/wx/os2/gdiimage.h +++ /dev/null @@ -1,251 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/gdiimage.h -// Purpose: wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor -// under OS/2 -// Author: David Webster (adapted from msw version by Vadim Zeitlin) -// Modified by: -// Created: 20.11.99 -// Copyright: (c) 1999 David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// NB: this is a private header, it is not intended to be directly included by -// user code (but may be included from other, public, wxWin headers - -#ifndef _WX_OS2_GDIIMAGE_H_ -#define _WX_OS2_GDIIMAGE_H_ - -#include "wx/gdiobj.h" // base class -#include "wx/gdicmn.h" // wxBITMAP_TYPE_INVALID -#include "wx/list.h" - -class WXDLLIMPEXP_FWD_CORE wxGDIImageRefData; -class WXDLLIMPEXP_FWD_CORE wxGDIImageHandler; -class WXDLLIMPEXP_FWD_CORE wxGDIImage; - -WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList); - -// ---------------------------------------------------------------------------- -// wxGDIImageRefData: common data fields for all derived classes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData -{ -public: - wxGDIImageRefData() - { - m_nWidth = m_nHeight = m_nDepth = 0; - - m_hHandle = 0; - } - - // accessors - virtual bool IsOk() const - { - if (m_hHandle == 0) - return false; - return true; - } - - void SetSize( int nW - ,int nH - ) - { m_nWidth = nW; m_nHeight = nH; } - - // free the ressources we allocated - virtual void Free() { } - - // for compatibility, the member fields are public - - // the size of the image - int m_nWidth; - int m_nHeight; - - // the depth of the image - int m_nDepth; - - // the handle to it - union - { - WXHANDLE m_hHandle; // for untyped access - WXHBITMAP m_hBitmap; - WXHICON m_hIcon; - WXHCURSOR m_hCursor; - }; - - unsigned int m_uId; -}; - -// ---------------------------------------------------------------------------- -// wxGDIImageHandler: a class which knows how to load/save wxGDIImages. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject -{ -public: - // ctor - wxGDIImageHandler() { m_lType = wxBITMAP_TYPE_INVALID; } - wxGDIImageHandler( const wxString& rName - ,const wxString& rExt - ,wxBitmapType lType - ) - : m_sName(rName) - , m_sExtension(rExt) - { - m_lType = lType; - } - - // accessors - void SetName(const wxString& rName) { m_sName = rName; } - void SetExtension(const wxString& rExt) { m_sExtension = rExt; } - void SetType(wxBitmapType lType) { m_lType = lType; } - - wxString GetName() const { return m_sName; } - wxString GetExtension() const { return m_sExtension; } - wxBitmapType GetType() const { return m_lType; } - - // real handler operations: to implement in derived classes - virtual bool Create( wxGDIImage* pImage - ,const void* pData - ,wxBitmapType lFlags - ,int nWidth - ,int nHeight - ,int nDepth = 1 - ) = 0; - virtual bool Load( wxGDIImage* pImage - ,const wxString& rName - ,HPS hPs - ,wxBitmapType lFlags - ,int nDesiredWidth - ,int nDesiredHeight - ) = 0; - virtual bool Load( wxGDIImage* pImage - ,int nId - ,wxBitmapType lFlags - ,int nDesiredWidth - ,int nDesiredHeight - ) = 0; - virtual bool Save( const wxGDIImage* pImage - ,const wxString& rName - ,wxBitmapType lType - ) const = 0; - -protected: - wxString m_sName; - wxString m_sExtension; - wxBitmapType m_lType; -}; // end of wxGDIImageHandler - -// ---------------------------------------------------------------------------- -// wxGDIImage: this class supports GDI image handlers which may be registered -// dynamically and will be used for loading/saving the images in the specified -// format. It also falls back to wxImage if no appropriate image is found. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject -{ -public: - // handlers list interface - static wxGDIImageHandlerList& GetHandlers() { return ms_handlers; } - - static void AddHandler(wxGDIImageHandler* hHandler); - static void InsertHandler(wxGDIImageHandler* hHandler); - static bool RemoveHandler(const wxString& rName); - - static wxGDIImageHandler* FindHandler(const wxString& rName); - static wxGDIImageHandler* FindHandler(const wxString& rExtension, wxBitmapType lType); - static wxGDIImageHandler* FindHandler(wxBitmapType lType); - - static void InitStandardHandlers(); - static void CleanUpHandlers(); - - // access to the ref data casted to the right type - wxGDIImageRefData *GetGDIImageData() const - { return (wxGDIImageRefData *)m_refData; } - - // create data if we don't have it yet - void EnsureHasData() { if ( IsNull() ) m_refData = CreateData(); } - - // accessors - WXHANDLE GetHandle() const - { - wxGDIImageRefData* pData; - - pData = GetGDIImageData(); - if (!pData) - return 0; - else - return pData->m_hHandle; - } - void SetHandle(WXHANDLE hHandle) - { - wxGDIImageRefData* pData; - - EnsureHasData(); - pData = GetGDIImageData(); - pData->m_hHandle = hHandle; - } - - int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; } - int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; } - int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_nDepth; } - - wxSize GetSize() const - { - return IsNull() ? wxSize(0,0) : - wxSize(GetGDIImageData()->m_nWidth, GetGDIImageData()->m_nHeight); - } - - void SetWidth(int nW) { EnsureHasData(); GetGDIImageData()->m_nWidth = nW; } - void SetHeight(int nH) { EnsureHasData(); GetGDIImageData()->m_nHeight = nH; } - void SetDepth(int nD) { EnsureHasData(); GetGDIImageData()->m_nDepth = nD; } - - void SetSize( int nW - ,int nH - ) - { - EnsureHasData(); - GetGDIImageData()->SetSize(nW, nH); - } - void SetSize(const wxSize& rSize) { SetSize(rSize.x, rSize.y); } - - unsigned int GetId(void) const - { - wxGDIImageRefData* pData; - - pData = GetGDIImageData(); - if (!pData) - return 0; - else - return pData->m_uId; - } // end of WxWinGdi_CGDIImage::GetId - void SetId(unsigned int uId) - { - wxGDIImageRefData* pData; - - EnsureHasData(); - pData = GetGDIImageData(); - pData->m_uId = uId; - } - // forward some of base class virtuals to wxGDIImageRefData - bool FreeResource(bool bForce = false); - virtual WXHANDLE GetResourceHandle() const; - -protected: - // create the data for the derived class here - virtual wxGDIImageRefData* CreateData() const = 0; - virtual wxGDIRefData *CreateGDIRefData() const { return CreateData(); } - - // we can't [efficiently] clone objects of this class - virtual wxGDIRefData * - CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const - { - wxFAIL_MSG( wxT("must be implemented if used") ); - - return NULL; - } - - static wxGDIImageHandlerList ms_handlers; -}; - -#endif // _WX_MSW_GDIIMAGE_H_ diff --git a/include/wx/os2/hand.ptr b/include/wx/os2/hand.ptr deleted file mode 100644 index 4dfcca7cee..0000000000 Binary files a/include/wx/os2/hand.ptr and /dev/null differ diff --git a/include/wx/os2/heart.ptr b/include/wx/os2/heart.ptr deleted file mode 100644 index e2e9519fb5..0000000000 Binary files a/include/wx/os2/heart.ptr and /dev/null differ diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h deleted file mode 100644 index 7013ae5db6..0000000000 --- a/include/wx/os2/helpwin.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/helpwin.h -// Purpose: Help system: native implementation for your system. -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPWIN_H_ -#define _WX_HELPWIN_H_ - -#include "wx/wx.h" - -#if wxUSE_HELP - -#include "wx/helpbase.h" - -class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase -{ - DECLARE_CLASS(wxWinHelpController) - - public: - wxWinHelpController(); - virtual ~wxWinHelpController(); - - // Must call this to set the filename and server name - virtual bool Initialize(const wxString& file); - - // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = wxEmptyString); - virtual bool DisplayContents(); - virtual bool DisplaySection(int sectionNo); - virtual bool DisplayBlock(long blockNo); - virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); - - virtual bool Quit(); - virtual void OnQuit(); - - inline wxString GetHelpFile() const { return m_helpFile; } - -protected: - wxString m_helpFile; -private: - // virtual function hiding supression :: do not use - bool Initialize(const wxString& rFile, int WXUNUSED(nServer) ) { return(Initialize(rFile)); } - bool DisplaySection(const wxString& rSection) { return wxHelpControllerBase::DisplaySection(rSection); } -}; - -#endif //wxUSE_HELP - -#endif - // _WX_HELPWIN_H_ diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h deleted file mode 100644 index 1248f619f8..0000000000 --- a/include/wx/os2/icon.h +++ /dev/null @@ -1,91 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/icon.h -// Purpose: wxIcon class -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ICON_H_ -#define _WX_ICON_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/bitmap.h" -#include "wx/os2/gdiimage.h" - -#define wxIconRefDataBase wxGDIImageRefData -#define wxIconBase wxGDIImage - -class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase -{ -public: - wxIconRefData() { } - virtual ~wxIconRefData() { Free(); } - - virtual void Free(); -}; // end of - -// --------------------------------------------------------------------------- -// Icon -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxIcon: public wxIconBase -{ -public: - wxIcon(); - - wxIcon( const char bits[] - ,int nWidth - ,int nHeight - ); - wxIcon(const char* const* ppData) { CreateIconFromXpm(ppData); } -#ifdef wxNEEDS_CHARPP - wxIcon(char** ppData) { CreateIconFromXpm(const_cast(ppData)); } -#endif - wxIcon( const wxString& rName - ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE - ,int nDesiredWidth = -1 - ,int nDesiredHeight = -1 - ); - wxIcon(const wxIconLocation& loc) - { - LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO); - } - - virtual ~wxIcon(); - - bool LoadFile( const wxString& rName - ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE - ,int nDesiredWidth = -1 - ,int nDesiredHeight = -1 - ); - - wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; } - - inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); } - inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); } - inline bool IsXpm(void) const { return m_bIsXpm; } - inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; } - - void CopyFromBitmap(const wxBitmap& rBmp); -protected: - virtual wxGDIImageRefData* CreateData() const - { - return new wxIconRefData; - } - void CreateIconFromXpm(const char* const* ppData); - -private: - bool m_bIsXpm; - wxBitmap m_vXpmSrc; - - DECLARE_DYNAMIC_CLASS(wxIcon) -}; - -#endif - // _WX_ICON_H_ diff --git a/include/wx/os2/info.ico b/include/wx/os2/info.ico deleted file mode 100644 index eccdd2e09c..0000000000 Binary files a/include/wx/os2/info.ico and /dev/null differ diff --git a/include/wx/os2/iniconf.h b/include/wx/os2/iniconf.h deleted file mode 100644 index 07cb3ef0ff..0000000000 --- a/include/wx/os2/iniconf.h +++ /dev/null @@ -1,121 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/iniconf.h -// Purpose: INI-file based wxConfigBase implementation -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _INICONF_H -#define _INICONF_H - -// ---------------------------------------------------------------------------- -// wxIniConfig is a wxConfig implementation which uses MS Windows INI files to -// store the data. Because INI files don't really support arbitrary nesting of -// groups, we do the following: -// (1) in win.ini file we store all entries in the [vendor] section and -// the value group1/group2/key is mapped to the value group1_group2_key -// in this section, i.e. all path separators are replaced with underscore -// (2) in appname.ini file we map group1/group2/group3/key to the entry -// group2_group3_key in [group1] -// -// Of course, it might lead to indesirable results if '_' is also used in key -// names (i.e. group/key is the same as group_key) and also GetPath() result -// may be not what you would expect it to be. -// -// Another limitation: the keys and section names are never case-sensitive -// which might differ from wxFileConfig it it was compiled with -// wxCONFIG_CASE_SENSITIVE option. -// ---------------------------------------------------------------------------- - -// for this class, "local" file is the file appname.ini and the global file -// is the [vendor] subsection of win.ini (default for "vendor" is to be the -// same as appname). The file name (strAppName parameter) may, in fact, -// contain the full path to the file. If it doesn't, the file is searched for -// in the Windows directory. -class WXDLLIMPEXP_CORE wxIniConfig : public wxConfigBase -{ -public: - // ctor & dtor - // if strAppName doesn't contain the extension and is not an absolute path, - // ".ini" is appended to it. if strVendor is empty, it's taken to be the - // same as strAppName. - wxIniConfig(const wxString& strAppName = wxEmptyString, const wxString& strVendor = wxEmptyString, - const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString, long style = wxCONFIG_USE_LOCAL_FILE); - virtual ~wxIniConfig(); - - // implement inherited pure virtual functions - virtual void SetPath(const wxString& strPath); - virtual const wxString& GetPath() const; - - virtual bool GetFirstGroup(wxString& str, long& lIndex) const; - virtual bool GetNextGroup (wxString& str, long& lIndex) const; - virtual bool GetFirstEntry(wxString& str, long& lIndex) const; - virtual bool GetNextEntry (wxString& str, long& lIndex) const; - - virtual size_t GetNumberOfEntries(bool bRecursive = FALSE) const; - virtual size_t GetNumberOfGroups(bool bRecursive = FALSE) const; - - virtual bool HasGroup(const wxString& strName) const; - virtual bool HasEntry(const wxString& strName) const; - - // return TRUE if the current group is empty - bool IsEmpty() const; - - // read/write - bool Read(const wxString& key, wxString *pStr) const; - bool Read(const wxString& key, wxString *pStr, const wxString& szDefault) const; - bool Read(const wxString& key, long *plResult) const; - - // The following are necessary to satisfy the compiler - wxString Read(const wxString& key, const wxString& defVal) const - { return wxConfigBase::Read(key, defVal); } - bool Read(const wxString& key, long *pl, long defVal) const - { return wxConfigBase::Read(key, pl, defVal); } - long Read(const wxString& key, long defVal) const - { return wxConfigBase::Read(key, defVal); } - bool Read(const wxString& key, int *pi, int defVal) const - { return wxConfigBase::Read(key, pi, defVal); } - bool Read(const wxString& key, int *pi) const - { return wxConfigBase::Read(key, pi); } - bool Read(const wxString& key, double* val) const - { return wxConfigBase::Read(key, val); } - bool Read(const wxString& key, double* val, double defVal) const - { return wxConfigBase::Read(key, val, defVal); } - - bool Write(const wxString& key, const wxString& szValue); - bool Write(const wxString& key, long lValue); - - virtual bool Flush(bool bCurrentOnly = FALSE); - - virtual bool RenameEntry(const wxString& oldName, const wxString& newName); - virtual bool RenameGroup(const wxString& oldName, const wxString& newName); - - virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso); - virtual bool DeleteGroup(const wxString& szKey); - virtual bool DeleteAll(); - -private: - // helpers - wxString GetPrivateKeyName(const wxString& szKey) const; - wxString GetKeyName(const wxString& szKey) const; - - wxString m_strLocalFilename; // name of the private INI file - wxString m_strGroup, // current group in appname.ini file - m_strPath; // the rest of the path (no trailing '_'!) - // Virtual function hiding - virtual bool Read(const wxString& key, bool* val) const - { return(wxConfigBase::Read(key, val));} - virtual bool Read(const wxString& key, bool* val, bool defVal) const - { return(wxConfigBase::Read(key, val, defVal));} - virtual bool Write(const wxString& key, double value) - { return(wxConfigBase::Write(key, value));} - virtual bool Write(const wxString& key, bool value) - { return(wxConfigBase::Write(key, value));} - virtual bool Write(const wxString& key, const char* value) - { return(wxConfigBase::Write(key, value));} -}; - -#endif //_INICONF_H diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h deleted file mode 100644 index dd431d71d8..0000000000 --- a/include/wx/os2/joystick.h +++ /dev/null @@ -1,88 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/joystick.h -// Purpose: wxJoystick class -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_JOYSTICK_H_ -#define _WX_JOYSTICK_H_ - -#include "wx/event.h" - -class WXDLLIMPEXP_ADV wxJoystick: public wxObject -{ - DECLARE_DYNAMIC_CLASS(wxJoystick) - public: - /* - * Public interface - */ - - wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; } - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - wxPoint GetPosition() const; - int GetZPosition() const; - int GetButtonState() const; - int GetPOVPosition() const; - int GetPOVCTSPosition() const; - int GetRudderPosition() const; - int GetUPosition() const; - int GetVPosition() const; - int GetMovementThreshold() const; - void SetMovementThreshold(int threshold) ; - - // Capabilities - //////////////////////////////////////////////////////////////////////////// - - bool IsOk() const; // Checks that the joystick is functioning - static int GetNumberJoysticks() ; - int GetManufacturerId() const ; - int GetProductId() const ; - wxString GetProductName() const ; - int GetXMin() const; - int GetYMin() const; - int GetZMin() const; - int GetXMax() const; - int GetYMax() const; - int GetZMax() const; - int GetNumberButtons() const; - int GetNumberAxes() const; - int GetMaxButtons() const; - int GetMaxAxes() const; - int GetPollingMin() const; - int GetPollingMax() const; - int GetRudderMin() const; - int GetRudderMax() const; - int GetUMin() const; - int GetUMax() const; - int GetVMin() const; - int GetVMax() const; - - bool HasRudder() const; - bool HasZ() const; - bool HasU() const; - bool HasV() const; - bool HasPOV() const; - bool HasPOV4Dir() const; - bool HasPOVCTS() const; - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // pollingFreq = 0 means that movement events are sent when above the threshold. - // If pollingFreq > 0, events are received every this many milliseconds. - bool SetCapture(wxWindow* win, int pollingFreq = 0); - bool ReleaseCapture(); - -protected: - int m_joystick; -}; - -#endif - // _WX_JOYSTICK_H_ diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h deleted file mode 100644 index dc6d6913b9..0000000000 --- a/include/wx/os2/listbox.h +++ /dev/null @@ -1,165 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/listbox.h -// Purpose: wxListBox class -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTBOX_H_ -#define _WX_LISTBOX_H_ - -// ---------------------------------------------------------------------------- -// simple types -// ---------------------------------------------------------------------------- - -#if wxUSE_OWNER_DRAWN - class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn; - - // define the array of list box items - #include "wx/dynarray.h" - - WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray); -#endif // wxUSE_OWNER_DRAWN - -// forward decl for GetSelections() -class wxArrayInt; - -// ---------------------------------------------------------------------------- -// List box control -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase -{ -public: - // ctors and such - wxListBox(); - wxListBox( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,int n = 0 - ,const wxString asChoices[] = NULL - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxListBoxNameStr) - { - Create( pParent - ,vId - ,rPos - ,rSize - ,n - ,asChoices - ,lStyle - ,rValidator - ,rsName - ); - } - wxListBox( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos - ,const wxSize& rSize - ,const wxArrayString& asChoices - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxListBoxNameStr) - { - Create( pParent - ,vId - ,rPos - ,rSize - ,asChoices - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,int n = 0 - ,const wxString asChoices[] = NULL - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxListBoxNameStr - ); - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos - ,const wxSize& rSize - ,const wxArrayString& asChoices - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxListBoxNameStr - ); - - virtual ~wxListBox(); - - // - // Implement base class pure virtuals - // - virtual void DoClear(void); - virtual void DoDeleteOneItem(unsigned int n); - - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& rsString); - - virtual bool IsSelected(int n) const; - virtual void DoSetSelection(int n, bool bSelect); - virtual int GetSelection(void) const; - virtual int GetSelections(wxArrayInt& raSelections) const; - - virtual void DoSetFirstItem(int n); - - virtual void DoSetItemClientData(unsigned int n, void* pClientData); - virtual void* DoGetItemClientData(unsigned int n) const; - - // - // wxCheckListBox support - // -#if wxUSE_OWNER_DRAWN - long OS2OnMeasure(WXMEASUREITEMSTRUCT *item); - bool OS2OnDraw(WXDRAWITEMSTRUCT *item); - - virtual wxOwnerDrawn* CreateItem(size_t n); - wxOwnerDrawn* GetItem(size_t n) const { return m_aItems[n]; } - int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); } -#endif // wxUSE_OWNER_DRAWN - - bool OS2Command( WXUINT uParam - ,WXWORD wId - ); - virtual void SetupColours(void); - -protected: - - bool HasMultipleSelection(void) const; - virtual wxSize DoGetBestSize(void) const; - - unsigned int m_nNumItems; - int m_nSelected; - -#if wxUSE_OWNER_DRAWN - // - // Control items - // - wxListBoxItemsArray m_aItems; -#endif - - // - // Implement base wxItemContainer virtuals - // - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, - wxClientDataType type); - - DECLARE_DYNAMIC_CLASS(wxListBox) -}; // end of wxListBox - -#endif // _WX_LISTBOX_H_ diff --git a/include/wx/os2/listctrl.h b/include/wx/os2/listctrl.h deleted file mode 100644 index 8f7aee9904..0000000000 --- a/include/wx/os2/listctrl.h +++ /dev/null @@ -1,539 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/listctrl.h -// Purpose: wxListCtrl class -// Author: -// Modified by: -// Created: -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_LISTCTRL_H_ -#define _WX_LISTCTRL_H_ - -#if wxUSE_LISTCTRL - -#include "wx/control.h" -#include "wx/event.h" -#include "wx/hash.h" -#include "wx/textctrl.h" - - -class WXDLLIMPEXP_FWD_CORE wxImageList; - -typedef int (wxCALLBACK *wxListCtrlCompare)(long lItem1, long lItem2, long lSortData); - -class WXDLLIMPEXP_CORE wxListCtrl: public wxControl -{ -public: - wxListCtrl() { Init(); } - wxListCtrl( wxWindow* pParent - ,wxWindowID vId = -1 - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxLC_ICON - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxListCtrlNameStr) - { - Init(); - Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - virtual ~wxListCtrl(); - - bool Create( wxWindow* pParent - ,wxWindowID vId = -1 - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxLC_ICON - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxListCtrlNameStr - ); - - - // Attributes - //////////////////////////////////////////////////////////////////////////// - // - - // - // Set the control colours - // - bool SetForegroundColour(const wxColour& rCol); - bool SetBackgroundColour(const wxColour& rCol); - - // - // Information about this column - // - bool GetColumn( int nCol - ,wxListItem& rItem - ) const; - bool SetColumn( int nCol - ,wxListItem& rItem - ); - - // - // Column width - // - int GetColumnWidth(int nCol) const; - bool SetColumnWidth( int nCol - ,int nWidth - ); - - // - // Gets the number of items that can fit vertically in the - // visible area of the list control (list or report view) - // or the total number of items in the list control (icon - // or small icon view) - // - int GetCountPerPage(void) const; - - wxRect GetViewRect() const; - // - // Gets the edit control for editing labels. - // - wxTextCtrl* GetEditControl(void) const; - - // - // Information about the item - // - bool GetItem(wxListItem& rInfo) const; - bool SetItem(wxListItem& rInfo); - - // - // Sets a string field at a particular column - // - long SetItem( long lIndex - ,int nCol - ,const wxString& rsLabel - ,int nImageId = -1 - ); - - // - // Item state - // - int GetItemState( long lItem - ,long lStateMask - ) const; - bool SetItemState( long lItem - ,long lState - ,long lStateMask - ); - - // - // Sets the item image - // - bool SetItemImage( long lItem - ,int nImage - ,int lSelImage - ); - bool SetItemColumnImage( long lItem - ,long lColumn - ,int nImage - ); - - // - // Item text - // - wxString GetItemText(long lItem) const; - void SetItemText( long lItem - ,const wxString& rsStr - ); - - // - // Item data - // - long GetItemData(long lItem) const; - bool SetItemPtrData(long item, wxUIntPtr data); - bool SetItemData(long item, long data) { return SetItemPtrData(item, data); } - - // - // Gets the item rectangle - // - bool GetItemRect( long lItem - ,wxRect& rRect - ,int nCode = wxLIST_RECT_BOUNDS - ) const; - - // - // Item position - // - bool GetItemPosition( long lItem - ,wxPoint& rPos - ) const; - bool SetItemPosition( long lItem - ,const wxPoint& rPos - ); - - // - // Gets the number of items in the list control - // - int GetItemCount(void) const; - - // - // Gets the number of columns in the list control - // - inline int GetColumnCount(void) const { return m_nColCount; } - - // - // Retrieves the spacing between icons in pixels. - // If bIsSmall is true, gets the spacing for the small icon - // view, otherwise the large icon view. - // - int GetItemSpacing(bool bIsSmall) const; - - // - // Foreground colour of an item. - // - wxColour GetItemTextColour(long lItem) const; - void SetItemTextColour( long lItem - ,const wxColour& rCol - ); - - // - // Background colour of an item. - // - wxColour GetItemBackgroundColour(long lItem ) const; - void SetItemBackgroundColour( long lItem - ,const wxColour& rCol - ); - - // - // Gets the number of selected items in the list control - // - int GetSelectedItemCount(void) const; - - // - // Text colour of the listview - // - wxColour GetTextColour(void) const; - void SetTextColour(const wxColour& rCol); - - // - // Gets the index of the topmost visible item when in - // list or report view - // - long GetTopItem(void) const; - - // - // Add or remove a single window style - void SetSingleStyle( long lStyle - ,bool bAdd = true - ); - - // - // Set the whole window style - // - void SetWindowStyleFlag(long lStyle); - - // - // Searches for an item, starting from 'item'. - // item can be -1 to find the first item that matches the - // specified flags. - // Returns the item or -1 if unsuccessful. - long GetNextItem( long lItem - ,int nGeometry = wxLIST_NEXT_ALL - ,int lState = wxLIST_STATE_DONTCARE - ) const; - - // - // Gets one of the three image lists - // - wxImageList* GetImageList(int nWhich) const; - - // - // Sets the image list - // - void SetImageList( wxImageList* pImageList - ,int nWhich - ); - void AssignImageList( wxImageList* pImageList - ,int nWhich - ); - - // - // Returns true if it is a virtual list control - // - inline bool IsVirtual() const { return (GetWindowStyle() & wxLC_VIRTUAL) != 0; } - - // - // Refresh items selectively (only useful for virtual list controls) - // - void RefreshItem(long lItem); - void RefreshItems( long lItemFrom - ,long lItemTo - ); - - // - // Operations - //////////////////////////////////////////////////////////////////////////// - // - - // - // Arranges the items - // - bool Arrange(int nFlag = wxLIST_ALIGN_DEFAULT); - - // - // Deletes an item - // - bool DeleteItem(long lItem); - - // - // Deletes all items - bool DeleteAllItems(void); - - // - // Deletes a column - // - bool DeleteColumn(int nCol); - - // - // Deletes all columns - // - bool DeleteAllColumns(void); - - // - // Clears items, and columns if there are any. - // - void ClearAll(void); - - // - // Edit the label - // - wxTextCtrl* EditLabel( long lItem - ,wxClassInfo* pTextControlClass = wxCLASSINFO(wxTextCtrl) - ); - - // - // End label editing, optionally cancelling the edit - // - bool EndEditLabel(bool bCancel); - - // - // Ensures this item is visible - // - bool EnsureVisible(long lItem); - - // - // Find an item whose label matches this string, starting from the item after 'start' - // or the beginning if 'start' is -1. - // - long FindItem( long lStart - ,const wxString& rsStr - ,bool bPartial = false - ); - - // - // Find an item whose data matches this data, starting from the item after 'start' - // or the beginning if 'start' is -1. - // - long FindItem( long lStart - ,long lData - ); - - // - // Find an item nearest this position in the specified direction, starting from - // the item after 'start' or the beginning if 'start' is -1. - // - long FindItem( long lStart - ,const wxPoint& rPoint - ,int lDirection - ); - - // - // Determines which item (if any) is at the specified point, - // giving details in 'flags' (see wxLIST_HITTEST_... flags above) - // - long HitTest( const wxPoint& rPoint - ,int& rFlags - ); - - // - // Inserts an item, returning the index of the new item if successful, - // -1 otherwise. - // - long InsertItem(wxListItem& rInfo); - - // - // Insert a string item - // - long InsertItem( long lIndex - ,const wxString& rsLabel - ); - - // - // Insert an image item - // - long InsertItem( long lIndex - ,int nImageIndex - ); - - // - // Insert an image/string item - // - long InsertItem( long lIndex - ,const wxString& rsLabel - ,int nImageIndex - ); - - // - // For list view mode (only), inserts a column. - // - long InsertColumn( long lCol - ,wxListItem& rInfo - ); - - long InsertColumn( long lCol - ,const wxString& rsHeading - ,int nFormat = wxLIST_FORMAT_LEFT - ,int lWidth = -1 - ); - - // - // set the number of items in a virtual list control - // - void SetItemCount(long lCount); - - // - // Scrolls the list control. If in icon, small icon or report view mode, - // x specifies the number of pixels to scroll. If in list view mode, x - // specifies the number of columns to scroll. - // If in icon, small icon or list view mode, y specifies the number of pixels - // to scroll. If in report view mode, y specifies the number of lines to scroll. - // - bool ScrollList( int nDx - ,int nDy - ); - - // Sort items. - - // - // fn is a function which takes 3 long arguments: item1, item2, data. - // item1 is the long data associated with a first item (NOT the index). - // item2 is the long data associated with a second item (NOT the index). - // data is the same value as passed to SortItems. - // The return value is a negative number if the first item should precede the second - // item, a positive number of the second item should precede the first, - // or zero if the two items are equivalent. - // - // data is arbitrary data to be passed to the sort function. - // - bool SortItems( wxListCtrlCompare fn - ,long lData - ); - - // - // IMPLEMENTATION - // -------------- - // - virtual bool OS2Command( WXUINT uParam - ,WXWORD wId - ); - // - // Bring the control in sync with current m_windowStyle value - // - void UpdateStyle(void); - - // - // Implementation: converts wxWidgets style to MSW style. - // Can be a single style flag or a bit list. - // oldStyle is 'normalised' so that it doesn't contain - // conflicting styles. - // - long ConvertToOS2Style( long& lOldStyle - ,long lStyle - ) const; - long ConvertArrangeToOS2Style(long lStyle); - long ConvertViewToOS2Style(long lStyle); - - virtual MRESULT OS2WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - - // Event handlers - //////////////////////////////////////////////////////////////////////////// - // Necessary for drawing hrules and vrules, if specified - void OnPaint(wxPaintEvent& rEvent); - -protected: - // - // common part of all ctors - // - void Init(void); - - // - // Free memory taken by all internal data - // - void FreeAllInternalData(void); - - wxTextCtrl* m_pTextCtrl; // The control used for editing a label - wxImageList* m_pImageListNormal; // The image list for normal icons - wxImageList* m_pImageListSmall; // The image list for small icons - wxImageList* m_pImageListState; // The image list state icons (not implemented yet) - bool m_bOwnsImageListNormal; - bool m_bOwnsImageListSmall; - bool m_bOwnsImageListState; - long m_lBaseStyle; // Basic PM style flags, for recreation purposes - int m_nColCount; // PM doesn't have GetColumnCount so must - // keep track of inserted/deleted columns - - // - // true if we have any internal data (user data & attributes) - // - bool m_bAnyInternalData; - - // - // true if we have any items with custom attributes - // - bool m_bHasAnyAttr; - - // - // These functions are only used for virtual list view controls, i.e. the - // ones with wxLC_VIRTUAL style - // - // return the text for the given column of the given item - // - virtual wxString OnGetItemText( long lItem - ,long lColumn - ) const; - - // - // Return the icon for the given item. In report view, OnGetItemImage will - // only be called for the first column. See OnGetItemColumnImage for - // details. - // - virtual int OnGetItemImage(long lItem) const; - - // - // Return the icon for the given item and column - // - virtual int OnGetItemColumnImage(long lItem, long lColumn) const; - - // - // Return the attribute for the item (may return NULL if none) - // - virtual wxListItemAttr* OnGetItemAttr(long lItem) const; - -private: - bool DoCreateControl( int nX - ,int nY - ,int nWidth - ,int nHeight - ); - - DECLARE_DYNAMIC_CLASS(wxListCtrl) - DECLARE_EVENT_TABLE() - wxDECLARE_NO_COPY_CLASS(wxListCtrl); -}; // end of CLASS wxListCtrl - -#endif // wxUSE_LISTCTRL - -#endif // _WX_LISTCTRL_H_ - diff --git a/include/wx/os2/magnit1.ptr b/include/wx/os2/magnit1.ptr deleted file mode 100644 index 0e0b74803c..0000000000 Binary files a/include/wx/os2/magnit1.ptr and /dev/null differ diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h deleted file mode 100644 index dbb6703767..0000000000 --- a/include/wx/os2/mdi.h +++ /dev/null @@ -1,197 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/mdi.h -// Purpose: MDI (Multiple Document Interface) classes. -// This doesn't have to be implemented just like Windows, -// it could be a tabbed design as in wxGTK. -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MDI_H_ -#define _WX_MDI_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; -class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; - -class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame -{ -DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) - - friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -public: - - wxMDIParentFrame(); - inline wxMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, // Scrolling refers to client window - const wxString& name = wxFrameNameStr) - { - Create(parent, id, title, pos, size, style, name); - } - - virtual ~wxMDIParentFrame(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - // accessors - // --------- - - // Get the active MDI child window (Windows only) - wxMDIChildFrame *GetActiveChild() const; - - // Get the client window - wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; } - - // Create the client window class (don't Create the window, - // just return a new class) - virtual wxMDIClientWindow *OnCreateClient(void); - - wxMenu* GetWindowMenu() const { return m_windowMenu; } -// void SetWindowMenu(wxMwnu* pMenu); - - // MDI operations - // -------------- - virtual void Cascade(); - virtual void Tile(); - virtual void ArrangeIcons(); - virtual void ActivateNext(); - virtual void ActivatePrevious(); - - // handlers - // -------- - - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - - void OnSize(wxSizeEvent& event); - - bool HandleActivate(int state, bool minimized, WXHWND activate); - bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); - - // override window proc for MDI-specific message processing - virtual MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - virtual MRESULT OS2DefWindowProc(WXUINT, WXWPARAM, WXLPARAM); - virtual bool OS2TranslateMessage(WXMSG* msg); - -protected: - virtual void InternalSetMenuBar(); - - wxMDIClientWindow * m_clientWindow; - wxMDIChildFrame * m_currentChild; - wxMenu* m_windowMenu; - - // TRUE if MDI Frame is intercepting commands, not child - bool m_parentFrameActive; - -private: - DECLARE_EVENT_TABLE() -}; - -class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame -{ -DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) -public: - - wxMDIChildFrame(); - inline wxMDIChildFrame(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Create(parent, id, title, pos, size, style, name); - } - - virtual ~wxMDIChildFrame(); - - bool Create(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - // MDI operations - virtual void Maximize(bool maximize = TRUE); - virtual void Restore(); - virtual void Activate(); - - // Handlers - - bool HandleMDIActivate(long bActivate, WXHWND, WXHWND); - bool HandleSize(int x, int y, WXUINT); - bool HandleWindowPosChanging(void *lpPos); - bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); - - virtual MRESULT OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - virtual MRESULT OS2DefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - virtual bool OS2TranslateMessage(WXMSG *msg); - - virtual void OS2DestroyWindow(); - - // Implementation - bool ResetWindowStyle(void *vrect); - -protected: - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoSetClientSize(int width, int height); - virtual void InternalSetMenuBar(); -}; - -/* The client window is a child of the parent MDI frame, and itself - * contains the child MDI frames. - * However, you create the MDI children as children of the MDI parent: - * only in the implementation does the client window become the parent - * of the children. Phew! So the children are sort of 'adopted'... - */ - -class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow -{ - DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) - - public: - - wxMDIClientWindow() { Init(); } - wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0) - { - Init(); - - CreateClient(parent, style); - } - - // Note: this is virtual, to allow overridden behaviour. - virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); - - // Explicitly call default scroll behaviour - void OnScroll(wxScrollEvent& event); - -protected: - void Init() { m_scrollX = m_scrollY = 0; } - - int m_scrollX, m_scrollY; - -private: - DECLARE_EVENT_TABLE() -}; - -#endif - // _WX_MDI_H_ diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h deleted file mode 100644 index a3a045bb1f..0000000000 --- a/include/wx/os2/menu.h +++ /dev/null @@ -1,291 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/menu.h -// Purpose: wxMenu, wxMenuBar classes -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MENU_H_ -#define _WX_MENU_H_ - -#if wxUSE_ACCEL - #include "wx/accel.h" - #include "wx/list.h" // for "template" list classes - #include "wx/dynarray.h" - - WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray); -#endif // wxUSE_ACCEL - -class WXDLLIMPEXP_FWD_CORE wxFrame; - -void wxSetShortCutKey(wxChar* zText); - -// ---------------------------------------------------------------------------- -// Menu -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase -{ -public: - // - // Ctors & dtor - // - wxMenu( const wxString& rTitle - ,long lStyle = 0 - ) - : wxMenuBase( rTitle - ,lStyle - ) - { - Init(); - } - - wxMenu(long lStyle = 0) - : wxMenuBase(lStyle) - { - Init(); - } - - virtual ~wxMenu(); - - // - // Implement base class virtuals - // - virtual wxMenuItem* DoAppend(wxMenuItem* pItem); - virtual wxMenuItem* DoInsert( size_t nPos - ,wxMenuItem* pItem - ); - virtual wxMenuItem* DoRemove(wxMenuItem* pItem); - virtual void Break(void); - virtual void SetTitle(const wxString& rTitle); - - // - // Implementation only from now on - // ------------------------------- - // - virtual void Attach(wxMenuBarBase* pMenubar); - - bool OS2Command( WXUINT uParam - ,WXWORD wId - ); - - // - // Semi-private accessors - // - - // - // Get the window which contains this menu - // - wxWindow* GetWindow(void) const; - - // - // Get the menu handle - // - WXHMENU GetHMenu() const { return m_hMenu; } - -#if wxUSE_ACCEL - // - // Called by wxMenuBar to build its accel table from the accels of all menus - // - bool HasAccels(void) const { return m_vAccels.IsEmpty(); } - size_t GetAccelCount(void) const { return m_vAccels.GetCount(); } - size_t CopyAccels(wxAcceleratorEntry* pAccels) const; - - // - // Called by wxMenuItem when its accels changes - // - void UpdateAccel(wxMenuItem* pItem); - - // - // Helper used by wxMenu itself (returns the index in m_accels) - // - int FindAccel(int nId) const; -#endif // wxUSE_ACCEL - // - // OS/2 specific Find - // - wxMenuItem* FindItem(int id, ULONG hItem, wxMenu **menu = NULL) const; - //virtual function hiding suppression - int FindItem(const wxString& rsString) const - { return wxMenuBase::FindItem(rsString); } - wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const - { return wxMenuBase::FindItem(id, menu); } - - // - // All OS/2PM Menu's have one of these - // - MENUITEM m_vMenuData; - -private: - // - // Common part of all ctors - // - void Init(); - - // - // Common part of Append/Insert (behaves as Append is pos == (size_t)-1) - // - bool DoInsertOrAppend( wxMenuItem* pItem - ,size_t nPos = (size_t)-1 - ); - - // - // Terminate the current radio group, if any - // - void EndRadioGroup(void); - - // - // If true, insert a breal before appending the next item - // - bool m_bDoBreak; - - // - // The menu handle of this menu - // - WXHMENU m_hMenu; - - // - // The helper variable for creating unique IDs. - // - static USHORT m_nextMenuId; - - // - // The position of the first item in the current radio group or -1 - // - int m_nStartRadioGroup; - -#if wxUSE_ACCEL - // - // The accelerators for our menu items - // - wxAcceleratorArray m_vAccels; -#endif // wxUSE_ACCEL - - DECLARE_DYNAMIC_CLASS(wxMenu) -}; // end of wxMenu - -// ---------------------------------------------------------------------------- -// Menu Bar (a la Windows) -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase -{ -public: - // - // Ctors & dtor - // - - // - // Default constructor - // - wxMenuBar(); - - // - // Unused under OS2 - wxMenuBar(long lStyle); - - // - // Menubar takes ownership of the menus arrays but copies the titles - // - wxMenuBar( int n - ,wxMenu* vMenus[] - ,const wxString sTitles[] - ,long lStyle = 0 - ); - virtual ~wxMenuBar(); - - // - // Menubar construction - // - virtual bool Append( wxMenu* pMenu - ,const wxString& rTitle - ); - virtual bool Insert( size_t nPos - ,wxMenu* pMenu - ,const wxString& rTitle - ); - virtual wxMenu* Replace( size_t nPos - ,wxMenu* pMenu - ,const wxString& rTitle - ); - virtual wxMenu* Remove(size_t nPos); - virtual int FindMenuItem( const wxString& rMenuString - ,const wxString& rItemString - ) const; - virtual wxMenuItem* FindItem( int nId - ,wxMenu** ppMenu = NULL - ) const; - virtual wxMenuItem* FindItem( int nId - ,ULONG hItem - ,wxMenu** ppMenu = NULL - ) const; - virtual void EnableTop( size_t nPos - ,bool bFlag - ); - virtual void SetMenuLabel( size_t nPos - ,const wxString& rLabel - ); - virtual wxString GetMenuLabel(size_t nPos) const; - - // - // Implementation from now on - // - WXHMENU Create(void); - virtual void Detach(void); - virtual void Attach(wxFrame* pFrame); - -#if wxUSE_ACCEL - // - // Get the accel table for all the menus - // - const wxAcceleratorTable& GetAccelTable(void) const { return m_vAccelTable; } - - // - // Update the accel table (must be called after adding/deleting a menu) - // - void RebuildAccelTable(void); -#endif // wxUSE_ACCEL - - // - // Get the menu handle - WXHMENU GetHMenu(void) const { return m_hMenu; } - - // - // If the menubar is modified, the display is not updated automatically, - // call this function to update it (m_menuBarFrame should be !NULL) - // - void Refresh(void); - -protected: - // - // Common part of all ctors - // - void Init(void); - - wxArrayString m_titles; - - WXHMENU m_hMenu; - -#if wxUSE_ACCEL - // - // The accelerator table for all accelerators in all our menus - // - wxAcceleratorTable m_vAccelTable; -#endif // wxUSE_ACCEL - -private: - // - // Virtual function hiding suppression - // - void Refresh( bool bErase - ,const wxRect* pRect - ) - { wxWindow::Refresh(bErase, pRect); } - - DECLARE_DYNAMIC_CLASS(wxMenuBar) -}; - -#endif // _WX_MENU_H_ diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h deleted file mode 100644 index 626996fe26..0000000000 --- a/include/wx/os2/menuitem.h +++ /dev/null @@ -1,171 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/menuitem.h -// Purpose: wxMenuItem class -// Author: Vadim Zeitlin -// Modified by: -// Created: 11.11.97 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MENUITEM_H -#define _MENUITEM_H - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" -#include "wx/os2/private.h" // for MENUITEM - -// an exception to the general rule that a normal header doesn't include other -// headers - only because ownerdrw.h is not always included and I don't want -// to write #ifdef's everywhere... -#if wxUSE_OWNER_DRAWN - #include "wx/ownerdrw.h" - #include "wx/bitmap.h" -#endif - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour -// ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase -#if wxUSE_OWNER_DRAWN - , public wxOwnerDrawn -#endif -{ -public: - // - // ctor & dtor - // - wxMenuItem( wxMenu* pParentMenu = NULL - ,int nId = wxID_SEPARATOR - ,const wxString& rStrName = wxEmptyString - ,const wxString& rWxHelp = wxEmptyString - ,wxItemKind eKind = wxITEM_NORMAL - ,wxMenu* pSubMenu = NULL - ); - - // - // Depricated, do not use in new code - // - wxMenuItem( wxMenu* pParentMenu - ,int vId - ,const wxString& rsText - ,const wxString& rsHelp - ,bool bIsCheckable - ,wxMenu* pSubMenu = NULL - ); - virtual ~wxMenuItem(); - - // - // Override base class virtuals - // - virtual void SetItemLabel(const wxString& rStrName); - - virtual void Enable(bool bDoEnable = true); - virtual void Check(bool bDoCheck = true); - virtual bool IsChecked(void) const; - - // - // Unfortunately needed to resolve ambiguity between - // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable() - // - bool IsCheckable(void) const { return wxMenuItemBase::IsCheckable(); } - - // - // The id for a popup menu is really its menu handle (as required by - // ::AppendMenu() API), so this function will return either the id or the - // menu handle depending on what we're - // - int GetRealId(void) const; - - // - // Mark item as belonging to the given radio group - // - void SetAsRadioGroupStart(void); - void SetRadioGroupStart(int nStart); - void SetRadioGroupEnd(int nEnd); - - // - // All OS/2PM Submenus and menus have one of these - // - MENUITEM m_vMenuData; - -#if wxUSE_OWNER_DRAWN - - void SetBitmaps(const wxBitmap& bmpChecked, - const wxBitmap& bmpUnchecked = wxNullBitmap) - { - m_bmpChecked = bmpChecked; - m_bmpUnchecked = bmpUnchecked; - SetOwnerDrawn(true); - } - - void SetBitmap(const wxBitmap& bmp, bool bChecked = true) - { - if ( bChecked ) - m_bmpChecked = bmp; - else - m_bmpUnchecked = bmp; - SetOwnerDrawn(true); - } - - void SetDisabledBitmap(const wxBitmap& bmpDisabled) - { - m_bmpDisabled = bmpDisabled; - SetOwnerDrawn(true); - } - - const wxBitmap& GetBitmap(bool bChecked = true) const - { return (bChecked ? m_bmpChecked : m_bmpUnchecked); } - - const wxBitmap& GetDisabledBitmap() const - { return m_bmpDisabled; } - - - // override wxOwnerDrawn base class virtuals - virtual wxString GetName() const; - virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight); - virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat); - -protected: - virtual void GetFontToUse(wxFont& font) const; - -#endif // wxUSE_OWNER_DRAWN - -private: - 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 m_nStart; - int m_nEnd; - } m_vRadioGroup; - - // - // Does this item start a radio group? - // - bool m_bIsRadioGroupStart; - -#if wxUSE_OWNER_DRAWN - // item bitmaps - wxBitmap m_bmpChecked, // bitmap to put near the item - m_bmpUnchecked, // (checked is used also for 'uncheckable' items) - m_bmpDisabled; -#endif // wxUSE_OWNER_DRAWN - - DECLARE_DYNAMIC_CLASS(wxMenuItem) -}; // end of CLASS wxMenuItem - -#endif //_MENUITEM_H diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h deleted file mode 100644 index 5036afe6eb..0000000000 --- a/include/wx/os2/metafile.h +++ /dev/null @@ -1,208 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/metafile.h -// Purpose: wxMetaFile, wxMetaFileDC classes. -// This probably should be restricted to Windows platforms, -// but if there is an equivalent on your platform, great. -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef _WX_METAFIILE_H_ -#define _WX_METAFIILE_H_ - -#include "wx/dc.h" -#include "wx/gdiobj.h" -#include "wx/os2/dc.h" - -#if wxUSE_DRAG_AND_DROP -#include "wx/dataobj.h" -#endif - -/* - * Metafile and metafile device context classes - * - */ - -#define wxMetaFile wxMetafile -#define wxMetaFileDC wxMetafileDC - -class WXDLLIMPEXP_FWD_CORE wxMetafile; - -class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData -{ - friend class WXDLLIMPEXP_FWD_CORE wxMetafile; -public: - wxMetafileRefData(void); - virtual ~wxMetafileRefData(void); - - virtual bool IsOk() const { return m_metafile != 0; } - -public: - WXHANDLE m_metafile; - int m_windowsMappingMode; -}; - -#define M_METAFILEDATA ((wxMetafileRefData *)m_refData) - -class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject -{ - DECLARE_DYNAMIC_CLASS(wxMetafile) -public: - wxMetafile(const wxString& file = wxEmptyString); - virtual ~wxMetafile(void); - - // After this is called, the metafile cannot be used for anything - // since it is now owned by the clipboard. - virtual bool SetClipboard(int width = 0, int height = 0); - - virtual bool Play(wxDC *dc); - - // Implementation - inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; } - void SetHMETAFILE(WXHANDLE mf) ; - inline int GetWindowsMappingMode(void) { return M_METAFILEDATA->m_windowsMappingMode; } - void SetWindowsMappingMode(int mm); - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; -}; - -class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxPMDCImpl -{ -public: - wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString); - wxMetafileDCImpl(wxDC *owner, const wxString& file, - int xext, int yext, int xorg, int yorg); - virtual ~wxMetafileDCImpl(); - - virtual wxMetafile *Close(); - virtual void SetMapMode(wxMappingMode mode); - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - - // Implementation - wxMetafile *GetMetaFile() const { return m_metaFile; } - void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } - int GetWindowsMappingMode() const { return m_windowsMappingMode; } - void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; } - -protected: - virtual void DoGetSize(int *width, int *height) const; - - int m_windowsMappingMode; - wxMetafile* m_metaFile; - -private: - DECLARE_CLASS(wxMetafileDCImpl) - wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl); -}; - -class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC -{ -public: - // Don't supply origin and extent - // Supply them to wxMakeMetaFilePlaceable instead. - wxMetafileDC(const wxString& file = wxEmptyString) - :wxDC(new wxMetafileDCImpl( this, file )) - { } - - // Supply origin and extent (recommended). - // Then don't need to supply them to wxMakeMetaFilePlaceable. - wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg) - : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg )) - { } - - wxMetafile *GetMetafile() const - { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); } - - virtual ~wxMetafileDC(void) - { delete m_pimpl; } - - // Should be called at end of drawing - virtual wxMetafile *Close(void) - { return ((wxMetafileDCImpl*)m_pimpl)->Close(); } - - inline void SetMetaFile(wxMetafile *mf) - { ((wxMetafileDCImpl*)m_pimpl)->SetMetaFile(mf); } - -private: - DECLARE_CLASS(wxMetafileDC) - wxDECLARE_NO_COPY_CLASS(wxMetafileDC); -}; - -/* - * Pass filename of existing non-placeable metafile, and bounding box. - * Adds a placeable metafile header, sets the mapping mode to anisotropic, - * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode. - * - */ - -// No origin or extent -#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable -bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); - -// Optional origin and extent -bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable( const wxString& filename - ,int x1 - ,int y1 - ,int x2 - ,int y2 - ,float scale = 1.0 - ,bool useOriginAndExtent = true - ); - -// ---------------------------------------------------------------------------- -// wxMetafileDataObject is a specialization of wxDataObject for metafile data -// ---------------------------------------------------------------------------- - -// TODO: implement OLE side of things. At present, it's just for clipboard -// use. - -#if wxUSE_DRAG_AND_DROP -class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject -{ -public: - // ctors - wxMetafileDataObject() { m_width = 0; m_height = 0; } - wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0) - :m_metafile(metafile) - ,m_width(width) - ,m_height(height) { } - - void SetMetafile(const wxMetafile& metafile, int w = 0, int h = 0) - { m_metafile = metafile; m_width = w; m_height = h; } - wxMetafile GetMetafile() const { return m_metafile; } - int GetWidth() const { return m_width; } - int GetHeight() const { return m_height; } - - virtual wxDataFormat GetFormat() const { return wxDF_METAFILE; } - -/* ?? - // implement base class pure virtuals - virtual wxDataFormat GetPreferredFormat() const - { return (wxDataFormat) wxDataObject::Text; } - virtual bool IsSupportedFormat(wxDataFormat format) const - { return format == wxDataObject::Text || format == wxDataObject::Locale; } - virtual size_t GetDataSize() const - { return m_strText.Len() + 1; } // +1 for trailing '\0'of course - virtual void GetDataHere(void *pBuf) const - { memcpy(pBuf, m_strText.c_str(), GetDataSize()); } -*/ - -private: - wxMetafile m_metafile; - int m_width; - int m_height; -}; -#endif - -#endif - // _WX_METAFIILE_H_ diff --git a/include/wx/os2/mimetype.h b/include/wx/os2/mimetype.h deleted file mode 100644 index 6429e98776..0000000000 --- a/include/wx/os2/mimetype.h +++ /dev/null @@ -1,107 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/mimetype.h -// Purpose: classes and functions to manage MIME types -// Author: David Webster -// Modified by: -// Created: 01.21.99 -// Copyright: adopted from msw port -- (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence (part of wxExtra library) -///////////////////////////////////////////////////////////////////////////// - -#ifndef _MIMETYPE_IMPL_H -#define _MIMETYPE_IMPL_H - -#include "wx/defs.h" - -#if wxUSE_MIMETYPE - -#include "wx/mimetype.h" - -// ---------------------------------------------------------------------------- -// wxFileTypeImpl is the OS/2 version of wxFileType, this is a private class -// and is never used directly by the application -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxFileTypeImpl -{ -public: - // ctor - wxFileTypeImpl() { m_info = NULL; } - - // one of these Init() function must be called (ctor can't take any - // arguments because it's common) - - // initialize us with our file type name and extension - in this case - // we will read all other data from the registry - void Init(const wxString& strFileType, const wxString& ext) - { m_strFileType = strFileType; m_ext = ext; } - - // initialize us with a wxFileTypeInfo object - it contains all the - // data - void Init(const wxFileTypeInfo& info) - { m_info = &info; } - - // implement accessor functions - bool GetExtensions(wxArrayString& extensions); - bool GetMimeType(wxString *mimeType) const; - bool GetMimeTypes(wxArrayString& mimeTypes) const; - bool GetIcon(wxIconLocation *iconLoc) const; - bool GetDescription(wxString *desc) const; - bool GetOpenCommand(wxString *openCmd, - const wxFileType::MessageParameters& params) const; - bool GetPrintCommand(wxString *printCmd, - const wxFileType::MessageParameters& params) const; - - size_t GetAllCommands(wxArrayString * verbs, wxArrayString * commands, - const wxFileType::MessageParameters& params) const; - - bool Unassociate(); - - // set an arbitrary command, ask confirmation if it already exists and - // overwriteprompt is true - bool SetCommand(const wxString& cmd, - const wxString& verb, - bool overwriteprompt = true); - - bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0); - - // this is called by Associate - bool SetDescription (const wxString& desc); - -private: - // helper function: reads the command corresponding to the specified verb - // from the registry (returns an empty string if not found) - wxString GetCommand(const wxChar *verb) const; - - // we use either m_info or read the data from the registry if m_info == NULL - const wxFileTypeInfo *m_info; - wxString m_strFileType, // may be empty - m_ext; -}; - - - -class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl -{ -public: - // nothing to do here, we don't load any data but just go and fetch it from - // the registry when asked for - wxMimeTypesManagerImpl() { } - - // implement containing class functions - wxFileType *GetFileTypeFromExtension(const wxString& ext); - wxFileType *GetOrAllocateFileTypeFromExtension(const wxString& ext); - wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); - - size_t EnumAllFileTypes(wxArrayString& mimetypes); - - void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); } - -private: - wxArrayFileTypeInfo m_fallbacks; -}; - -#endif // wxUSE_MIMETYPE - -#endif - //_MIMETYPE_IMPL_H diff --git a/include/wx/os2/minifram.h b/include/wx/os2/minifram.h deleted file mode 100644 index 44dd84eec1..0000000000 --- a/include/wx/os2/minifram.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/minifram.h -// Purpose: wxMiniFrame class. A small frame for e.g. floating toolbars. -// If there is no equivalent on your platform, just make it a -// normal frame. -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MINIFRAM_H_ -#define _WX_MINIFRAM_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { - - DECLARE_DYNAMIC_CLASS(wxMiniFrame) - -public: - inline wxMiniFrame(void) {} - inline wxMiniFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT, name); - } - -protected: -}; - -#endif - // _WX_MINIFRAM_H_ - diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h deleted file mode 100644 index 8b94effb3f..0000000000 --- a/include/wx/os2/msgdlg.h +++ /dev/null @@ -1,34 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/msgdlg.h -// Purpose: wxMessageDialog class. Use generic version if no -// platform-specific implementation. -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSGBOXDLG_H_ -#define _WX_MSGBOXDLG_H_ - -class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase -{ -public: - wxMessageDialog( wxWindow* pParent - ,const wxString& rsMessage - ,const wxString& rsCaption = wxMessageBoxCaptionStr - ,long lStyle = wxOK|wxCENTRE - ,const wxPoint& WXUNUSED(rPos) = wxDefaultPosition - ) - : wxMessageDialogBase(pParent, rsMessage, rsCaption, lStyle) - { - } - - int ShowModal(void); - -protected: - DECLARE_DYNAMIC_CLASS(wxMessageDialog) -}; // end of CLASS wxMessageDialog - -#endif // _WX_MSGBOXDLG_H_ diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h deleted file mode 100644 index e9df265914..0000000000 --- a/include/wx/os2/notebook.h +++ /dev/null @@ -1,200 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/notebook.h -// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) -// Author: David Webster -// Modified by: -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _NOTEBOOK_H -#define _NOTEBOOK_H - -#if wxUSE_NOTEBOOK - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/control.h" - -// ---------------------------------------------------------------------------- -// wxNotebook -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase -{ -public: - // - // Ctors - // ----- - // Default for dynamic class - // - wxNotebook(); - - // - // the same arguments as for wxControl - // - wxNotebook( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxString& rsName = wxNotebookNameStr - ); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxString& rsName = wxNotebookNameStr - ); - - // - // Accessors - // --------- - // Get number of pages in the dialog - // - virtual size_t GetPageCount(void) const; - - // - // Set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - // - int SetSelection(size_t nPage); - - // changes selected page without sending events - int ChangeSelection(size_t nPage); - - // - // Set/Get the title of a page - // - bool SetPageText( size_t nPage - ,const wxString& sStrText - ); - wxString GetPageText(size_t nPage) const; - - // - // Image list stuff: each page may have an image associated with it. All - // the images belong to an image list, so you have to - // 1) create an image list - // 2) associate it with the notebook - // 3) set for each page it's image - // associate image list with a control - // - void SetImageList(wxImageList* pImageList); - - // - // Sets/returns item's image index in the current image list - // - int GetPageImage(size_t nPage) const; - bool SetPageImage( size_t nPage - ,int nImage - ); - - // - // Currently it's always 1 because wxGTK doesn't support multi-row - // tab controls - // - int GetRowCount(void) const; - - // - // control the appearance of the notebook pages - // set the size (the same for all pages) - // - void SetPageSize(const wxSize& rSize); - - // - // Set the padding between tabs (in pixels) - // - void SetPadding(const wxSize& rPadding); - - // - // Operations - // ---------- - // Remove all pages - // - bool DeleteAllPages(void); - - // - // Adds a new page to the notebook (it will be deleted ny the notebook, - // don't delete it yourself). If bSelect, this page becomes active. - // - bool AddPage( wxNotebookPage* pPage - ,const wxString& rsStrText - ,bool bSelect = false - ,int nImageId = -1 - ); - - // - // The same as AddPage(), but adds it at the specified position - // - bool InsertPage( size_t nPage - ,wxNotebookPage* pPage - ,const wxString& rsStrText - ,bool bSelect = false - ,int nImageId = -1 - ); - - // - // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH - // style. - // - void SetTabSize(const wxSize& rSize); - - // - // Callbacks - // --------- - // - void OnSize(wxSizeEvent& rEvent); - void OnSelChange(wxBookCtrlEvent& rEvent); - void OnSetFocus(wxFocusEvent& rEvent); - void OnNavigationKey(wxNavigationKeyEvent& rEvent); - - // - // Base class virtuals - // ------------------- - // - virtual bool OS2OnScroll( int nOrientation - ,WXWORD wSBCode - ,WXWORD wPos - ,WXHWND hControl - ); - virtual void SetConstraintSizes(bool bRecurse = true); - virtual bool DoPhase(int nPhase); - -protected: - // - // Common part of all ctors - // - void Init(void); - - // - // Translate wxWin styles to the PM ones - // - virtual WXDWORD OS2GetStyle( long lFlags - ,WXDWORD* pwExstyle = NULL - ) const; - - // - // Remove one page from the notebook, without deleting - // - virtual wxNotebookPage* DoRemovePage(size_t nPage); - - // - // Helper functions - // - -private: - wxArrayLong m_alPageId; - int m_nTabSize; // holds the largest tab size - - DECLARE_DYNAMIC_CLASS(wxNotebook) - DECLARE_EVENT_TABLE() -}; // end of CLASS wxNotebook - -#endif // wxUSE_NOTEBOOK - -#endif // _NOTEBOOK_H diff --git a/include/wx/os2/ownerdrw.h b/include/wx/os2/ownerdrw.h deleted file mode 100644 index 49de7f00f2..0000000000 --- a/include/wx/os2/ownerdrw.h +++ /dev/null @@ -1,28 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/ownerdrw.h -// Purpose: wxOwnerDrawn class -// Author: Marcin Malich -// Modified by: -// Created: 2009-09-22 -// Copyright: (c) 2009 Marcin Malich -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OWNERDRW_H_ -#define _WX_OWNERDRW_H_ - -#if wxUSE_OWNER_DRAWN - -class WXDLLIMPEXP_CORE wxOwnerDrawn : public wxOwnerDrawnBase -{ -public: - wxOwnerDrawn() {} - virtual ~wxOwnerDrawn() {} - - virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, - wxODAction act, wxODStatus stat); -}; - -#endif // wxUSE_OWNER_DRAWN - -#endif // _WX_OWNERDRW_H_ diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h deleted file mode 100644 index ef67ec240a..0000000000 --- a/include/wx/os2/palette.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/palette.h -// Purpose: wxPalette class -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PALETTE_H_ -#define _WX_PALETTE_H_ - -#include "wx/gdiobj.h" -#include "wx/os2/private.h" - -class WXDLLIMPEXP_FWD_CORE wxPalette; - -class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData -{ - friend class WXDLLIMPEXP_FWD_CORE wxPalette; -public: - wxPaletteRefData(); - virtual ~wxPaletteRefData(); -// protected: - WXHPALETTE m_hPalette; - HPS m_hPS; -}; // end of CLASS wxPaletteRefData - -#define M_PALETTEDATA ((wxPaletteRefData *)m_refData) - -class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase -{ -public: - wxPalette(); - - wxPalette( int n - ,const unsigned char* pRed - ,const unsigned char* pGreen - ,const unsigned char* pBlue - ); - virtual ~wxPalette(); - - bool Create( int n - ,const unsigned char* pRed - ,const unsigned char* pGreen - ,const unsigned char* pBlue - ); - int GetPixel( unsigned char cRed - ,unsigned char cGreen - ,unsigned char cBlue - ) const; - bool GetRGB( int nPixel - ,unsigned char* pRed - ,unsigned char* pGreen - ,unsigned char* pBlue - ) const; - - virtual bool FreeResource(bool bForce = false); - - inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); } - void SetHPALETTE(WXHPALETTE hPalette); - void SetPS(HPS hPS); - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - DECLARE_DYNAMIC_CLASS(wxPalette) -}; // end of CLASS wxPalette - -#endif - // _WX_PALETTE_H_ diff --git a/include/wx/os2/pbrush.ptr b/include/wx/os2/pbrush.ptr deleted file mode 100644 index f7738ca048..0000000000 Binary files a/include/wx/os2/pbrush.ptr and /dev/null differ diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h deleted file mode 100644 index fb37d4dcb0..0000000000 --- a/include/wx/os2/pen.h +++ /dev/null @@ -1,104 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/pen.h -// Purpose: wxPen class -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PEN_H_ -#define _WX_PEN_H_ - -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - -typedef long wxPMDash; - -// ---------------------------------------------------------------------------- -// Pen -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPen : public wxPenBase -{ -public: - wxPen() { } - wxPen( const wxColour& rColour - ,int nWidth = 1 - ,wxPenStyle nStyle = wxPENSTYLE_SOLID - ); - - wxPen( const wxBitmap& rStipple - ,int nWidth - ); - virtual ~wxPen() { } - - bool operator == (const wxPen& rPen) const; - inline bool operator != (const wxPen& rPen) const - { return !(*this == rPen); } - - // - // Override in order to recreate the pen - // - void SetColour(const wxColour& rColour); - void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue); - - void SetWidth(int nWidth); - void SetStyle(wxPenStyle nStyle); - void SetStipple(const wxBitmap& rStipple); - void SetDashes( int nNbDashes - ,const wxDash* pDash - ); - void SetJoin(wxPenJoin nJoin); - void SetCap(wxPenCap nCap); - void SetPS(HPS hPS); - - wxColour GetColour(void) const; - int GetWidth(void) const; - wxPenStyle GetStyle(void) const; - wxPenJoin GetJoin(void) const; - wxPenCap GetCap(void) const; - int GetPS(void) const; - int GetDashes(wxDash **ptr) const; - wxDash* GetDash() const; - int GetDashCount() const; - wxBitmap* GetStipple(void) const; - - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - wxPen(const wxColour& col, int width, int style); - - wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") - void SetStyle(int style) { SetStyle((wxPenStyle)style); } - - // - // Implementation - // - - // - // Useful helper: create the brush resource - // - bool RealizeResource(void); - bool FreeResource(bool bForce = false); - virtual WXHANDLE GetResourceHandle(void) const; - bool IsFree(void) const; - -private: - LINEBUNDLE m_vLineBundle; - AREABUNDLE m_vAreaBundle; - -protected: - virtual wxGDIRefData* CreateGDIRefData() const; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; - - // same as FreeResource() + RealizeResource() - bool Recreate(); - - DECLARE_DYNAMIC_CLASS(wxPen) -}; // end of CLASS wxPen - -extern int wx2os2PenStyle(wxPenStyle nWxStyle); - -#endif - // _WX_PEN_H_ diff --git a/include/wx/os2/pencil.ptr b/include/wx/os2/pencil.ptr deleted file mode 100644 index 792d7bbec6..0000000000 Binary files a/include/wx/os2/pencil.ptr and /dev/null differ diff --git a/include/wx/os2/pnghand.h b/include/wx/os2/pnghand.h deleted file mode 100644 index f5d0209dcd..0000000000 --- a/include/wx/os2/pnghand.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/pnghand.h -// Purpose: PNG bitmap handler -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Microsoft, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PNGHAND_H_ -#define _WX_PNGHAND_H_ - -class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler -{ - DECLARE_DYNAMIC_CLASS(wxPNGFileHandler) -public: - inline wxPNGFileHandler(void) - { - m_sName = "PNG bitmap file"; - m_sExtension = "bmp"; - m_lType = wxBITMAP_TYPE_PNG; - } - - virtual bool LoadFile( wxBitmap* pBitmap - ,const wxString& rName - ,HPS hPs - ,long lFlags - ,int nDesiredWidth - ,int nDesiredHeight - ); - virtual bool SaveFile( wxBitmap* pBitmap - ,const wxString& rName - ,int nType - ,const wxPalette* pPalette = NULL - ); -}; - -#endif - // _WX_PNGHAND_H_ diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h deleted file mode 100644 index 3c40306804..0000000000 --- a/include/wx/os2/pngread.h +++ /dev/null @@ -1,287 +0,0 @@ -/* - * File: wx/os2/pngread.h - * Purpose: PNG file reader - * Author: Alejandro Aguilar Sierra/Julian Smart - * Created: 1995 - * Copyright: (c) 1995, Alejandro Aguilar Sierra - * - * - */ - -#ifndef _WX_PNGREAD__ -#define _WX_PNGREAD__ - -#ifndef byte -typedef unsigned char byte; -#endif - -#define WXIMA_COLORS DIB_PAL_COLORS - -typedef byte* ImagePointerType; - -typedef struct -{ - byte red; - byte green; - byte blue; -} rgb_color_struct; - - -#define COLORTYPE_PALETTE 1 -#define COLORTYPE_COLOR 2 -#define COLORTYPE_ALPHA 4 - -class wxPNGReader -{ -protected: - int filetype; - wxChar filename[255]; - ImagePointerType RawImage; // Image data - - int Width, Height; // Dimensions - int Depth; // (bits x pixel) - int ColorType; // Bit 1 = Palette used - // Bit 2 = Color used - // Bit 3 = Alpha used - - long EfeWidth; // Efective Width - - BITMAPINFOHEADER2* lpbi; - int bgindex; - wxPalette* Palette; - bool imageOK; -friend class wxPNGReaderIter; -public: - wxPNGReader(void); - wxPNGReader (wxChar* ImageFileName); // Read an image file - ~wxPNGReader (); - - void Create(int width, int height, int deep, int colortype=-1); - - bool ReadFile( wxChar* ImageFileName=0 ); - bool SaveFile( wxChar* ImageFileName=0 ); - bool SaveXPM(wxChar *filename, wxChar *name = 0); - int GetWidth( void ) const { return Width; } - int GetHeight( void ) const { return Height; } - int GetDepth( void ) const { return Depth; } - int GetColorType( void ) const { return ColorType; } - - int GetIndex(int x, int y); - bool GetRGB(int x, int y, byte* r, byte* g, byte* b); - - bool SetIndex(int x, int y, int index); - bool SetRGB(int x, int y, byte r, byte g, byte b); - - // ColorMap settings - bool SetPalette(wxPalette* colourmap); - bool SetPalette(int n, rgb_color_struct *rgb_struct); - bool SetPalette(int n, byte *r, byte *g=0, byte *b=0); - wxPalette* GetPalette() const { return Palette; } - - void NullData(); - inline int GetBGIndex(void) { return bgindex; } - - inline bool Inside(int x, int y) - { return (0<=y && yRawImage; - Itx = Ity = 0; - Stepx = Stepy = 0; -} - -inline -wxPNGReaderIter::operator wxPNGReader* () -{ - return ima; -} - -inline -bool wxPNGReaderIter::ItOK () -{ - if (ima) - return ima->Inside(Itx, Ity); - else - return FALSE; -} - - -inline void wxPNGReaderIter::reset() -{ - IterImage = ima->RawImage; - Itx = Ity = 0; -} - -inline void wxPNGReaderIter::upset() -{ - Itx = 0; - Ity = ima->Height-1; - IterImage = ima->RawImage + ima->EfeWidth*(ima->Height-1); -} - -inline bool wxPNGReaderIter::NextRow() -{ - if (++Ity >= ima->Height) return 0; - IterImage += ima->EfeWidth; - return 1; -} - -inline bool wxPNGReaderIter::PrevRow() -{ - if (--Ity < 0) return 0; - IterImage -= ima->EfeWidth; - return 1; -} - -////////////////////////// AD - for interlace /////////////////////////////// -inline void wxPNGReaderIter::SetY(int y) -{ - if ((y < 0) || (y > ima->Height)) return; - Ity = y; - IterImage = ima->RawImage + ima->EfeWidth*y; -} - -///////////////////////////////////////////////////////////////////////////// - -inline void wxPNGReaderIter::SetRow(byte *buf, int n) -{ -// Here should be bcopy or memcpy - //_fmemcpy(IterImage, (void far *)buf, n); - if (n<0) - n = ima->GetWidth(); - - for (int i=0; iEfeWidth) - return 1; - else - if (++Ity < ima->Height) - { - IterImage += ima->EfeWidth; - Itx = 0; - return 1; - } else - return 0; -} - -inline bool wxPNGReaderIter::PrevByte() -{ - if (--Itx >= 0) - return 1; - else - if (--Ity >= 0) - { - IterImage -= ima->EfeWidth; - Itx = 0; - return 1; - } else - return 0; -} - -inline bool wxPNGReaderIter::NextStep() -{ - Itx += Stepx; - if (Itx < ima->EfeWidth) - return 1; - else { - Ity += Stepy; - if (Ity < ima->Height) - { - IterImage += ima->EfeWidth; - Itx = 0; - return 1; - } else - return 0; - } -} - -inline bool wxPNGReaderIter::PrevStep() -{ - Itx -= Stepx; - if (Itx >= 0) - return 1; - else { - Ity -= Stepy; - if (Ity >= 0 && Ity < ima->Height) - { - IterImage -= ima->EfeWidth; - Itx = 0; - return 1; - } else - return 0; - } -} - -#endif - // _WX_PNGREAD__ diff --git a/include/wx/os2/pntleft.ptr b/include/wx/os2/pntleft.ptr deleted file mode 100644 index e11bb0882d..0000000000 Binary files a/include/wx/os2/pntleft.ptr and /dev/null differ diff --git a/include/wx/os2/pntright.ptr b/include/wx/os2/pntright.ptr deleted file mode 100644 index b243c42a05..0000000000 Binary files a/include/wx/os2/pntright.ptr and /dev/null differ diff --git a/include/wx/os2/popupwin.h b/include/wx/os2/popupwin.h deleted file mode 100644 index bcbe265cf4..0000000000 --- a/include/wx/os2/popupwin.h +++ /dev/null @@ -1,57 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/popupwin.h -// Purpose: wxPopupWindow class for wxPM -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.01.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PM_POPUPWIN_H_ -#define _WX_PM_POPUPWIN_H_ - -// ---------------------------------------------------------------------------- -// wxPopupWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase -{ -public: - wxPopupWindow() { } - - wxPopupWindow( wxWindow* pParent - ,int nFlags - ) - { (void)Create(pParent, nFlags); } - - bool Create( wxWindow* pParent - ,int nFlags = wxBORDER_NONE - ); - // - // Implementation only from now on - // ------------------------------- - // -protected: - - virtual void DoGetPosition( int* pnX - ,int* pny - ) const; - - virtual WXDWORD OS2GetStyle( long lFlags - ,WXDWORD* dwExstyle - ) const; - // - // Get the HWND to be used as parent of this window with CreateWindow() - // - virtual WXHWND OS2GetParent(void) const; - - // - // The list of all currently shown popup windows used by FindPopupFor() - // - static wxWindowList m_svShownPopups; - - DECLARE_DYNAMIC_CLASS(wxPopupWindow) -}; // end of CLASS wxPopupWindow - -#endif // _WX_PM_POPUPWIN_H_ diff --git a/include/wx/os2/print.h b/include/wx/os2/print.h deleted file mode 100644 index a22fab1e01..0000000000 --- a/include/wx/os2/print.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/print.h -// Purpose: wxPrinter, wxPrintPreview classes -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINT_H_ -#define _WX_PRINT_H_ - -#include "wx/prntbase.h" - -/* - * Represents the printer: manages printing a wxPrintout object - */ - -class WXDLLIMPEXP_CORE wxOS2Printer: public wxPrinterBase -{ - DECLARE_DYNAMIC_CLASS(wxPrinter) - - public: - wxOS2Printer(wxPrintData *data = NULL); - virtual ~wxOS2Printer(); - - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE); - virtual wxDC* PrintDialog(wxWindow *parent); - virtual bool Setup(wxWindow *parent); -private: -}; - -/* - * wxPrintPreview - * Programmer creates an object of this class to preview a wxPrintout. - */ - -class WXDLLIMPEXP_CORE wxOS2PrintPreview: public wxPrintPreviewBase -{ - DECLARE_CLASS(wxPrintPreview) - - public: - wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); - virtual ~wxOS2PrintPreview(); - - virtual bool Print(bool interactive); - virtual void DetermineScaling(); -}; - -#endif - // _WX_PRINT_H_ diff --git a/include/wx/os2/printos2.h b/include/wx/os2/printos2.h deleted file mode 100644 index 3cf8f0ec4d..0000000000 --- a/include/wx/os2/printos2.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/printos2.h -// Purpose: wxOS2Printer, wxOS2PrintPreview classes -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_PRINT_H_ -#define _WX_PRINT_H_ - -#include "wx/prntbase.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -/* - * Represents the printer: manages printing a wxPrintout object - */ - -class WXDLLIMPEXP_CORE wxOS2Printer: public wxPrinterBase -{ - DECLARE_DYNAMIC_CLASS(wxOS2Printer) - -public: - wxOS2Printer(wxPrintDialogData *data = NULL); - virtual ~wxOS2Printer(); - - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true); - virtual wxDC* PrintDialog(wxWindow *parent); - virtual bool Setup(wxWindow *parent); -private: -}; - -/* - * wxOS2PrintPreview - * Programmer creates an object of this class to preview a wxPrintout. - */ - -class WXDLLIMPEXP_CORE wxOS2PrintPreview: public wxPrintPreviewBase -{ - DECLARE_CLASS(wxOS2PrintPreview) - -public: - wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintDialogData *data = NULL); - wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data); - virtual ~wxOS2PrintPreview(); - - virtual bool Print(bool interactive); - virtual void DetermineScaling(); -}; - -#endif // wxUSE_PRINTING_ARCHITECTURE - -#endif - // _WX_PRINT_H_ diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h deleted file mode 100644 index 9729793909..0000000000 --- a/include/wx/os2/private.h +++ /dev/null @@ -1,423 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/private.h -// Purpose: Private declarations: as this header is only included by -// wxWidgets itself, it may contain identifiers which don't start -// with "wx". -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_PRIVATE_H_ -#define _WX_OS2_PRIVATE_H_ - -#define INCL_BASE -#define INCL_PM -#define INCL_GPI -#define INCL_WINSYS -#define INCL_GPIERRORS -#define INCL_DOS -#define INCL_DOSPROCESS -#define INCL_DOSERRORS -#define INCL_WIN -#define INCL_WINATOM -#define INCL_SHLERRORS - -#include - -#if wxONLY_WATCOM_EARLIER_THAN(1,4) - inline HATOMTBL APIENTRY WinQuerySystemAtomTable(VOID){return NULL;} - inline ULONG APIENTRY WinQueryAtomName(HATOMTBL,ATOM,PCSZ,ULONG){return 0;} - inline LONG APIENTRY GpiPointArc(HPS,PPOINTL){return GPI_ERROR;} - inline BOOL APIENTRY WinDrawPointer(HPS,LONG,LONG,HPOINTER,ULONG){return FALSE;} - inline HPOINTER APIENTRY WinCreatePointerIndirect(HWND,PPOINTERINFO){return NULLHANDLE;} - inline BOOL APIENTRY WinGetMaxPosition(HWND,PSWP){return FALSE;} - inline BOOL APIENTRY WinGetMinPosition(HWND,PSWP,PPOINTL){return FALSE;} -#endif - -#if defined(__WATCOMC__) && defined(__WXMOTIF__) - #include - #define I_NEED_OS2_H - #include - - // include this header from here for many of the GUI related code - #if wxUSE_GUI - extern "C" { - #include - } - #endif - - // provide Unix-like pipe() - #include - #include - #include - // Use ::DosCreatePipe or ::DosCreateNPipe under OS/2 - // for more see http://posix2.sourceforge.net/guide.html - inline int pipe( int WXUNUSED(filedes)[2] ) - { - wxFAIL_MSG(wxT("Implement first")); - return -1; - } -#endif - -#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(HAVE_SPBCDATA) - - typedef struct _SPBCDATA { - ULONG cbSize; /* Size of control block. */ - ULONG ulTextLimit; /* Entryfield text limit. */ - LONG lLowerLimit; /* Spin lower limit (numeric only). */ - LONG lUpperLimit; /* Spin upper limit (numeric only). */ - ULONG idMasterSpb; /* ID of the servant's master spinbutton. */ - PVOID pHWXCtlData; /* Handwriting control data structure flag. */ - } SPBCDATA; - - typedef SPBCDATA *PSPBCDATA; - -#endif - -#include "wx/dlimpexp.h" -#include "wx/fontenc.h" - -class WXDLLIMPEXP_FWD_CORE wxFont; -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_BASE wxString; -class WXDLLIMPEXP_FWD_CORE wxBitmap; - -// --------------------------------------------------------------------------- -// private constants -// --------------------------------------------------------------------------- - -// -// Constant strings for control names and classes -// - -// -// Controls -// -WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxCheckBoxNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxComboBoxNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxFrameNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxGaugeNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBoxNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxListBoxNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticLineNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticTextNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBitmapNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxPanelNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxRadioBoxNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxRadioButtonNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxBitmapRadioButtonNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxScrollBarNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxSliderNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxTextCtrlNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxStatusLineNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxGetTextFromUserPromptStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxMessageBoxCaptionStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxFileSelectorPromptStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxFileSelectorDefaultWildcardStr[]; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxInternalErrorStr; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFatalErrorStr; -WXDLLIMPEXP_DATA_CORE(extern const char) wxTreeCtrlNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxDirDialogNameStr[]; -WXDLLIMPEXP_DATA_CORE(extern const char) wxDirDialogDefaultFolderStr[]; - -// -// Class names -// -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFrameClassName; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFrameClassNameNoRedraw; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIFrameClassName; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIFrameClassNameNoRedraw; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIChildFrameClassName; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIChildFrameClassNameNoRedraw; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxPanelClassName; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxPanelClassNameNR; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxCanvasClassName; -WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxCanvasClassNameNR; - -// --------------------------------------------------------------------------- -// standard icons from the resources -// --------------------------------------------------------------------------- - -#ifdef __WXPM__ - -WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_FRAME_ICON; -WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_MDIPARENTFRAME_ICON; -WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_MDICHILDFRAME_ICON; -WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_FRAME_ICON; -WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON; -WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON; -WXDLLIMPEXP_DATA_CORE(extern HFONT) wxSTATUS_LINE_FONT; - -#endif - -// --------------------------------------------------------------------------- -// this defines a CASTWNDPROC macro which casts a pointer to the type of a -// window proc for PM. -// MPARAM is a void * but is really a 32-bit value -// --------------------------------------------------------------------------- - -typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM); -#define CASTWNDPROC (WndProcCast) - -/* - * Decide what window classes we're going to use - * for this combination of CTl3D/FAFA settings - */ - -#define STATIC_CLASS wxT("STATIC") -#define STATIC_FLAGS (SS_TEXT|DT_LEFT|SS_LEFT|WS_VISIBLE) -#define CHECK_CLASS wxT("BUTTON") -#define CHECK_FLAGS (BS_AUTOCHECKBOX|WS_TABSTOP) -#define CHECK_IS_FAFA FALSE -#define RADIO_CLASS wxT("BUTTON" ) -#define RADIO_FLAGS (BS_AUTORADIOBUTTON|WS_VISIBLE) -#define RADIO_SIZE 20 -#define RADIO_IS_FAFA FALSE -#define PURE_WINDOWS -/* PM has no group box button style -#define GROUP_CLASS "BUTTON" -#define GROUP_FLAGS (BS_GROUPBOX|WS_CHILD|WS_VISIBLE) -*/ - -/* -#define BITCHECK_FLAGS (FB_BITMAP|FC_BUTTONDRAW|FC_DEFAULT|WS_VISIBLE) -#define BITRADIO_FLAGS (FC_BUTTONDRAW|FB_BITMAP|FC_RADIO|WS_CHILD|WS_VISIBLE) -*/ - -// --------------------------------------------------------------------------- -// misc macros -// --------------------------------------------------------------------------- - -#define MEANING_CHARACTER '0' -#define DEFAULT_ITEM_WIDTH 200 -#define DEFAULT_ITEM_HEIGHT 80 - -// Scale font to get edit control height -#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (3*(cy)/2) - -#ifdef __WXPM__ - -// Generic subclass proc, for panel item moving/sizing and intercept -// EDIT control VK_RETURN messages -extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message, WXWPARAM wParam, WXLPARAM lParam); - -#endif - -// --------------------------------------------------------------------------- -// constants which might miss from some compilers' headers -// --------------------------------------------------------------------------- - -#if !defined(WS_EX_CLIENTEDGE) - #define WS_EX_CLIENTEDGE 0x00000200L -#endif - -#ifndef ENDSESSION_LOGOFF - #define ENDSESSION_LOGOFF 0x80000000 -#endif - -#ifndef PMERR_INVALID_PARM - #define PMERR_INVALID_PARM 0x1303 -#endif - -#ifndef PMERR_INVALID_PARAMETERS - #define PMERR_INVALID_PARAMETERS 0x1208 -#endif - -#ifndef BOOKERR_INVALID_PARAMETERS - #define BOOKERR_INVALID_PARAMETERS -1 -#endif - -#ifndef DLGC_ENTRYFIELD - #define DLGC_ENTRYFIELD 0x0001 -#endif - -#ifndef DLGC_BUTTON - #define DLGC_BUTTON 0x0002 -#endif - -#ifndef DLGC_MLE - #define DLGC_MLE 0x0400 -#endif - -#ifndef DP_NORMAL - #define DP_NORMAL 0 -#endif - -// --------------------------------------------------------------------------- -// debug messages -- OS/2 has no native debug output system -// --------------------------------------------------------------------------- - -// --------------------------------------------------------------------------- -// macros to make casting between WXFOO and FOO a bit easier: the GetFoo() -// returns Foo cast to the Windows type for oruselves, while GetFooOf() takes -// an argument which should be a pointer or reference to the object of the -// corresponding class (this depends on the macro) -// --------------------------------------------------------------------------- - -#define GetHwnd() ((HWND)GetHWND()) -#define GetHwndOf(win) ((HWND)((win)->GetHWND())) -// old name -#define GetWinHwnd GetHwndOf - -#define GetHdc() ((HDC)GetHDC()) -#define GetHdcOf(dc) ((HDC)(dc).GetHDC()) - -#define GetHbitmap() ((HBITMAP)GetHBITMAP()) -#define GetHbitmapOf(bmp) ((HBITMAP)(bmp).GetHBITMAP()) - -#define GetHicon() ((HICON)GetHICON()) -#define GetHiconOf(icon) ((HICON)(icon).GetHICON()) - -#define GetHaccel() ((HACCEL)GetHACCEL()) -#define GetHaccelOf(table) ((HACCEL)((table).GetHACCEL())) - -#define GetHmenu() ((HMENU)GetHMenu()) -#define GetHmenuOf(menu) ((HMENU)menu->GetHMenu()) - -#define GetHcursor() ((HCURSOR)GetHCURSOR()) -#define GetHcursorOf(cursor) ((HCURSOR)(cursor).GetHCURSOR()) - -#define GetHfont() ((HFONT)GetHFONT()) -#define GetHfontOf(font) ((HFONT)(font).GetHFONT()) - -// OS/2 convention of the mask is opposed to the wxWidgets one, so we need -// to invert the mask each time we pass one/get one to/from Windows -extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); -extern HBITMAP wxCopyBmp(HBITMAP hbmp, bool flip=false, int w=0, int h=0); - -// --------------------------------------------------------------------------- -// global data -// --------------------------------------------------------------------------- - -#ifdef __WXPM__ -// The MakeProcInstance version of the function wxSubclassedGenericControlProc -WXDLLIMPEXP_DATA_CORE(extern int) wxGenericControlSubClassProc; -WXDLLIMPEXP_DATA_CORE(extern wxChar*) wxBuffer; -WXDLLIMPEXP_DATA_CORE(extern HINSTANCE) wxhInstance; -#endif - -// --------------------------------------------------------------------------- -// global functions -// --------------------------------------------------------------------------- - -#ifdef __WXPM__ -extern "C" -{ -WXDLLIMPEXP_CORE HINSTANCE wxGetInstance(); -} - -WXDLLIMPEXP_CORE void wxSetInstance(HINSTANCE hInst); -#endif - -#include "wx/thread.h" -static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid, - MPARAM mpParam1, MPARAM mpParam2) -{ - MRESULT vRes; - vRes = ::WinSendMsg(hwnd, ulMsgid, mpParam1, mpParam2); -#if wxUSE_THREADS - if (!wxThread::IsMain()) - ::WinPostMsg(hwnd, ulMsgid, mpParam1, mpParam2); -#endif - return vRes; -} -#define WinSendMsg MySendMsg - -#ifdef __WXPM__ - -WXDLLIMPEXP_CORE void wxDrawBorder( HPS hPS - ,RECTL& rRect - ,WXDWORD dwStyle - ); - -WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(WXHWND hWnd); - -WXDLLIMPEXP_CORE void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font); - -WXDLLIMPEXP_CORE void wxConvertVectorFontSize( FIXED fxPointSize - ,PFATTRS pFattrs - ); -WXDLLIMPEXP_CORE void wxFillLogFont( LOGFONT* pLogFont - ,PFACENAMEDESC pFaceName - ,HPS* phPS - ,bool* pbInternalPS - ,long* pflId - ,wxString& sFaceName - ,wxFont* pFont - ); -WXDLLIMPEXP_CORE wxFontEncoding wxGetFontEncFromCharSet(int nCharSet); -WXDLLIMPEXP_CORE void wxOS2SelectMatchingFontByName( PFATTRS vFattrs - ,PFACENAMEDESC pFaceName - ,PFONTMETRICS pFM - ,int nNumFonts - ,const wxFont* pFont - ); -WXDLLIMPEXP_CORE wxFont wxCreateFontFromLogFont( LOGFONT* pLogFont - ,PFONTMETRICS pFM - ,PFACENAMEDESC pFace - ); -WXDLLIMPEXP_CORE int wxGpiStrcmp(wxChar* s0, wxChar* s1); - -WXDLLIMPEXP_CORE void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); -WXDLLIMPEXP_CORE void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); - -// Find maximum size of window/rectangle -WXDLLIMPEXP_CORE extern void wxFindMaxSize(WXHWND hwnd, RECT *rect); - -WXDLLIMPEXP_CORE wxWindow* wxFindControlFromHandle(WXHWND hWnd); -WXDLLIMPEXP_CORE void wxAddControlHandle(WXHWND hWnd, wxWindow *item); - -// Safely get the window text (i.e. without using fixed size buffer) -WXDLLIMPEXP_CORE extern wxString wxGetWindowText(WXHWND hWnd); - -// get the window class name -WXDLLIMPEXP_CORE extern wxString wxGetWindowClass(WXHWND hWnd); - -// get the window id (should be unsigned, hence this is not wxWindowID which -// is, for mainly historical reasons, signed) -WXDLLIMPEXP_CORE extern WXWORD wxGetWindowId(WXHWND hWnd); - -// Convert a PM Error code to a string -WXDLLIMPEXP_BASE extern wxString wxPMErrorToStr(ERRORID vError); - -// Does this window style specify any border? -inline bool wxStyleHasBorder(long style) -{ - return (style & (wxSIMPLE_BORDER | wxRAISED_BORDER | - wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0; -} - -inline RECTL wxGetWindowRect(HWND hWnd) -{ - RECTL vRect; - - ::WinQueryWindowRect(hWnd, &vRect); - return vRect; -} // end of wxGetWindowRect - -WXDLLIMPEXP_CORE extern void wxOS2SetFont( HWND hWnd - ,const wxFont& rFont - ); - - -WXDLLIMPEXP_CORE extern bool wxCheckWindowWndProc( WXHWND hWnd - ,WXFARPROC fnWndProc - ); -WXDLLIMPEXP_CORE extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp - ,long lColor - ); -#if wxUSE_GUI -class wxColour; -WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor); -#endif - -#endif // __WXPM__ - -#endif // _WX_OS2_PRIVATE_H_ diff --git a/include/wx/os2/private/timer.h b/include/wx/os2/private/timer.h deleted file mode 100644 index a1ba027559..0000000000 --- a/include/wx/os2/private/timer.h +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/private/timer.h -// Purpose: wxTimer class -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_PRIVATE_TIMER_H_ -#define _WX_OS2_PRIVATE_TIMER_H_ - -#include "wx/private/timer.h" - -class WXDLLIMPEXP_CORE wxOS2TimerImpl: public wxTimerImpl -{ -friend void wxProcessTimer(wxOS2TimerImpl& timer); - -public: - wxOS2TimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_ulId = 0; } - - virtual bool Start(int nMilliseconds = -1, bool bOneShot = FALSE); - virtual void Stop(void); - - virtual bool IsRunning(void) const { return m_ulId != 0L; } - -protected: - ULONG m_ulId; - HAB m_Hab; -}; - -extern ULONG wxTimerProc( HWND WXUNUSED(hwnd) - ,ULONG - ,int nIdTimer - ,ULONG - ); -#endif // _WX_OS2_PRIVATE_TIMER_H_ diff --git a/include/wx/os2/query.ptr b/include/wx/os2/query.ptr deleted file mode 100644 index cfffae5951..0000000000 Binary files a/include/wx/os2/query.ptr and /dev/null differ diff --git a/include/wx/os2/question.ico b/include/wx/os2/question.ico deleted file mode 100644 index 129053ec6a..0000000000 Binary files a/include/wx/os2/question.ico and /dev/null differ diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h deleted file mode 100644 index c548ab7b14..0000000000 --- a/include/wx/os2/radiobox.h +++ /dev/null @@ -1,193 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/radiobox.h -// Purpose: wxRadioBox class -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RADIOBOX_H_ -#define _WX_RADIOBOX_H_ - -// List box item -class WXDLLIMPEXP_FWD_CORE wxBitmap ; - -class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase -{ -public: - wxRadioBox(); - - inline wxRadioBox( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,int nNum = 0 - ,const wxString asChoices[] = NULL - ,int nMajorDim = 0 - ,long lStyle = wxRA_SPECIFY_COLS - ,const wxValidator& rVal = wxDefaultValidator - ,const wxString& rsName = wxRadioBoxNameStr - ) - { - Create( pParent - ,vId - ,rsTitle - ,rPos - ,rSize - ,nNum - ,asChoices - ,nMajorDim - ,lStyle - ,rVal - ,rsName - ); - } - - inline wxRadioBox( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos - ,const wxSize& rSize - ,const wxArrayString& asChoices - ,int nMajorDim = 0 - ,long lStyle = wxRA_SPECIFY_COLS - ,const wxValidator& rVal = wxDefaultValidator - ,const wxString& rsName = wxRadioBoxNameStr - ) - { - Create( pParent - ,vId - ,rsTitle - ,rPos - ,rSize - ,asChoices - ,nMajorDim - ,lStyle - ,rVal - ,rsName - ); - } - - virtual ~wxRadioBox(); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,int nNum = 0 - ,const wxString asChoices[] = NULL - ,int nMajorDim = 0 - ,long lStyle = wxRA_SPECIFY_COLS - ,const wxValidator& rVal = wxDefaultValidator - ,const wxString& rsName = wxRadioBoxNameStr - ); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos - ,const wxSize& rSize - ,const wxArrayString& asChoices - ,int nMajorDim = 0 - ,long lStyle = wxRA_SPECIFY_COLS - ,const wxValidator& rVal = wxDefaultValidator - ,const wxString& rsName = wxRadioBoxNameStr - ); - - // Enabling - virtual bool Enable(bool bEnable = true); - virtual bool Enable(unsigned int nItem, bool bEnable = true); - virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const - { - /* TODO */ - return true; - } - - // Showing - virtual bool Show(bool bShow = true); - virtual bool Show(unsigned int nItem, bool bShow = true); - virtual bool IsItemShown(unsigned int WXUNUSED(n)) const - { - /* TODO */ - return true; - } - - void Command(wxCommandEvent& rEvent); - bool ContainsHWND(WXHWND hWnd) const; - - virtual WXHBRUSH OnCtlColor( WXHDC hDC - ,WXHWND hWnd - ,WXUINT uCtlColor - ,WXUINT uMessage - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - virtual bool OS2Command( WXUINT uParam - ,WXWORD wId - ); - void SendNotificationEvent(void); - MRESULT WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - - - - - virtual unsigned int GetCount() const; - inline WXHWND* GetRadioButtons(void) const { return m_ahRadioButtons; } - int GetSelection(void) const; - void GetSize(int* pnX, int* pnY) const; - inline int GetSizeFlags(void) const { return m_nSizeFlags; } - virtual wxString GetString(unsigned int nIndex) const; - virtual wxString GetStringSelection(void) const; - - inline void SetButtonFont(const wxFont& rFont) { SetFont(rFont); } - void SetFocus(void); - virtual bool SetFont(const wxFont& rFont); - inline void SetLabelFont(const wxFont& WXUNUSED(font)) {} - virtual void SetSelection(int nIndex); - virtual void SetString(unsigned int nNum, const wxString& rsLabel); - virtual bool SetStringSelection(const wxString& rsStr); - - virtual void SetLabel(const wxString& rsLabel) - { wxControl::SetLabel(rsLabel); } - virtual wxString GetLabel() const - { return wxControl::GetLabel(); } - - void SetLabel( int nItem, const wxString& rsLabel ); - void SetLabel( int item, wxBitmap* pBitmap ); - wxString GetLabel(int nItem) const; - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize(void) const; - virtual void DoSetSize( int nX - ,int nY - ,int nWidth - ,int nHeight - ,int nSizeFlags = wxSIZE_AUTO - ); - wxSize GetMaxButtonSize(void) const; - wxSize GetTotalButtonSize(const wxSize& rSizeBtn) const; - void SubclassRadioButton(WXHWND hWndBtn); - - - WXHWND* m_ahRadioButtons; - int* m_pnRadioWidth; // for bitmaps - int* m_pnRadioHeight; - int m_nSelectedButton; - int m_nSizeFlags; - -private: - - unsigned int m_nNoItems; - - DECLARE_DYNAMIC_CLASS(wxRadioBox) -}; // end of wxRadioBox - -#endif // _WX_RADIOBOX_H_ diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h deleted file mode 100644 index 7e8f9ac173..0000000000 --- a/include/wx/os2/radiobut.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/radiobut.h -// Purpose: wxRadioButton class -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_RADIOBUT_H_ -#define _WX_RADIOBUT_H_ - -#include "wx/control.h" - -class WXDLLIMPEXP_CORE wxRadioButton: public wxControl -{ -public: - inline wxRadioButton() { Init(); } - inline wxRadioButton( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxRadioButtonNameStr - ) - { - Init(); - - Create( pParent - ,vId - ,rsLabel - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxRadioButtonNameStr - ); - - virtual void SetLabel(const wxString& rsLabel); - virtual void SetValue(bool bVal); - virtual bool GetValue(void) const ; - - bool OS2Command( WXUINT wParam - ,WXWORD wId - ); - void Command(wxCommandEvent& rEvent); - virtual MRESULT OS2WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - virtual void SetFocus(void); - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; - -private: - void Init(void); - - bool m_bFocusJustSet; - - DECLARE_DYNAMIC_CLASS(wxRadioButton) -}; // end of wxRadioButton - -#endif - // _WX_RADIOBUT_H_ diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h deleted file mode 100644 index 40ef561b96..0000000000 --- a/include/wx/os2/region.h +++ /dev/null @@ -1,115 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/region.h -// Purpose: wxRegion class -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_REGION_H_ -#define _WX_OS2_REGION_H_ - -#include "wx/list.h" -#include "wx/os2/private.h" - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine -{ -public: - wxRegion( wxCoord x - ,wxCoord y - ,wxCoord vWidth - ,wxCoord vHeight - ); - wxRegion( const wxPoint& rTopLeft - ,const wxPoint& rBottomRight - ); - wxRegion(const wxRect& rRect); - wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region - wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); - wxRegion( const wxBitmap& bmp) - { - Union(bmp); - } - wxRegion( const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - { - Union(bmp, transColour, tolerance); - } - - wxRegion(); - virtual ~wxRegion(); - - // - // Modify region - // - - // - // Clear current region - // - virtual void Clear(); - - // - // Is region empty? - // - virtual bool IsEmpty() const; - - // - // Get internal region handle - // - WXHRGN GetHRGN() const; - - void SetPS(HPS hPS); - -protected: - virtual wxGDIRefData* CreateGDIRefData(void) const; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* pData) const; - - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; - - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoCombine(const wxRegion& region, wxRegionOp op); - - friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; - DECLARE_DYNAMIC_CLASS(wxRegion); - -}; // end of CLASS wxRegion - -class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject -{ -public: - wxRegionIterator(); - wxRegionIterator(const wxRegion& rRegion); - virtual ~wxRegionIterator(); - - void Reset(void) { m_lCurrent = 0; } - void Reset(const wxRegion& rRegion); - - operator bool (void) const { return m_lCurrent < m_lNumRects; } - bool HaveRects(void) const { return m_lCurrent < m_lNumRects; } - - void operator ++ (void); - void operator ++ (int); - - wxCoord GetX(void) const; - wxCoord GetY(void) const; - wxCoord GetW(void) const; - wxCoord GetWidth(void) const { return GetW(); } - wxCoord GetH(void) const; - wxCoord GetHeight(void) const { return GetH(); } - wxRect GetRect(void) const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); } - -private: - long m_lCurrent; - long m_lNumRects; - wxRegion m_vRegion; - wxRect* m_pRects; - - DECLARE_DYNAMIC_CLASS(wxRegionIterator) -}; // end of wxRegionIterator - -#endif // _WX_OS2_REGION_H_ diff --git a/include/wx/os2/removble.ico b/include/wx/os2/removble.ico deleted file mode 100644 index 823094f1e5..0000000000 Binary files a/include/wx/os2/removble.ico and /dev/null differ diff --git a/include/wx/os2/roller.ptr b/include/wx/os2/roller.ptr deleted file mode 100644 index 5306a1722b..0000000000 Binary files a/include/wx/os2/roller.ptr and /dev/null differ diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h deleted file mode 100644 index d8688818e6..0000000000 --- a/include/wx/os2/scrolbar.h +++ /dev/null @@ -1,98 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/scrolbar.h -// Purpose: wxScrollBar class -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SCROLBAR_H_ -#define _WX_SCROLBAR_H_ - -#include "wx/scrolbar.h" - -// Scrollbar item -class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase -{ -public: - inline wxScrollBar() - { - m_nPageSize = 0; - m_nViewSize = 0; - m_nObjectSize = 0; - } - inline wxScrollBar( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxSB_HORIZONTAL -#if wxUSE_VALIDATORS - ,const wxValidator& rValidator = wxDefaultValidator -#endif - ,const wxString& rsName = wxScrollBarNameStr - ) - { - Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle -#if wxUSE_VALIDATORS - ,rValidator -#endif - ,rsName - ); - } - virtual ~wxScrollBar(); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxSB_HORIZONTAL -#if wxUSE_VALIDATORS - ,const wxValidator& rValidator = wxDefaultValidator -#endif - ,const wxString& rsName = wxScrollBarNameStr - ); - - int GetThumbPosition(void) const ; - inline int GetThumbSize(void) const { return m_nPageSize; } - inline int GetPageSize(void) const { return m_nViewSize; } - inline int GetRange(void) const { return m_nObjectSize; } - - virtual void SetThumbPosition(int nViewStart); - virtual void SetScrollbar( int nPosition - ,int nThumbSize - ,int nRange - ,int nPageSize - ,bool bRefresh = TRUE - ); - - void Command(wxCommandEvent& rEvent); - virtual WXHBRUSH OnCtlColor( WXHDC hDC - ,WXHWND hWnd - ,WXUINT uCtlColor - ,WXUINT uMessage - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - virtual bool OS2OnScroll( int nOrientation - ,WXWORD wParam - ,WXWORD wPos - ,WXHWND hControl - ); - -protected: - int m_nPageSize; - int m_nViewSize; - int m_nObjectSize; - -private: - DECLARE_DYNAMIC_CLASS(wxScrollBar) -}; // end of CLASS wxScrollBar - -#endif - // _WX_SCROLBAR_H_ diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h deleted file mode 100644 index fec365da5b..0000000000 --- a/include/wx/os2/setup0.h +++ /dev/null @@ -1,1499 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/setup.h -// Purpose: Configuration for the library -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SETUP_H_ -#define _WX_SETUP_H_ - -/* --- start common options --- */ -// ---------------------------------------------------------------------------- -// global settings -// ---------------------------------------------------------------------------- - -// define this to 0 when building wxBase library - this can also be done from -// makefile/project file overriding the value here -#ifndef wxUSE_GUI - #define wxUSE_GUI 1 -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// compatibility settings -// ---------------------------------------------------------------------------- - -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - -// This setting determines the compatibility with 3.0 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 - -// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when -// default system font is used for wxWindow::GetCharWidth/Height() instead of -// the current font. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxDIALOG_UNIT_COMPATIBILITY 0 - -// ---------------------------------------------------------------------------- -// debugging settings -// ---------------------------------------------------------------------------- - -// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no -// need to define it here. You may do it for two reasons: either completely -// disable/compile out the asserts in release version (then do it inside #ifdef -// NDEBUG) or, on the contrary, enable more asserts, including the usually -// disabled ones, in the debug build (then do it inside #ifndef NDEBUG) -// -// #ifdef NDEBUG -// #define wxDEBUG_LEVEL 0 -// #else -// #define wxDEBUG_LEVEL 2 -// #endif - -// wxHandleFatalExceptions() may be used to catch the program faults at run -// time and, instead of terminating the program with a usual GPF message box, -// call the user-defined wxApp::OnFatalException() function. If you set -// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. -// -// This setting is for Win32 only and can only be enabled if your compiler -// supports Win32 structured exception handling (currently only VC++ does) -// -// Default is 1 -// -// Recommended setting: 1 if your compiler supports it. -#define wxUSE_ON_FATAL_EXCEPTION 1 - -// Set this to 1 to be able to generate a human-readable (unlike -// machine-readable minidump created by wxCrashReport::Generate()) stack back -// trace when your program crashes using wxStackWalker -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_STACKWALKER 1 - -// Set this to 1 to compile in wxDebugReport class which allows you to create -// and optionally upload to your web site a debug report consisting of back -// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, it is compiled into a separate library so there -// is no overhead if you don't use it -#define wxUSE_DEBUGREPORT 1 - -// Generic comment about debugging settings: they are very useful if you don't -// use any other memory leak detection tools such as Purify/BoundsChecker, but -// are probably redundant otherwise. Also, Visual C++ CRT has the same features -// as wxWidgets memory debugging subsystem built in since version 5.0 and you -// may prefer to use it instead of built in memory debugging code because it is -// faster and more fool proof. -// -// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG -// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) -// and if __NO_VC_CRTDBG__ is not defined. - -// The rest of the options in this section are obsolete and not supported, -// enable them at your own risk. - -// If 1, enables wxDebugContext, for writing error messages to file, etc. If -// __WXDEBUG__ is not defined, will still use the normal memory operators. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_CONTEXT 0 - -// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* -// __WXDEBUG__ is also defined. -// -// WARNING: this code may not work with all architectures, especially if -// alignment is an issue. This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 1 if you are not using a memory debugging tool, else 0 -#define wxUSE_MEMORY_TRACING 0 - -// In debug mode, cause new and delete to be redefined globally. -// If this causes problems (e.g. link errors which is a common problem -// especially if you use another library which also redefines the global new -// and delete), set this to 0. -// This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If -// this causes problems (e.g. link errors), set this to 0. You may need to set -// this to 0 if using templates (at least for VC++). This switch is currently -// ignored for MinGW/Cygwin. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_NEW_ALWAYS 0 - - -// ---------------------------------------------------------------------------- -// Unicode support -// ---------------------------------------------------------------------------- - -// These settings are obsolete: the library is always built in Unicode mode -// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if -// absolutely necessary -- updating it is strongly recommended as the ANSI mode -// will disappear completely in future wxWidgets releases. -#ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 1 -#endif - -// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -#define wxUSE_WCHAR_T 1 - -// ---------------------------------------------------------------------------- -// global features -// ---------------------------------------------------------------------------- - -// Compile library in exception-safe mode? If set to 1, the library will try to -// behave correctly in presence of exceptions (even though it still will not -// use the exceptions itself) and notify the user code about any unhandled -// exceptions. If set to 0, propagation of the exceptions through the library -// code will lead to undefined behaviour -- but the code itself will be -// slightly smaller and faster. -// -// Note that like wxUSE_THREADS this option is automatically set to 0 if -// wxNO_EXCEPTIONS is defined. -// -// Default is 1 -// -// Recommended setting: depends on whether you intend to use C++ exceptions -// in your own code (1 if you do, 0 if you don't) -#define wxUSE_EXCEPTIONS 1 - -// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI -// -// Default is 0 -// -// Recommended setting: 0 (this is still work in progress...) -#define wxUSE_EXTENDED_RTTI 0 - -// Support for message/error logging. This includes wxLogXXX() functions and -// wxLog and derived classes. Don't set this to 0 unless you really know what -// you are doing. -// -// Default is 1 -// -// Recommended setting: 1 (always) -#define wxUSE_LOG 1 - -// Recommended setting: 1 -#define wxUSE_LOGWINDOW 1 - -// Recommended setting: 1 -#define wxUSE_LOGGUI 1 - -// Recommended setting: 1 -#define wxUSE_LOG_DIALOG 1 - -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - -// Support for multithreaded applications: if 1, compile in thread classes -// (thread.h) and make the library a bit more thread safe. Although thread -// support is quite stable by now, you may still consider recompiling the -// library without it if you have no use for it - this will result in a -// somewhat smaller and faster operation. -// -// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset -// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in -// build/msw/config.* file this value will have no effect. -// -// Default is 1 -// -// Recommended setting: 0 unless you do plan to develop MT applications -#define wxUSE_THREADS 1 - -// If enabled, compiles wxWidgets streams classes -// -// wx stream classes are used for image IO, process IO redirection, network -// protocols implementation and much more and so disabling this results in a -// lot of other functionality being lost. -// -// Default is 1 -// -// Recommended setting: 1 as setting it to 0 disables many other things -#define wxUSE_STREAMS 1 - -// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. -// Note that if the system's implementation does not support positional -// parameters, setting this to 1 forces the use of the wxWidgets implementation -// of wxVsnprintf. The standard vsnprintf() supports positional parameters on -// many Unix systems but usually doesn't under Windows. -// -// Positional parameters are very useful when translating a program since using -// them in formatting strings allow translators to correctly reorder the -// translated sentences. -// -// Default is 1 -// -// Recommended setting: 1 if you want to support multiple languages -#define wxUSE_PRINTF_POS_PARAMS 1 - -// Enable the use of compiler-specific thread local storage keyword, if any. -// This is used for wxTLS_XXX() macros implementation and normally should use -// the compiler-provided support as it's simpler and more efficient, but is -// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets -// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under -// XP as this triggers a bug in compiler TLS support that results in crashes -// when any TLS variables are used. -// -// If you're absolutely sure that your build of wxWidgets is never going to be -// used in such situation, either because it's not going to be linked from any -// kind of plugin or because you only target Vista or later systems, you can -// set this to 2 to force the use of compiler TLS even under MSW. -// -// Default is 1 meaning that compiler TLS is used only if it's 100% safe. -// -// Recommended setting: 2 if you want to have maximal performance and don't -// care about the scenario described above. -#define wxUSE_COMPILER_TLS 1 - -// ---------------------------------------------------------------------------- -// Interoperability with the standard library. -// ---------------------------------------------------------------------------- - -// Set wxUSE_STL to 1 to enable maximal interoperability with the standard -// library, even at the cost of backwards compatibility. -// -// Default is 0 -// -// Recommended setting: 0 as the options below already provide a relatively -// good level of interoperability and changing this option arguably isn't worth -// diverging from the official builds of the library. -#define wxUSE_STL 0 - -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. -// -// Currently the Digital Mars and Watcom compilers come without standard C++ -// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -// them (e.g. from STLPort). -#if defined(__DMC__) || defined(__WATCOMC__) - #define wxUSE_STD_DEFAULT 0 -#else - #define wxUSE_STD_DEFAULT 1 -#endif - -// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> -// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but -// usually more limited) implementations are used which allows to avoid the -// dependency on the C++ run-time library. -// -// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't -// support using standard containers. -// -// 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 -// standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 1 if compiler supports it. -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable minimal interoperability with the standard C++ string class if 1. -// "Minimal" means that wxString can be constructed from std::string or -// std::wstring but can't be implicitly converted to them. You need to enable -// the option below for the latter. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - -// Make wxString as much interchangeable with std::[w]string as possible, in -// particular allow implicit conversion of wxString to either of these classes. -// This comes at a price (or a benefit, depending on your point of view) of not -// allowing implicit conversion to "const char *" and "const wchar_t *". -// -// Because a lot of existing code relies on these conversions, this option is -// disabled by default but can be enabled for your build if you don't care -// about compatibility. -// -// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. -// -// Recommended setting: 0 to remain compatible with the official builds of -// wxWidgets. -#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 - - -// ---------------------------------------------------------------------------- -// non GUI features selection -// ---------------------------------------------------------------------------- - -// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit -// integer which is implemented in terms of native 64 bit integers if any or -// uses emulation otherwise. -// -// This class is required by wxDateTime and so you should enable it if you want -// to use wxDateTime. For most modern platforms, it will use the native 64 bit -// integers in which case (almost) all of its functions are inline and it -// almost does not take any space, so there should be no reason to switch it -// off. -// -// Recommended setting: 1 -#define wxUSE_LONGLONG 1 - -// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for -// storing binary data in wxConfig on most platforms. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_BASE64 1 - -// Set this to 1 to be able to use wxEventLoop even in console applications -// (i.e. using base library only, without GUI). This is mostly useful for -// processing socket events but is also necessary to use timers in console -// applications -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_CONSOLE_EVENTLOOP 1 - -// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level -// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. -// -// Default is 1 -// -// Recommended setting: 1 (wxFile is highly recommended as it is required by -// i18n code, wxFileConfig and others) -#define wxUSE_FILE 1 -#define wxUSE_FFILE 1 - -// Use wxFSVolume class providing access to the configured/active mount points -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely disabled if you don't use it) -#define wxUSE_FSVOLUME 1 - -// Use wxStandardPaths class which allows to retrieve some standard locations -// in the file system -// -// Default is 1 -// -// Recommended setting: 1 (may be disabled to save space, but not much) -#define wxUSE_STDPATHS 1 - -// use wxTextBuffer class: required by wxTextFile -#define wxUSE_TEXTBUFFER 1 - -// use wxTextFile class: requires wxFile and wxTextBuffer, required by -// wxFileConfig -#define wxUSE_TEXTFILE 1 - -// i18n support: _() macro, wxLocale class. Requires wxTextFile. -#define wxUSE_INTL 1 - -// Provide wxFoo_l() functions similar to standard foo() functions but taking -// an extra locale parameter. -// -// Notice that this is fully implemented only for the systems providing POSIX -// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary -// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will -// only work for the current user locale and "C" locale. You can use -// wxHAS_XLOCALE_SUPPORT to test whether the full support is available. -// -// Default is 1 -// -// Recommended setting: 1 but may be disabled if you are writing programs -// running only in C locale anyhow -#define wxUSE_XLOCALE 1 - -// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which -// allow to manipulate dates, times and time intervals. wxDateTime replaces the -// old wxTime and wxDate classes which are still provided for backwards -// compatibility (and implemented in terms of wxDateTime). -// -// Note that this class is relatively new and is still officially in alpha -// stage because some features are not yet (fully) implemented. It is already -// quite useful though and should only be disabled if you are aiming at -// absolutely minimal version of the library. -// -// Requires: wxUSE_LONGLONG -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_DATETIME 1 - -// Set wxUSE_TIMER to 1 to compile wxTimer class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_TIMER 1 - -// Use wxStopWatch clas. -// -// Default is 1 -// -// Recommended setting: 1 (needed by wxSocket) -#define wxUSE_STOPWATCH 1 - -// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FSWATCHER 1 - -// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes -// which allow the application to store its settings in the persistent -// storage. Setting this to 1 will also enable on-demand creation of the -// global config object in wxApp. -// -// See also wxUSE_CONFIG_NATIVE below. -// -// Recommended setting: 1 -#define wxUSE_CONFIG 1 - -// If wxUSE_CONFIG is 1, you may choose to use either the native config -// classes under Windows (using .INI files under Win16 and the registry under -// Win32) or the portable text file format used by the config classes under -// Unix. -// -// Default is 1 to use native classes. Note that you may still use -// wxFileConfig even if you set this to 1 - just the config object created by -// default for the applications needs will be a wxRegConfig or wxIniConfig and -// not wxFileConfig. -// -// Recommended setting: 1 -#define wxUSE_CONFIG_NATIVE 1 - -// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows -// to connect/disconnect from the network and be notified whenever the dial-up -// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 - -// Compile in classes for run-time DLL loading and function calling. -// Required by wxUSE_DIALUP_MANAGER. -// -// This setting is for Win32 only -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DYNLIB_CLASS 1 - -// experimental, don't use for now -#define wxUSE_DYNAMIC_LOADER 1 - -// Set to 1 to use socket classes -#define wxUSE_SOCKETS 1 - -// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) -// -// Notice that currently setting this option under Windows will result in -// programs which can only run on recent OS versions (with ws2_32.dll -// installed) which is why it is disabled by default. -// -// Default is 1. -// -// Recommended setting: 1 if you need IPv6 support -#define wxUSE_IPV6 0 - -// Set to 1 to enable virtual file systems (required by wxHTML) -#define wxUSE_FILESYSTEM 1 - -// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ZIP 1 - -// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ARCHIVE 1 - -// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_INET 1 - -// wxArchive classes for accessing archives such as zip and tar -#define wxUSE_ARCHIVE_STREAMS 1 - -// Set to 1 to compile wxZipInput/OutputStream classes. -#define wxUSE_ZIPSTREAM 1 - -// Set to 1 to compile wxTarInput/OutputStream classes. -#define wxUSE_TARSTREAM 1 - -// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -// wxUSE_LIBPNG -#define wxUSE_ZLIB 1 - -// If enabled, the code written by Apple will be used to write, in a portable -// way, float on the disk. See extended.c for the license which is different -// from wxWidgets one. -// -// Default is 1. -// -// Recommended setting: 1 unless you don't like the license terms (unlikely) -#define wxUSE_APPLE_IEEE 1 - -// Joystick support class -#define wxUSE_JOYSTICK 1 - -// wxFontEnumerator class -#define wxUSE_FONTENUM 1 - -// wxFontMapper class -#define wxUSE_FONTMAP 1 - -// wxMimeTypesManager class -#define wxUSE_MIMETYPE 1 - -// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP -// or wxURL you need to set this to 1. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_PROTOCOL 1 - -// The settings for the individual URL schemes -#define wxUSE_PROTOCOL_FILE 1 -#define wxUSE_PROTOCOL_FTP 1 -#define wxUSE_PROTOCOL_HTTP 1 - -// Define this to use wxURL class. -#define wxUSE_URL 1 - -// Define this to use native platform url and protocol support. -// Currently valid only for MS-Windows. -// Note: if you set this to 1, you can open ftp/http/gopher sites -// and obtain a valid input stream for these sites -// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0. -// Doing so reduces the code size. -// -// This code is experimental and subject to change. -#define wxUSE_URL_NATIVE 0 - -// Support for wxVariant class used in several places throughout the library, -// notably in wxDataViewCtrl API. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size as much as -// possible in which case setting this to 0 can gain up to 100KB. -#define wxUSE_VARIANT 1 - -// Support for wxAny class, the successor for wxVariant. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size by a small amount, -// or your compiler cannot for some reason cope with complexity of templates used. -#define wxUSE_ANY 1 - -// Support for regular expression matching via wxRegEx class: enable this to -// use POSIX regular expressions in your code. You need to compile regex -// library from src/regex to use it under Windows. -// -// Default is 0 -// -// Recommended setting: 1 if your compiler supports it, if it doesn't please -// contribute us a makefile for src/regex for it -#define wxUSE_REGEX 1 - -// wxSystemOptions class -#define wxUSE_SYSTEM_OPTIONS 1 - -// wxSound class -#define wxUSE_SOUND 1 - -// Use wxMediaCtrl -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_MEDIACTRL 1 - -// Use wxWidget's XRC XML-based resource system. Recommended. -// -// Default is 1 -// -// Recommended setting: 1 (requires wxUSE_XML) -#define wxUSE_XRC 1 - -// XML parsing classes. Note that their API will change in the future, so -// using wxXmlDocument and wxXmlNode in your app is not recommended. -// -// Default is the same as wxUSE_XRC, i.e. 1 by default. -// -// Recommended setting: 1 (required by XRC) -#define wxUSE_XML wxUSE_XRC - -// Use wxWidget's AUI docking system -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_AUI 1 - -// Use wxWidget's Ribbon classes for interfaces -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_RIBBON 1 - -// Use wxPropertyGrid. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_PROPGRID 1 - -// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STC 1 - -// Use wxWidget's web viewing classes -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_WEBVIEW 1 - -// Use the IE wxWebView backend -// -// Default is 1 on MSW -// -// Recommended setting: 1 -#ifdef __WXMSW__ -#define wxUSE_WEBVIEW_IE 1 -#else -#define wxUSE_WEBVIEW_IE 0 -#endif - -// Use the WebKit wxWebView backend -// -// Default is 1 on GTK and OSX -// -// Recommended setting: 1 -#if defined(__WXGTK__) || defined(__WXOSX__) -#define wxUSE_WEBVIEW_WEBKIT 1 -#else -#define wxUSE_WEBVIEW_WEBKIT 0 -#endif - -// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced -// 2D drawing API. (Still somewhat experimental) -// -// Please note that on Windows gdiplus.dll is loaded dynamically which means -// that nothing special needs to be done as long as you don't use -// wxGraphicsContext at all or only use it on XP and later systems but you -// still do need to distribute it yourself for an application using -// wxGraphicsContext to be runnable on pre-XP systems. -// -// Default is 1 except if you're using a non-Microsoft compiler under Windows -// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g. -// mingw32) you may need to install the headers (and just the headers) -// yourself. If you do, change the setting below manually. -// -// Recommended setting: 1 if supported by the compilation environment - -// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is -// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined -#ifdef _MSC_VER -# define wxUSE_GRAPHICS_CONTEXT 1 -#else - // Disable support for other Windows compilers, enable it if your compiler - // comes with new enough SDK or you installed the headers manually. - // - // Notice that this will be set by configure under non-Windows platforms - // anyhow so the value there is not important. -# define wxUSE_GRAPHICS_CONTEXT 0 -#endif - -// Enable wxGraphicsContext implementation using Cairo library. -// -// This is not needed under Windows and detected automatically by configure -// under other systems, however you may set this to 1 manually if you installed -// Cairo under Windows yourself and prefer to use it instead the native GDI+ -// implementation. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_CAIRO 0 - - -// ---------------------------------------------------------------------------- -// Individual GUI controls -// ---------------------------------------------------------------------------- - -// You must set wxUSE_CONTROLS to 1 if you are using any controls at all -// (without it, wxControl class is not compiled) -// -// Default is 1 -// -// Recommended setting: 1 (don't change except for very special programs) -#define wxUSE_CONTROLS 1 - -// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). -// Currently markup is supported only by a few controls and only some ports but -// their number will increase with time. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you want to save on code size) -#define wxUSE_MARKUP 1 - -// wxPopupWindow class is a top level transient window. It is currently used -// to implement wxTipWindow -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW) -#define wxUSE_POPUPWIN 1 - -// wxTipWindow allows to implement the custom tooltips, it is used by the -// context help classes. Requires wxUSE_POPUPWIN. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0) -#define wxUSE_TIPWINDOW 1 - -// Each of the settings below corresponds to one wxWidgets control. They are -// all switched on by default but may be disabled if you are sure that your -// program (including any standard dialogs it can show!) doesn't need them and -// if you desperately want to save some space. If you use any of these you must -// set wxUSE_CONTROLS as well. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl -#define wxUSE_BANNERWINDOW 1 // wxBannerWindow -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COLLPANE 1 // wxCollapsiblePane -#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl -#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox -#define wxUSE_FILECTRL 1 // wxFileCtrl -#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl -#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl -#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl -#define wxUSE_TOGGLEBTN 1 // requires wxButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl -#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl - -// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR -// below either wxStatusBar95 or a generic wxStatusBar will be used. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STATUSBAR 1 - -// Two status bar implementations are available under Win32: the generic one -// or the wrapper around native control. For native look and feel the native -// version should be used. -// -// Default is 1 for the platforms where native status bar is supported. -// -// Recommended setting: 1 (there is no advantage in using the generic one) -#define wxUSE_NATIVE_STATUSBAR 1 - -// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar -// classes at all. Otherwise, use the native toolbar class unless -// wxUSE_TOOLBAR_NATIVE is 0. -// -// Default is 1 for all settings. -// -// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. -#define wxUSE_TOOLBAR 1 -#define wxUSE_TOOLBAR_NATIVE 1 - -// wxNotebook is a control with several "tabs" located on one of its sides. It -// may be used to logically organise the data presented to the user instead of -// putting everything in one huge dialog. It replaces wxTabControl and related -// classes of wxWin 1.6x. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTEBOOK 1 - -// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_LISTBOOK 1 - -// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CHOICEBOOK 1 - -// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TREEBOOK 1 - -// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of -// tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLBOOK 1 - -// wxTaskBarIcon is a small notification icon shown in the system toolbar or -// dock. -// -// Default is 1. -// -// Recommended setting: 1 (but can be set to 0 if you don't need it) -#define wxUSE_TASKBARICON 1 - -// wxGrid class -// -// Default is 1, set to 0 to cut down compilation time and binaries size if you -// don't use it. -// -// Recommended setting: 1 -// -#define wxUSE_GRID 1 - -// wxMiniFrame class: a frame with narrow title bar -// -// Default is 1. -// -// Recommended setting: 1 (it doesn't cost almost anything) -#define wxUSE_MINIFRAME 1 - -// wxComboCtrl and related classes: combobox with custom popup window and -// not necessarily a listbox. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox -#define wxUSE_COMBOCTRL 1 - -// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox -// items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0, except where it is -// needed as a base class for generic wxBitmapComboBox. -#define wxUSE_ODCOMBOBOX 1 - -// wxBitmapComboBox is a combobox that can have images in front of text items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 -#define wxUSE_BITMAPCOMBOBOX 1 - -// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items -// up and down in it. It is also used as part of wxRearrangeDialog. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 (currently used only by -// wxHeaderCtrl) -#define wxUSE_REARRANGECTRL 1 - -// ---------------------------------------------------------------------------- -// Miscellaneous GUI stuff -// ---------------------------------------------------------------------------- - -// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -#define wxUSE_ACCEL 1 - -// Use the standard art provider. The icons returned by this provider are -// embedded into the library as XPMs so disabling it reduces the library size -// somewhat but this should only be done if you use your own custom art -// provider returning the icons or never use any icons not provided by the -// native art provider (which might not be implemented at all for some -// platforms) or by the Tango icons provider (if it's not itself disabled -// below). -// -// Default is 1. -// -// Recommended setting: 1 unless you use your own custom art provider. -#define wxUSE_ARTPROVIDER_STD 1 - -// Use art provider providing Tango icons: this art provider has higher quality -// icons than the default ones using smaller size XPM icons without -// transparency but the embedded PNG icons add to the library size. -// -// Default is 1 under non-GTK ports. Under wxGTK the native art provider using -// the GTK+ stock icons replaces it so it is normally not necessary. -// -// Recommended setting: 1 but can be turned off to reduce the library size. -#define wxUSE_ARTPROVIDER_TANGO 1 - -// Hotkey support (currently Windows only) -#define wxUSE_HOTKEY 1 - -// Use wxCaret: a class implementing a "cursor" in a text control (called caret -// under Windows). -// -// Default is 1. -// -// Recommended setting: 1 (can be safely set to 0, not used by the library) -#define wxUSE_CARET 1 - -// Use wxDisplay class: it allows enumerating all displays on a system and -// their geometries as well as finding the display on which the given point or -// window lies. -// -// Default is 1. -// -// Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 1 - -// Miscellaneous geometry code: needed for Canvas library -#define wxUSE_GEOMETRY 1 - -// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and -// wxListCtrl. -// -// Default is 1. -// -// Recommended setting: 1 (set it to 0 if you don't use any of the controls -// enumerated above, then this class is mostly useless too) -#define wxUSE_IMAGLIST 1 - -// Use wxInfoBar class. -// -// Default is 1. -// -// Recommended setting: 1 (but can be disabled without problems as nothing -// depends on it) -#define wxUSE_INFOBAR 1 - -// Use wxMenu, wxMenuBar, wxMenuItem. -// -// Default is 1. -// -// Recommended setting: 1 (can't be disabled under MSW) -#define wxUSE_MENUS 1 - -// Use wxNotificationMessage. -// -// wxNotificationMessage allows to show non-intrusive messages to the user -// using balloons, banners, popups or whatever is the appropriate method for -// the current platform. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTIFICATION_MESSAGE 1 - -// wxPreferencesEditor provides a common API for different ways of presenting -// the standard "Preferences" or "Properties" dialog under different platforms -// (e.g. some use modal dialogs, some use modeless ones; some apply the changes -// immediately while others require an explicit "Apply" button). -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_PREFERENCES_EDITOR 1 - -// wxRichToolTip is a customizable tooltip class which has more functionality -// than the stock (but native, unlike this class) wxToolTip. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely set to 0 if you don't need it) -#define wxUSE_RICHTOOLTIP 1 - -// Use wxSashWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SASH 1 - -// Use wxSplitterWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SPLITTER 1 - -// Use wxToolTip and wxWindow::Set/GetToolTip() methods. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLTIPS 1 - -// wxValidator class and related methods -#define wxUSE_VALIDATORS 1 - -// Use reference counted ID management: this means that wxWidgets will track -// the automatically allocated ids (those used when you use wxID_ANY when -// creating a window, menu or toolbar item &c) instead of just supposing that -// the program never runs out of them. This is mostly useful only under wxMSW -// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where -// long-running programs can run into problems with ids reuse without this. On -// the other platforms, where the ids have the full int range, this shouldn't -// be necessary. -#ifdef __WXMSW__ -#define wxUSE_AUTOID_MANAGEMENT 1 -#else -#define wxUSE_AUTOID_MANAGEMENT 0 -#endif - -// ---------------------------------------------------------------------------- -// common dialogs -// ---------------------------------------------------------------------------- - -// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. -// file selector, printer dialog). Switching this off also switches off the -// printing architecture and interactive wxPrinterDC. -// -// Default is 1 -// -// Recommended setting: 1 (unless it really doesn't work) -#define wxUSE_COMMON_DIALOGS 1 - -// wxBusyInfo displays window with message when app is busy. Works in same way -// as wxBusyCursor -#define wxUSE_BUSYINFO 1 - -// Use single/multiple choice dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_CHOICEDLG 1 - -// Use colour picker dialog -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_COLOURDLG 1 - -// wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 - -// TODO: setting to choose the generic or native one - -// Use file open/save dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in many places in the library itself) -#define wxUSE_FILEDLG 1 - -// Use find/replace dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely set to 0) -#define wxUSE_FINDREPLDLG 1 - -// Use font picker dialog -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_FONTDLG 1 - -// Use wxMessageDialog and wxMessageBox. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_MSGDLG 1 - -// progress dialog class for lengthy operations -#define wxUSE_PROGRESSDLG 1 - -// support for startup tips (wxShowTip &c) -#define wxUSE_STARTUP_TIPS 1 - -// text entry dialog and wxGetTextFromUser function -#define wxUSE_TEXTDLG 1 - -// number entry dialog -#define wxUSE_NUMBERDLG 1 - -// splash screen class -#define wxUSE_SPLASH 1 - -// wizards -#define wxUSE_WIZARDDLG 1 - -// Compile in wxAboutBox() function showing the standard "About" dialog. -// -// Default is 1 -// -// Recommended setting: 1 but can be set to 0 to save some space if you don't -// use this function -#define wxUSE_ABOUTDLG 1 - -// wxFileHistory class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FILE_HISTORY 1 - -// ---------------------------------------------------------------------------- -// Metafiles support -// ---------------------------------------------------------------------------- - -// Windows supports the graphics format known as metafile which is, though not -// portable, is widely used under Windows and so is supported by wxWin (under -// Windows only, of course). Win16 (Win3.1) used the so-called "Window -// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in -// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by -// default, WMFs will be used under Win16 and EMFs under Win32. This may be -// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting -// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile -// in any metafile related classes at all. -// -// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. -// -// Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 -#define wxUSE_WIN_METAFILES_ALWAYS 0 - -// ---------------------------------------------------------------------------- -// Big GUI components -// ---------------------------------------------------------------------------- - -// Set to 0 to disable MDI support. -// -// Requires wxUSE_NOTEBOOK under platforms other than MSW. -// -// Default is 1. -// -// Recommended setting: 1, can be safely set to 0. -#define wxUSE_MDI 1 - -// Set to 0 to disable document/view architecture -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 - -// Set to 0 to disable MDI document/view architecture -// -// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 1 - -// Set to 0 to disable print/preview architecture code -#define wxUSE_PRINTING_ARCHITECTURE 1 - -// wxHTML sublibrary allows to display HTML in wxWindow programs and much, -// much more. -// -// Default is 1. -// -// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a -// smaller library. -#define wxUSE_HTML 1 - -// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL -// headers and libraries to be able to compile the library with wxUSE_GLCANVAS -// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the -// list of libraries used to link your application (although this is done -// implicitly for Microsoft Visual C++ users). -// -// Default is 1 unless the compiler is known to ship without the necessary -// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE). -// -// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 -// otherwise. -#define wxUSE_GLCANVAS 1 - -// wxRichTextCtrl allows editing of styled text. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 if you want compile a -// smaller library. -#define wxUSE_RICHTEXT 1 - -// ---------------------------------------------------------------------------- -// Data transfer -// ---------------------------------------------------------------------------- - -// Use wxClipboard class for clipboard copy/paste. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CLIPBOARD 1 - -// Use wxDataObject and related classes. Needed for clipboard and OLE drag and -// drop -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DATAOBJ 1 - -// Use wxDropTarget and wxDropSource classes for drag and drop (this is -// different from "built in" drag and drop in wxTreeCtrl which is always -// available). Requires wxUSE_DATAOBJ. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DRAG_AND_DROP 1 - -// Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. -// -// Default is 0. -// -// Recommended setting (at present): 0 -#define wxUSE_ACCESSIBILITY 0 - -// ---------------------------------------------------------------------------- -// miscellaneous settings -// ---------------------------------------------------------------------------- - -// wxSingleInstanceChecker class allows to verify at startup if another program -// instance is running. -// -// Default is 1 -// -// Recommended setting: 1 (the class is tiny, disabling it won't save much -// space) -#define wxUSE_SNGLINST_CHECKER 1 - -#define wxUSE_DRAGIMAGE 1 - -#define wxUSE_IPC 1 - // 0 for no interprocess comms -#define wxUSE_HELP 1 - // 0 for no help facility - -// Should we use MS HTML help for wxHelpController? If disabled, neither -// wxCHMHelpController nor wxBestHelpController are available. -// -// Default is 1 under MSW, 0 is always used for the other platforms. -// -// Recommended setting: 1, only set to 0 if you have trouble compiling -// wxCHMHelpController (could be a problem with really ancient compilers) -#define wxUSE_MS_HTML_HELP 1 - - -// Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 1 - -#define wxUSE_CONSTRAINTS 1 - // 0 for no window layout constraint system - -#define wxUSE_SPLINES 1 - // 0 for no splines - -#define wxUSE_MOUSEWHEEL 1 - // Include mouse wheel support - -// Compile wxUIActionSimulator class? -#define wxUSE_UIACTIONSIMULATOR 1 - -// ---------------------------------------------------------------------------- -// wxDC classes for various output formats -// ---------------------------------------------------------------------------- - -// Set to 1 for PostScript device context. -#define wxUSE_POSTSCRIPT 0 - -// Set to 1 to use font metric files in GetTextExtent -#define wxUSE_AFM_FOR_POSTSCRIPT 1 - -// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -// to create files in SVG (Scalable Vector Graphics) format. -#define wxUSE_SVG 1 - -// Should wxDC provide SetTransformMatrix() and related methods? -// -// Default is 1 but can be set to 0 if this functionality is not used. Notice -// that currently only wxMSW supports this so setting this to 0 doesn't change -// much for non-MSW platforms (although it will still save a few bytes -// probably). -// -// Recommended setting: 1. -#define wxUSE_DC_TRANSFORM_MATRIX 1 - -// ---------------------------------------------------------------------------- -// image format support -// ---------------------------------------------------------------------------- - -// wxImage supports many different image formats which can be configured at -// compile-time. BMP is always supported, others are optional and can be safely -// disabled if you don't plan to use images in such format sometimes saving -// substantial amount of code in the final library. -// -// Some formats require an extra library which is included in wxWin sources -// which is mentioned if it is the case. - -// Set to 1 for wxImage support (recommended). -#define wxUSE_IMAGE 1 - -// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. -#define wxUSE_LIBPNG 1 - -// Set to 1 for JPEG format support (requires libjpeg) -#define wxUSE_LIBJPEG 1 - -// Set to 1 for TIFF format support (requires libtiff) -#define wxUSE_LIBTIFF 1 - -// Set to 1 for TGA format support (loading only) -#define wxUSE_TGA 1 - -// Set to 1 for GIF format support -#define wxUSE_GIF 1 - -// Set to 1 for PNM format support -#define wxUSE_PNM 1 - -// Set to 1 for PCX format support -#define wxUSE_PCX 1 - -// Set to 1 for IFF format support (Amiga format) -#define wxUSE_IFF 0 - -// Set to 1 for XPM format support -#define wxUSE_XPM 1 - -// Set to 1 for MS Icons and Cursors format support -#define wxUSE_ICO_CUR 1 - -// Set to 1 to compile in wxPalette class -#define wxUSE_PALETTE 1 - -// ---------------------------------------------------------------------------- -// wxUniversal-only options -// ---------------------------------------------------------------------------- - -// Set to 1 to enable compilation of all themes, this is the default -#define wxUSE_ALL_THEMES 1 - -// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -// is unset, if it is set these options are not used; notice that metal theme -// uses Win32 one -#define wxUSE_THEME_GTK 0 -#define wxUSE_THEME_METAL 0 -#define wxUSE_THEME_MONO 0 -#define wxUSE_THEME_WIN32 0 - - -/* --- end common options --- */ - -/* - * Unix-specific options - */ -#define wxUSE_SELECT_DISPATCHER 1 -#define wxUSE_EPOLL_DISPATCHER 0 - -#define wxUSE_UNICODE_UTF8 0 -#define wxUSE_UTF8_LOCALE_ONLY 0 - -#endif // _WX_SETUP_H_ diff --git a/include/wx/os2/size.ptr b/include/wx/os2/size.ptr deleted file mode 100644 index c361ba01ff..0000000000 Binary files a/include/wx/os2/size.ptr and /dev/null differ diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h deleted file mode 100644 index dd53538ae3..0000000000 --- a/include/wx/os2/slider.h +++ /dev/null @@ -1,156 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/slider.h -// Purpose: wxSlider class -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SLIDER_H_ -#define _WX_SLIDER_H_ - -#include "wx/control.h" - -// Slider -class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase -{ -public: - wxSlider(); - inline wxSlider( wxWindow* pParent - ,wxWindowID vId - ,int nValue - ,int nMinValue - ,int nMaxValue - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxSL_HORIZONTAL - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxSliderNameStr - ) - { - Create( pParent - ,vId - ,nValue - ,nMinValue - ,nMaxValue - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - virtual ~wxSlider(); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,int nValue - ,int nMinValue - ,int nMaxValue - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxSL_HORIZONTAL - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxSliderNameStr - ); - - virtual int GetValue(void) const ; - virtual void SetValue(int); - - void GetSize( int* pnX - ,int* pnY - ) const; - void GetPosition( int* pnX - ,int* pnY - ) const ; - bool Show(bool bShow = TRUE); - void SetRange( int nMinValue - ,int nMaxValue - ); - - inline int GetMin(void) const { return m_nRangeMin; } - inline int GetMax(void) const { return m_nRangeMax; } - - // - // For trackbars only - // - void ClearSel(void); - void ClearTicks(void); - - int GetLineSize(void) const; - int GetPageSize(void) const ; - int GetSelEnd(void) const; - int GetSelStart(void) const; - inline int GetTickFreq(void) const { return m_nTickFreq; } - int GetThumbLength(void) const ; - - void SetLineSize(int nLineSize); - void SetPageSize(int nPageSize); - void SetSelection( int nMinPos - ,int nMaxPos - ); - void SetThumbLength(int nLen) ; - void SetTick(int ntickPos) ; - - // - // IMPLEMENTATION - // - inline WXHWND GetStaticMin(void) const { return m_hStaticMin; } - inline WXHWND GetStaticMax(void) const { return m_hStaticMax; } - inline WXHWND GetEditValue(void) const { return m_hStaticValue; } - virtual bool ContainsHWND(WXHWND hWnd) const; - void AdjustSubControls( int nX - ,int nY - ,int nWidth - ,int nHeight - ,int nSizeFlags - ); - inline int GetSizeFlags(void) { return m_nSizeFlags; } - void Command(wxCommandEvent& rEvent); - virtual WXHBRUSH OnCtlColor( WXHDC hDC - ,WXHWND hWnd - ,WXUINT uCtlColor - ,WXUINT uMessage - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - virtual bool OS2OnScroll( int nOrientation - ,WXWORD wParam - ,WXWORD wPos - ,WXHWND hControl - ); - -protected: - WXHWND m_hStaticMin; - WXHWND m_hStaticMax; - WXHWND m_hStaticValue; - int m_nRangeMin; - int m_nRangeMax; - int m_nPageSize; - int m_nLineSize; - int m_nTickFreq; - double m_dPixelToRange; - int m_nThumbLength; - int m_nSizeFlags; - - virtual void DoGetSize( int* pnWidth - ,int* pnHeight - ) const; - virtual void DoSetSize( int nX - ,int nY - ,int nWidth - ,int nHeight - ,int nSizeFlags = wxSIZE_AUTO - ); - - // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq); - -private: - DECLARE_DYNAMIC_CLASS(wxSlider) -}; // end of CLASS wxSlider - -#endif - // _WX_SLIDER_H_ diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h deleted file mode 100644 index e8fdad5428..0000000000 --- a/include/wx/os2/sound.h +++ /dev/null @@ -1,45 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/sound.h -// Purpose: wxSound class (loads and plays short Windows .wav files). -// Optional on non-Windows platforms. -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SOUND_H_ -#define _WX_SOUND_H_ - -#include "wx/object.h" - -class wxSound : public wxSoundBase -{ -public: - wxSound(); - wxSound(const wxString& fileName, bool isResource = FALSE); - wxSound(size_t size, const void* data); - virtual ~wxSound(); - -public: - // Create from resource or file - bool Create(const wxString& fileName, bool isResource = FALSE); - // Create from data - bool Create(size_t size, const void* data); - - bool IsOk() const { return (m_waveData ? TRUE : FALSE); } - -protected: - bool Free(); - - bool DoPlay(unsigned flags) const; - -private: - wxByte* m_waveData; - int m_waveLength; - bool m_isResource; -}; - -#endif - // _WX_SOUND_H_ diff --git a/include/wx/os2/spinbutt.h b/include/wx/os2/spinbutt.h deleted file mode 100644 index c37381f327..0000000000 --- a/include/wx/os2/spinbutt.h +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/spinbutt.h -// Purpose: wxSpinButton class -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SPINBUTT_H_ -#define _WX_SPINBUTT_H_ - -#include "wx/control.h" -#include "wx/event.h" - -extern MRESULT EXPENTRY wxSpinCtrlWndProc( - HWND hWnd -, UINT uMessage -, MPARAM wParam -, MPARAM lParam -); - -class WXDLLIMPEXP_CORE wxSpinButton: public wxSpinButtonBase -{ -public: - // Construction - wxSpinButton() { } - inline wxSpinButton( wxWindow* pParent - ,wxWindowID vId = -1 - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxSP_VERTICAL - ,const wxString& rsName = wxT("wxSpinButton") - ) - { - Create(pParent, vId, rPos, rSize, lStyle, rsName); - } - virtual ~wxSpinButton(); - - - bool Create( wxWindow* pParent - ,wxWindowID vId = -1 - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxSP_VERTICAL - ,const wxString& rsName = wxT("wxSpinButton") - ); - - // Accessors - inline virtual int GetMax(void) const { return m_max; } - inline virtual int GetMin(void) const { return m_min; } - virtual int GetValue(void) const; - inline bool IsVertical(void) const {return ((m_windowStyle & wxSP_VERTICAL) != 0); } - virtual void SetValue(int nVal); - virtual void SetRange( int nMinVal - ,int nMaxVal - ); - - // - // Implementation - // - virtual bool OS2Command( WXUINT wParam - ,WXWORD wId - ); - virtual bool OS2OnScroll( int nOrientation - ,WXWORD wParam - ,WXWORD wPos - ,WXHWND hControl - ); - - inline virtual bool AcceptsFocus(void) const { return FALSE; } -protected: - virtual wxSize DoGetBestSize() const; -private: - DECLARE_DYNAMIC_CLASS(wxSpinButton) -}; // end of CLASS wxSpinButton - -#endif // _WX_SPINBUTT_H_ diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h deleted file mode 100644 index ac81c63996..0000000000 --- a/include/wx/os2/spinctrl.h +++ /dev/null @@ -1,127 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/spinctrl.h -// Purpose: wxSpinCtrl class declaration for Win32 -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_SPINCTRL_H_ -#define _WX_MSW_SPINCTRL_H_ - -#include "wx/spinbutt.h" // the base class -#include "wx/dynarray.h" -class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; -WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins); - -// ---------------------------------------------------------------------------- -// Under Win32 and OS2 PM, wxSpinCtrl is a wxSpinButton with a buddy -// text window whose contents is automatically updated when the spin -// control is clicked. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton -{ -public: - wxSpinCtrl() { } - wxSpinCtrl( wxWindow* pParent - ,wxWindowID vId = wxID_ANY - ,const wxString& rsValue = wxEmptyString - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxSP_ARROW_KEYS - ,int nMin = 0 - ,int nMax = 100 - ,int nInitial = 0 - ,const wxString& rsName = wxT("wxSpinCtrl") - ) - { - Create(pParent, vId, rsValue, rPos, rSize, lStyle, nMin, nMax, nInitial, rsName); - } - virtual ~wxSpinCtrl(); - - bool Create(wxWindow* pParent - ,wxWindowID vId = wxID_ANY - ,const wxString& rsValue = wxEmptyString - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxSP_ARROW_KEYS - ,int nMin = 0 - ,int nMax = 100 - ,int nInitial = 0 - ,const wxString& rsName = wxT("wxSpinCtrl") - ); - - // - // A wxTextCtrl-like method (but we can't have GetValue returning wxString - // because the base class already has one returning int!) - // - void SetValue(const wxString& rsText); - - // - // implementation only from now on - // ------------------------------- - // - virtual bool Enable(bool bEnable = true); - - virtual int GetValue(void) const; - - virtual bool SetFont(const wxFont &rFont); - virtual void SetFocus(void); - - inline virtual void SetValue(int nVal) { wxSpinButton::SetValue(nVal); } - - void SetSelection(long lFrom, long lTo); - - virtual bool Show(bool bShow = true); - - // - // wxSpinButton doesn't accept focus, but we do - // - inline virtual bool AcceptsFocus(void) const { return false; } - - // - // Return the spinctrl object whose buddy is the given window or NULL - // Doesn't really do much under OS/2 - // - static wxSpinCtrl* GetSpinForTextCtrl(WXHWND hWndBuddy); - - // - // Process a WM_COMMAND generated by the buddy text control - // - bool ProcessTextCommand( WXWORD wCmd - ,WXWORD wId - ); - -protected: - virtual void DoGetPosition( int* nlX - ,int* nlY - ) const; - void DoMoveWindow( int nX - ,int nY - ,int nWidth - ,int nHeight - ); - virtual wxSize DoGetBestSize(void) const; - virtual void DoGetSize( int* pnWidth - ,int* pnHeight - ) const; - - // - // The handler for wxSpinButton events - // - void OnSpinChange(wxSpinEvent& rEvent); - void OnChar(wxKeyEvent& rEvent); - void OnSetFocus(wxFocusEvent& rEvent); - - WXHWND m_hWndBuddy; - static wxArraySpins m_svAllSpins; - -private: - DECLARE_DYNAMIC_CLASS(wxSpinCtrl) - DECLARE_EVENT_TABLE() -}; // end of CLASS wxSpinCtrl - -#endif // _WX_MSW_SPINCTRL_H_ diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h deleted file mode 100644 index ff59f015e1..0000000000 --- a/include/wx/os2/statbmp.h +++ /dev/null @@ -1,82 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/statbmp.h -// Purpose: wxStaticBitmap class -// Author: David Webster -// Modified by: -// Created: 11/27/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATBMP_H_ -#define _WX_STATBMP_H_ - -#include "wx/control.h" -#include "wx/icon.h" - -class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase -{ - public: - inline wxStaticBitmap() { Init(); } - - inline wxStaticBitmap( wxWindow* pParent - ,wxWindowID nId - ,const wxGDIImage& rLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxString& rName = wxStaticBitmapNameStr - ) - { - Create(pParent, nId, rLabel, rPos, rSize, lStyle, rName); - } - - bool Create( wxWindow* pParent - ,wxWindowID nId - ,const wxGDIImage& rLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxString& rName = wxStaticBitmapNameStr - ); - inline virtual ~wxStaticBitmap() { Free(); } - - virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); } - virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); } - - // assert failure is provoked by an attempt to get an icon from bitmap or - // vice versa - wxIcon GetIcon() const - { wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; } - wxBitmap GetBitmap() const - { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; } - - // overridden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } - virtual MRESULT OS2WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - void OnPaint(wxPaintEvent& rEvent); - -protected: - virtual wxSize DoGetBestSize() const; - - void Init() { m_bIsIcon = TRUE; m_pImage = NULL; } - void Free(); - - // TRUE if icon/bitmap is valid - bool ImageIsOk() const; - - void SetImage(const wxGDIImage& rImage); - - // we can have either an icon or a bitmap - bool m_bIsIcon; - wxGDIImage* m_pImage; -private: - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - DECLARE_EVENT_TABLE() -}; // end of wxStaticBitmap - -#endif - // _WX_STATBMP_H_ diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h deleted file mode 100644 index 764fd74b07..0000000000 --- a/include/wx/os2/statbox.h +++ /dev/null @@ -1,65 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/statbox.h -// Purpose: wxStaticBox class -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATBOX_H_ -#define _WX_STATBOX_H_ - -#include "wx/control.h" - -// Group box -class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase -{ -public: - inline wxStaticBox() {} - inline wxStaticBox( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxString& rsName = wxStaticBoxNameStr - ) - { - Create(pParent, vId, rsLabel, rPos, rSize, lStyle, rsName); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxString& rsName = wxStaticBoxNameStr - ); - - // - // implementation from now on - // -------------------------- - // - virtual MRESULT OS2WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - - // - // overridden base class virtuals - // - inline virtual bool AcceptsFocus(void) const { return FALSE; } - -protected: - virtual wxSize DoGetBestSize(void) const; - -private: - DECLARE_DYNAMIC_CLASS(wxStaticBox) -}; // end of CLASS wxStaticBox - -#endif - // _WX_STATBOX_H_ - diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h deleted file mode 100644 index 8d31bdcaa0..0000000000 --- a/include/wx/os2/statline.h +++ /dev/null @@ -1,85 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/statline.h -// Purpose: MSW version of wxStaticLine class -// Author: Vadim Zeitlin -// Created: 28.06.99 -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_STATLINE_H_ -#define _WX_OS2_STATLINE_H_ - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase -{ - -public: - // constructors and pseudo-constructors - wxStaticLine() { } - wxStaticLine( wxWindow* pParent - ,wxWindowID vId = wxID_ANY - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxLI_HORIZONTAL - ,const wxString& rsName = wxStaticLineNameStr - ) - { - Create(pParent, vId, rPos, rSize, lStyle, rsName); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId = wxID_ANY - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxLI_HORIZONTAL - ,const wxString& rsName = wxStaticLineNameStr - ); - - inline bool IsVertical(void) const { return((GetWindowStyleFlag() & wxLI_VERTICAL) != 0); } - inline static int GetDefaultSize(void) { return 2; } - - // - // Overridden base class virtuals - // - inline virtual bool AcceptsFocus(void) const {return FALSE;} - -protected: - inline wxSize AdjustSize(const wxSize& rSize) const - { - wxSize vSizeReal( rSize.x - ,rSize.y - ); - - if (IsVertical()) - { - if (rSize.x == -1 ) - vSizeReal.x = GetDefaultSize(); - } - else - { - if (rSize.y == -1) - vSizeReal.y = GetDefaultSize(); - } - return vSizeReal; - } - - inline wxSize DoGetBestSize(void) const { return (AdjustSize(wxDefaultSize)); } - - // - // Usually overridden base class virtuals - // - virtual WXDWORD OS2GetStyle( long lStyle - ,WXDWORD* pdwExstyle - ) const; - -private: - DECLARE_DYNAMIC_CLASS(wxStaticLine) -}; // end of CLASS wxStaticLine - -#endif // _WX_OS2_STATLINE_H_ - - diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h deleted file mode 100644 index 3db6fd34b3..0000000000 --- a/include/wx/os2/stattext.h +++ /dev/null @@ -1,77 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/stattext.h -// Purpose: wxStaticText class -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_STATTEXT_H_ -#define _WX_STATTEXT_H_ - -#include "wx/control.h" - -class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase -{ -public: - inline wxStaticText() { } - inline wxStaticText( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0L - ,const wxString& rsName = wxStaticTextNameStr - ) - { - Create(pParent, vId, rsLabel, rPos, rSize, lStyle, rsName); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsLabel - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0L - ,const wxString& rsName = wxStaticTextNameStr - ); - - // - // Accessors - // - virtual void SetLabel(const wxString& rsLabel); - virtual bool SetFont(const wxFont &rFont); - - // - // Overridden base class virtuals - // - virtual bool AcceptsFocus() const { return FALSE; } - - // - // Callbacks - // - virtual MRESULT OS2WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - -protected: - virtual void DoSetSize( int nX - ,int nY - ,int nWidth - ,int nHeight - ,int nSizeFlags = wxSIZE_AUTO - ); - virtual wxSize DoGetBestSize(void) const; - - virtual void DoSetLabel(const wxString& str); - virtual wxString DoGetLabel() const; - -private: - DECLARE_DYNAMIC_CLASS(wxStaticText) -}; // end of CLASS wxStaticText - -#endif - // _WX_STATTEXT_H_ diff --git a/include/wx/os2/stdpaths.h b/include/wx/os2/stdpaths.h deleted file mode 100644 index 62d58429b8..0000000000 --- a/include/wx/os2/stdpaths.h +++ /dev/null @@ -1,51 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/stdpaths.h -// Purpose: wxStandardPaths for OS/2 -// Author: Stefan Neis -// Modified by: -// Created: 2004-11-06 -// Copyright: (c) 2004 Stefan Neis -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_STDPATHS_H_ -#define _WX_OS2_STDPATHS_H_ - -// ---------------------------------------------------------------------------- -// wxStandardPaths -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase -{ -public: - // set the program installation directory which is /usr/local by default - // - // The program directory can be determined automatically from argv[0], - // this function is automatically called from application initialisation. - // If you override the initialisation routine, you should call it - // explicitly yourself. - static void SetInstallPrefix(const wxString& prefix); - - // get the program installation prefix - // - // if the prefix had been previously by SetInstallPrefix, returns that - // value, otherwise returns /usr/local if it failed - wxString GetInstallPrefix() const; - - // implement base class pure virtuals - virtual wxString GetConfigDir() const; - virtual wxString GetUserConfigDir() const; - virtual wxString GetDataDir() const; - virtual wxString GetUserDataDir() const; - virtual wxString GetPluginsDir() const; - -protected: - // Ctor is protected, use wxStandardPaths::Get() instead of instantiating - // objects of this class directly. - wxStandardPaths() { } - -private: - static wxString m_prefix; -}; - -#endif // _WX_OS2_STDPATHS_H_ diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h deleted file mode 100644 index cc1d8d1e05..0000000000 --- a/include/wx/os2/textctrl.h +++ /dev/null @@ -1,197 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/textctrl.h -// Purpose: wxTextCtrl class -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TEXTCTRL_H_ -#define _WX_TEXTCTRL_H_ - -typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData); - -class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase -{ -public: - wxTextCtrl(); - wxTextCtrl( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsValue = wxEmptyString - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxTextCtrlNameStr - ) - { - Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName); - } - virtual ~wxTextCtrl(); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsValue = wxEmptyString - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxTextCtrlNameStr - ); - - // - // Implement base class pure virtuals - // ---------------------------------- - // - virtual wxString GetValue(void) const; - - virtual int GetLineLength(long nLineNo) const; - virtual wxString GetLineText(long nLineNo) const; - virtual int GetNumberOfLines(void) const; - - virtual bool IsModified(void) const; - virtual bool IsEditable(void) const; - - virtual void GetSelection( long* pFrom - ,long* pTo - ) const; - // - // Operations - // ---------- - // - virtual void Clear(void); - virtual void Replace( long lFrom - ,long lTo - ,const wxString& rsValue - ); - virtual void Remove( long lFrom - ,long lTo - ); - - virtual bool DoLoadFile(const wxString& rsFile, int fileType); - - virtual void MarkDirty(); - virtual void DiscardEdits(void); - - virtual void WriteText(const wxString& rsText); - virtual void AppendText(const wxString& rsText); - virtual bool EmulateKeyPress(const wxKeyEvent& rEvent); - - virtual bool SetStyle( long lStart - ,long lEnd - ,const wxTextAttr& rStyle - ); - virtual long XYToPosition( long lX - ,long lY - ) const; - virtual bool PositionToXY( long lPos - ,long* plX - ,long* plY - ) const; - - virtual void ShowPosition(long lPos); - - virtual void Copy(void); - virtual void Cut(void); - virtual void Paste(void); - - virtual bool CanCopy(void) const; - virtual bool CanCut(void) const; - virtual bool CanPaste(void) const; - - virtual void Undo(void); - virtual void Redo(void); - - virtual bool CanUndo(void) const; - virtual bool CanRedo(void) const; - - virtual void SetInsertionPoint(long lPos); - virtual void SetInsertionPointEnd(void); - virtual long GetInsertionPoint(void) const; - virtual wxTextPos GetLastPosition(void) const; - - virtual void SetSelection( long lFrom - ,long lTo - ); - virtual void SetEditable(bool bEditable); - virtual void SetWindowStyleFlag(long lStyle); - - // - // Implementation from now on - // -------------------------- - // - virtual void Command(wxCommandEvent& rEvent); - virtual bool OS2Command( WXUINT uParam - ,WXWORD wId - ); - - virtual WXHBRUSH OnCtlColor( WXHDC hDC - ,WXHWND pWnd - ,WXUINT nCtlColor - ,WXUINT message - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - - virtual bool SetBackgroundColour(const wxColour& colour); - virtual bool SetForegroundColour(const wxColour& colour); - - virtual void AdoptAttributesFromHWND(void); - virtual void SetupColours(void); - - virtual bool AcceptsFocus(void) const; - - // callbacks - void OnDropFiles(wxDropFilesEvent& rEvent); - void OnChar(wxKeyEvent& rEvent); // Process 'enter' if required - - void OnCut(wxCommandEvent& rEvent); - void OnCopy(wxCommandEvent& rEvent); - void OnPaste(wxCommandEvent& rEvent); - void OnUndo(wxCommandEvent& rEvent); - void OnRedo(wxCommandEvent& rEvent); - void OnDelete(wxCommandEvent& rEvent); - void OnSelectAll(wxCommandEvent& rEvent); - - void OnUpdateCut(wxUpdateUIEvent& rEvent); - void OnUpdateCopy(wxUpdateUIEvent& rEvent); - void OnUpdatePaste(wxUpdateUIEvent& rEvent); - void OnUpdateUndo(wxUpdateUIEvent& rEvent); - void OnUpdateRedo(wxUpdateUIEvent& rEvent); - void OnUpdateDelete(wxUpdateUIEvent& rEvent); - void OnUpdateSelectAll(wxUpdateUIEvent& rEvent); - - inline bool IsMLE(void) {return m_bIsMLE;} - inline void SetMLE(bool bIsMLE) {m_bIsMLE = bIsMLE;} - -protected: - // - // call this to increase the size limit (will do nothing if the current - // limit is big enough) - // - void AdjustSpaceLimit(void); - virtual wxSize DoGetBestSize(void) const; - virtual bool OS2ShouldPreProcessMessage(WXMSG* pMsg); - - virtual WXDWORD OS2GetStyle( long lStyle - ,WXDWORD* dwExstyle - ) const; - - virtual void DoSetValue(const wxString &value, int flags = 0); - - bool m_bSkipUpdate; - -private: - // implement wxTextEntry pure virtual: it implements all the operations for - // the simple EDIT controls - virtual WXHWND GetEditHWND() const { return m_hWnd; } - - bool m_bIsMLE; - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxTextCtrl) -}; // end of CLASS wxTextCtrl - -#endif - // _WX_TEXTCTRL_H_ diff --git a/include/wx/os2/textentry.h b/include/wx/os2/textentry.h deleted file mode 100644 index 5f8a8f37af..0000000000 --- a/include/wx/os2/textentry.h +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/textentry.h -// Purpose: wxOS2-specific wxTextEntry implementation -// Author: Stefan Neis -// Created: 2007-11-18 -// Copyright: (c) 2007 Stefan Neis -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_TEXTENTRY_H_ -#define _WX_OS2_TEXTENTRY_H_ - -// ---------------------------------------------------------------------------- -// wxTextEntry: common part of wxComboBox and (single line) wxTextCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase -{ -public: - wxTextEntry() { } - - // implement wxTextEntryBase pure virtual methods - virtual void WriteText(const wxString& text); - virtual void Remove(long from, long to); - - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - virtual void Undo(); - virtual void Redo(); - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; - - virtual void SetSelection(long from, long to) - { DoSetSelection(from, to); } - virtual void GetSelection(long *from, long *to) const; - - virtual bool IsEditable() const; - virtual void SetEditable(bool editable); - - virtual void SetMaxLength(unsigned long len); - -protected: - virtual wxString DoGetValue() const; - - // this is really a hook for multiline text controls as the single line - // ones don't need to ever scroll to show the selection but having it here - // allows us to put Remove() in the base class - enum - { - SetSel_NoScroll = 0, // don't do anything special - SetSel_Scroll = 1 // default: scroll to make the selection visible - }; - virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll); - -private: - // implement this to return the HWND of the EDIT control - virtual WXHWND GetEditHWND() const = 0; -}; - -#endif // _WX_OS2_TEXTENTRY_H_ - diff --git a/include/wx/os2/tglbtn.h b/include/wx/os2/tglbtn.h deleted file mode 100644 index 959d8a2349..0000000000 --- a/include/wx/os2/tglbtn.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/tglbtn.h -// Purpose: Declaration of the wxToggleButton class, which implements a -// toggle button under wxOS2. -// Author: Dave Webster -// Modified by: -// Created: 08.02.01 -// Copyright: (c) 2005 David A Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOGGLEBUTTON_H_ -#define _WX_TOGGLEBUTTON_H_ - -// Checkbox item (single checkbox) -class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase -{ -public: - wxToggleButton() {} - wxToggleButton(wxWindow *parent, - wxWindowID id, - const wxString& 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 wxString& 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 OS2Command(WXUINT param, WXWORD id); - virtual void Command(wxCommandEvent& event); - -protected: - virtual wxSize DoGetBestSize() const; - virtual wxBorder GetDefaultBorder() const; - virtual WXDWORD OS2GetStyle(long flags, WXDWORD *exstyle = NULL) const; - -private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton) -}; - -#endif // _WX_TOGGLEBUTTON_H_ - diff --git a/include/wx/os2/tick.bmp b/include/wx/os2/tick.bmp deleted file mode 100644 index 3673eda5de..0000000000 Binary files a/include/wx/os2/tick.bmp and /dev/null differ diff --git a/include/wx/os2/tip.ico b/include/wx/os2/tip.ico deleted file mode 100644 index 6b77dcd123..0000000000 Binary files a/include/wx/os2/tip.ico and /dev/null differ diff --git a/include/wx/os2/tls.h b/include/wx/os2/tls.h deleted file mode 100644 index 4cdfdd1471..0000000000 --- a/include/wx/os2/tls.h +++ /dev/null @@ -1,117 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/tls.h -// Purpose: OS/2 implementation of wxTlsValue<> -// Author: Stefan Neis -// Created: 2008-08-30 -// Copyright: (c) 2008 Stefan Neis -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_TLS_H_ -#define _WX_OS2_TLS_H_ - -#include "wx/os2/private.h" -#include "wx/thread.h" -#include "wx/vector.h" - -// ---------------------------------------------------------------------------- -// wxTlsKey is a helper class encapsulating a TLS slot -// ---------------------------------------------------------------------------- - -class wxTlsKey -{ -public: - // ctor allocates a new key - wxTlsKey(wxTlsDestructorFunction destructor) - { - m_destructor = destructor; - APIRET rc = ::DosAllocThreadLocalMemory(1, &m_slot); - if (rc != NO_ERROR) - m_slot = NULL; - } - - // return true if the key was successfully allocated - bool IsOk() const { return m_slot != NULL; } - - // get the key value, there is no error return - void *Get() const - { - return (void *)m_slot; - } - - // change the key value, return true if ok - bool Set(void *value) - { - void *old = Get(); - - m_slot = (ULONG*)value; - - if ( old ) - m_destructor(old); - - // update m_allValues list of all values - remove old, add new - wxCriticalSectionLocker lock(m_csAllValues); - if ( old ) - { - for ( wxVector::iterator i = m_allValues.begin(); - i != m_allValues.end(); - ++i ) - { - if ( *i == old ) - { - if ( value ) - *i = value; - else - m_allValues.erase(i); - return true; - } - } - wxFAIL_MSG( "previous wxTlsKey value not recorded in m_allValues" ); - } - - if ( value ) - m_allValues.push_back(value); - - return true; - } - - // free the key - ~wxTlsKey() - { - if ( !IsOk() ) - return; - - // Win32 and OS/2 API doesn't have the equivalent of pthread's - // destructor, so we have to keep track of all allocated values and - // destroy them manually; ideally we'd do that at thread exit time, but - // since we could only do that with wxThread and not otherwise created - // threads, we do it here. - // - // TODO: We should still call destructors for wxTlsKey used in the - // thread from wxThread's thread shutdown code, *in addition* - // to doing it in ~wxTlsKey. - // - // NB: No need to lock m_csAllValues, by the time this code is called, - // no other thread can be using this key. - for ( wxVector::iterator i = m_allValues.begin(); - i != m_allValues.end(); - ++i ) - { - m_destructor(*i); - } - - ::DosFreeThreadLocalMemory(m_slot); - } - -private: - wxTlsDestructorFunction m_destructor; - ULONG* m_slot; - - wxVector m_allValues; - wxCriticalSection m_csAllValues; - - wxDECLARE_NO_COPY_CLASS(wxTlsKey); -}; - -#endif // _WX_OS2_TLS_H_ - diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h deleted file mode 100644 index d0fc1a1c7d..0000000000 --- a/include/wx/os2/toolbar.h +++ /dev/null @@ -1,224 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/toolbar.h -// Purpose: wxToolBar class -// Author: David Webster -// Modified by: -// Created: 10/17/98 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TOOLBAR_H_ -#define _WX_TOOLBAR_H_ - -#if wxUSE_TOOLBAR -#include "wx/timer.h" -#include "wx/tbarbase.h" - -#define ID_TOOLTIMER 100 -#define ID_TOOLEXPTIMER 101 - -class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase -{ -public: - /* - * Public interface - */ - - wxToolBar() - : m_vToolTimer(this, ID_TOOLTIMER) - , m_vToolExpTimer(this, ID_TOOLEXPTIMER) - { Init(); } - - inline wxToolBar( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxTB_HORIZONTAL - ,const wxString& rName = wxToolBarNameStr - ) : m_vToolTimer(this, ID_TOOLTIMER) - , m_vToolExpTimer(this, ID_TOOLEXPTIMER) - { - Init(); - Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rName - ); - } - virtual ~wxToolBar(); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxTB_HORIZONTAL - ,const wxString& rName = wxToolBarNameStr - ); - - - // - // Override/implement base class virtuals - // - virtual wxToolBarToolBase* FindToolForPosition( wxCoord vX - ,wxCoord vY - ) const; - virtual bool Realize(void); - virtual void SetRows(int nRows); - - // - // Special overrides for OS/2 - // - virtual wxToolBarToolBase* InsertControl( size_t nPos - ,wxControl* pControl - ); - virtual wxToolBarToolBase* InsertSeparator(size_t nPos); - virtual wxToolBarToolBase* InsertTool( size_t nPos - ,int nId - ,const wxString& rsLabel - ,const wxBitmap& rBitmap - ,const wxBitmap& rBmpDisabled = wxNullBitmap - ,wxItemKind eKind = wxITEM_NORMAL - ,const wxString& rsShortHelp = wxEmptyString - ,const wxString& rsLongHelp = wxEmptyString - ,wxObject* pClientData = NULL - ); - wxToolBarToolBase* InsertTool( size_t nPos - ,int nId - ,const wxBitmap& rBitmap - ,const wxBitmap& rBmpDisabled = wxNullBitmap - ,bool bToggle = FALSE - ,wxObject* pClientData = NULL - ,const wxString& rsShortHelp = wxEmptyString - ,const wxString& rsLongHelp = wxEmptyString - ) - { - return InsertTool( nPos - ,nId - ,wxEmptyString - ,rBitmap - ,rBmpDisabled - ,bToggle ? wxITEM_CHECK : wxITEM_NORMAL - ,rsShortHelp - ,rsLongHelp - ,pClientData - ); - } - virtual bool DeleteTool(int nId); - virtual bool DeleteToolByPos(size_t nPos); - - // - // Event handlers - // - void OnPaint(wxPaintEvent& event); - void OnSize(wxSizeEvent& event); - void OnMouseEvent(wxMouseEvent& event); - void OnKillFocus(wxFocusEvent& event); - -protected: - // - // Common part of all ctors - // - void Init(); - - // - // Implement base class pure virtuals - // - virtual wxToolBarToolBase* DoAddTool( int id - ,const wxString& label - ,const wxBitmap& bitmap - ,const wxBitmap& bmpDisabled - ,wxItemKind kind - ,const wxString& shortHelp = wxEmptyString - ,const wxString& longHelp = wxEmptyString - ,wxObject *clientData = NULL - ,wxCoord xPos = -1 - ,wxCoord yPos = -1 - ); - - virtual bool DoInsertTool( size_t nPos - ,wxToolBarToolBase* pTool - ); - virtual bool DoDeleteTool( size_t nPos - , wxToolBarToolBase* pTool - ); - - virtual void DoEnableTool( wxToolBarToolBase* pTool - ,bool bEnable - ); - virtual void DoToggleTool( wxToolBarToolBase* pTool - ,bool bToggle - ); - virtual void DoSetToggle( wxToolBarToolBase* pTool - ,bool bToggle - ); - - virtual wxToolBarToolBase* CreateTool( int vId - ,const wxString& rsLabel - ,const wxBitmap& rBmpNormal - ,const wxBitmap& rBmpDisabled - ,wxItemKind eKind - ,wxObject* pClientData - ,const wxString& rsShortHelp - ,const wxString& rsLongHelp - ); - virtual wxToolBarToolBase* CreateTool(wxControl* pControl, - const wxString& label); - - // - // Helpers - // - void DrawTool(wxToolBarToolBase *tool); - virtual void DrawTool( wxDC& rDC - ,wxToolBarToolBase* pTool - ); - virtual void SpringUpButton(int nIndex); - - int m_nCurrentRowsOrColumns; - int m_nPressedTool; - int m_nCurrentTool; - wxCoord m_vLastX; - wxCoord m_vLastY; - wxCoord m_vMaxWidth; - wxCoord m_vMaxHeight; - wxCoord m_vXPos; - wxCoord m_vYPos; - wxCoord m_vTextX; - wxCoord m_vTextY; - -private: - void LowerTool( wxToolBarToolBase* pTool - ,bool bLower = TRUE - ); - void RaiseTool( wxToolBarToolBase* pTool - ,bool bRaise = TRUE - ); - void OnTimer(wxTimerEvent& rEvent); - - static bool m_bInitialized; - - wxTimer m_vToolTimer; - wxTimer m_vToolExpTimer; - wxToolTip* m_pToolTip; - wxCoord m_vXMouse; - wxCoord m_vYMouse; - - // - // Virtual function hiding supression - virtual wxToolBarToolBase *InsertTool (size_t nPos, wxToolBarToolBase* pTool) - { - return( wxToolBarBase::InsertTool( nPos - ,pTool - )); - } - - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxToolBar) -}; - -#endif // wxUSE_TOOLBAR - -#endif - // _WX_TOOLBAR_H_ diff --git a/include/wx/os2/tooltip.h b/include/wx/os2/tooltip.h deleted file mode 100644 index c94ff99a82..0000000000 --- a/include/wx/os2/tooltip.h +++ /dev/null @@ -1,54 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/tooltip.h -// Purpose: wxToolTip class - tooltip control -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_TOOLTIP_H_ -#define _WX_OS2_TOOLTIP_H_ - -class wxToolTip : public wxObject -{ -public: - // ctor & dtor - wxToolTip(const wxString &rsTip); - virtual ~wxToolTip(); - - // - // Accessors - // - inline const wxString& GetTip(void) const { return m_sText; } - inline wxWindow* GetWindow(void) const { return m_pWindow; } - - void SetTip(const wxString& rsTip); - inline void SetWindow(wxWindow* pWin) { m_pWindow = pWin; } - - // controlling tooltip behaviour: globally change tooltip parameters - // enable or disable the tooltips globally - static void Enable(bool WXUNUSED(flag)) {} - // set the delay after which the tooltip appears - static void SetDelay(long WXUNUSED(milliseconds)) {} - // set the delay after which the tooltip disappears or how long the tooltip remains visible - static void SetAutoPop(long WXUNUSED(milliseconds)) {} - // set the delay between subsequent tooltips to appear - static void SetReshow(long WXUNUSED(milliseconds)) {} - - // - // Implementation - // - void DisplayToolTipWindow(const wxPoint& rPos); - void HideToolTipWindow(void); - -private: - void Create(const wxString &rsTip); - - HWND m_hWnd; - wxString m_sText; // tooltip text - wxWindow* m_pWindow; // window we're associated with -}; // end of CLASS wxToolTip - -#endif // _WX_OS2_TOOLTIP_H_ diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h deleted file mode 100644 index 9b2ccfc4d4..0000000000 --- a/include/wx/os2/toplevel.h +++ /dev/null @@ -1,176 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/toplevel.h -// Purpose: wxTopLevelWindowOS2 is the OS2 implementation of wxTLW -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.09.01 -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_MSW_TOPLEVEL_H_ -#define _WX_MSW_TOPLEVEL_H_ - -enum ETemplateID -{ - kResizeableDialog = 130, - kCaptionDialog, - kNoCaptionDialog -}; - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowOS2 -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowOS2 : public wxTopLevelWindowBase -{ -public: - // constructors and such - wxTopLevelWindowOS2() { Init(); } - - wxTopLevelWindowOS2( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxDEFAULT_FRAME_STYLE - ,const wxString& rsName = wxFrameNameStr - ) - { - Init(); - - (void)Create(pParent, vId, rsTitle, rPos, rSize, lStyle, rsName); - } - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxString& rsTitle - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxDEFAULT_FRAME_STYLE - ,const wxString& rsName = wxFrameNameStr - ); - - virtual ~wxTopLevelWindowOS2(); - - // - // Implement base class pure virtuals - // - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; - - virtual void Iconize(bool bIconize = true); - virtual bool IsFullScreen(void) const { return m_bFsIsShowing; } - virtual bool IsIconized(void) const; - virtual bool IsMaximized(void) const; - virtual void Maximize(bool bMaximize = true); - virtual void Restore(void); - virtual void SendSizeEvent(int flags = 0); - virtual void SetIcons(const wxIconBundle& rIcons); - - virtual bool Show(bool bShow = true); - virtual bool ShowFullScreen( bool bShow, - long lStyle = wxFULLSCREEN_ALL ); - - // - // EnableCloseButton(false) may be used to remove the "Close" - // button from the title bar - // - bool EnableCloseButton(bool bEnable = true); - HWND GetFrame(void) const { return m_hFrame; } - - // - // Implementation from now on - // -------------------------- - // - PSWP GetSwpClient(void) { return &m_vSwpClient; } - - void OnActivate(wxActivateEvent& rEvent); - - void SetLastFocus(wxWindow *pWin) { m_pWinLastFocused = pWin; } - wxWindow* GetLastFocus(void) const { return m_pWinLastFocused; } - -protected: - - // - // Common part of all ctors - // - void Init(void); - - // - // Create a new frame, return false if it couldn't be created - // - bool CreateFrame( const wxString& rsTitle - ,const wxPoint& rPos - ,const wxSize& rSize - ); - - // - // Create a new dialog using the given dialog template from resources, - // return false if it couldn't be created - // - bool CreateDialog( ULONG ulDlgTemplate - ,const wxString& rsTitle - ,const wxPoint& rPos - ,const wxSize& rSize - ); - - // - // Common part of Iconize(), Maximize() and Restore() - // - void DoShowWindow(int nShowCmd); - - // - // Implement the geometry-related methods for a top level window - // - virtual void DoSetClientSize( int nWidth - ,int nHeight - ); - virtual void DoGetClientSize( int* pnWidth - ,int* pnHeight - ) const; - - // - // Translate wxWidgets flags into OS flags - // - virtual WXDWORD OS2GetStyle( long lFlag - ,WXDWORD* pdwExstyle - ) const; - - // - // Choose the right parent to use with CreateWindow() - // - virtual WXHWND OS2GetParent(void) const; - - // - // Is the frame currently iconized? - // - bool m_bIconized; - - // - // Should the frame be maximized when it will be shown? set by Maximize() - // when it is called while the frame is hidden - // - bool m_bMaximizeOnShow; - - // - // Data to save/restore when calling ShowFullScreen - // - long m_lFsStyle; // Passed to ShowFullScreen - wxRect m_vFsOldSize; - long m_lFsOldWindowStyle; - bool m_bFsIsMaximized; - bool m_bFsIsShowing; - - wxWindow* m_pWinLastFocused; - - WXHWND m_hFrame; - SWP m_vSwp; - SWP m_vSwpClient; - static bool m_sbInitialized; - static wxWindow* m_spHiddenParent; - - DECLARE_EVENT_TABLE() -}; // end of CLASS wxTopLevelWindowOS2 - -#endif // _WX_MSW_TOPLEVEL_H_ diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h deleted file mode 100644 index 2c3fcd4396..0000000000 --- a/include/wx/os2/treectrl.h +++ /dev/null @@ -1,626 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/treectrl.h -// Purpose: wxTreeCtrl class -// Author: David Webster -// Modified by: -// Created: 01/23/03 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TREECTRL_H_ -#define _WX_TREECTRL_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#if wxUSE_TREECTRL - -#include "wx/textctrl.h" -#include "wx/dynarray.h" -#include "wx/treebase.h" -#include "wx/hashmap.h" - -// the type for "untyped" data -typedef long wxDataType; - -// fwd decl -class WXDLLIMPEXP_CORE wxImageList; -class WXDLLIMPEXP_CORE wxDragImage; -struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem; - -// a callback function used for sorting tree items, it should return -1 if the -// first item precedes the second, +1 if the second precedes the first or 0 if -// they're equivalent -class wxTreeItemData; - -// hash storing attributes for our items -WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr); - -// ---------------------------------------------------------------------------- -// wxTreeCtrl -// ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl -{ -public: - // creation - // -------- - wxTreeCtrl() { Init(); } - - wxTreeCtrl( wxWindow* pParent - ,wxWindowID vId = wxID_ANY - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxTreeCtrlNameStr - ) - { - Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); - } - virtual ~wxTreeCtrl(); - - bool Create( wxWindow* pParent - ,wxWindowID vId = wxID_ANY - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT - ,const wxValidator& rValidator = wxDefaultValidator - ,const wxString& rsName = wxTreeCtrlNameStr - ); - - // - // Accessors - // --------- - // - - // - // Get the total number of items in the control - // - virtual unsigned int GetCount(void) const; - - // - // Indent is the number of pixels the children are indented relative to - // the parents position. SetIndent() also redraws the control - // immediately. - // - unsigned int GetIndent(void) const; - void SetIndent(unsigned int uIndent); - - // - // Spacing is the number of pixels between the start and the Text - // - unsigned int GetSpacing(void) const { return 18; } // return wxGTK default - void SetSpacing(unsigned int uSpacing) { } - - // - // Image list: these functions allow to associate an image list with - // the control and retrieve it. Note that the control does _not_ delete - // the associated image list when it's deleted in order to allow image - // lists to be shared between different controls. - // - // OS/2 doesn't really use imagelists as MSW does, but since the MSW - // control is the basis for this one, until I decide how to get rid of - // the need for them they are here for now. - // - wxImageList* GetImageList(void) const; - wxImageList* GetStateImageList(void) const; - - void AssignImageList(wxImageList* pImageList); - void AssignStateImageList(wxImageList* pImageList); - void SetImageList(wxImageList* pImageList); - void SetStateImageList(wxImageList* pImageList); - - // - // Functions to work with tree ctrl items. Unfortunately, they can _not_ be - // member functions of wxTreeItem because they must know the tree the item - // belongs to for Windows implementation and storing the pointer to - // wxTreeCtrl in each wxTreeItem is just too much waste. - - // - // Item's label - // - wxString GetItemText(const wxTreeItemId& rItem) const; - void SetItemText( const wxTreeItemId& rItem - ,const wxString& rsText - ); - - // - // One of the images associated with the item (normal by default) - // - int GetItemImage( const wxTreeItemId& rItem - ,wxTreeItemIcon vWhich = wxTreeItemIcon_Normal - ) const; - void SetItemImage( const wxTreeItemId& rItem - ,int nImage - ,wxTreeItemIcon vWhich = wxTreeItemIcon_Normal - ); - - // - // Data associated with the item - // - wxTreeItemData* GetItemData(const wxTreeItemId& rItem) const; - void SetItemData( const wxTreeItemId& rItem - ,wxTreeItemData* pData - ); - - // - // Item's text colour - // - wxColour GetItemTextColour(const wxTreeItemId& rItem) const; - void SetItemTextColour( const wxTreeItemId& rItem - ,const wxColour& rColor - ); - - // - // Item's background colour - // - wxColour GetItemBackgroundColour(const wxTreeItemId& rItem) const; - void SetItemBackgroundColour( const wxTreeItemId& rItem - ,const wxColour& rColour - ); - - // - // Item's font - // - wxFont GetItemFont(const wxTreeItemId& rItem) const; - void SetItemFont( const wxTreeItemId& rItem - ,const wxFont& rFont - ); - - // - // Force appearance of [+] button near the item. This is useful to - // allow the user to expand the items which don't have any children now - // - but instead add them only when needed, thus minimizing memory - // usage and loading time. - // - void SetItemHasChildren( const wxTreeItemId& rItem - ,bool bHas = true - ); - - // - // The item will be shown in bold - // - void SetItemBold( const wxTreeItemId& rItem - ,bool bBold = true - ); - - // - // The item will be shown with a drop highlight - // - void SetItemDropHighlight( const wxTreeItemId& rItem - ,bool bHighlight = true - ); - - // - // Item status inquiries - // --------------------- - // - - // - // Is the item visible (it might be outside the view or not expanded)? - // - bool IsVisible(const wxTreeItemId& rItem) const; - - // - // Does the item has any children? - // - bool ItemHasChildren(const wxTreeItemId& rItem) const; - - // - // Is the item expanded (only makes sense if HasChildren())? - // - bool IsExpanded(const wxTreeItemId& rItem) const; - - // - // Is this item currently selected (the same as has focus)? - // - bool IsSelected(const wxTreeItemId& rItem) const; - - // - // Is item text in bold font? - // - bool IsBold(const wxTreeItemId& rItem) const; - - // - // Number of children - // ------------------ - // - - // - // If 'bRecursively' is false, only immediate children count, otherwise - // the returned number is the number of all items in this branch - // - size_t GetChildrenCount( const wxTreeItemId& rItem - ,bool bRecursively = true - ) const; - - // - // Navigation - // ---------- - // - - // - // Get the root tree item - // - wxTreeItemId GetRootItem(void) const; - - // - // Get the item currently selected (may return NULL if no selection) - // - wxTreeItemId GetSelection(void) const; - - // - // Get the items currently selected, return the number of such item - // - size_t GetSelections(wxArrayTreeItemIds& rSelections) const; - - // - // Get the parent of this item (may return NULL if root) - // - wxTreeItemId GetItemParent(const wxTreeItemId& rItem) const; - - // for this enumeration function you must pass in a "cookie" parameter - // which is opaque for the application but is necessary for the library - // to make these functions reentrant (i.e. allow more than one - // enumeration on one and the same object simultaneously). Of course, - // the "cookie" passed to GetFirstChild() and GetNextChild() should be - // the same! - - // get the first child of this item - wxTreeItemId GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const; - // get the next child - wxTreeItemId GetNextChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const; - - // - // Get the last child of this item - this method doesn't use cookies - // - wxTreeItemId GetLastChild(const wxTreeItemId& rItem) const; - - // - // Get the next sibling of this item - // - wxTreeItemId GetNextSibling(const wxTreeItemId& rItem) const; - - // - // Get the previous sibling - // - wxTreeItemId GetPrevSibling(const wxTreeItemId& rItem) const; - - // - // Get first visible item - // - wxTreeItemId GetFirstVisibleItem(void) const; - - // - // Get the next visible item: item must be visible itself! - // see IsVisible() and wxTreeCtrl::GetFirstVisibleItem() - // - wxTreeItemId GetNextVisible(const wxTreeItemId& rItem) const; - - // - // Get the previous visible item: item must be visible itself! - // - wxTreeItemId GetPrevVisible(const wxTreeItemId& rItem) const; - - // - // Operations - // ---------- - // - - // - // Add the root node to the tree - // - wxTreeItemId AddRoot( const wxString& rsText - ,int nImage = -1 - ,int nSelectedImage = -1 - ,wxTreeItemData* pData = NULL - ); - - // - // Insert a new item in as the first child of the parent - // - wxTreeItemId PrependItem( const wxTreeItemId& rParent - ,const wxString& rsText - ,int nImage = -1 - ,int nSelectedImage = -1 - ,wxTreeItemData* pData = NULL - ); - - // - // Insert a new item after a given one - // - wxTreeItemId InsertItem( const wxTreeItemId& rParent - ,const wxTreeItemId& rIdPrevious - ,const wxString& rsText - ,int nImage = -1 - ,int nSelectedImage = -1 - ,wxTreeItemData* pData = NULL - ); - - // - // Insert a new item before the one with the given index - // - wxTreeItemId InsertItem( const wxTreeItemId& pParent - ,size_t nIndex - ,const wxString& rsText - ,int nImage = -1 - ,int nSelectedImage = -1 - ,wxTreeItemData* pData = NULL - ); - - // - // Insert a new item in as the last child of the parent - // - wxTreeItemId AppendItem( const wxTreeItemId& rParent - ,const wxString& rsText - ,int nImage = -1 - ,int nSelectedImage = -1 - ,wxTreeItemData* pData = NULL - ); - - // - // Delete this item and associated data if any - // - void Delete(const wxTreeItemId& rItem); - - // - // Delete all children (but don't delete the item itself) - // - void DeleteChildren(const wxTreeItemId& rItem); - - // - // Delete all items from the tree - // - void DeleteAllItems(void); - - // - // Expand this item - // - void Expand(const wxTreeItemId& rItem); - - // - // Collapse the item without removing its children - // - void Collapse(const wxTreeItemId& rItem); - - // - // Collapse the item and remove all children - // - void CollapseAndReset(const wxTreeItemId& rItem); - - // - // Toggles the current state - // - void Toggle(const wxTreeItemId& rItem); - - // - // Remove the selection from currently selected item (if any) - // - void Unselect(void); - - // - // Unselect all items (only makes sense for multiple selection control) - // - void UnselectAll(void); - - // - // Select this item - // - void SelectItem(const wxTreeItemId& rItem); - - // - // Make sure this item is visible (expanding the parent item and/or - // scrolling to this item if necessary) - // - void EnsureVisible(const wxTreeItemId& rItem); - - // - // Scroll to this item (but don't expand its parent) - // - void ScrollTo(const wxTreeItemId& rItem); - - // - // OS/2 does not use a separate edit field for editting text. Here for - // interface compatibility, only. - // - wxTextCtrl* EditLabel( const wxTreeItemId& rItem - ,wxClassInfo* pTextCtrlClass = wxCLASSINFO(wxTextCtrl) - ); - - // - // returns NULL for OS/2 in ALL cases - // - wxTextCtrl* GetEditControl(void) const {return NULL;} - - // - // End editing and accept or discard the changes to item label - // - void EndEditLabel( const wxTreeItemId& rItem - ,bool bDiscardChanges = false - ); - - // - // Sorting - // ------- - // - - // - // This function is called to compare 2 items and should return -1, 0 - // or +1 if the first item is less than, equal to or greater than the - // second one. The base class version performs alphabetic comparaison - // of item labels (GetText) - // - virtual int OnCompareItems( const wxTreeItemId& rItem1 - ,const wxTreeItemId& rItem2 - ); - - // - // Sort the children of this item using OnCompareItems - // - void SortChildren(const wxTreeItemId& rItem); - - // - // Helpers - // ------- - // - - // - // Determine to which item (if any) belongs the given point (the - // coordinates specified are relative to the client area of tree ctrl) - // and fill the flags parameter with a bitmask of wxTREE_HITTEST_xxx - // constants. - - // - // The first function is more portable (because easier to implement - // on other platforms), but the second one returns some extra info. - // - wxTreeItemId HitTest(const wxPoint& rPoint) - { int nDummy = 0; return HitTest(rPoint, nDummy); } - wxTreeItemId HitTest( const wxPoint& rPoint - ,int& rFlags - ); - - // - // Get the bounding rectangle of the item (or of its label only) - // - bool GetBoundingRect( const wxTreeItemId& rItem - ,wxRect& rRect - ,bool bTextOnly = false - ) const; - - // - // Implementation - // -------------- - // - - virtual MRESULT OS2WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - virtual bool OS2Command( WXUINT uParam - ,WXWORD wId - ); -// virtual bool OMSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - // - // Override some base class virtuals - // - virtual bool SetBackgroundColour(const wxColour& rColour); - virtual bool SetForegroundColour(const wxColour& rColour); - - // - // Get/set the check state for the item (only for wxTR_MULTIPLE) - // - bool IsItemChecked(const wxTreeItemId& rItem) const; - void SetItemCheck( const wxTreeItemId& rItem - ,bool bCheck = true - ); - -protected: - // - // SetImageList helper - // - void SetAnyImageList( wxImageList* pImageList - ,int nWhich - ); - - // - // Refresh a single item - // - void RefreshItem(const wxTreeItemId& rItem); - - wxImageList* m_pImageListNormal; // images for tree elements - wxImageList* m_pImageListState; // special images for app defined states - bool m_bOwnsImageListNormal; - bool m_bOwnsImageListState; - -private: - - // - // The common part of all ctors - // - void Init(void); - - // - // Helper functions - // - inline bool DoGetItem(wxTreeViewItem* pTvItem) const; - inline void DoSetItem(wxTreeViewItem* pTvItem); - - inline void DoExpand( const wxTreeItemId& rItem - ,int nFlag - ); - wxTreeItemId DoInsertItem( const wxTreeItemId& pParent - ,wxTreeItemId hInsertAfter - ,const wxString& rsText - ,int nImage - ,int nSelectedImage - ,wxTreeItemData* pData - ); - int DoGetItemImageFromData( const wxTreeItemId& rItem - ,wxTreeItemIcon vWhich - ) const; - void DoSetItemImageFromData( const wxTreeItemId& rItem - ,int nImage - ,wxTreeItemIcon vWhich - ) const; - void DoSetItemImages( const wxTreeItemId& rItem - ,int nImage - ,int nImageSel - ); - void DeleteTextCtrl() { } - - // - // support for additional item images which we implement using - // wxTreeItemIndirectData technique - see the comments in msw/treectrl.cpp - // - void SetIndirectItemData( const wxTreeItemId& rItem - ,class wxTreeItemIndirectData* pData - ); - bool HasIndirectData(const wxTreeItemId& rItem) const; - bool IsDataIndirect(wxTreeItemData* pData) const - { return pData && pData->GetId().m_pItem == 0; } - - // - // The hash storing the items attributes (indexed by items ids) - // - wxMapTreeAttr m_vAttrs; - - // - // true if the hash above is not empty - // - bool m_bHasAnyAttr; - - // - // Used for dragging - // - wxDragImage* m_pDragImage; - - // Virtual root item, if wxTR_HIDE_ROOT is set. -// void* m_pVirtualRoot; - - // the starting item for selection with Shift -// WXHTREEITEM m_htSelStart; -// - friend class wxTreeItemIndirectData; - friend class wxTreeSortHelper; - - DECLARE_DYNAMIC_CLASS(wxTreeCtrl) - wxDECLARE_NO_COPY_CLASS(wxTreeCtrl); -}; // end of CLASS wxTreeCtrl - -#endif // wxUSE_TREECTRL - -#endif - // _WX_TREECTRL_H_ diff --git a/include/wx/os2/warning.ico b/include/wx/os2/warning.ico deleted file mode 100644 index 7f70ff0708..0000000000 Binary files a/include/wx/os2/warning.ico and /dev/null differ diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h deleted file mode 100644 index 787113c405..0000000000 --- a/include/wx/os2/window.h +++ /dev/null @@ -1,570 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/os2/window.h -// Purpose: wxWindow class -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WINDOW_H_ -#define _WX_WINDOW_H_ - -#define wxUSE_MOUSEEVENT_HACK 0 - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- -#define INCL_DOS -#define INCL_PM -#define INCL_GPI -#include - - -// --------------------------------------------------------------------------- -// forward declarations -// --------------------------------------------------------------------------- -#ifndef CW_USEDEFAULT -# define CW_USEDEFAULT ((int)0x80000000) -#endif - -// --------------------------------------------------------------------------- -// forward declarations -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxButton; - -// --------------------------------------------------------------------------- -// wxWindow declaration for OS/2 PM -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowOS2 : public wxWindowBase -{ -public: - wxWindowOS2() - { - Init(); - } - - wxWindowOS2( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxString& rName = wxPanelNameStr - ) - { - Init(); - Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rName - ); - } - - virtual ~wxWindowOS2(); - - bool Create( wxWindow* pParent - ,wxWindowID vId - ,const wxPoint& rPos = wxDefaultPosition - ,const wxSize& rSize = wxDefaultSize - ,long lStyle = 0 - ,const wxString& rName = wxPanelNameStr - ); - - // implement base class pure virtuals - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel(void) const; - virtual void Raise(void); - virtual void Lower(void); - virtual bool Show(bool bShow = true); - virtual void DoEnable(bool bEnable); - virtual void SetFocus(void); - virtual void SetFocusFromKbd(void); - virtual bool Reparent(wxWindowBase* pNewParent); - virtual void WarpPointer( int x - ,int y - ); - virtual void Refresh( bool bEraseBackground = true - ,const wxRect* pRect = (const wxRect *)NULL - ); - virtual void Update(void); - virtual void SetWindowStyleFlag(long lStyle); - virtual bool SetCursor(const wxCursor& rCursor); - virtual bool SetFont(const wxFont& rFont); - virtual int GetCharHeight(void) const; - virtual int GetCharWidth(void) const; - - virtual void SetScrollbar( int nOrient - ,int nPos - ,int nThumbVisible - ,int nRange - ,bool bRefresh = true - ); - virtual void SetScrollPos( int nOrient - ,int nPos - ,bool bRefresh = true - ); - virtual int GetScrollPos(int nOrient) const; - virtual int GetScrollThumb(int nOrient) const; - virtual int GetScrollRange(int nOrient) const; - virtual void ScrollWindow( int nDx - ,int nDy - ,const wxRect* pRect = NULL - ); - - inline HWND GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;} - inline HWND GetScrollBarVert(void) const {return m_hWndScrollBarVert;} -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget(wxDropTarget* pDropTarget); -#endif // wxUSE_DRAG_AND_DROP - - // Accept files for dragging - virtual void DragAcceptFiles(bool bAccept); - -#ifndef __WXUNIVERSAL__ - // Native resource loading (implemented in src/os2/nativdlg.cpp) - // FIXME: should they really be all virtual? - virtual bool LoadNativeDialog( wxWindow* pParent - ,wxWindowID& vId - ); - virtual bool LoadNativeDialog( wxWindow* pParent - ,const wxString& rName - ); - wxWindow* GetWindowChild1(wxWindowID vId); - wxWindow* GetWindowChild(wxWindowID vId); -#endif //__WXUNIVERSAL__ - - // implementation from now on - // -------------------------- - - // simple accessors - // ---------------- - - WXHWND GetHWND(void) const { return m_hWnd; } - void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } - virtual WXWidget GetHandle(void) const { return GetHWND(); } - bool GetUseCtl3D(void) const { return m_bUseCtl3D; } - bool GetTransparentBackground(void) const { return m_bBackgroundTransparent; } - void SetTransparentBackground(bool bT = true) { m_bBackgroundTransparent = bT; } - - // event handlers - // -------------- - void OnSetFocus(wxFocusEvent& rEvent); - void OnEraseBackground(wxEraseEvent& rEvent); - void OnIdle(wxIdleEvent& rEvent); - -public: - - // Windows subclassing - void SubclassWin(WXHWND hWnd); - void UnsubclassWin(void); - - WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; } - void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; } - // - // Return true if the window is of a standard (i.e. not wxWidgets') class - // - bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; } - - wxWindow* FindItem(long lId) const; - wxWindow* FindItemByHWND( WXHWND hWnd - ,bool bControlOnly = false - ) const; - - // Make a Windows extended style from the given wxWidgets window style ?? applicable to OS/2?? - static WXDWORD MakeExtendedStyle( long lStyle - ,bool bEliminateBorders = true - ); - - // PM only: true if this control is part of the main control - virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; } - - // translate wxWidgets style flags for this control into the PM style - // and optional extended style for the corresponding native control - // - // this is the function that should be overridden in the derived classes, - // but you will mostly use OS2GetCreateWindowFlags() below - virtual WXDWORD OS2GetStyle( long lFlags - ,WXDWORD* pdwExstyle = NULL - ) const; - - // get the MSW window flags corresponding to wxWidgets ones - // - // the functions returns the flags (WS_XXX) directly and puts the ext - // (WS_EX_XXX) flags into the provided pointer if not NULL - WXDWORD OS2GetCreateWindowFlags(WXDWORD* pdwExflags = NULL) const - { return OS2GetStyle(GetWindowStyle(), pdwExflags); } - - - // get the HWND to be used as parent of this window with CreateWindow() - virtual WXHWND OS2GetParent(void) const; - - // returns true if the window has been created - bool OS2Create( PSZ zClass - ,const wxChar* zTitle - ,WXDWORD dwStyle - ,const wxPoint& rPos - ,const wxSize& rSize - ,void* pCtlData - ,WXDWORD dwExStyle - ,bool bIsChild - ); - virtual bool OS2Command( WXUINT uParam - ,WXWORD nId - ); - -#ifndef __WXUNIVERSAL__ - // Create an appropriate wxWindow from a HWND - virtual wxWindow* CreateWindowFromHWND( wxWindow* pParent - ,WXHWND hWnd - ); - - // Make sure the window style reflects the HWND style (roughly) - virtual void AdoptAttributesFromHWND(void); -#endif - - // Setup background and foreground colours correctly - virtual void SetupColours(void); - - // ------------------------------------------------------------------------ - // helpers for message handlers: these perform the same function as the - // message crackers from - they unpack WPARAM and LPARAM into - // the correct parameters - // ------------------------------------------------------------------------ - - void UnpackCommand( WXWPARAM wParam - ,WXLPARAM lParam, - WXWORD* pId - ,WXHWND* pHwnd - ,WXWORD* pCmd - ); - void UnpackActivate( WXWPARAM wParam - ,WXLPARAM lParam - ,WXWORD* pState - ,WXHWND* pHwnd - ); - void UnpackScroll( WXWPARAM wParam - ,WXLPARAM lParam - ,WXWORD* pCode - ,WXWORD* pPos - ,WXHWND* pHwnd - ); - void UnpackMenuSelect( WXWPARAM wParam - ,WXLPARAM lParam - ,WXWORD* pTtem - ,WXWORD* pFlags - ,WXHMENU* pHmenu - ); - - // ------------------------------------------------------------------------ - // internal handlers for OS2 messages: all handlers return a boolen value: - // true means that the handler processed the event and false that it didn't - // ------------------------------------------------------------------------ - - // there are several cases where we have virtual functions for PM - // message processing: this is because these messages often require to be - // processed in a different manner in the derived classes. For all other - // messages, however, we do *not* have corresponding OS2OnXXX() function - // and if the derived class wants to process them, it should override - // OS2WindowProc() directly. - - // scroll event (both horizontal and vertical) - virtual bool OS2OnScroll( int nOrientation - ,WXWORD nSBCode - ,WXWORD pos - ,WXHWND control - ); - - // owner-drawn controls need to process these messages - virtual bool OS2OnDrawItem( int nId - ,WXDRAWITEMSTRUCT* pItem - ); - virtual long OS2OnMeasureItem( int nId - ,WXMEASUREITEMSTRUCT* pItem - ); - - virtual void OnPaint(wxPaintEvent& rEvent); - - // the rest are not virtual - bool HandleCreate( WXLPCREATESTRUCT vCs - ,bool* pMayCreate - ); - bool HandleInitDialog(WXHWND hWndFocus); - bool HandleDestroy(void); - bool HandlePaint(void); - bool HandleEraseBkgnd(WXHDC vDC); - bool HandleMinimize(void); - bool HandleMaximize(void); - bool HandleSize( int nX - ,int nY - ,WXUINT uFlag - ); - bool HandleGetMinMaxInfo(PSWP pMmInfo); - bool HandleShow( bool bShow - ,int nStatus - ); - bool HandleActivate( int nFlag - ,WXHWND hActivate - ); - bool HandleCommand( WXWORD nId - ,WXWORD nCmd - ,WXHWND hControl - ); - bool HandleSysCommand( WXWPARAM wParam - ,WXLPARAM lParam - ); - bool HandlePaletteChanged(void); - bool HandleQueryNewPalette(void); - bool HandleSysColorChange(void); - bool HandleDisplayChange(void); - bool HandleCaptureChanged(WXHWND hBainedCapture); - - bool HandleCtlColor(WXHBRUSH* hBrush); - bool HandleSetFocus(WXHWND hWnd); - bool HandleKillFocus(WXHWND hWnd); - bool HandleEndDrag(WXWPARAM wParam); - bool HandleMouseEvent( WXUINT uMsg - ,int nX - ,int nY - ,WXUINT uFlags - ); - bool HandleMouseMove( int nX - ,int nY - ,WXUINT uFlags - ); - bool HandleChar( WXWPARAM wParam - ,WXLPARAM lParam - ,bool bIsASCII = false - ); - bool HandleKeyDown( WXWPARAM wParam - ,WXLPARAM lParam - ); - bool HandleKeyUp( WXWPARAM wParam - ,WXLPARAM lParam - ); - bool HandleQueryDragIcon(WXHICON* phIcon); - bool HandleSetCursor( USHORT vId - ,WXHWND hWnd - ); - - bool IsMouseInWindow(void) const; - bool OS2GetCreateWindowCoords( const wxPoint& rPos - ,const wxSize& rSize - ,int& rnX - ,int& rnY - ,int& rnWidth - ,int& rnHeight - ) const; - - // Window procedure - virtual MRESULT OS2WindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - - // Calls an appropriate default window procedure - virtual MRESULT OS2DefWindowProc( WXUINT uMsg - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - virtual bool OS2ProcessMessage(WXMSG* pMsg); - virtual bool OS2ShouldPreProcessMessage(WXMSG* pMsg); - virtual bool OS2TranslateMessage(WXMSG* pMsg); - virtual void OS2DestroyWindow(void); - - // this function should return the brush to paint the window background - // with or 0 for the default brush - virtual WXHBRUSH OnCtlColor( WXHDC hDC - ,WXHWND hWnd - ,WXUINT uCtlColor - ,WXUINT uMessage - ,WXWPARAM wParam - ,WXLPARAM lParam - ); - - // Responds to colour changes: passes event on to children. - void OnSysColourChanged(wxSysColourChangedEvent& rEvent); - - // initialize various fields of wxMouseEvent (common part of OS2OnMouseXXX) - void InitMouseEvent( wxMouseEvent& rEvent - ,int nX - ,int nY - ,WXUINT uFlags - ); - - void MoveChildren(int nDiff); - PSWP GetSwp(void) {return &m_vWinSwp;} - -protected: - virtual void DoFreeze(void); - virtual void DoThaw(void); - - // PM can't create some MSW styles natively but can perform these after - // creation by sending messages - typedef enum extra_flags { kFrameToolWindow = 0x0001 - ,kVertCaption = 0x0002 - ,kHorzCaption = 0x0004 - } EExtraFlags; - // Some internal sizeing id's to make it easy for event handlers - typedef enum size_types { kSizeNormal - ,kSizeMax - ,kSizeMin - } ESizeTypes; - // the window handle - WXHWND m_hWnd; - - // the old window proc (we subclass all windows) - WXFARPROC m_fnOldWndProc; - - // additional (OS2 specific) flags - bool m_bUseCtl3D:1; // Using CTL3D for this control - bool m_bBackgroundTransparent:1; - bool m_bMouseInWindow:1; - bool m_bLastKeydownProcessed:1; - bool m_bWinCaptured:1; - WXDWORD m_dwExStyle; - - // the size of one page for scrolling - int m_nXThumbSize; - int m_nYThumbSize; - -#if wxUSE_MOUSEEVENT_HACK - // the coordinates of the last mouse event and the type of it - long m_lLastMouseX, - long m_lLastMouseY; - int m_nLastMouseEvent; -#endif // wxUSE_MOUSEEVENT_HACK - - WXHMENU m_hMenu; // Menu, if any - unsigned long m_ulMenubarId; // it's Id, if any - - // the return value of WM_GETDLGCODE handler - long m_lDlgCode; - - // implement the base class pure virtuals - virtual void GetTextExtent( const wxString& rString - ,int* pX - ,int* pY - ,int* pDescent = NULL - ,int* pExternalLeading = NULL - ,const wxFont* pTheFont = NULL - ) const; -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu* pMenu - ,int nX - ,int nY - ); -#endif // wxUSE_MENUS_NATIVE - virtual void DoClientToScreen( int* pX - ,int* pY - ) const; - virtual void DoScreenToClient( int* pX - ,int* pY - ) const; - virtual void DoGetPosition( int* pX - ,int* pY - ) const; - virtual void DoGetSize( int* pWidth - ,int* pHeight - ) const; - virtual void DoGetClientSize( int* pWidth - ,int* pHeight - ) const; - virtual void DoSetSize( int nX - ,int nY - ,int nWidth - ,int nHeight - ,int nSizeFlags = wxSIZE_AUTO - ); - virtual void DoSetClientSize( int nWidth - ,int nHeight - ); - - virtual void DoCaptureMouse(void); - virtual void DoReleaseMouse(void); - - // move the window to the specified location and resize it: this is called - // from both DoSetSize() and DoSetClientSize() and would usually just call - // ::WinSetWindowPos() except for composite controls which will want to arrange - // themselves inside the given rectangle - virtual void DoMoveWindow( int nX - ,int nY - ,int nWidth - ,int nHeight - ); - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip(wxToolTip* pTip); -#endif // wxUSE_TOOLTIPS - - int GetOS2ParentHeight(wxWindowOS2* pParent); - -private: - // common part of all ctors - void Init(void); - - // the (non-virtual) handlers for the events - bool HandleMove( int nX - ,int nY - ); - bool HandleJoystickEvent( WXUINT uMsg - ,int pX - ,int pY - ,WXUINT uFlags - ); - - bool HandleNotify( int nIdCtrl - ,WXLPARAM lParam - ,WXLPARAM* pResult - ); - // the helper functions used by HandleChar/KeyXXX methods - wxKeyEvent CreateKeyEvent( wxEventType evType - ,int nId - ,WXLPARAM lParam = 0 - ,WXWPARAM wParam = 0 - ) const; - - HWND m_hWndScrollBarHorz; - HWND m_hWndScrollBarVert; - SWP m_vWinSwp; - - DECLARE_DYNAMIC_CLASS(wxWindowOS2); - wxDECLARE_NO_COPY_CLASS(wxWindowOS2); - DECLARE_EVENT_TABLE() -}; // end of wxWindow - -class wxWindowCreationHook -{ -public: - wxWindowCreationHook(wxWindow* pWinBeingCreated); - ~wxWindowCreationHook(); -}; // end of CLASS wxWindowCreationHook - -// --------------------------------------------------------------------------- -// global functions -// --------------------------------------------------------------------------- - -// kbd code translation -WXDLLIMPEXP_CORE int wxCharCodeOS2ToWX(int nKeySym); -WXDLLIMPEXP_CORE int wxCharCodeWXToOS2( int nId - ,bool* pbIsVirtual = NULL - ); - -// ---------------------------------------------------------------------------- -// global objects -// ---------------------------------------------------------------------------- - -// notice that this hash must be defined after wxWindow declaration as it -// needs to "see" its dtor and not just forward declaration -#include "wx/hash.h" - -// pseudo-template HWND <-> wxWindow hash table -WX_DECLARE_HASH(wxWindowOS2, wxWindowList, wxWinHashTable); - -extern wxWinHashTable *wxWinHandleHash; - -#endif // _WX_WINDOW_H_ diff --git a/include/wx/os2/wx.dlg b/include/wx/os2/wx.dlg deleted file mode 100644 index e4c73f8b46..0000000000 --- a/include/wx/os2/wx.dlg +++ /dev/null @@ -1,34 +0,0 @@ -DLGINCLUDE 1 \dev\wx2\wxwindows\include\wx\os2\wxrsc.h - -DLGTEMPLATE ID_RESIZEABLEDIALOG PRELOAD MOVEABLE DISCARDABLE -BEGIN - DIALOG "" ID_RESIZEABLEDIALOG 34, 22, 144, 75 - WS_SAVEBITS | FS_SIZEBORDER | FS_NOMOVEWITHOWNER, - FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU - BEGIN - END -END - -DLGTEMPLATE ID_CAPTIONDIALOG PRELOAD MOVEABLE DISCARDABLE -BEGIN - DIALOG "Dummy Dialog" ID_CAPTIONDIALOG 34, 22, 144, 75 - WS_SAVEBITS | FS_DLGBORDER | FS_NOMOVEWITHOWNER, - FCF_DLGBORDER | FCF_TITLEBAR | FCF_SYSMENU - BEGIN - END -END - -/* -////////////////////////////////////////////////////////////////////////////// -// Dummy dialog for dialog boxes without caption & with thin frame -////////////////////////////////////////////////////////////////////////////// -*/ -DLGTEMPLATE ID_NOCAPTIONDIALOG PRELOAD MOVEABLE DISCARDABLE -BEGIN - DIALOG "" ID_NOCAPTIONDIALOG 34, 22, 144, 75 - WS_SAVEBITS | FS_NOMOVEWITHOWNER, - FCF_BORDER - BEGIN - END -END - diff --git a/include/wx/os2/wx.rc b/include/wx/os2/wx.rc deleted file mode 100644 index 1a8570756a..0000000000 --- a/include/wx/os2/wx.rc +++ /dev/null @@ -1,85 +0,0 @@ -#include -#include "wxrsc.h" - - -/* -////////////////////////////////////////////////////////////////////////////// -// This is the MDI Window menu -////////////////////////////////////////////////////////////////////////////// -*/ -MENU ID_WINDOW_MENU PRELOAD -BEGIN - SUBMENU "~Window", 131 - BEGIN - MENUITEM "~Cascade", 132 - MENUITEM "Tile ~Horizontally", 133 - MENUITEM "Tile ~Vertically", 134 - MENUITEM "", -1 - MENUITEM "~Arrange Icons", 135 - MENUITEM "~Next", 136 - END -END - -/* -////////////////////////////////////////////////////////////////////////////// -// Standard winWindows Cursors -////////////////////////////////////////////////////////////////////////////// -*/ - -POINTER WXCURSOR_HAND LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\hand.ptr" -POINTER WXCURSOR_BULLSEYE LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\bullseye.ptr" -POINTER WXCURSOR_PENCIL LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pencil.ptr" -POINTER WXCURSOR_MAGNIFIER LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\magnit1.ptr" -POINTER WXCURSOR_SIZING LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\size.ptr" -POINTER WXCURSOR_ROLLER LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\roller.ptr" -POINTER WXCURSOR_PBRUSH LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pbrush.ptr" -POINTER WXCURSOR_PLEFT LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntleft.ptr" -POINTER WXCURSOR_PRIGHT LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntright.ptr" -POINTER WXCURSOR_QARROW LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\query.ptr" -POINTER WXCURSOR_BLANK LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\blank.ptr" - -/* -////////////////////////////////////////////////////////////////////////////// -// Default Icons -////////////////////////////////////////////////////////////////////////////// -*/ -/* Standard icons */ -ICON wxICON_TIP PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\tip.ico" - -ICON wxICON_SMALL_CLOSED_FOLDER PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\folder1.ico" -ICON wxICON_SMALL_OPEN_FOLDER PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\folder2.ico" -ICON wxICON_SMALL_FILE PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\file.ico" -ICON wxICON_SMALL_COMPUTER PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\computer.ico" -ICON wxICON_SMALL_DRIVE PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\drive.ico" -ICON wxICON_SMALL_CDROM PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\cdrom.ico" -ICON wxICON_SMALL_FLOPPY PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\floppy.ico" -ICON wxICON_SMALL_REMOVEABLE PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\removble.ico" -ICON wxICON_SMALL_ERROR PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\error.ico" -ICON wxICON_SMALL_INFO PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\info.ico" -ICON wxICON_SMALL_WARNING PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\warning.ico" - -/* -////////////////////////////////////////////////////////////////////////////// -// Bitmaps -////////////////////////////////////////////////////////////////////////////// -*/ -BITMAP wxDISABLE_BUTTON_BITMAP LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\disable.bmp" - -/* -// For src/generic/proplist.cpp -*/ -BITMAP wxTICK_BITMAP LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\tick.bmp" -BITMAP wxCROSS_BITMAP LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\cross.bmp" - -/* -// For kContextHelpButton -*/ -BITMAP wxCSQUERY_BITMAP LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\csquery.bmp" - -/* -// For obtaining the RGB values of standard colours -*/ -BITMAP wxBITMAP_STD_COLOURS LOADONCALL "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\colours.bmp" - -RCINCLUDE \Dev\Wx2\WxWindows\INCLUDE\WX\OS2\WX.DLG - diff --git a/include/wx/os2/wx.res b/include/wx/os2/wx.res deleted file mode 100644 index 25c2e20f51..0000000000 Binary files a/include/wx/os2/wx.res and /dev/null differ diff --git a/include/wx/os2/wxrsc.h b/include/wx/os2/wxrsc.h deleted file mode 100644 index e87843d15f..0000000000 --- a/include/wx/os2/wxrsc.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -// Pointer ID's -*/ -#define WXCURSOR_HAND 100 -#define WXCURSOR_BULLSEYE 101 -#define WXCURSOR_PENCIL 102 -#define WXCURSOR_MAGNIFIER 103 -#define WXCURSOR_NO_ENTRY 104 -#define WXCURSOR_SIZING 105 -#define WXCURSOR_ROLLER 106 -#define WXCURSOR_WATCH 107 -#define WXCURSOR_PBRUSH 108 -#define WXCURSOR_PLEFT 109 -#define WXCURSOR_PRIGHT 110 -#define WXCURSOR_QARROW 111 -#define WXCURSOR_BLANK 112 - -/* -// Icon Ids -*/ -#define wxICON_TIP 113 -#define wxICON_SMALL_CLOSED_FOLDER 114 -#define wxICON_SMALL_OPEN_FOLDER 115 -#define wxICON_SMALL_FILE 116 -#define wxICON_SMALL_COMPUTER 117 -#define wxICON_SMALL_DRIVE 118 -#define wxICON_SMALL_CDROM 119 -#define wxICON_SMALL_FLOPPY 120 -#define wxICON_SMALL_REMOVEABLE 121 -#define wxICON_SMALL_ERROR 122 -#define wxICON_SMALL_INFO 123 -#define wxICON_SMALL_WARNING 124 - -/* -// Bitmap Ids -*/ -#define wxDISABLE_BUTTON_BITMAP 125 -#define wxTICK_BITMAP 126 -#define wxCROSS_BITMAP 127 -#define wxCSQUERY_BITMAP 128 -#define wxBITMAP_STD_COLOURS 129 - -/* -// Dialog Ids -- must match enums in Toplevel.cpp -*/ -#define ID_RESIZEABLEDIALOG 130 -#define ID_CAPTIONDIALOG 131 -#define ID_NOCAPTIONDIALOG 132 - -#define ID_WINDOW_MENU 133 - diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h index b25f5cc71a..7ae3b71cb4 100644 --- a/include/wx/ownerdrw.h +++ b/include/wx/ownerdrw.h @@ -135,8 +135,6 @@ private: #if defined(__WXMSW__) #include "wx/msw/ownerdrw.h" -#elif defined(__WXPM__) - #include "wx/os2/ownerdrw.h" #endif #endif // wxUSE_OWNER_DRAWN diff --git a/include/wx/palette.h b/include/wx/palette.h index 85bf7dd689..d3d675c3bf 100644 --- a/include/wx/palette.h +++ b/include/wx/palette.h @@ -35,8 +35,6 @@ public: #include "wx/generic/paletteg.h" #elif defined(__WXMAC__) #include "wx/osx/palette.h" -#elif defined(__WXPM__) - #include "wx/os2/palette.h" #endif #endif // wxUSE_PALETTE diff --git a/include/wx/pen.h b/include/wx/pen.h index 2b7ecc0cad..9f6f10078f 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -111,8 +111,6 @@ public: #include "wx/osx/pen.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/pen.h" -#elif defined(__WXPM__) - #include "wx/os2/pen.h" #endif class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase diff --git a/include/wx/platform.h b/include/wx/platform.h index d1c18f320d..c69b9d8521 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -311,7 +311,7 @@ #elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \ defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \ defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \ - defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__MACH__) + defined(__VMS) || defined(__BEOS__) || defined(__MACH__) # define __UNIX_LIKE__ @@ -331,9 +331,6 @@ # endif # endif /* SGI */ -# ifdef __EMX__ -# define OS2EMX_PLAIN_CHAR -# endif # if defined(__INNOTEK_LIBC__) /* Ensure visibility of strnlen declaration */ # define _GNU_SOURCE @@ -369,29 +366,6 @@ # endif # endif -/* - OS: OS/2 - */ -#elif defined(__OS2__) - - /* wxOS2 vs. non wxOS2 ports on OS2 platform */ -# if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) -# ifndef __WXPM__ -# define __WXPM__ -# endif -# endif - -# if defined(__IBMCPP__) -# define __VISAGEAVER__ __IBMCPP__ -# endif - - /* Place other OS/2 compiler environment defines here */ -# if defined(__VISAGECPP__) - /* VisualAge is the only thing that understands _Optlink */ -# define LINKAGEMODE _Optlink -# endif -# define wxSIZE_T_IS_UINT - /* OS: Windows */ @@ -450,7 +424,6 @@ ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \ wxCHECK_WATCOM_VERSION(1,0) ) && \ !defined(__DOS__) && \ - !defined(__WXPM__) && \ !defined(__WXMOTIF__) && \ !defined(__WXX11__) # include "wx/msw/gccpriv.h" diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 3f38bdd716..7264b99a45 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -53,8 +53,6 @@ public: // include the real class declaration #if defined(__WXMSW__) #include "wx/msw/popupwin.h" -#elif defined(__WXPM__) - #include "wx/os2/popupwin.h" #elif defined(__WXGTK20__) #include "wx/gtk/popupwin.h" #elif defined(__WXGTK__) diff --git a/include/wx/print.h b/include/wx/print.h index 56ebcf6597..40e55faaa0 100644 --- a/include/wx/print.h +++ b/include/wx/print.h @@ -23,10 +23,6 @@ #include "wx/osx/printmac.h" -#elif defined(__WXPM__) - -#include "wx/os2/printos2.h" - #else #include "wx/generic/printps.h" diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h index acfa9e8f8a..1b86d445a4 100644 --- a/include/wx/radiobox.h +++ b/include/wx/radiobox.h @@ -165,8 +165,6 @@ private: #include "wx/osx/radiobox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/radiobox.h" -#elif defined(__WXPM__) - #include "wx/os2/radiobox.h" #endif #endif // wxUSE_RADIOBOX diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h index 427787341e..10e3170fea 100644 --- a/include/wx/radiobut.h +++ b/include/wx/radiobut.h @@ -48,8 +48,6 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[]; #include "wx/osx/radiobut.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/radiobut.h" -#elif defined(__WXPM__) - #include "wx/os2/radiobut.h" #endif #endif // wxUSE_RADIOBTN diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index 8e73e14693..ec12c77ae1 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -168,11 +168,6 @@ typedef wxPixelFormat wxImagePixelFormat; // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA typedef wxPixelFormat wxNativePixelFormat; - #define wxPIXEL_FORMAT_ALPHA 3 -#elif defined(__WXPM__) - // Under PM, we can use standard RGB or RGBA - typedef wxPixelFormat wxNativePixelFormat; - #define wxPIXEL_FORMAT_ALPHA 3 #elif defined(__WXDFB__) // Under DirectFB, RGB components are reversed, they're in BGR order diff --git a/include/wx/region.h b/include/wx/region.h index 64a8e05532..448105cb19 100644 --- a/include/wx/region.h +++ b/include/wx/region.h @@ -181,8 +181,7 @@ protected: // implement individual wxRegion operations, factor out the common code for the // ports with Combine() in this class #if defined(__WXMSW__) || \ - ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ) || \ - defined(__WXPM__) + ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ) #define wxHAS_REGION_COMBINE @@ -225,8 +224,6 @@ protected: #include "wx/osx/region.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/region.h" -#elif defined(__WXPM__) - #include "wx/os2/region.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index 21f2d75a8a..76b865c249 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -76,8 +76,6 @@ private: #include "wx/osx/scrolbar.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/scrolbar.h" -#elif defined(__WXPM__) - #include "wx/os2/scrolbar.h" #endif #endif // wxUSE_SCROLLBAR diff --git a/include/wx/slider.h b/include/wx/slider.h index 9a5788bb0b..c3c7fc3229 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -141,8 +141,6 @@ private: #include "wx/osx/slider.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/slider.h" -#elif defined(__WXPM__) - #include "wx/os2/slider.h" #endif #endif // wxUSE_SLIDER diff --git a/include/wx/sound.h b/include/wx/sound.h index b81a11cb46..772ecc5755 100644 --- a/include/wx/sound.h +++ b/include/wx/sound.h @@ -60,8 +60,6 @@ protected: #include "wx/cocoa/sound.h" #elif defined(__WXMAC__) #include "wx/osx/sound.h" -#elif defined(__WXPM__) - #include "wx/os2/sound.h" #elif defined(__UNIX__) #include "wx/unix/sound.h" #endif diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 48da93213a..6a36e98097 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -88,8 +88,6 @@ protected: #include "wx/osx/spinbutt.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/spinbutt.h" -#elif defined(__WXPM__) - #include "wx/os2/spinbutt.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h index 7c44a9bd1f..14e3d9777e 100644 --- a/include/wx/spinctrl.h +++ b/include/wx/spinctrl.h @@ -121,9 +121,6 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&); #elif defined(__WXMSW__) #define wxHAS_NATIVE_SPINCTRL #include "wx/msw/spinctrl.h" -#elif defined(__WXPM__) - #define wxHAS_NATIVE_SPINCTRL - #include "wx/os2/spinctrl.h" #elif defined(__WXGTK20__) #define wxHAS_NATIVE_SPINCTRL #define wxHAS_NATIVE_SPINCTRLDOUBLE diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 27752633a8..095b59c9dc 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -66,8 +66,6 @@ protected: #include "wx/osx/statbmp.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/statbmp.h" -#elif defined(__WXPM__) - #include "wx/os2/statbmp.h" #endif #endif // wxUSE_STATBMP diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 155bb89b98..44ca4924ca 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -66,8 +66,6 @@ protected: #include "wx/osx/statbox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/statbox.h" -#elif defined(__WXPM__) - #include "wx/os2/statbox.h" #endif #endif // wxUSE_STATBOX diff --git a/include/wx/statline.h b/include/wx/statline.h index a6f522c5d5..d8a6bb0c50 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -90,8 +90,6 @@ protected: #include "wx/gtk/statline.h" #elif defined(__WXGTK__) #include "wx/gtk1/statline.h" -#elif defined(__WXPM__) - #include "wx/os2/statline.h" #elif defined(__WXMAC__) #include "wx/osx/statline.h" #elif defined(__WXCOCOA__) diff --git a/include/wx/stattext.h b/include/wx/stattext.h index f5406d94b8..bb11750cb9 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -99,8 +99,6 @@ private: #include "wx/osx/stattext.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/stattext.h" -#elif defined(__WXPM__) - #include "wx/os2/stattext.h" #endif #endif // !wxNO_PORT_STATTEXT_INCLUDE diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h index 9d92044457..7f44468d29 100644 --- a/include/wx/stdpaths.h +++ b/include/wx/stdpaths.h @@ -178,9 +178,6 @@ protected: #elif defined(__WXMAC__) || defined(__DARWIN__) #include "wx/osx/core/stdpaths.h" #define wxHAS_NATIVE_STDPATHS - #elif defined(__OS2__) - #include "wx/os2/stdpaths.h" - #define wxHAS_NATIVE_STDPATHS #elif defined(__UNIX__) #include "wx/unix/stdpaths.h" #define wxHAS_NATIVE_STDPATHS diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 48e2130bf3..2a3c82b2e9 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -20,10 +20,6 @@ #include "typeinfo.h" #endif -#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 -# undef __BSEXCPT__ -#endif - #include class WXDLLIMPEXP_FWD_BASE wxString; diff --git a/include/wx/string.h b/include/wx/string.h index dd81c1cb86..7b4b7ce3e5 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -23,24 +23,15 @@ #include "wx/defs.h" // everybody should include this -#if defined(__WXMAC__) || defined(__VISAGECPP__) +#if defined(__WXMAC__) #include #endif -#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 - // problem in VACPP V4 with including stdlib.h multiple times - // strconv includes it anyway -# include -# include -# include -# include -#else -# include -# include -# include -# include -# include -#endif +#include +#include +#include +#include +#include #include "wx/wxcrtbase.h" // for wxChar, wxStrlen() etc. #include "wx/strvararg.h" diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 0795d08872..090782e8e6 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -787,8 +787,6 @@ protected: #include "wx/osx/textctrl.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/textctrl.h" -#elif defined(__WXPM__) - #include "wx/os2/textctrl.h" #endif // ---------------------------------------------------------------------------- diff --git a/include/wx/textentry.h b/include/wx/textentry.h index 2707afa203..ed4a0b0e34 100644 --- a/include/wx/textentry.h +++ b/include/wx/textentry.h @@ -319,8 +319,6 @@ private: #include "wx/msw/textentry.h" #elif defined(__WXMOTIF__) #include "wx/motif/textentry.h" -#elif defined(__WXPM__) - #include "wx/os2/textentry.h" #else // no platform-specific implementation of wxTextEntry yet class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h index 8fe11b77b3..3b7fcabcba 100644 --- a/include/wx/tglbtn.h +++ b/include/wx/tglbtn.h @@ -80,8 +80,6 @@ protected: #elif defined(__WXMAC__) #include "wx/osx/tglbtn.h" #define wxHAS_BITMAPTOGGLEBUTTON -#elif defined(__WXPM__) - #include "wx/os2/tglbtn.h" #endif // old wxEVT_COMMAND_* constants diff --git a/include/wx/thread.h b/include/wx/thread.h index eed295d70f..290325083f 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -277,7 +277,7 @@ private: wxCritSectBuffer m_buffer; }; -#endif // Unix&OS2/Win32 +#endif // Unix/Win32 wxDECLARE_NO_COPY_CLASS(wxCriticalSection); }; @@ -849,7 +849,7 @@ public: #if wxUSE_THREADS -#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__) || defined(__DARWIN__) +#if defined(__WINDOWS__) || defined(__DARWIN__) // unlock GUI if there are threads waiting for and lock it back when // there are no more of them - should be called periodically by the main // thread diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp index 000b24d589..b8d2eae7d9 100644 --- a/include/wx/thrimpl.cpp +++ b/include/wx/thrimpl.cpp @@ -75,7 +75,7 @@ wxMutexError wxMutex::Unlock() // variables and their events/event semaphores have quite different semantics, // so we reimplement the conditions from scratch using the mutexes and // semaphores -#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__) +#if defined(__WINDOWS__) class wxConditionInternal { @@ -222,7 +222,7 @@ wxCondError wxConditionInternal::Broadcast() return wxCOND_NO_ERROR; } -#endif // __WINDOWS__ || __OS2__ || __EMX__ +#endif // __WINDOWS__ // ---------------------------------------------------------------------------- // wxCondition diff --git a/include/wx/tls.h b/include/wx/tls.h index 76e93f6489..7c21958a4f 100644 --- a/include/wx/tls.h +++ b/include/wx/tls.h @@ -56,8 +56,6 @@ #if defined(__WINDOWS__) #include "wx/msw/tls.h" - #elif defined(__OS2__) - #include "wx/os2/tls.h" #elif defined(__UNIX__) #include "wx/unix/tls.h" #else diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h index 49a446e777..e14557b185 100644 --- a/include/wx/toolbar.h +++ b/include/wx/toolbar.h @@ -83,8 +83,6 @@ enum #include "wx/osx/toolbar.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/toolbar.h" - #elif defined(__WXPM__) - #include "wx/os2/toolbar.h" #endif #endif // wxUSE_TOOLBAR diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h index 0948e65eff..5070258c77 100644 --- a/include/wx/tooltip.h +++ b/include/wx/tooltip.h @@ -27,8 +27,6 @@ #include "wx/osx/tooltip.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/tooltip.h" -#elif defined(__WXPM__) -#include "wx/os2/tooltip.h" #endif #endif diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index e06d261679..cec7501ca2 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -372,9 +372,6 @@ protected: #elif defined(__WXCOCOA__) #include "wx/cocoa/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowCocoa -#elif defined(__WXPM__) - #include "wx/os2/toplevel.h" - #define wxTopLevelWindowNative wxTopLevelWindowOS2 #elif defined(__WXMOTIF__) #include "wx/motif/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowMotif diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h index 13df8ae557..c54a1582d2 100644 --- a/include/wx/treectrl.h +++ b/include/wx/treectrl.h @@ -468,8 +468,6 @@ private: #include "wx/generic/treectlg.h" #elif defined(__WXCOCOA__) #include "wx/generic/treectlg.h" -#elif defined(__WXPM__) - #include "wx/generic/treectlg.h" #endif #endif // wxUSE_TREECTRL diff --git a/include/wx/window.h b/include/wx/window.h index 4b067ac6c7..fd7b6630ad 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -54,7 +54,7 @@ // Otherwise wx itself must ensure that when the parent is disabled its // children are disabled too, and their initial state is restored when the // parent is enabled back. -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WXMSW__) // must do everything ourselves #undef wxHAS_NATIVE_ENABLED_MANAGEMENT #elif defined(__WXOSX__) @@ -1926,13 +1926,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size) #define wxWindowCocoa wxWindow #endif // wxUniv #include "wx/cocoa/window.h" -#elif defined(__WXPM__) - #ifdef __WXUNIVERSAL__ - #define wxWindowNative wxWindowOS2 - #else // !wxUniv - #define wxWindowOS2 wxWindow - #endif // wxUniv/!wxUniv - #include "wx/os2/window.h" #endif // for wxUniversal, we now derive the real wxWindow from wxWindow, diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index b6c5a82027..65253196d2 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -241,9 +241,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); /* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */ -#if defined(__BORLANDC__) || defined(__WATCOMC__) || \ - defined(__VISAGECPP__) || \ - defined(__EMX__) || defined(__DJGPP__) +#if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) #define wxCRT_StricmpA stricmp #define wxCRT_StrnicmpA strnicmp #elif defined(__SYMANTEC__) || (defined(__VISUALC__) && !defined(__WXWINCE__)) diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 2b50dff4b3..2e7983b263 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -15,7 +15,6 @@ // explicitly disabled by defining NOPCH #if defined(__VISUALC__) || \ defined(__DMC__) || \ - defined(__VISAGECPP__) || \ defined(__WATCOMC__) || \ defined(__BORLANDC__) @@ -49,11 +48,6 @@ #include "wx/msw/missing.h" #endif -// include -#ifdef __OS2__ -# include "wx/os2/private.h" -#endif - // include the most common wx headers #include "wx/wx.h" diff --git a/include/wx/xpmhand.h b/include/wx/xpmhand.h index 0952748d80..c7f8d0de20 100644 --- a/include/wx/xpmhand.h +++ b/include/wx/xpmhand.h @@ -11,14 +11,11 @@ #ifndef _WX_XPMHAND_H_BASE_ #define _WX_XPMHAND_H_BASE_ -// Only wxMSW and wxPM currently defines a separate XPM handler, since -// mostly Windows and Presentation Manager apps won't need XPMs. +// Only wxMSW currently defines a separate XPM handler, since +// mostly Windows apps won't need XPMs. #if defined(__WXMSW__) #error xpmhand.h is no longer needed since wxImage now handles XPMs. #endif -#if defined(__WXPM__) -#include "wx/os2/xpmhand.h" -#endif #endif // _WX_XPMHAND_H_BASE_ diff --git a/include/wx/xrc/xh_tglbtn.h b/include/wx/xrc/xh_tglbtn.h index 6c6c9a2cd3..cd68a91cfd 100644 --- a/include/wx/xrc/xh_tglbtn.h +++ b/include/wx/xrc/xh_tglbtn.h @@ -25,7 +25,7 @@ public: protected: virtual void DoCreateToggleButton(wxObject *control); -#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__)) +#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__)) virtual void DoCreateBitmapToggleButton(wxObject *control); #endif }; diff --git a/interface/wx/checkbox.h b/interface/wx/checkbox.h index 231ba84d9b..203928873c 100644 --- a/interface/wx/checkbox.h +++ b/interface/wx/checkbox.h @@ -50,8 +50,7 @@ enum wxCheckBoxState @style{wxCHK_2STATE} Create a 2-state checkbox. This is the default. @style{wxCHK_3STATE} - Create a 3-state checkbox. Not implemented in wxOS2 and - wxGTK built against GTK+ 1.2. + Create a 3-state checkbox. Not implemented in wxGTK1. @style{wxCHK_ALLOW_3RD_STATE_FOR_USER} By default a user can't set a 3-state checkbox to the third state. It can only be done from code. Using this flags allows the user to diff --git a/interface/wx/encconv.h b/interface/wx/encconv.h index 579f4fc1e7..37a5476161 100644 --- a/interface/wx/encconv.h +++ b/interface/wx/encconv.h @@ -112,7 +112,6 @@ public: Supported platforms: @li wxPLATFORM_UNIX @li wxPLATFORM_WINDOWS - @li wxPLATFORM_OS2 @li wxPLATFORM_MAC @li wxPLATFORM_CURRENT diff --git a/interface/wx/event.h b/interface/wx/event.h index 1403f8e6a4..6d249a01fc 100644 --- a/interface/wx/event.h +++ b/interface/wx/event.h @@ -2247,7 +2247,7 @@ public: not sent when the window is restored to its original size after it had been maximized, only a normal wxSizeEvent is generated in this case. - Currently this event is only generated in wxMSW, wxGTK, wxOSX/Cocoa and wxOS2 + Currently this event is only generated in wxMSW, wxGTK and wxOSX/Cocoa ports so portable programs should only rely on receiving @c wxEVT_SIZE and not necessarily this event when the window is maximized. @@ -4172,7 +4172,7 @@ public: Notice that the event is not triggered when the application is iconized (minimized) or restored under wxMSW. - @onlyfor{wxmsw,wxgtk,wxos2} + @onlyfor{wxmsw,wxgtk} @beginEventTable{wxShowEvent} @event{EVT_SHOW(func)} diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h index 4cd2fd34e7..ca3ad06685 100644 --- a/interface/wx/gdicmn.h +++ b/interface/wx/gdicmn.h @@ -1039,7 +1039,7 @@ const wxSize wxDefaultSize; /** This macro loads a bitmap from either application resources (on the - platforms for which they exist, i.e. Windows and OS2) or from an XPM file. + platforms for which they exist, i.e.\ Windows) or from an XPM file. This can help to avoid using @ifdef_ when creating bitmaps. @see @ref overview_bitmap, wxICON() @@ -1117,7 +1117,7 @@ const wxSize wxDefaultSize; /** This macro loads an icon from either application resources (on the - platforms for which they exist, i.e. Windows and OS2) or from an XPM file. + platforms for which they exist, i.e.\ Windows) or from an XPM file. This can help to avoid using @ifdef_ when creating icons. @see @ref overview_bitmap, wxBITMAP() diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h index e1399737ad..5b5eacddd3 100644 --- a/interface/wx/listctrl.h +++ b/interface/wx/listctrl.h @@ -45,11 +45,6 @@ #define wxLIST_STATE_FOCUSED 0x0002 #define wxLIST_STATE_SELECTED 0x0004 #define wxLIST_STATE_CUT 0x0008 // MSW only -#define wxLIST_STATE_DISABLED 0x0010 // OS2 only -#define wxLIST_STATE_FILTERED 0x0020 // OS2 only -#define wxLIST_STATE_INUSE 0x0040 // OS2 only -#define wxLIST_STATE_PICKED 0x0080 // OS2 only -#define wxLIST_STATE_SOURCE 0x0100 // OS2 only /// Hit test flags, used in HitTest #define wxLIST_HITTEST_ABOVE 0x0001 // Above the client area. diff --git a/interface/wx/stdpaths.h b/interface/wx/stdpaths.h index 2c49a2f574..4935ffd0e6 100644 --- a/interface/wx/stdpaths.h +++ b/interface/wx/stdpaths.h @@ -167,7 +167,7 @@ public: @note This function is only available under Unix platforms (but not limited to wxGTK mentioned below). - @onlyfor{wxos2,wxgtk} + @onlyfor{wxgtk} */ wxString GetInstallPrefix() const; @@ -340,7 +340,7 @@ public: @note This function is only available under Unix platforms (but not limited to wxGTK mentioned below). - @onlyfor{wxos2,wxgtk} + @onlyfor{wxgtk} */ void SetInstallPrefix(const wxString& prefix); diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc index f8892c439c..942b9f988b 100644 --- a/misc/schema/xrc_schema.rnc +++ b/misc/schema/xrc_schema.rnc @@ -401,7 +401,7 @@ stdWindowProperties = platform = attribute platform { - xsd:string { pattern = "(win|mac|unix|os2)( *\| *(win|mac|unix|os2))*" } + xsd:string { pattern = "(win|mac|unix)( *\| *(win|mac|unix))*" } }? # shorthand alias for 'platform' for use in properties definitions and # elsewhere where 'platform' would be too verbose diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 24ef89dab4..8064f12bf5 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -49,7 +49,6 @@ ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ $(__accesstest___win32rc) \ - $(__accesstest_os2_lib_res) \ accesstest_accesstest.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd = $(NM) accesstest$(EXEEXT) \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_sample_rc.o -@COND_PLATFORM_OS2_1@__accesstest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__accesstest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = accesstest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__accesstest_bundle___depname = accesstest_bundle diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index da25d00325..43e0d2d891 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -49,7 +49,6 @@ ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) ANITEST_OBJECTS = \ - $(__anitest_os2_lib_res) \ anitest_anitest.o \ $(__anitest___win32rc) @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__anitest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__anitest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__anitest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = anitest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__anitest_bundle___depname = anitest_bundle diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index d70d9cd71a..3e4a0be150 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -49,7 +49,6 @@ ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = \ $(__arttest___win32rc) \ - $(__arttest_os2_lib_res) \ arttest_arttest.o \ arttest_artbrows.o @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd = $(NM) arttest$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__arttest___win32rc = arttest_sample_rc.o -@COND_PLATFORM_OS2_1@__arttest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__arttest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = arttest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__arttest_bundle___depname = arttest_bundle diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index 8fd37d0078..59f28be746 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -51,7 +51,6 @@ AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) AUIDEMO_OBJECTS = \ $(__auidemo___win32rc) \ - $(__auidemo_os2_lib_res) \ auidemo_auidemo.o ### Conditionally set variables: ### @@ -91,8 +90,6 @@ COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__auidemo___win32rc = auidemo_sample_rc.o -@COND_PLATFORM_OS2_1@__auidemo_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__auidemo_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = auidemo.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__auidemo_bundle___depname = auidemo_bundle diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 5103e1512b..f47c39d137 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -50,7 +50,6 @@ CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = \ $(__calendar___win32rc) \ - $(__calendar_os2_lib_res) \ calendar_calendar.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar_sample_rc.o -@COND_PLATFORM_OS2_1@__calendar_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__calendar_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = calendar.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__calendar_bundle___depname = calendar_bundle diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 50080c66d4..856f0a9b4c 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -49,7 +49,6 @@ CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ $(__caret___win32rc) \ - $(__caret_os2_lib_res) \ caret_caret.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__caret___win32rc = caret_sample_rc.o -@COND_PLATFORM_OS2_1@__caret_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__caret_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = caret.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__caret_bundle___depname = caret_bundle diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in index ed263c16ef..d54d247b5a 100644 --- a/samples/clipboard/Makefile.in +++ b/samples/clipboard/Makefile.in @@ -49,7 +49,6 @@ CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) CLIPBOARD_OBJECTS = \ $(__clipboard___win32rc) \ - $(__clipboard_os2_lib_res) \ clipboard_clipboard.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd = $(NM) clipboard$(EXEEXT) | \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__clipboard___win32rc = clipboard_sample_rc.o -@COND_PLATFORM_OS2_1@__clipboard_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__clipboard_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = clipboard.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__clipboard_bundle___depname = clipboard_bundle diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index 637db9fd8b..d5c3075be0 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -49,7 +49,6 @@ COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) COLLPANE_OBJECTS = \ - $(__collpane_os2_lib_res) \ collpane_collpane.o \ $(__collpane___win32rc) @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd = $(NM) collpane$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__collpane___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__collpane_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__collpane_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = collpane.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__collpane_bundle___depname = collpane_bundle diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 9608ffe1d3..a6bd7a3987 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -50,7 +50,6 @@ COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) COMBO_OBJECTS = \ $(__combo___win32rc) \ - $(__combo_os2_lib_res) \ combo_combo.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___combo___os2_emxbindcmd = $(NM) combo$(EXEEXT) | if grep -q @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__combo___win32rc = combo_sample_rc.o -@COND_PLATFORM_OS2_1@__combo_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__combo_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = combo.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__combo_bundle___depname = combo_bundle diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 3c227830bf..0939a777c0 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -49,7 +49,6 @@ CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ $(__conftest___win32rc) \ - $(__conftest_os2_lib_res) \ conftest_conftest.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_sample_rc.o -@COND_PLATFORM_OS2_1@__conftest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = conftest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 1c1ec7fcb6..7e16fb1a4f 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -48,7 +48,6 @@ CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = \ - $(__controls_os2_lib_res) \ controls_controls.o \ $(__controls___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___controls___os2_emxbindcmd = $(NM) controls$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__controls___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___controls___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__controls_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__controls_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = controls.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__controls_bundle___depname = controls_bundle diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index 9268a70842..f7a9bcdfdb 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -49,7 +49,6 @@ DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) DATAVIEW_OBJECTS = \ - $(__dataview_os2_lib_res) \ dataview_dataview.o \ dataview_mymodels.o \ $(__dataview___win32rc) @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd = $(NM) dataview$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__dataview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__dataview_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__dataview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = dataview.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__dataview_bundle___depname = dataview_bundle diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 1ee8fca2dd..826dca5650 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -49,7 +49,6 @@ DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) DEBUGRPT_OBJECTS = \ $(__debugrpt___win32rc) \ - $(__debugrpt_os2_lib_res) \ debugrpt_debugrpt.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd = $(NM) debugrpt$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__debugrpt___win32rc = debugrpt_sample_rc.o -@COND_PLATFORM_OS2_1@__debugrpt_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__debugrpt_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = debugrpt.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__debugrpt_bundle___depname = debugrpt_bundle diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 5cd3d8e3f4..f94839c0b9 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -50,7 +50,6 @@ DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = \ $(__dialogs___win32rc) \ - $(__dialogs_os2_lib_res) \ dialogs_dialogs.o \ $(__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS) @@ -91,8 +90,6 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_sample_rc.o -@COND_PLATFORM_OS2_1@__dialogs_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__dialogs_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = dialogs.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__dialogs_bundle___depname = dialogs_bundle diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index 374af2a09a..e8e1703ea8 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -64,12 +64,6 @@ of MSW, MAC and OS2 #define USE_WXGTK 0 #endif -#ifdef __WXPM__ - #define USE_WXPM 1 -#else - #define USE_WXPM 0 -#endif - #define USE_GENERIC_DIALOGS (!USE_WXUNIVERSAL && !USE_DLL) #define USE_COLOURDLG_GENERIC \ @@ -77,10 +71,10 @@ of MSW, MAC and OS2 #define USE_DIRDLG_GENERIC \ ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG) #define USE_FILEDLG_GENERIC \ - ((((USE_WXMSW || USE_WXMAC || USE_WXPM || USE_WXGTK) \ + ((((USE_WXMSW || USE_WXMAC || USE_WXGTK) \ && USE_GENERIC_DIALOGS) || USE_WXWINCE) && wxUSE_FILEDLG) #define USE_FONTDLG_GENERIC \ - ((USE_WXMSW || USE_WXMACFONTDLG || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG) + ((USE_WXMSW || USE_WXMACFONTDLG) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG) // Turn USE_MODAL_PRESENTATION to 0 if there is any reason for not presenting difference // between modal and modeless dialogs (ie. not implemented it in your port yet) diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 405afbd3e2..5310658909 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -49,7 +49,6 @@ NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ $(__nettest___win32rc) \ - $(__nettest_os2_lib_res) \ nettest_nettest.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_sample_rc.o -@COND_PLATFORM_OS2_1@__nettest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ = nettest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_bundle___depname \ diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index b0a4eddb6e..4c8a18aa25 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -49,7 +49,6 @@ DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = \ $(__display___win32rc) \ - $(__display_os2_lib_res) \ display_display.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o -@COND_PLATFORM_OS2_1@__display_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__display_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = display.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in index 262e24d49a..ca2673b6ee 100644 --- a/samples/dll/Makefile.in +++ b/samples/dll/Makefile.in @@ -61,7 +61,6 @@ WX_EXE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) WX_EXE_OBJECTS = \ $(__wx_exe___win32rc) \ - $(__wx_exe_os2_lib_res) \ wx_exe_wx_exe.o SDK_EXE_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) SDK_EXE_OBJECTS = \ @@ -103,8 +102,6 @@ COND_PLATFORM_OS2_1___wx_exe___os2_emxbindcmd = $(NM) wx_exe$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wx_exe___win32rc = wx_exe_sample_rc.o -@COND_PLATFORM_OS2_1@__wx_exe_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@__wx_exe_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@ = \ @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@ wx_exe.app/Contents/PkgInfo diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index d413584a29..6c6eec0360 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -48,7 +48,6 @@ DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = \ - $(__dnd_os2_lib_res) \ dnd_dnd.o \ $(__dnd___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd = $(NM) dnd$(EXEEXT) | if grep -q \ @COND_PLATFORM_OS2_1@__dnd___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__dnd_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__dnd_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = dnd.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__dnd_bundle___depname = dnd_bundle diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 9527b878ee..76307785da 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -48,7 +48,6 @@ DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ - $(__docview_os2_lib_res) \ docview_docview.o \ docview_doc.o \ docview_view.o \ @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__docview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___docview___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__docview_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__docview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = docview.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index f833f4880b..d9aa8de4bd 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -48,7 +48,6 @@ DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = \ - $(__dragimag_os2_lib_res) \ dragimag_dragimag.o \ $(__dragimag___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd = $(NM) dragimag$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__dragimag___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__dragimag_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__dragimag_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = dragimag.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__dragimag_bundle___depname = dragimag_bundle diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 4b73215266..a7587bdfe7 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -49,7 +49,6 @@ DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = \ $(__drawing___win32rc) \ - $(__drawing_os2_lib_res) \ drawing_drawing.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd = $(NM) drawing$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_sample_rc.o -@COND_PLATFORM_OS2_1@__drawing_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__drawing_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = drawing.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__drawing_bundle___depname = drawing_bundle diff --git a/samples/erase/Erase.icc b/samples/erase/Erase.icc deleted file mode 100644 index 8d2e7c0500..0000000000 --- a/samples/erase/Erase.icc +++ /dev/null @@ -1,17 +0,0 @@ -option ProjectOptions = gen(arch, "pentium2"), gen(manglelinkagekeywordonlyfuncs, "no"), lang(longlong, "yes"), lang(allowtypedefasclassname, "yes"), - lang(compatmath, "yes"), lang(nokeyword, "const_cast"), lang(nokeyword, "explicit"), lang(nokeyword, "export"), lang(nokeyword, "false"), - lang(nokeyword, "mutable"), lang(nokeyword, "true"), lang(nokeyword, "typename"), lang(templatedefimpls, "dontparse"), - lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"), link(debug, "yes"), link(linkwithmultithreadlib, "yes"), - link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(defaultlibsname, "..\\..\\LIB\\wx40.lib"), - link(defaultlibsname, "..\\..\\LIB\\os2png.lib"), link(defaultlibsname, "..\\..\\LIB\\os2zlib.lib"), - link(defaultlibsname, "NETAPI32.LIB"), link(defaultlibsname, "UPM32.LIB"), link(defaultlibsname, "..\\..\\LIB\\dummy.obj"), - link(extdictionary, "no"), opt(inline, "yes"), opt(tune, "pentium2"), define("__WXPM__", ), define("__VISAGECPP__", ), - incl(searchpath, "..\\..\\src\\png"), incl(searchpath, "..\\..\\src\\jpeg"), incl(searchpath, "..\\..\\src\\xpm"), - incl(searchpath, "..\\..\\src\\zlib"), incl(searchpath, "..\\..\\Include"), macros(redefine, "yes") -{ - target "Erase.exe" - { - source type(cpp) "ERASE.CPP" - source type(rc) "ERASE.RCO" - } -} diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 0a433bdbc3..50627254f4 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -49,7 +49,6 @@ ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = \ $(__erase___win32rc) \ - $(__erase_os2_lib_res) \ erase_erase.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__erase___win32rc = erase_sample_rc.o -@COND_PLATFORM_OS2_1@__erase_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__erase_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = erase.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__erase_bundle___depname = erase_bundle diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 034eb8ae8a..b0c7a840e3 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -49,7 +49,6 @@ EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = \ $(__event___win32rc) \ - $(__event_os2_lib_res) \ event_event.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___event___os2_emxbindcmd = $(NM) event$(EXEEXT) | if grep -q @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__event___win32rc = event_sample_rc.o -@COND_PLATFORM_OS2_1@__event_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__event_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = event.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__event_bundle___depname = event_bundle diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 27522f67a5..75108bc57e 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -49,7 +49,6 @@ EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = \ $(__except___win32rc) \ - $(__except_os2_lib_res) \ except_except.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___except___os2_emxbindcmd = $(NM) except$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__except___win32rc = except_sample_rc.o -@COND_PLATFORM_OS2_1@__except_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__except_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = except.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__except_bundle___depname = except_bundle diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index c31c97626f..c16f383df5 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -49,7 +49,6 @@ EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ $(__exec___win32rc) \ - $(__exec_os2_lib_res) \ exec_exec.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__exec___win32rc = exec_sample_rc.o -@COND_PLATFORM_OS2_1@__exec_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__exec_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = exec.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__exec_bundle___depname = exec_bundle diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index ecf84cc0dd..60a27865de 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -49,7 +49,6 @@ FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ $(__font___win32rc) \ - $(__font_os2_lib_res) \ font_font.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__font___win32rc = font_sample_rc.o -@COND_PLATFORM_OS2_1@__font_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__font_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = font.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__font_bundle___depname = font_bundle diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in index 10fad66760..27357f028a 100644 --- a/samples/fswatcher/Makefile.in +++ b/samples/fswatcher/Makefile.in @@ -49,7 +49,6 @@ FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) FSWATCHER_OBJECTS = \ $(__fswatcher___win32rc) \ - $(__fswatcher_os2_lib_res) \ fswatcher_fswatcher.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___fswatcher___os2_emxbindcmd = $(NM) fswatcher$(EXEEXT) | \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__fswatcher___win32rc = fswatcher_sample_rc.o -@COND_PLATFORM_OS2_1@__fswatcher_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__fswatcher_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = fswatcher.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__fswatcher_bundle___depname = fswatcher_bundle diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 7081042821..9de1704bba 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -50,7 +50,6 @@ GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = \ $(__grid___win32rc) \ - $(__grid_os2_lib_res) \ grid_griddemo.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__grid___win32rc = grid_sample_rc.o -@COND_PLATFORM_OS2_1@__grid_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__grid_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = grid.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__grid_bundle___depname = grid_bundle diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 9a728de50b..72ff3ce8ec 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -51,7 +51,6 @@ HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(__help___win32rc) \ - $(__help_os2_lib_res) \ help_demo.o ### Conditionally set variables: ### @@ -91,8 +90,6 @@ COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__help___win32rc = help_sample_rc.o -@COND_PLATFORM_OS2_1@__help_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__help_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = help.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index eb16986a5a..62425cf658 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -50,7 +50,6 @@ HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = \ $(__htlbox___win32rc) \ - $(__htlbox_os2_lib_res) \ htlbox_htlbox.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd = $(NM) htlbox$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_sample_rc.o -@COND_PLATFORM_OS2_1@__htlbox_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__htlbox_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = htlbox.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__htlbox_bundle___depname = htlbox_bundle diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index f1a369d762..672f50dfec 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -50,7 +50,6 @@ ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = \ $(__about___win32rc) \ - $(__about_os2_lib_res) \ about_about.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__about___win32rc = about_sample_rc.o -@COND_PLATFORM_OS2_1@__about_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__about_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = about.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__about_bundle___depname = about_bundle diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index cb68ad1212..c7f3729e42 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -50,7 +50,6 @@ HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) HTMLHELP_OBJECTS = \ $(__htmlhelp___win32rc) \ - $(__htmlhelp_os2_lib_res) \ htmlhelp_help.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htmlhelp___win32rc = htmlhelp_sample_rc.o -@COND_PLATFORM_OS2_1@__htmlhelp_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__htmlhelp_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = htmlhelp.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__htmlhelp_bundle___depname = htmlhelp_bundle diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 014e332aa4..1b26ed8625 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -50,7 +50,6 @@ HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(__helpview___win32rc) \ - $(__helpview_os2_lib_res) \ helpview_helpview.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_sample_rc.o -@COND_PLATFORM_OS2_1@__helpview_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__helpview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = helpview.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__helpview_bundle___depname = helpview_bundle diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index 35c58dd099..6ed19cd614 100644 --- a/samples/html/htmlctrl/Makefile.in +++ b/samples/html/htmlctrl/Makefile.in @@ -49,7 +49,6 @@ HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) HTMLCTRL_OBJECTS = \ $(__htmlctrl___win32rc) \ - $(__htmlctrl_os2_lib_res) \ htmlctrl_htmlctrl.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___htmlctrl___os2_emxbindcmd = $(NM) htmlctrl$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htmlctrl___win32rc = htmlctrl_sample_rc.o -@COND_PLATFORM_OS2_1@__htmlctrl_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__htmlctrl_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = htmlctrl.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__htmlctrl_bundle___depname = htmlctrl_bundle diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index c350aa33cb..a558a7aa9a 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -50,7 +50,6 @@ HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) HTMLPRINTING_OBJECTS = \ $(__htmlprinting___win32rc) \ - $(__htmlprinting_os2_lib_res) \ htmlprinting_printing.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd = $(NM) \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htmlprinting___win32rc = htmlprinting_sample_rc.o -@COND_PLATFORM_OS2_1@__htmlprinting_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__htmlprinting_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = htmlprinting.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__htmlprinting_bundle___depname \ diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 3cba603d2e..1408a4a0da 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -50,7 +50,6 @@ TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(__test___win32rc) \ - $(__test_os2_lib_res) \ test_test.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o -@COND_PLATFORM_OS2_1@__test_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__test_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = test.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 27cfee1944..4564464d78 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -50,7 +50,6 @@ VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ $(__virtual___win32rc) \ - $(__virtual_os2_lib_res) \ virtual_virtual.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_sample_rc.o -@COND_PLATFORM_OS2_1@__virtual_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__virtual_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = virtual.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__virtual_bundle___depname = virtual_bundle diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 482b7cb418..9c5f0cf753 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -50,7 +50,6 @@ WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = \ $(__widget___win32rc) \ - $(__widget_os2_lib_res) \ widget_widget.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__widget___win32rc = widget_sample_rc.o -@COND_PLATFORM_OS2_1@__widget_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__widget_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = widget.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__widget_bundle___depname = widget_bundle diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 73108af090..0631bb93ab 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -50,7 +50,6 @@ ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = \ $(__zip___win32rc) \ - $(__zip_os2_lib_res) \ zip_zip.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__zip___win32rc = zip_sample_rc.o -@COND_PLATFORM_OS2_1@__zip_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__zip_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = zip.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__zip_bundle___depname = zip_bundle diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index b7a18d07f8..b8725a9cde 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -48,7 +48,6 @@ IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ - $(__image_os2_lib_res) \ image_image.o \ image_canvas.o \ $(__image___win32rc) @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q @COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__image_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__image_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = image.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 1dfa59418b..38eac2217f 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -49,7 +49,6 @@ INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = \ $(__internat___win32rc) \ - $(__internat_os2_lib_res) \ internat_internat.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__internat___win32rc = internat_sample_rc.o -@COND_PLATFORM_OS2_1@__internat_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__internat_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = internat.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 18ca3e8259..8cd8e35019 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -49,7 +49,6 @@ IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) IPCCLIENT_OBJECTS = \ $(__ipcclient___win32rc) \ - $(__ipc) \ ipcclient_client.o IPCSERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -57,7 +56,6 @@ IPCSERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) IPCSERVER_OBJECTS = \ $(__ipcserver___win32rc) \ - $(__ipc) \ ipcserver_server.o BASEIPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -147,7 +145,6 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \ @COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__ipc = $(top_srcdir)/include/wx/os2/wx.res COND_MONOLITHIC_0___WXLIB_CORE_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 9576f0d57e..93179b0fbd 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -50,7 +50,6 @@ JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = \ $(__joytest___win32rc) \ - $(__joytest_os2_lib_res) \ joytest_joytest.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd = $(NM) joytest$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_sample_rc.o -@COND_PLATFORM_OS2_1@__joytest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__joytest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = joytest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__joytest_bundle___depname = joytest_bundle diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index a5d20c760d..17fa7b682e 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -49,7 +49,6 @@ KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = \ $(__keyboard___win32rc) \ - $(__keyboard_os2_lib_res) \ keyboard_keyboard.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard_sample_rc.o -@COND_PLATFORM_OS2_1@__keyboard_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__keyboard_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = keyboard.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__keyboard_bundle___depname = keyboard_bundle diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index c4cc951c5d..6d517d7f7b 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -49,7 +49,6 @@ LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = \ $(__layout___win32rc) \ - $(__layout_os2_lib_res) \ layout_layout.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__layout___win32rc = layout_sample_rc.o -@COND_PLATFORM_OS2_1@__layout_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__layout_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = layout.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__layout_bundle___depname = layout_bundle diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index c7c9464c28..992e37d49f 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -48,7 +48,6 @@ LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = \ - $(__listctrl_os2_lib_res) \ listctrl_listtest.o \ $(__listctrl___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd = $(NM) listctrl$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__listctrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__listctrl_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__listctrl_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = listctrl.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__listctrl_bundle___depname = listctrl_bundle diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h index ddc095cef7..2e49793c35 100644 --- a/samples/listctrl/listtest.h +++ b/samples/listctrl/listtest.h @@ -10,7 +10,7 @@ // not all ports have support for EVT_CONTEXT_MENU yet, don't define // USE_CONTEXT_MENU for those which don't -#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__) +#if defined(__WXMOTIF__) || defined(__WXX11__) #define USE_CONTEXT_MENU 0 #else #define USE_CONTEXT_MENU 1 diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 29a6eb60ba..b473715a70 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -48,7 +48,6 @@ MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = \ - $(__mdi_os2_lib_res) \ mdi_mdi.o \ $(__mdi___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd = $(NM) mdi$(EXEEXT) | if grep -q \ @COND_PLATFORM_OS2_1@__mdi___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__mdi_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__mdi_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = mdi.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__mdi_bundle___depname = mdi_bundle diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index 4c43c97e87..7831c36c97 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -50,7 +50,6 @@ MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) MEDIAPLAYER_OBJECTS = \ $(__mediaplayer___win32rc) \ - $(__mediaplayer_os2_lib_res) \ mediaplayer_mediaplayer.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__mediaplayer___win32rc = mediaplayer_sample_rc.o -@COND_PLATFORM_OS2_1@__mediaplayer_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__mediaplayer_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = mediaplayer.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__mediaplayer_bundle___depname = mediaplayer_bundle diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index de7b295d8d..9c35212985 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -49,7 +49,6 @@ MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = \ $(__memcheck___win32rc) \ - $(__memcheck_os2_lib_res) \ memcheck_memcheck.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd = $(NM) memcheck$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_sample_rc.o -@COND_PLATFORM_OS2_1@__memcheck_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__memcheck_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = memcheck.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__memcheck_bundle___depname = memcheck_bundle diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 4cea0e7fcb..df96ebacd9 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -49,7 +49,6 @@ MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = \ $(__menu___win32rc) \ - $(__menu_os2_lib_res) \ menu_menu.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_sample_rc.o -@COND_PLATFORM_OS2_1@__menu_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__menu_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = menu.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 7707b7473b..f02168fbf8 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -40,7 +40,7 @@ // not all ports have support for EVT_CONTEXT_MENU yet, don't define // USE_CONTEXT_MENU for those which don't -#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__) +#if defined(__WXMOTIF__) || defined(__WXX11__) #define USE_CONTEXT_MENU 0 #else #define USE_CONTEXT_MENU 1 diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index f335b306e0..0b1baac537 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -49,7 +49,6 @@ MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = \ $(__minimal___win32rc) \ - $(__minimal_os2_lib_res) \ minimal_minimal.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o -@COND_PLATFORM_OS2_1@__minimal_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__minimal_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = minimal.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__minimal_bundle___depname = minimal_bundle diff --git a/samples/minimal/Minimal.icc b/samples/minimal/Minimal.icc deleted file mode 100644 index f3c9428ede..0000000000 --- a/samples/minimal/Minimal.icc +++ /dev/null @@ -1,17 +0,0 @@ -option ProjectOptions = gen(arch, "pentium2"), gen(manglelinkagekeywordonlyfuncs, "no"), lang(longlong, "yes"), lang(allowtypedefasclassname, "yes"), - lang(compatmath, "yes"), lang(nokeyword, "const_cast"), lang(nokeyword, "explicit"), lang(nokeyword, "export"), lang(nokeyword, "false"), - lang(nokeyword, "mutable"), lang(nokeyword, "true"), lang(nokeyword, "typename"), lang(templatedefimpls, "dontparse"), - lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"), link(debug, "yes"), link(linkwithmultithreadlib, "yes"), - link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(defaultlibsname, "..\\..\\LIB\\wx40.lib"), - link(defaultlibsname, "..\\..\\LIB\\os2png.lib"), link(defaultlibsname, "..\\..\\LIB\\os2zlib.lib"), - link(defaultlibsname, "NETAPI32.LIB"), link(defaultlibsname, "UPM32.LIB"), link(defaultlibsname, "..\\..\\LIB\\dummy.obj"), - link(extdictionary, "no"), opt(inline, "yes"), opt(tune, "pentium2"), define("__WXPM__", ), define("__VISAGECPP__", ), - incl(searchpath, "..\\..\\src\\png"), incl(searchpath, "..\\..\\src\\jpeg"), incl(searchpath, "..\\..\\src\\xpm"), - incl(searchpath, "..\\..\\src\\zlib"), incl(searchpath, "..\\..\\Include"), macros(redefine, "yes") -{ - target "Minimal.exe" - { - source type(cpp) "MINIMAL.CPP" - source type(rc) "MINIMAL.RCO" - } -} diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index 4981b72bad..59789063fc 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -48,7 +48,6 @@ NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = \ - $(__nativdlg_os2_lib_res) \ nativdlg_nativdlg.o \ $(__nativdlg___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___nativdlg___os2_emxbindcmd = $(NM) nativdlg$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__nativdlg___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nativdlg___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__nativdlg_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__nativdlg_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = nativdlg.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__nativdlg_bundle___depname = nativdlg_bundle diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp index 147d1f43ed..47442b4b9b 100644 --- a/samples/nativdlg/nativdlg.cpp +++ b/samples/nativdlg/nativdlg.cpp @@ -90,7 +90,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) { -#if ( defined(__WXPM__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__) +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) MyDialog dialog; if (dialog.LoadNativeDialog(this, wxT("dialog1"))) { diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 4c524f0aff..dfbdec8f2e 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -50,7 +50,6 @@ NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = \ $(__notebook___win32rc) \ - $(__notebook_os2_lib_res) \ notebook_notebook.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd = $(NM) notebook$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_sample_rc.o -@COND_PLATFORM_OS2_1@__notebook_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__notebook_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = notebook.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__notebook_bundle___depname = notebook_bundle diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index d8a832b7d9..bf3ab87324 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -49,7 +49,6 @@ OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = \ $(__oleauto___win32rc) \ - $(__oleauto_os2_lib_res) \ oleauto_oleauto.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd = $(NM) oleauto$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_sample_rc.o -@COND_PLATFORM_OS2_1@__oleauto_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__oleauto_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = oleauto.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__oleauto_bundle___depname = oleauto_bundle diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index f10d11c4ae..aed5435aea 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -50,7 +50,6 @@ CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) CUBE_OBJECTS = \ $(__cube___win32rc) \ - $(__cube_os2_lib_res) \ cube_cube.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__cube___win32rc = cube_sample_rc.o -@COND_PLATFORM_OS2_1@__cube_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ = cube.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_bundle___depname = cube_bundle diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index fc5459a7ed..a86b27bfb0 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -50,7 +50,6 @@ ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = \ $(__isosurf___win32rc) \ - $(__isosurf_os2_lib_res) \ isosurf_isosurf.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o -@COND_PLATFORM_OS2_1@__isosurf_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__isosurf_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ = isosurf.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__isosurf_bundle___depname \ diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index c780e3b602..aee855843a 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -56,7 +56,6 @@ PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = \ $(__penguin___win32rc) \ - $(__penguin_os2_lib_res) \ penguin_penguin.o \ penguin_dxfrenderer.o \ penguin_trackball.o @@ -100,8 +99,6 @@ COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__penguin___win32rc = penguin_sample_rc.o -@COND_PLATFORM_OS2_1@__penguin_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__penguin_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ = penguin.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__penguin_bundle___depname \ diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index 7ab3faccf4..e06a11524d 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -48,7 +48,6 @@ OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = \ - $(__ownerdrw_os2_lib_res) \ ownerdrw_ownerdrw.o \ $(__ownerdrw___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___ownerdrw___os2_emxbindcmd = $(NM) ownerdrw$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__ownerdrw___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ownerdrw___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__ownerdrw_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__ownerdrw_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = ownerdrw.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__ownerdrw_bundle___depname = ownerdrw_bundle diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index 58f9f23bdd..c1e8a49b65 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -48,7 +48,6 @@ POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) POPUP_OBJECTS = \ - $(__popup_os2_lib_res) \ popup_popup.o \ $(__popup___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___popup___os2_emxbindcmd = $(NM) popup$(EXEEXT) | if grep -q @COND_PLATFORM_OS2_1@__popup___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___popup___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__popup_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__popup_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = popup.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__popup_bundle___depname = popup_bundle diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index a052f1f678..cb06d213e3 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -49,7 +49,6 @@ POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) POWER_OBJECTS = \ $(__power___win32rc) \ - $(__power_os2_lib_res) \ power_power.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___power___os2_emxbindcmd = $(NM) power$(EXEEXT) | if grep -q @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__power___win32rc = power_sample_rc.o -@COND_PLATFORM_OS2_1@__power_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__power_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = power.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__power_bundle___depname = power_bundle diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in index fb12b8aece..105dc3e68c 100644 --- a/samples/preferences/Makefile.in +++ b/samples/preferences/Makefile.in @@ -49,7 +49,6 @@ PREFERENCES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) PREFERENCES_OBJECTS = \ $(__preferences___win32rc) \ - $(__preferences_os2_lib_res) \ preferences_preferences.o ### Conditionally set variables: ### @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___preferences___os2_emxbindcmd = $(NM) \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__preferences___win32rc = preferences_sample_rc.o -@COND_PLATFORM_OS2_1@__preferences_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__preferences_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = preferences.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__preferences_bundle___depname = preferences_bundle diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 996bd44783..f16327254c 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -49,7 +49,6 @@ PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(__printing___win32rc) \ - $(__printing_os2_lib_res) \ printing_printing.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___printing___os2_emxbindcmd = $(NM) printing$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_sample_rc.o -@COND_PLATFORM_OS2_1@__printing_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__printing_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = printing.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__printing_bundle___depname = printing_bundle diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in index ef300e619d..e6aad86b30 100644 --- a/samples/propgrid/Makefile.in +++ b/samples/propgrid/Makefile.in @@ -49,7 +49,6 @@ PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) PROPGRID_OBJECTS = \ - $(__propgrid_os2_lib_res) \ propgrid_propgrid.o \ propgrid_propgrid_minimal.o \ propgrid_sampleprops.o \ @@ -92,8 +91,6 @@ COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd = $(NM) propgrid$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__propgrid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__propgrid_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__propgrid_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = propgrid.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__propgrid_bundle___depname = propgrid_bundle diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 92324b85de..e497f79fd3 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -48,7 +48,6 @@ REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = \ - $(__regtest_os2_lib_res) \ regtest_regtest.o \ $(__regtest___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd = $(NM) regtest$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__regtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__regtest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__regtest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = regtest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__regtest_bundle___depname = regtest_bundle diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 53acf8716b..a09fb6b5af 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -60,7 +60,6 @@ RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) RENDER_OBJECTS = \ $(__render___win32rc) \ - $(__render_os2_lib_res) \ render_render.o RENDDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -109,8 +108,6 @@ COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__render___win32rc = render_sample_rc.o -@COND_PLATFORM_OS2_1@__render_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__render_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = render.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__render_bundle___depname = render_bundle diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in index 717203afc5..7397283139 100644 --- a/samples/ribbon/Makefile.in +++ b/samples/ribbon/Makefile.in @@ -49,7 +49,6 @@ RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) RIBBON_OBJECTS = \ - $(__ribbon_os2_lib_res) \ ribbon_ribbondemo.o \ $(__ribbon___win32rc) @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___ribbon___os2_emxbindcmd = $(NM) ribbon$(EXEEXT) | if grep @COND_PLATFORM_OS2_1@__ribbon___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ribbon___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__ribbon_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__ribbon_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = ribbon.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__ribbon_bundle___depname = ribbon_bundle diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in index 44a4f58194..6eff46bc82 100644 --- a/samples/richtext/Makefile.in +++ b/samples/richtext/Makefile.in @@ -50,7 +50,6 @@ RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) RICHTEXT_OBJECTS = \ - $(__richtext_os2_lib_res) \ richtext_richtext.o \ $(__richtext___win32rc) @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd = $(NM) richtext$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__richtext___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__richtext_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__richtext_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = richtext.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__richtext_bundle___depname = richtext_bundle diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 1f98e45d08..40d610c335 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -49,7 +49,6 @@ SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = \ - $(__sashtest_os2_lib_res) \ sashtest_sashtest.o \ $(__sashtest___win32rc) @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___sashtest___os2_emxbindcmd = $(NM) sashtest$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__sashtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___sashtest___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__sashtest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__sashtest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = sashtest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__sashtest_bundle___depname = sashtest_bundle diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index d72caac016..b2176b81af 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -49,7 +49,6 @@ SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = \ $(__scroll___win32rc) \ - $(__scroll_os2_lib_res) \ scroll_scroll.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd = $(NM) scroll$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_sample_rc.o -@COND_PLATFORM_OS2_1@__scroll_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__scroll_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = scroll.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__scroll_bundle___depname = scroll_bundle diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index b51f1994a2..07aee7857b 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -49,7 +49,6 @@ SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = \ $(__shaped___win32rc) \ - $(__shaped_os2_lib_res) \ shaped_shaped.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_sample_rc.o -@COND_PLATFORM_OS2_1@__shaped_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__shaped_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = shaped.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__shaped_bundle___depname = shaped_bundle diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index dad69e3de3..89f9b3e239 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -49,7 +49,6 @@ CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(__client___win32rc) \ - $(os2_lib_res) \ client_client.o SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -57,7 +56,6 @@ SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(__server___win32rc) \ - $(os2_lib_res) \ server_server.o BASECLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -145,7 +143,6 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep @COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@os2_lib_res = $(top_srcdir)/include/wx/os2/wx.res COND_MONOLITHIC_0___WXLIB_CORE_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index 8e840a48bc..439fb2c401 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -49,7 +49,6 @@ SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) SOUND_OBJECTS = \ - $(__sound_os2_lib_res) \ sound_sound.o \ $(__sound___win32rc) @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___sound___os2_emxbindcmd = $(NM) sound$(EXEEXT) | if grep -q @COND_PLATFORM_OS2_1@__sound___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___sound___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__sound_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__sound_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = sound.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__sound_bundle___depname = sound_bundle diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in index 1b042bc6fc..f4be61d7e3 100644 --- a/samples/splash/Makefile.in +++ b/samples/splash/Makefile.in @@ -50,7 +50,6 @@ SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) SPLASH_OBJECTS = \ - $(__splash_os2_lib_res) \ splash_splash.o \ $(__splash___win32rc) @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___splash___os2_emxbindcmd = $(NM) splash$(EXEEXT) | if grep @COND_PLATFORM_OS2_1@__splash___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splash___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__splash_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__splash_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = splash.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__splash_bundle___depname = splash_bundle diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index f87c598cfe..078ef91ee5 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -49,7 +49,6 @@ SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = \ $(__splitter___win32rc) \ - $(__splitter_os2_lib_res) \ splitter_splitter.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd = $(NM) splitter$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_sample_rc.o -@COND_PLATFORM_OS2_1@__splitter_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__splitter_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = splitter.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__splitter_bundle___depname = splitter_bundle diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index b555529b4a..088fbacba1 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -49,7 +49,6 @@ STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = \ $(__statbar___win32rc) \ - $(__statbar_os2_lib_res) \ statbar_statbar.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd = $(NM) statbar$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_sample_rc.o -@COND_PLATFORM_OS2_1@__statbar_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__statbar_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = statbar.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__statbar_bundle___depname = statbar_bundle diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index 951cda80ce..0b7133d381 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -49,7 +49,6 @@ STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = \ $(__stctest___win32rc) \ - $(__stctest_os2_lib_res) \ stctest_stctest.o \ stctest_edit.o \ stctest_prefs.o @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o -@COND_PLATFORM_OS2_1@__stctest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__stctest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = stctest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index d1f286c88b..874cc002db 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -49,7 +49,6 @@ SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = \ $(__svgtest___win32rc) \ - $(__svgtest_os2_lib_res) \ svgtest_svgtest.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd = $(NM) svgtest$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o -@COND_PLATFORM_OS2_1@__svgtest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__svgtest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = svgtest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__svgtest_bundle___depname = svgtest_bundle diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in index 27c13b3a60..a6517c3a5d 100644 --- a/samples/taborder/Makefile.in +++ b/samples/taborder/Makefile.in @@ -49,7 +49,6 @@ TABORDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) TABORDER_OBJECTS = \ $(__taborder___win32rc) \ - $(__taborder_os2_lib_res) \ taborder_taborder.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd = $(NM) taborder$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__taborder___win32rc = taborder_sample_rc.o -@COND_PLATFORM_OS2_1@__taborder_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__taborder_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = taborder.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__taborder_bundle___depname = taborder_bundle diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 604e60950f..3114aa5495 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -50,7 +50,6 @@ TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ $(__taskbar___win32rc) \ - $(__taskbar_os2_lib_res) \ taskbar_tbtest.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_sample_rc.o -@COND_PLATFORM_OS2_1@__taskbar_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__taskbar_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = taskbar.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index ce7fac4ae5..11fd3145e2 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -49,7 +49,6 @@ TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = \ $(__text___win32rc) \ - $(__text_os2_lib_res) \ text_text.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___text___os2_emxbindcmd = $(NM) text$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__text___win32rc = text_sample_rc.o -@COND_PLATFORM_OS2_1@__text_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__text_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = text.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__text_bundle___depname = text_bundle diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 9ce7899ed6..b662410ec7 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -49,7 +49,6 @@ THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = \ $(__thread___win32rc) \ - $(__thread_os2_lib_res) \ thread_thread.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___thread___os2_emxbindcmd = $(NM) thread$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__thread___win32rc = thread_sample_rc.o -@COND_PLATFORM_OS2_1@__thread_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__thread_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = thread.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__thread_bundle___depname = thread_bundle diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index b3043285b8..d9924e39e3 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -48,7 +48,6 @@ TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = \ - $(__toolbar_os2_lib_res) \ toolbar_toolbar.o \ $(__toolbar___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd = $(NM) toolbar$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__toolbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__toolbar_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__toolbar_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = toolbar.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__toolbar_bundle___depname = toolbar_bundle diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index abcb3230f9..0dafd3a666 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -48,7 +48,6 @@ TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = \ - $(__treectrl_os2_lib_res) \ treectrl_treetest.o \ $(__treectrl___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd = $(NM) treectrl$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__treectrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__treectrl_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__treectrl_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = treectrl.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__treectrl_bundle___depname = treectrl_bundle diff --git a/samples/treelist/Makefile.in b/samples/treelist/Makefile.in index 9e2e19960d..770eb4aa7f 100644 --- a/samples/treelist/Makefile.in +++ b/samples/treelist/Makefile.in @@ -50,7 +50,6 @@ TREELIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) TREELIST_OBJECTS = \ $(__treelist___win32rc) \ - $(__treelist_os2_lib_res) \ treelist_treelist.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___treelist___os2_emxbindcmd = $(NM) treelist$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__treelist___win32rc = treelist_sample_rc.o -@COND_PLATFORM_OS2_1@__treelist_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__treelist_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = treelist.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__treelist_bundle___depname = treelist_bundle diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index b7e0ebc7fd..e3056d144b 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -49,7 +49,6 @@ TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = \ $(__typetest___win32rc) \ - $(__typetest_os2_lib_res) \ typetest_typetest.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd = $(NM) typetest$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_sample_rc.o -@COND_PLATFORM_OS2_1@__typetest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__typetest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = typetest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__typetest_bundle___depname = typetest_bundle diff --git a/samples/uiaction/Makefile.in b/samples/uiaction/Makefile.in index e779af0ceb..0e3470a75d 100644 --- a/samples/uiaction/Makefile.in +++ b/samples/uiaction/Makefile.in @@ -49,7 +49,6 @@ UIACTION_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) UIACTION_OBJECTS = \ $(__uiaction___win32rc) \ - $(__uiaction_os2_lib_res) \ uiaction_uiaction.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___uiaction___os2_emxbindcmd = $(NM) uiaction$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__uiaction___win32rc = uiaction_sample_rc.o -@COND_PLATFORM_OS2_1@__uiaction_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__uiaction_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = uiaction.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__uiaction_bundle___depname = uiaction_bundle diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index 70c5792256..4552651ebc 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -48,7 +48,6 @@ VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = \ - $(__validate_os2_lib_res) \ validate_validate.o \ $(__validate___win32rc) @@ -87,8 +86,6 @@ COND_PLATFORM_OS2_1___validate___os2_emxbindcmd = $(NM) validate$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__validate___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___validate___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__validate_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__validate_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = validate.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__validate_bundle___depname = validate_bundle diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index e13d257d91..724f0159d2 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -49,7 +49,6 @@ VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = \ $(__vstest___win32rc) \ - $(__vstest_os2_lib_res) \ vstest_vstest.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o -@COND_PLATFORM_OS2_1@__vstest_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__vstest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = vstest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__vstest_bundle___depname = vstest_bundle diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in index 1c95821a7b..25c8508961 100644 --- a/samples/webview/Makefile.in +++ b/samples/webview/Makefile.in @@ -49,7 +49,6 @@ WEBVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) WEBVIEW_OBJECTS = \ - $(__webview_os2_lib_res) \ webview_webview.o \ $(__webview___win32rc) @@ -89,8 +88,6 @@ COND_PLATFORM_OS2_1___webview___os2_emxbindcmd = $(NM) webview$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__webview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___webview___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__webview_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__webview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = webview.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__webview_bundle___depname = webview_bundle diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index 274304ab77..37d5d866a2 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -49,7 +49,6 @@ WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = \ - $(__widgets_os2_lib_res) \ widgets_bmpcombobox.o \ widgets_button.o \ widgets_checkbox.o \ @@ -117,8 +116,6 @@ COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd = $(NM) widgets$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__widgets___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__widgets_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__widgets_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = widgets.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__widgets_bundle___depname = widgets_bundle diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 4a457e551a..489f6cb50b 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -50,7 +50,6 @@ WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = \ $(__wizard___win32rc) \ - $(__wizard_os2_lib_res) \ wizard_wizard.o ### Conditionally set variables: ### @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd = $(NM) wizard$(EXEEXT) | if grep @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wizard___win32rc = wizard_sample_rc.o -@COND_PLATFORM_OS2_1@__wizard_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__wizard_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = wizard.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__wizard_bundle___depname = wizard_bundle diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in index e2b154a5cd..ab1a73c87b 100644 --- a/samples/wrapsizer/Makefile.in +++ b/samples/wrapsizer/Makefile.in @@ -49,7 +49,6 @@ WRAPSIZER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) WRAPSIZER_OBJECTS = \ $(__wrapsizer___win32rc) \ - $(__wrapsizer_os2_lib_res) \ wrapsizer_wrapsizer.o ### Conditionally set variables: ### @@ -88,8 +87,6 @@ COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd = $(NM) wrapsizer$(EXEEXT) | \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wrapsizer___win32rc = wrapsizer_sample_rc.o -@COND_PLATFORM_OS2_1@__wrapsizer_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__wrapsizer_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = wrapsizer.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__wrapsizer_bundle___depname = wrapsizer_bundle diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 33f0160c35..a81ad1a573 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -51,7 +51,6 @@ XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(__xrcdemo___win32rc) \ - $(__xrcdemo_os2_lib_res) \ xrcdemo_xrcdemo.o \ xrcdemo_myframe.o \ xrcdemo_derivdlg.o \ @@ -95,8 +94,6 @@ COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_sample_rc.o -@COND_PLATFORM_OS2_1@__xrcdemo_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__xrcdemo_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = xrcdemo.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle diff --git a/samples/xti/Makefile.in b/samples/xti/Makefile.in index 851e815894..abe6c1e9a3 100644 --- a/samples/xti/Makefile.in +++ b/samples/xti/Makefile.in @@ -49,7 +49,6 @@ XTI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(CPPFLAGS) $(CXXFLAGS) XTI_OBJECTS = \ $(__xti___win32rc) \ - $(__xti_os2_lib_res) \ xti_xti.o \ xti_classlist.o \ xti_codereadercallback.o @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___xti___os2_emxbindcmd = $(NM) xti$(EXEEXT) | if grep -q \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__xti___win32rc = xti_sample_rc.o -@COND_PLATFORM_OS2_1@__xti_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__xti_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = xti.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__xti_bundle___depname = xti_bundle diff --git a/setup.h.in b/setup.h.in index 18ede4bb47..c4fe86082a 100644 --- a/setup.h.in +++ b/setup.h.in @@ -142,9 +142,6 @@ #undef WINVER #endif -/* OS/2 with EMX */ -#undef __OS2__ - /* --- start common options --- */ #ifndef wxUSE_GUI diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp index 9f99a8ee6a..c3c0c6b9ce 100644 --- a/src/common/cshelp.cpp +++ b/src/common/cshelp.cpp @@ -250,8 +250,6 @@ bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt) * to put the application into context help mode. */ -#ifndef __WXPM__ - static const char * csquery_xpm[] = { "12 11 2 1", " c None", @@ -268,7 +266,6 @@ static const char * csquery_xpm[] = { " .. ", " "}; -#endif IMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton) @@ -283,12 +280,7 @@ bool wxContextHelpButton::Create(wxWindow* parent, long style) { return wxBitmapButton::Create(parent, id, -#if defined(__WXPM__) - wxBitmap(wxCSQUERY_BITMAP, - wxBITMAP_TYPE_BMP_RESOURCE), -#else wxBitmap(csquery_xpm), -#endif pos, size, style); } diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index f8337b3ccc..83b07f752a 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -63,12 +63,6 @@ #include "wx/osx/dcscreen.h" #endif -#ifdef __WXPM__ - #include "wx/os2/dcclient.h" - #include "wx/os2/dcmemory.h" - #include "wx/os2/dcscreen.h" -#endif - #ifdef __WXCOCOA__ #include "wx/cocoa/dcclient.h" #include "wx/cocoa/dcmemory.h" diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp index 167836f588..45b95cb18f 100644 --- a/src/common/dircmn.cpp +++ b/src/common/dircmn.cpp @@ -61,7 +61,7 @@ bool wxDir::HasFiles(const wxString& spec) const } // we have a (much) faster version for Unix -#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__EMX__) || defined(__WINE__) +#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WINE__) bool wxDir::HasSubDirs(const wxString& spec) const { diff --git a/src/common/dummy.cpp b/src/common/dummy.cpp index 98044d0f4d..0743f76a78 100644 --- a/src/common/dummy.cpp +++ b/src/common/dummy.cpp @@ -26,7 +26,3 @@ #ifdef __WINDOWS__ #include "wx/msw/msvcrt.h" #endif - -#ifdef __VISAGECPP__ - char wxDummyChar = 0; -#endif diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 9683402770..55d11ded23 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -54,7 +54,7 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray) // --------------------------------------------------------------------------- // for MSW/Unix it is defined in platform-specific file -#if !(defined(__WINDOWS__) || defined(__UNIX__)) || defined(__EMX__) +#if !(defined(__WINDOWS__) || defined(__UNIX__)) wxDllType wxDynamicLibrary::GetProgramHandle() { @@ -82,15 +82,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) } } - // different ways to load a shared library - // - // FIXME: should go to the platform-specific files! -#if defined(__WXPM__) || defined(__EMX__) - char err[256] = ""; - DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle); -#else // this should be the only remaining branch eventually m_handle = RawLoad(libname, flags); -#endif if ( m_handle == 0 && !(flags & wxDL_QUIET) ) { @@ -104,36 +96,12 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) return IsLoaded(); } -// for MSW and Unix this is implemented in the platform-specific file -// -// TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp! -#if (!defined(__WINDOWS__) && !defined(__UNIX__)) || defined(__EMX__) - -/* static */ -void wxDynamicLibrary::Unload(wxDllType handle) -{ -#if defined(__OS2__) || defined(__EMX__) - DosFreeModule( handle ); -#else - #error "runtime shared lib support not implemented" -#endif -} - -#endif // !(__WINDOWS__ || __UNIX__) - void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const { wxCHECK_MSG( IsLoaded(), NULL, wxT("Can't load symbol from unloaded library") ); - void *symbol = 0; - - wxUnusedVar(symbol); -#if defined(__WXPM__) || defined(__EMX__) - DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol ); -#else - symbol = RawGetSymbol(m_handle, name); -#endif + void *symbol = RawGetSymbol(m_handle, name); if ( success ) *success = symbol != NULL; @@ -165,7 +133,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString& name, bool *success) const wxString wxDynamicLibrary::GetDllExt(wxDynamicLibraryCategory cat) { wxUnusedVar(cat); -#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__) +#if defined(__WINDOWS__) return ".dll"; #elif defined(__HPUX__) return ".sl"; @@ -192,7 +160,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name, wxString nameCanonic; // under Unix the library names usually start with "lib" prefix, add it -#if defined(__UNIX__) && !defined(__EMX__) +#if defined(__UNIX__) switch ( cat ) { case wxDL_LIBRARY: @@ -230,7 +198,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name, suffix = wxString(wxT("_")) + suffix; #define WXSTRINGIZE(x) #x -#if defined(__UNIX__) && !defined(__EMX__) +#if defined(__UNIX__) #if (wxMINOR_VERSION % 2) == 0 #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) #else diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp index e666b9f245..d0ce3aef1c 100644 --- a/src/common/encconv.cpp +++ b/src/common/encconv.cpp @@ -351,7 +351,7 @@ wxString wxEncodingConverter::Convert(const wxString& input) const #define STOP wxFONTENCODING_SYSTEM -#define NUM_OF_PLATFORMS 4 /*must conform to enum wxPLATFORM_XXXX !!!*/ +#define NUM_OF_PLATFORMS 3 /*must conform to enum wxPLATFORM_XXXX !!!*/ #define ENC_PER_PLATFORM 3 // max no. of encodings for one language used on one platform. // Using maximum of everything at the current moment to not make the @@ -366,7 +366,6 @@ static const wxFontEncoding { /* unix */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP}, /* windows */ {wxFONTENCODING_CP1252, STOP}, - /* os2 */ {STOP}, /* mac */ {wxFONTENCODING_MACROMAN, STOP} }, @@ -374,7 +373,6 @@ static const wxFontEncoding { /* unix */ {wxFONTENCODING_ISO8859_2, STOP}, /* windows */ {wxFONTENCODING_CP1250, STOP}, - /* os2 */ {STOP}, /* mac */ {wxFONTENCODING_MACCENTRALEUR, STOP} }, @@ -382,7 +380,6 @@ static const wxFontEncoding { /* unix */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP}, /* windows */ {wxFONTENCODING_CP1257, STOP}, - /* os2 */ {STOP}, /* mac */ {STOP} }, @@ -390,7 +387,6 @@ static const wxFontEncoding { /* unix */ {wxFONTENCODING_ISO8859_8, STOP}, /* windows */ {wxFONTENCODING_CP1255, STOP}, - /* os2 */ {STOP}, /* mac */ {wxFONTENCODING_MACHEBREW, STOP} }, @@ -398,7 +394,6 @@ static const wxFontEncoding { /* unix */ {wxFONTENCODING_ISO8859_7, STOP}, /* windows */ {wxFONTENCODING_CP1253, STOP}, - /* os2 */ {STOP}, /* mac */ {wxFONTENCODING_MACGREEK, STOP} }, @@ -406,7 +401,6 @@ static const wxFontEncoding { /* unix */ {wxFONTENCODING_ISO8859_6, STOP}, /* windows */ {wxFONTENCODING_CP1256, STOP}, - /* os2 */ {STOP}, /* mac */ {wxFONTENCODING_MACARABIC, STOP} }, @@ -414,7 +408,6 @@ static const wxFontEncoding { /* unix */ {wxFONTENCODING_ISO8859_9, STOP}, /* windows */ {wxFONTENCODING_CP1254, STOP}, - /* os2 */ {STOP}, /* mac */ {wxFONTENCODING_MACTURKISH, STOP} }, @@ -422,11 +415,10 @@ static const wxFontEncoding { /* unix */ {wxFONTENCODING_KOI8, wxFONTENCODING_KOI8_U, wxFONTENCODING_ISO8859_5, STOP}, /* windows */ {wxFONTENCODING_CP1251, STOP}, - /* os2 */ {STOP}, /* mac */ {wxFONTENCODING_MACCYRILLIC, STOP} }, - {{STOP},{STOP},{STOP},{STOP}} /* Terminator */ + {{STOP},{STOP},{STOP}} /* Terminator */ /* no, _not_ Arnold! */ }; @@ -448,8 +440,6 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e platform = wxPLATFORM_WINDOWS; #elif defined(__WXGTK__) || defined(__WXMOTIF__) platform = wxPLATFORM_UNIX; -#elif defined(__WXPM__) - platform = wxPLATFORM_OS2; #elif defined(__WXMAC__) platform = wxPLATFORM_MAC; #endif diff --git a/src/common/file.cpp b/src/common/file.cpp index a0647252a1..709efff8b7 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -48,8 +48,6 @@ #elif defined(__WINDOWS__) && defined(__WXWINCE__) #include "wx/msw/missing.h" -#elif (defined(__OS2__)) - #include #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include #include @@ -575,9 +573,7 @@ bool wxTempFile::Open(const wxString& strName) if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 ) { -#ifndef __OS2__ wxLogSysError(_("Failed to set temporary file permissions")); -#endif } #endif // Unix diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index 8bf2f8a588..d3988e62f8 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -48,10 +48,6 @@ #if defined(__WINDOWS__) #include "wx/msw/private.h" #endif //windows.h -#if defined(__WXPM__) - #define INCL_DOS - #include -#endif #include #include diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 4c9c702eaf..be2706b4d2 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -107,14 +107,6 @@ static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN]; #endif -#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 -// -// VisualAge C++ V4.0 cannot have any external linkage const decs -// in headers included by more than one primary source -// -const int wxInvalidOffset = -1; -#endif - // ============================================================================ // implementation // ============================================================================ @@ -203,7 +195,7 @@ void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(envVariable)) // "C:\Program" and "Files"; this is true for both Windows and Unix. static const wxChar PATH_TOKS[] = -#if defined(__WINDOWS__) || defined(__OS2__) +#if defined(__WINDOWS__) wxT(";"); // Don't separate with colon in DOS (used for drive) #else wxT(":;"); @@ -316,7 +308,7 @@ wxIsAbsolutePath (const wxString& filename) if ((filename[0] == wxT('[') && filename[1] != wxT('.'))) return true; #endif -#if defined(__WINDOWS__) || defined(__OS2__) +#if defined(__WINDOWS__) // MSDOS like if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))) return true; @@ -392,7 +384,7 @@ static CharType *wxDoRealPath (CharType *path) path[0] = SEP; path[1] = wxT('\0'); } -#if defined(__WINDOWS__) || defined(__OS2__) +#if defined(__WINDOWS__) /* Check that path[2] is NULL! */ else if (path[1] == wxT(':') && !path[2]) { @@ -522,23 +514,6 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name) #endif /* Expand inline environment variables */ -#ifdef __VISAGECPP__ - while (*d) - { - *d++ = *s; - if(*s == wxT('\\')) - { - *(d - 1) = *++s; - if (*d) - { - s++; - continue; - } - else - break; - } - else -#else while ((*d++ = *s) != 0) { # ifndef __WINDOWS__ if (*s == wxT('\\')) { @@ -549,7 +524,6 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name) break; } else # endif -#endif // No env variables on WinCE #ifndef __WXWINCE__ #ifdef __WINDOWS__ @@ -763,7 +737,7 @@ wxPathOnly (wxChar *path) i --; } -#if defined(__WINDOWS__) || defined(__OS2__) +#if defined(__WINDOWS__) // Try Drive specifier if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { @@ -815,7 +789,7 @@ wxString wxPathOnly (const wxString& path) i --; } -#if defined(__WINDOWS__) || defined(__OS2__) +#if defined(__WINDOWS__) // Try Drive specifier if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { @@ -933,14 +907,14 @@ void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); } template static void -#if defined(__WINDOWS__) || defined(__OS2__) +#if defined(__WINDOWS__) wxDoUnix2DosFilename(T *s) #else wxDoUnix2DosFilename(T *WXUNUSED(s) ) #endif { // Yes, I really mean this to happen under DOS only! JACS -#if defined(__WINDOWS__) || defined(__OS2__) +#if defined(__WINDOWS__) if (s) while (*s) { @@ -995,7 +969,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil } // helper of generic implementation of wxCopyFile() -#if !(defined(__WIN32__) || defined(__OS2__)) && wxUSE_FILE +#if !defined(__WIN32__) && wxUSE_FILE static bool wxDoCopyFile(wxFile& fileIn, @@ -1054,9 +1028,6 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) return false; } -#elif defined(__OS2__) - if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 ) - return false; #elif wxUSE_FILE // !Win32 wxStructStat fbuf; @@ -1128,16 +1099,12 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) } #endif // wxMac || wxCocoa -#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__) - // no chmod in VA. Should be some permission API for HPFS386 partitions - // however if ( chmod(file2.fn_str(), fbuf.st_mode) != 0 ) { wxLogSysError(_("Impossible to set permissions for the file '%s'"), file2.c_str()); return false; } -#endif // OS/2 || Mac #else // !Win32 && ! wxUSE_FILE @@ -1209,7 +1176,7 @@ bool wxMkdir(const wxString& dir, int perm) // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too // for the GNU compiler -#elif (!(defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__))) || \ +#elif (!(defined(__WINDOWS__) || defined(__DOS__))) || \ (defined(__GNUWIN32__) && !defined(__MINGW32__)) || \ defined(__WINE__) || defined(__WXMICROWIN__) const wxChar *dirname = dir.c_str(); @@ -1219,9 +1186,6 @@ bool wxMkdir(const wxString& dir, int perm) #else if ( mkdir(wxFNCONV(dirname), perm) != 0 ) #endif -#elif defined(__OS2__) - wxUnusedVar(perm); - if (::DosCreateDir(dir.c_str(), NULL) != 0) // enhance for EAB's?? #elif defined(__DOS__) const wxChar *dirname = dir.c_str(); #if defined(__WATCOMC__) @@ -1253,9 +1217,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) #if defined(__VMS__) return false; //to be changed since rmdir exists in VMS7.x #else - #if defined(__OS2__) - if ( ::DosDeleteDir(dir.c_str()) != 0 ) - #elif defined(__WXWINCE__) + #if defined(__WXWINCE__) if ( RemoveDirectory(dir.fn_str()) == 0 ) #else if ( wxRmDir(dir.fn_str()) != 0 ) @@ -1406,25 +1368,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz) { #if defined(_MSC_VER) || defined(__MINGW32__) ok = _getcwd(cbuf, sz) != NULL; - #elif defined(__OS2__) - APIRET rc; - ULONG ulDriveNum = 0; - ULONG ulDriveMap = 0; - rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap); - ok = rc == 0; - if (ok) - { - sz -= 3; - rc = ::DosQueryCurrentDir( 0 // current drive - ,(PBYTE)cbuf + 3 - ,(PULONG)&sz - ); - cbuf[0] = char('A' + (ulDriveNum - 1)); - cbuf[1] = ':'; - cbuf[2] = '\\'; - ok = rc == 0; - } - #else // !Win32/VC++ !Mac !OS2 + #else // !Win32/VC++ !Mac ok = getcwd(cbuf, sz) != NULL; #endif // platform @@ -1499,17 +1443,7 @@ wxString wxGetCwd() bool wxSetWorkingDirectory(const wxString& d) { bool success = false; -#if defined(__OS2__) - if (d[1] == ':') - { - ::DosSetDefaultDisk(wxToupper(d[0]) - wxT('A') + 1); - // do not call DosSetCurrentDir when just changing drive, - // since it requires e.g. "d:." instead of "d:"! - if (d.length() == 2) - return true; - } - success = (::DosSetCurrentDir(d.c_str()) == 0); -#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__) +#if defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__) success = (chdir(wxFNSTRINGCAST d.fn_str()) == 0); #elif defined(__WINDOWS__) @@ -1744,7 +1678,7 @@ int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr, return filters.GetCount(); } -#if defined(__WINDOWS__) && !(defined(__UNIX__) || defined(__OS2__)) +#if defined(__WINDOWS__) && !defined(__UNIX__) static bool wxCheckWin32Permission(const wxString& path, DWORD access) { // quoting the MSDN: "To obtain a handle to a directory, call the @@ -1787,7 +1721,7 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access) bool wxIsWritable(const wxString &path) { -#if defined( __UNIX__ ) || defined(__OS2__) +#if defined( __UNIX__ ) // access() will take in count also symbolic links return wxAccess(path.c_str(), W_OK) == 0; #elif defined( __WINDOWS__ ) @@ -1801,7 +1735,7 @@ bool wxIsWritable(const wxString &path) bool wxIsReadable(const wxString &path) { -#if defined( __UNIX__ ) || defined(__OS2__) +#if defined( __UNIX__ ) // access() will take in count also symbolic links return wxAccess(path.c_str(), R_OK) == 0; #elif defined( __WINDOWS__ ) @@ -1815,7 +1749,7 @@ bool wxIsReadable(const wxString &path) bool wxIsExecutable(const wxString &path) { -#if defined( __UNIX__ ) || defined(__OS2__) +#if defined( __UNIX__ ) // access() will take in count also symbolic links return wxAccess(path.c_str(), X_OK) == 0; #elif defined( __WINDOWS__ ) diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 817fc45552..613982fcc8 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -126,17 +126,6 @@ #include #endif -#ifdef __VISAGECPP__ -#ifndef MAX_PATH -#define MAX_PATH 256 -#endif -#endif - -#ifdef __EMX__ -#include -#define MAX_PATH _MAX_PATH -#endif - #ifndef S_ISREG #define S_ISREG(mode) ((mode) & S_IFREG) #endif @@ -324,7 +313,7 @@ static bool IsUNCPath(const wxString& path, wxPathFormat format) // the appropriate file with an extra twist that it also works when there is no // wxFileName object at all, as is the case in static methods. -#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__)) +#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__)) #define wxHAVE_LSTAT #endif @@ -653,7 +642,7 @@ void RemoveTrailingSeparatorsFromPath(wxString& strPath) } } -#endif // __WINDOWS__ || __OS2__ +#endif // __WINDOWS_ bool wxFileSystemObjectExists(const wxString& path, int flags) @@ -687,34 +676,6 @@ wxFileSystemObjectExists(const wxString& path, int flags) // Anything else must be a file (perhaps we should check for // FILE_ATTRIBUTE_REPARSE_POINT?) return acceptFile; -#elif defined(__OS2__) - if ( acceptDir ) - { - // OS/2 can't handle "d:", it wants either "d:\" or "d:." - if (strPath.length() == 2 && strPath[1u] == wxT(':')) - strPath << wxT('.'); - } - - FILESTATUS3 Info = {{0}}; - APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD, - (void*) &Info, sizeof(FILESTATUS3)); - - if ( rc == NO_ERROR ) - { - if ( Info.attrFile & FILE_DIRECTORY ) - return acceptDir; - else - return acceptFile; - } - - // We consider that the path must exist if we get a sharing violation for - // it but we don't know what is it in this case. - if ( rc == ERROR_SHARING_VIOLATION ) - return flags & wxFILE_EXISTS_ANY; - - // Any other error (usually ERROR_PATH_NOT_FOUND), means there is nothing - // there. - return false; #else // Non-MSW, non-OS/2 wxStructStat st; if ( !StatAny(st, strPath, flags) ) @@ -2338,7 +2299,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format ) { if (format == wxPATH_NATIVE) { -#if defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__) +#if defined(__WINDOWS__) || defined(__DOS__) format = wxPATH_DOS; #elif defined(__VMS) format = wxPATH_VMS; diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp index 0b02d9243b..6b02055206 100644 --- a/src/common/fldlgcmn.cpp +++ b/src/common/fldlgcmn.cpp @@ -30,7 +30,7 @@ extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[] = "filedlg"; extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[] = "Select a file"; extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] = -#if defined(__WXMSW__) || defined(__OS2__) +#if defined(__WXMSW__) "*.*" #else // Unix/Mac "*" diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 328e6d342f..4f0a4a6014 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -786,7 +786,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_) // format there anyhow (but there is a well-defined standard for X11 fonts used // by wxGTK and wxMotif) -#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) || defined (__WXPM__) || defined(__WXOSX__) +#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) || defined(__WXOSX__) wxString wxNativeFontInfo::ToUserString() const { @@ -1106,7 +1106,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s) return true; } -#endif // generic or wxMSW or wxOS2 +#endif // generic or wxMSW // wxFont <-> wxString utilities, used by wxConfig diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 89f1f0a9ee..b2912bfe61 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -278,10 +278,6 @@ wxColourDatabase::~wxColourDatabase () delete m_map; } - -#ifdef __WXPM__ - delete [] m_palTable; -#endif } // Colour database stuff @@ -382,16 +378,6 @@ void wxColourDatabase::Initialize() const wxColourDesc& cc = wxColourTable[n]; (*m_map)[cc.name] = new wxColour(cc.r, cc.g, cc.b); } - -#ifdef __WXPM__ - m_palTable = new long[n]; - for ( n = 0; n < WXSIZEOF(wxColourTable); n++ ) - { - const wxColourDesc& cc = wxColourTable[n]; - m_palTable[n] = OS2RGB(cc.r,cc.g,cc.b); - } - m_nSize = n; -#endif } // ---------------------------------------------------------------------------- diff --git a/src/common/intl.cpp b/src/common/intl.cpp index dd1b0e8fbf..53b2f941d9 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -24,12 +24,6 @@ #pragma hdrstop #endif -#ifdef __EMX__ -// The following define is needed by Innotek's libc to -// make the definition of struct localeconv available. -#define __INTERNAL_DEFS -#endif - #if wxUSE_INTL #ifndef WX_PRECOMP @@ -387,9 +381,7 @@ bool wxLocale::Init(int language, int flags) wxString locale; // Set the locale: -#if defined(__OS2__) - const char *retloc = wxSetlocale(LC_ALL , wxEmptyString); -#elif defined(__UNIX__) && !defined(__WXMAC__) +#if defined(__UNIX__) && !defined(__WXMAC__) if (language != wxLANGUAGE_DEFAULT) locale = info->CanonicalName; diff --git a/src/common/memory.cpp b/src/common/memory.cpp index 6dc5d026d2..c3a1aab53d 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -932,10 +932,6 @@ void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, // If not in debugging allocation mode, do the normal thing // so we don't leave any trace of ourselves in the node list. -#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ) -// VA 3.0 still has trouble in here - return (void *)malloc(size); -#endif if (!wxDebugContext::GetDebugMode()) { return (void *)malloc(size); @@ -992,10 +988,6 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) ) if (!buf) return; -#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ) -// VA 3.0 still has trouble in here - free((char *)buf); -#endif // If not in debugging allocation mode, do the normal thing // so we don't leave any trace of ourselves in the node list. if (!wxDebugContext::GetDebugMode()) diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index bce29b6c54..b9be6fa851 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -324,12 +324,10 @@ void wxMenuItemBase::SetHelp(const wxString& str) } } -#ifndef __WXPM__ wxString wxMenuItemBase::GetLabelText(const wxString& text) { return wxStripMenuCodes(text); } -#endif #if WXWIN_COMPATIBILITY_2_8 wxString wxMenuItemBase::GetLabelFromText(const wxString& text) diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 57a54e1088..a14433b816 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -49,9 +49,6 @@ #include "wx/msw/mimetype.h" #elif ( defined(__DARWIN__) ) #include "wx/osx/mimetype.h" -#elif defined(__WXPM__) || defined (__EMX__) - #include "wx/os2/mimetype.h" - #undef __UNIX__ #elif defined(__DOS__) #include "wx/msdos/mimetype.h" #else // Unix diff --git a/src/common/object.cpp b/src/common/object.cpp index 5ae47aabb0..d36bf02b17 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -25,15 +25,6 @@ #include -#if wxUSE_DEBUG_CONTEXT - #if defined(__VISAGECPP__) - #define DEBUG_PRINTF(NAME) { static int raz=0; \ - printf( #NAME " %i\n",raz); fflush(stdout); raz++; } - #else - #define DEBUG_PRINTF(NAME) - #endif -#endif // wxUSE_DEBUG_CONTEXT - // we must disable optimizations for VC.NET because otherwise its too eager // linker discards wxClassInfo objects in release build thus breaking many, // many things @@ -288,10 +279,6 @@ void wxClassInfo::Unregister() wxObject *wxCreateDynamicObject(const wxString& name) { -#if wxUSE_DEBUG_CONTEXT - DEBUG_PRINTF(wxObject *wxCreateDynamicObject) -#endif - if ( wxClassInfo::sm_classTable ) { wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name); @@ -362,10 +349,6 @@ void wxRefCounter::DecRef() void wxObject::Ref(const wxObject& clone) { -#if wxUSE_DEBUG_CONTEXT - DEBUG_PRINTF(wxObject::Ref) -#endif - // nothing to be done if (m_refData == clone.m_refData) return; diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 922b8c99bf..0fed83a137 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -58,9 +58,6 @@ #include "wx/osx/printdlg.h" #include "wx/osx/private/print.h" #include "wx/osx/dcprint.h" -#elif defined(__WXPM__) -#include "wx/os2/dcprint.h" -#include "wx/generic/prntdlgg.h" #else #include "wx/generic/prntdlgg.h" #include "wx/dcps.h" @@ -104,8 +101,6 @@ wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data ) return new wxWindowsPrinter( data ); #elif defined(__WXMAC__) return new wxMacPrinter( data ); -#elif defined(__WXPM__) - return new wxOS2Printer( data ); #else return new wxPostScriptPrinter( data ); #endif @@ -118,8 +113,6 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe return new wxWindowsPrintPreview( preview, printout, data ); #elif defined(__WXMAC__) return new wxMacPrintPreview( preview, printout, data ); -#elif defined(__WXPM__) - return new wxOS2PrintPreview( preview, printout, data ); #else return new wxPostScriptPrintPreview( preview, printout, data ); #endif @@ -132,8 +125,6 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe return new wxWindowsPrintPreview( preview, printout, data ); #elif defined(__WXMAC__) return new wxMacPrintPreview( preview, printout, data ); -#elif defined(__WXPM__) - return new wxOS2PrintPreview( preview, printout, data ); #else return new wxPostScriptPrintPreview( preview, printout, data ); #endif diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index 9cba613091..917958099e 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -52,15 +52,9 @@ #include #include -#if defined(__OS2__) -#define RGB_RED_OS2 0 -#define RGB_GREEN_OS2 1 -#define RGB_BLUE_OS2 2 -#else #define RGB_RED 0 #define RGB_GREEN 1 #define RGB_BLUE 2 -#endif #define MAXJSAMPLE 255 #define CENTERJSAMPLE 128 @@ -165,26 +159,6 @@ struct jpeg_color_quantizer { * you'll probably want to tweak the histogram sizes too. */ -#if defined(__OS2__) - -#if RGB_RED_OS2 == 0 -#define C0_SCALE R_SCALE -#endif -#if RGB_BLUE_OS2 == 0 -#define C0_SCALE B_SCALE -#endif -#if RGB_GREEN_OS2 == 1 -#define C1_SCALE G_SCALE -#endif -#if RGB_RED_OS2 == 2 -#define C2_SCALE R_SCALE -#endif -#if RGB_BLUE_OS2 == 2 -#define C2_SCALE B_SCALE -#endif - -#else - #if RGB_RED == 0 #define C0_SCALE R_SCALE #endif @@ -201,8 +175,6 @@ struct jpeg_color_quantizer { #define C2_SCALE B_SCALE #endif -#endif - /* * First we have the histogram data structure and routines for creating it. * @@ -569,20 +541,6 @@ median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes, /* We want to break any ties in favor of green, then red, blue last. * This code does the right thing for R,G,B or B,G,R color orders only. */ -#if defined(__VISAGECPP__) - -#if RGB_RED_OS2 == 0 - cmax = c1; n = 1; - if (c0 > cmax) { cmax = c0; n = 0; } - if (c2 > cmax) { n = 2; } -#else - cmax = c1; n = 1; - if (c2 > cmax) { cmax = c2; n = 2; } - if (c0 > cmax) { n = 0; } -#endif - -#else - #if RGB_RED == 0 cmax = c1; n = 1; if (c0 > cmax) { cmax = c0; n = 0; } @@ -593,7 +551,6 @@ median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes, if (c0 > cmax) { n = 0; } #endif -#endif /* Choose split point along selected axis, and update box bounds. * Current algorithm: split at halfway point. * (Since the box has been shrunk to minimum volume, diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp index 4a45c9444a..452e8f254c 100644 --- a/src/common/textbuf.cpp +++ b/src/common/textbuf.cpp @@ -40,8 +40,6 @@ const wxTextFileType wxTextBuffer::typeDefault = wxTextFileType_Dos; #elif defined(__UNIX__) wxTextFileType_Unix; -#elif defined(__OS2__) - wxTextFileType_Os2; #else wxTextFileType_None; #error "wxTextBuffer: unsupported platform." diff --git a/src/common/time.cpp b/src/common/time.cpp index 011b601490..18a8b49c27 100644 --- a/src/common/time.cpp +++ b/src/common/time.cpp @@ -40,13 +40,6 @@ #endif #endif -#if defined(__VISAGECPP__) && !defined(HAVE_FTIME) - #define HAVE_FTIME -# if __IBMCPP__ >= 400 - # define ftime(x) _ftime(x) -# endif -#endif - #ifndef __WXWINCE__ #include #else @@ -211,7 +204,7 @@ int wxGetTimeZone() #if defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it. return WX_TIMEZONE; - #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) + #elif defined(__BORLANDC__) || defined(__MINGW32__) return _timezone; #else // unknown platform -- assume it has timezone return timezone; diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index dd3f3eefcd..60846f004b 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -368,7 +368,7 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) m_mode = mode; if (m_mode == wxEOL_NATIVE) { -#if defined(__WINDOWS__) || defined(__WXPM__) +#if defined(__WINDOWS__) m_mode = wxEOL_DOS; #else m_mode = wxEOL_UNIX; @@ -388,7 +388,7 @@ void wxTextOutputStream::SetMode(wxEOL mode) m_mode = mode; if (m_mode == wxEOL_NATIVE) { -#if defined(__WINDOWS__) || defined(__WXPM__) +#if defined(__WINDOWS__) m_mode = wxEOL_DOS; #else m_mode = wxEOL_UNIX; diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 12001687a4..e5dd120b0f 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -387,14 +387,6 @@ bool wxPlatform::Is(int platform) if (platform == wxOS_UNIX) return true; #endif -#ifdef __OS2__ - if (platform == wxOS_OS2) - return true; -#endif -#ifdef __WXPM__ - if (platform == wxPORT_PM) - return true; -#endif #ifdef __WXCOCOA__ if (platform == wxPORT_MAC) return true; diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp index 003853d86a..18a9862f50 100644 --- a/src/generic/busyinfo.cpp +++ b/src/generic/busyinfo.cpp @@ -58,54 +58,6 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) // make the frame of at least the standard size (400*80) but big enough // for the text we show wxSize sizeText = text->GetBestSize(); -#ifdef __WXPM__ - int nX = 0; - int nY = 0; - int nWidth = 0; - int nHeight = 0; - int nParentHeight = parent->GetClientSize().y; - int nParentWidth = parent->GetClientSize().x; - int nColor; - - SetBackgroundColour(wxT("WHITE")); - nColor = (LONG)GetBackgroundColour().GetPixel(); - - ::WinSetPresParam( GetHwnd() - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&nColor - ); - panel->SetBackgroundColour(wxT("WHITE")); - nColor = (LONG)panel->GetBackgroundColour().GetPixel(); - - ::WinSetPresParam( GetHwndOf(panel) - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&nColor - ); - nWidth = wxMax(sizeText.x, 340) + 60; - nHeight = wxMax(sizeText.y, 40) + 40; - nX = (nParentWidth - nWidth) / 2; - nY = (nParentHeight / 2) - (nHeight / 2); - nY = nParentHeight - (nY + nHeight); - ::WinSetWindowPos( m_hFrame - ,HWND_TOP - ,nX - ,nY - ,nWidth - ,nHeight - ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE - ); - text->SetBackgroundColour(wxT("WHITE")); - nColor = (LONG)text->GetBackgroundColour().GetPixel(); - - ::WinSetPresParam( GetHwndOf(text) - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&nColor - ); - text->Center(wxBOTH); -#else SetClientSize(wxMax(sizeText.x, 340) + 60, wxMax(sizeText.y, 40) + 40); // need to size the panel correctly first so that text->Centre() works @@ -113,7 +65,6 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) text->Centre(wxBOTH); Centre(wxBOTH); -#endif } wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent) diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 60bdf6a787..5cd6446955 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -169,13 +169,6 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event) int x = (int)event.GetX(); int y = (int)event.GetY(); -#ifdef __WXPM__ - // Handle OS/2's reverse coordinate system and account for the dialog title - int nClientHeight; - - GetClientSize(NULL, &nClientHeight); - y = (nClientHeight - y) + 20; -#endif if ((x >= m_standardColoursRect.x && x <= (m_standardColoursRect.x + m_standardColoursRect.width)) && (y >= m_standardColoursRect.y && y <= (m_standardColoursRect.y + m_standardColoursRect.height))) { @@ -220,11 +213,7 @@ void wxGenericColourDialog::CalculateMeasurements() m_sectionSpacing = 15; m_standardColoursRect.x = 10; -#ifdef __WXPM__ - m_standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */ -#else m_standardColoursRect.y = 15; -#endif m_standardColoursRect.width = (8*m_smallRectangleSize.x) + (7*m_gridSpacing); m_standardColoursRect.height = (6*m_smallRectangleSize.y) + (5*m_gridSpacing); diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 101bef8918..c1b0a3c1d3 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -70,18 +70,6 @@ #endif // __WINDOWS__ -#if defined(__OS2__) || defined(__DOS__) - #ifdef __OS2__ - #define INCL_BASE - #include - #ifndef __EMX__ - #include - #endif - #include - #include - #endif -#endif // __OS2__ - #if defined(__WXMAC__) // #include "MoreFilesX.h" #endif @@ -107,7 +95,7 @@ wxDEFINE_EVENT( wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent ); wxDEFINE_EVENT( wxEVT_DIRCTRL_FILEACTIVATED, wxTreeEvent ); // ---------------------------------------------------------------------------- -// wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/") +// wxGetAvailableDrives, for WINDOWS, DOS, MAC, UNIX (returns "/") // ---------------------------------------------------------------------------- size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids) @@ -156,56 +144,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI names.Add(vol.GetDisplayName()); icon_ids.Add(imageId); } -#elif defined(__OS2__) - APIRET rc; - ULONG ulDriveNum = 0; - ULONG ulDriveMap = 0; - rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap); - if ( rc == 0) - { - size_t i = 0; - while (i < 26) - { - if (ulDriveMap & ( 1 << i )) - { - const wxString path = wxFileName::GetVolumeString( - 'A' + i, wxPATH_GET_SEPARATOR); - const wxString name = wxFileName::GetVolumeString( - 'A' + i, wxPATH_NO_SEPARATOR); - - // Note: If _filesys is unsupported by some compilers, - // we can always replace it by DosQueryFSAttach - char filesysname[20]; -#ifdef __WATCOMC__ - ULONG cbBuffer = sizeof(filesysname); - PFSQBUFFER2 pfsqBuffer = (PFSQBUFFER2)filesysname; - APIRET rc = ::DosQueryFSAttach(name.fn_str(),0,FSAIL_QUERYNAME,pfsqBuffer,&cbBuffer); - if (rc != NO_ERROR) - { - filesysname[0] = '\0'; - } -#else - _filesys(name.fn_str(), filesysname, sizeof(filesysname)); -#endif - /* FAT, LAN, HPFS, CDFS, NFS */ - int imageId; - if (path == wxT("A:\\") || path == wxT("B:\\")) - imageId = wxFileIconsTable::floppy; - else if (!strcmp(filesysname, "CDFS")) - imageId = wxFileIconsTable::cdrom; - else if (!strcmp(filesysname, "LAN") || - !strcmp(filesysname, "NFS")) - imageId = wxFileIconsTable::drive; - else - imageId = wxFileIconsTable::drive; - paths.Add(path); - names.Add(name); - icon_ids.Add(imageId); - } - i ++; - } - } -#else // !__WIN32__, !__OS2__ +#else // !__WIN32__ /* If we can switch to the drive, it exists. */ for ( char drive = 'A'; drive <= 'Z'; drive++ ) { @@ -292,7 +231,7 @@ bool wxIsDriveAvailable(const wxString& dirName) return true; } -#elif defined(__WINDOWS__) || defined(__OS2__) +#elif defined(__WINDOWS__) int setdrive(int WXUNUSED_IN_WINCE(drive)) { @@ -307,12 +246,7 @@ int setdrive(int WXUNUSED_IN_WINCE(drive)) return -1; newdrive[0] = (wxChar)(wxT('A') + drive - 1); newdrive[1] = wxT(':'); -#ifdef __OS2__ - newdrive[2] = wxT('\\'); - newdrive[3] = wxT('\0'); -#else newdrive[2] = wxT('\0'); -#endif #if defined(__WINDOWS__) if (::SetCurrentDirectory(newdrive)) #else @@ -343,11 +277,6 @@ bool wxIsDriveAvailable(const wxString& WXUNUSED_IN_WINCE(dirName)) #ifndef wxHAS_DRIVE_FUNCTIONS success = wxDirExists(dirNameLower); #else - #if defined(__OS2__) - // Avoid changing to drive since no media may be inserted. - if (dirNameLower[(size_t)0] == 'a' || dirNameLower[(size_t)0] == 'b') - return success; - #endif int currentDrive = _getdrive(); int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ; int err = setdrive( thisDrive ) ; @@ -366,7 +295,7 @@ bool wxIsDriveAvailable(const wxString& WXUNUSED_IN_WINCE(dirName)) return success; #endif } -#endif // __WINDOWS__ || __OS2__ +#endif // __WINDOWS__ #endif // wxUSE_DIRDLG || wxUSE_FILEDLG @@ -537,7 +466,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, wxString rootName; -#if defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__) +#if defined(__WINDOWS__) || defined(__DOS__) rootName = _("Computer"); #else rootName = _("Sections"); @@ -795,7 +724,7 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId) wxString dirName(data->m_path); -#if (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__DOS__) || defined(__OS2__) +#if (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__DOS__) // Check if this is a root directory and if so, // whether the drive is available. if (!wxIsDriveAvailable(dirName)) @@ -809,7 +738,7 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId) // This may take a longish time. Go to busy cursor wxBusyCursor busy; -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__) +#if defined(__WINDOWS__) || defined(__DOS__) if (dirName.Last() == ':') dirName += wxString(wxFILE_SEP_PATH); #endif @@ -958,8 +887,8 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& // Append a separator to foil bogus substring matching path2 += wxString(wxFILE_SEP_PATH); - // In MSW or PM, case is not significant -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__) + // In MSW case is not significant +#if defined(__WINDOWS__) || defined(__DOS__) path2.MakeLower(); #endif @@ -975,8 +904,8 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& if (!wxEndsWithPathSeparator(childPath)) childPath += wxString(wxFILE_SEP_PATH); - // In MSW and PM, case is not significant -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__) + // In MSW case is not significant +#if defined(__WINDOWS__) || defined(__DOS__) childPath.MakeLower(); #endif @@ -1224,7 +1153,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArray wxString dirName(data->m_path); -#if defined(__WINDOWS__) || defined(__OS2__) +#if defined(__WINDOWS__) if (dirName.Last() == ':') dirName += wxString(wxFILE_SEP_PATH); #endif diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp index 1dfba4421c..adc3be4d96 100644 --- a/src/generic/filectrlg.cpp +++ b/src/generic/filectrlg.cpp @@ -40,7 +40,7 @@ #if defined(__WXWINCE__) #define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/")) -#elif (defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)) +#elif defined(__DOS__) || defined(__WINDOWS__) #define IsTopMostDir(dir) (dir.empty()) #else #define IsTopMostDir(dir) (dir == wxT("/")) @@ -175,7 +175,7 @@ void wxFileData::ReadData() return; } -#if defined(__DOS__) || (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__OS2__) +#if defined(__DOS__) || (defined(__WINDOWS__) && !defined(__WXWINCE__)) // c:\.. is a drive don't stat it if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5)) { @@ -221,7 +221,7 @@ void wxFileData::ReadData() wxStructStat buff; -#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS)) +#if defined(__UNIX__) && !defined(__VMS) const bool hasStat = lstat( m_filePath.fn_str(), &buff ) == 0; if ( hasStat ) m_type |= S_ISLNK(buff.st_mode) ? is_link : 0; @@ -534,7 +534,7 @@ void wxFileListCtrl::UpdateFiles() item.m_itemId = 0; item.m_col = 0; -#if (defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)) && !defined(__WXWINCE__) +#if (defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__)) && !defined(__WXWINCE__) if ( IsTopMostDir(m_dirName) ) { wxArrayString names, paths; @@ -569,7 +569,7 @@ void wxFileListCtrl::UpdateFiles() if ( !IsTopMostDir(m_dirName) && !m_dirName.empty() ) { wxString p(wxPathOnly(m_dirName)); -#if (defined(__UNIX__) || defined(__WXWINCE__)) && !defined(__OS2__) +#if (defined(__UNIX__) || defined(__WXWINCE__)) if (p.empty()) p = wxT("/"); #endif // __UNIX__ wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder); @@ -580,10 +580,10 @@ void wxFileListCtrl::UpdateFiles() } wxString dirname(m_dirName); -#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) +#if defined(__DOS__) || defined(__WINDOWS__) if (dirname.length() == 2 && dirname[1u] == wxT(':')) dirname << wxT('\\'); -#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) +#endif // defined(__DOS__) || defined(__WINDOWS__) if (dirname.empty()) dirname = wxFILE_SEP_PATH; @@ -705,7 +705,7 @@ void wxFileListCtrl::GoToParentDir() m_dirName.Remove( len-1, 1 ); wxString fname( wxFileNameFromPath(m_dirName) ); m_dirName = wxPathOnly( m_dirName ); -#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) +#if defined(__DOS__) || defined(__WINDOWS__) if (!m_dirName.empty()) { if (m_dirName.Last() == wxT('.')) diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 9ec0842c64..2806f6ef23 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -18,7 +18,7 @@ #if wxUSE_FILEDLG // NOTE : it probably also supports MAC, untested -#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) +#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) #error wxGenericFileDialog currently only supports Unix, win32 and DOS #endif @@ -88,7 +88,7 @@ #if defined(__WXWINCE__) #define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/")) -#elif (defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)) +#elif defined(__DOS__) || defined(__WINDOWS__) #define IsTopMostDir(dir) (dir.empty()) #else #define IsTopMostDir(dir) (dir == wxT("/")) @@ -117,9 +117,9 @@ BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog) EVT_FILECTRL_FILEACTIVATED(ID_FILE_CTRL, wxGenericFileDialog::OnFileActivated) EVT_UPDATE_UI(ID_UP_DIR, wxGenericFileDialog::OnUpdateButtonsUI) -#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) +#if defined(__DOS__) || defined(__WINDOWS__) EVT_UPDATE_UI(ID_NEW_DIR, wxGenericFileDialog::OnUpdateButtonsUI) -#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) +#endif // defined(__DOS__) || defined(__WINDOWS__) END_EVENT_TABLE() long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST; diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index af4644ad85..6cb7efb235 100644 --- a/src/generic/helpext.cpp +++ b/src/generic/helpext.cpp @@ -34,7 +34,7 @@ #include #include -#if !defined(__WINDOWS__) && !defined(__OS2__) +#if !defined(__WINDOWS__) #include #endif diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index ba98cc4003..52f294e699 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -155,13 +155,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap ) wxCHECK_MSG( node, false, wxT("wrong index in image list") ); wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ? - #if defined(__VISAGECPP__) - //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff - //so construct it from a bitmap object until I can figure this nonsense out. (DW) - new wxBitmap(bitmap) - #else new wxBitmap( (const wxIcon&) bitmap ) - #endif : new wxBitmap(bitmap) ; if (index == (int) m_images.GetCount() - 1) @@ -188,13 +182,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit wxCHECK_MSG( node, false, wxT("wrong index in image list") ); wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) ? - #if defined(__VISAGECPP__) - //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff - //so construct it from a bitmap object until I can figure this nonsense out. (DW) - new wxBitmap(bitmap) - #else new wxBitmap( (const wxIcon&) bitmap ) - #endif : new wxBitmap(bitmap) ; if (index == (int) m_images.GetCount() - 1) diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 9b35e5e10d..3db08ecb42 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -58,10 +58,6 @@ #endif // Windows -#ifdef __WXPM__ - #include -#endif - #if wxUSE_LOG_DIALOG #include "wx/listctrl.h" #include "wx/imaglist.h" diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index a036308435..23fbd709ec 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -270,7 +270,7 @@ bool wxGenericProgressDialog::Create( const wxString& title, // Windows dialogs usually have buttons in the lower right corner const int sizerFlags = -#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXOSX__) +#if defined(__WXMSW__) || defined(__WXOSX__) wxALIGN_RIGHT | wxALL #else // !MSW wxALIGN_CENTER_HORIZONTAL | wxBOTTOM | wxTOP @@ -403,7 +403,7 @@ wxGenericProgressDialog::CreateLabel(const wxString& text, wxSizer *sizer) // value and time to the left in two rows sizer->Add(label, 1, wxALIGN_LEFT); sizer->Add(value, 1, wxALIGN_LEFT); -#elif defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) || defined(__WXGTK20__) +#elif defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__) // value and time centered in one row sizer->Add(label, 1, wxLARGESMALL(wxALIGN_RIGHT,wxALIGN_LEFT) | wxTOP | wxRIGHT, LAYOUT_MARGIN); sizer->Add(value, 1, wxALIGN_LEFT | wxTOP, LAYOUT_MARGIN); @@ -620,7 +620,7 @@ void wxGenericProgressDialog::SetMaximum(int maximum) { m_maximum = maximum; -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WXMSW__) // we can't have values > 65,536 in the progress control under Windows, so // scale everything down m_factor = m_maximum / 65536 + 1; diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 6de10c46aa..1351308649 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -123,10 +123,6 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, InitColours(); -#ifdef __WXPM__ - SetFont(*wxSMALL_FONT); -#endif - int height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height); @@ -299,8 +295,6 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight) dc.SetPen((style == wxSB_RAISED) ? m_mediumShadowPen : m_hilightPen); -#ifndef __WXPM__ - // Right and bottom lines dc.DrawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height); @@ -314,19 +308,6 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight) rect.x, rect.y); dc.DrawLine(rect.x, rect.y, rect.x + rect.width, rect.y); -#else - - dc.DrawLine(rect.x + rect.width, rect.height + 2, - rect.x, rect.height + 2); - dc.DrawLine(rect.x + rect.width, rect.y, - rect.x + rect.width, rect.y + rect.height); - - dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen); - dc.DrawLine(rect.x, rect.y, - rect.x + rect.width, rect.y); - dc.DrawLine(rect.x, rect.y + rect.height, - rect.x, rect.y); -#endif } DrawFieldText(dc, rect, i, textHeight); @@ -387,16 +368,8 @@ int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const void wxStatusBarGeneric::InitColours() { -#if defined(__WXPM__) - m_mediumShadowPen = wxPen(wxColour(127, 127, 127)); - m_hilightPen = *wxWHITE_PEN; - - SetBackgroundColour(*wxLIGHT_GREY); - SetForegroundColour(*wxBLACK); -#else // !__WXPM__ m_mediumShadowPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)); m_hilightPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT)); -#endif // __WXPM__/!__WXPM__ } void wxStatusBarGeneric::SetMinHeight(int height) diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 52c7befdfd..021080d62a 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -244,24 +244,9 @@ wxTipDialog::wxTipDialog(wxWindow *parent, m_text->SetFont(wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); #endif -//#if defined(__WXPM__) - // - // The only way to get icons into an OS/2 static bitmap control - // -// wxBitmap vBitmap; - -// vBitmap.SetId(wxICON_TIP); // OS/2 specific bitmap method--OS/2 wxBitmaps all have an ID. -// // and for StatBmp's under OS/2 it MUST be a valid resource ID. -// -// wxStaticBitmap* bmp = new wxStaticBitmap(this, wxID_ANY, vBitmap); -// -//#else - wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG); wxStaticBitmap *bmp = new wxStaticBitmap(this, wxID_ANY, icon); -//#endif - m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup")); m_checkbox->SetValue(showAtStartup); m_checkbox->SetFocus(); diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index a94c171b56..87db2b1598 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -338,7 +338,7 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) #endif // __UNIX__ -#if defined(__UNIX__) || defined(__OS2__) +#if defined(__UNIX__) wxString wxGUIAppTraits::GetDesktopEnvironment() const { @@ -358,7 +358,7 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const return de; } -#endif // __UNIX__ || __OS2__ +#endif // __UNIX__ #ifdef __UNIX__ diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index 73db426634..94e45dbd1d 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -77,11 +77,6 @@ const wxCoord CONTENT_TREE_INDEX_MIN_WIDTH = 150; class wxHtmlHelpTreeItemData : public wxTreeItemData { public: -#if defined(__VISAGECPP__) -// VA needs a default ctor for some reason.... - wxHtmlHelpTreeItemData() : wxTreeItemData() - { m_Id = 0; } -#endif wxHtmlHelpTreeItemData(int id) : wxTreeItemData() { m_Id = id;} diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index c8afdeb56e..a5a088251e 100644 --- a/src/jpeg/jconfig.h +++ b/src/jpeg/jconfig.h @@ -1,4 +1,4 @@ -#if defined(_WIN32) || defined(__OS2__) +#if defined(_WIN32) #include "jconfig.vc" #else @@ -46,9 +46,7 @@ /* use wxWidgets' configure */ /* #define INLINE __inline__ */ -#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400) -#define INLINE -#elif defined(__WATCOMC__) +#if defined(__WATCOMC__) #define INLINE #else #define INLINE inline diff --git a/src/jpeg/jctrans.c b/src/jpeg/jctrans.c index c5bb27f321..e8b796db54 100644 --- a/src/jpeg/jctrans.c +++ b/src/jpeg/jctrans.c @@ -21,13 +21,6 @@ LOCAL(void) transencode_master_selection LOCAL(void) transencode_coef_controller JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays)); -#if defined(__VISAGECPP__) -/* Visual Age fixups for multiple declarations */ -# define start_pass_coef start_pass_coef2 /* already in jccoeft.c */ -# define compress_output compress_output2 /* already in jccoeft.c */ -#endif - - /* * Compression initialization for writing raw-coefficient data. * Before calling this, all parameters and a data destination must be set up. @@ -391,12 +384,3 @@ transencode_coef_controller (j_compress_ptr cinfo, coef->dummy_buffer[i] = buffer + i; } } - -#if defined(__VISAGECPP__) -# ifdef start_pass_coef2 -# undef start_pass_coef2 -# endif -# ifdef compress_output2 -# undef compress_output2 -# endif -#endif diff --git a/src/jpeg/jdcoefct.c b/src/jpeg/jdcoefct.c index e5c3636e46..7ee7a46b0f 100644 --- a/src/jpeg/jdcoefct.c +++ b/src/jpeg/jdcoefct.c @@ -104,11 +104,7 @@ start_iMCU_row (j_decompress_ptr cinfo) */ METHODDEF(void) -#if defined(__VISAGECPP__) -start_input_pass2 (j_decompress_ptr cinfo) -#else start_input_pass (j_decompress_ptr cinfo) -#endif { cinfo->input_iMCU_row = 0; start_iMCU_row(cinfo); @@ -684,11 +680,7 @@ jinit_d_coef_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_coef_controller)); cinfo->coef = (struct jpeg_d_coef_controller *) coef; -#if defined(__VISAGECPP__) - coef->pub.start_input_pass2 = start_input_pass2; -#else coef->pub.start_input_pass = start_input_pass; -#endif coef->pub.start_output_pass = start_output_pass; #ifdef BLOCK_SMOOTHING_SUPPORTED diff --git a/src/jpeg/jdcolor.c b/src/jpeg/jdcolor.c index cca2842297..ea745de9ee 100644 --- a/src/jpeg/jdcolor.c +++ b/src/jpeg/jdcolor.c @@ -12,12 +12,6 @@ #include "jinclude.h" #include "jpeglib.h" -#if defined(__VISAGECPP__) -/* Visual Age fixups for multiple declarations */ -# define null_convert null_convert2 /* already in jcmaint.c */ -# define grayscale_convert grayscale_convert2 /* already in jcmaint.c */ -#endif - /* Private subobject */ typedef struct { @@ -399,12 +393,3 @@ jinit_color_deconverter (j_decompress_ptr cinfo) else cinfo->output_components = cinfo->out_color_components; } - -#if defined(__VISAGECPP__) -# ifdef null_convert2 -# undef null_convert2 -# endif -# ifdef grayscale_convert2 -# undef grayscale_convert2 -# endif -#endif diff --git a/src/jpeg/jdinput.c b/src/jpeg/jdinput.c index c89b75de58..bd4f9c71b5 100644 --- a/src/jpeg/jdinput.c +++ b/src/jpeg/jdinput.c @@ -255,11 +255,7 @@ start_input_pass (j_decompress_ptr cinfo) per_scan_setup(cinfo); latch_quant_tables(cinfo); (*cinfo->entropy->start_pass) (cinfo); -#if defined(__VISAGECPP__) - (*cinfo->coef->start_input_pass2) (cinfo); -#else (*cinfo->coef->start_input_pass) (cinfo); -#endif cinfo->inputctl->consume_input = cinfo->coef->consume_data; } diff --git a/src/jpeg/jdmainct.c b/src/jpeg/jdmainct.c index cd55e8ce1c..c3f5b9e9b9 100644 --- a/src/jpeg/jdmainct.c +++ b/src/jpeg/jdmainct.c @@ -141,12 +141,6 @@ typedef my_main_controller * my_main_ptr; #define CTX_POSTPONED_ROW 2 /* feeding postponed row group */ -#if defined(__VISAGECPP__) -/* Visual Age fixups for multiple declarations */ -# define start_pass_main start_pass_main2 /* already in jcmaint.c */ -# define process_data_simple_main process_data_simple_main2 /* already in jcmaint.c */ -#endif - /* Forward declarations */ METHODDEF(void) process_data_simple_main JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf, @@ -518,12 +512,3 @@ jinit_d_main_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer (JDIMENSION) (rgroup * ngroups)); } } - -#if defined(__VISAGECPP__) -# ifdef start_pass_main2 -# undef start_pass_main2 -# endif -# ifdef process_data_simple_main2 -# undef process_data_simple_main2 -# endif -#endif diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h index c4a5d33b08..b40f451337 100644 --- a/src/jpeg/jmorecfg.h +++ b/src/jpeg/jmorecfg.h @@ -191,11 +191,7 @@ typedef unsigned int JDIMENSION; * or code profilers that require it. */ -#if defined(__VISAGECPP__) -#define JPEG_CALLING_CONV _Optlink -#else /* !Visual Age C++ */ #define JPEG_CALLING_CONV -#endif /* We can't declare a static function as extern "C" as we need to do in C++ * programs, so suppress static in METHODDEF when using C++. @@ -221,23 +217,12 @@ typedef unsigned int JDIMENSION; * Again, you can customize this if you need special linkage keywords. */ -#if defined(__VISAGECPP__) /* need this for /common/imagjpeg.obj but not loclly */ -#ifdef HAVE_PROTOTYPES -#define JMETHOD(type,methodname,arglist) type (_Optlink *methodname) arglist -#else -#define JMETHOD(type,methodname,arglist) type (_Optlink *methodname) () -#endif - -#else - #ifdef HAVE_PROTOTYPES #define JMETHOD(type,methodname,arglist) type (*methodname) arglist #else #define JMETHOD(type,methodname,arglist) type (*methodname) () #endif -#endif - /* Here is the pseudo-keyword for declaring pointers that must be "far" * on 80x86 machines. Most of the specialized coding for 80x86 is handled * by just saying "FAR *" where such a pointer is needed. In a few places diff --git a/src/jpeg/jpegint.h b/src/jpeg/jpegint.h index 7928ae3c50..a241d6c76b 100644 --- a/src/jpeg/jpegint.h +++ b/src/jpeg/jpegint.h @@ -164,14 +164,7 @@ struct jpeg_d_main_controller { /* Coefficient buffer control */ struct jpeg_d_coef_controller { -#if defined(__VISAGECPP__) - /* the start input pass in jdcoeft must have a different name than the - // one in jdtrans under VisualAge or else we get a dup symbol error - */ - JMETHOD(void, start_input_pass2, (j_decompress_ptr cinfo)); -#else JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); -#endif JMETHOD(int, consume_data, (j_decompress_ptr cinfo)); JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo)); diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index 820fe96358..f5292a17e7 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -59,10 +59,6 @@ #include "wx/motif/private.h" #include "wx/motif/dcclient.h" -#ifdef __EMX__ - #include // for M_PI -#endif // __EMX__ - #include "bdiag.xbm" #include "fdiag.xbm" #include "cdiag.xbm" diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp index f415bd14a2..df237c79fe 100644 --- a/src/motif/gauge.cpp +++ b/src/motif/gauge.cpp @@ -27,10 +27,6 @@ #include "wx/math.h" #endif -#ifdef __OS2__ -#include -#endif - #ifdef __VMS__ #pragma message disable nosimpint #endif diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c index be780d1fbc..961d8475e3 100644 --- a/src/motif/xmcombo/xmcombo.c +++ b/src/motif/xmcombo/xmcombo.c @@ -134,8 +134,6 @@ /* --- Systemspezifische Definitionen */ #if defined(VMS) #define strcasecmp(s1, s2) strcmp(s1, s2) -#elif defined(__EMX__) -#define strcasecmp stricmp #endif /* --- sonstiger Quark */ diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp deleted file mode 100644 index 7f8dfefc2b..0000000000 --- a/src/os2/accel.cpp +++ /dev/null @@ -1,242 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/accel.cpp -// Purpose: wxAcceleratorTable -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/accel.h" - -#ifndef WX_PRECOMP - #include - #include "wx/window.h" - #include "wx/app.h" - #include "wx/frame.h" -#endif - -#include "wx/os2/private.h" - - -IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) - -class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData -{ - friend class WXDLLEXPORT wxAcceleratorTable; -public: - wxAcceleratorRefData(); - virtual ~wxAcceleratorRefData(); - - inline HACCEL GetHACCEL() const { return m_hAccel; } -protected: - HACCEL m_hAccel; - bool m_ok; -}; - -#define M_ACCELDATA ((wxAcceleratorRefData *)m_refData) - -wxAcceleratorRefData::wxAcceleratorRefData() -{ - m_ok = false; - m_hAccel = 0; -} // end of wxAcceleratorRefData::wxAcceleratorRefData - -wxAcceleratorRefData::~wxAcceleratorRefData() -{ - if (m_hAccel) - { - WinDestroyAccelTable((HACCEL) m_hAccel); - } - m_hAccel = 0 ; -} // end of wxAcceleratorRefData::~wxAcceleratorRefData - -wxAcceleratorTable::wxAcceleratorTable() -{ - m_refData = NULL; -} // end of wxAcceleratorTable::wxAcceleratorTable - -wxAcceleratorTable::~wxAcceleratorTable() -{ -} // end of wxAcceleratorTable::~wxAcceleratorTable - -// Load from .rc resource -wxAcceleratorTable::wxAcceleratorTable( - const wxString& rResource -) -{ - HACCEL hAccel; - ULONG ulId; - - m_refData = new wxAcceleratorRefData; - - ulId = atol(rResource.c_str()); - hAccel = ::WinLoadAccelTable( vHabmain - ,NULL // resources always in .exe - ,(ULONG)ulId - ); - if (wxTheApp->GetTopWindow() != NULL) - { - // - // If we have accelerators the top window is the frame - // - wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow(); - - ::WinSetAccelTable( vHabmain - ,hAccel - ,(HWND)pFrame->GetFrame() - ); - } - M_ACCELDATA->m_hAccel = hAccel; - M_ACCELDATA->m_ok = (hAccel != 0); -} - -extern int wxCharCodeWXToOS2( - int nId -, bool* pbIsVirtual -); - -// Create from an array -wxAcceleratorTable::wxAcceleratorTable( - int n -, const wxAcceleratorEntry vaEntries[] -) -{ - int nAccelLength = ((sizeof(ACCEL) * n) + sizeof(ACCELTABLE)); - PACCELTABLE pArr; - int i; - - m_refData = new wxAcceleratorRefData; - pArr = (PACCELTABLE) new BYTE[nAccelLength]; - - for (i = 0; i < n; i++) - { - USHORT uVirt = AF_CHAR; - - if (vaEntries[i].GetFlags() & wxACCEL_ALT) - { - uVirt |= AF_ALT; - uVirt |= AF_VIRTUALKEY; - } - if (vaEntries[i].GetFlags() & wxACCEL_SHIFT) - { - uVirt |= AF_SHIFT; - uVirt |= AF_VIRTUALKEY; - } - if (vaEntries[i].GetFlags() & wxACCEL_CTRL) - { - uVirt |= AF_CONTROL; - uVirt |= AF_VIRTUALKEY; - } - - bool bIsVirtual; - USHORT uKey = (USHORT)wxCharCodeWXToOS2( vaEntries[i].GetKeyCode(), - &bIsVirtual); - if (bIsVirtual) - uVirt = AF_CHAR | AF_VIRTUALKEY; - - USHORT uCmd = (USHORT)vaEntries[i].GetCommand(); - - pArr->aaccel[i].fs = uVirt; - pArr->aaccel[i].key = uKey; - pArr->aaccel[i].cmd = uCmd; - } - pArr->codepage = (USHORT)::WinQueryCp(wxTheApp->m_hMq); - pArr->cAccel = (USHORT)n; - M_ACCELDATA->m_hAccel = ::WinCreateAccelTable( vHabmain - ,pArr - ); - if (wxTheApp->GetTopWindow() != NULL) - { - // - // If we have accelerators the top window is the frame - // - wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow(); - - ::WinSetAccelTable( vHabmain - ,M_ACCELDATA->m_hAccel - ,(HWND)pFrame->GetFrame() - ); - } - - delete[] pArr; - M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0); -} // end of wxAcceleratorTable::wxAcceleratorTable - -bool wxAcceleratorTable::IsOk() const -{ - return(M_ACCELDATA && (M_ACCELDATA->m_ok)); -} // end of wxAcceleratorTable::IsOk - -void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel) -{ - if (!M_ACCELDATA) - m_refData = new wxAcceleratorRefData; - - M_ACCELDATA->m_hAccel = (HACCEL) hAccel; -} - -WXHACCEL wxAcceleratorTable::GetHACCEL() const -{ - if (!M_ACCELDATA) - return 0; - return (WXHACCEL) M_ACCELDATA->m_hAccel; -} - -bool wxAcceleratorTable::Translate( WXHWND hWnd, - WXMSG* pWxmsg ) const -{ - PQMSG pMsg = (PQMSG)pWxmsg; - BOOL rc = FALSE; - - rc = ::WinTranslateAccel( vHabmain - ,(HWND)hWnd - ,GetHaccel() - ,pMsg - ); - return (IsOk() && rc); -} // end of wxAcceleratorTable::Translate - -// --------------------------------------------------------------------------- -// function for translating labels -// --------------------------------------------------------------------------- - -wxString wxPMTextToLabel( const wxString& rsTitle ) -{ - wxString sTitle; - const wxChar* zPc; - - if (rsTitle.empty()) - return(sTitle); - - for (zPc = rsTitle.c_str(); *zPc != wxT('\0'); zPc++) - { - if (*zPc == wxT('&')) - { - if (*(zPc + 1) == wxT('&')) - { - zPc++; - sTitle << wxT('&'); - } - else - sTitle << wxT('~'); - } - else - { - if ( *zPc == wxT('~')) - { - // - // Tildes must be doubled to prevent them from being - // interpreted as accelerator character prefix by PM ??? - // - sTitle << *zPc; - } - sTitle << *zPc; - } - } - return(sTitle); -} // end of wxPMTextToLabel diff --git a/src/os2/app.cpp b/src/os2/app.cpp deleted file mode 100644 index 002cf73d77..0000000000 --- a/src/os2/app.cpp +++ /dev/null @@ -1,584 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/app.cpp -// Purpose: wxApp -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/app.h" - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/frame.h" - #include "wx/utils.h" - #include "wx/gdicmn.h" - #include "wx/pen.h" - #include "wx/brush.h" - #include "wx/cursor.h" - #include "wx/icon.h" - #include "wx/palette.h" - #include "wx/dc.h" - #include "wx/dialog.h" - #include "wx/msgdlg.h" - #include "wx/intl.h" - #include "wx/crt.h" - #include "wx/log.h" - #include "wx/module.h" -#endif - -#include "wx/stdpaths.h" -#include "wx/filename.h" -#include "wx/evtloop.h" - -#include "wx/os2/private.h" - -#ifdef __EMX__ - -#include -#include - -#else - -#include -#include -#include -#include - -#endif // - -#if defined(__WATCOMC__) - -#include - -#elif !defined(__EMX__) - -#define select(a,b,c,d,e) bsdselect(a,b,c,d,e) -extern "C" int _System bsdselect(int, - struct fd_set *, - struct fd_set *, - struct fd_set *, - struct timeval *); -#endif - -#if wxUSE_THREADS - #include "wx/thread.h" -#endif // wxUSE_THREADS - -#if wxUSE_TOOLTIPS - #include "wx/tooltip.h" -#endif // wxUSE_TOOLTIPS - -#include -#include - -// --------------------------------------------------------------------------- -// global variables -// --------------------------------------------------------------------------- - -WXDLLEXPORT_DATA(wxChar*) wxBuffer; -extern wxCursor* g_globalCursor; - -HAB vHabmain = NULLHANDLE; - - -HICON wxSTD_FRAME_ICON = (HICON) NULL; -HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; -HICON wxSTD_MDIPARENTFRAME_ICON = (HICON) NULL; - -HICON wxDEFAULT_FRAME_ICON = (HICON) NULL; -HICON wxDEFAULT_MDICHILDFRAME_ICON = (HICON) NULL; -HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; - -HBRUSH wxDisableButtonBrush = (HBRUSH) 0; - -MRESULT EXPENTRY wxWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2); -MRESULT EXPENTRY wxFrameWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2); - -// =========================================================================== -// implementation -// =========================================================================== - -// --------------------------------------------------------------------------- -// helper struct and functions for socket handling -// --------------------------------------------------------------------------- - -struct GsocketCallbackInfo{ - void (*proc)(void *); - int type; - int handle; - void* gsock; -}; - -// These defines are used here and in gsockpm.cpp -#define wxSockReadMask 0x01 -#define wxSockWriteMask 0x02 - -void wxApp::HandleSockets() -{ - bool pendingEvent = false; - - // Check whether it's time for Gsocket operation - if (m_maxSocketHandles > 0 && m_maxSocketNr > 0) - { - fd_set readfds = m_readfds; - fd_set writefds = m_writefds; - struct timeval timeout; - int i; - struct GsocketCallbackInfo - *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo; - timeout.tv_sec = 0; - timeout.tv_usec = 0; - if ( select(m_maxSocketNr, &readfds, &writefds, 0, &timeout) > 0) - { - for (i = m_lastUsedHandle + 1; i != m_lastUsedHandle; - (i < m_maxSocketNr - 1) ? i++ : (i = 0)) - { - if (FD_ISSET(i, &readfds)) - { - int r; - for (r = 0; r < m_maxSocketHandles; r++){ - if(CallbackInfo[r].handle == i && - CallbackInfo[r].type == wxSockReadMask) - break; - } - if (r < m_maxSocketHandles) - { - CallbackInfo[r].proc(CallbackInfo[r].gsock); - pendingEvent = true; - } - } - if (FD_ISSET(i, &writefds)) - { - int r; - for (r = 0; r < m_maxSocketHandles; r++) - if(CallbackInfo[r].handle == i && - CallbackInfo[r].type == wxSockWriteMask) - break; - if (r < m_maxSocketHandles) - { - CallbackInfo[r].proc(CallbackInfo[r].gsock); - pendingEvent = true; - } - } - } - m_lastUsedHandle = i; - } - if (pendingEvent) - ProcessPendingEvents(); - } -} -// --------------------------------------------------------------------------- -// wxApp -// --------------------------------------------------------------------------- - - IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) - - BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) - EVT_END_SESSION(wxApp::OnEndSession) - EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) - END_EVENT_TABLE() - -// -// Initialize -// -bool wxApp::Initialize(int& argc, wxChar **argv) -{ - if ( !wxAppBase::Initialize(argc, argv) ) - return false; - -#if defined(wxUSE_CONSOLEDEBUG) - #if wxUSE_CONSOLEDEBUG -/***********************************************/ -/* Code for using stdout debug */ -/* To use it you mast link app as "Window" - EK*/ -/***********************************************/ - { - PPIB pib; - PTIB tib; - - printf("In console\n"); - - DosGetInfoBlocks(&tib, &pib); -/* Try morphing into a PM application. */ -// if(pib->pib_ultype == 2) /* VIO */ - pib->pib_ultype = 3; - } -/**********************************************/ -/**********************************************/ - #endif //wxUSE_CONSOLEDEBUG -#endif - - // - // OS2 has to have an anchorblock - // - vHabmain = WinInitialize(0); - wxFileName GetPrefix(argv[0]); - GetPrefix.MakeAbsolute(); - wxStandardPaths::SetInstallPrefix(GetPrefix.GetPath()); - if (!vHabmain) - { - // TODO: at least give some error message here... - wxAppBase::CleanUp(); - - return false; - } - - wxBuffer = new wxChar[1500]; // FIXME; why? - - // Some people may wish to use this, but - // probably it shouldn't be here by default. - // wxRedirectIOToConsole(); - - wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100); - - // This is to foil optimizations in Visual C++ that throw out dummy.obj. - // PLEASE DO NOT ALTER THIS. -#if !defined(WXMAKINGDLL) && defined(__VISAGECPP__) - extern char wxDummyChar; - if (wxDummyChar) wxDummyChar++; -#endif - - // wxSetKeyboardHook(TRUE); - - RegisterWindowClasses(vHabmain); - - return true; -} // end of wxApp::Initialize - -const char* CANTREGISTERCLASS = " Can't register Class "; -// --------------------------------------------------------------------------- -// RegisterWindowClasses -// --------------------------------------------------------------------------- - -bool wxApp::RegisterWindowClasses( HAB vHab ) -{ - ERRORID vError = 0L; - wxString sError; - - if (!::WinRegisterClass( vHab - ,(PSZ)wxFrameClassName - ,wxFrameWndProc - ,CS_SIZEREDRAW | CS_SYNCPAINT - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - - if (!::WinRegisterClass( vHab - ,(PSZ)wxFrameClassNameNoRedraw - ,wxWndProc - ,0 - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - - if (!::WinRegisterClass( vHab - ,(PSZ)wxMDIFrameClassName - ,wxWndProc - ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - - if (!::WinRegisterClass( vHab - ,(PSZ)wxMDIFrameClassNameNoRedraw - ,wxWndProc - ,0 - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - - if (!::WinRegisterClass( vHab - ,(PSZ)wxMDIChildFrameClassName - ,wxWndProc - ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - - if (!::WinRegisterClass( vHab - ,(PSZ)wxMDIChildFrameClassNameNoRedraw - ,wxWndProc - ,CS_HITTEST - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - - if (!::WinRegisterClass( vHab - ,(PSZ)wxPanelClassName - ,wxWndProc - ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - - if (!::WinRegisterClass( vHab - ,(PSZ)wxCanvasClassName - ,wxWndProc - ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - if (!::WinRegisterClass( vHab - ,(PSZ)wxCanvasClassNameNR - ,wxWndProc - ,CS_HITTEST | CS_SYNCPAINT - ,sizeof(ULONG) - )) - { - vError = ::WinGetLastError(vHab); - sError = wxPMErrorToStr(vError); - wxLogLastError(sError.c_str()); - return false; - } - return true; -} // end of wxApp::RegisterWindowClasses - -// -// Cleans up any wxWidgets internal structures left lying around -// -void wxApp::CleanUp() -{ - wxDELETEA(wxBuffer); - - // - // PM-SPECIFIC CLEANUP - // - - // wxSetKeyboardHook(false); - - if (wxSTD_FRAME_ICON) - ::WinFreeFileIcon(wxSTD_FRAME_ICON); - if (wxSTD_MDICHILDFRAME_ICON) - ::WinFreeFileIcon(wxSTD_MDICHILDFRAME_ICON); - if (wxSTD_MDIPARENTFRAME_ICON) - ::WinFreeFileIcon(wxSTD_MDIPARENTFRAME_ICON); - - if (wxDEFAULT_FRAME_ICON) - ::WinFreeFileIcon(wxDEFAULT_FRAME_ICON); - if (wxDEFAULT_MDICHILDFRAME_ICON) - ::WinFreeFileIcon(wxDEFAULT_MDICHILDFRAME_ICON); - if (wxDEFAULT_MDIPARENTFRAME_ICON) - ::WinFreeFileIcon(wxDEFAULT_MDIPARENTFRAME_ICON); - - if ( wxDisableButtonBrush ) - { -// TODO: ::DeleteObject( wxDisableButtonBrush ); - } - - wxDELETE(wxWinHandleHash); - - // Delete Message queue - if (wxTheApp->m_hMq) - ::WinDestroyMsgQueue(wxTheApp->m_hMq); - - wxAppBase::CleanUp(); -} // end of wxApp::CleanUp - -bool wxApp::OnInitGui() -{ - ERRORID vError; - wxString sError; - - if (!wxAppBase::OnInitGui()) - return false; - - m_hMq = ::WinCreateMsgQueue(vHabmain, 0); - if (!m_hMq) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogDebug(sError); - return false; - } - - return true; -} // end of wxApp::OnInitGui - -wxApp::wxApp() -{ - m_nPrintMode = wxPRINT_WINDOWS; - m_hMq = 0; - m_maxSocketHandles = 0; - m_maxSocketNr = 0; - m_sockCallbackInfo = 0; -} // end of wxApp::wxApp - -wxApp::~wxApp() -{ -} // end of wxApp::~wxApp - -bool gbInOnIdle = false; - -void wxApp::OnIdle( wxIdleEvent& WXUNUSED(rEvent) ) -{ - // - // Avoid recursion (via ProcessEvent default case) - // - if (gbInOnIdle) - return; - - gbInOnIdle = true; - -#if wxUSE_DC_CACHEING - // automated DC cache management: clear the cached DCs and bitmap - // if it's likely that the app has finished with them, that is, we - // get an idle event and we're not dragging anything. - if (!::WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) && - !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) && - !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2)) - wxDC::ClearCache(); -#endif // wxUSE_DC_CACHEING - - gbInOnIdle = false; -} // end of wxApp::OnIdle - -void wxApp::OnEndSession( - wxCloseEvent& WXUNUSED(rEvent)) -{ - if (GetTopWindow()) - GetTopWindow()->Close(true); -} // end of wxApp::OnEndSession - -// -// Default behaviour: close the application with prompts. The -// user can veto the close, and therefore the end session. -// -void wxApp::OnQueryEndSession( wxCloseEvent& rEvent ) -{ - if (GetTopWindow()) - { - if (!GetTopWindow()->Close(!rEvent.CanVeto())) - rEvent.Veto(true); - } -} // end of wxApp::OnQueryEndSession - -int wxApp::AddSocketHandler(int handle, int mask, - void (*callback)(void*), void * gsock) -{ - int find; - struct GsocketCallbackInfo - *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo; - - for (find = 0; find < m_maxSocketHandles; find++) - if (CallbackInfo[find].handle == -1) - break; - if (find == m_maxSocketHandles) - { - // Allocate new memory - m_sockCallbackInfo = realloc(m_sockCallbackInfo, - (m_maxSocketHandles+=10)* - sizeof(struct GsocketCallbackInfo)); - CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo; - for (find = m_maxSocketHandles - 10; find < m_maxSocketHandles; find++) - CallbackInfo[find].handle = -1; - find = m_maxSocketHandles - 10; - } - CallbackInfo[find].proc = callback; - CallbackInfo[find].type = mask; - CallbackInfo[find].handle = handle; - CallbackInfo[find].gsock = gsock; - if (mask & wxSockReadMask) - FD_SET(handle, &m_readfds); - if (mask & wxSockWriteMask) - FD_SET(handle, &m_writefds); - if (handle >= m_maxSocketNr) - m_maxSocketNr = handle + 1; - return find; -} - -void wxApp::RemoveSocketHandler(int handle) -{ - struct GsocketCallbackInfo - *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo; - if (handle < m_maxSocketHandles) - { - if (CallbackInfo[handle].type & wxSockReadMask) - FD_CLR(CallbackInfo[handle].handle, &m_readfds); - if (CallbackInfo[handle].type & wxSockWriteMask) - FD_CLR(CallbackInfo[handle].handle, &m_writefds); - CallbackInfo[handle].handle = -1; - } -} - -//----------------------------------------------------------------------------- -// wxWakeUpIdle -//----------------------------------------------------------------------------- - -void wxApp::WakeUpIdle() -{ - // - // Send the top window a dummy message so idle handler processing will - // start up again. Doing it this way ensures that the idle handler - // wakes up in the right thread (see also wxWakeUpMainThread() which does - // the same for the main app thread only) - // - wxWindow* pTopWindow = wxTheApp->GetTopWindow(); - - if (pTopWindow) - { - if ( !::WinPostMsg(GetHwndOf(pTopWindow), WM_NULL, (MPARAM)0, (MPARAM)0)) - { - // - // Should never happen - // - wxLogLastError(wxT("PostMessage(WM_NULL)")); - } - } -} // end of wxWakeUpIdle - -HAB wxGetInstance() -{ - return vHabmain; -} - -void wxSetInstance( HAB vHab ) -{ - vHabmain = vHab; -} diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp deleted file mode 100644 index f5b7862131..0000000000 --- a/src/os2/bitmap.cpp +++ /dev/null @@ -1,1690 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/bitmap.cpp -// Purpose: wxBitmap -// Author: David Webster -// Modified by: -// Created: 08/08/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/bitmap.h" - -#ifndef WX_PRECOMP - #include - - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/palette.h" - #include "wx/dcmemory.h" - #include "wx/icon.h" - #include "wx/log.h" - #include "wx/image.h" -#endif - -#include "wx/os2/dc.h" -#include "wx/os2/private.h" - -#include "wx/xpmdecod.h" - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) -IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) - -IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxBitmapRefData -// ---------------------------------------------------------------------------- - -wxBitmapRefData::wxBitmapRefData() -{ - m_nQuality = 0; - m_pSelectedInto = NULL; - m_nNumColors = 0; - m_pBitmapMask = NULL; - m_hBitmap = (WXHBITMAP) NULL; -} // end of wxBitmapRefData::wxBitmapRefData - -wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy) -{ - m_nQuality = tocopy.m_nQuality; - m_pSelectedInto = NULL; // don't copy this - m_nNumColors = tocopy.m_nNumColors; - - // copy the mask - if (tocopy.m_pBitmapMask) - m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask); - - m_hBitmap = wxCopyBmp(tocopy.m_hBitmap); -} - -void wxBitmapRefData::Free() -{ - if ( m_pSelectedInto ) - { - wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)")); - } - if (m_hBitmap) - { - if (!::GpiDeleteBitmap((HBITMAP)m_hBitmap)) - { - wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)")); - } - } - wxDELETE(m_pBitmapMask); -} // end of wxBitmapRefData::Free - -// ---------------------------------------------------------------------------- -// wxBitmap creation -// ---------------------------------------------------------------------------- - -wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const -{ - return new wxBitmapRefData(*static_cast(data)); -} - -// this function should be called from all wxBitmap ctors -void wxBitmap::Init() -{ - m_bIsMono = false; - // - // True for all bitmaps created from bits, wxImages, Xpms - // -} // end of wxBitmap::Init - -bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& rIcon) -{ - HPOINTER hIcon = (HPOINTER)rIcon.GetHandle(); - POINTERINFO SIconInfo; - - if (!::WinQueryPointerInfo(hIcon, &SIconInfo)) - { - wxLogLastError(wxT("WinQueryPointerInfo")); - return false; - } - wxBitmapRefData* pRefData = new wxBitmapRefData; - - m_refData = pRefData; - - int nWidth = rIcon.GetWidth(); - int nHeight = rIcon.GetHeight(); - - pRefData->m_nWidth = nWidth; - pRefData->m_nHeight = nHeight; - pRefData->m_nDepth = wxDisplayDepth(); - - pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor; - - wxMask* pMask = new wxMask(SIconInfo.hbmPointer); - - pMask->SetMaskBitmap(GetHBITMAP()); - SetMask(pMask); - - return true; -} // end of wxBitmap::CopyFromIconOrCursor - -bool wxBitmap::CopyFromCursor( - const wxCursor& rCursor -) -{ - UnRef(); - - if (!rCursor.IsOk()) - return(false); - return(CopyFromIconOrCursor(rCursor)); -} // end of wxBitmap::CopyFromCursor - -bool wxBitmap::CopyFromIcon( - const wxIcon& rIcon -) -{ - UnRef(); - - if (!rIcon.IsOk()) - return(false); - - return CopyFromIconOrCursor(rIcon); -} // end of wxBitmap::CopyFromIcon - -wxBitmap::~wxBitmap() -{ -} // end of wxBitmap::~wxBitmap - -wxBitmap::wxBitmap( - const char zBits[] -, int nWidth -, int nHeight -, int nDepth -) -{ - Init(); - - wxBitmapRefData* pRefData = new wxBitmapRefData; - BITMAPINFOHEADER2 vHeader; - BITMAPINFO2 vInfo; - HDC hDc; - HPS hPs; - DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - SIZEL vSize = {0, 0}; - char* pzData; - - wxASSERT(vHabmain != NULL); - - m_refData = pRefData; - - pRefData->m_nWidth = nWidth; - pRefData->m_nHeight = nHeight; - pRefData->m_nDepth = nDepth; - pRefData->m_nNumColors = 0; - pRefData->m_pSelectedInto = NULL; - - hDc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS); - if (hPs == 0) - { - wxLogLastError(wxT("GpiCreatePS Failure")); - } - - if (nDepth == 1) - { - // - // We assume that it is in XBM format which is not quite the same as - // the format CreateBitmap() wants because the order of bytes in the - // line is reversed! - // - const size_t nBytesPerLine = (nWidth + 7) / 8; - const size_t nPadding = nBytesPerLine % 2; - const size_t nLen = nHeight * (nPadding + nBytesPerLine); - const char* pzSrc = zBits; - int nRows; - size_t nCols; - - pzData = (char *)malloc(nLen); - - char* pzDst = pzData; - - for (nRows = 0; nRows < nHeight; nRows++) - { - for (nCols = 0; nCols < nBytesPerLine; nCols++) - { - unsigned char ucVal = *pzSrc++; - unsigned char ucReversed = 0; - int nBits; - - for (nBits = 0; nBits < 8; nBits++) - { - ucReversed <<= 1; - ucReversed = (unsigned char)(ucReversed | (ucVal & 0x01)); - ucVal >>= 1; - } - *pzDst++ = ucReversed; - } - if (nPadding) - *pzDst++ = 0; - } - } - else - { - // - // Bits should already be in Windows standard format - // - pzData = (char *)zBits; // const_cast is harmless - } - - if (nDepth > 24) - nDepth = 24; // MAX supported in PM - memset(&vHeader, '\0', 16); - vHeader.cbFix = 16; - vHeader.cx = (USHORT)nWidth; - vHeader.cy = (USHORT)nHeight; - vHeader.cPlanes = 1L; - vHeader.cBitCount = (USHORT)nDepth; - vHeader.usReserved = 0; - - memset(&vInfo, '\0', 16); - vInfo.cbFix = 16; - vInfo.cx = (USHORT)nWidth; - vInfo.cy = (USHORT)nHeight; - vInfo.cPlanes = 1L; - vInfo.cBitCount = (USHORT)nDepth; - - HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo); - - if (!hBmp) - { - wxLogLastError(wxT("CreateBitmap")); - } - ::GpiDestroyPS(hPs); - ::DevCloseDC(hDc); - SetHBITMAP((WXHBITMAP)hBmp); -} // end of wxBitmap::wxBitmap - -wxBitmap::wxBitmap( - const void* pData -, wxBitmapType lType -, int nWidth -, int nHeight -, int nDepth -) -{ - Init(); - - (void)Create( pData - ,lType - ,nWidth - ,nHeight - ,nDepth - ); -} // end of wxBitmap::wxBitmap - -wxBitmap::wxBitmap( - int nId -, wxBitmapType lType -) -{ - Init(); - LoadFile( nId - ,lType - ); - SetId(nId); -} // end of wxBitmap::wxBitmap - -bool wxBitmap::Create( - int nW -, int nH -, int nD -) -{ - HBITMAP hBmp; - BITMAPINFOHEADER2 vHeader; - - wxASSERT(vHabmain != NULL); - UnRef(); - m_refData = new wxBitmapRefData; - GetBitmapData()->m_nWidth = nW; - GetBitmapData()->m_nHeight = nH; - GetBitmapData()->m_nDepth = nD; - - // - // Xpms and bitmaps from other images can also be mono's, but only - // mono's need help changing their colors with MemDC changes - // - if (nD > 0) - { - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - SIZEL vSize = {0, 0}; - HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); - - if (nD == 1) - m_bIsMono = true; - memset(&vHeader, '\0', 16); - vHeader.cbFix = 16; - vHeader.cx = nW; - vHeader.cy = nH; - vHeader.cPlanes = 1; - vHeader.cBitCount = 24; //nD; - - hBmp = ::GpiCreateBitmap( hPS - ,&vHeader - ,0L - ,NULL - ,NULL - ); - ::GpiDestroyPS(hPS); - ::DevCloseDC(hDC); - } - else - { - HPS hPSScreen; - HDC hDCScreen; - LONG lBitCount; - - hPSScreen = ::WinGetScreenPS(HWND_DESKTOP); - hDCScreen = ::GpiQueryDevice(hPSScreen); - ::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount); - - if (lBitCount > 24) - lBitCount = 24; - - memset(&vHeader, '\0', 16); - vHeader.cbFix = 16; - vHeader.cx = nW; - vHeader.cy = nH; - vHeader.cPlanes = 1; - vHeader.cBitCount = (USHORT)lBitCount; - - hBmp = ::GpiCreateBitmap( hPSScreen - ,&vHeader - ,0L - ,NULL - ,NULL - ); - - GetBitmapData()->m_nDepth = wxDisplayDepth(); - ::WinReleasePS(hPSScreen); - } - SetHBITMAP((WXHBITMAP)hBmp); - - return IsOk(); -} // end of wxBitmap::Create - -bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) -{ - UnRef(); - - wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); - - if ( handler ) - { - m_refData = new wxBitmapRefData; - - return handler->LoadFile(this, filename, type, -1, -1); - } -#if wxUSE_IMAGE - else // no bitmap handler found - { - wxImage image; - if ( image.LoadFile( filename, type ) && image.IsOk() ) - { - *this = wxBitmap(image); - - return true; - } - } -#endif // wxUSE_IMAGE - - return false; -} - -bool wxBitmap::LoadFile( - int nId -, wxBitmapType lType -) -{ - UnRef(); - - wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType) - ,wxBitmapHandler - ); - - if (pHandler) - { - m_refData = new wxBitmapRefData; - - return(pHandler->LoadFile( this - ,nId - ,lType - , -1 - , -1 - )); - } - else - { - return false; - } -} // end of wxBitmap::LoadFile - -bool wxBitmap::Create( - const void* pData -, wxBitmapType lType -, int nWidth -, int nHeight -, int nDepth -) -{ - UnRef(); - - wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType) - ,wxBitmapHandler - ); - - if (!pHandler) - { - wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), lType); - - return false; - } - - m_refData = new wxBitmapRefData; - - return(pHandler->Create( this - ,pData - ,lType - ,nWidth - ,nHeight - ,nDepth - )); -} // end of wxBitmap::Create - -bool wxBitmap::SaveFile( - const wxString& rFilename -, wxBitmapType lType -, const wxPalette* pPalette -) -{ - wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType) - ,wxBitmapHandler - ); - - if (pHandler) - { - return pHandler->SaveFile( this - ,rFilename - ,lType - ,pPalette - ); - } - else - { - // FIXME what about palette? shouldn't we use it? - wxImage vImage = ConvertToImage(); - - if (!vImage.IsOk()) - return false; - - return(vImage.SaveFile( rFilename - ,lType - )); - } -} // end of wxBitmap::SaveFile - - -// ---------------------------------------------------------------------------- -// wxImage-wxBitmap conversion -// ---------------------------------------------------------------------------- - -bool wxBitmap::CreateFromImage ( - const wxImage& rImage -, int nDepth -) -{ - wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image")); - m_refData = new wxBitmapRefData(); - - int nSizeLimit = 1024 * 768 * 3; - int nWidth = rImage.GetWidth(); - int nBmpHeight = rImage.GetHeight(); - int nBytePerLine = nWidth * 3; - int nSizeDWORD = sizeof(DWORD); - int nLineBoundary = nBytePerLine % nSizeDWORD; - int nPadding = 0; - - if (nLineBoundary > 0) - { - nPadding = nSizeDWORD - nLineBoundary; - nBytePerLine += nPadding; - } - - // - // Calc the number of DIBs and heights of DIBs - // - int nNumDIB = 1; - int nHRemain = 0; - int nHeight = nSizeLimit / nBytePerLine; - - if (nHeight >= nBmpHeight) - nHeight = nBmpHeight; - else - { - nNumDIB = nBmpHeight / nHeight; - nHRemain = nBmpHeight % nHeight; - if (nHRemain > 0) - nNumDIB++; - } - - // - // Set bitmap parameters - // - wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image")); - SetWidth(nWidth); - SetHeight(nBmpHeight); - if (nDepth == 1) - m_bIsMono = true; - else - m_bIsMono = false; - if (nDepth == -1) - nDepth = wxDisplayDepth(); - SetDepth(nDepth); - -#if wxUSE_PALETTE - // - // Copy the palette from the source image - // - SetPalette(rImage.GetPalette()); -#endif // wxUSE_PALETTE - - // - // Create a DIB header - // - BITMAPINFOHEADER2 vHeader; - BITMAPINFO2 vInfo; - - // - // Fill in the DIB header - // - memset(&vHeader, '\0', 16); - vHeader.cbFix = 16; - vHeader.cx = (ULONG)nWidth; - vHeader.cy = (ULONG)nHeight; - vHeader.cPlanes = 1L; - vHeader.cBitCount = 24; - - // - // Memory for DIB data - // - unsigned char* pucBits; - - pucBits = (unsigned char *)malloc(nBytePerLine * nHeight); - if(!pucBits) - { - wxFAIL_MSG(wxT("could not allocate memory for DIB")); - return false; - } - memset(pucBits, '\0', (nBytePerLine * nHeight)); - - // - // Create and set the device-dependent bitmap - // - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - SIZEL vSize = {0, 0}; - HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); - LONG lScans; - HDC hDCScreen = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPSScreen; - HBITMAP hBmp; - HBITMAP hBmpOld; - - memset(&vInfo, '\0', 16); - vInfo.cbFix = 16; - vInfo.cx = (ULONG)nWidth; - vInfo.cy = (ULONG)nHeight; - vInfo.cPlanes = 1; - vInfo.cBitCount = 24; // Set to desired count going in - - hBmp = ::GpiCreateBitmap( hPS - ,&vHeader - ,0L - ,NULL - ,NULL - ); -#if wxUSE_PALETTE - HPAL hOldPalette = NULLHANDLE; - if (rImage.GetPalette().IsOk()) - { - hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE()); - } -#endif // wxUSE_PALETTE - - // - // Copy image data into DIB data and then into DDB (in a loop) - // - unsigned char* pData = rImage.GetData(); - int i; - int j; - int n; - int nOrigin = 0; - unsigned char* ptdata = pData; - unsigned char* ptbits; - - if ((hBmpOld = ::GpiSetBitmap(hPS, hBmp)) == HBM_ERROR) - { - ERRORID vError; - wxString sError; - - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - for (n = 0; n < nNumDIB; n++) - { - if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0) - { - // - // Redefine height and size of the (possibly) last smaller DIB - // memory is not reallocated - // - nHeight = nHRemain; - vHeader.cy = (DWORD)(nHeight); - vHeader.cbImage = nBytePerLine * nHeight; - } - ptbits = pucBits; - for (j = 0; j < nHeight; j++) - { - for (i = 0; i < nWidth; i++) - { - *(ptbits++) = *(ptdata + 2); - *(ptbits++) = *(ptdata + 1); - *(ptbits++) = *(ptdata); - ptdata += 3; - } - for (i = 0; i < nPadding; i++) - *(ptbits++) = 0; - } - - // - // Have to do something similar to WIN32's StretchDIBits, use GpiBitBlt - // in combination with setting the bits into the selected bitmap - // - if ((lScans = ::GpiSetBitmapBits( hPS - ,0 // Start at the bottom - ,(LONG)nHeight // One line per scan - ,(PBYTE)pucBits - ,&vInfo - )) == GPI_ALTERROR) - { - ERRORID vError; - wxString sError; - - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - hPSScreen = ::GpiCreatePS( vHabmain - ,hDCScreen - ,&vSize - ,PU_PELS | GPIA_ASSOC - ); - - POINTL vPoint[4] = { {0, nOrigin}, - {nWidth, nHeight}, - {0, 0}, {nWidth, nHeight} - }; - - - ::GpiBitBlt( hPSScreen - ,hPS - ,4 - ,vPoint - ,ROP_SRCCOPY - ,BBO_IGNORE - ); - ::GpiDestroyPS(hPSScreen); - nOrigin += nHeight; - } - SetHBITMAP((WXHBITMAP)hBmp); -#if wxUSE_PALETTE - if (hOldPalette) - ::GpiSelectPalette(hPS, hOldPalette); -#endif // wxUSE_PALETTE - - // - // Similarly, created an mono-bitmap for the possible mask - // - if (rImage.HasMask()) - { - vHeader.cbFix = 16; - vHeader.cx = nWidth; - vHeader.cy = nHeight; - vHeader.cPlanes = 1; - vHeader.cBitCount = 24; - hBmp = ::GpiCreateBitmap( hPS - ,&vHeader - ,0L - ,NULL - ,NULL - ); - hBmpOld = ::GpiSetBitmap(hPS, hBmp); - if (nNumDIB == 1) - nHeight = nBmpHeight; - else - nHeight = nSizeLimit / nBytePerLine; - vHeader.cy = (DWORD)(nHeight); - nOrigin = 0; - - unsigned char cRed = rImage.GetMaskRed(); - unsigned char cGreen = rImage.GetMaskGreen(); - unsigned char cBlue = rImage.GetMaskBlue(); - unsigned char cZero = 0; - unsigned char cOne = 255; - - ptdata = pData; - for (n = 0; n < nNumDIB; n++) - { - if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0) - { - // - // Redefine height and size of the (possibly) last smaller DIB - // memory is not reallocated - // - nHeight = nHRemain; - vHeader.cy = (DWORD)(nHeight); - vHeader.cbImage = nBytePerLine * nHeight; - } - ptbits = pucBits; - for (int j = 0; j < nHeight; j++) - { - for (i = 0; i < nWidth; i++) - { - unsigned char cRedImage = (*(ptdata++)) ; - unsigned char cGreenImage = (*(ptdata++)) ; - unsigned char cBlueImage = (*(ptdata++)) ; - - if ((cRedImage != cRed) || (cGreenImage != cGreen) || (cBlueImage != cBlue)) - { - *(ptbits++) = cOne; - *(ptbits++) = cOne; - *(ptbits++) = cOne; - } - else - { - *(ptbits++) = cZero; - *(ptbits++) = cZero; - *(ptbits++) = cZero; - } - } - for (i = 0; i < nPadding; i++) - *(ptbits++) = cZero; - } - lScans = ::GpiSetBitmapBits( hPS - ,0 // Start at the bottom - ,(LONG)nHeight // One line per scan - ,(PBYTE)pucBits - ,&vInfo - ); - hPSScreen = ::GpiCreatePS( vHabmain - ,hDCScreen - ,&vSize - ,PU_PELS | GPIA_ASSOC - ); - POINTL vPoint2[4] = { {0, nOrigin}, - {nWidth, nHeight}, - {0, 0}, {nWidth, nHeight} - }; - ::GpiBitBlt( hPSScreen - ,hPS - ,4 - ,vPoint2 - ,ROP_SRCCOPY - ,BBO_IGNORE - ); - ::GpiDestroyPS(hPSScreen); - nOrigin += nHeight; - } - - // - // Create a wxMask object - // - wxMask* pMask = new wxMask(); - - pMask->SetMaskBitmap((WXHBITMAP)hBmp); - SetMask(pMask); - hBmpOld = ::GpiSetBitmap(hPS, hBmpOld); - } - - // - // Free allocated resources - // - ::GpiSetBitmap(hPS, NULLHANDLE); - ::GpiDestroyPS(hPS); - ::DevCloseDC(hDCScreen); - ::DevCloseDC(hDC); - free(pucBits); - return true; -} // end of wxBitmap::CreateFromImage - -wxImage wxBitmap::ConvertToImage() const -{ - wxImage vImage; - wxDC* pDC; - - wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); - - // - // Create an wxImage object - // - int nWidth = GetWidth(); - int nHeight = GetHeight(); - int nDevWidth; - int nDevHeight; - int nBytePerLine = nWidth * 3; - int nSizeDWORD = sizeof(DWORD); - int nLineBoundary = nBytePerLine % nSizeDWORD; - int nPadding = 0; - unsigned char* pData; - unsigned char* lpBits; - long lScans; - BITMAPINFOHEADER2 vDIBh; - BITMAPINFO2 vDIBInfo; - HPS hPSMem; - HBITMAP hBitmap; - HBITMAP hOldBitmap; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - SIZEL vSizlPage = {0,0}; - HDC hDCMem = NULLHANDLE; - - vImage.Create( nWidth - ,nHeight - ); - pData = vImage.GetData(); - if(!pData) - { - wxFAIL_MSG( wxT("could not allocate data for image") ); - return wxNullImage; - } - if(nLineBoundary > 0) - { - nPadding = nSizeDWORD - nLineBoundary; - nBytePerLine += nPadding; - } - wxDisplaySize( &nDevWidth - ,&nDevHeight - ); - // - // Create and fill a DIB header - // - memset(&vDIBh, '\0', 16); - vDIBh.cbFix = 16; - vDIBh.cx = nWidth; - vDIBh.cy = nHeight; - vDIBh.cPlanes = 1; - vDIBh.cBitCount = 24; - - memset(&vDIBInfo, '\0', 16); - vDIBInfo.cbFix = 16; - vDIBInfo.cx = nWidth; - vDIBInfo.cy = nHeight; - vDIBInfo.cPlanes = 1; - vDIBInfo.cBitCount = 24; - - lpBits = (unsigned char *)malloc(nBytePerLine * nHeight); - if (!lpBits) - { - wxFAIL_MSG(wxT("could not allocate data for DIB")); - free(pData); - return wxNullImage; - } - memset(lpBits, '\0', (nBytePerLine * nHeight)); - hBitmap = (HBITMAP)GetHBITMAP(); - - // - // May already be selected into a PS - // - pDC = GetSelectedInto(); - const wxPMDCImpl *impl; - if (pDC != NULL && - (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL) - { - hPSMem = impl->GetHPS(); - } - else - { - hDCMem = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,5L - ,(PDEVOPENDATA)&vDop - ,NULLHANDLE - ); - hPSMem = ::GpiCreatePS( vHabmain - ,hDCMem - ,&vSizlPage - ,PU_PELS | GPIA_ASSOC - ); - } - if ((hOldBitmap = ::GpiSetBitmap(hPSMem, hBitmap)) == HBM_ERROR) - { - ERRORID vError; - wxString sError; - - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - - // - // Copy data from the device-dependent bitmap to the DIB - // - if ((lScans = ::GpiQueryBitmapBits( hPSMem - ,0L - ,(LONG)nHeight - ,(PBYTE)lpBits - ,&vDIBInfo - )) == GPI_ALTERROR) - { - ERRORID vError; - wxString sError; - - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - - // - // Copy DIB data into the wxImage object - // - int i; - int j; - unsigned char* ptdata = pData; - unsigned char* ptbits = lpBits; - - for (i = 0; i < nHeight; i++) - { - for (j = 0; j < nWidth; j++) - { - *(ptdata++) = *(ptbits+2); - *(ptdata++) = *(ptbits+1); - *(ptdata++) = *(ptbits ); - ptbits += 3; - } - ptbits += nPadding; - } - if ((pDC = GetSelectedInto()) == NULL) - { - ::GpiSetBitmap(hPSMem, NULLHANDLE); - ::GpiDestroyPS(hPSMem); - ::DevCloseDC(hDCMem); - } - - // - // Similarly, set data according to the possible mask bitmap - // - if (GetMask() && GetMask()->GetMaskBitmap()) - { - hBitmap = (HBITMAP)GetMask()->GetMaskBitmap(); - - // - // Memory DC/PS created, color set, data copied, and memory DC/PS deleted - // - HDC hMemDC = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,5L - ,(PDEVOPENDATA)&vDop - ,NULLHANDLE - ); - HPS hMemPS = ::GpiCreatePS( vHabmain - ,hMemDC - ,&vSizlPage - ,PU_PELS | GPIA_ASSOC - ); - ::GpiSetColor(hMemPS, OS2RGB(0, 0, 0)); - ::GpiSetBackColor(hMemPS, OS2RGB(255, 255, 255) ); - ::GpiSetBitmap(hMemPS, hBitmap); - ::GpiQueryBitmapBits( hPSMem - ,0L - ,(LONG)nHeight - ,(PBYTE)lpBits - ,&vDIBInfo - ); - ::GpiSetBitmap(hMemPS, NULLHANDLE); - ::GpiDestroyPS(hMemPS); - ::DevCloseDC(hMemDC); - - // - // Background color set to RGB(16,16,16) in consistent with wxGTK - // - unsigned char ucRed = 16; - unsigned char ucGreen = 16; - unsigned char ucBlue = 16; - - ptdata = pData; - ptbits = lpBits; - for (i = 0; i < nHeight; i++) - { - for (j = 0; j < nWidth; j++) - { - if (*ptbits != 0) - ptdata += 3; - else - { - *(ptdata++) = ucRed; - *(ptdata++) = ucGreen; - *(ptdata++) = ucBlue; - } - ptbits += 3; - } - ptbits += nPadding; - } - vImage.SetMaskColour( ucRed - ,ucGreen - ,ucBlue - ); - vImage.SetMask(true); - } - else - { - vImage.SetMask(false); - } - - // - // Free allocated resources - // - free(lpBits); - return vImage; -} // end of wxBitmap::ConvertToImage - -// ---------------------------------------------------------------------------- -// sub bitmap extraction -// ---------------------------------------------------------------------------- - -wxBitmap wxBitmap::GetSubBitmap( - const wxRect& rRect -) const -{ - wxCHECK_MSG( IsOk() && - (rRect.x >= 0) && (rRect.y >= 0) && - (rRect.x + rRect.width <= GetWidth()) && - (rRect.y + rRect.height <= GetHeight()), - wxNullBitmap, wxT("Invalid bitmap or bitmap region") ); - - wxBitmap vRet( rRect.width - ,rRect.height - ,GetDepth() - ); - wxASSERT_MSG( vRet.IsOk(), wxT("GetSubBitmap error") ); - - - // - // Copy bitmap data - // - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); - HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { {0, 0}, {rRect.width, rRect.height}, - {rRect.x, rRect.y}, - {rRect.x + rRect.width, rRect.y + rRect.height} - }; - - ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); - ::GpiSetBitmap(hPSDst, (HBITMAP) vRet.GetHBITMAP()); - ::GpiBitBlt( hPSDst - ,hPSSrc - ,4L - ,vPoint - ,ROP_SRCCOPY - ,BBO_IGNORE - ); - - // - // Copy mask if there is one - // - if (GetMask()) - { - BITMAPINFOHEADER2 vBmih; - - memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); - vBmih.cbFix = sizeof(BITMAPINFOHEADER2); - vBmih.cx = rRect.width; - vBmih.cy = rRect.height; - vBmih.cPlanes = 1; - vBmih.cBitCount = 24; - - HBITMAP hBmpMask = ::GpiCreateBitmap( hPSDst - ,&vBmih - ,0L - ,NULL - ,NULL - ); - - ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); - ::GpiSetBitmap(hPSDst, (HBITMAP) vRet.GetHBITMAP()); - - ::GpiSetBitmap(hPSSrc, (HBITMAP) GetMask()->GetMaskBitmap()); - ::GpiSetBitmap(hPSDst, (HBITMAP) hBmpMask); - ::GpiBitBlt( hPSDst - ,hPSSrc - ,4L - ,vPoint - ,ROP_SRCCOPY - ,BBO_IGNORE - ); - - wxMask* pMask = new wxMask((WXHBITMAP)hBmpMask); - vRet.SetMask(pMask); - } - - ::GpiSetBitmap(hPSSrc, NULL); - ::GpiSetBitmap(hPSDst, NULL); - ::GpiDestroyPS(hPSSrc); - ::GpiDestroyPS(hPSDst); - ::DevCloseDC(hDCSrc); - ::DevCloseDC(hDCDst); - return vRet; -} // end of wxBitmap::GetSubBitmap - -// ---------------------------------------------------------------------------- -// wxBitmap accessors -// ---------------------------------------------------------------------------- - -void wxBitmap::SetQuality( - int nQ -) -{ - EnsureHasData(); - - GetBitmapData()->m_nQuality = nQ; -} // end of wxBitmap::SetQuality - -void wxBitmap::SetPalette( - const wxPalette& rPalette -) -{ - EnsureHasData(); - - GetBitmapData()->m_vBitmapPalette = rPalette; -} // end of wxBitmap::SetPalette - -void wxBitmap::SetMask( - wxMask* pMask -) -{ - EnsureHasData(); - - GetBitmapData()->m_pBitmapMask = pMask; -} // end of wxBitmap::SetMask - -wxBitmap wxBitmap::GetBitmapForDC(wxDC& WXUNUSED(rDc)) const -{ - return(*this); -} // end of wxBitmap::GetBitmapForDC - -// ---------------------------------------------------------------------------- -// wxMask -// ---------------------------------------------------------------------------- - -wxMask::wxMask() -{ - m_hMaskBitmap = 0; -} // end of wxMask::wxMask - -wxMask::wxMask(const wxMask& tocopy) -{ - m_hMaskBitmap = wxCopyBmp(tocopy.m_hMaskBitmap); -} // end of wxMask::wxMask - -// Construct a mask from a bitmap and a colour indicating -// the transparent area -wxMask::wxMask( - const wxBitmap& rBitmap -, const wxColour& rColour -) -{ - m_hMaskBitmap = 0; - Create( rBitmap - ,rColour - ); -} // end of wxMask::wxMask - -// Construct a mask from a bitmap and a palette index indicating -// the transparent area -wxMask::wxMask( - const wxBitmap& rBitmap -, int nPaletteIndex -) -{ - m_hMaskBitmap = 0; - Create( rBitmap - ,nPaletteIndex - ); -} // end of wxMask::wxMask - -// Construct a mask from a mono bitmap (copies the bitmap). -wxMask::wxMask( - const wxBitmap& rBitmap -) -{ - m_hMaskBitmap = 0; - Create(rBitmap); -} // end of wxMask::wxMask - -wxMask::~wxMask() -{ - if (m_hMaskBitmap) - ::GpiDeleteBitmap((HBITMAP)m_hMaskBitmap); -} // end of wxMask::~wxMask - -// Create a mask from a mono bitmap (copies the bitmap). -bool wxMask::Create( - const wxBitmap& rBitmap -) -{ - BITMAPINFOHEADER2 vBmih; - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); - HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { {0 ,0}, {rBitmap.GetWidth(), rBitmap.GetHeight()}, - {0, 0}, {rBitmap.GetWidth(), rBitmap.GetHeight()} - }; - - if (m_hMaskBitmap) - { - ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); - m_hMaskBitmap = 0; - } - if (!rBitmap.IsOk() || rBitmap.GetDepth() != 1) - { - return false; - } - - memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); - vBmih.cbFix = sizeof(BITMAPINFOHEADER2); - vBmih.cx = rBitmap.GetWidth(); - vBmih.cy = rBitmap.GetHeight(); - vBmih.cPlanes = 1; - vBmih.cBitCount = 24; - - m_hMaskBitmap = ::GpiCreateBitmap( hPSDst - ,&vBmih - ,0L - ,NULL - ,NULL - ); - - ::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP()); - ::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap); - ::GpiBitBlt( hPSDst - ,hPSSrc - ,4L - ,vPoint - ,ROP_SRCCOPY - ,BBO_IGNORE - ); - - ::GpiDestroyPS(hPSSrc); - ::GpiDestroyPS(hPSDst); - ::DevCloseDC(hDCSrc); - ::DevCloseDC(hDCDst); - return true; -} // end of wxMask::Create - -// Create a mask from a bitmap and a palette index indicating -// the transparent area -bool wxMask::Create( - const wxBitmap& rBitmap -, int nPaletteIndex -) -{ - if (m_hMaskBitmap) - { - ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); - m_hMaskBitmap = 0; - } - if (rBitmap.IsOk() && rBitmap.GetPalette()->IsOk()) - { - unsigned char cRed; - unsigned char cGreen; - unsigned char cBlue; - - if (rBitmap.GetPalette()->GetRGB( nPaletteIndex - ,&cRed - ,&cGreen - ,&cBlue - )) - { - wxColour vTransparentColour( cRed - ,cGreen - ,cBlue - ); - - return (Create( rBitmap - ,vTransparentColour - )); - } - } - return false; -} // end of wxMask::Create - -// Create a mask from a bitmap and a colour indicating -// the transparent area -bool wxMask::Create( - const wxBitmap& rBitmap -, const wxColour& rColour -) -{ - bool bOk = true; - COLORREF vMaskColour = OS2RGB( rColour.Red() - ,rColour.Green() - ,rColour.Blue() - ); - BITMAPINFOHEADER2 vBmih; - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); - HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - - if (m_hMaskBitmap) - { - ::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap); - m_hMaskBitmap = 0; - } - if (!rBitmap.IsOk()) - { - return false; - } - - // - // Scan the bitmap for the transparent colour and set - // the corresponding pixels in the mask to BLACK and - // the rest to WHITE - // - - memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); - vBmih.cbFix = sizeof(BITMAPINFOHEADER2); - vBmih.cx = rBitmap.GetWidth(); - vBmih.cy = rBitmap.GetHeight(); - vBmih.cPlanes = 1; - vBmih.cBitCount = 1; - - m_hMaskBitmap = ::GpiCreateBitmap( hPSDst - ,&vBmih - ,0L - ,NULL - ,NULL - ); - - ::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP()); - ::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap); - - // - // This is not very efficient, but I can't think - // of a better way of doing it - // - for (int w = 0; w < rBitmap.GetWidth(); w++) - { - for (int h = 0; h < rBitmap.GetHeight(); h++) - { - POINTL vPt = {w, h}; - COLORREF vCol = (COLORREF)::GpiQueryPel(hPSSrc, &vPt); - if (vCol == (COLORREF)CLR_NOINDEX) - { - // - // Doesn't make sense to continue - // - bOk = false; - break; - } - - if (vCol == vMaskColour) - { - ::GpiSetColor(hPSDst, OS2RGB(0, 0, 0)); - ::GpiSetPel(hPSDst, &vPt); - } - else - { - ::GpiSetColor(hPSDst, OS2RGB(255, 255, 255)); - ::GpiSetPel(hPSDst, &vPt); - } - } - } - ::GpiSetBitmap(hPSSrc, NULL); - ::GpiSetBitmap(hPSDst, NULL); - ::GpiDestroyPS(hPSSrc); - ::GpiDestroyPS(hPSDst); - ::DevCloseDC(hDCSrc); - ::DevCloseDC(hDCDst); - return true; -} // end of wxMask::Create - -// ---------------------------------------------------------------------------- -// wxBitmapHandler -// ---------------------------------------------------------------------------- - -bool wxBitmapHandler::Create( wxGDIImage* pImage, - const void* pData, - wxBitmapType lType, - int nWidth, - int nHeight, - int nDepth) -{ - wxBitmap* pBitmap = wxDynamicCast( pImage - ,wxBitmap - ); - - return(pBitmap ? Create( pBitmap - ,pData - ,lType - ,nWidth - ,nHeight - ,nDepth - ) : false); -} - -bool wxBitmapHandler::Load( - wxGDIImage* pImage -, int nId -, wxBitmapType lFlags -, int nWidth -, int nHeight -) -{ - wxBitmap* pBitmap = wxDynamicCast( pImage - ,wxBitmap - ); - - return(pBitmap ? LoadFile( pBitmap - ,nId - ,lFlags - ,nWidth - ,nHeight - ) : false); -} - -bool wxBitmapHandler::Save( - const wxGDIImage* pImage -, const wxString& rName -, wxBitmapType lType -) const -{ - wxBitmap* pBitmap = wxDynamicCast( pImage - ,wxBitmap - ); - - return(pBitmap ? SaveFile( pBitmap - ,rName - ,lType - ) : false); -} - -bool wxBitmapHandler::Create( - wxBitmap* WXUNUSED(pBitmap) -, const void* WXUNUSED(pData) -, wxBitmapType WXUNUSED(lType) -, int WXUNUSED(nWidth) -, int WXUNUSED(nHeight) -, int WXUNUSED(nDepth) -) -{ - return false; -} - -bool wxBitmapHandler::LoadFile( - wxBitmap* WXUNUSED(pBitmap) -, int WXUNUSED(nId) -, wxBitmapType WXUNUSED(lType) -, int WXUNUSED(nDesiredWidth) -, int WXUNUSED(nDesiredHeight) -) -{ - return false; -} - -bool wxBitmapHandler::LoadFile( - wxBitmap* WXUNUSED(pBitmap) -, const wxString& WXUNUSED(rName) -, wxBitmapType WXUNUSED(lType) -, int WXUNUSED(nDesiredWidth) -, int WXUNUSED(nDesiredHeight) -) -{ - return false; -} - -bool wxBitmapHandler::SaveFile( - wxBitmap* WXUNUSED(pBitmap) -, const wxString& WXUNUSED(rName) -, wxBitmapType WXUNUSED(nType) -, const wxPalette* WXUNUSED(pPalette) -) const -{ - return false; -} - -// ---------------------------------------------------------------------------- -// Utility functions -// ---------------------------------------------------------------------------- -HBITMAP wxInvertMask( - HBITMAP hBmpMask -, int nWidth -, int nHeight -) -{ - HBITMAP hBmpInvMask = 0; - - wxCHECK_MSG( hBmpMask, 0, wxT("invalid bitmap in wxInvertMask") ); - - // - // Get width/height from the bitmap if not given - // - if (!nWidth || !nHeight) - { - BITMAPINFOHEADER2 vBmhdr; - - ::GpiQueryBitmapInfoHeader( hBmpMask - ,&vBmhdr - ); - nWidth = (int)vBmhdr.cx; - nHeight = (int)vBmhdr.cy; - } - - BITMAPINFOHEADER2 vBmih; - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); - HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { {0 ,0}, {nWidth, nHeight}, - {0, 0}, {nWidth, nHeight} - }; - - memset(&vBmih, '\0', 16); - vBmih.cbFix = 16; - vBmih.cx = nWidth; - vBmih.cy = nHeight; - vBmih.cPlanes = 1; - vBmih.cBitCount = 24; - - hBmpInvMask = ::GpiCreateBitmap( hPSDst - ,&vBmih - ,0L - ,NULL - ,NULL - ); - - ::GpiSetBitmap(hPSSrc, (HBITMAP) hBmpMask); - ::GpiSetBitmap(hPSDst, (HBITMAP) hBmpInvMask); - - ::GpiBitBlt( hPSDst - ,hPSSrc - ,4L - ,vPoint - ,ROP_SRCINVERT - ,BBO_IGNORE - ); - - ::GpiDestroyPS(hPSSrc); - ::GpiDestroyPS(hPSDst); - ::DevCloseDC(hDCSrc); - ::DevCloseDC(hDCDst); - - return hBmpInvMask; -} // end of WxWinGdi_InvertMask - -HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight ) -{ - wxCHECK_MSG( hBmp, 0, wxT("invalid bitmap in wxCopyBmp") ); - - // - // Get width/height from the bitmap if not given - // - if (!nWidth || !nHeight) - { - BITMAPINFOHEADER2 vBmhdr; - - vBmhdr.cbFix = 16; - ::GpiQueryBitmapInfoHeader( hBmp, - &vBmhdr ); - nWidth = (int)vBmhdr.cx; - nHeight = (int)vBmhdr.cy; - } - - BITMAPINFOHEADER2 vBmih; - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDCSrc = ::DevOpenDC( vHabmain, - OD_MEMORY, - "*", - 5L, - (PDEVOPENDATA)&vDop, - NULLHANDLE ); - HDC hDCDst = ::DevOpenDC( vHabmain, - OD_MEMORY, - "*", - 5L, - (PDEVOPENDATA)&vDop, - NULLHANDLE ); - HPS hPSSrc = ::GpiCreatePS( vHabmain, - hDCSrc, - &vSize, - PU_PELS | GPIA_ASSOC ); - HPS hPSDst = ::GpiCreatePS( vHabmain, - hDCDst, - &vSize, - PU_PELS | GPIA_ASSOC ); - POINTL vPoint[4] = { {0, nHeight}, - {nWidth, 0}, - {0, 0}, - {nWidth, nHeight} }; - if (!flip) - { - vPoint[0].y = 0; - vPoint[1].y = nHeight; - } - memset(&vBmih, '\0', 16); - vBmih.cbFix = 16; - vBmih.cx = nWidth; - vBmih.cy = nHeight; - vBmih.cPlanes = 1; - vBmih.cBitCount = 24; - - HBITMAP hInvBmp = ::GpiCreateBitmap( hPSDst, - &vBmih, - 0L, - NULL, - NULL ); - - ::GpiSetBitmap(hPSSrc, (HBITMAP) hBmp); - ::GpiSetBitmap(hPSDst, (HBITMAP) hInvBmp); - - ::GpiBitBlt( hPSDst, - hPSSrc, - 4L, - vPoint, - ROP_SRCCOPY, - BBO_IGNORE ); - - ::GpiDestroyPS(hPSSrc); - ::GpiDestroyPS(hPSDst); - ::DevCloseDC(hDCSrc); - ::DevCloseDC(hDCDst); - - return hInvBmp; -} // end of wxFlipBmp diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp deleted file mode 100644 index 57b654bc45..0000000000 --- a/src/os2/bmpbuttn.cpp +++ /dev/null @@ -1,299 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/bmpbuttn.cpp -// Purpose: wxBitmapButton -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_BMPBUTTON - -#include "wx/bmpbuttn.h" - -#ifndef WX_PRECOMP -#endif - -#include "wx/os2/dcclient.h" -#include "wx/os2/private.h" - - -#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) - -bool wxBitmapButton::Create( wxWindow* pParent, - wxWindowID vId, - const wxBitmap& rBitmap, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxValidator& rValidator, - const wxString& rsName ) -{ - m_bitmaps[State_Normal] = rBitmap; - SetName(rsName); -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - - pParent->AddChild(this); - - m_backgroundColour = pParent->GetBackgroundColour() ; - m_foregroundColour = pParent->GetForegroundColour() ; - m_windowStyle = lStyle; - - if (lStyle & wxBU_AUTODRAW) - { - m_marginX = wxDEFAULT_BUTTON_MARGIN; - m_marginY = wxDEFAULT_BUTTON_MARGIN; - } - - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - - if (vId == wxID_ANY) - m_windowId = NewControlId(); - else - m_windowId = vId; - - if (nWidth == wxDefaultCoord && rBitmap.IsOk()) - nWidth = rBitmap.GetWidth() + 4 * m_marginX; - - if (nHeight == wxDefaultCoord && rBitmap.IsOk()) - nHeight = rBitmap.GetHeight() + 4 * m_marginY; - - ULONG ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON; - - if (m_windowStyle & wxCLIP_SIBLINGS) - ulOS2Style |= WS_CLIPSIBLINGS; - - m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent) - ,WC_BUTTON - ,(PSZ)wxEmptyString - ,ulOS2Style - ,0, 0, 0, 0 - ,GetHwndOf(pParent) - ,HWND_TOP - ,m_windowId - ,NULL - ,NULL - ); - - // - //Subclass again for purposes of dialog editing mode - // - SubclassWin(m_hWnd); - SetFont(*wxSMALL_FONT); - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - return true; -} // end of wxBitmapButton::Create - -bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem) -{ - PUSERBUTTON pUser = (PUSERBUTTON)pItem; - bool bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0; - - if (!pUser) - return false; - - wxBitmap bitmap; - bool bIsSelected = pUser->fsState & BDS_HILITED; - wxClientDC vDc(this); - - if (bIsSelected) - bitmap = GetBitmapPressed(); - else if (pUser->fsState & BDS_DEFAULT) - bitmap = GetBitmapFocus(); - else if (pUser->fsState & BDS_DISABLED) - bitmap = GetBitmapDisabled(); - - if (!bitmap.IsOk() ) - { - bitmap = GetBitmapLabel(); - if (!bitmap.IsOk() ) - return false; - } - - - // - // Centre the bitmap in the control area - // - int nX1 = 0; - int nY1 = 0; - wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl(); - int nWidth = impl->m_vRclPaint.xRight - impl->m_vRclPaint.xLeft; - int nHeight = impl->m_vRclPaint.yTop - impl->m_vRclPaint.yBottom; - int nBmpWidth = bitmap.GetWidth(); - int nBmpHeight = bitmap.GetHeight(); - - nX1 = (nWidth - nBmpWidth) / 2; - nY1 = (nHeight - nBmpHeight) / 2; - - if (bIsSelected && bAutoDraw) - { - nX1++; - nY1++; - } - - // - // Draw the button face - // - DrawFace( vDc, bIsSelected ); - - // - // Draw the bitmap - // - vDc.DrawBitmap( bitmap, nX1, nY1, true ); - - // - // Draw focus / disabled state, if auto-drawing - // - if ((pUser->fsState == BDS_DISABLED) && bAutoDraw) - { - DrawButtonDisable( vDc, bitmap ); - } - else if ((pUser->fsState == BDS_DEFAULT) && bAutoDraw) - { - DrawButtonFocus(vDc); - } - return true; -} // end of wxBitmapButton::OS2OnDraw - -void wxBitmapButton::DrawFace (wxClientDC& rDC, bool bSel) -{ - // - // Set up drawing colors - // - wxPen vHiLitePen(*wxWHITE, 2, wxSOLID); // White - wxColour gray85(85, 85, 85); - wxPen vDarkShadowPen(gray85, 2, wxSOLID); - wxColour vFaceColor(204, 204, 204); // Light Grey - - // - // Draw the main button face - // - // This triggers a redraw and destroys the bottom & left focus border and - // doesn't seem to do anything useful. - // ::WinFillRect(rDC.GetHPS(), &rDC.m_vRclPaint, vFaceColor.GetPixel()); - - // - // Draw the border - // Note: DrawLine expects wxWidgets coordinate system so swap - // - rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen); - wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); - // top - rDC.DrawLine( impl->m_vRclPaint.xLeft + 1 - ,impl->m_vRclPaint.yBottom + 1 - ,impl->m_vRclPaint.xRight - 1 - ,impl->m_vRclPaint.yBottom + 1 - ); - // left - rDC.DrawLine( impl->m_vRclPaint.xLeft + 1 - ,impl->m_vRclPaint.yBottom + 1 - ,impl->m_vRclPaint.xLeft + 1 - ,impl->m_vRclPaint.yTop - 1 - ); - - rDC.SetPen(bSel ? vHiLitePen : vDarkShadowPen); - // bottom - rDC.DrawLine( impl->m_vRclPaint.xLeft + 1 - ,impl->m_vRclPaint.yTop - 1 - ,impl->m_vRclPaint.xRight - 1 - ,impl->m_vRclPaint.yTop - 1 - ); - // right - rDC.DrawLine( impl->m_vRclPaint.xRight - 1 - ,impl->m_vRclPaint.yBottom + 1 - ,impl->m_vRclPaint.xRight - 1 - ,impl->m_vRclPaint.yTop - 1 - ); - -} // end of wxBitmapButton::DrawFace - -void wxBitmapButton::DrawButtonFocus ( - wxClientDC& rDC -) -{ - wxPen vBlackPen(*wxBLACK, 2, wxSOLID); - - // - // Draw a thick black line around the outside of the button - // Note: DrawLine expects wxWidgets coordinate system so swap - // - rDC.SetPen(vBlackPen); - wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); - // top - rDC.DrawLine( impl->m_vRclPaint.xLeft - ,impl->m_vRclPaint.yBottom - ,impl->m_vRclPaint.xRight - ,impl->m_vRclPaint.yBottom - ); - // right - rDC.DrawLine( impl->m_vRclPaint.xRight - ,impl->m_vRclPaint.yBottom - ,impl->m_vRclPaint.xRight - ,impl->m_vRclPaint.yTop - ); - // bottom - rDC.DrawLine( impl->m_vRclPaint.xRight - ,impl->m_vRclPaint.yTop - ,impl->m_vRclPaint.xLeft - ,impl->m_vRclPaint.yTop - ); - // left - rDC.DrawLine( impl->m_vRclPaint.xLeft - ,impl->m_vRclPaint.yTop - ,impl->m_vRclPaint.xLeft - ,impl->m_vRclPaint.yBottom - ); -} // end of wxBitmapButton::DrawButtonFocus - -void wxBitmapButton::DrawButtonDisable( wxClientDC& rDC, - wxBitmap& rBmp ) -{ - wxPen vGreyPen(wxT("GREY"), 2, wxSOLID); - - // - // Draw a thick black line around the outside of the button - // Note: DrawLine expects wxWidgets coordinate system so swap - // - rDC.SetPen(vGreyPen); - wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); - // top - rDC.DrawLine( impl->m_vRclPaint.xLeft - ,impl->m_vRclPaint.yBottom - ,impl->m_vRclPaint.xRight - ,impl->m_vRclPaint.yBottom - ); - // right - rDC.DrawLine( impl->m_vRclPaint.xRight - ,impl->m_vRclPaint.yBottom - ,impl->m_vRclPaint.xRight - ,impl->m_vRclPaint.yTop - ); - // bottom - rDC.DrawLine( impl->m_vRclPaint.xRight - ,impl->m_vRclPaint.yTop - ,impl->m_vRclPaint.xLeft - ,impl->m_vRclPaint.yTop - ); - // left - rDC.DrawLine( impl->m_vRclPaint.xLeft - ,impl->m_vRclPaint.yTop - ,impl->m_vRclPaint.xLeft - ,impl->m_vRclPaint.yBottom - ); - wxDisableBitmap(rBmp, vGreyPen.GetColour().GetPixel()); -} // end of wxBitmapButton::DrawButtonDisable - -#endif // ndef for wxUSE_BMPBUTTON diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp deleted file mode 100644 index a8523da3fd..0000000000 --- a/src/os2/brush.cpp +++ /dev/null @@ -1,382 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/brush.cpp -// Purpose: wxBrush -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/brush.h" - #include "wx/log.h" -#endif - -#include "wx/os2/private.h" - -class WXDLLEXPORT wxBrushRefData: public wxGDIRefData -{ - friend class WXDLLIMPEXP_FWD_CORE wxBrush; -public: - wxBrushRefData(const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID); - wxBrushRefData(const wxBitmap& stipple); - wxBrushRefData(const wxBrushRefData& rData); - virtual ~wxBrushRefData(); - - bool operator == (const wxBrushRefData& data) const - { - return (m_nStyle == data.m_nStyle && - m_vStipple.IsSameAs(data.m_vStipple) && - m_vColour == data.m_vColour); - } - -protected: - wxBrushStyle m_nStyle; - wxBitmap m_vStipple; - wxColour m_vColour; - WXHBRUSH m_hBrush; // in OS/2 GPI this will be the PS the pen is associated with - AREABUNDLE m_vBundle; -}; - -#define M_BRUSHDATA ((wxBrushRefData *)m_refData) - -// ============================================================================ -// wxBrushRefData implementation -// ============================================================================ - -IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) - -// ---------------------------------------------------------------------------- -// wxBrushRefData ctors/dtor -// ---------------------------------------------------------------------------- - -wxBrushRefData::wxBrushRefData(const wxColour& colour, wxBrushStyle style) - : m_vColour(colour) -{ - m_nStyle = style; - m_hBrush = 0; - memset(&m_vBundle, '\0', sizeof(AREABUNDLE)); -} // end of wxBrushRefData::wxBrushRefData - -wxBrushRefData::wxBrushRefData(const wxBitmap& stipple) -{ - m_vStipple = stipple; - m_nStyle = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE - : wxBRUSHSTYLE_STIPPLE; - - m_hBrush = NULL; - memset(&m_vBundle, '\0', sizeof(AREABUNDLE)); -} - -wxBrushRefData::wxBrushRefData(const wxBrushRefData& rData) - : wxGDIRefData(), - m_vStipple(rData.m_vStipple), - m_vColour(rData.m_vColour) -{ - m_nStyle = rData.m_nStyle; - m_hBrush = 0; - memcpy(&m_vBundle, &rData.m_vBundle, sizeof(AREABUNDLE)); -} // end of wxBrushRefData::wxBrushRefData - -wxBrushRefData::~wxBrushRefData() -{ -} // end of wxBrushRefData::~wxBrushRefData - -// ============================================================================ -// wxBrush implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxBrush ctors/dtor -// ---------------------------------------------------------------------------- - -wxBrush::wxBrush() -{ -} // end of wxBrush::wxBrush - -wxBrush::~wxBrush() -{ -} // end of wxBrush::~wxBrush - -wxBrush::wxBrush( - const wxColour& rColour -, wxBrushStyle nStyle -) -{ - m_refData = new wxBrushRefData(rColour, nStyle); - - RealizeResource(); -} // end of wxBrush::wxBrush - -wxBrush::wxBrush(const wxColour& col, int style) -{ - m_refData = new wxBrushRefData(col, (wxBrushStyle)style); - - RealizeResource(); -} - -wxBrush::wxBrush(const wxBitmap& rStipple) -{ - m_refData = new wxBrushRefData(rStipple); - - RealizeResource(); -} // end of wxBrush::wxBrush - -bool wxBrush::RealizeResource() -{ - bool bOk; - ERRORID vError; - wxString sError; - - if (M_BRUSHDATA && M_BRUSHDATA->m_hBrush == 0L) - { - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDC = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,5L - ,(PDEVOPENDATA)&vDop - ,NULLHANDLE - ); - M_BRUSHDATA->m_hBrush = (WXHPEN)::GpiCreatePS( vHabmain - ,hDC - ,&vSize - ,PU_PELS | GPIT_MICRO | GPIA_ASSOC - ); - } - if (M_BRUSHDATA) - { - // - // Set the color table to RGB mode - // - if (!::GpiCreateLogColorTable( (HPS)M_BRUSHDATA->m_hBrush - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str()); - return false; - } - - if (M_BRUSHDATA->m_nStyle==wxTRANSPARENT) - { - return true; - } - COLORREF vPmColour = 0L; - - vPmColour = M_BRUSHDATA->m_vColour.GetPixel() ; - - M_BRUSHDATA->m_vBundle.usSet = LCID_DEFAULT; - switch (M_BRUSHDATA->m_nStyle) - { - case wxTRANSPARENT: - M_BRUSHDATA->m_hBrush = NULL; // Must always select a suitable background brush - break; // - could choose white always for a quick solution - - case wxBDIAGONAL_HATCH: - M_BRUSHDATA->m_vBundle.usSymbol = PATSYM_DIAG3; - break; - - case wxCROSSDIAG_HATCH: - M_BRUSHDATA->m_vBundle.usSymbol = PATSYM_DIAGHATCH; - break; - - case wxFDIAGONAL_HATCH: - M_BRUSHDATA->m_vBundle.usSymbol = PATSYM_DIAG1; - break; - - case wxCROSS_HATCH: - M_BRUSHDATA->m_vBundle.usSymbol = PATSYM_HATCH; - break; - - case wxHORIZONTAL_HATCH: - M_BRUSHDATA->m_vBundle.usSymbol = PATSYM_HORIZ; - break; - - case wxVERTICAL_HATCH: - M_BRUSHDATA->m_vBundle.usSymbol = PATSYM_VERT; - break; - - case wxSTIPPLE: - if (M_BRUSHDATA->m_vStipple.IsOk()) - { - ::GpiSetBitmapId( M_BRUSHDATA->m_hBrush - ,(USHORT)M_BRUSHDATA->m_vStipple.GetHBITMAP() - ,(USHORT)M_BRUSHDATA->m_vStipple.GetId() - ); - ::GpiSetPatternSet( M_BRUSHDATA->m_hBrush - ,(USHORT)M_BRUSHDATA->m_vStipple.GetId() - ); - } - else - M_BRUSHDATA->m_vBundle.usSymbol = PATSYM_SOLID; - break ; - - case wxSOLID: - default: - M_BRUSHDATA->m_vBundle.usSymbol = PATSYM_SOLID; - break; - } -#ifdef WXDEBUG_CREATE - if (M_BRUSHDATA->m_hBrush==NULL) wxError("Cannot create brush","Internal error") ; -#endif - M_BRUSHDATA->m_vBundle.lColor = vPmColour; - M_BRUSHDATA->m_vBundle.lBackColor = RGB_WHITE; - M_BRUSHDATA->m_vBundle.usMixMode = FM_OVERPAINT; - M_BRUSHDATA->m_vBundle.usBackMixMode = BM_OVERPAINT; - - bOk = (bool)::GpiSetAttrs( M_BRUSHDATA->m_hBrush - ,PRIM_AREA - ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | - ABB_SET | ABB_SYMBOL | ABB_REF_POINT - ,ABB_SET | ABB_SYMBOL | ABB_REF_POINT - ,&M_BRUSHDATA->m_vBundle - ); - if (!bOk) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n"), sError.c_str()); - } - return bOk; - } - return false; -} // end of wxBrush::RealizeResource - -// ---------------------------------------------------------------------------- -// wxBrush accessors -// ---------------------------------------------------------------------------- - -wxColour wxBrush::GetColour() const -{ - wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); - - return M_BRUSHDATA->m_vColour; -} - -wxBrushStyle wxBrush::GetStyle() const -{ - wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); - - return M_BRUSHDATA->m_nStyle; -} - -wxBitmap *wxBrush::GetStipple() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); - - return &(M_BRUSHDATA->m_vStipple); -} - -int wxBrush::GetPS() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid brush") ); - - return M_BRUSHDATA->m_hBrush; -} - -WXHANDLE wxBrush::GetResourceHandle() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid brush") ); - - return (WXHANDLE)M_BRUSHDATA->m_hBrush; -} // end of wxBrush::GetResourceHandle - -bool wxBrush::FreeResource( bool WXUNUSED(bForce) ) -{ - if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush != 0)) - { - M_BRUSHDATA->m_hBrush = 0; - return true; - } - else return false; -} // end of wxBrush::FreeResource - -bool wxBrush::IsFree() const -{ - return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0)); -} // end of wxBrush::IsFree - -// ---------------------------------------------------------------------------- -// wxBrush setters -// ---------------------------------------------------------------------------- - -void wxBrush::SetColour( const wxColour& rColour ) -{ - AllocExclusive(); - M_BRUSHDATA->m_vColour = rColour; - RealizeResource(); -} - -void wxBrush::SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue) -{ - AllocExclusive(); - M_BRUSHDATA->m_vColour.Set( cRed, cGreen, cBlue ); - RealizeResource(); -} // end of wxBrush::SetColour - -void wxBrush::SetStyle(wxBrushStyle nStyle) -{ - AllocExclusive(); - M_BRUSHDATA->m_nStyle = nStyle; - RealizeResource(); -} // end of wxBrush::SetStyle - -void wxBrush::SetStipple( - const wxBitmap& rStipple -) -{ - AllocExclusive(); - M_BRUSHDATA->m_vStipple = rStipple; - RealizeResource(); -} // end of wxBrush::SetStipple - -void wxBrush::SetPS( - HPS hPS -) -{ - AllocExclusive(); - if (M_BRUSHDATA->m_hBrush) - ::GpiDestroyPS(M_BRUSHDATA->m_hBrush); - M_BRUSHDATA->m_hBrush = hPS; - RealizeResource(); -} // end of WxWinGdi_CPen::SetPS - -// ---------------------------------------------------------------------------- -// wxBrush house keeping stuff -// ---------------------------------------------------------------------------- - -bool wxBrush::operator == ( - const wxBrush& brush -) const -{ - if (m_refData == brush.m_refData) return true; - - if (!m_refData || !brush.m_refData) return false; - - return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData ); -} // end of wxBrush::operator == - -wxGDIRefData *wxBrush::CreateGDIRefData() const -{ - return new wxBrushRefData; -} - -wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxBrushRefData(*(const wxBrushRefData *)data); -} diff --git a/src/os2/button.cpp b/src/os2/button.cpp deleted file mode 100644 index 4a9626a060..0000000000 --- a/src/os2/button.cpp +++ /dev/null @@ -1,434 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/button.cpp -// Purpose: wxButton -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/button.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/scrolwin.h" - #include "wx/toplevel.h" -#endif - -#include "wx/stockitem.h" -#include "wx/os2/private.h" - -#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10) - -// -// Should be at the very least less than winDEFAULT_BUTTON_MARGIN -// -#define FOCUS_MARGIN 3 - -#ifndef BST_CHECKED -#define BST_CHECKED 0x0001 -#endif - -// Button - -bool wxButton::Create( wxWindow* pParent, - wxWindowID vId, - const wxString& rsLbl, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxValidator& rValidator, - const wxString& rsName) -{ - wxString rsLabel(rsLbl); - if (rsLabel.empty() && wxIsStockID(vId)) - rsLabel = wxGetStockLabel(vId); - - wxString sLabel = ::wxPMTextToLabel(rsLabel); - - SetName(rsName); -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - m_windowStyle = lStyle; - pParent->AddChild((wxButton *)this); - if (vId == -1) - m_windowId = NewControlId(); - else - m_windowId = vId; - lStyle = WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON; - - // - // OS/2 PM does not have Right/Left/Top/Bottom styles. - // We will have to define an additional style when we implement notebooks - // for a notebook page button - // - if (m_windowStyle & wxCLIP_SIBLINGS ) - lStyle |= WS_CLIPSIBLINGS; - - m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent) // Parent handle - ,WC_BUTTON // A Button class window - ,sLabel.c_str() // Button text - ,lStyle // Button style - ,0, 0, 0, 0 // Location and size - ,GetHwndOf(pParent) // Owner handle - ,HWND_TOP // Top of Z-Order - ,vId // Identifier - ,NULL // No control data - ,NULL // No Presentation parameters - ); - if (m_hWnd == 0) - { - return false; - } - - // - // Subclass again for purposes of dialog editing mode - // - SubclassWin(m_hWnd); - wxFont* pButtonFont = new wxFont( 8 - ,wxSWISS - ,wxNORMAL - ,wxNORMAL - ); - SetFont(*pButtonFont); - SetXComp(0); - SetYComp(0); - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); - delete pButtonFont; - return true; -} // end of wxButton::Create - -wxButton::~wxButton() -{ - wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - - if (tlw) - { - if (tlw->GetDefaultItem() == this) - { - // - // Don't leave the panel with invalid default item - // - tlw->SetDefaultItem(NULL); - } - } -} // end of wxButton::~wxButton - -// ---------------------------------------------------------------------------- -// size management including autosizing -// ---------------------------------------------------------------------------- - -wxSize wxButton::DoGetBestSize() const -{ - wxString rsLabel = wxGetWindowText(GetHWND()); - int nWidthButton; - int nWidthChar; - int nHeightChar; - wxFont vFont = (wxFont)GetFont(); - - GetTextExtent( rsLabel - ,&nWidthButton - ,NULL - ); - - wxGetCharSize( GetHWND() - ,&nWidthChar - ,&nHeightChar - ,&vFont - ); - - // - // Add a margin - the button is wider than just its label - // - nWidthButton += 3 * nWidthChar; - - // - // The button height is proportional to the height of the font used - // - int nHeightButton = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(nHeightChar); - - // - // Need a little extra to make it look right - // - nHeightButton += (int)(nHeightChar/1.5); - - if (!HasFlag(wxBU_EXACTFIT)) - { - wxSize vSize = GetDefaultSize(); - - if (nWidthButton > vSize.x) - vSize.x = nWidthButton; - if (nHeightButton > vSize.y) - vSize.y = nHeightButton; - return vSize; - } - return wxSize( nWidthButton - ,nHeightButton - ); -} // end of wxButton::DoGetBestSize - -/* static */ -wxSize wxButton::GetDefaultSize() -{ - static wxSize vSizeBtn; - - if (vSizeBtn.x == 0) - { - wxScreenDC vDc; - - vDc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - - // - // The size of a standard button in the dialog units is 50x14, - // translate this to pixels - // NB1: the multipliers come from the Windows convention - // NB2: the extra +1/+2 were needed to get the size be the same as the - // size of the buttons in the standard dialog - I don't know how - // this happens, but on my system this size is 75x23 in pixels and - // 23*8 isn't even divisible by 14... Would be nice to understand - // why these constants are needed though! - vSizeBtn.x = (50 * (vDc.GetCharWidth() + 1))/4; - vSizeBtn.y = ((14 * vDc.GetCharHeight()) + 2)/8; - } - return vSizeBtn; -} // end of wxButton::GetDefaultSize - -void wxButton::Command ( - wxCommandEvent& rEvent -) -{ - ProcessCommand (rEvent); -} // end of wxButton::Command - -// ---------------------------------------------------------------------------- -// helpers -// ---------------------------------------------------------------------------- - -bool wxButton::SendClickEvent() -{ - wxCommandEvent vEvent( wxEVT_BUTTON - ,GetId() - ); - - vEvent.SetEventObject(this); - return ProcessCommand(vEvent); -} // end of wxButton::SendClickEvent - -wxWindow *wxButton::SetDefault() -{ - // - // Set this one as the default button both for wxWidgets and Windows - // - wxWindow* pWinOldDefault = wxButtonBase::SetDefault(); - - SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false); - SetDefaultStyle( this, true ); - - return pWinOldDefault; -} // end of wxButton::SetDefault - -void wxButton::SetTmpDefault() -{ - wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - - wxCHECK_RET( tlw, wxT("button without top level window?") ); - - wxWindow* pWinOldDefault = tlw->GetDefaultItem(); - - tlw->SetTmpDefaultItem(this); - SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false); - SetDefaultStyle( this, true ); -} // end of wxButton::SetTmpDefault - -void wxButton::UnsetTmpDefault() -{ - wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - - wxCHECK_RET( tlw, wxT("button without top level window?") ); - - tlw->SetTmpDefaultItem(NULL); - - wxWindow* pWinOldDefault = tlw->GetDefaultItem(); - - SetDefaultStyle( this, false ); - SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), true ); -} // end of wxButton::UnsetTmpDefault - -void wxButton::SetDefaultStyle( - wxButton* pBtn -, bool bOn -) -{ - long lStyle; - // - // We may be called with NULL pointer -- simpler to do the check here than - // in the caller which does wxDynamicCast() - // - if (!pBtn) - return; - - // - // First, let DefDlgProc() know about the new default button - // - if (bOn) - { - if (!wxTheApp->IsActive()) - return; - - // - // In OS/2 the dialog/panel doesn't really know it has a default - // button, the default button simply has that style. We'll just - // simulate by setting focus to it - // - pBtn->SetFocus(); - } - lStyle = ::WinQueryWindowULong(GetHwndOf(pBtn), QWL_STYLE); - if (!(lStyle & BS_DEFAULT) == bOn) - { - if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON) - { - if (bOn) - lStyle |= BS_DEFAULT; - else - lStyle &= ~BS_DEFAULT; - ::WinSetWindowULong(GetHwndOf(pBtn), QWL_STYLE, lStyle); - } - else - { - // - // Redraw the button - it will notice itself that it's not the - // default one any longer - // - pBtn->Refresh(); - } - } -} // end of wxButton::UpdateDefaultStyle - -// ---------------------------------------------------------------------------- -// event/message handlers -// ---------------------------------------------------------------------------- - -bool wxButton::OS2Command(WXUINT uParam, WXWORD WXUNUSED(wId)) -{ - bool bProcessed = false; - - switch (uParam) - { - case BN_CLICKED: // normal buttons send this - case BN_DBLCLICKED: // owner-drawn ones also send this - bProcessed = SendClickEvent(); - break; - } - - return bProcessed; -} // end of wxButton::OS2Command - -WXHBRUSH wxButton::OnCtlColor( WXHDC WXUNUSED(pDC), - WXHWND WXUNUSED(pWnd), - WXUINT WXUNUSED(nCtlColor), - WXUINT WXUNUSED(uMessage), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam) ) -{ - wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour() - ,wxSOLID - ); - - return (WXHBRUSH)pBackgroundBrush->GetResourceHandle(); -} // end of wxButton::OnCtlColor - -void wxButton::MakeOwnerDrawn() -{ - long lStyle = 0L; - - lStyle = ::WinQueryWindowULong(GetHwnd(), QWL_STYLE); - if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON) - { - // - // Make it so - // - lStyle |= BS_USERBUTTON; - ::WinSetWindowULong(GetHwnd(), QWL_STYLE, lStyle); - } -} // end of wxButton::MakeOwnerDrawn - -WXDWORD wxButton::OS2GetStyle( - long lStyle -, WXDWORD* pdwExstyle -) const -{ - // - // Buttons never have an external border, they draw their own one - // - WXDWORD dwStyle = wxControl::OS2GetStyle( (lStyle & ~wxBORDER_MASK) | wxBORDER_NONE - ,pdwExstyle - ); - - // - // We must use WS_CLIPSIBLINGS with the buttons or they would draw over - // each other in any resizable dialog which has more than one button in - // the bottom - // - dwStyle |= WS_CLIPSIBLINGS; - return dwStyle; -} // end of wxButton::OS2GetStyle - -MRESULT wxButton::WindowProc( WXUINT uMsg, - WXWPARAM wParam, - WXLPARAM lParam ) -{ - // - // When we receive focus, we want to temporary become the default button in - // our parent panel so that pressing "Enter" would activate us -- and when - // losing it we should restore the previous default button as well - // - if (uMsg == WM_SETFOCUS) - { - if (SHORT1FROMMP(lParam) == TRUE) - SetTmpDefault(); - else - UnsetTmpDefault(); - - // - // Let the default processign take place too - // - } - - else if (uMsg == WM_BUTTON1DBLCLK) - { - // - // Emulate a click event to force an owner-drawn button to change its - // appearance - without this, it won't do it - // - (void)wxControl::OS2WindowProc( WM_BUTTON1DOWN - ,wParam - ,lParam - ); - - // - // And conitnue with processing the message normally as well - // - } - - // - // Let the base class do all real processing - // - return (wxControl::OS2WindowProc( uMsg - ,wParam - ,lParam - )); -} // end of wxWindowProc diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp deleted file mode 100644 index e99f381927..0000000000 --- a/src/os2/checkbox.cpp +++ /dev/null @@ -1,209 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/checkbox.cpp -// Purpose: wxCheckBox -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/checkbox.h" - -#ifndef WX_PRECOMP - #include "wx/brush.h" - #include "wx/scrolwin.h" - #include "wx/dcscreen.h" - #include "wx/settings.h" -#endif - -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) - -extern void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxCheckBox -// ---------------------------------------------------------------------------- - -bool wxCheckBox::OS2Command( WXUINT WXUNUSED(uParam), - WXWORD WXUNUSED(wId) ) -{ - wxCommandEvent rEvent( wxEVT_CHECKBOX, m_windowId ); - rEvent.SetInt(GetValue()); - rEvent.SetEventObject(this); - ProcessCommand(rEvent); - return true; -} // end of wxCheckBox::OS2Command - -bool wxCheckBox::Create(wxWindow* pParent, - wxWindowID vId, - const wxString& rsLabel, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxValidator& rValidator, - const wxString& rsName ) -{ - if (!CreateControl( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - )) - return false; - - - long osStyle = BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE; - - bool bOk = OS2CreateControl( wxT("BUTTON") - ,osStyle - ,rPos - ,rSize - ,rsLabel - ,0 - ); - m_backgroundColour = pParent->GetBackgroundColour(); - - LONG lColor = (LONG)m_backgroundColour.GetPixel(); - ::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - wxAssociateWinWithHandle(m_hWnd, this); - return bOk; -} // end of wxCheckBox::Create - -void wxCheckBox::SetLabel( const wxString& rsLabel ) -{ - wxString sLabel=::wxPMTextToLabel(rsLabel); - ::WinSetWindowText(GetHwnd(), sLabel.c_str()); -} // end of wxCheckBox::SetLabel - -wxSize wxCheckBox::DoGetBestSize() const -{ - // We should probably compute nCheckSize but it seems to be a constant - // independent of its label's font size and not made available by OS/2. - int nCheckSize = RADIO_SIZE; - int nWidthCheckbox; - int nHeightCheckbox; - wxString sStr = wxGetWindowText(GetHWND()); - - if (!sStr.empty()) - { - GetTextExtent( sStr - ,&nWidthCheckbox - ,&nHeightCheckbox - ); - nWidthCheckbox += nCheckSize; - - if (nHeightCheckbox < nCheckSize) - nHeightCheckbox = nCheckSize; - } - else - { - nWidthCheckbox = nCheckSize; - nHeightCheckbox = nCheckSize; - } - - return wxSize( nWidthCheckbox, nHeightCheckbox ); -} // end of wxCheckBox::DoGetBestSize - -void wxCheckBox::SetValue( bool bValue ) -{ - ::WinSendMsg(GetHwnd(), BM_SETCHECK, (MPARAM)bValue, 0); -} // end of wxCheckBox::SetValue - -#ifndef BST_CHECKED -#define BST_CHECKED 0x0001 -#endif - -bool wxCheckBox::GetValue() const -{ - return((LONGFROMMR(::WinSendMsg(GetHwnd(), BM_QUERYCHECK, (MPARAM)0, (MPARAM)0)) == 1L)); -} // end of wxCheckBox::GetValue - -void wxCheckBox::Command ( wxCommandEvent& rEvent ) -{ - SetValue((rEvent.GetInt() != 0)); - ProcessCommand(rEvent); -} // end of wxCheckBox:: Command - -// ---------------------------------------------------------------------------- -// wxBitmapCheckBox -// ---------------------------------------------------------------------------- - -bool wxBitmapCheckBox::Create( wxWindow* pParent, - wxWindowID vId, - const wxBitmap* WXUNUSED(pLabel), - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxValidator& rValidator, - const wxString& rsName) -{ - SetName(rsName); -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - if (pParent) - pParent->AddChild(this); - - SetBackgroundColour(pParent->GetBackgroundColour()) ; - SetForegroundColour(pParent->GetForegroundColour()) ; - m_windowStyle = lStyle; - - if (vId == -1) - m_windowId = NewControlId(); - else - m_windowId = vId; - - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - - m_nCheckWidth = -1 ; - m_nCheckHeight = -1 ; -// long msStyle = CHECK_FLAGS; - - HWND hButton = 0; // TODO: Create the bitmap checkbox - - m_hWnd = (WXHWND)hButton; - - // - // Subclass again for purposes of dialog editing mode - // - SubclassWin((WXHWND)hButton); - - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - - ::WinShowWindow(hButton, TRUE); - return true; -} // end of wxBitmapCheckBox::Create - -void wxBitmapCheckBox::SetLabel( const wxBitmap& WXUNUSED(rBitmap) ) -{ - wxFAIL_MSG(wxT("not implemented")); -} // end of wxBitmapCheckBox::SetLabel diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp deleted file mode 100644 index 1559397f57..0000000000 --- a/src/os2/checklst.cpp +++ /dev/null @@ -1,416 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/checklst.cpp -// Purpose: implementation of wxCheckListBox class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// headers & declarations -// ============================================================================ - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN - -#include "wx/checklst.h" - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/log.h" - #include "wx/window.h" - #include "wx/dcmemory.h" - #include "wx/dcscreen.h" - #include "wx/settings.h" - #include "wx/listbox.h" - #include "wx/bitmap.h" - #include "wx/colour.h" - #include "wx/font.h" -#endif - -#include "wx/os2/dc.h" -#include "wx/ownerdrw.h" - -#define INCL_PM -#include - -// ---------------------------------------------------------------------------- -// constants for base class -// ---------------------------------------------------------------------------- - -static const int CHECK_MARK_WIDTH = 15; - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// get item (converted to right type) -#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n))) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// declaration and implementation of wxCheckListBoxItem class -// ---------------------------------------------------------------------------- - -class wxCheckListBoxItem : public wxOwnerDrawn -{ - friend class wxCheckListBox; -public: - // - // ctor - // - wxCheckListBoxItem(wxCheckListBox* pParent, size_t nIndex); - - // - // Drawing functions - // - virtual bool OnDrawItem( wxDC& rDc, - const wxRect& rRect, - wxODAction eAct, - wxODStatus eStat - ); - - // - // Simple accessors - // - bool IsChecked(void) const { return m_bChecked; } - void Check(bool bCheck); - void Toggle(void) { Check(!IsChecked()); } - - virtual wxString GetName() const { return m_pParent->GetString(m_nIndex); } - -private: - bool m_bChecked; - wxCheckListBox* m_pParent; - size_t m_nIndex; -}; // end of CLASS wxCheckListBoxItem - - - -wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox* pParent, size_t nIndex) - :wxOwnerDrawn( wxEmptyString, true /* checkable */ ) -{ - m_bChecked = false; - m_pParent = pParent; - m_nIndex = nIndex; - - // - // We don't initialize m_nCheckHeight/Width vars because it's - // done in OnMeasure while they are used only in OnDraw and we - // know that there will always be OnMeasure before OnDraw - // - SetMarginWidth(CHECK_MARK_WIDTH); -} // end of wxCheckListBoxItem::wxCheckListBoxItem - - - -bool wxCheckListBoxItem::OnDrawItem ( wxDC& rDc, - const wxRect& rRect, - wxODAction eAct, - wxODStatus eStat ) -{ - wxRect vRect = rRect; - - - wxPMDCImpl *impl = (wxPMDCImpl*) rDc.GetImpl(); - ::WinQueryWindowRect( m_pParent->GetHWND(), &impl->m_vRclPaint ); - if (IsChecked()) - eStat = (wxOwnerDrawn::wxODStatus)(eStat | wxOwnerDrawn::wxODChecked); - - // - // Unfortunately PM doesn't quite get the text position exact. We need to alter - // it down and to the right, just a little bit. The coords in rRect are OS/2 - // coords not wxWidgets coords. - // - vRect.x += 5; - vRect.y -= 3; - if (wxOwnerDrawn::OnDrawItem( rDc, vRect, eAct, eStat)) - { - size_t nCheckWidth = CHECK_MARK_WIDTH; - size_t nCheckHeight = m_pParent->GetItemHeight(); - int nParentHeight; - int nX = rRect.GetX(); - int nY = rRect.GetY(); - int nOldY = nY; - wxColour vColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - wxPen vPenBack; - wxPen vPenPrev; - - m_pParent->GetSize( NULL, &nParentHeight); - - nY = nParentHeight - nY - nCheckHeight; - vPenBack = wxPen(vColour, 1, wxSOLID); - - // - // Erase the 1-pixel border - // - rDc.SetPen(vPenBack); - rDc.DrawRectangle( nX, nY, nCheckWidth, nCheckHeight ); - - // - // Now we draw the smaller rectangle - // - nY++; - nCheckWidth -= 2; - nCheckHeight -= 2; - - // - // Draw hollow gray rectangle - // - rDc.SetPen(*wxGREY_PEN); - rDc.DrawRectangle( nX, nY, nCheckWidth, nCheckHeight ); - - nX++; - if (IsChecked()) - { - // - // Draw the check by loading the sys standard bitmap and drawing it - // - HBITMAP hChkBmp = ::WinGetSysBitmap( HWND_DESKTOP, SBMP_MENUCHECK ); - POINTL vPoint = {nX, nOldY + 3}; - wxPMDCImpl *impl = (wxPMDCImpl*) rDc.GetImpl(); - ::WinDrawBitmap( impl->GetHPS(), - hChkBmp, - NULL, - &vPoint, - NULL, - NULL, - DBM_NORMAL - ); - } - return true; - } - return false; -} // end of wxCheckListBoxItem::OnDrawItem - -// -// Change the state of the item and redraw it -// -void wxCheckListBoxItem::Check( bool bCheck ) -{ - m_bChecked = bCheck; - - // - // Index may be chanegd because new items were added/deleted - // - if (m_pParent->GetItemIndex(this) != (int)m_nIndex) - { - // - // Update it - // - int nIndex = m_pParent->GetItemIndex(this); - - wxASSERT_MSG(nIndex != wxNOT_FOUND, wxT("what does this item do here?")); - - m_nIndex = (size_t)nIndex; - } - - - wxCommandEvent vEvent( wxEVT_CHECKLISTBOX,m_pParent->GetId()); - - vEvent.SetInt(m_nIndex); - vEvent.SetEventObject(m_pParent); - m_pParent->ProcessCommand(vEvent); -} // end of wxCheckListBoxItem::Check - - -// ---------------------------------------------------------------------------- -// implementation of wxCheckListBox class -// ---------------------------------------------------------------------------- - -// define event table -// ------------------ -BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox) - EVT_CHAR(wxCheckListBox::OnChar) - EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick) -END_EVENT_TABLE() - - - -// -// Control creation -// ---------------- -// - -// -// Default ctor: use Create() to really create the control -// -wxCheckListBox::wxCheckListBox() - :wxCheckListBoxBase() -{ -} // end of wxCheckListBox::wxCheckListBox - -// -// Ctor which creates the associated control -// -wxCheckListBox::wxCheckListBox ( wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - int nStrings, - const wxString asChoices[], - long lStyle, - const wxValidator& rVal, - const wxString& rsName) - :wxCheckListBoxBase() -{ - Create( pParent, vId, rPos, rSize, nStrings, asChoices, lStyle | wxLB_OWNERDRAW, rVal, rsName ); -} // end of wxCheckListBox::wxCheckListBox - -wxCheckListBox::wxCheckListBox ( wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - const wxArrayString& asChoices, - long lStyle, - const wxValidator& rVal, - const wxString& rsName ) - :wxCheckListBoxBase() -{ - wxCArrayString chs(asChoices); - Create( pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(), - lStyle | wxLB_OWNERDRAW, rVal, rsName ); -} // end of wxCheckListBox::wxCheckListBox - -void wxCheckListBox::Delete(unsigned int n) -{ - wxCHECK_RET( IsValid(n), - wxT("invalid index in wxCheckListBox::Delete") ); - wxListBox::Delete(n); - - // - // Free memory - // - delete m_aItems[n]; - m_aItems.RemoveAt(n); -} // end of wxCheckListBox::Delete - -bool wxCheckListBox::SetFont ( const wxFont& rFont ) -{ - for (unsigned int i = 0; i < m_aItems.GetCount(); i++) - m_aItems[i]->SetFont(rFont); - wxListBox::SetFont(rFont); - return true; -} // end of wxCheckListBox::SetFont - - - -// -// Create/retrieve item -// -------------------- -// - -// -// Create a check list box item -// -wxOwnerDrawn* wxCheckListBox::CreateItem(size_t nIndex) -{ - wxCheckListBoxItem* pItem = new wxCheckListBoxItem( this, nIndex ); - return pItem; -} // end of wxCheckListBox::CreateItem - - - -// -// Return item size -// ---------------- -// -long wxCheckListBox::OS2OnMeasure ( WXMEASUREITEMSTRUCT* pItem ) -{ - if (!pItem) - pItem = (WXMEASUREITEMSTRUCT*)new OWNERITEM; - if (wxListBox::OS2OnMeasure(pItem)) - { - POWNERITEM pStruct = (POWNERITEM)pItem; - - // - // Save item height - // - m_nItemHeight = pStruct->rclItem.yTop - pStruct->rclItem.yBottom; - - // - // Add place for the check mark - // - pStruct->rclItem.xRight += CHECK_MARK_WIDTH; - return long(MRFROM2SHORT((USHORT)m_nItemHeight, (USHORT)(pStruct->rclItem.xRight - pStruct->rclItem.xLeft))); - } - return 0L; -} // end of wxCheckListBox::CreateItem - - - -// -// Check items -// ----------- -// -bool wxCheckListBox::IsChecked(unsigned int uiIndex) const -{ - return GetItem(uiIndex)->IsChecked(); -} // end of wxCheckListBox::IsChecked - -void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck) -{ - GetItem(uiIndex)->Check(bCheck); -} // end of wxCheckListBox::Check - - - -// -// Process events -// -------------- -// -void wxCheckListBox::OnChar ( wxKeyEvent& rEvent ) -{ - if (rEvent.GetKeyCode() == WXK_SPACE) - GetItem(GetSelection())->Toggle(); - else - rEvent.Skip(); -} // end of wxCheckListBox::OnChar - -void wxCheckListBox::OnLeftClick ( wxMouseEvent& rEvent ) -{ - // - // Clicking on the item selects it, clicking on the checkmark toggles - // - if (rEvent.GetX() <= CHECK_MARK_WIDTH) - { - int nParentHeight; - wxScreenDC vDc; - wxCoord vHeight; - - GetSize( NULL, &nParentHeight ); - vDc.SetFont(GetFont()); - vHeight = (wxCoord)(vDc.GetCharHeight() * 2.5); - - // - // This, of course, will not work if the LB is scrolled - // - int nY = rEvent.GetY(); - - nY = nParentHeight - (nY + vHeight); - - size_t nItem = (size_t)(nY / vHeight); - - if (nItem < m_nNumItems) - GetItem(nItem)->Toggle(); - // - // else: it's not an error, just click outside of client zone - // - } - else - { - // - // Implement default behaviour: clicking on the item selects it - // - rEvent.Skip(); - } -} // end of wxCheckListBox::OnLeftClick - -#endif // wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp deleted file mode 100644 index ab7747cea2..0000000000 --- a/src/os2/choice.cpp +++ /dev/null @@ -1,382 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/choice.cpp -// Purpose: wxChoice -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_CHOICE - -#include "wx/choice.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/log.h" - #include "wx/settings.h" -#endif - -#include "wx/os2/private.h" - -bool wxChoice::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, const wxArrayString& asChoices -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) -{ - wxCArrayString chs(asChoices); - - return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(), - lStyle, rValidator, rsName); -} - -bool wxChoice::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, int n -, const wxString asChoices[] -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) -{ - long lSstyle; - - if (!CreateControl( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - )) - return false; - lSstyle = CBS_DROPDOWNLIST | - WS_TABSTOP | - WS_VISIBLE; - - // clipping siblings does not yet work - // if (lStyle & wxCLIP_SIBLINGS ) - // lSstyle |= WS_CLIPSIBLINGS; - - wxASSERT_MSG( !(lStyle & wxCB_DROPDOWN) && - !(lStyle & wxCB_READONLY) && - !(lStyle & wxCB_SIMPLE), - wxT("this style flag is ignored by wxChoice, you " - "probably want to use a wxComboBox") ); - - if (!OS2CreateControl( wxT("COMBOBOX") - ,lSstyle - )) - return false; - - // - // A choice/combobox normally has a white background (or other, depending - // on global settings) rather than inheriting the parent's background colour. - // - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - - // initialize the controls contents - for (int i = 0; i < n; i++) - { - Append(asChoices[i]); - } - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); - - // Set height to use with sizers i.e. without the dropdown listbox - wxFont vFont = GetFont(); - int nEditHeight; - wxGetCharSize( GetHWND(), NULL, &nEditHeight, &vFont ); - nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nEditHeight); - SetInitialSize(wxSize(-1,nEditHeight+4)); // +2x2 for the border - - return true; -} // end of wxChoice::Create - -wxChoice::~wxChoice() -{ - Clear(); -} - -// ---------------------------------------------------------------------------- -// adding/deleting items to/from the list -// ---------------------------------------------------------------------------- - -int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items - , unsigned int pos - , void **clientData - , wxClientDataType type - ) -{ - int nIndex = wxNOT_FOUND; - LONG nIndexType = 0; - bool incrementPos = false; - if ( IsSorted() ) - nIndexType = LIT_SORTASCENDING; - else if (pos == GetCount()) - nIndexType = LIT_END; - else - { - nIndexType = pos; - incrementPos = true; - } - - const unsigned int count = items.GetCount(); - for( unsigned int i = 0; i < count; ++i ) - { - nIndex = (int)::WinSendMsg( GetHwnd() - ,LM_INSERTITEM - ,(MPARAM)nIndexType - ,(MPARAM)items[i].wx_str() - ); - if (nIndex < 0) - { - nIndex = wxNOT_FOUND; - break; - } - AssignNewItemClientData(nIndex, clientData, i, type); - - if (incrementPos) - ++nIndexType; - } - return nIndex; -} // end of wxChoice::DoInsertAppendItemsWithData - -void wxChoice::DoDeleteOneItem(unsigned int n) -{ - wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") ); - - ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0); -} // end of wxChoice::Delete - -void wxChoice::DoClear() -{ - ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0); -} // end of wxChoice::Clear - -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -int wxChoice::GetSelection() const -{ - return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0))); -} // end of wxChoice::GetSelection - -void wxChoice::SetSelection( - int n -) -{ - ::WinSendMsg( GetHwnd() - ,LM_SELECTITEM - ,(MPARAM)n - ,(MPARAM)TRUE - ); -} // end of wxChoice::SetSelection - -// ---------------------------------------------------------------------------- -// string list functions -// ---------------------------------------------------------------------------- - -unsigned int wxChoice::GetCount() const -{ - return((unsigned int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0))); -} // end of wxChoice::GetCount - -void wxChoice::SetString(unsigned int n, const wxString& rsStr) -{ - LONG nIndexType = 0; - void* pData; - - if ( HasClientData() ) - { - pData = DoGetItemClientData(n); - } - else // no client data - { - pData = NULL; - } - - ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0); - - if (m_windowStyle & wxCB_SORT) - nIndexType = LIT_SORTASCENDING; - else - nIndexType = LIT_END; - ::WinSendMsg( GetHwnd() - ,LM_INSERTITEM - ,(MPARAM)nIndexType - ,(MPARAM)rsStr.wx_str() - ); - - if (pData) - { - DoSetItemClientData(n, pData); - } -} // end of wxChoice::SetString - -wxString wxChoice::GetString(unsigned int n) const -{ - int nLen = 0; - wxString sStr = wxEmptyString; - wxChar* zBuf; - - nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0)); - if (nLen != LIT_ERROR && nLen > 0) - { - zBuf = new wxChar[++nLen]; - ::WinSendMsg( GetHwnd() - ,LM_QUERYITEMTEXT - ,MPFROM2SHORT((SHORT)n, (SHORT)nLen) - ,(MPARAM)zBuf - ); - sStr = zBuf; - delete [] zBuf; - } - return sStr; -} // end of wxChoice::GetString - -// ---------------------------------------------------------------------------- -// client data -// ---------------------------------------------------------------------------- - -void wxChoice::DoSetItemClientData(unsigned int n, void* pClientData) -{ - ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)n, MPFROMP(pClientData)); -} // end of wxChoice::DoSetItemClientData - -void* wxChoice::DoGetItemClientData(unsigned int n) const -{ - MRESULT rc = ::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, (MPARAM)n, (MPARAM)0); - return((void*)rc); -} // end of wxChoice::DoGetItemClientData - -// ---------------------------------------------------------------------------- -// wxOS2 specific helpers -// ---------------------------------------------------------------------------- - -void wxChoice::DoSetSize(int nX, - int nY, - int nWidth, - int WXUNUSED(nHeight), - int nSizeFlags) -{ - // - // Ignore height parameter because height doesn't mean 'initially - // displayed' height, it refers to the drop-down menu as well. The - // wxWidgets interpretation is different; also, getting the size returns - // the _displayed_ size (NOT the drop down menu size) so - // setting-getting-setting size would not work. - // - wxControl::DoSetSize( nX - ,nY - ,nWidth - ,wxDefaultCoord - ,nSizeFlags - ); -} // end of wxChoice::DoSetSize - -wxSize wxChoice::DoGetBestSize() const -{ - // - // Find the widest string - // - int nLineWidth; - int nChoiceWidth = 0; - int nCx; - int nCy; - wxFont vFont = (wxFont)GetFont(); - - const unsigned int nItems = GetCount(); - - for (unsigned int i = 0; i < nItems; i++) - { - wxString sStr(GetString(i)); - GetTextExtent( sStr, &nLineWidth, NULL ); - if (nLineWidth > nChoiceWidth) - nChoiceWidth = nLineWidth; - } - - // - // Give it some reasonable default value if there are no strings in the - // list - // - if (nChoiceWidth == 0L) - nChoiceWidth = 100L; - - // - // The combobox should be larger than the widest string - // - wxGetCharSize( GetHWND(), &nCx, &nCy, &vFont ); - nChoiceWidth += 5 * nCx; - - // - // Choice drop-down list depends on number of items (limited to 10) - // - size_t nStrings = nItems == 0 ? 10 : wxMin(10, nItems) + 1; - int nChoiceHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * nStrings; - - return wxSize(nChoiceWidth, nChoiceHeight); -} // end of wxChoice::DoGetBestSize - -MRESULT wxChoice::OS2WindowProc( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) -{ - return wxWindow::OS2WindowProc( uMsg - ,wParam - ,lParam - ); -} // end of wxChoice::OS2WindowProc - -bool wxChoice::OS2Command( - WXUINT uParam -, WXWORD WXUNUSED(wId) -) -{ - if (uParam != LN_SELECT) - { - // - // "selection changed" is the only event we're after - // - return false; - } - int n = GetSelection(); - - if (n > -1) - { - wxCommandEvent vEvent( wxEVT_CHOICE - ,m_windowId - ); - - vEvent.SetInt(n); - vEvent.SetEventObject(this); - vEvent.SetString(GetStringSelection()); - if (HasClientObjectData()) - vEvent.SetClientObject(GetClientObject(n)); - else if (HasClientUntypedData()) - vEvent.SetClientData(GetClientData(n)); - ProcessCommand(vEvent); - } - return true; -} // end of wxChoice::OS2Command - -#endif // wxUSE_CHOICE diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp deleted file mode 100644 index 7bd6843a13..0000000000 --- a/src/os2/clipbrd.cpp +++ /dev/null @@ -1,611 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/clipbrd.cpp -// Purpose: Clipboard functionality -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_CLIPBOARD - -#include "wx/clipbrd.h" - -#ifndef WX_PRECOMP - #include "wx/object.h" - #include "wx/event.h" - #include "wx/app.h" - #include "wx/frame.h" - #include "wx/bitmap.h" - #include "wx/utils.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/dataobj.h" -#endif - -#if wxUSE_METAFILE - #include "wx/metafile.h" -#endif - -#include - -#include "wx/os2/private.h" - -// wxDataObject is tied to OLE/drag and drop implementation, -// therefore so is wxClipboard :-( - -// =========================================================================== -// implementation -// =========================================================================== - -// --------------------------------------------------------------------------- -// old-style clipboard functions using Windows API -// --------------------------------------------------------------------------- - -static bool gs_wxClipboardIsOpen = false; - -bool wxOpenClipboard() -{ - wxCHECK_MSG( !gs_wxClipboardIsOpen, true, wxT("clipboard already opened.") ); -// TODO: -/* - wxWindow *win = wxTheApp->GetTopWindow(); - if ( win ) - { - gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0; - - if ( !gs_wxClipboardIsOpen ) - { - wxLogSysError(_("Failed to open the clipboard.")); - } - - return gs_wxClipboardIsOpen; - } - else - { - wxLogDebug(wxT("Cannot open clipboard without a main window.")); - - return false; - } -*/ - return false; -} - -bool wxCloseClipboard() -{ - wxCHECK_MSG( gs_wxClipboardIsOpen, false, wxT("clipboard is not opened") ); -// TODO: -/* - gs_wxClipboardIsOpen = false; - - if ( ::CloseClipboard() == 0 ) - { - wxLogSysError(_("Failed to close the clipboard.")); - - return false; - } -*/ - return true; -} - -bool wxEmptyClipboard() -{ -// TODO: -/* - if ( ::EmptyClipboard() == 0 ) - { - wxLogSysError(_("Failed to empty the clipboard.")); - - return false; - } -*/ - return true; -} - -bool wxIsClipboardOpened() -{ - return gs_wxClipboardIsOpen; -} - -bool wxIsClipboardFormatAvailable(wxDataFormat WXUNUSED(dataFormat)) -{ - // TODO: return ::IsClipboardFormatAvailable(dataFormat) != 0; - return false; -} - -#if 0 -#if wxUSE_DRAG_AND_DROP -static bool wxSetClipboardData(wxDataObject *data) -{ - // TODO: -/* - size_t size = data->GetDataSize(); - HANDLE hGlobal = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, size); - if ( !hGlobal ) - { - wxLogSysError(_("Failed to allocate %dKb of memory for clipboard " - "transfer."), size / 1024); - - return false; - } - - LPVOID lpGlobalMemory = ::GlobalLock(hGlobal); - - data->GetDataHere(lpGlobalMemory); - - GlobalUnlock(hGlobal); - - wxDataFormat format = data->GetPreferredFormat(); - if ( !::SetClipboardData(format, hGlobal) ) - { - wxLogSysError(_("Failed to set clipboard data in format %s"), - wxDataObject::GetFormatName(format)); - - return false; - } -*/ - return true; -} -#endif // wxUSE_DRAG_AND_DROP -#endif - -bool wxSetClipboardData(wxDataFormat WXUNUSED(dataFormat), - const void *WXUNUSED(data), - int WXUNUSED(width), int WXUNUSED(height)) -{ -// TODO: -/* - HANDLE handle = 0; // return value of SetClipboardData - switch (dataFormat) - { - case wxDF_BITMAP: - { - wxBitmap *bitmap = (wxBitmap *)data; - - HDC hdcMem = CreateCompatibleDC((HDC) NULL); - HDC hdcSrc = CreateCompatibleDC((HDC) NULL); - HBITMAP old = (HBITMAP) - ::SelectObject(hdcSrc, (HBITMAP)bitmap->GetHBITMAP()); - HBITMAP hBitmap = CreateCompatibleBitmap(hdcSrc, - bitmap->GetWidth(), - bitmap->GetHeight()); - if (!hBitmap) - { - SelectObject(hdcSrc, old); - DeleteDC(hdcMem); - DeleteDC(hdcSrc); - return false; - } - - HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap); - BitBlt(hdcMem, 0, 0, bitmap->GetWidth(), bitmap->GetHeight(), - hdcSrc, 0, 0, SRCCOPY); - - // Select new bitmap out of memory DC - SelectObject(hdcMem, old1); - - // Set the data - handle = ::SetClipboardData(CF_BITMAP, hBitmap); - - // Clean up - SelectObject(hdcSrc, old); - DeleteDC(hdcSrc); - DeleteDC(hdcMem); - break; - } - - case wxDF_DIB: - { -#if wxUSE_IMAGE_LOADING_IN_MSW - wxBitmap *bitmap = (wxBitmap *)data; - HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP(); - // NULL palette means to use the system one - HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL); - handle = SetClipboardData(CF_DIB, hDIB); -#endif - break; - } - -#if wxUSE_METAFILE - case wxDF_METAFILE: - { - wxMetafile *wxMF = (wxMetafile *)data; - HANDLE data = GlobalAlloc(GHND, sizeof(METAFILEPICT) + 1); - METAFILEPICT *mf = (METAFILEPICT *)GlobalLock(data); - - mf->mm = wxMF->GetWindowsMappingMode(); - mf->xExt = width; - mf->yExt = height; - mf->hMF = (HMETAFILE) wxMF->GetHMETAFILE(); - GlobalUnlock(data); - wxMF->SetHMETAFILE((WXHANDLE) NULL); - - handle = SetClipboardData(CF_METAFILEPICT, data); - break; - } -#endif - case CF_SYLK: - case CF_DIF: - case CF_TIFF: - case CF_PALETTE: - default: - { - wxLogError(_("Unsupported clipboard format.")); - return false; - } - - case wxDF_OEMTEXT: - dataFormat = wxDF_TEXT; - // fall through - - case wxDF_TEXT: - { - char *s = (char *)data; - - width = strlen(s) + 1; - height = 1; - DWORD l = (width * height); - HANDLE hGlobalMemory = GlobalAlloc(GHND, l); - if ( hGlobalMemory ) - { - LPSTR lpGlobalMemory = (LPSTR)GlobalLock(hGlobalMemory); - - memcpy(lpGlobalMemory, s, l); - - GlobalUnlock(hGlobalMemory); - } - - handle = SetClipboardData(dataFormat, hGlobalMemory); - break; - } - } - - if ( handle == 0 ) - { - wxLogSysError(_("Failed to set clipboard data.")); - - return false; - } -*/ - return true; -} - -void *wxGetClipboardData(wxDataFormat WXUNUSED(dataFormat), long *WXUNUSED(len)) -{ -// void *retval = NULL; -// TODO: -/* - switch ( dataFormat ) - { - case wxDF_BITMAP: - { - BITMAP bm; - HBITMAP hBitmap = (HBITMAP) GetClipboardData(CF_BITMAP); - if (!hBitmap) - break; - - HDC hdcMem = CreateCompatibleDC((HDC) NULL); - HDC hdcSrc = CreateCompatibleDC((HDC) NULL); - - HBITMAP old = (HBITMAP) ::SelectObject(hdcSrc, hBitmap); - GetObject(hBitmap, sizeof(BITMAP), (LPSTR)&bm); - - HBITMAP hNewBitmap = CreateBitmapIndirect(&bm); - - if (!hNewBitmap) - { - SelectObject(hdcSrc, old); - DeleteDC(hdcMem); - DeleteDC(hdcSrc); - break; - } - - HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hNewBitmap); - BitBlt(hdcMem, 0, 0, bm.bmWidth, bm.bmHeight, - hdcSrc, 0, 0, SRCCOPY); - - // Select new bitmap out of memory DC - SelectObject(hdcMem, old1); - - // Clean up - SelectObject(hdcSrc, old); - DeleteDC(hdcSrc); - DeleteDC(hdcMem); - - // Create and return a new wxBitmap - wxBitmap *wxBM = new wxBitmap; - wxBM->SetHBITMAP((WXHBITMAP) hNewBitmap); - wxBM->SetWidth(bm.bmWidth); - wxBM->SetHeight(bm.bmHeight); - wxBM->SetDepth(bm.bmPlanes); - wxBM->SetOk(true); - retval = wxBM; - break; - } - - case wxDF_METAFILE: - case CF_SYLK: - case CF_DIF: - case CF_TIFF: - case CF_PALETTE: - case wxDF_DIB: - { - wxLogError(_("Unsupported clipboard format.")); - return NULL; - } - - case wxDF_OEMTEXT: - dataFormat = wxDF_TEXT; - // fall through - - case wxDF_TEXT: - { - HANDLE hGlobalMemory = ::GetClipboardData(dataFormat); - if (!hGlobalMemory) - break; - - DWORD hsize = ::GlobalSize(hGlobalMemory); - if (len) - *len = hsize; - - char *s = new char[hsize]; - if (!s) - break; - - LPSTR lpGlobalMemory = (LPSTR)::GlobalLock(hGlobalMemory); - - memcpy(s, lpGlobalMemory, hsize); - - ::GlobalUnlock(hGlobalMemory); - - retval = s; - break; - } - - default: - { - HANDLE hGlobalMemory = ::GetClipboardData(dataFormat); - if ( !hGlobalMemory ) - break; - - DWORD size = ::GlobalSize(hGlobalMemory); - if ( len ) - *len = size; - - void *buf = malloc(size); - if ( !buf ) - break; - - LPSTR lpGlobalMemory = (LPSTR)::GlobalLock(hGlobalMemory); - - memcpy(buf, lpGlobalMemory, size); - - ::GlobalUnlock(hGlobalMemory); - - retval = buf; - break; - } - } - - if ( !retval ) - { - wxLogSysError(_("Failed to retrieve data from the clipboard.")); - } - - return retval; -*/ - return NULL; -} - -wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat) -{ - // TODO: return ::EnumClipboardFormats(dataFormat); - return dataFormat; -} - -int wxRegisterClipboardFormat(wxChar *WXUNUSED(formatName)) -{ - // TODO: return ::RegisterClipboardFormat(formatName); - return 0; -} - -bool wxGetClipboardFormatName(wxDataFormat WXUNUSED(dataFormat), - wxChar *WXUNUSED(formatName), - int WXUNUSED(maxCount)) -{ - // TODO: return ::GetClipboardFormatName((int)dataFormat, formatName, maxCount) > 0; - return 0; -} - -// --------------------------------------------------------------------------- -// wxClipboard -// --------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject) - -wxClipboard::wxClipboard() -{ -} - -wxClipboard::~wxClipboard() -{ - Clear(); -} - -void wxClipboard::Clear() -{ -} - -bool wxClipboard::Flush() -{ - // TODO: - return false; -} - -bool wxClipboard::Open() -{ - return wxOpenClipboard(); -} - -bool wxClipboard::IsOpened() const -{ - return wxIsClipboardOpened(); -} - -bool wxClipboard::SetData( wxDataObject *WXUNUSED(data) ) -{ - (void)wxEmptyClipboard(); - // TODO: - /* - if ( data ) - return AddData(data); - else - return true; - */ - return true; -} - -bool wxClipboard::AddData( wxDataObject *data ) -{ - wxCHECK_MSG( data, false, wxT("data is invalid") ); - -#if wxUSE_DRAG_AND_DROP - wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") ); - -// wxDataFormat format = data->GetPreferredFormat(); -// TODO: -/* - switch ( format ) - { - case wxDF_TEXT: - case wxDF_OEMTEXT: - { - wxTextDataObject* textDataObject = (wxTextDataObject*) data; - wxString str(textDataObject->GetText()); - return wxSetClipboardData(format, str.c_str()); - } - - case wxDF_BITMAP: - case wxDF_DIB: - { - wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data; - wxBitmap bitmap(bitmapDataObject->GetBitmap()); - return wxSetClipboardData(data->GetPreferredFormat(), &bitmap); - } - -#if wxUSE_METAFILE - case wxDF_METAFILE: - { - wxMetafileDataObject* metaFileDataObject = - (wxMetafileDataObject*) data; - wxMetafile metaFile = metaFileDataObject->GetMetafile(); - return wxSetClipboardData(wxDF_METAFILE, &metaFile, - metaFileDataObject->GetWidth(), - metaFileDataObject->GetHeight()); - } -#endif // wxUSE_METAFILE - - default: - return wxSetClipboardData(data); - } -#else // !wxUSE_DRAG_AND_DROP -*/ - return false; -#else - return false; -#endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP -} - -void wxClipboard::Close() -{ - wxCloseClipboard(); -} - -bool wxClipboard::IsSupported( const wxDataFormat& format ) -{ - return wxIsClipboardFormatAvailable(format); -} - -bool wxClipboard::GetData( wxDataObject& WXUNUSED(data) ) -{ - wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") ); - -#if wxUSE_DRAG_AND_DROP -// wxDataFormat format = data.GetPreferredFormat(); - // TODO: -/* - switch ( format ) - { - case wxDF_TEXT: - case wxDF_OEMTEXT: - { - wxTextDataObject& textDataObject = (wxTextDataObject&) data; - char* s = (char*) wxGetClipboardData(format); - if ( s ) - { - textDataObject.SetText(s); - delete[] s; - return true; - } - else - return false; - } - - case wxDF_BITMAP: - case wxDF_DIB: - { - wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data; - wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetPreferredFormat()); - if (bitmap) - { - bitmapDataObject.SetBitmap(* bitmap); - delete bitmap; - return true; - } - else - return false; - } -#if wxUSE_METAFILE - case wxDF_METAFILE: - { - wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data; - wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE); - if (metaFile) - { - metaFileDataObject.SetMetafile(*metaFile); - delete metaFile; - return true; - } - else - return false; - } -#endif - default: - { - long len; - void *buf = wxGetClipboardData(format, &len); - if ( buf ) - { - // FIXME this is for testing only! - ((wxPrivateDataObject &)data).SetData(buf, len); - free(buf); - - return true; - } - } - - return false; - } -#else -*/ - return false; -#else - return false; -#endif -} - -#endif // wxUSE_CLIPBOARD diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp deleted file mode 100644 index 287e2c4181..0000000000 --- a/src/os2/colour.cpp +++ /dev/null @@ -1,62 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/colour.cpp -// Purpose: wxColour class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/colour.h" - -#ifndef WX_PRECOMP - #include "wx/gdicmn.h" -#endif - -#define INCL_GPI -#define INCL_PM -#include - -// Colour - -void wxColour::Init() -{ - m_bIsInit = false; - m_vPixel = 0; - m_cRed = m_cBlue = m_cGreen = 0; -} // end of wxColour::Init - -wxColour::wxColour( const wxColour& rCol ) -{ - *this = rCol; -} // end of wxColour::wxColour - -wxColour& wxColour::operator= (const wxColour& rCol) -{ - m_cRed = rCol.m_cRed; - m_cGreen = rCol.m_cGreen; - m_cBlue = rCol.m_cBlue; - m_bIsInit = rCol.m_bIsInit; - m_vPixel = rCol.m_vPixel; - return *this; -} // end of wxColour& wxColour::operator = - -wxColour::~wxColour() -{ -} // end of wxColour::~wxColour - -void wxColour::InitRGBA( unsigned char cRed, - unsigned char cGreen, - unsigned char cBlue, - unsigned char WXUNUSED(calpha) ) -{ - m_cRed = cRed; - m_cGreen = cGreen; - m_cBlue = cBlue; - m_bIsInit = true; - m_vPixel = OS2RGB (m_cRed, m_cGreen, m_cBlue); -} // end of wxColour::Set diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp deleted file mode 100644 index 9cf412cb15..0000000000 --- a/src/os2/combobox.cpp +++ /dev/null @@ -1,281 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/combobox.cpp -// Purpose: wxComboBox class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_COMBOBOX - -#include "wx/combobox.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" -#endif - -#include "wx/clipbrd.h" -#include "wx/os2/private.h" - -#define OWNER_DRAWN_LISTBOX_EXTRA_SPACE (1) - -MRESULT EXPENTRY wxComboEditWndProc( HWND hWnd - ,UINT uMessage - ,MPARAM wParam - ,MPARAM lParam - ); -// -// The pointer to standard wnd proc -// -static WXFARPROC gfnWndprocEdit = (WXFARPROC)NULL; - -bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) ) -{ - long lSel = GetSelection(); - wxString sValue; - - switch (uParam) - { - case CBN_LBSELECT: - if (lSel > -1) - { - wxCommandEvent vEvent( wxEVT_COMBOBOX, GetId() ); - - vEvent.SetInt(lSel); - vEvent.SetEventObject(this); - vEvent.SetString(GetStringSelection()); - - ProcessCommand(vEvent); - } - break; - - case CBN_EFCHANGE: - { - wxCommandEvent vEvent( wxEVT_TEXT, GetId() ); - - if (lSel == -1L) - sValue = GetValue(); - else - sValue = GetStringSelection(); - vEvent.SetString(sValue); - vEvent.SetEventObject(this); - ProcessCommand(vEvent); - } - break; - } - // - // There is no return value for the CBN_ notifications, so always return - // false from here to pass the message to DefWindowProc() - // - return false; -} // end of wxComboBox::OS2Command - -bool wxComboBox::Create( - wxWindow* pParent -, wxWindowID vId -, const wxString& rsValue -, const wxPoint& rPos -, const wxSize& rSize -, const wxArrayString& asChoices -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) -{ - wxCArrayString chs(asChoices); - - return Create(pParent, vId, rsValue, rPos, rSize, chs.GetCount(), - chs.GetStrings(), lStyle, rValidator, rsName); -} - -bool wxComboBox::Create( - wxWindow* pParent -, wxWindowID vId -, const wxString& rsValue -, const wxPoint& rPos -, const wxSize& rSize -, int n -, const wxString asChoices[] -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) -{ - m_isShown = false; - - if (!CreateControl( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - )) - return false; - - // - // Get the right style - // - long lSstyle = 0L; - - lSstyle = WS_TABSTOP | - WS_VISIBLE; - - // clipping siblings does not yet work - // if (lStyle & wxCLIP_SIBLINGS ) - // lSstyle |= WS_CLIPSIBLINGS; - if (lStyle & wxCB_READONLY) - lSstyle |= CBS_DROPDOWNLIST; - else if (lStyle & wxCB_SIMPLE) - lSstyle |= CBS_SIMPLE; // A list (shown always) and edit control - else - lSstyle |= CBS_DROPDOWN; - - - if (!OS2CreateControl( wxT("COMBOBOX") - ,lSstyle - )) - return false; - - // - // A choice/combobox normally has a white background (or other, depending - // on global settings) rather than inheriting the parent's background colour. - // - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - - for (int i = 0; i < n; i++) - { - Append(asChoices[i]); - } - - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); - - // Set height to use with sizers i.e. without the dropdown listbox - wxFont vFont = GetFont(); - int nEditHeight; - wxGetCharSize( GetHWND(), NULL, &nEditHeight, &vFont ); - nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nEditHeight); - SetInitialSize(wxSize(-1,nEditHeight+4)); // +2x2 for the border - - if (!rsValue.empty()) - { - SetValue(rsValue); - } - gfnWndprocEdit = (WXFARPROC)::WinSubclassWindow( (HWND)GetHwnd() - ,(PFNWP)wxComboEditWndProc - ); - ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this); - Show(true); - return true; -} // end of wxComboBox::Create - -wxString wxComboBox::GetValue() const -{ - return HasFlag(wxCB_READONLY) ? GetStringSelection() - : wxTextEntry::GetValue(); -} - -void wxComboBox::SetValue(const wxString& value) -{ - if ( HasFlag(wxCB_READONLY) ) - SetStringSelection(value); - else - wxTextEntry::SetValue(value); -} - -void wxComboBox::Clear() -{ - wxChoice::Clear(); - if ( !HasFlag(wxCB_READONLY) ) - wxTextEntry::Clear(); -} - -bool wxComboBox::IsEditable() const -{ - return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable(); -} - -bool wxComboBox::ProcessEditMsg( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam) -{ - SHORT vFlag; - switch (uMsg) - { - case WM_CHAR: - vFlag = SHORT1FROMMP(wParam); - switch(vFlag) - { - case KC_CHAR: - return (HandleChar( wParam - ,lParam - ,true /* isASCII */ - )); - - case KC_PREVDOWN: - return (HandleKeyDown( wParam - ,lParam - )); - - case KC_KEYUP: - return (HandleKeyUp( wParam - ,lParam - )); - } - break; - - case WM_SETFOCUS: - if (SHORT1FROMMP((MPARAM)lParam) == TRUE) - return(HandleSetFocus((WXHWND)(HWND)wParam)); - else - return(HandleKillFocus((WXHWND)(HWND)wParam)); - } - return false; -} // end of wxComboBox::ProcessEditMsg - -MRESULT EXPENTRY wxComboEditWndProc( - HWND hWnd -, UINT uMessage -, MPARAM wParam -, MPARAM lParam -) -{ - switch (uMessage) - { - // - // Forward some messages to the combobox - // - case WM_SETFOCUS: - case WM_CHAR: - { - wxComboBox* pCombo = (wxComboBox *)::WinQueryWindowULong( hWnd - ,QWL_USER - ); - - if (pCombo->ProcessEditMsg( uMessage - ,wParam - ,lParam - )) - return ((MRESULT)0); - } - break; - - // - // TODO: Deal with tooltips here - // - } - return (gfnWndprocEdit(hWnd, (ULONG)uMessage, (MPARAM)wParam, (MPARAM)lParam)); -} // end of wxComboEditWndProc - -#endif - // wxUSE_COMBOBOX diff --git a/src/os2/control.cpp b/src/os2/control.cpp deleted file mode 100644 index 50020c88b5..0000000000 --- a/src/os2/control.cpp +++ /dev/null @@ -1,280 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/control.cpp -// Purpose: wxControl class -// Author: David Webster -// Modified by: -// Created: 09/17/99 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/control.h" - -#ifndef WX_PRECOMP - #include "wx/event.h" - #include "wx/app.h" - #include "wx/dcclient.h" - #include "wx/scrolwin.h" - #include "wx/log.h" -#endif - -#include "wx/os2/dc.h" -#include "wx/os2/private.h" - -IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) - -BEGIN_EVENT_TABLE(wxControl, wxWindow) - EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) -END_EVENT_TABLE() - -// Item members -wxControl::wxControl() -{ -} // end of wxControl::wxControl - -bool wxControl::Create( wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxValidator& rValidator, - const wxString& rsName ) -{ - bool bRval = wxWindow::Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rsName - ); - if (bRval) - { -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - } - return bRval; -} // end of wxControl::Create - -bool wxControl::OS2CreateControl( const wxChar* zClassname, - const wxString& rsLabel, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle ) -{ - WXDWORD dwExstyle; - WXDWORD dwStyle = OS2GetStyle( lStyle, &dwExstyle ); - - return OS2CreateControl( zClassname - ,dwStyle - ,rPos - ,rSize - ,rsLabel - ,dwExstyle - ); -} // end of wxControl::OS2CreateControl - -bool wxControl::OS2CreateControl( const wxChar* zClassname, - WXDWORD dwStyle, - const wxPoint& rPos, - const wxSize& rSize, - const wxString& rsLabel, - WXDWORD dwExstyle ) -{ - // - // Doesn't do anything at all under OS/2 - // - if (dwExstyle == (WXDWORD)-1) - { - dwExstyle = 0; - (void) OS2GetStyle(GetWindowStyle(), &dwExstyle); - } - // - // All controls should have these styles (wxWidgets creates all controls - // visible by default) - // - if (m_isShown ) - dwStyle |= WS_VISIBLE; - - wxWindow* pParent = GetParent(); - PSZ zClass = ""; - - if (!pParent) - return false; - - if ((wxStrcmp(zClassname, wxT("COMBOBOX"))) == 0) - zClass = WC_COMBOBOX; - else if ((wxStrcmp(zClassname, wxT("STATIC"))) == 0) - zClass = WC_STATIC; - else if ((wxStrcmp(zClassname, wxT("BUTTON"))) == 0) - zClass = WC_BUTTON; - else if ((wxStrcmp(zClassname, wxT("NOTEBOOK"))) == 0) - zClass = WC_NOTEBOOK; - else if ((wxStrcmp(zClassname, wxT("CONTAINER"))) == 0) - zClass = WC_CONTAINER; - if ((zClass == WC_STATIC) || (zClass == WC_BUTTON)) - dwStyle |= DT_MNEMONIC; - - m_dwStyle = dwStyle; - m_label = rsLabel; - wxString label; - if (dwStyle & DT_MNEMONIC) - label = ::wxPMTextToLabel(m_label); - else - label = m_label; - - // clipping siblings does not yet work - dwStyle &= ~WS_CLIPSIBLINGS; - - m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,zClass // Window class - ,label.c_str() // Initial Text - ,(ULONG)dwStyle // Style flags - ,(LONG)0 // X pos of origin - ,(LONG)0 // Y pos of origin - ,(LONG)0 // control width - ,(LONG)0 // control height - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(ULONG)GetId() // Window identifier - ,NULL // no control data - ,NULL // no Presentation parameters - ); - - if ( !m_hWnd ) - { - wxLogError(wxT("Failed to create a control of class '%s'"), zClassname); - - return false; - } - // - // Subclass again for purposes of dialog editing mode - // - SubclassWin(m_hWnd); - - // - // Controls use the same colours as their parent dialog by default - // - InheritAttributes(); - // - // All OS/2 ctrls use the small font - // - SetFont(*wxSMALL_FONT); - - SetXComp(0); - SetYComp(0); - SetSize( rPos.x, rPos.y, rSize.x, rSize.y ); - return true; -} // end of wxControl::OS2CreateControl - -wxSize wxControl::DoGetBestSize() const -{ - return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); -} // end of wxControl::DoGetBestSize - -bool wxControl::ProcessCommand(wxCommandEvent& event) -{ - return HandleWindowEvent(event); -} - -WXHBRUSH wxControl::OnCtlColor(WXHDC hWxDC, - WXHWND WXUNUSED(hWnd), - WXUINT WXUNUSED(uCtlColor), - WXUINT WXUNUSED(uMessage), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam)) -{ - HPS hPS = (HPS)hWxDC; // pass in a PS handle in OS/2 - wxColour vColFore = GetForegroundColour(); - wxColour vColBack = GetBackgroundColour(); - - if (GetParent()->GetTransparentBackground()) - ::GpiSetBackMix(hPS, BM_LEAVEALONE); - else - ::GpiSetBackMix(hPS, BM_OVERPAINT); - - ::GpiSetBackColor(hPS, vColBack.GetPixel()); - ::GpiSetColor(hPS, vColFore.GetPixel()); - - wxBrush* pBrush = wxTheBrushList->FindOrCreateBrush( vColBack - ,wxSOLID - ); - return (WXHBRUSH)pBrush->GetResourceHandle(); -} // end of wxControl::OnCtlColor - -void wxControl::OnEraseBackground( wxEraseEvent& rEvent ) -{ - RECTL vRect; - wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl(); - HPS hPS = impl->GetHPS(); - SIZEL vSize = {0,0}; - - ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT); - ::WinQueryWindowRect((HWND)GetHwnd(), &vRect); - ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); -} // end of wxControl::OnEraseBackground - -WXDWORD wxControl::OS2GetStyle( long lStyle, WXDWORD* pdwExstyle ) const -{ - long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle ); - - if (AcceptsFocusFromKeyboard()) - { - dwStyle |= WS_TABSTOP; - } - return dwStyle; -} // end of wxControl::OS2GetStyle - -void wxControl::SetLabel( const wxString& rsLabel ) -{ - if(rsLabel != m_label) - { - m_label = rsLabel; - wxString label; - if (m_dwStyle & DT_MNEMONIC) - label = ::wxPMTextToLabel(m_label); - else - label = m_label; - ::WinSetWindowText(GetHwnd(), label.c_str()); - } -} // end of wxControl::SetLabel - -// --------------------------------------------------------------------------- -// global functions -// --------------------------------------------------------------------------- - -// Call this repeatedly for several wnds to find the overall size -// of the widget. -// Call it initially with -1 for all values in rect. -// Keep calling for other widgets, and rect will be modified -// to calculate largest bounding rectangle. -void wxFindMaxSize( - WXHWND hWnd -, RECT* pRect -) -{ - int nLeft = pRect->xLeft; - int nRight = pRect->xRight; - int nTop = pRect->yTop; - int nBottom = pRect->yBottom; - - ::WinQueryWindowRect((HWND)hWnd, pRect); - - if (nLeft < 0) - return; - - if (nLeft < pRect->xLeft) - pRect->xLeft = nLeft; - - if (nRight > pRect->xRight) - pRect->xRight = nRight; - - if (nTop > pRect->yTop) - pRect->yTop = nTop; - - if (nBottom < pRect->yBottom) - pRect->yBottom = nBottom; -} // end of wxFindMaxSize diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp deleted file mode 100644 index bf5bc9c84f..0000000000 --- a/src/os2/cursor.cpp +++ /dev/null @@ -1,311 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/cursor.cpp -// Purpose: wxCursor class -// Author: David Webster -// Modified by: -// Created: 10/13/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/cursor.h" - -#ifndef WX_PRECOMP - #include - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/icon.h" - #include "wx/image.h" - #include "wx/log.h" -#endif - -#include "wx/os2/private.h" -#include "wx/os2/wxrsc.h" - -#include "assert.h" - -IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) - -wxCursorRefData::wxCursorRefData(void) -{ - m_nWidth = 32; - m_nHeight = 32; - m_hCursor = 0 ; - m_bDestroyCursor = false; -} - -void wxCursorRefData::Free() -{ - if (m_hCursor) - { - if (m_bDestroyCursor) - ::WinDestroyPointer((HPOINTER)m_hCursor); - m_hCursor = 0; - } -} // end of wxCursorRefData::Free - -// Cursors -wxCursor::wxCursor(void) -{ -} - -wxCursor::wxCursor(const wxImage& rImage) -{ - wxImage vImage32 = rImage.Scale(32,32); - int nWidth = vImage32.GetWidth(); - int nHeight = vImage32.GetHeight(); - - // - // Need a bitmap handle somehow - // - HBITMAP hBitmap = wxBitmap(vImage32).GetHBITMAP(); - int nHotSpotX = vImage32.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); - int nHotSpotY = vImage32.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y); - - if (nHotSpotX < 0 || nHotSpotX >= nWidth) - nHotSpotX = 0; - if (nHotSpotY < 0 || nHotSpotY >= nHeight) - nHotSpotY = 0; - - - wxCursorRefData* pRefData = new wxCursorRefData; - - m_refData = pRefData; - pRefData->m_hCursor = (WXHCURSOR) ::WinCreatePointer( HWND_DESKTOP - ,hBitmap - ,TRUE - ,nHotSpotY - ,nHotSpotX - ); - -} // end of wxCursor::wxCursor - -wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile), - wxBitmapType type, - int WXUNUSED(nHotSpotX), - int WXUNUSED(nHotSpotY) ) -{ - wxCursorRefData* pRefData = new wxCursorRefData; - - pRefData = new wxCursorRefData; - m_refData = pRefData; - pRefData->m_bDestroyCursor = false; - if (type == wxBITMAP_TYPE_CUR_RESOURCE) - { - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)type // if OS/2 this should be the resource Id - ); - } - else - wxLogError("Invalid cursor bitmap type '%d'", type); -} // end of wxCursor::wxCursor - -// Cursors by stock number -void wxCursor::InitFromStock(wxStockCursor nCursorType) -{ - wxCursorRefData* pRefData = new wxCursorRefData; - - m_refData = pRefData; - switch (nCursorType) - { - case wxCURSOR_ARROWWAIT: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_WAIT - ,FALSE - ); - break; - - case wxCURSOR_WATCH: - case wxCURSOR_WAIT: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_WAIT - ,FALSE - ); - break; - - case wxCURSOR_IBEAM: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_TEXT - ,FALSE - ); - break; - - case wxCURSOR_CROSS: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_MOVE - ,FALSE - ); - break; - - case wxCURSOR_SIZENWSE: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_SIZENWSE - ,FALSE - ); - break; - - case wxCURSOR_SIZENESW: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_SIZENESW - ,FALSE - ); - break; - - case wxCURSOR_SIZEWE: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_SIZEWE - ,FALSE - ); - break; - - case wxCURSOR_SIZENS: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_SIZENS - ,FALSE - ); - break; - - case wxCURSOR_CHAR: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_ARROW - ,FALSE - ); - break; - - case wxCURSOR_HAND: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)wxCURSOR_HAND - ); - break; - - case wxCURSOR_BULLSEYE: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)wxCURSOR_BULLSEYE - ); - break; - - case wxCURSOR_PENCIL: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)wxCURSOR_PENCIL - ); - break; - - case wxCURSOR_MAGNIFIER: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)wxCURSOR_MAGNIFIER - ); - break; - - case wxCURSOR_NO_ENTRY: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_ILLEGAL - ,FALSE - ); - break; - - case wxCURSOR_LEFT_BUTTON: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_ARROW - ,FALSE - ); - break; - - case wxCURSOR_RIGHT_BUTTON: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_ARROW - ,FALSE - ); - break; - - case wxCURSOR_MIDDLE_BUTTON: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_ARROW - ,FALSE - ); - break; - - case wxCURSOR_SIZING: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_SIZE - ,FALSE - ); - break; - - case wxCURSOR_SPRAYCAN: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)WXCURSOR_ROLLER - ); - break; - - case wxCURSOR_PAINT_BRUSH: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)WXCURSOR_PBRUSH - ); - break; - - case wxCURSOR_POINT_LEFT: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)WXCURSOR_PLEFT - ); - break; - - case wxCURSOR_POINT_RIGHT: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)WXCURSOR_PRIGHT - ); - break; - - case wxCURSOR_QUESTION_ARROW: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)WXCURSOR_QARROW - ); - break; - - case wxCURSOR_BLANK: - pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP - ,0 - ,(ULONG)WXCURSOR_BLANK - ); - break; - - default: - case wxCURSOR_ARROW: - pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP - ,(ULONG)SPTR_ARROW - ,FALSE - ); - break; - } - // - // No need to destroy the stock cursors - // - ((wxCursorRefData *)m_refData)->m_bDestroyCursor = false; -} // end of wxCursor::wxCursor - -// Global cursor setting -void wxSetCursor(const wxCursor& cursor) -{ - extern wxCursor *g_globalCursor; - - if ( cursor.IsOk() && cursor.GetHCURSOR() ) - { -// ::SetCursor((HCURSOR) cursor.GetHCURSOR()); - - if ( g_globalCursor ) - (*g_globalCursor) = cursor; - } -} diff --git a/src/os2/data.cpp b/src/os2/data.cpp deleted file mode 100644 index 1f7323d09d..0000000000 --- a/src/os2/data.cpp +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/data.cpp -// Purpose: Various OS/2-specific global data -// Author: David Webster -// Modified by: -// Created: 09/20/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#include "wx/fontutil.h" - -// Current cursor, in order to hang on to -// cursor handle when setting the cursor globally -wxCursor *g_globalCursor = NULL; - -wxNativeFontInfo wxNullNativeFontInfo; - -// -// Class names -// -const wxChar* wxFrameClassName = wxT("wxFrameClass"); -const wxChar* wxFrameClassNameNoRedraw = wxT("wxFrameClassNR"); -const wxChar* wxMDIFrameClassName = wxT("wxMDIFrameClass"); -const wxChar* wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR"); -const wxChar* wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass"); -const wxChar* wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR"); -const wxChar* wxPanelClassName = wxT("wxPanelClass"); -const wxChar* wxPanelClassNameNR = wxT("wxPanelClassNR"); -const wxChar* wxCanvasClassName = wxT("wxCanvasClass"); -const wxChar* wxCanvasClassNameNR = wxT("wxCanvasClassNR"); - diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp deleted file mode 100644 index 290810616e..0000000000 --- a/src/os2/dataobj.cpp +++ /dev/null @@ -1,355 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dataobj.cpp -// Purpose: implementation of wx[I]DataObject class -// Author: David Webster -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1999 David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_DATAOBJ - -#include "wx/dataobj.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/image.h" -#endif - -#include "wx/mstream.h" - -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// functions -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// wxDataFormat -// ---------------------------------------------------------------------------- - -wxString wxDataFormat::GetId() const -{ - wxChar zBuf[256]; - wxString sRet; - - ::WinQueryAtomName( ::WinQuerySystemAtomTable() - ,m_uFormat - ,(PSZ)zBuf - ,256 - ); - sRet = zBuf; - return sRet; -} // end of wxDataFormat::GetId() - -void wxDataFormat::SetId ( - const wxString& zId -) -{ - m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable() - ,zId.char_str() - ); -} // end of wxDataFormat::SetId - -class CIDataObject -{ -public: - CIDataObject(wxDataObject* pDataObject); - ~CIDataObject(); - - // - // Operations on the DRAGITEM struct - // - bool GetData( const wxDataFormat& rFormat - ,char* pzBuffer - ,ULONG ulLen - ); - void GetDataHere( const wxDataFormat& rFormat - ,char* pzBuffer - ,ULONG ulLen - ); - void QueryGetData(const wxDataFormat& rFormat); - void SetData( const wxDataFormat& rFormat - ,char* pzBuffer - ); -private: - wxDataObject* m_pDataObject; // pointer to C++ class we belong to - DRAGITEM m_vDragItem; -}; // end of CLASS CIDataObject - -bool CIDataObject::GetData ( const wxDataFormat& rFormat, - char* pzBuffer, - ULONG ulLen ) -{ - QueryGetData(rFormat); - if (rFormat.GetType() == wxDF_INVALID) - return false; - - ULONG ulSize = m_pDataObject->GetDataSize(rFormat); - - if (ulSize == 0) - { - // - // It probably means that the method is just not implemented - // - return false; - } - if (rFormat.GetType() == wxDF_PRIVATE) - { - // - // For custom formats, put the size with the data - alloc the - // space for it - // - ulSize += sizeof(ULONG); - } - - if (ulSize > ulLen) // not enough room to copy - return false; - - // - // Copy the data - // - GetDataHere( rFormat - ,pzBuffer - ,ulSize - ); - return true; -} // end of CIDataObject::GetData - -void CIDataObject::GetDataHere( - const wxDataFormat& rFormat -, char* pzBuffer -, ULONG WXUNUSED(ulLen) -) -{ - m_pDataObject->GetDataHere( rFormat - ,(void*)pzBuffer - ); -} // end of CIDataObject::GetDataHere - -void CIDataObject::QueryGetData ( - const wxDataFormat& rFormat -) -{ - m_pDataObject->IsSupportedFormat(rFormat); -} // end of CIDataObject::QueryGetData - -void CIDataObject::SetData ( - const wxDataFormat& rFormat -, char* pzBuffer -) -{ - ULONG ulSize = 0; - - switch (rFormat.GetType()) - { - case wxDF_TEXT: - case wxDF_OEMTEXT: - case wxDF_FILENAME: - case wxDF_HTML: - ulSize = strlen((const char *)pzBuffer); - break; - -#if wxUSE_UNICODE - case wxDF_UNICODETEXT: - ulSize = ::wcslen((const wchar_t *)pzBuffer); - break; -#endif - - case wxDF_BITMAP: - case wxDF_METAFILE: - case wxDF_ENHMETAFILE: - case wxDF_TIFF: - case wxDF_DIB: - ulSize = 0; // pass via a handle - break; - - - case wxDF_SYLK: - case wxDF_DIF: - case wxDF_PALETTE: - case wxDF_PENDATA: - case wxDF_RIFF: - case wxDF_WAVE: - case wxDF_LOCALE: - //PUNT - break; - - case wxDF_PRIVATE: - size_t* p = (size_t *)pzBuffer; - - ulSize = *p++; - pzBuffer = (char*)p; - break; - } - m_pDataObject->SetData( rFormat - ,ulSize - ,(void*)pzBuffer - ); -} // end of CIDataObject::SetData - -//------------------------------------------------------------------------- -// wxDataObject -//------------------------------------------------------------------------- - -wxDataObject::wxDataObject () -{ - m_pDataObject = new DRAGITEM; -} // end of wxDataObject::wxDataObject - -wxDataObject::~wxDataObject () -{ - delete m_pDataObject; -} // end of wxDataObject::~wxDataObject - -// ---------------------------------------------------------------------------- -// wxFileDataObject -// ---------------------------------------------------------------------------- - -bool wxFileDataObject::GetDataHere( void* pBuf ) const -{ - wxString sFilenames; - - for (size_t i = 0; i < m_filenames.GetCount(); i++) - { - sFilenames += m_filenames[i]; - sFilenames += (wxChar)0; - } - - memcpy(pBuf, sFilenames.mbc_str(), sFilenames.length() + 1); - return true; -} - -size_t wxFileDataObject::GetDataSize() const -{ - size_t nRes = 0; - - for (size_t i = 0; i < m_filenames.GetCount(); i++) - { - nRes += m_filenames[i].length(); - nRes += 1; - } - - return nRes + 1; -} - -bool wxFileDataObject::SetData( size_t WXUNUSED(nSize), - const void* pBuf ) -{ - /* TODO */ - - wxString sFile((const wxChar *)pBuf); /* char, not wxChar */ - - AddFile(sFile); - - return true; -} - -void wxFileDataObject::AddFile( - const wxString& rFilename -) -{ - m_filenames.Add(rFilename); -} - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject -// ---------------------------------------------------------------------------- - -wxBitmapDataObject::wxBitmapDataObject() -{ - Init(); -} - -wxBitmapDataObject::wxBitmapDataObject( - const wxBitmap& rBitmap -) -: wxBitmapDataObjectBase(rBitmap) -{ - Init(); - - DoConvertToPng(); -} - -wxBitmapDataObject::~wxBitmapDataObject() -{ - Clear(); -} - -void wxBitmapDataObject::SetBitmap( const wxBitmap& rBitmap ) -{ - ClearAll(); - wxBitmapDataObjectBase::SetBitmap(rBitmap); - DoConvertToPng(); -} - -bool wxBitmapDataObject::GetDataHere( void* pBuf ) const -{ - if (!m_pngSize) - { - wxFAIL_MSG(wxT("attempt to copy empty bitmap failed")); - return false; - } - memcpy(pBuf, m_pngData, m_pngSize); - return true; -} - -bool wxBitmapDataObject::SetData( size_t nSize, const void* pBuf) -{ - Clear(); - m_pngSize = nSize; - m_pngData = malloc(m_pngSize); - - memcpy(m_pngData, pBuf, m_pngSize); - -#if wxUSE_STREAMS - wxMemoryInputStream vMstream((char*)m_pngData, m_pngSize); - wxImage vImage; - wxPNGHandler vHandler; - - if (!vHandler.LoadFile(&vImage, vMstream)) - { - return false; - } - - m_bitmap = wxBitmap(vImage); -#endif //wxUSE_STREAMS - - return m_bitmap.IsOk(); -} - -void wxBitmapDataObject::DoConvertToPng() -{ - if (!m_bitmap.IsOk()) - return; - -#if wxUSE_STREAMS - wxImage vImage = m_bitmap.ConvertToImage(); - wxPNGHandler vHandler; - wxCountingOutputStream vCount; - - vHandler.SaveFile(&vImage, vCount); - - m_pngSize = vCount.GetSize() + 100; // sometimes the size seems to vary ??? - m_pngData = malloc(m_pngSize); - - wxMemoryOutputStream vMstream((char*) m_pngData, m_pngSize); - - vHandler.SaveFile(&vImage, vMstream ); -#endif -} - -#endif // wxUSE_DATAOBJ diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp deleted file mode 100644 index 823467f540..0000000000 --- a/src/os2/dc.cpp +++ /dev/null @@ -1,2734 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dc.cpp -// Purpose: wxDC class -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/dc.h" - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/app.h" - #include "wx/bitmap.h" - #include "wx/dcmemory.h" - #include "wx/log.h" - #include "wx/icon.h" - #include "wx/msgdlg.h" - #include "wx/dcprint.h" - #include "wx/statusbr.h" - #include "wx/module.h" -#endif - -#include - -#include "wx/os2/dc.h" -#include "wx/os2/dcclient.h" -#include "wx/os2/private.h" - -IMPLEMENT_ABSTRACT_CLASS(wxPMDCImpl, wxDCImpl) - -// -// wxWidgets uses the Microsoft convention that the origin is the UPPER left. -// Native OS/2 however in the GPI and PM define the origin as the LOWER left. -// In order to map OS/2 GPI/PM y coordinates to wxWidgets coordinates we must -// perform the following transformation: -// -// Parent object height: POBJHEIGHT -// Desried origin: WXORIGINY -// Object to place's height: OBJHEIGHT -// -// To get the OS2 position from the wxWidgets one: -// -// OS2Y = POBJHEIGHT - (WXORIGINY + OBJHEIGHT) -// -// For OS/2 wxDC's we will always determine m_vRclPaint as the size of the -// OS/2 Presentation Space associated with the device context. y is the -// desired application's y coordinate of the origin in wxWidgets space. -// objy is the height of the object we are going to draw. -// -#define OS2Y(y, objy) ((m_vRclPaint.yTop - m_vRclPaint.yBottom) - (y + objy)) - -// --------------------------------------------------------------------------- -// constants -// --------------------------------------------------------------------------- - -static const int VIEWPORT_EXTENT = 1000; - -static const int MM_POINTS = 9; -static const int MM_METRIC = 10; - -// --------------------------------------------------------------------------- -// private functions -// --------------------------------------------------------------------------- - -// convert degrees to radians -static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } - -int SetTextColor( - HPS hPS -, int nForegroundColour -) -{ - CHARBUNDLE vCbnd; - - vCbnd.lColor = nForegroundColour; - ::GpiSetAttrs( hPS // presentation-space handle - ,PRIM_CHAR // Char primitive. - ,CBB_COLOR // sets color. - ,0 // - ,&vCbnd // buffer for attributes. - ); - return 0; -} - -int QueryTextBkColor( - HPS hPS -) -{ - CHARBUNDLE vCbnd; - - ::GpiQueryAttrs( hPS // presentation-space handle - ,PRIM_CHAR // Char primitive. - ,CBB_BACK_COLOR // Background color. - ,&vCbnd // buffer for attributes. - ); - return vCbnd.lBackColor; -} - - -int SetTextBkColor( - HPS hPS -, int nBackgroundColour -) -{ - CHARBUNDLE vCbnd; - int rc; - - rc = QueryTextBkColor(hPS); - - vCbnd.lBackColor = nBackgroundColour; - ::GpiSetAttrs(hPS, // presentation-space handle - PRIM_CHAR, // Char primitive. - CBB_BACK_COLOR, // sets color. - 0, - &vCbnd // buffer for attributes. - ); - return rc; -} - -int SetBkMode( - HPS hPS -, int nBackgroundMode -) -{ - if(nBackgroundMode == wxTRANSPARENT) - ::GpiSetBackMix( hPS - ,BM_LEAVEALONE - ); - else - // the background of the primitive takes over whatever is underneath. - ::GpiSetBackMix( hPS - ,BM_OVERPAINT - ); - return 0; -} - -// =========================================================================== -// implementation -// =========================================================================== - -#if wxUSE_DC_CACHEING - -/* - * This implementation is a bit ugly and uses the old-fashioned wxList class, so I will - * improve it in due course, either using arrays, or simply storing pointers to one - * entry for the bitmap, and two for the DCs. -- JACS - */ - -// --------------------------------------------------------------------------- -// wxDCCacheEntry -// --------------------------------------------------------------------------- - -wxList wxPMDCImpl::m_svBitmapCache; -wxList wxPMDCImpl::m_svDCCache; - -wxDCCacheEntry::wxDCCacheEntry( - WXHBITMAP hBitmap -, int nWidth -, int nHeight -, int nDepth -) -{ - m_hBitmap = hBitmap; - m_hPS = NULLHANDLE; - m_nWidth = nWidth; - m_nHeight = nHeight; - m_nDepth = nDepth; -} // end of wxDCCacheEntry::wxDCCacheEntry - -wxDCCacheEntry::wxDCCacheEntry( - HPS hPS -, int nDepth -) -{ - m_hBitmap = NULLHANDLE; - m_hPS = hPS; - m_nWidth = 0; - m_nHeight = 0; - m_nDepth = nDepth; -} // end of wxDCCacheEntry::wxDCCacheEntry - -wxDCCacheEntry::~wxDCCacheEntry() -{ - if (m_hBitmap) - ::GpiDeleteBitmap(m_hBitmap); - if (m_hPS) - ::GpiDestroyPS(m_hPS); -} // end of wxDCCacheEntry::~wxDCCacheEntry - -wxDCCacheEntry* wxPMDCImpl::FindBitmapInCache( - HPS hPS -, int nWidth -, int nHeight -) -{ - int nDepth = 24; // we'll fix this later ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); - wxNode* pNode = m_svBitmapCache.First(); - BITMAPINFOHEADER2 vBmpHdr; - - while(pNode) - { - wxDCCacheEntry* pEntry = (wxDCCacheEntry*)pNode->Data(); - - if (pEntry->m_nDepth == nDepth) - { - memset(&vBmpHdr, 0, sizeof(BITMAPINFOHEADER2)); - - if (pEntry->m_nWidth < nWidth || pEntry->m_nHeight < nHeight) - { - ::GpiDeleteBitmap((HBITMAP)pEntry->m_hBitmap); - vBmpHdr.cbFix = sizeof(BITMAPINFOHEADER2); - vBmpHdr.cx = nWidth; - vBmpHdr.cy = nHeight; - vBmpHdr.cPlanes = 1; - vBmpHdr.cBitCount = (USHORT)nDepth; - - pEntry->m_hBitmap = (WXHBITMAP) ::GpiCreateBitmap( hPS - ,&vBmpHdr - ,0L, NULL, NULL - ); - if (!pEntry->m_hBitmap) - { - wxLogLastError(wxT("CreateCompatibleBitmap")); - } - pEntry->m_nWidth = nWidth; - pEntry->m_nHeight = nHeight; - return pEntry; - } - return pEntry; - } - pNode = pNode->Next(); - } - memset(&vBmpHdr, 0, sizeof(BITMAPINFOHEADER2)); - vBmpHdr.cbFix = sizeof(BITMAPINFOHEADER2); - vBmpHdr.cx = nWidth; - vBmpHdr.cy = nHeight; - vBmpHdr.cPlanes = 1; - vBmpHdr.cBitCount = (USHORT)nDepth; - - WXHBITMAP hBitmap = (WXHBITMAP) ::GpiCreateBitmap( hPS - ,&vBmpHdr - ,0L, NULL, NULL - ); - if (!hBitmap) - { - wxLogLastError(wxT("CreateCompatibleBitmap")); - } - wxDCCacheEntry* pEntry = new wxDCCacheEntry( hBitmap - ,nWidth - ,nHeight - ,nDepth - ); - AddToBitmapCache(pEntry); - return pEntry; -} // end of FindBitmapInCache - -wxDCCacheEntry* wxPMDCImpl::FindDCInCache( - wxDCCacheEntry* pNotThis -, HPS hPS -) -{ - int nDepth = 24; // we'll fix this up later ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); - wxNode* pNode = m_svDCCache.First(); - - while(pNode) - { - wxDCCacheEntry* pEntry = (wxDCCacheEntry*)pNode->Data(); - - // - // Don't return the same one as we already have - // - if (!pNotThis || (pNotThis != pEntry)) - { - if (pEntry->m_nDepth == nDepth) - { - return pEntry; - } - } - pNode = pNode->Next(); - } - wxDCCacheEntry* pEntry = new wxDCCacheEntry( hPS - ,nDepth - ); - AddToDCCache(pEntry); - return pEntry; -} // end of wxPMDCImpl::FindDCInCache - -void wxPMDCImpl::AddToBitmapCache( - wxDCCacheEntry* pEntry -) -{ - m_svBitmapCache.Append(pEntry); -} // end of wxPMDCImpl::AddToBitmapCache - -void wxPMDCImpl::AddToDCCache( - wxDCCacheEntry* pEntry -) -{ - m_svDCCache.Append(pEntry); -} // end of wxPMDCImpl::AddToDCCache - -void wxPMDCImpl::ClearCache() -{ - m_svBitmapCache.DeleteContents(true); - m_svBitmapCache.Clear(); - m_svBitmapCache.DeleteContents(false); - m_svDCCache.DeleteContents(true); - m_svDCCache.Clear(); - m_svDCCache.DeleteContents(false); -} // end of wxPMDCImpl::ClearCache - -// Clean up cache at app exit -class wxDCModule : public wxModule -{ -public: - virtual bool OnInit() { return true; } - virtual void OnExit() { wxPMDCImpl::ClearCache(); } - -private: - DECLARE_DYNAMIC_CLASS(wxDCModule) -}; // end of CLASS wxDCModule - -IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule) - -#endif // ndef for wxUSE_DC_CACHEING - -// --------------------------------------------------------------------------- -// wxDC -// --------------------------------------------------------------------------- - -wxPMDCImpl::wxPMDCImpl( wxDC *owner, WXHDC hDC ) : - wxDCImpl( owner ) -{ - Init(); - m_hDC = hDC; -} // end of wxPMDCImpl::wxPMDCImpl - -wxPMDCImpl::~wxPMDCImpl() -{ - if ( m_hDC != 0 ) - { - SelectOldObjects(m_hDC); - - // if we own the HDC, we delete it, otherwise we just release it - - if (m_bOwnsDC) - { - if(m_hPS) - { - ::GpiAssociate(m_hPS, NULLHANDLE); - ::GpiDestroyPS(m_hPS); - } - m_hPS = NULLHANDLE; - ::DevCloseDC((HDC)m_hDC); - } - else - { - // - // Just Dissacociate, not destroy if we don't own the DC - // - if(m_hPS) - { - ::GpiAssociate(m_hPS, NULLHANDLE); - } - } - } -} // end of wxPMDCImpl::~wxDC - -// This will select current objects out of the DC, -// which is what you have to do before deleting the -// DC. -void wxPMDCImpl::SelectOldObjects( - WXHDC hPS -) -{ - if (hPS) - { - if (m_hOldBitmap) - { - ::GpiSetBitmap(hPS, (HBITMAP) m_hOldBitmap); - if (m_vSelectedBitmap.IsOk()) - { - m_vSelectedBitmap.SetSelectedInto(NULL); - } - } - m_hOldBitmap = 0; - // - // OS/2 has no other native GDI objects to set in a PS/DC like windows - // - m_hOldPen = 0; - m_hOldBrush = 0; - m_hOldFont = 0; - m_hOldPalette = 0; - } - - m_brush = wxNullBrush; - m_pen = wxNullPen; - m_palette = wxNullPalette; - m_font = wxNullFont; - m_backgroundBrush = wxNullBrush; - m_vSelectedBitmap = wxNullBitmap; -} // end of wxPMDCImpl::SelectOldObjects - -// --------------------------------------------------------------------------- -// clipping -// --------------------------------------------------------------------------- - -#define DO_SET_CLIPPING_BOX() \ -{ \ - RECTL rect; \ - \ - ::GpiQueryClipBox(m_hPS, &rect); \ - \ - m_clipX1 = (wxCoord) XDEV2LOG(rect.xLeft); \ - m_clipY1 = (wxCoord) YDEV2LOG(rect.yTop); \ - m_clipX2 = (wxCoord) XDEV2LOG(rect.xRight); \ - m_clipY2 = (wxCoord) YDEV2LOG(rect.yBottom); \ -} - -void wxPMDCImpl::DoSetClippingRegion( - wxCoord vX -, wxCoord vY -, wxCoord vWidth -, wxCoord vHeight -) -{ - RECTL vRect; - - vY = OS2Y(vY,vHeight); - m_clipping = true; - vRect.xLeft = vX; - vRect.yTop = vY + vHeight; - vRect.xRight = vX + vWidth; - vRect.yBottom = vY; - ::GpiIntersectClipRectangle(m_hPS, &vRect); - DO_SET_CLIPPING_BOX() -} // end of wxPMDCImpl::DoSetClippingRegion - -void wxPMDCImpl::DoSetDeviceClippingRegion( - const wxRegion& rRegion -) -{ - wxCHECK_RET(rRegion.GetHRGN(), wxT("invalid clipping region")); - HRGN hRgnOld; - - m_clipping = true; - ::GpiSetClipRegion( m_hPS - ,(HRGN)rRegion.GetHRGN() - ,&hRgnOld - ); - DO_SET_CLIPPING_BOX() -} // end of wxPMDCImpl::DoSetDeviceClippingRegion - -void wxPMDCImpl::DestroyClippingRegion() -{ - if (m_clipping && m_hPS) - { - HRGN hRgnOld; - RECTL vRect; - - // TODO: this should restore the previous clipped region - // so that OnPaint processing works correctly, and - // the update doesn't get destroyed after the first - // DestroyClippingRegion - vRect.xLeft = XLOG2DEV(0); - vRect.yTop = YLOG2DEV(32000); - vRect.xRight = XLOG2DEV(32000); - vRect.yBottom = YLOG2DEV(0); - - HRGN hRgn = ::GpiCreateRegion(m_hPS, 1, &vRect); - - ::GpiSetClipRegion(m_hPS, hRgn, &hRgnOld); - } - ResetClipping(); -} // end of wxPMDCImpl::DestroyClippingRegion - -// --------------------------------------------------------------------------- -// query capabilities -// --------------------------------------------------------------------------- - -bool wxPMDCImpl::CanDrawBitmap() const -{ - return true; -} - -bool wxPMDCImpl::CanGetTextExtent() const -{ - LONG lTechnology = 0L; - - ::DevQueryCaps(GetHDC(), CAPS_TECHNOLOGY, 1L, &lTechnology); - return (lTechnology == CAPS_TECH_RASTER_DISPLAY) || (lTechnology == CAPS_TECH_RASTER_PRINTER); -} // end of wxPMDCImpl::CanGetTextExtent - -int wxPMDCImpl::GetDepth() const -{ - LONG lCapsColorBitcount; - int nBitsPerPixel = 0; - - if(::DevQueryCaps( GetHDC() - ,CAPS_COLOR_BITCOUNT - ,1L - ,&lCapsColorBitcount - )) - { - nBitsPerPixel = (int)lCapsColorBitcount; - } - return nBitsPerPixel; -} // end of wxPMDCImpl::GetDepth - -// --------------------------------------------------------------------------- -// drawing -// --------------------------------------------------------------------------- - -void wxPMDCImpl::Clear() -{ - // - // If this is a canvas DC then just fill with the background color - // Otherwise purge the whole thing - // - if (m_pCanvas) - { - RECTL vRect; - - ::GpiQueryClipBox(m_hPS, &vRect); - ::WinFillRect(m_hPS, &vRect, ::GpiQueryBackColor(m_hPS)); - } - else - ::GpiErase(m_hPS); -} // end of wxPMDCImpl::Clear - -bool wxPMDCImpl::DoFloodFill( - wxCoord vX -, wxCoord vY -, const wxColour& rCol -, wxFloodFillStyle nStyle -) -{ - POINTL vPtlPos; - LONG lColor; - LONG lOptions; - LONG lHits; - bool bSuccess = false; - - vPtlPos.x = vX; // Loads x-coordinate - vPtlPos.y = OS2Y(vY,0); // Loads y-coordinate - ::GpiMove(m_hPS, &vPtlPos); // Sets current position - lColor = rCol.GetPixel(); - lOptions = FF_BOUNDARY; - if(wxFLOOD_SURFACE == nStyle) - lOptions = FF_SURFACE; - - if ((lHits = ::GpiFloodFill(m_hPS, lOptions, lColor)) != GPI_ERROR) - bSuccess = true; - - return bSuccess; -} // end of wxPMDCImpl::DoFloodFill - -bool wxPMDCImpl::DoGetPixel( - wxCoord vX -, wxCoord vY -, wxColour* pCol -) const -{ - POINTL vPoint; - LONG lColor; - - vPoint.x = vX; - vPoint.y = OS2Y(vY,0); - lColor = ::GpiQueryPel(m_hPS, &vPoint); - - // - // return the color of the pixel - // - if(pCol) - pCol->Set( GetRValue(lColor) - ,GetGValue(lColor) - ,GetBValue(lColor) - ); - return true; -} // end of wxPMDCImpl::DoGetPixel - -void wxPMDCImpl::DoCrossHair( - wxCoord vX -, wxCoord vY -) -{ - vY = OS2Y(vY,0); - - wxCoord vX1 = vX - VIEWPORT_EXTENT; - wxCoord vY1 = vY - VIEWPORT_EXTENT; - wxCoord vX2 = vX + VIEWPORT_EXTENT; - wxCoord vY2 = vY + VIEWPORT_EXTENT; - POINTL vPoint[4]; - - vPoint[0].x = vX1; - vPoint[0].y = vY; - - vPoint[1].x = vX2; - vPoint[1].y = vY; - - ::GpiMove(m_hPS, &vPoint[0]); - ::GpiLine(m_hPS, &vPoint[1]); - - vPoint[2].x = vX; - vPoint[2].y = vY1; - - vPoint[3].x = vX; - vPoint[3].y = vY2; - - ::GpiMove(m_hPS, &vPoint[2]); - ::GpiLine(m_hPS, &vPoint[3]); - CalcBoundingBox(vX1, vY1); - CalcBoundingBox(vX2, vY2); -} // end of wxPMDCImpl::DoCrossHair - -void wxPMDCImpl::DoDrawLine( - wxCoord vX1 -, wxCoord vY1 -, wxCoord vX2 -, wxCoord vY2 -) -{ - POINTL vPoint[2]; - COLORREF vColor = 0x00ffffff; - - // - // Might be a memory DC with no Paint rect. - // - if (!(m_vRclPaint.yTop == 0 && - m_vRclPaint.yBottom == 0 && - m_vRclPaint.xRight == 0 && - m_vRclPaint.xLeft == 0)) - { - vY1 = OS2Y(vY1,0); - vY2 = OS2Y(vY2,0); - } - else - { - if (m_vSelectedBitmap.IsOk()) - { - m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); - m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); - vY1 = OS2Y(vY1,0); - vY2 = OS2Y(vY2,0); - } - } - vPoint[0].x = vX1; - vPoint[0].y = vY1; - vPoint[1].x = vX2; - vPoint[1].y = vY2; - if (m_pen.IsOk()) - { - vColor = m_pen.GetColour().GetPixel(); - } - ::GpiSetColor(m_hPS, vColor); - ::GpiMove(m_hPS, &vPoint[0]); - ::GpiLine(m_hPS, &vPoint[1]); - CalcBoundingBox(vX1, vY1); - CalcBoundingBox(vX2, vY2); -} // end of wxPMDCImpl::DoDrawLine - -////////////////////////////////////////////////////////////////////////////// -// Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1) -// and ending at (x2, y2). The current pen is used for the outline and the -// current brush for filling the shape. The arc is drawn in an anticlockwise -// direction from the start point to the end point. -////////////////////////////////////////////////////////////////////////////// -void wxPMDCImpl::DoDrawArc( - wxCoord vX1 -, wxCoord vY1 -, wxCoord vX2 -, wxCoord vY2 -, wxCoord vXc -, wxCoord vYc -) -{ - POINTL vPtlPos; - POINTL vPtlArc[2]; // Structure for current position - double dRadius; - double dAngl1; - double dAngl2; - double dAnglmid; - wxCoord vXm; - wxCoord vYm; - ARCPARAMS vArcp; // Structure for arc parameters - - if((vX1 == vXc && vY1 == vXc) || (vX2 == vXc && vY2 == vXc)) - return; // Draw point ?? - dRadius = 0.5 * ( hypot( (double)(vY1 - vYc) - ,(double)(vX1 - vXc) - ) + - hypot( (double)(vY2 - vYc) - ,(double)(vX2 - vXc) - ) - ); - - dAngl1 = atan2( (double)(vY1 - vYc) - ,(double)(vX1 - vXc) - ); - dAngl2 = atan2( (double)(vY2 - vYc) - ,(double)(vX2 - vXc) - ); - if(dAngl2 < dAngl1) - dAngl2 += M_PI * 2; - - // - // GpiPointArc can't draw full arc - // - if(dAngl2 == dAngl1 || (vX1 == vX2 && vY1 == vY2) ) - { - // - // Medium point - // - dAnglmid = (dAngl1 + dAngl2)/2. + M_PI; - vXm = (wxCoord)(vXc + dRadius * cos(dAnglmid)); - vYm = (wxCoord)(vYc + dRadius * sin(dAnglmid)); - DoDrawArc( vX1, vY1 - ,vXm, vYm - ,vXc, vYc - ); - DoDrawArc( vXm, vYm - ,vX2, vY2 - ,vXc, vYc - ); - return; - } - - // - // Medium point - // - dAnglmid = (dAngl1 + dAngl2)/2.; - vXm = (wxCoord)(vXc + dRadius * cos(dAnglmid)); - vYm = (wxCoord)(vYc + dRadius * sin(dAnglmid)); - - // - // Ellipse main axis (r,q), (p,s) with center at (0,0) */ - // - vArcp.lR = 0; - vArcp.lQ = 1; - vArcp.lP = 1; - vArcp.lS = 0; - ::GpiSetArcParams(m_hPS, &vArcp); // Sets parameters to default - - vPtlPos.x = vX1; // Loads x-coordinate - vPtlPos.y = vY1; // Loads y-coordinate - ::GpiMove(m_hPS, &vPtlPos); // Sets current position - vPtlArc[0].x = vXm; - vPtlArc[0].y = vYm; - vPtlArc[1].x = vX2; - vPtlArc[1].y = vY2; - ::GpiPointArc(m_hPS, vPtlArc); // Draws the arc - CalcBoundingBox( (wxCoord)(vXc - dRadius) - ,(wxCoord)(vYc - dRadius) - ); - CalcBoundingBox( (wxCoord)(vXc + dRadius) - ,(wxCoord)(vYc + dRadius) - ); -} // end of wxPMDCImpl::DoDrawArc - -void wxPMDCImpl::DoDrawCheckMark( - wxCoord vX1 -, wxCoord vY1 -, wxCoord vWidth -, wxCoord vHeight -) -{ - POINTL vPoint[2]; - - vY1 = OS2Y(vY1,vHeight); - - vPoint[0].x = vX1; - vPoint[0].y = vY1; - vPoint[1].x = vX1 + vWidth; - vPoint[1].y = vY1 + vHeight; - - ::GpiMove(m_hPS, &vPoint[0]); - ::GpiBox( m_hPS // handle to a presentation space - ,DRO_OUTLINE // draw the box outline ? or ? - ,&vPoint[1] // address of the corner - ,0L // horizontal corner radius - ,0L // vertical corner radius - ); - if(vWidth > 4 && vHeight > 4) - { - int nTmp; - - vPoint[0].x += 2; vPoint[0].y += 2; - vPoint[1].x -= 2; vPoint[1].y -= 2; - ::GpiMove(m_hPS, &vPoint[0]); - ::GpiLine(m_hPS, &vPoint[1]); - nTmp = vPoint[0].x; - vPoint[0].x = vPoint[1].x; - vPoint[1].x = nTmp; - ::GpiMove(m_hPS, &vPoint[0]); - ::GpiLine(m_hPS, &vPoint[1]); - } - CalcBoundingBox( vX1 - ,vY1 - ); - - wxCoord vX2 = vX1 + vWidth; - wxCoord vY2 = vY1 + vHeight; - - CalcBoundingBox( vX2 - ,vY2 - ); -} // end of wxPMDCImpl::DoDrawCheckMark - -void wxPMDCImpl::DoDrawPoint( - wxCoord vX -, wxCoord vY -) -{ - POINTL vPoint; - COLORREF vColor = 0x00ffffff; - - if (m_pen.IsOk()) - { - vColor = m_pen.GetColour().GetPixel(); - } - ::GpiSetColor(m_hPS, vColor); - vPoint.x = vX; - vPoint.y = OS2Y(vY,0); - ::GpiSetPel(m_hPS, &vPoint); - CalcBoundingBox( vX - ,vY - ); -} // end of wxPMDCImpl::DoDrawPoint - -void wxPMDCImpl::DoDrawPolygon( int n, - const wxPoint vPoints[], - wxCoord vXoffset, - wxCoord vYoffset, - wxPolygonFillMode nFillStyle ) -{ - ULONG ulCount = 1; // Number of polygons. - POLYGON vPlgn; // polygon. - ULONG flOptions = 0L; // Drawing options. - - ////////////////////////////////////////////////////////////////////////////// - // This contains fields of option bits... to draw boundary lines as well as - // the area interior. - // - // Drawing boundary lines: - // POLYGON_NOBOUNDARY Does not draw boundary lines. - // POLYGON_BOUNDARY Draws boundary lines (the default). - // - // Construction of the area interior: - // POLYGON_ALTERNATE Constructs interior in alternate mode - // (the default). - // POLYGON_WINDING Constructs interior in winding mode. - ////////////////////////////////////////////////////////////////////////////// - - ULONG flModel = POLYGON_INCL; // Drawing model. - - ////////////////////////////////////////////////////////////////////////////// - // Drawing model. - // POLYGON_INCL Fill is inclusive of bottom right (the default). - // POLYGON_EXCL Fill is exclusive of bottom right. - // This is provided to aid migration from other graphics models. - ////////////////////////////////////////////////////////////////////////////// - - LONG lHits = 0L; // Correlation/error indicator. - int i; - int nIsTRANSPARENT = 0; - LONG lBorderColor = 0L; - LONG lColor = 0L; - - lBorderColor = m_pen.GetColour().GetPixel(); - lColor = m_brush.GetColour().GetPixel(); - if(m_brush.GetStyle() == wxTRANSPARENT) - nIsTRANSPARENT = 1; - - vPlgn.ulPoints = n; - vPlgn.aPointl = (POINTL*) calloc( n + 1 - ,sizeof(POINTL) - ); // well, new will call malloc - - for(i = 0; i < n; i++) - { - vPlgn.aPointl[i].x = vPoints[i].x+vXoffset; - vPlgn.aPointl[i].y = OS2Y(vPoints[i].y+vYoffset,0); - } - flOptions = POLYGON_BOUNDARY; - if(nFillStyle == wxWINDING_RULE) - flOptions |= POLYGON_WINDING; - else - flOptions |= POLYGON_ALTERNATE; - - ::GpiSetColor(m_hPS, lBorderColor); - ::GpiMove(m_hPS, &vPlgn.aPointl[0]); - lHits = ::GpiPolygons(m_hPS, ulCount, &vPlgn, flOptions, flModel); - free(vPlgn.aPointl); -} // end of wxPMDCImpl::DoDrawPolygon - -void wxPMDCImpl::DoDrawLines( - int n -, const wxPoint vPoints[] -, wxCoord vXoffset -, wxCoord vYoffset -) -{ - POINTL vPoint; - - if (vXoffset != 0L || vYoffset != 0L) - { - int i; - - vPoint.x = vPoints[0].x + vXoffset; - vPoint.y = OS2Y(vPoints[0].y + vYoffset,0); - ::GpiMove(m_hPS, &vPoint); - - LONG lBorderColor = m_pen.GetColour().GetPixel(); - - ::GpiSetColor(m_hPS, lBorderColor); - for(i = 1; i < n; i++) - { - vPoint.x = vPoints[i].x + vXoffset; - vPoint.y = OS2Y(vPoints[i].y + vYoffset,0); - ::GpiLine(m_hPS, &vPoint); - } - } - else - { - int i; - - CalcBoundingBox( vPoints[0].x - ,vPoints[0].y - ); - vPoint.x = vPoints[0].x; - vPoint.y = OS2Y(vPoints[0].y,0); - ::GpiMove(m_hPS, &vPoint); - - for (i = 0; i < n; i++) - { - CalcBoundingBox( vPoints[i].x - ,vPoints[i].y - ); - vPoint.x = vPoints[i].x; - vPoint.y = OS2Y(vPoints[i].y,0); - ::GpiLine(m_hPS, &vPoint); - } - } -} // end of wxPMDCImpl::DoDrawLines - -void wxPMDCImpl::DoDrawRectangle( - wxCoord vX -, wxCoord vY -, wxCoord vWidth -, wxCoord vHeight -) -{ - POINTL vPoint[2]; - LONG lControl; - LONG lColor; - LONG lBorderColor; - int nIsTRANSPARENT = 0; - - // - // Might be a memory DC with no Paint rect. - // - if (!(m_vRclPaint.yTop == 0 && - m_vRclPaint.yBottom == 0 && - m_vRclPaint.xRight == 0 && - m_vRclPaint.xLeft == 0)) - vY = OS2Y(vY,vHeight); - else - { - if (m_vSelectedBitmap.IsOk()) - { - m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); - m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); - vY = OS2Y(vY,vHeight); - } - } - - wxCoord vX2 = vX + vWidth; - wxCoord vY2 = vY + vHeight; - - vPoint[0].x = vX; - vPoint[0].y = vY; - vPoint[1].x = vX + vWidth - 1; - vPoint[1].y = vY + vHeight - 1; - ::GpiMove(m_hPS, &vPoint[0]); - lColor = m_brush.GetColour().GetPixel(); - lBorderColor = m_pen.GetColour().GetPixel(); - if (m_brush.GetStyle() == wxTRANSPARENT) - nIsTRANSPARENT = 1; - if(lColor == lBorderColor || nIsTRANSPARENT) - { - lControl = DRO_OUTLINEFILL; //DRO_FILL; - if(m_brush.GetStyle() == wxTRANSPARENT) - lControl = DRO_OUTLINE; - - ::GpiSetColor(m_hPS, lBorderColor); - ::GpiBox( m_hPS // handle to a presentation space - ,lControl // draw the box outline ? or ? - ,&vPoint[1] // address of the corner - ,0L // horizontal corner radius - ,0L // vertical corner radius - ); - } - else - { - lControl = DRO_OUTLINE; - ::GpiSetColor( m_hPS - ,lBorderColor - ); - ::GpiBox( m_hPS - ,lControl - ,&vPoint[1] - ,0L - ,0L - ); - lControl = DRO_FILL; - ::GpiSetColor( m_hPS - ,lColor - ); - vPoint[0].x = vX + 1; - vPoint[0].y = vY + 1; - vPoint[1].x = vX + vWidth - 2; - vPoint[1].y = vY + vHeight - 2; - ::GpiMove(m_hPS, &vPoint[0]); - ::GpiBox( m_hPS - ,lControl - ,&vPoint[1] - ,0L - ,0L - ); - } - CalcBoundingBox(vX, vY); - CalcBoundingBox(vX2, vY2); -} // end of wxPMDCImpl::DoDrawRectangle - -void wxPMDCImpl::DoDrawRoundedRectangle( - wxCoord vX -, wxCoord vY -, wxCoord vWidth -, wxCoord vHeight -, double dRadius -) -{ - POINTL vPoint[2]; - LONG lControl; - LONG lColor; - LONG lBorderColor; - int nIsTRANSPARENT = 0; - - // - // Might be a memory DC with no Paint rect. - // - if (!(m_vRclPaint.yTop == 0 && - m_vRclPaint.yBottom == 0 && - m_vRclPaint.xRight == 0 && - m_vRclPaint.xLeft == 0)) - vY = OS2Y(vY,vHeight); - else - { - if (m_vSelectedBitmap.IsOk()) - { - m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); - m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); - vY = OS2Y(vY,vHeight); - } - } - - wxCoord vX2 = (vX + vWidth); - wxCoord vY2 = (vY + vHeight); - - vPoint[0].x = vX; - vPoint[0].y = vY; - vPoint[1].x = vX + vWidth - 1; - vPoint[1].y = vY + vHeight - 1; - ::GpiMove(m_hPS, &vPoint[0]); - - lColor = m_brush.GetColour().GetPixel(); - lBorderColor = m_pen.GetColour().GetPixel(); - lControl = DRO_OUTLINEFILL; //DRO_FILL; - if (m_brush.GetStyle() == wxTRANSPARENT) - nIsTRANSPARENT = 1; - if(lColor == lBorderColor || nIsTRANSPARENT) - { - lControl = DRO_OUTLINEFILL; //DRO_FILL; - if(m_brush.GetStyle() == wxTRANSPARENT) - lControl = DRO_OUTLINE; - - ::GpiSetColor(m_hPS, lColor); - ::GpiBox( m_hPS // handle to a presentation space - ,lControl // draw the box outline ? or ? - ,&vPoint[1] // address of the corner - ,(LONG)dRadius // horizontal corner radius - ,(LONG)dRadius // vertical corner radius - ); - } - else - { - lControl = DRO_OUTLINE; - ::GpiSetColor( m_hPS - ,lBorderColor - ); - ::GpiBox( m_hPS - ,lControl - ,&vPoint[1] - ,(LONG)dRadius - ,(LONG)dRadius - ); - lControl = DRO_FILL; - ::GpiSetColor( m_hPS - ,lColor - ); - vPoint[0].x = vX + 1; - vPoint[0].y = vY + 1; - vPoint[1].x = vX + vWidth - 2; - vPoint[1].y = vY + vHeight - 2; - ::GpiMove(m_hPS, &vPoint[0]); - ::GpiBox( m_hPS - ,lControl - ,&vPoint[1] - ,(LONG)dRadius - ,(LONG)dRadius - ); - } - - CalcBoundingBox(vX, vY); - CalcBoundingBox(vX2, vY2); -} // end of wxPMDCImpl::DoDrawRoundedRectangle - -// Draw Ellipse within box (x,y) - (x+width, y+height) -void wxPMDCImpl::DoDrawEllipse( - wxCoord vX -, wxCoord vY -, wxCoord vWidth -, wxCoord vHeight -) -{ - POINTL vPtlPos; // Structure for current position - FIXED vFxMult; // Multiplier for ellipse - ARCPARAMS vArcp; // Structure for arc parameters - - vY = OS2Y(vY,vHeight); - - vArcp.lR = 0; - vArcp.lQ = vHeight/2; - vArcp.lP = vWidth/2; - vArcp.lS = 0; - ::GpiSetArcParams( m_hPS - ,&vArcp - ); // Sets parameters to default - vPtlPos.x = vX + vWidth/2; // Loads x-coordinate - vPtlPos.y = vY + vHeight/2; // Loads y-coordinate - ::GpiMove( m_hPS - ,&vPtlPos - ); // Sets current position - vFxMult = MAKEFIXED(1, 0); /* Sets multiplier */ - - // - // DRO_FILL, DRO_OTLINEFILL - where to get - // - ::GpiFullArc( m_hPS - ,DRO_OUTLINE - ,vFxMult - ); // Draws full arc with center at current position - - wxCoord vX2 = (vX + vWidth); - wxCoord vY2 = (vY + vHeight); - - CalcBoundingBox(vX, vY); - CalcBoundingBox(vX2, vY2); -} // end of wxPMDCImpl::DoDrawEllipse - -void wxPMDCImpl::DoDrawEllipticArc( - wxCoord vX -, wxCoord vY -, wxCoord vWidth -, wxCoord vHeight -, double dSa -, double dEa -) -{ - POINTL vPtlPos; // Structure for current position - FIXED vFxMult; // Multiplier for ellipse - ARCPARAMS vArcp; // Structure for arc parameters - FIXED vFSa; - FIXED vFSweepa; // Start angle, sweep angle - double dIntPart; - double dFractPart; - - vY = OS2Y(vY,vHeight); - - dFractPart = modf(dSa,&dIntPart); - vFSa = MAKEFIXED((int)dIntPart, (int)(dFractPart * 0xffff) ); - dFractPart = modf(dEa - dSa, &dIntPart); - vFSweepa = MAKEFIXED((int)dIntPart, (int)(dFractPart * 0xffff) ); - - // - // Ellipse main axis (r,q), (p,s) with center at (0,0) - // - vArcp.lR = 0; - vArcp.lQ = vHeight/2; - vArcp.lP = vWidth/2; - vArcp.lS = 0; - ::GpiSetArcParams(m_hPS, &vArcp); // Sets parameters to default - vPtlPos.x = (wxCoord)(vX + vWidth/2 * (1. + cos(DegToRad(dSa)))); // Loads x-coordinate - vPtlPos.y = (wxCoord)(vY + vHeight/2 * (1. + sin(DegToRad(dSa)))); // Loads y-coordinate - ::GpiMove(m_hPS, &vPtlPos); // Sets current position - - // - // May be not to the center ? - // - vPtlPos.x = vX + vWidth/2 ; // Loads x-coordinate - vPtlPos.y = vY + vHeight/2; // Loads y-coordinate - vFxMult = MAKEFIXED(1, 0); // Sets multiplier - - // - // DRO_FILL, DRO_OTLINEFILL - where to get - // - ::GpiPartialArc( m_hPS - ,&vPtlPos - ,vFxMult - ,vFSa - ,vFSweepa - ); - wxCoord vX2 = (vX + vWidth); - wxCoord vY2 = (vY + vHeight); - - CalcBoundingBox(vX, vY); - CalcBoundingBox(vX2, vY2); -} // end of wxPMDCImpl::DoDrawEllipticArc - -void wxPMDCImpl::DoDrawIcon( - const wxIcon& rIcon -, wxCoord vX -, wxCoord vY -) -{ - // - // Need to copy back into a bitmap. ::WinDrawPointer uses device coords - // and I don't feel like figuring those out for scrollable windows so - // just convert to a bitmap then let the DoDrawBitmap routine display it - // - if (rIcon.IsXpm()) - { - DoDrawBitmap(rIcon.GetXpmSrc(), vX, vY, true); - } - else - { - wxBitmap vBitmap(rIcon); - - DoDrawBitmap(vBitmap, vX, vY, false); - } - CalcBoundingBox(vX, vY); - CalcBoundingBox(vX + rIcon.GetWidth(), vY + rIcon.GetHeight()); -} // end of wxPMDCImpl::DoDrawIcon - -void wxPMDCImpl::DoDrawBitmap( - const wxBitmap& rBmp -, wxCoord vX -, wxCoord vY -, bool bUseMask -) -{ -#if wxUSE_PRINTING_ARCHITECTURE - if (!IsKindOf(CLASSINFO(wxPrinterDC))) -#endif - { - HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP(); - HBITMAP hBitmapOld = NULLHANDLE; - POINTL vPoint[4]; - - vY = OS2Y(vY,rBmp.GetHeight()); - - vPoint[0].x = vX; - vPoint[0].y = vY + rBmp.GetHeight(); - vPoint[1].x = vX + rBmp.GetWidth(); - vPoint[1].y = vY; - vPoint[2].x = 0; - vPoint[2].y = 0; - vPoint[3].x = rBmp.GetWidth(); - vPoint[3].y = rBmp.GetHeight(); - if (bUseMask) - { - wxMask* pMask = rBmp.GetMask(); - - if (pMask) - { - // - // Need to imitate ::MaskBlt in windows. - // 1) Extract the bits from from the bitmap. - // 2) Extract the bits from the mask - // 3) Using the mask bits do the following: - // A) If the mask byte is 00 leave the bitmap byte alone - // B) If the mask byte is FF copy the screen color into - // bitmap byte - // 4) Create a new bitmap and set its bits to the above result - // 5) Blit this to the screen PS - // - HBITMAP hMask = (HBITMAP)pMask->GetMaskBitmap(); - HBITMAP hOldMask = NULLHANDLE; - HBITMAP hOldBitmap = NULLHANDLE; - HBITMAP hNewBitmap = NULLHANDLE; - unsigned char* pucBits; // buffer that will contain the bitmap data - unsigned char* pucBitsMask; // buffer that will contain the mask data - unsigned char* pucData; // pointer to use to traverse bitmap data - unsigned char* pucDataMask; // pointer to use to traverse mask data - LONG lHits; - ERRORID vError; - wxString sError; - - // - // The usual Memory context creation stuff - // - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - SIZEL vSize = {0, 0}; - HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); - - // - // The usual bitmap header stuff - // - BITMAPINFOHEADER2 vHeader; - BITMAPINFO2 vInfo; - - memset(&vHeader, '\0', 16); - vHeader.cbFix = 16; - - memset(&vInfo, '\0', 16); - vInfo.cbFix = 16; - vInfo.cx = (ULONG)rBmp.GetWidth(); - vInfo.cy = (ULONG)rBmp.GetHeight(); - vInfo.cPlanes = 1; - vInfo.cBitCount = 24; // Set to desired count going in - - // - // Create the buffers for data....all wxBitmaps are 24 bit internally - // - int nBytesPerLine = rBmp.GetWidth() * 3; - int nSizeDWORD = sizeof(DWORD); - int nLineBoundary = nBytesPerLine % nSizeDWORD; - int nPadding = 0; - int i; - int j; - LONG lScans = 0L; - LONG lColor = 0L; - - // - // Need to get a background color for mask blitting - // - if (IsKindOf(CLASSINFO(wxWindowDCImpl))) - { - wxWindowDCImpl* pWindowDC = wxDynamicCast(this, wxWindowDCImpl); - - lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel(); - } - else if (GetBrush().IsOk()) - lColor = GetBrush().GetColour().GetPixel(); - else - lColor = m_textBackgroundColour.GetPixel(); - - // - // Bitmap must be in a double-word aligned address so we may - // have some padding to worry about - // - if (nLineBoundary > 0) - { - nPadding = nSizeDWORD - nLineBoundary; - nBytesPerLine += nPadding; - } - pucBits = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight()); - pucBitsMask = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight()); - memset(pucBits, '\0', (nBytesPerLine * rBmp.GetHeight())); - memset(pucBitsMask, '\0', (nBytesPerLine * rBmp.GetHeight())); - - // - // Extract the bitmap and mask data - // - if ((hOldBitmap = ::GpiSetBitmap(hPS, hBitmap)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - ::GpiQueryBitmapInfoHeader(hBitmap, &vHeader); - vInfo.cBitCount = 24; - if ((lScans = ::GpiQueryBitmapBits( hPS - ,0L - ,(LONG)rBmp.GetHeight() - ,(PBYTE)pucBits - ,&vInfo - )) == GPI_ALTERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((hOldMask = ::GpiSetBitmap(hPS, hMask)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - ::GpiQueryBitmapInfoHeader(hMask, &vHeader); - vInfo.cBitCount = 24; - if ((lScans = ::GpiQueryBitmapBits( hPS - ,0L - ,(LONG)rBmp.GetHeight() - ,(PBYTE)pucBitsMask - ,&vInfo - )) == GPI_ALTERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if (( hMask = ::GpiSetBitmap(hPS, hOldMask)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - - // - // Now set the bytes(bits) according to the mask values - // 3 bytes per pel...must handle one at a time - // - pucData = pucBits; - pucDataMask = pucBitsMask; - - // - // 16 bit kludge really only kinda works. The mask gets applied - // where needed but the original bitmap bits are dorked sometimes - // - bool bpp16 = (wxDisplayDepth() == 16); - - for (i = 0; i < rBmp.GetHeight(); i++) - { - for (j = 0; j < rBmp.GetWidth(); j++) - { - // Byte 1 - if (bpp16 && *pucDataMask == 0xF8) // 16 bit display gobblygook - pucData++; - else if (*pucDataMask == 0xFF) // leave bitmap byte alone - pucData++; - else - { - *pucData = ((unsigned char)(lColor >> 16)); - pucData++; - } - // Byte 2 - if (bpp16 && *(pucDataMask + 1) == 0xFC) // 16 bit display gobblygook - pucData++; - else if (*(pucDataMask + 1) == 0xFF) // leave bitmap byte alone - pucData++; - else - { - *pucData = ((unsigned char)(lColor >> 8)); - pucData++; - } - - // Byte 3 - if (bpp16 && *(pucDataMask + 2) == 0xF8) // 16 bit display gobblygook - pucData++; - else if (*(pucDataMask + 2) == 0xFF) // leave bitmap byte alone - pucData++; - else - { - *pucData = ((unsigned char)lColor); - pucData++; - } - pucDataMask += 3; - } - for (j = 0; j < nPadding; j++) - { - pucData++; - pucDataMask++; - } - } - // - // Create a new bitmap - // - vHeader.cx = (ULONG)rBmp.GetWidth(); - vHeader.cy = (ULONG)rBmp.GetHeight(); - vHeader.cPlanes = 1L; - vHeader.cBitCount = 24; - if ((hNewBitmap = ::GpiCreateBitmap( hPS - ,&vHeader - ,CBM_INIT - ,(PBYTE)pucBits - ,&vInfo - )) == GPI_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - - // - // Now blit it to the screen PS - // - if ((lHits = ::GpiWCBitBlt( (HPS)GetHPS() - ,hNewBitmap - ,4 - ,vPoint - ,ROP_SRCCOPY - ,BBO_IGNORE - )) == GPI_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - - // - // Clean up - // - free(pucBits); - free(pucBitsMask); - ::GpiSetBitmap(hPS, NULLHANDLE); - ::GpiDeleteBitmap(hNewBitmap); - ::GpiDestroyPS(hPS); - ::DevCloseDC(hDC); - } - } - else - { - ULONG lOldForeGround = ::GpiQueryColor((HPS)GetHPS()); - ULONG lOldBackGround = ::GpiQueryBackColor((HPS)GetHPS()); - - if (m_textForegroundColour.IsOk()) - { - ::GpiSetColor( (HPS)GetHPS() - ,m_textForegroundColour.GetPixel() - ); - } - if (m_textBackgroundColour.IsOk()) - { - ::GpiSetBackColor( (HPS)GetHPS() - ,m_textBackgroundColour.GetPixel() - ); - } - // - // Need to alter bits in a mono bitmap to match the new - // background-foreground if it is different. - // - if (rBmp.IsMono() && - ((m_textForegroundColour.GetPixel() != lOldForeGround) || - (m_textBackgroundColour.GetPixel() != lOldBackGround))) - { - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - SIZEL vSize = {0, 0}; - HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); - - int nBytesPerLine = rBmp.GetWidth() * 3; - int i, j; - LONG lForeGround = m_textForegroundColour.GetPixel(); - LONG lBackGround = m_textBackgroundColour.GetPixel(); - LONG lScans; - HBITMAP hOldBitmap = NULLHANDLE; - BITMAPINFO2 vInfo; - ERRORID vError; - wxString sError; - - - memset(&vInfo, '\0', 16); - vInfo.cbFix = 16; - vInfo.cx = (ULONG)rBmp.GetWidth(); - vInfo.cy = (ULONG)rBmp.GetHeight(); - vInfo.cPlanes = 1; - vInfo.cBitCount = 24; - - unsigned char* pucBits; // buffer that will contain the bitmap data - unsigned char* pucData; // pointer to use to traverse bitmap data - - pucBits = new unsigned char[nBytesPerLine * rBmp.GetHeight()]; - memset(pucBits, '\0', (nBytesPerLine * rBmp.GetHeight())); - - if ((hOldBitmap = ::GpiSetBitmap(hPS, hBitmap)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - delete [] pucBits; - return; - } - if ((lScans = ::GpiQueryBitmapBits( hPS - ,0L - ,(LONG)rBmp.GetHeight() - ,(PBYTE)pucBits - ,&vInfo - )) == GPI_ALTERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - delete [] pucBits; - return; - } - unsigned char cOldRedFore = (unsigned char)(lOldForeGround >> 16); - unsigned char cOldGreenFore = (unsigned char)(lOldForeGround >> 8); - unsigned char cOldBlueFore = (unsigned char)lOldForeGround; - - unsigned char cRedFore = (unsigned char)(lForeGround >> 16); - unsigned char cGreenFore = (unsigned char)(lForeGround >> 8); - unsigned char cBlueFore = (unsigned char)lForeGround; - - unsigned char cRedBack = (unsigned char)(lBackGround >> 16); - unsigned char cGreenBack = (unsigned char)(lBackGround >> 8); - unsigned char cBlueBack = (unsigned char)lBackGround; - - pucData = pucBits; - for (i = 0; i < rBmp.GetHeight(); i++) - { - for (j = 0; j < rBmp.GetWidth(); j++) - { - unsigned char cBmpRed = *pucData; - unsigned char cBmpGreen = *(pucData + 1); - unsigned char cBmpBlue = *(pucData + 2); - - if ((cBmpRed == cOldRedFore) && - (cBmpGreen == cOldGreenFore) && - (cBmpBlue == cOldBlueFore)) - { - *pucData = cBlueFore; - pucData++; - *pucData = cGreenFore; - pucData++; - *pucData = cRedFore; - pucData++; - } - else - { - *pucData = cBlueBack; - pucData++; - *pucData = cGreenBack; - pucData++; - *pucData = cRedBack; - pucData++; - } - } - } - if ((lScans = ::GpiSetBitmapBits( hPS - ,0L - ,(LONG)rBmp.GetHeight() - ,(PBYTE)pucBits - ,&vInfo - )) == GPI_ALTERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - return; - } - delete [] pucBits; - ::GpiSetBitmap(hPS, NULLHANDLE); - ::GpiDestroyPS(hPS); - ::DevCloseDC(hDC); - } - ::GpiWCBitBlt( (HPS)GetHPS() - ,hBitmap - ,4 - ,vPoint - ,ROP_SRCCOPY - ,BBO_IGNORE - ); - ::GpiSetBitmap((HPS)GetHPS(), hBitmapOld); - ::GpiSetColor((HPS)GetHPS(), lOldForeGround); - ::GpiSetBackColor((HPS)GetHPS(), lOldBackGround); - } - } -} // end of wxPMDCImpl::DoDrawBitmap - -void wxPMDCImpl::DoDrawText( - const wxString& rsText -, wxCoord vX -, wxCoord vY -) -{ - wxCoord vWidth; - wxCoord vHeight; - - DrawAnyText( rsText - ,vX - ,vY - ); - - CalcBoundingBox(vX, vY); - GetOwner()->GetTextExtent(rsText, &vWidth, &vHeight); - CalcBoundingBox((vX + vWidth), (vY + vHeight)); -} // end of wxPMDCImpl::DoDrawText - -void wxPMDCImpl::DrawAnyText( const wxString& rsText, - wxCoord vX, - wxCoord vY ) -{ - int nOldBackground = 0; - POINTL vPtlStart; - LONG lHits; - wxCoord vTextX = 0; - wxCoord vTextY = 0; - - // - // prepare for drawing the text - // - - // - // Set text color attributes - // - if (m_textForegroundColour.IsOk()) - { - SetTextColor( m_hPS - ,(int)m_textForegroundColour.GetPixel() - ); - } - - if (m_textBackgroundColour.IsOk()) - { - nOldBackground = SetTextBkColor( m_hPS - ,(int)m_textBackgroundColour.GetPixel() - ); - } - SetBkMode( m_hPS - ,m_backgroundMode - ); - GetOwner()->GetTextExtent( rsText - ,&vTextX - ,&vTextY - ); - vPtlStart.x = vX; - if (!(m_vRclPaint.yTop == 0 && - m_vRclPaint.yBottom == 0 && - m_vRclPaint.xRight == 0 && - m_vRclPaint.xLeft == 0)) - { - vPtlStart.y = OS2Y(vY,vTextY); - } - else - { - if (m_vSelectedBitmap.IsOk()) - { - m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); - m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); - vPtlStart.y = OS2Y(vY,vTextY); - } - else - vPtlStart.y = vY; - } - - ::GpiMove(m_hPS, &vPtlStart); - lHits = ::GpiCharString( m_hPS - ,rsText.length() - ,rsText.char_str() - ); - if (lHits != GPI_OK) - { - wxLogLastError(wxT("TextOut")); - } - - // - // Restore the old parameters (text foreground colour may be left because - // it never is set to anything else, but background should remain - // transparent even if we just drew an opaque string) - // - if (m_textBackgroundColour.IsOk()) - SetTextBkColor( m_hPS - ,nOldBackground - ); - SetBkMode( m_hPS - ,wxTRANSPARENT - ); -} - -void wxPMDCImpl::DoDrawRotatedText( - const wxString& rsText -, wxCoord vX -, wxCoord vY -, double dAngle -) -{ - if (dAngle == 0.0) - { - DoDrawText( rsText - ,vX - ,vY - ); - } - - // TODO: - /* - if ( angle == 0.0 ) - { - DoDrawText(text, x, y); - } - else - { - LOGFONT lf; - wxFillLogFont(&lf, &m_font); - - // GDI wants the angle in tenth of degree - long angle10 = (long)(angle * 10); - lf.lfEscapement = angle10; - lf. lfOrientation = angle10; - - HFONT hfont = ::CreateFontIndirect(&lf); - if ( !hfont ) - { - wxLogLastError("CreateFont"); - } - else - { - HFONT hfontOld = ::SelectObject(GetHdc(), hfont); - - DrawAnyText(text, x, y); - - (void)::SelectObject(GetHdc(), hfontOld); - } - - // call the bounding box by adding all four vertices of the rectangle - // containing the text to it (simpler and probably not slower than - // determining which of them is really topmost/leftmost/...) - wxCoord w, h; - GetTextExtent(text, &w, &h); - - double rad = DegToRad(angle); - - // "upper left" and "upper right" - CalcBoundingBox(x, y); - CalcBoundingBox(x + w*cos(rad), y - h*sin(rad)); - CalcBoundingBox(x + h*sin(rad), y + h*cos(rad)); - - // "bottom left" and "bottom right" - x += (wxCoord)(h*sin(rad)); - y += (wxCoord)(h*cos(rad)); - CalcBoundingBox(x, y); - CalcBoundingBox(x + h*sin(rad), y + h*cos(rad)); - } -*/ -} - -// --------------------------------------------------------------------------- -// set GDI objects -// --------------------------------------------------------------------------- - -void wxPMDCImpl::DoSelectPalette( bool WXUNUSED(bRealize) ) -{ - // - // Set the old object temporarily, in case the assignment deletes an object - // that's not yet selected out. - // - if (m_hOldPalette) - { - m_hOldPalette = 0; - } - - if (m_palette.IsOk()) - { - HPALETTE hOldPal; - - hOldPal = ::GpiSelectPalette((HDC) m_hPS, (HPALETTE) m_palette.GetHPALETTE()); - if (!m_hOldPalette) - m_hOldPalette = (WXHPALETTE)hOldPal; - } -} // end of wxPMDCImpl::DoSelectPalette - -void wxPMDCImpl::InitializePalette() -{ - if (wxDisplayDepth() <= 8 ) - { - // - // Look for any window or parent that has a custom palette. If any has - // one then we need to use it in drawing operations - // - wxWindow* pWin = m_pCanvas->GetAncestorWithCustomPalette(); - - m_hasCustomPalette = pWin && pWin->HasCustomPalette(); - if (m_hasCustomPalette) - { - m_palette = pWin->GetPalette(); - - // - // turn on PM translation for this palette - // - DoSelectPalette(); - } - } -} // end of wxPMDCImpl::InitializePalette - -void wxPMDCImpl::SetPalette( - const wxPalette& rPalette -) -{ - if (m_hOldFont) - { - m_hOldFont = 0; - } - m_palette = rPalette; - if (!rPalette.IsOk()) - { - if (m_hOldFont) - { - m_hOldFont = 0; - } - } - HPALETTE hOldPal = ::GpiSelectPalette((HDC) m_hPS, (HPALETTE) m_palette.GetHPALETTE()); - if (!m_hOldPalette) - m_hOldPalette = (WXHPALETTE)hOldPal; -} // end of wxPMDCImpl::SetPalette - -void wxPMDCImpl::SetFont( - const wxFont& rFont -) -{ - // - // Set the old object temporarily, in case the assignment deletes an object - // that's not yet selected out. - // - if (m_hOldFont) - { - m_hOldFont = 0; - } - m_font = rFont; - if (!rFont.IsOk()) - { - m_hOldFont = 0; - } - - m_font.SetPS(m_hPS); // this will realize the font - - if (m_font.IsOk()) - { - HFONT hFont = m_font.GetResourceHandle(); - if (hFont == (HFONT) NULL) - { - wxLogDebug(wxT("::SelectObject failed in wxPMDCImpl::SetFont.")); - } - if (!m_hOldFont) - m_hOldFont = (WXHFONT) hFont; - } -} // end of wxPMDCImpl::SetFont - -void wxPMDCImpl::SetPen( - const wxPen& rPen -) -{ - if (m_pen == rPen) - return; - m_pen = rPen; - if (!m_pen.IsOk()) - return; - - if (m_hOldPen) - m_hOldPen = 0L; - m_pen = rPen; - - if (!m_pen.IsOk()) - { - if (m_hOldPen) - { - m_pen.SetPS((HPS)m_hOldPen); - } - m_hOldPen = 0L; - } - - if (m_pen.IsOk()) - { - if (m_pen.GetResourceHandle()) - { - m_pen.SetPS(m_hPS); - if (!m_hOldPen) - m_hOldPen = m_pen.GetPS(); - } - ::GpiSetColor(m_hPS, m_pen.GetColour().GetPixel()); - } -} - -void wxPMDCImpl::SetBrush( - const wxBrush& rBrush -) -{ - if (m_hOldBrush) - m_hOldBrush = 0L; - m_brush = rBrush; - if (!m_brush.IsOk()) - if (m_brush == rBrush) - return; - if (!m_brush.IsOk()) - if (m_hOldBrush) - m_hOldBrush = 0L; - - if (!m_brush.IsOk()) - { - if (m_hOldBrush) - { - m_brush.SetPS((HPS)m_hOldBrush); - } - m_hOldBrush = 0L; - } - - if (m_brush.IsOk()) - { - if (m_brush.GetResourceHandle()) - { - m_brush.SetPS(m_hPS); - if (!m_hOldBrush) - m_hOldBrush = (WXHWND)m_brush.GetPS(); - } - } -} // end of wxPMDCImpl::SetBrush - -void wxPMDCImpl::SetBackground(const wxBrush& rBrush) -{ - m_backgroundBrush = rBrush; - - if (m_backgroundBrush.IsOk()) - { - (void)::GpiSetBackColor((HPS)m_hPS, m_backgroundBrush.GetColour().GetPixel()); - } -} // end of wxPMDCImpl::SetBackground - -void wxPMDCImpl::SetBackgroundMode(int nMode) -{ - m_backgroundMode = nMode; -} // end of wxPMDCImpl::SetBackgroundMode - -void wxPMDCImpl::SetLogicalFunction(wxRasterOperationMode nFunction) -{ - m_logicalFunction = nFunction; - SetRop((WXHDC)m_hDC); -} // wxPMDCImpl::SetLogicalFunction - -void wxPMDCImpl::SetRop(WXHDC hDC) -{ - if (!hDC || m_logicalFunction < 0) - return; - - LONG lCRop; - switch (m_logicalFunction) - { - case wxXOR: - lCRop = FM_XOR; - break; - - case wxINVERT: - lCRop = FM_INVERT; - break; - - case wxOR_REVERSE: - lCRop = FM_MERGESRCNOT; - break; - - case wxAND_REVERSE: - lCRop = FM_NOTMASKSRC; - break; - - case wxCLEAR: - lCRop = FM_ONE; - break; - - case wxSET: - lCRop = FM_ZERO; - break; - - case wxSRC_INVERT: - lCRop = FM_MERGENOTSRC; - break; - - case wxOR_INVERT: - lCRop = FM_MERGESRCNOT; - break; - - case wxAND: - lCRop = FM_AND; - break; - - case wxOR: - lCRop = FM_OR; - break; - - case wxAND_INVERT: - lCRop = FM_SUBTRACT; - break; - - case wxEQUIV: - case wxNAND: - case wxCOPY: - default: - lCRop = FM_OVERPAINT; - break; - } - ::GpiSetMix((HPS)hDC, lCRop); -} // end of wxPMDCImpl::SetRop - -bool wxPMDCImpl::StartDoc( const wxString& WXUNUSED(rsMessage) ) -{ - // We might be previewing, so return true to let it continue. - return true; -} // end of wxPMDCImpl::StartDoc - -void wxPMDCImpl::EndDoc() -{ -} // end of wxPMDCImpl::EndDoc - -void wxPMDCImpl::StartPage() -{ -} // end of wxPMDCImpl::StartPage - -void wxPMDCImpl::EndPage() -{ -} // end of wxPMDCImpl::EndPage - -// --------------------------------------------------------------------------- -// text metrics -// --------------------------------------------------------------------------- - -wxCoord wxPMDCImpl::GetCharHeight() const -{ - FONTMETRICS vFM; // metrics structure - - ::GpiQueryFontMetrics( m_hPS - ,sizeof(FONTMETRICS) - ,&vFM - ); - return YDEV2LOGREL(vFM.lXHeight); -} - -wxCoord wxPMDCImpl::GetCharWidth() const -{ - FONTMETRICS vFM; // metrics structure - - ::GpiQueryFontMetrics( m_hPS - ,sizeof(FONTMETRICS) - ,&vFM - ); - return XDEV2LOGREL(vFM.lAveCharWidth); -} - -void wxPMDCImpl::DoGetTextExtent( - const wxString& rsString -, wxCoord* pvX -, wxCoord* pvY -, wxCoord* pvDescent -, wxCoord* pvExternalLeading -, const wxFont* pTheFont -) const -{ - POINTL avPoint[TXTBOX_COUNT]; - POINTL vPtMin; - POINTL vPtMax; - int i; - int l; - FONTMETRICS vFM; // metrics structure - BOOL bRc; - ERRORID vErrorCode; // last error id code - wxFont* pFontToUse = (wxFont*)pTheFont; - - wxChar zMsg[128]; // DEBUG - wxString sError; - - if (!pFontToUse) - pFontToUse = (wxFont*)&m_font; - l = rsString.length(); - - // - // In world coordinates. - // - if (!m_hPS) - { - (void)wxMessageBox( wxT("wxWidgets core library") - ,"Using uninitialized DC for measuring text!\n" - ,wxICON_INFORMATION - ); - } - - bRc = ::GpiQueryTextBox( m_hPS - ,l - ,rsString.char_str() - ,TXTBOX_COUNT // return maximum information - ,avPoint // array of coordinates points - ); - if(!bRc) - { - vErrorCode = ::WinGetLastError(wxGetInstance()); - sError = wxPMErrorToStr(vErrorCode); - // DEBUG - wxSprintf(zMsg, wxT("GpiQueryTextBox for %s: failed with Error: %lx - %s"), rsString.c_str(), vErrorCode, sError.c_str()); - (void)wxMessageBox( wxT("wxWidgets core library") - ,zMsg - ,wxICON_INFORMATION - ); - } - - vPtMin.x = avPoint[0].x; - vPtMax.x = avPoint[0].x; - vPtMin.y = avPoint[0].y; - vPtMax.y = avPoint[0].y; - for (i = 1; i < 4; i++) - { - if(vPtMin.x > avPoint[i].x) vPtMin.x = avPoint[i].x; - if(vPtMin.y > avPoint[i].y) vPtMin.y = avPoint[i].y; - if(vPtMax.x < avPoint[i].x) vPtMax.x = avPoint[i].x; - if(vPtMax.y < avPoint[i].y) vPtMax.y = avPoint[i].y; - } - ::GpiQueryFontMetrics( m_hPS - ,sizeof(FONTMETRICS) - ,&vFM - ); - - if (pvX) - *pvX = (wxCoord)(vPtMax.x - vPtMin.x + 1); - if (pvY) - *pvY = (wxCoord)(vPtMax.y - vPtMin.y + 1); - if (pvDescent) - *pvDescent = vFM.lMaxDescender; - if (pvExternalLeading) - *pvExternalLeading = vFM.lExternalLeading; -} - -void wxPMDCImpl::SetMapMode( - wxMappingMode nMode -) -{ - int nPixelWidth = 0; - int nPixelHeight = 0; - int nMmWidth = 1; - int nMmHeight = 1; - LONG lArray[CAPS_VERTICAL_RESOLUTION+1]; - - m_mappingMode = nMode; - - if(::DevQueryCaps( m_hDC - ,CAPS_FAMILY // id of first item - ,CAPS_VERTICAL_RESOLUTION+1 // number of items wanted - ,lArray - )) - { - LONG lHorzRes; - LONG lVertRes; - - nPixelWidth = lArray[CAPS_WIDTH]; - nPixelHeight = lArray[CAPS_HEIGHT]; - lHorzRes = lArray[CAPS_HORIZONTAL_RESOLUTION]; // returns pel/meter - lVertRes = lArray[CAPS_VERTICAL_RESOLUTION]; // returns pel/meter - nMmWidth = (lHorzRes/1000) * nPixelWidth; - nMmHeight = (lVertRes/1000) * nPixelHeight; - } - if ((nPixelWidth == 0) || (nPixelHeight == 0) || (nMmWidth == 0) || (nMmHeight == 0)) - { - return; - } - - double dMm2pixelsX = nPixelWidth/(double)nMmWidth; - double dMm2pixelsY = nPixelHeight/(double)nMmHeight; - - switch (nMode) - { - case wxMM_TWIPS: - m_logicalScaleX = (twips2mm * dMm2pixelsX); - m_logicalScaleY = (twips2mm * dMm2pixelsY); - break; - - case wxMM_POINTS: - m_logicalScaleX = (pt2mm * dMm2pixelsX); - m_logicalScaleY = (pt2mm * dMm2pixelsY); - break; - - case wxMM_METRIC: - m_logicalScaleX = dMm2pixelsX; - m_logicalScaleY = dMm2pixelsY; - break; - - case wxMM_LOMETRIC: - m_logicalScaleX = (dMm2pixelsX/10.0); - m_logicalScaleY = (dMm2pixelsY/10.0); - break; - - case wxMM_TEXT: - default: - m_logicalScaleX = 1.0; - m_logicalScaleY = 1.0; - break; - } - - SIZEL vSize; - ULONG ulOptions; - - ulOptions = ::GpiQueryPS(m_hPS, &vSize); - if (!ulOptions & PU_ARBITRARY) - { - ulOptions = PU_ARBITRARY | GPIF_DEFAULT; - ::GpiSetPS(m_hPS, &vSize, ulOptions); - } - ComputeScaleAndOrigin(); - -}; // end of wxPMDCImpl::SetMapMode - -void wxPMDCImpl::SetUserScale( double dX, - double dY ) -{ - m_userScaleX = dX; - m_userScaleY = dY; - - SetMapMode(m_mappingMode); -} // end of wxPMDCImpl::SetUserScale - -void wxPMDCImpl::SetAxisOrientation( bool bXLeftRight, - bool bYBottomUp ) -{ - m_signX = bXLeftRight ? 1 : -1; - m_signY = bYBottomUp ? -1 : 1; - - SetMapMode(m_mappingMode); -} // end of wxPMDCImpl::SetAxisOrientation - -void wxPMDCImpl::SetLogicalOrigin( - wxCoord vX -, wxCoord vY -) -{ - RECTL vRect; - - ::GpiQueryPageViewport( m_hPS - ,&vRect - ); - vRect.xRight -= vX; - vRect.yTop += vY; - vRect.xLeft = vX; - vRect.yBottom = vY; - ::GpiSetPageViewport( m_hPS - ,&vRect - ); -}; // end of wxPMDCImpl::SetLogicalOrigin - -void wxPMDCImpl::SetDeviceOrigin( - wxCoord vX -, wxCoord vY -) -{ - RECTL vRect; - - m_deviceOriginX = vX; - m_deviceOriginY = vY; - ::GpiQueryPageViewport( m_hPS - ,&vRect - ); - vRect.xLeft += vX; - vRect.xRight += vX; - vRect.yBottom -= vY; - vRect.yTop -= vY; - ::GpiSetPageViewport( m_hPS - ,&vRect - ); -}; // end of wxPMDCImpl::SetDeviceOrigin - -// --------------------------------------------------------------------------- -// bit blit -// --------------------------------------------------------------------------- - -bool wxPMDCImpl::DoBlit( wxCoord vXdest, - wxCoord vYdest, - wxCoord vWidth, - wxCoord vHeight, - wxDC* pSource, - wxCoord vXsrc, - wxCoord vYsrc, - wxRasterOperationMode nRop, - bool bUseMask, - wxCoord WXUNUSED(vXsrcMask), - wxCoord WXUNUSED(vYsrcMask) ) -{ - wxMask* pMask = NULL; - CHARBUNDLE vCbnd; - COLORREF vOldTextColor; - COLORREF vOldBackground = ::GpiQueryBackColor(m_hPS); - - wxDCImpl *impl = pSource->GetImpl(); - wxPMDCImpl *pm_impl = wxDynamicCast( impl, wxPMDCImpl ); - if (!pm_impl) - { - // TODO: Do we want to be able to blit - // from other DCs too? - return false; - } - - if (bUseMask) - { - const wxBitmap& rBmp = pm_impl->GetSelectedBitmap(); - - pMask = rBmp.GetMask(); - if (!(rBmp.IsOk() && pMask && pMask->GetMaskBitmap())) - { - bUseMask = false; - } - } - - ::GpiQueryAttrs( m_hPS - ,PRIM_CHAR - ,CBB_COLOR - ,&vCbnd - ); - vOldTextColor = (COLORREF)vCbnd.lColor; - - if (m_textForegroundColour.IsOk()) - { - vCbnd.lColor = (LONG)m_textForegroundColour.GetPixel(); - ::GpiSetAttrs( m_hPS // presentation-space handle - ,PRIM_CHAR // Char primitive. - ,CBB_COLOR // sets color. - ,0 - ,&vCbnd // buffer for attributes. - ); - } - if (m_textBackgroundColour.IsOk()) - { - ::GpiSetBackColor(m_hPS, (LONG)m_textBackgroundColour.GetPixel()); - } - - LONG lRop = ROP_SRCCOPY; - - switch (nRop) - { - case wxXOR: lRop = ROP_SRCINVERT; break; - case wxINVERT: lRop = ROP_DSTINVERT; break; - case wxOR_REVERSE: lRop = 0x00DD0228; break; - case wxAND_REVERSE: lRop = ROP_SRCERASE; break; - case wxCLEAR: lRop = ROP_ZERO; break; - case wxSET: lRop = ROP_ONE; break; - case wxOR_INVERT: lRop = ROP_MERGEPAINT; break; - case wxAND: lRop = ROP_SRCAND; break; - case wxOR: lRop = ROP_SRCPAINT; break; - case wxEQUIV: lRop = 0x00990066; break; - case wxNAND: lRop = 0x007700E6; break; - case wxAND_INVERT: lRop = 0x00220326; break; - case wxCOPY: lRop = ROP_SRCCOPY; break; - case wxNO_OP: lRop = ROP_NOTSRCERASE; break; - case wxSRC_INVERT: lRop = ROP_SRCINVERT; break; - case wxNOR: lRop = ROP_NOTSRCCOPY; break; - default: - wxFAIL_MSG( wxT("unsupported logical function") ); - return false; - } - - bool bSuccess; - - if (bUseMask) - { - // - // Blit bitmap with mask - // - - // - // Create a temp buffer bitmap and DCs/PSs to access it and the mask - // - HDC hDCMask; - HDC hDCBuffer; - HPS hPSMask; - HPS hPSBuffer; - DEVOPENSTRUC vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - BITMAPINFOHEADER2 vBmpHdr; - HBITMAP hBufBitmap; - SIZEL vSize = {0, 0}; - LONG rc; - - memset(&vBmpHdr, 0, sizeof(BITMAPINFOHEADER2)); - vBmpHdr.cbFix = sizeof(BITMAPINFOHEADER2); - vBmpHdr.cx = vWidth; - vBmpHdr.cy = vHeight; - vBmpHdr.cPlanes = 1; - vBmpHdr.cBitCount = 24; - -#if wxUSE_DC_CACHEING - { - // - // create a temp buffer bitmap and DCs to access it and the mask - // - wxDCCacheEntry* pDCCacheEntry1 = FindDCInCache( NULL - ,pm_impl->GetHPS() - ); - wxDCCacheEntry* pDCCacheEntry2 = FindDCInCache( pDCCacheEntry1 - ,GetHPS() - ); - wxDCCacheEntry* pBitmapCacheEntry = FindBitmapInCache( GetHPS() - ,vWidth - ,vHeight - ); - - hPSMask = pDCCacheEntry1->m_hPS; - hDCBuffer = (HDC)pDCCacheEntry2->m_hPS; - hBufBitmap = (HBITMAP)pBitmapCacheEntry->m_hBitmap; - wxUnusedVar(hDCMask); - } -#else - { - hDCMask = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE); - hDCBuffer = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE); - hPSMask = ::GpiCreatePS(vHabmain, hDCMask, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - hPSBuffer = ::GpiCreatePS(vHabmain, hDCBuffer, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - hBufBitmap = ::GpiCreateBitmap(GetHPS(), &vBmpHdr, 0L, NULL, NULL); - } -#endif - - POINTL aPoint1[4] = { {0, 0} - ,{vWidth, vHeight} - ,{vXdest, vYdest} - ,{vXdest + vWidth, vYdest + vHeight} - }; - POINTL aPoint2[4] = { {0, 0} - ,{vWidth, vHeight} - ,{vXsrc, vYsrc} - ,{vXsrc + vWidth, vYsrc + vHeight} - }; - POINTL aPoint3[4] = { {vXdest, vYdest} - ,{vXdest + vWidth, vYdest + vHeight} - ,{vXsrc, vYsrc} - ,{vXsrc + vWidth, vYsrc + vHeight} - }; - POINTL aPoint4[4] = { {vXdest, vYdest} - ,{vXdest + vWidth, vYdest + vHeight} - ,{0, 0} - ,{vWidth, vHeight} - }; - ::GpiSetBitmap(hPSMask, (HBITMAP) pMask->GetMaskBitmap()); - ::GpiSetBitmap(hPSBuffer, (HBITMAP) hBufBitmap); - - // - // Copy dest to buffer - // - rc = ::GpiBitBlt( hPSBuffer - ,GetHPS() - ,4L - ,aPoint1 - ,ROP_SRCCOPY - ,BBO_IGNORE - ); - if (rc == GPI_ERROR) - { - wxLogLastError(wxT("BitBlt")); - } - - // - // Copy src to buffer using selected raster op - // - rc = ::GpiBitBlt( hPSBuffer - ,GetHPS() - ,4L - ,aPoint2 - ,lRop - ,BBO_IGNORE - ); - if (rc == GPI_ERROR) - { - wxLogLastError(wxT("BitBlt")); - } - - // - // Set masked area in buffer to BLACK (pixel value 0) - // - COLORREF vPrevBkCol = ::GpiQueryBackColor(GetHPS()); - COLORREF vPrevCol = ::GpiQueryColor(GetHPS()); - - ::GpiSetBackColor(GetHPS(), OS2RGB(255, 255, 255)); - ::GpiSetColor(GetHPS(), OS2RGB(0, 0, 0)); - - rc = ::GpiBitBlt( hPSBuffer - ,hPSMask - ,4L - ,aPoint2 - ,ROP_SRCAND - ,BBO_IGNORE - ); - if (rc == GPI_ERROR) - { - wxLogLastError(wxT("BitBlt")); - } - - // - // Set unmasked area in dest to BLACK - // - ::GpiSetBackColor(GetHPS(), OS2RGB(0, 0, 0)); - ::GpiSetColor(GetHPS(), OS2RGB(255, 255, 255)); - rc = ::GpiBitBlt( GetHPS() - ,hPSMask - ,4L - ,aPoint3 - ,ROP_SRCAND - ,BBO_IGNORE - ); - if (rc == GPI_ERROR) - { - wxLogLastError(wxT("BitBlt")); - } - - // - // Restore colours to original values - // - ::GpiSetBackColor(GetHPS(), vPrevBkCol); - ::GpiSetColor(GetHPS(), vPrevCol); - - // - // OR buffer to dest - // - rc = ::GpiBitBlt( GetHPS() - ,hPSMask - ,4L - ,aPoint4 - ,ROP_SRCPAINT - ,BBO_IGNORE - ); - if (rc == GPI_ERROR) - { - bSuccess = false; - wxLogLastError(wxT("BitBlt")); - } - - // - // Tidy up temporary DCs and bitmap - // - ::GpiSetBitmap(hPSMask, NULLHANDLE); - ::GpiSetBitmap(hPSBuffer, NULLHANDLE); -#if !wxUSE_DC_CACHEING - ::GpiDestroyPS(hPSMask); - ::GpiDestroyPS(hPSBuffer); - ::DevCloseDC(hDCMask); - ::DevCloseDC(hDCBuffer); - ::GpiDeleteBitmap(hBufBitmap); -#endif - bSuccess = true; - } - else // no mask, just BitBlt() it - { - POINTL aPoint[4] = { {vXdest, vYdest} - ,{vXdest + vWidth, vYdest + vHeight} - ,{vXsrc, vYsrc} - ,{vXsrc + vWidth, vYsrc + vHeight} - }; - - bSuccess = (::GpiBitBlt( m_hPS - ,pm_impl->GetHPS() - ,4L - ,aPoint - ,lRop - ,BBO_IGNORE - ) != GPI_ERROR); - if (!bSuccess ) - { - wxLogLastError(wxT("BitBlt")); - } - } - vCbnd.lColor = (LONG)vOldTextColor; - ::GpiSetAttrs( m_hPS // presentation-space handle - ,PRIM_CHAR // Char primitive. - ,CBB_COLOR // sets color. - ,0 - ,&vCbnd // buffer for attributes. - ); - ::GpiSetBackColor(m_hPS, (LONG)vOldBackground); - return bSuccess; -} - -void wxPMDCImpl::DoGetSize( int* pnWidth, - int* pnHeight ) const -{ - LONG lArray[CAPS_HEIGHT+1]; - - if(::DevQueryCaps( m_hDC - ,CAPS_FAMILY - ,CAPS_HEIGHT+1 - ,lArray - )) - { - if (pnWidth) - *pnWidth = lArray[CAPS_WIDTH]; - if (pnHeight) - *pnHeight = lArray[CAPS_HEIGHT]; - } -}; // end of wxPMDCImpl::DoGetSize( - -void wxPMDCImpl::DoGetSizeMM( int* pnWidth, - int* pnHeight ) const -{ - LONG lArray[CAPS_VERTICAL_RESOLUTION+1]; - - if(::DevQueryCaps( m_hDC - ,CAPS_FAMILY - ,CAPS_VERTICAL_RESOLUTION+1 - ,lArray - )) - { - if(pnWidth) - { - int nWidth = lArray[CAPS_WIDTH]; - int nHorzRes = lArray[CAPS_HORIZONTAL_RESOLUTION]; // returns pel/meter - // use fp to avoid returning 0 if nHorzRes < 1000 - *pnWidth = (int)((nHorzRes/1000.0) * nWidth); - } - - if(pnHeight) - { - int nHeight = lArray[CAPS_HEIGHT]; - int nVertRes = lArray[CAPS_VERTICAL_RESOLUTION]; // returns pel/meter - // use fp to avoid returning 0 if nVertRes < 1000 - *pnHeight = (int)((nVertRes/1000.0) * nHeight); - } - } -}; // end of wxPMDCImpl::DoGetSizeMM - -wxSize wxPMDCImpl::GetPPI() const -{ - LONG lArray[CAPS_VERTICAL_RESOLUTION+1]; - int nWidth = 0; - int nHeight = 0; - - if(::DevQueryCaps( m_hDC - ,CAPS_FAMILY - ,CAPS_VERTICAL_RESOLUTION+1 - ,lArray - )) - { - int nPelWidth; - int nPelHeight; - int nHorzRes; - int nVertRes; - - nPelWidth = lArray[CAPS_WIDTH]; - nPelHeight = lArray[CAPS_HEIGHT]; - nHorzRes = lArray[CAPS_HORIZONTAL_RESOLUTION]; // returns pel/meter - nVertRes = lArray[CAPS_VERTICAL_RESOLUTION]; // returns pel/meter - nWidth = (int)((nHorzRes/39.3) * nPelWidth); - nHeight = (int)((nVertRes/39.3) * nPelHeight); - } - wxSize ppisize(nWidth, nHeight); - return ppisize; -} // end of wxPMDCImpl::GetPPI - -void wxPMDCImpl::SetLogicalScale( double dX, double dY ) -{ - m_logicalScaleX = dX; - m_logicalScaleY = dY; -}; // end of wxPMDCImpl::SetLogicalScale diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp deleted file mode 100644 index c5f2201c66..0000000000 --- a/src/os2/dcclient.cpp +++ /dev/null @@ -1,433 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dcclient.cpp -// Purpose: wxClientDC class -// Author: David Webster -// Modified by: -// Created: 09/21/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// declarations -// =========================================================================== - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/dcclient.h" -#include "wx/os2/dcclient.h" - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/log.h" - #include "wx/app.h" - #include "wx/window.h" -#endif - -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// array/list types -// ---------------------------------------------------------------------------- - -struct WXDLLEXPORT wxPaintDCInfo -{ - wxPaintDCInfo( wxWindow* pWin - ,wxPaintDCImpl* pDC - ) - { - m_hWnd = pWin->GetHWND(); - m_hDC = pDC->GetHDC(); - m_nCount = 1; - } - - WXHWND m_hWnd; // window for this DC - WXHDC m_hDC; // the DC handle - size_t m_nCount; // usage count -}; // end of wxPaintDCInfot - -#include "wx/arrimpl.cpp" - -WX_DEFINE_OBJARRAY(wxArrayDCInfo); - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -static RECT g_paintStruct; - -#ifdef wxHAS_PAINT_DEBUG - // a global variable which we check to verify that wxPaintDC are only - // created in resopnse to WM_PAINT message - doing this from elsewhere is a - // common programming error among wxWidgets programmers and might lead to - // very subtle and difficult to debug refresh/repaint bugs. - int g_isPainting = 0; -#endif // wxHAS_PAINT_DEBUG - -// =========================================================================== -// implementation -// =========================================================================== - -// ---------------------------------------------------------------------------- -// wxWindowDCImpl -// ---------------------------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxPMDCImpl) - -wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) : - wxPMDCImpl( owner ) -{ - m_PageSize.cx = m_PageSize.cy = 0; -} - -wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow* pTheCanvas) : - wxPMDCImpl( owner ) -{ - ERRORID vError; - wxString sError; - int nWidth, nHeight; - - m_pCanvas = pTheCanvas; - DoGetSize(&nWidth, &nHeight); - m_PageSize.cx = nWidth; - m_PageSize.cy = nHeight; - m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) ); - - // - // default under PM is that Window and Client DC's are the same - // so we offer a separate Presentation Space to use for the - // entire window. Otherwise, calling BeginPaint will just create - // chached-micro client presentation space - // - m_hPS = ::GpiCreatePS( vHabmain - ,m_hDC - ,&m_PageSize - ,PU_PELS | GPIF_LONG | GPIA_ASSOC - ); - if (!m_hPS) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Unable to create presentation space. Error: %s\n"), sError.c_str()); - } - ::GpiAssociate(m_hPS, NULLHANDLE); - ::GpiAssociate(m_hPS, m_hDC); - - // - // Set the wxWidgets color table - // - if (!::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Unable to set current color table (3). Error: %s\n"), sError.c_str()); - } - ::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - ); - ::WinQueryWindowRect( GetWinHwnd(m_pCanvas) - ,&m_vRclPaint - ); - InitDC(); -} // end of wxWindowDCImpl::wxWindowDCImpl - -void wxWindowDCImpl::InitDC() -{ - - // - // The background mode is only used for text background and is set in - // DrawText() to OPAQUE as required, otherwise always TRANSPARENT, - // - ::GpiSetBackMix(GetHPS(), BM_LEAVEALONE); - - // - // Default bg colour is pne of the window - // - SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID)); - - m_pen.SetColour(*wxBLACK); - m_brush.SetColour(*wxWHITE); - // since we are a window dc we need to grab the palette from the window -#if wxUSE_PALETTE - InitializePalette(); -#endif - wxFont* pFont = new wxFont( 10, wxMODERN, wxNORMAL, wxBOLD ); - SetFont(*pFont); - delete pFont; - // - // OS/2 default vertical character alignment needs to match the other OS's - // - ::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM); - -} // end of wxWindowDCImpl::InitDC - -void wxWindowDCImpl::DoGetSize( - int* pnWidth -, int* pnHeight -) const -{ - wxCHECK_RET( m_pCanvas, wxT("wxWindowDC without a window?") ); - m_pCanvas->GetSize( pnWidth - ,pnHeight - ); -} // end of wxWindowDCImpl::DoGetSize - -// ---------------------------------------------------------------------------- -// wxClientDC -// ---------------------------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl) - -wxClientDCImpl::wxClientDCImpl( wxDC *owner ) : - wxWindowDCImpl( owner ) -{ - m_pCanvas = NULL; -} - -wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *pTheCanvas) : - wxWindowDCImpl( owner ) -{ - SIZEL vSizl = { 0,0}; - ERRORID vError; - wxString sError; - - m_pCanvas = pTheCanvas; - - // - // default under PM is that Window and Client DC's are the same - // - - m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas)); - printf("Got WindowDC %X for window handle %X\n", m_hDC, pTheCanvas); - - m_hPS = ::GpiCreatePS( wxGetInstance() - ,m_hDC - ,&vSizl - ,PU_PELS | GPIF_LONG | GPIA_ASSOC - ); - ::GpiAssociate(m_hPS, NULLHANDLE); - ::GpiAssociate(m_hPS, m_hDC); - - printf("Got m_hPS %X\n", m_hPS); - // Set the wxWidgets color table - if (!::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Unable to set current color table (4). Error: %s\n"), sError.c_str()); - } - ::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - ); - // - // Set the DC/PS rectangle - // - ::WinQueryWindowRect( GetWinHwnd(m_pCanvas) - ,&m_vRclPaint - ); - InitDC(); -} // end of wxClientDCImpl::wxClientDCImpl - -void wxClientDCImpl::InitDC() -{ - wxWindowDCImpl::InitDC(); - - // in wxUniv build we must manually do some DC adjustments usually - // performed by Windows for us -#ifdef __WXUNIVERSAL__ - wxPoint ptOrigin = m_pCanvas->GetClientAreaOrigin(); - if ( ptOrigin.x || ptOrigin.y ) - { - // no need to shift DC origin if shift is null - SetDeviceOrigin(ptOrigin.x, ptOrigin.y); - } - - // clip the DC to avoid overwriting the non client area - SetClippingRegion(wxPoint(0, 0), m_pCanvas->GetClientSize()); -#endif // __WXUNIVERSAL__ -} // end of wxClientDCImpl::InitDC - -wxClientDCImpl::~wxClientDCImpl() -{ -} // end of wxClientDCImpl::~wxClientDCImpl - -void wxClientDCImpl::DoGetSize( - int* pnWidth -, int* pnHeight -) const -{ - wxCHECK_RET( m_pCanvas, wxT("wxWindowDC without a window?") ); - m_pCanvas->GetClientSize( pnWidth - ,pnHeight - ); -} // end of wxClientDCImpl::DoGetSize - -// ---------------------------------------------------------------------------- -// wxPaintDC -// ---------------------------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl) - -wxArrayDCInfo wxPaintDCImpl::ms_cache; - -wxPaintDCImpl::wxPaintDCImpl( wxDC *owner ) : - wxClientDCImpl( owner ) -{ - m_pCanvas = NULL; - m_hDC = 0; -} - -wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *pCanvas) : - wxClientDCImpl( owner ) -{ - wxCHECK_RET(pCanvas, wxT("NULL canvas in wxPaintDC ctor")); - -#ifdef wxHAS_PAINT_DEBUG - if (g_isPainting <= 0) - { - wxFAIL_MSG( wxT("wxPaintDC may be created only in EVT_PAINT handler!") ); - return; - } -#endif // wxHAS_PAINT_DEBUG - - m_pCanvas = pCanvas; - - // - // Do we have a DC for this window in the cache? - // - wxPaintDCInfo* pInfo = FindInCache(); - - if (pInfo) - { - m_hDC = pInfo->m_hDC; - pInfo->m_nCount++; - } - else // not in cache, create a new one - { - HPS hPS; - - m_hDC = ::WinOpenWindowDC(GetWinHwnd(m_pCanvas)); - hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas) - ,NULLHANDLE - ,&g_paintStruct - ); - if(hPS) - { - ::GpiAssociate(hPS, m_hDC); - m_hOldPS = m_hPS; - m_hPS = hPS; - ::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - ); - ::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - ); - - ::WinFillRect(hPS, &g_paintStruct, m_pCanvas->GetBackgroundColour().GetPixel()); - ::WinQueryWindowRect( GetWinHwnd(m_pCanvas) - ,&m_vRclPaint - ); - } - - m_bIsPaintTime = true; - ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this)); - } - InitDC(); -} // end of wxPaintDCImpl::wxPaintDCImpl - -wxPaintDCImpl::~wxPaintDCImpl() -{ - if ( m_hDC ) - { - SelectOldObjects(m_hDC); - - size_t nIndex; - wxPaintDCInfo* pInfo = FindInCache(&nIndex); - - wxCHECK_RET( pInfo, wxT("existing DC should have a cache entry") ); - - if ( !--pInfo->m_nCount ) - { - ::WinEndPaint(m_hPS); - m_hPS = m_hOldPS; - m_bIsPaintTime = false; - ms_cache.RemoveAt(nIndex); - } - //else: cached DC entry is still in use - - // prevent the base class dtor from ReleaseDC()ing it again - m_hDC = 0; - } -} - -wxPaintDCInfo* wxPaintDCImpl::FindInCache( - size_t* pIndex -) const -{ - wxPaintDCInfo* pInfo = NULL; - size_t nCache = ms_cache.GetCount(); - - for (size_t n = 0; n < nCache; n++) - { - pInfo = &ms_cache[n]; - if (pInfo->m_hWnd == m_pCanvas->GetHWND()) - { - if (pIndex) - *pIndex = n; - break; - } - } - return pInfo; -} // end of wxPaintDCImpl::FindInCache - -// find the entry for this DC in the cache (keyed by the window) -WXHDC wxPaintDCImpl::FindDCInCache( - wxWindow* pWin -) -{ - wxPaintDCInfo* pInfo = NULL; - size_t nCache = ms_cache.GetCount(); - - for (size_t n = 0; n < nCache; n++) - { - pInfo = &ms_cache[n]; - if (pInfo->m_hWnd == pWin->GetHWND()) - { - return pInfo->m_hDC; - } - } - return 0; -} // end of wxPaintDCImpl::FindInCache diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp deleted file mode 100644 index 9950c287b6..0000000000 --- a/src/os2/dcmemory.cpp +++ /dev/null @@ -1,211 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dcmemory.cpp -// Purpose: wxMemoryDC class -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/dcmemory.h" -#include "wx/os2/dcmemory.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/log.h" -#endif - -#include "wx/os2/private.h" - -IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl) - -///////////////////////////////////////////////////////////////////////////// -// Memory DC -///////////////////////////////////////////////////////////////////////////// - -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) - : wxPMDCImpl( owner ) -{ - CreateCompatible(NULL); - Init(); -} - -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) - : wxPMDCImpl( owner ) -{ - CreateCompatible(NULL); - Init(); - DoSelect(bitmap); -} - -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC) - : wxPMDCImpl( owner ) -{ - wxCHECK_RET( pOldDC, wxT("NULL dc in wxMemoryDC ctor") ); - - CreateCompatible(pOldDC); - Init(); -} // end of wxMemoryDC::wxMemoryDC - -void wxMemoryDCImpl::Init() -{ - if (m_ok) - { - SetBrush(*wxWHITE_BRUSH); - SetPen(*wxBLACK_PEN); - - // the background mode is only used for text background and is set in - // DrawText() to OPAQUE as required, otherwise always TRANSPARENT - ::GpiSetBackMix( GetHPS(), BM_LEAVEALONE ); - } - memset(&m_vRclPaint, 0, sizeof(m_vRclPaint)); -} // end of wxMemoryDC::Init - -bool wxMemoryDCImpl::CreateCompatible( wxDC* WXUNUSED(pDC) ) -{ - HDC hDC; - HPS hPS; - DEVOPENSTRUC vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - SIZEL vSize = {0, 0}; - - // - // Create a memory device context - // - hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE); - if (hDC != DEV_ERROR) - { - hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - if (hPS != GPI_ERROR) - { - m_hPS = hPS; - m_hDC = hDC; - m_ok = true; - m_bOwnsDC = true; - // - // Set the wxWidgets color table - // - ::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - ); - ::GpiCreateLogColorTable( m_hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - ); - } - else - { - m_hPS = NULLHANDLE; - m_hDC = NULLHANDLE; - m_ok = false; - m_bOwnsDC = false; - } - } - else - { - m_hPS = NULLHANDLE; - m_hDC = NULLHANDLE; - m_ok = false; - m_bOwnsDC = false; - } - - // - // As we created the DC, we must delete it in the dtor - // - m_bOwnsDC = true; - m_ok = m_hDC != 0; - return m_ok; -} // end of wxMemoryDC::CreateCompatible - -void wxMemoryDCImpl::DoSelect( - const wxBitmap& rBitmap -) -{ - // - // Select old bitmap out of the device context - // - if (m_hOldBitmap) - { - ::GpiSetBitmap(m_hPS, NULLHANDLE); - if (m_vSelectedBitmap.IsOk()) - { - m_vSelectedBitmap.SetSelectedInto(NULL); - m_vSelectedBitmap = wxNullBitmap; - } - } - - // - // Check for whether the bitmap is already selected into a device context - // - wxCHECK_RET( !rBitmap.GetSelectedInto() || - (rBitmap.GetSelectedInto() == GetOwner()), - wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") ); - - WXHBITMAP hBmp = rBitmap.GetHBITMAP(); - - if (!hBmp) - { - // - // Bmps drawn to are upside down, so flip it before committing - // - POINTL vPoint[4] = { {0, m_vSelectedBitmap.GetHeight()} - ,{m_vSelectedBitmap.GetWidth(), 0} - ,{0, 0} - ,{m_vSelectedBitmap.GetWidth(), m_vSelectedBitmap.GetHeight()} - }; - - - ::GpiBitBlt( m_hPS - ,m_hPS - ,4 - ,vPoint - ,ROP_SRCCOPY - ,BBO_IGNORE - ); - m_vSelectedBitmap.SetSelectedInto(NULL); - } - - m_vSelectedBitmap = rBitmap; - - - if (!hBmp) - { - - m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE); - return; - } - m_vSelectedBitmap.SetSelectedInto(GetOwner()); - m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp); - - if (m_hOldBitmap == HBM_ERROR) - { - wxLogLastError(wxT("SelectObject(memDC, bitmap)")); - wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC")); - } -} // end of wxMemoryDC::SelectObject - -void wxMemoryDCImpl::DoGetSize( - int* pWidth -, int* pHeight -) const -{ - if (!m_vSelectedBitmap.IsOk()) - { - *pWidth = 0; - *pHeight = 0; - return; - } - *pWidth = m_vSelectedBitmap.GetWidth(); - *pHeight = m_vSelectedBitmap.GetHeight(); -} // end of wxMemoryDC::DoGetSize diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp deleted file mode 100644 index a3ffc66a7f..0000000000 --- a/src/os2/dcprint.cpp +++ /dev/null @@ -1,289 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dcprint.cpp -// Purpose: wxPrinterDC class -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -#include "wx/dcprint.h" -#include "wx/os2/dcprint.h" - -#define INCL_DEV -#define INCL_GPI -#define INCL_PM -#include - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/math.h" - #include "wx/string.h" - #include "wx/log.h" - #include "wx/window.h" -#endif - -#include "wx/os2/private.h" - -IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxPMDCImpl) - -wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& rPrintData ) : - wxPMDCImpl( owner ) -{ - m_printData = rPrintData; - m_isInteractive = false; - m_hDC = wxGetPrinterDC(rPrintData); - m_ok = (m_hDC != 0); - if (m_hDC) - SetMapMode(wxMM_TEXT); - SetBrush(*wxBLACK_BRUSH); - SetPen(*wxBLACK_PEN); -} // end of wxPrinterDC::wxPrinterDC - -wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, WXHDC hTheDC ) : - wxPMDCImpl( owner ) -{ - m_isInteractive = false; - m_hDC = hTheDC; - m_ok = true; - if (m_hDC) - { - SetMapMode(wxMM_TEXT); - } - SetBrush(*wxBLACK_BRUSH); - SetPen(*wxBLACK_PEN); -} // end of wxPrinterDC::wxPrinterDC - -void wxPrinterDCImpl::Init() -{ - if (m_hDC) - { - SetMapMode(wxMM_TEXT); - - SetBrush(*wxBLACK_BRUSH); - SetPen(*wxBLACK_PEN); - } -} // end of wxPrinterDC::Init - -bool wxPrinterDCImpl::StartDoc(const wxString& WXUNUSED(rsMessage)) -{ -/* TODO: PM's implementation - DOCINFO docinfo; - docinfo.cbSize = sizeof(DOCINFO); - docinfo.lpszDocName = (const wxChar*)message; - - wxString filename(m_printData.GetFilename()); - - if (filename.empty()) - docinfo.lpszOutput = NULL; - else - docinfo.lpszOutput = (const wxChar *) filename; - - docinfo.lpszDatatype = NULL; - docinfo.fwType = 0; - - if (!m_hDC) - return false; - - int ret = -#ifndef __WIN32__ - ::StartDoc((HDC) m_hDC, &docinfo); -#else -#ifdef UNICODE - ::StartDocW((HDC) m_hDC, &docinfo); -#else -#ifdef __TWIN32__ - ::StartDoc((HDC) m_hDC, &docinfo); -#else - ::StartDocA((HDC) m_hDC, &docinfo); -#endif -#endif -#endif - -#ifndef __WIN16__ - if (ret <= 0) - { - DWORD lastError = GetLastError(); - wxLogDebug(wxT("wxDC::StartDoc failed with error: %d\n"), lastError); - } -#endif - return (ret > 0); -*/ - return true; -} // end of wxPrinterDC::StartDoc - -void wxPrinterDCImpl::EndDoc() -{ -// if (m_hDC) ::EndDoc((HDC) m_hDC); -} // end of wxPrinterDC::EndDoc - -void wxPrinterDCImpl::StartPage() -{ -// if (m_hDC) -// ::StartPage((HDC) m_hDC); -} // end of wxPrinterDC::StartPage - -void wxPrinterDCImpl::EndPage() -{ -// if (m_hDC) -// ::EndPage((HDC) m_hDC); -} // end of wxPrinterDC::EndPage - -wxRect wxPrinterDCImpl::GetPaperRect() const -{ - // Use page rect if we can't get paper rect. - wxCoord w, h; - GetSize(&w, &h); - return wxRect(0, 0, w, h); -} - -#if 0 -// Returns default device and port names -static bool wxGetDefaultDeviceName( wxString& rsDeviceName, wxString& rsPortName ) -{ - rsDeviceName = wxEmptyString; -/* - LPDEVNAMES lpDevNames; - LPSTR lpszDriverName; - LPSTR lpszDeviceName; - LPSTR lpszPortName; - - PRINTDLG pd; - - // Cygwin has trouble believing PRINTDLG is 66 bytes - thinks it is 68 -#ifdef __GNUWIN32__ - pd.lStructSize = 66; // sizeof(PRINTDLG); -#else - pd.lStructSize = sizeof(PRINTDLG); -#endif - - pd.hwndOwner = (HWND)NULL; - pd.hDevMode = NULL; // Will be created by PrintDlg - pd.hDevNames = NULL; // Ditto - pd.Flags = PD_RETURNDEFAULT; - pd.nCopies = 1; - - if (!PrintDlg((LPPRINTDLG)&pd)) - { - if ( pd.hDevMode ) - GlobalFree(pd.hDevMode); - if (pd.hDevNames) - GlobalFree(pd.hDevNames); - - return false; - } - - if (pd.hDevNames) - { - lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames); - lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset; - lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset; - lpszPortName = (LPSTR)lpDevNames + lpDevNames->wOutputOffset; - GlobalUnlock(pd.hDevNames); - GlobalFree(pd.hDevNames); - pd.hDevNames=NULL; - - deviceName = lpszDeviceName; - portName = lpszPortName; - } - - if (pd.hDevMode) - { - GlobalFree(pd.hDevMode); - pd.hDevMode=NULL; - } - return !deviceName.empty(); -*/ - return true; -} // end of wxGetDefaultDeviceName -#endif - -// Gets an HDC for the specified printer configuration -WXHDC WXDLLEXPORT wxGetPrinterDC( const wxPrintData& WXUNUSED(rPrintDataConst) ) -{ - HDC hDC = NULLHANDLE; -/* - wxPrintData printData = printDataConst; - printData.ConvertToNative(); - - wxChar* driverName = NULL; - - wxString devNameStr = printData.GetPrinterName(); - wxChar* deviceName; - wxChar* portName = NULL; // Obsolete in WIN32 - - if (devNameStr.empty()) - deviceName = NULL; - else - deviceName = WXSTRINGCAST devNameStr; - - LPDEVMODE lpDevMode = (LPDEVMODE) NULL; - - HGLOBAL hDevMode = (HGLOBAL)(DWORD) printData.GetNativeData(); - - if ( hDevMode ) - lpDevMode = (DEVMODE*) GlobalLock(hDevMode); - - if (devNameStr.empty()) - { - // Retrieve the default device name - wxString portName; - bool ret = wxGetDefaultDeviceName(devNameStr, portName); - - wxASSERT_MSG( ret, wxT("Could not get default device name.") ); - - deviceName = WXSTRINGCAST devNameStr; - } - -#ifdef __WIN32__ - HDC hDC = CreateDC(driverName, deviceName, portName, (DEVMODE *) lpDevMode); -#else - HDC hDC = CreateDC(driverName, deviceName, portName, (LPSTR) lpDevMode); -#endif - - if (hDevMode && lpDevMode) - GlobalUnlock(hDevMode); -*/ - return (WXHDC) hDC; -} // end of wxGetPrinterDC - -void wxPrinterDCImpl::DoDrawBitmap( const wxBitmap& rBmp, - wxCoord WXUNUSED(vX), - wxCoord WXUNUSED(vY), - bool WXUNUSED(bUseMask)) -{ - wxCHECK_RET( rBmp.IsOk(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); - -// int nWidth = rBmp.GetWidth(); -// int nHeight = rBmp.GetHeight(); - - // TODO: - -} // end of wxPrinterDC::DoDrawBitmap - -bool wxPrinterDCImpl::DoBlit( wxCoord WXUNUSED(vXdest), - wxCoord WXUNUSED(vYdest), - wxCoord WXUNUSED(vWidth), - wxCoord WXUNUSED(vHeight), - wxDC* WXUNUSED(pSource), - wxCoord WXUNUSED(vXsrc), - wxCoord WXUNUSED(vYsrc), - wxRasterOperationMode WXUNUSED(nRop), - bool WXUNUSED(bUseMask), - wxCoord WXUNUSED(xsrcMask), - wxCoord WXUNUSED(ysrcMask) ) -{ - bool bSuccess = true; - - // TODO: - - return bSuccess; -} // end of wxPrintDCImpl::DoBlit - -#endif //wxUSE_PRINTING_ARCHITECTURE diff --git a/src/os2/dcscreen.cpp b/src/os2/dcscreen.cpp deleted file mode 100644 index 8c8543fa29..0000000000 --- a/src/os2/dcscreen.cpp +++ /dev/null @@ -1,43 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dcscreen.cpp -// Purpose: wxScreenDC class -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/os2/dcscreen.h" - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/window.h" -#endif - -#include "wx/os2/private.h" - -IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxPMDCImpl) - -// Create a DC representing the whole screen -wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) : - wxPMDCImpl( owner ) -{ - m_hDC = ::WinOpenWindowDC(HWND_DESKTOP); - m_hPS = ::WinGetScreenPS(HWND_DESKTOP); - ::GpiSetBackMix(m_hPS, BM_LEAVEALONE); -} // end of wxScreenDC::wxScreenDC() - -void wxScreenDCImpl::DoGetSize( int* pnWidth, - int* pnHeight ) const -{ - // - // Skip wxWindowDC version because it doesn't work without a valid m_canvas - // (which we don't have) - // - wxPMDCImpl::DoGetSize( pnWidth, pnHeight ); - -} // end of wxScreenDC::DoGetSize diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp deleted file mode 100644 index 2c08d9f52c..0000000000 --- a/src/os2/dialog.cpp +++ /dev/null @@ -1,284 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dialog.cpp -// Purpose: wxDialog class -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/dialog.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/frame.h" - #include "wx/app.h" - #include "wx/settings.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include "wx/os2/private.h" -#include "wx/evtloop.h" -#include "wx/scopedptr.h" -#include "wx/modalhook.h" - -#define wxDIALOG_DEFAULT_X 300 -#define wxDIALOG_DEFAULT_Y 300 - -#define wxDIALOG_DEFAULT_WIDTH 500 -#define wxDIALOG_DEFAULT_HEIGHT 500 - - -// ---------------------------------------------------------------------------- -// wxDialogModalData -// ---------------------------------------------------------------------------- - -// this is simply a container for any data we need to implement modality which -// allows us to avoid changing wxDialog each time the implementation changes -class wxDialogModalData -{ -public: - wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { } - - void RunLoop() - { - m_evtLoop.Run(); - } - - void ExitLoop() - { - m_evtLoop.Exit(); - } - -private: - wxModalEventLoop m_evtLoop; -}; - -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData); - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxDialog construction -// ---------------------------------------------------------------------------- - -void wxDialog::Init() -{ - m_pOldFocus = NULL; - m_isShown = false; - m_pWindowDisabler = NULL; - m_modalData = NULL; - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); -} // end of wxDialog::Init - -bool wxDialog::Create( wxWindow* pParent, - wxWindowID vId, - const wxString& rsTitle, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxString& rsName ) -{ - Init(); - SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); - - // - // Save focus before doing anything which can potentially change it - // - m_pOldFocus = FindFocus(); - - // - // All dialogs should really have this style - // - lStyle |= wxTAB_TRAVERSAL; - - if (!wxTopLevelWindow::Create( pParent - ,vId - ,rsTitle - ,rPos - ,rSize - ,lStyle - ,rsName - )) - return false; - - SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - - // - // Must defer setting the title until after dialog is created and sized - // - if ( !rsTitle.empty() ) - SetTitle(rsTitle); - return true; -} // end of wxDialog::Create - -wxDialog::~wxDialog() -{ - SendDestroyEvent(); - - // this will also reenable all the other windows for a modal dialog - Show(false); -} // end of wxDialog::~wxDialog - -// ---------------------------------------------------------------------------- -// showing the dialogs -// ---------------------------------------------------------------------------- - -bool wxDialog::Show( bool bShow ) -{ - if ( bShow == IsShown() ) - return false; - - if (!bShow && m_modalData ) - { - // we need to do this before calling wxDialogBase version because if we - // had disabled other app windows, they must be reenabled right now as - // if they stay disabled Windows will activate another window (one - // which is enabled, anyhow) when we're hidden in the base class Show() - // and we will lose activation - m_modalData->ExitLoop(); -#if 0 - wxDELETE(m_pWindowDisabler); -#endif - } - - if (bShow) - { - if (CanDoLayoutAdaptation()) - DoLayoutAdaptation(); - - // this usually will result in TransferDataToWindow() being called - // which will change the controls values so do it before showing as - // otherwise we could have some flicker - InitDialog(); - } - - wxDialogBase::Show(bShow); - - wxString title = GetTitle(); - if (!title.empty()) - ::WinSetWindowText((HWND)GetHwnd(), title.c_str()); - - if ( bShow ) - { - // dialogs don't get WM_SIZE message after creation unlike most (all?) - // other windows and so could start their life not laid out correctly - // if we didn't call Layout() from here - // - // NB: normally we should call it just the first time but doing it - // every time is simpler than keeping a flag - Layout(); - } - - return true; -} // end of wxDialog::Show - -// -// Replacement for Show(true) for modal dialogs - returns return code -// -int wxDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - wxASSERT_MSG( !IsModal(), wxT("wxDialog::ShowModal() reentered?") ); - - m_endModalCalled = false; - - Show(); - - // EndModal may have been called from InitDialog handler (called from - // inside Show()), which would cause an infinite loop if we didn't take it - // into account - if ( !m_endModalCalled ) - { - // modal dialog needs a parent window, so try to find one - wxWindow * const parent = GetParentForModalDialog(); - - // remember where the focus was - wxWindow *oldFocus = m_pOldFocus; - if ( !oldFocus ) - { - // VZ: do we really want to do this? - oldFocus = parent; - } - - // We have to remember the HWND because we need to check - // the HWND still exists (oldFocus can be garbage when the dialog - // exits, if it has been destroyed) - HWND hwndOldFocus = oldFocus ? GetHwndOf(oldFocus) : NULL; - - - // - // Before entering the modal loop, reset the "is in OnIdle()" flag (see - // comment in app.cpp) - // - extern bool gbInOnIdle; - bool bWasInOnIdle = gbInOnIdle; - - gbInOnIdle = false; - - // enter and run the modal loop - { - wxDialogModalDataTiedPtr modalData(&m_modalData, - new wxDialogModalData(this)); - modalData->RunLoop(); - } - gbInOnIdle = bWasInOnIdle; - - // and restore focus - // Note that this code MUST NOT access the dialog object's data - // in case the object has been deleted (which will be the case - // for a modal dialog that has been destroyed before calling EndModal). - if ( oldFocus && (oldFocus != this) && ::WinIsWindow(vHabmain, hwndOldFocus)) - { - // This is likely to prove that the object still exists - if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus) - oldFocus->SetFocus(); - } - } - - return GetReturnCode(); -} // end of wxDialog::ShowModal - -void wxDialog::EndModal( - int nRetCode -) -{ - wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") ); - - m_endModalCalled = true; - SetReturnCode(nRetCode); - - Hide(); -} // end of wxDialog::EndModal - -MRESULT wxDialog::OS2WindowProc( WXUINT uMessage, WXWPARAM wParam, WXLPARAM lParam ) -{ - MRESULT rc = 0; - bool bProcessed = false; - - switch (uMessage) - { - case WM_CLOSE: - // - // If we can't close, tell the system that we processed the - // message - otherwise it would close us - // - bProcessed = !Close(); - break; - } - - if (!bProcessed) - rc = wxWindow::OS2WindowProc( uMessage - ,wParam - ,lParam - ); - return rc; -} // end of wxDialog::OS2WindowProc diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp deleted file mode 100644 index 73ed70ca0e..0000000000 --- a/src/os2/dir.cpp +++ /dev/null @@ -1,389 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dir.cpp -// Purpose: wxDir implementation for OS/2 -// Author: Vadim Zeitlin -// Modified by: Stefan Neis -// Created: 08.12.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/os2/private.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif // PCH - -#include "wx/dir.h" -#include "wx/filefn.h" // for wxMatchWild - -#include - -#define INCL_DOSFILEMGR -#define INCL_DOSERRORS -#include - -#ifdef __EMX__ -#include -#endif - -// ---------------------------------------------------------------------------- -// define the types and functions used for file searching -// ---------------------------------------------------------------------------- - -typedef FILEFINDBUF3 FIND_STRUCT; -typedef HDIR FIND_DATA; -typedef ULONG FIND_ATTR; - -static inline FIND_DATA InitFindData() { return ERROR_INVALID_HANDLE; } - -static inline bool IsFindDataOk( - FIND_DATA vFd -) -{ - return vFd != ERROR_INVALID_HANDLE; -} - -static inline void FreeFindData( - FIND_DATA vFd -) -{ - if (!::DosFindClose(vFd)) - { - wxLogLastError(wxT("DosFindClose")); - } -} - -static inline FIND_DATA FindFirst( - const wxString& rsSpec -, FIND_STRUCT* pFinddata -) -{ - ULONG ulFindCount = 1; - FIND_DATA hDir = HDIR_CREATE; - FIND_ATTR rc; - - rc = ::DosFindFirst( rsSpec.c_str() - ,&hDir - ,0x37 // was: FILE_NORMAL - ,pFinddata - ,sizeof(FILEFINDBUF3) - ,&ulFindCount - ,FIL_STANDARD - ); - if (rc != 0) - return InitFindData(); - return hDir; -} - -static inline bool FindNext( - FIND_DATA vFd -, FIND_STRUCT* pFinddata -) -{ - ULONG ulFindCount = 1; - - return ::DosFindNext( vFd - ,pFinddata - ,sizeof(FILEFINDBUF3) - ,&ulFindCount - ) == 0; -} - -static const wxChar* GetNameFromFindData( - FIND_STRUCT* pFinddata -) -{ - return (wxChar*)pFinddata->achName; -} - -static const FIND_ATTR GetAttrFromFindData( - FIND_STRUCT* pFinddata -) -{ - return pFinddata->attrFile; -} - -static inline bool IsDir( - FIND_ATTR vAttr -) -{ - return (vAttr & FILE_DIRECTORY) != 0; -} - -static inline bool IsHidden( - FIND_ATTR vAttr -) -{ - return (vAttr & (FILE_HIDDEN | FILE_SYSTEM)) != 0; -} - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -#ifndef MAX_PATH - #define MAX_PATH 260 // from PM++ headers -#endif - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -#define M_DIR ((wxDirData *)m_data) - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// this class stores everything we need to enumerate the files -class wxDirData -{ -public: - wxDirData(const wxString& rsDirname); - ~wxDirData(); - - void SetFileSpec(const wxString& rsFilespec) { m_sFilespec = rsFilespec; } - void SetFlags(int nFlags) { m_nFlags = nFlags; } - - const wxString& GetName() const { return m_sDirname; } - void Close(); - void Rewind(); - bool Read(wxString* rsFilename); - -private: - FIND_DATA m_vFinddata; - wxString m_sDirname; - wxString m_sFilespec; - int m_nFlags; -}; // end of CLASS wxDirData - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxDirData -// ---------------------------------------------------------------------------- - -wxDirData::wxDirData( - const wxString& rsDirname -) -: m_sDirname(rsDirname) -{ - m_vFinddata = InitFindData(); -} // end of wxDirData::wxDirData - -wxDirData::~wxDirData() -{ - Close(); -} // end of wxDirData::~wxDirData - -void wxDirData::Close() -{ - if ( IsFindDataOk(m_vFinddata) ) - { - FreeFindData(m_vFinddata); - m_vFinddata = InitFindData(); - } -} // end of wxDirData::Close - -void wxDirData::Rewind() -{ - Close(); -} // end of wxDirData::Rewind - -bool wxDirData::Read( - wxString* psFilename -) -{ - bool bFirst = false; - - FILEFINDBUF3 vFinddata; - #define PTR_TO_FINDDATA (&vFinddata) - - if (!IsFindDataOk(m_vFinddata)) - { - // - // Open first - // - wxString sFilespec = m_sDirname; - - if ( !wxEndsWithPathSeparator(sFilespec) ) - { - sFilespec += wxT('\\'); - } - sFilespec += (!m_sFilespec ? wxT("*.*") : m_sFilespec.c_str()); - - m_vFinddata = FindFirst( sFilespec - ,PTR_TO_FINDDATA - ); - bFirst = true; - } - - if ( !IsFindDataOk(m_vFinddata) ) - { - return false; - } - - const wxChar* zName; - FIND_ATTR vAttr; - - for ( ;; ) - { - if (bFirst) - { - bFirst = false; - } - else - { - if (!FindNext( m_vFinddata - ,PTR_TO_FINDDATA - )) - { - return false; - } - } - - zName = GetNameFromFindData(PTR_TO_FINDDATA); - vAttr = GetAttrFromFindData(PTR_TO_FINDDATA); - - // - // Don't return "." and ".." unless asked for - // - if ( zName[0] == wxT('.') && - ((zName[1] == wxT('.') && zName[2] == wxT('\0')) || - (zName[1] == wxT('\0'))) ) - { - if (!(m_nFlags & wxDIR_DOTDOT)) - continue; - } - - // - // Check the type now - // - if (!(m_nFlags & wxDIR_FILES) && !IsDir(vAttr)) - { - // - // It's a file, but we don't want them - // - continue; - } - else if (!(m_nFlags & wxDIR_DIRS) && IsDir(vAttr) ) - { - // - // It's a dir, and we don't want it - // - continue; - } - - // - // Finally, check whether it's a hidden file - // - if (!(m_nFlags & wxDIR_HIDDEN)) - { - if (IsHidden(vAttr)) - { - // - // It's a hidden file, skip it - // - continue; - } - } - *psFilename = zName; - break; - } - return true; -} // end of wxDirData::Read - -// ---------------------------------------------------------------------------- -// wxDir construction/destruction -// ---------------------------------------------------------------------------- - -wxDir::wxDir( - const wxString& rsDirname -) -{ - m_data = NULL; - - (void)Open(rsDirname); -} // end of wxDir::wxDir - -bool wxDir::Open( - const wxString& rsDirname -) -{ - delete M_DIR; - m_data = new wxDirData(rsDirname); - return true; -} // end of wxDir::Open - -bool wxDir::IsOpened() const -{ - return m_data != NULL; -} // end of wxDir::IsOpen - -wxString wxDir::GetName() const -{ - wxString name; - if ( m_data ) - { - name = M_DIR->GetName(); - if ( !name.empty() ) - { - // bring to canonical Windows form - name.Replace(wxT("/"), wxT("\\")); - - if ( name.Last() == wxT('\\') ) - { - // chop off the last (back)slash - name.Truncate(name.length() - 1); - } - } - } - - return name; -} - -wxDir::~wxDir() -{ - delete M_DIR; -} // end of wxDir::~wxDir - -// ---------------------------------------------------------------------------- -// wxDir enumerating -// ---------------------------------------------------------------------------- - -bool wxDir::GetFirst( - wxString* psFilename -, const wxString& rsFilespec -, int nFlags -) const -{ - wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") ); - M_DIR->Rewind(); - M_DIR->SetFileSpec(rsFilespec); - M_DIR->SetFlags(nFlags); - return GetNext(psFilename); -} // end of wxDir::GetFirst - -bool wxDir::GetNext( - wxString* psFilename -) const -{ - wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") ); - wxCHECK_MSG( psFilename, false, wxT("bad pointer in wxDir::GetNext()") ); - return M_DIR->Read(psFilename); -} // end of wxDir::GetNext - diff --git a/src/os2/dirdlg.cpp b/src/os2/dirdlg.cpp deleted file mode 100644 index fcaf7a87c9..0000000000 --- a/src/os2/dirdlg.cpp +++ /dev/null @@ -1,49 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dirdlg.cpp -// Purpose: wxDirDialog -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/dirdlg.h" -#include "wx/modalhook.h" - -#ifndef WX_PRECOMP - #include - #include "wx/utils.h" - #include "wx/dialog.h" -#endif - -#include "wx/os2/private.h" - -#include -#include - -#define wxDIALOG_DEFAULT_X 300 -#define wxDIALOG_DEFAULT_Y 300 - -IMPLEMENT_CLASS(wxDirDialog, wxDialog) - -wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message, - const wxString& defaultPath, - long style, const wxPoint& pos) -{ - m_message = message; - m_windowStyle = style; - m_parent = parent; - m_path = defaultPath; -} - -int wxDirDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - // TODO - return wxID_CANCEL; -} diff --git a/src/os2/dllar.sh b/src/os2/dllar.sh deleted file mode 100755 index 2dd495b9b6..0000000000 --- a/src/os2/dllar.sh +++ /dev/null @@ -1,485 +0,0 @@ -#!/bin/sh -# -# dllar - a tool to build both a .dll and an .a file -# from a set of object (.o) files for EMX/OS2. -# -# Written by Andrew Zabolotny, bit@freya.etu.ru -# Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de -# -# This script will accept a set of files on the command line. -# All the public symbols from the .o files will be exported into -# a .DEF file, then linker will be run (through gcc) against them to -# build a shared library consisting of all given .o files. All libraries -# (.a) will be first decompressed into component .o files then act as -# described above. You can optionally give a description (-d "description") -# which will be put into .DLL. To see the list of accepted options (as well -# as command-line format) simply run this program without options. The .DLL -# is built to be imported by name (there is no guarantee that new versions -# of the library you build will have same ordinals for same symbols). -# -# dllar is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# dllar is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with dllar; see the file COPYING. If not, write to the Free -# Software Foundation, 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# To successfuly run this program you will need: -# - Current drive should have LFN support (HPFS, ext2, network, etc) -# (Sometimes dllar generates filenames which won't fit 8.3 scheme) -# - gcc -# (used to build the .dll) -# - emxexp -# (used to create .def file from .o files) -# - emximp -# (used to create .a file from .def file) -# - GNU text utilites (cat, sort, uniq) -# used to process emxexp output -# - GNU file utilities (mv, rm) -# - GNU sed -# - lxlite (optional, see flag below) -# (used for general .dll cleanup) -# - -flag_USE_LXLITE=1; - -# -# helper functions -# basnam, variant of basename, which does _not_ remove the path, _iff_ -# second argument (suffix to remove) is given -basnam(){ - case $# in - 1) - echo $1 | sed 's/.*\///' | sed 's/.*\\//' - ;; - 2) - echo $1 | sed 's/'$2'$//' - ;; - *) - echo "error in basnam $*" - exit 8 - ;; - esac -} - -# Cleanup temporary files and output -CleanUp() { - cd $curDir - for i in $inputFiles ; do - case $i in - *!) - rm -rf `basnam $i !` - ;; - *) - ;; - esac - done - - # Kill result in case of failure as there is just to many stupid make/nmake - # things out there which doesn't do this. - if [ $# -eq 0 ]; then - rm -f $arcFile $arcFile2 $defFile $dllFile - fi -} - -# Print usage and exit script with rc=1. -PrintHelp() { - echo 'Usage: dllar.sh [-o[utput] output_file] [-i[mport] importlib_name]' - echo ' [-name-mangler-script script.sh]' - echo ' [-d[escription] "dll descrption"] [-cc "CC"] [-f[lags] "CFLAGS"]' - echo ' [-ord[inals]] -ex[clude] "symbol(s)"' - echo ' [-libf[lags] "{INIT|TERM}{GLOBAL|INSTANCE}"] [-nocrt[dll]] [-nolxl[ite]]' - echo ' [*.o] [*.a]' - echo '*> "output_file" should have no extension.' - echo ' If it has the .o, .a or .dll extension, it is automatically removed.' - echo ' The import library name is derived from this and is set to "name".a,' - echo ' unless overridden by -import' - echo '*> "importlib_name" should have no extension.' - echo ' If it has the .o, or .a extension, it is automatically removed.' - echo ' This name is used as the import library name and may be longer and' - echo ' more descriptive than the DLL name which has to follow the old ' - echo ' 8.3 convention of FAT.' - echo '*> "script.sh may be given to override the output_file name by a' - echo ' different name. It is mainly useful if the regular make process' - echo ' of some package does not take into account OS/2 restriction of' - echo ' DLL name lengths. It takes the importlib name as input and is' - echo ' supposed to procude a shorter name as output. The script should' - echo ' expect to get importlib_name without extension and should produce' - echo ' a (max.) 8 letter name without extension.' - echo '*> "cc" is used to use another GCC executable. (default: gcc.exe)' - echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)' - echo ' These flags will be put at the start of GCC command line.' - echo '*> -ord[inals] tells dllar to export entries by ordinals. Be careful.' - echo '*> -ex[clude] defines symbols which will not be exported. You can define' - echo ' multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".' - echo ' If the last character of a symbol is "*", all symbols beginning' - echo ' with the prefix before "*" will be exclude, (see _GLOBAL* above).' - echo '*> -libf[lags] can be used to add INITGLOBAL/INITINSTANCE and/or' - echo ' TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.' - echo '*> -nocrt[dll] switch will disable linking the library against emx''s' - echo ' C runtime DLLs.' - echo '*> -nolxl[ite] switch will disable running lxlite on the resulting DLL.' - echo '*> All other switches (for example -L./ or -lmylib) will be passed' - echo ' unchanged to GCC at the end of command line.' - echo '*> If you create a DLL from a library and you do not specify -o,' - echo ' the basename for DLL and import library will be set to library name,' - echo ' the initial library will be renamed to 'name'_s.a (_s for static)' - echo ' i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial' - echo ' library will be renamed into gcc_s.a.' - echo '--------' - echo 'Example:' - echo ' dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord' - echo ' -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"' - CleanUp - exit 1 -} - -# Execute a command. -# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script. -# @Uses Whatever CleanUp() uses. -doCommand() { - echo "$*" - eval $* - rcCmd=$? - - if [ $rcCmd -ne 0 ]; then - echo "command failed, exit code="$rcCmd - CleanUp - exit $rcCmd - fi -} - -# main routine -# setup globals -cmdLine=$* -outFile="" -outimpFile="" -inputFiles="" -renameScript="" -description="" -CC=gcc.exe -CFLAGS="-s -Zcrtdll" -EXTRA_CFLAGS="" -EXPORT_BY_ORDINALS=0 -exclude_symbols="" -library_flags="" -curDir=`pwd` -curDirS=curDir -case $curDirS in -*/) - ;; -*) - curDirS=${curDirS}"/" - ;; -esac -# Parse commandline -libsToLink=0 -omfLinking=0 -while [ $1 ]; do - case $1 in - -ord*) - EXPORT_BY_ORDINALS=1; - ;; - -o*) - shift - outFile=$1 - ;; - -i*) - shift - outimpFile=$1 - ;; - -name-mangler-script) - shift - renameScript=$1 - ;; - -d*) - shift - description=$1 - ;; - -f*) - shift - CFLAGS=$1 - ;; - -c*) - shift - CC=$1 - ;; - -h*) - PrintHelp - ;; - -ex*) - shift - exclude_symbols=${exclude_symbols}$1" " - ;; - -libf*) - shift - library_flags=${library_flags}$1" " - ;; - -nocrt*) - CFLAGS="-s" - ;; - -nolxl*) - flag_USE_LXLITE=0 - ;; - -* | /*) - case $1 in - -L* | -l*) - libsToLink=1 - ;; - -Zomf) - omfLinking=1 - ;; - *) - ;; - esac - EXTRA_CFLAGS=${EXTRA_CFLAGS}" "$1 - ;; - *.dll) - EXTRA_CFLAGS="${EXTRA_CFLAGS} `basnam $1 .dll`" - if [ $omfLinking -eq 1 ]; then - EXTRA_CFLAGS="${EXTRA_CFLAGS}.lib" - else - EXTRA_CFLAGS="${EXTRA_CFLAGS}.a" - fi - ;; - *) - found=0; - if [ $libsToLink -ne 0 ]; then - EXTRA_CFLAGS=${EXTRA_CFLAGS}" "$1 - else - for file in $1 ; do - if [ -f $file ]; then - inputFiles="${inputFiles} $file" - found=1 - fi - done - if [ $found -eq 0 ]; then - echo "ERROR: No file(s) found: "$1 - exit 8 - fi - fi - ;; - esac - shift -done # iterate cmdline words - -# -if [ -z "$inputFiles" ]; then - echo "dllar: no input files" - PrintHelp -fi - -# Now extract all .o files from .a files -newInputFiles="" -for file in $inputFiles ; do - case $file in - *.a | *.lib) - case $file in - *.a) - suffix=".a" - AR="ar" - ;; - *.lib) - suffix=".lib" - AR="emxomfar" - EXTRA_CFLAGS="$EXTRA_CFLAGS -Zomf" - ;; - *) - ;; - esac - dirname=`basnam $file $suffix`"_%" - mkdir $dirname - if [ $? -ne 0 ]; then - echo "Failed to create subdirectory ./$dirname" - CleanUp - exit 8; - fi - # Append '!' to indicate archive - newInputFiles="$newInputFiles ${dirname}!" - doCommand "cd $dirname; $AR x ../$file" - cd $curDir - found=0; - for subfile in $dirname/*.o* ; do - if [ -f $subfile ]; then - found=1 - if [ -s $subfile ]; then - # FIXME: This should be: is file size > 32 byte, _not_ > 0! - newInputFiles="$newInputFiles $subfile" - fi - fi - done - if [ $found -eq 0 ]; then - echo "WARNING: there are no files in archive \'$file\'" - fi - ;; - *) - newInputFiles="${newInputFiles} $file" - ;; - esac -done -inputFiles="$newInputFiles" - -# Output filename(s). -do_backup=0; -if [ -z $outFile ]; then - do_backup=1; - set outFile $inputFiles; outFile=$2 -fi - -# If it is an archive, remove the '!' and the '_%' suffixes -case $outFile in -*_%!) - outFile=`basnam $outFile _%!` - ;; -*) - ;; -esac -case $outFile in -*.dll) - outFile=`basnam $outFile .dll` - ;; -*.DLL) - outFile=`basnam $outFile .DLL` - ;; -*.o) - outFile=`basnam $outFile .o` - ;; -*.obj) - outFile=`basnam $outFile .obj` - ;; -*.a) - outFile=`basnam $outFile .a` - ;; -*.lib) - outFile=`basnam $outFile .lib` - ;; -*) - ;; -esac -case $outimpFile in -*.a) - outimpFile=`basnam $outimpFile .a` - ;; -*.lib) - outimpFile=`basnam $outimpFile .lib` - ;; -*) - ;; -esac -if [ -z $outimpFile ]; then - outimpFile=$outFile -fi -defFile="${outFile}.def" -arcFile="${outimpFile}.a" -arcFile2="${outimpFile}.lib" - -#create $dllFile as something matching 8.3 restrictions, -if [ -z $renameScript ] ; then - dllFile="$outFile" -else - dllFile=`$renameScript $outimpFile` -fi - -if [ $do_backup -ne 0 ] ; then - if [ -f $arcFile ] ; then - doCommand "mv $arcFile ${outFile}_s.a" - fi - if [ -f $arcFile2 ] ; then - doCommand "mv $arcFile2 ${outFile}_s.lib" - fi -fi - -# Extract public symbols from all the object files. -tmpdefFile=${defFile}_% -rm -f $tmpdefFile -for file in $inputFiles ; do - case $file in - *!) - ;; - *) - # we do not want to export weak symbols in general, so we filter - # those out using grep. - doCommand "emxexp -u $file >> $tmpdefFile || true" - ;; - esac -done - -# Create the def file. -rm -f $defFile -echo "LIBRARY `basnam $dllFile` $library_flags" >> $defFile -dllFile="${dllFile}.dll" -if [ ! -z $description ]; then - echo "DESCRIPTION \"${description}\"" >> $defFile -fi -echo "EXPORTS" >> $defFile - -doCommand "cat $tmpdefFile | sort.exe | uniq.exe > ${tmpdefFile}%" -grep -v "^ *;" < ${tmpdefFile}% | grep -v "^ *$" >$tmpdefFile - -# Checks if the export is ok or not. -for word in $exclude_symbols; do - grep -v $word < $tmpdefFile >${tmpdefFile}% - mv ${tmpdefFile}% $tmpdefFile -done - - -if [ $EXPORT_BY_ORDINALS -ne 0 ]; then - sed "=" < $tmpdefFile | \ - sed ' - N - : loop - s/^\([0-9]\+\)\([^;]*\)\(;.*\)\?/\2 @\1 NONAME/ - t loop - ' > ${tmpdefFile}% - grep -v "^ *$" < ${tmpdefFile}% > $tmpdefFile -else - rm -f ${tmpdefFile}% -fi -cat $tmpdefFile >> $defFile -rm -f $tmpdefFile - -# Do linking, create implib, and apply lxlite. -gccCmdl=""; -for file in $inputFiles ; do - case $file in - *!) - ;; - *) - gccCmdl="$gccCmdl $file" - ;; - esac -done -doCommand "$CC $CFLAGS -Zdll -o $dllFile $defFile $gccCmdl $EXTRA_CFLAGS" -touch "${outFile}.dll" - -doCommand "emximp -o $arcFile $defFile" -if [ $flag_USE_LXLITE -ne 0 ]; then - add_flags=""; - if [ $EXPORT_BY_ORDINALS -ne 0 ]; then - add_flags="-ynd" - fi - doCommand "lxlite -cs -t: $add_flags `echo $dllFile | sed 's/\//\\\\/g'`" -fi - -#New version of emxomf do no longer want the "-l" flag -case `emxomf` in -emxomf\ 0.6*) - omflibflag="" - ;; -*) - omflibflag=" -l" - ;; -esac -doCommand "emxomf -s$omflibflag $arcFile" - -# Successful exit. -CleanUp 1 -exit 0 diff --git a/src/os2/dllnames.sh b/src/os2/dllnames.sh deleted file mode 100755 index 443b0da78e..0000000000 --- a/src/os2/dllnames.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# dllnames - a tool to form short DLL names for wxWindows -# -# This script will accept an import library name and create -# a short(er) DLL name from it. - -dllFile="$1" -dirName=`echo $dllFile | sed 's-\(.*[/\\]\)[^/\\]*$-\1-'` -dllFile=`echo $dllFile | sed 's-.*[/\\]\([^/\\]*\)$-\1-'` -case $dllFile in -*wx_base_*) - dllFile=`echo $dllFile | sed 's/base_\(...\)/b\1/'` - ;; -*wx_based_*) - dllFile=`echo $dllFile | sed 's/based_\(...\)/d\1/'` - ;; -*wx_based-*) - dllFile=`echo $dllFile | sed 's/based/basd/'` - ;; -*wx_*d_*) - dllFile=`echo $dllFile | sed 's/_\(.\)[^_]*_\(..\)[^-]*-/\1d\2/'` - ;; -*wx_*_*) - dllFile=`echo $dllFile | sed 's/_\(..\)[^_]*_\(..\)[^-]*-/\1\2/'` - ;; -*) - ;; -esac -dllFile="`echo $dllFile | sed 's/\.//' | sed 's/_//' | sed 's/-//'`" -echo $dirName$dllFile -exit 0 \ No newline at end of file diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp deleted file mode 100644 index b0c64cda48..0000000000 --- a/src/os2/dnd.cpp +++ /dev/null @@ -1,590 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/dnd.cpp -// Purpose: wxDropTarget, wxDropSource, wxDataObject implementation -// Author: David Webster -// Modified by: -// Created: 10/21/99 -// Copyright: (c) 1998 AUTHOR -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_DRAG_AND_DROP - -#include "wx/dnd.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/window.h" - #include "wx/gdicmn.h" -#endif - -#define INCL_PM -#define INCL_DOS -#include - -// ---------------------------------------------------------------------------- -// global -// ---------------------------------------------------------------------------- - -///////////////////////////////////////////////////////////////////////////// -// Private functions -///////////////////////////////////////////////////////////////////////////// - -#if 0 -static wxDragResult ConvertDragEffectToResult ( - DWORD dwEffect -) -{ - switch (dwEffect) - { - case DO_COPY: - return wxDragCopy; - - case DO_LINK: - return wxDragLink; - - case DO_MOVE: - return wxDragMove; - - default: - case DO_DEFAULT: - return wxDragNone; - } -} // end of ConvertDragEffectToResult - -static DWORD ConvertDragResultToEffect ( - wxDragResult eResult -) -{ - switch (eResult) - { - case wxDragCopy: - return DO_COPY; - - case wxDragLink: - return DO_LINK; - - case wxDragMove: - return DO_MOVE; - - default: - case wxDragNone: - return DO_DEFAULT; - } -} // end of ConvertDragResultToEffect -#endif - -class CIDropTarget -{ -public: - CIDropTarget(wxDropTarget* pTarget) - { - m_pTarget = pTarget; - m_pDragItem = NULL; - } - virtual ~CIDropTarget() { } - - // - // Accessors for CDropTarget - // - void Free(void) { ::DrgFreeDraginfo(m_pDragInfo); } - PDRAGINFO GetDataSource(void) { return m_pDragInfo; } - void SetDataSource(PDRAGINFO pDragInfo) { m_pDragInfo = pDragInfo; } - void SetHWND(HWND hWnd) { m_hWnd = hWnd; } - - // - // CIDropTarget methods - // - bool DragLeave(void); - MRESULT DragOver(void); - MRESULT Drop(void); - -protected: - - PDRAGINFO m_pDragInfo; - PDRAGITEM m_pDragItem; // !NULL between DragEnter and DragLeave/Drop - wxDropTarget* m_pTarget; // the real target (we're just a proxy) - HWND m_hWnd; // window we're associated with -}; // end of CLASS CIDropTarget - -bool CIDropTarget::DragLeave() -{ - // - // Remove the UI feedback - // - m_pTarget->OnLeave(); - - // - // Release the held object - // - Free(); - return true; -} // end of CIDropTarget::DragLeave - -MRESULT CIDropTarget::DragOver () -{ - char zBuffer[128]; - ULONG ulBytes; - USHORT uOp = 0; - USHORT uIndicator; - ULONG ulItems; - ULONG i; - - ::DrgAccessDraginfo(m_pDragInfo); - switch(m_pDragInfo->usOperation) - { - case DO_UNKNOWN: - Free(); - return (MRFROM2SHORT(DOR_NODROPOP, 0)); - - case DO_DEFAULT: - m_pDragItem = ::DrgQueryDragitemPtr(m_pDragInfo, 0); - ulBytes = ::DrgQueryStrName( m_pDragItem->hstrContainerName - ,128 - ,zBuffer - ); - if (!ulBytes) - return (MRFROM2SHORT(DOR_NODROPOP, 0)); - else - uOp = DO_MOVE; - break; - - case DO_COPY: - case DO_MOVE: - uOp = m_pDragInfo->usOperation; - break; - } - uIndicator = DOR_DROP; - ulItems = (ULONG)::DrgQueryDragitemCount(m_pDragInfo); - for (i = 0; i < ulItems; i++) - { - m_pDragItem = ::DrgQueryDragitemPtr(m_pDragInfo, i); - if (((m_pDragItem->fsSupportedOps & DO_COPYABLE) && - (uOp == (USHORT)DO_COPY)) || - ((m_pDragItem->fsSupportedOps & DO_MOVEABLE) && - (uOp == (USHORT)DO_COPY))) - { - if (::DrgVerifyRMF(m_pDragItem, "DRM_OS2FILE", "DRF_UNKNOWN")) - uIndicator = (USHORT)DOR_DROP; - else - uIndicator = (USHORT)DOR_NEVERDROP; - } - } - Free(); - return (MRFROM2SHORT(uIndicator, uOp)); -} // end of CIDropTarget::DragOver - -// #pragma page "CIDropTarget::Drop" -///////////////////////////////////////////////////////////////////////////// -// -// CIDropTarget::Drop -// -// Instructs the drop target to paste data that was just now dropped on it. -// -// PARAMETERS -// pIDataSource -- the data to paste -// dwKeyState -- kbd & mouse state -// pt -- mouse coordinates -// pdwEffect -- effect flag -// -// RETURN VALUE -// STDMETHODIMP S_OK -// -///////////////////////////////////////////////////////////////////////////// -MRESULT CIDropTarget::Drop () -{ - char zBuffer[128]; - ULONG ulBytes; - USHORT uOp = 0; - USHORT uIndicator; - ULONG ulItems; - ULONG i; - - ::DrgAccessDraginfo(m_pDragInfo); - switch(m_pDragInfo->usOperation) - { - case DO_UNKNOWN: - Free(); - return (MRFROM2SHORT(DOR_NODROPOP, 0)); - - case DO_DEFAULT: - m_pDragItem = ::DrgQueryDragitemPtr(m_pDragInfo, 0); - ulBytes = ::DrgQueryStrName( m_pDragItem->hstrContainerName - ,128 - ,zBuffer - ); - if (!ulBytes) - return (MRFROM2SHORT(DOR_NODROPOP, 0)); - else - uOp = DO_MOVE; - break; - - case DO_COPY: - case DO_MOVE: - uOp = m_pDragInfo->usOperation; - break; - } - uIndicator = DOR_DROP; - ulItems = (ULONG)::DrgQueryDragitemCount(m_pDragInfo); - for (i = 0; i < ulItems; i++) - { - m_pDragItem = ::DrgQueryDragitemPtr(m_pDragInfo, i); - if (((m_pDragItem->fsSupportedOps & DO_COPYABLE) && - (uOp == (USHORT)DO_COPY)) || - ((m_pDragItem->fsSupportedOps & DO_MOVEABLE) && - (uOp == (USHORT)DO_COPY))) - { - if (::DrgVerifyRMF(m_pDragItem, "DRM_OS2FILE", "DRF_UNKNOWN")) - uIndicator = (USHORT)DOR_DROP; - else - uIndicator = (USHORT)DOR_NEVERDROP; - } - } - - // - // First ask the drop target if it wants data - // - if (m_pTarget->OnDrop( m_pDragInfo->xDrop - ,m_pDragInfo->yDrop - )) - { - wxDragResult eRc = wxDragNone; - - // - // And now it has the data - // - eRc = m_pTarget->OnData( m_pDragInfo->xDrop - ,m_pDragInfo->yDrop - ,eRc - ); - } - //else: OnDrop() returned false, no need to copy data - - // - // Release the held object - // - Free(); - return (MRFROM2SHORT(uIndicator, uOp)); -} // end of CIDropTarget::Drop - -// ---------------------------------------------------------------------------- -// wxDropTarget -// ---------------------------------------------------------------------------- - -wxDropTarget::wxDropTarget ( - wxDataObject* pDataObject -) -{ - m_dataObject = pDataObject; - m_pDropTarget = new CIDropTarget(this); -} // end of wxDropTarget::wxDropTarget - -wxDropTarget::~wxDropTarget() -{ - Release(); -} // end of wxDropTarget::~wxDropTarget - -bool wxDropTarget::GetData () -{ - wxDataFormat vFormat = GetSupportedFormat(m_pDropTarget->GetDataSource()); - - if (vFormat == wxDF_INVALID) - { - return false; - } - // - // Under OS/2 we already have the data via the attached DRAGITEM's - // - return true; -} // end of wxDropTarget::GetData - -wxDataFormat wxDropTarget::GetSupportedFormat ( - PDRAGINFO pDataSource -) const -{ - PDRAGITEM pDragItem; - wxDataFormat vFormat; - wxDataFormat* pFormats; - ULONG ulFormats = m_dataObject->GetFormatCount(wxDataObject::Set); - ULONG ulItems = (ULONG)::DrgQueryDragitemCount(pDataSource); - ULONG i; - ULONG n; - wxString sMechanism; - wxString sFormat; - bool bValid = false; - - pFormats = ulFormats == 1 ? &vFormat : new wxDataFormat[ulFormats]; - m_dataObject->GetAllFormats( pFormats - ,wxDataObject::Set - ); - - for (n = 0; n < ulFormats; n++) - { - switch(pFormats[n].GetType()) - { - case wxDF_TEXT: - case wxDF_FILENAME: - case wxDF_HTML: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_TEXT"); - break; - - case wxDF_OEMTEXT: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_OEMTEXT"); - break; - - case wxDF_BITMAP: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_BITMAP"); - break; - - case wxDF_METAFILE: - case wxDF_ENHMETAFILE: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_METAFILE"); - break; - - case wxDF_TIFF: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_TIFF"); - break; - - case wxDF_SYLK: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_SYLK"); - break; - - case wxDF_DIF: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_DIF"); - break; - - case wxDF_DIB: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_DIB"); - break; - - case wxDF_PALETTE: - case wxDF_PENDATA: - case wxDF_RIFF: - case wxDF_WAVE: - case wxDF_UNICODETEXT: - case wxDF_LOCALE: - sMechanism = wxT("DRM_OS2FILE"); - sFormat = wxT("DRF_UNKNOWN"); - break; - - case wxDF_PRIVATE: - sMechanism = wxT("DRM_OBJECT"); - sFormat = wxT("DRF_UNKNOWN"); - break; - } - for (i = 0; i < ulItems; i++) - { - pDragItem = ::DrgQueryDragitemPtr(pDataSource, i); - if (::DrgVerifyRMF(pDragItem, sMechanism.c_str(), sFormat.c_str())) - { - bValid = true; - break; - } - } - if (bValid) - { - vFormat = pFormats[n]; - break; - } - } - if (pFormats != &vFormat) - { - // - // Free memory if we allocated it - // - delete [] pFormats; - } - return (n < ulFormats ? vFormat : wxFormatInvalid); -} // end of wxDropTarget::GetSupportedFormat - -bool wxDropTarget::IsAcceptedData ( - PDRAGINFO pDataSource -) const -{ - return (GetSupportedFormat(pDataSource) != wxDF_INVALID); -} // end of wxDropTarget::IsAcceptedData - -void wxDropTarget::Release () -{ - m_pDropTarget->Free(); -} // end of wxDropTarget::Release - - -wxDragResult wxDropTarget::OnData ( - wxCoord WXUNUSED(vX) -, wxCoord WXUNUSED(y) -, wxDragResult WXUNUSED(vResult) -) -{ - return (wxDragResult)0; -} // end of wxDropTarget::OnData - -bool wxDropTarget::OnDrop ( - wxCoord WXUNUSED(x) -, wxCoord WXUNUSED(y) -) -{ - return true; -} // end of wxDropTarget::OnDrop - -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -wxDropSource::wxDropSource ( wxWindow* WXUNUSED(pWin) ) -{ - Init(); -} // end of wxDropSource::wxDropSource - -wxDropSource::wxDropSource ( wxDataObject& rData, wxWindow* WXUNUSED(pWin) ) -{ - Init(); - SetData(rData); -} // end of wxDropSource::wxDropSource - -wxDropSource::~wxDropSource () -{ - ::DrgFreeDraginfo(m_pDragInfo); -} // end of wxDropSource::~wxDropSource - -wxDragResult wxDropSource::DoDragDrop ( - int WXUNUSED(flags) -) -{ - // - // Need to specify drag items in derived classes that know their data types - // before calling DoDragDrop - // - if (::DrgDrag( m_pWindow->GetHWND() - ,m_pDragInfo - ,&m_vDragImage - ,m_ulItems - ,VK_BUTTON2 - ,NULL - ) != NULLHANDLE) - { - switch(m_pDragInfo->usOperation) - { - case DO_COPY: - return wxDragCopy; - - case DO_MOVE: - return wxDragCopy; - - case DO_LINK: - return wxDragCopy; - - default: - return wxDragNone; - } - } - return wxDragError; -} // end of wxDropSource::DoDragDrop - -bool wxDropSource::GiveFeedback ( - wxDragResult eEffect -) -{ - const wxCursor& rCursor = GetCursor(eEffect); - - if (rCursor.IsOk()) - { - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)rCursor.GetHCURSOR()); - m_vDragImage.hImage = (LHANDLE)rCursor.GetHCURSOR(); - switch(eEffect) - { - case wxDragCopy: - m_pDragInfo->usOperation = DO_COPY; - break; - - case wxDragMove: - m_pDragInfo->usOperation = DO_MOVE; - break; - - case wxDragLink: - m_pDragInfo->usOperation = DO_LINK; - break; - - case wxDragNone: - case wxDragCancel: - case wxDragError: - break; - } - return true; - } - else - { - return false; - } -} // end of GuiAdvDnd_CDropSource::GiveFeedback - -void wxDropSource::Init () -{ - m_pDragInfo = ::DrgAllocDraginfo(m_ulItems); - - // - // Set a default drag image struct with what we know so far - // - m_vDragImage.cb = sizeof(DRAGIMAGE); - m_vDragImage.cptl = 0; // non-zero if fl is DRG_POLYGON - m_vDragImage.hImage = 0; // Set in GiveFeedback - m_vDragImage.sizlStretch.cx = 20L; - m_vDragImage.sizlStretch.cy = 20L; - m_vDragImage.fl = DRG_ICON | DRG_STRETCH; - m_vDragImage.cxOffset = 0; - m_vDragImage.cyOffset = 0; - - HSTR hStrType = ::DrgAddStrHandle(DRT_UNKNOWN); - HSTR hStrRMF; - HSTR hStrContainer; - wxChar zFormats[128]; - wxChar zContainer[128]; - USHORT uSize = (USHORT)(GetDataObject()->GetDataSize(GetDataObject()->GetPreferredFormat()) + 1); - wxChar* pzBuffer = new wxChar[uSize]; - - memset(pzBuffer, '\0', GetDataObject()->GetDataSize(GetDataObject()->GetPreferredFormat())); - pzBuffer[GetDataObject()->GetDataSize(GetDataObject()->GetPreferredFormat())] = '\0'; - GetDataObject()->GetDataHere( GetDataObject()->GetPreferredFormat() - ,(void*)pzBuffer - ); - - wxStrcpy(zFormats, wxT("")); - wxStrcpy(zContainer, GetDataObject()->GetPreferredFormat().GetId()); - - hStrRMF = ::DrgAddStrHandle((PSZ)zFormats); - hStrContainer = ::DrgAddStrHandle((PSZ)zContainer); - - m_pDragItem = new DRAGITEM[m_ulItems]; - for (ULONG i = 0; i < m_ulItems; i++) - { - m_pDragItem[i].hwndItem = m_pWindow->GetHWND(); - m_pDragItem[i].hstrType = hStrType; - m_pDragItem[i].hstrRMF = hStrRMF; - m_pDragItem[i].hstrContainerName = hStrContainer; - m_pDragItem[i].fsControl = 0; - m_pDragItem[i].fsSupportedOps = DO_COPYABLE | DO_MOVEABLE | DO_LINKABLE; - m_pDragItem[i].hstrSourceName = ::DrgAddStrHandle((PSZ)pzBuffer); - m_pDragItem[i].hstrTargetName = m_pDragItem[i].hstrSourceName; - m_pDragItem[i].ulItemID = i; - ::DrgSetDragitem( m_pDragInfo - ,&m_pDragItem[i] - ,sizeof(DRAGITEM) - ,0 - ); - } - delete [] pzBuffer; - delete [] m_pDragItem; -} // end of wxDropSource::Init - -#endif //wxUSE_DRAG_AND_DROP diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp deleted file mode 100644 index 82e73e0da2..0000000000 --- a/src/os2/evtloop.cpp +++ /dev/null @@ -1,397 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/evtloop.cpp -// Purpose: implements wxGUIEventLoop for PM -// Author: Vadim Zeitlin -// Modified by: -// Created: 01.06.01 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/app.h" - #include "wx/timer.h" - #include "wx/log.h" -#endif //WX_PRECOMP - -#include "wx/evtloop.h" -#include "wx/tooltip.h" -#include "wx/scopedptr.h" - -#include "wx/os2/private.h" -#include "wx/os2/private/timer.h" // for wxTimerProc - -#if wxUSE_THREADS - // define the array of QMSG strutures - WX_DECLARE_OBJARRAY(QMSG, wxMsgArray); - - #include "wx/arrimpl.cpp" - - WX_DEFINE_OBJARRAY(wxMsgArray); -#endif - -extern HAB vHabmain; - -// ---------------------------------------------------------------------------- -// wxEventLoopImpl -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxEventLoopImpl -{ -public: - // ctor - wxEventLoopImpl() { SetExitCode(0); } - - // process a message - void ProcessMessage(QMSG *msg); - - // generate an idle message, return TRUE if more idle time requested - bool SendIdleMessage(); - - // set/get the exit code - void SetExitCode(int exitcode) { m_exitcode = exitcode; } - int GetExitCode() const { return m_exitcode; } - -private: - // preprocess a message, return TRUE if processed (i.e. no further - // dispatching required) - bool PreProcessMessage(QMSG *msg); - - // the exit code of the event loop - int m_exitcode; -}; - -// ---------------------------------------------------------------------------- -// helper class -// ---------------------------------------------------------------------------- - -wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl); - -// ============================================================================ -// wxEventLoopImpl implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxEventLoopImpl message processing -// ---------------------------------------------------------------------------- - -void wxEventLoopImpl::ProcessMessage(QMSG *msg) -{ - // give us the chance to preprocess the message first - if ( !PreProcessMessage(msg) ) - { - // if it wasn't done, dispatch it to the corresponding window - ::WinDispatchMsg(vHabmain, msg); - } -} - -bool wxEventLoopImpl::PreProcessMessage(QMSG *pMsg) -{ - HWND hWnd = pMsg->hwnd; - wxWindow *pWndThis = wxFindWinFromHandle((WXHWND)hWnd); - wxWindow *pWnd; - - // - // Pass non-system timer messages to the wxTimerProc - // - if (pMsg->msg == WM_TIMER && - (SHORT1FROMMP(pMsg->mp1) != TID_CURSOR && - SHORT1FROMMP(pMsg->mp1) != TID_FLASHWINDOW && - SHORT1FROMMP(pMsg->mp1) != TID_SCROLL && - SHORT1FROMMP(pMsg->mp1) != 0x0000 - )) - wxTimerProc(NULL, 0, (int)pMsg->mp1, 0); - - // Allow the window to prevent certain messages from being - // translated/processed (this is currently used by wxTextCtrl to always - // grab Ctrl-C/V/X, even if they are also accelerators in some parent) - // - if (pWndThis && !pWndThis->OS2ShouldPreProcessMessage((WXMSG*)pMsg)) - { - return FALSE; - } - - // - // For some composite controls (like a combobox), wndThis might be NULL - // because the subcontrol is not a wxWindow, but only the control itself - // is - try to catch this case - // - while (hWnd && !pWndThis) - { - hWnd = ::WinQueryWindow(hWnd, QW_PARENT); - pWndThis = wxFindWinFromHandle((WXHWND)hWnd); - } - - - // - // Try translations first; find the youngest window with - // a translation table. OS/2 has case sensiive accels, so - // this block, coded by BK, removes that and helps make them - // case insensitive. - // - if(pMsg->msg == WM_CHAR) - { - PBYTE pChmsg = (PBYTE)&(pMsg->msg); - USHORT uSch = CHARMSG(pChmsg)->chr; - bool bRc = FALSE; - - // - // Do not process keyup events - // - if(!(CHARMSG(pChmsg)->fs & KC_KEYUP)) - { - if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0) - CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)uSch); - - - for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() ) - { - if((bRc = pWnd->OS2TranslateMessage((WXMSG*)pMsg)) == TRUE) - break; - // stop at first top level window, i.e. don't try to process the - // key strokes originating in a dialog using the accelerators of - // the parent frame - this doesn't make much sense - if ( pWnd->IsTopLevel() ) - break; - } - - if(!bRc) // untranslated, should restore original value - CHARMSG(pChmsg)->chr = uSch; - } - } - // - // Anyone for a non-translation message? Try youngest descendants first. - // -// for (pWnd = pWndThis->GetParent(); pWnd; pWnd = pWnd->GetParent()) -// { -// if (pWnd->OS2ProcessMessage(pWxmsg)) -// return TRUE; -// } - return FALSE; -} - -// ---------------------------------------------------------------------------- -// wxEventLoopImpl idle event processing -// ---------------------------------------------------------------------------- - -bool wxEventLoopImpl::SendIdleMessage() -{ - return wxTheApp->ProcessIdle() ; -} - -// ============================================================================ -// wxGUIEventLoop implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxGUIEventLoop running and exiting -// ---------------------------------------------------------------------------- - -wxGUIEventLoop::~wxGUIEventLoop() -{ - wxASSERT_MSG( !m_impl, wxT("should have been deleted in Run()") ); -} - -////////////////////////////////////////////////////////////////////////////// -// -// Keep trying to process messages until WM_QUIT -// received. -// -// If there are messages to be processed, they will all be -// processed and OnIdle will not be called. -// When there are no more messages, OnIdle is called. -// If OnIdle requests more time, -// it will be repeatedly called so long as there are no pending messages. -// A 'feature' of this is that once OnIdle has decided that no more processing -// is required, then it won't get processing time until further messages -// are processed (it'll sit in Dispatch). -// -////////////////////////////////////////////////////////////////////////////// -class CallEventLoopMethod -{ -public: - typedef void (wxGUIEventLoop::*FuncType)(); - - CallEventLoopMethod(wxGUIEventLoop *evtLoop, FuncType fn) - : m_evtLoop(evtLoop), m_fn(fn) { } - ~CallEventLoopMethod() { (m_evtLoop->*m_fn)(); } - -private: - wxGUIEventLoop *m_evtLoop; - FuncType m_fn; -}; - -int wxGUIEventLoop::Run() -{ - // event loops are not recursive, you need to create another loop! - wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") ); - - // SendIdleMessage() and Dispatch() below may throw so the code here should - // be exception-safe, hence we must use local objects for all actions we - // should undo - wxEventLoopActivator activate(this); - wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl); - - CallEventLoopMethod callOnExit(this, &wxGUIEventLoop::OnExit); - - for ( ;; ) - { -#if wxUSE_THREADS - wxMutexGuiLeaveOrEnter(); -#endif // wxUSE_THREADS - - // generate and process idle events for as long as we don't have - // anything else to do - while ( !Pending() && m_impl->SendIdleMessage() ) - { - wxTheApp->HandleSockets(); - wxMilliSleep(10); - } - - wxTheApp->HandleSockets(); - if (Pending()) - { - if ( !Dispatch() ) - { - // we got WM_QUIT - break; - } - } - else - wxMilliSleep(10); - } - - OnExit(); - - return m_impl->GetExitCode(); -} - -void wxGUIEventLoop::Exit(int rc) -{ - wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") ); - - m_impl->SetExitCode(rc); - - ::WinPostMsg(NULL, WM_QUIT, 0, 0); -} - -// ---------------------------------------------------------------------------- -// wxGUIEventLoop message processing dispatching -// ---------------------------------------------------------------------------- - -bool wxGUIEventLoop::Pending() const -{ - QMSG msg; - return ::WinPeekMsg(vHabmain, &msg, 0, 0, 0, PM_NOREMOVE) != 0; -} - -bool wxGUIEventLoop::Dispatch() -{ - wxCHECK_MSG( IsRunning(), false, wxT("can't call Dispatch() if not running") ); - - QMSG msg; - BOOL bRc = ::WinGetMsg(vHabmain, &msg, (HWND) NULL, 0, 0); - - if ( bRc == 0 ) - { - // got WM_QUIT - return false; - } - -#if wxUSE_THREADS - wxASSERT_MSG( wxThread::IsMain(), - wxT("only the main thread can process Windows messages") ); - - static bool s_hadGuiLock = true; - static wxMsgArray s_aSavedMessages; - - // if a secondary thread owning the mutex is doing GUI calls, save all - // messages for later processing - we can't process them right now because - // it will lead to recursive library calls (and we're not reentrant) - if ( !wxGuiOwnedByMainThread() ) - { - s_hadGuiLock = false; - - // leave out WM_COMMAND messages: too dangerous, sometimes - // the message will be processed twice - if ( !wxIsWaitingForThread() || msg.msg != WM_COMMAND ) - { - s_aSavedMessages.Add(msg); - } - - return true; - } - else - { - // have we just regained the GUI lock? if so, post all of the saved - // messages - // - // FIXME of course, it's not _exactly_ the same as processing the - // messages normally - expect some things to break... - if ( !s_hadGuiLock ) - { - s_hadGuiLock = true; - - size_t count = s_aSavedMessages.Count(); - for ( size_t n = 0; n < count; n++ ) - { - QMSG& msg = s_aSavedMessages[n]; - m_impl->ProcessMessage(&msg); - } - - s_aSavedMessages.Empty(); - } - } -#endif // wxUSE_THREADS - - m_impl->ProcessMessage(&msg); - - return true; -} - -// -// Yield to incoming messages -// -void wxGUIEventLoop::DoYieldFor(long eventsToProcess) -{ - HAB vHab = 0; - QMSG vMsg; - - // - // We want to go back to the main message loop - // if we see a WM_QUIT. (?) - // - while (::WinPeekMsg(vHab, &vMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && vMsg.msg != WM_QUIT) - { - // TODO: implement event filtering using the eventsToProcess mask - -#if wxUSE_THREADS - wxMutexGuiLeaveOrEnter(); -#endif // wxUSE_THREADS - if (!wxTheApp->Dispatch()) - break; - } - - wxEventLoopBase::DoYieldFor(eventsToProcess); - - if (eventsToProcess == wxEVT_CATEGORY_ALL && wxTheApp) - { - wxTheApp->HandleSockets(); - } -} // end of wxYield diff --git a/src/os2/file.lst b/src/os2/file.lst deleted file mode 100644 index 8f2f489186..0000000000 --- a/src/os2/file.lst +++ /dev/null @@ -1,39 +0,0 @@ -List of files yet to be implemented. As you finish a file, delete it from the list. - - ..\os2\$D\dcprint.obj \ - ..\os2\$D\dnd.obj \ - ..\os2\$D\helpwin.obj \ - ..\os2\$D\joystick.obj \ - ..\os2\$D\metafile.obj \ - ..\os2\$D\print.obj \ - ..\os2\$D\taskbar.obj \ - ..\os2\$D\wave.obj \ - - -List of things that still need doing, include the above files. Some are more difficult than others. - -DND is a needed component of the tree control. - -The tree control is a component of the list and dirctrl's. These are, in turn, components of the dirdlgg. - -DDE isn't used much anymore as an IPC protocol, but if OS/2 needs DDE, it should be straight forward. - -Printing is an untouched area, but should not be too difficult to finish. - -Not sure what good a taskbar control is but the other ports have one. - -The wave file is for OS/2 to be able to simply play back a .wav file. I have not touched -multimedia as of yet. - -There is a problem with TIFF right now for some reason. - -The color sliders in the color dialog do not seem to display correctly. - -Dialogs are generally not resizable, but in wxOS2, resizing a dialog leaves the title bar un-resized. - -Static bitmap controls need some work as they are non-wx standard, requiring a resource. Probably need -a "roll-our-own" control that is a simple window with an icon or bitmap drawn directly in it. - - - - diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp deleted file mode 100644 index a23b8981f8..0000000000 --- a/src/os2/filedlg.cpp +++ /dev/null @@ -1,327 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/filedlg.cpp -// Purpose: wxFileDialog -// Author: David Webster -// Modified by: -// Created: 10/05/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_FILEDLG - -#include "wx/filedlg.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/msgdlg.h" - #include "wx/filename.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/app.h" - #include "wx/math.h" -#endif - -#define INCL_PM -#include - -#include "wx/os2/private.h" - -#include -#include - -#include "wx/tokenzr.h" -#include "wx/modalhook.h" - -#define wxMAXPATH 1024 -#define wxMAXFILE 1024 -#define wxMAXEXT 5 - -#ifndef MAXPATH -# define MAXPATH 400 -#endif - -#ifndef MAXDRIVE -# define MAXDRIVE 3 -#endif - -#ifndef MAXFILE -# define MAXFILE 9 -#endif - -#ifndef MAXEXT -# define MAXEXT 5 -#endif - -IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) - -// ---------------------------------------------------------------------------- -// CLASS wxFileDialog -// ---------------------------------------------------------------------------- - -wxFileDialog::wxFileDialog ( - wxWindow* pParent -, const wxString& rsMessage -, const wxString& rsDefaultDir -, const wxString& rsDefaultFileName -, const wxString& rsWildCard -, long lStyle -, const wxPoint& rPos, - const wxSize& sz, - const wxString& name -) - :wxFileDialogBase(pParent, rsMessage, rsDefaultDir, rsDefaultFileName, rsWildCard, lStyle, rPos, sz, name) - -{ - // NB: all style checks are done by wxFileDialogBase::Create - - m_filterIndex = 1; -} // end of wxFileDialog::wxFileDialog - -void wxFileDialog::GetPaths ( - wxArrayString& rasPaths -) const -{ - wxString sDir(m_dir); - size_t nCount = m_fileNames.GetCount(); - - rasPaths.Empty(); - if (m_dir.Last() != wxT('\\')) - sDir += wxT('\\'); - - for ( size_t n = 0; n < nCount; n++ ) - { - rasPaths.Add(sDir + m_fileNames[n]); - } -} // end of wxFileDialog::GetPaths - -int wxFileDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - wxString sTheFilter; - wxString sFilterBuffer; - wxChar* pzFilterBuffer; - static wxChar zFileNameBuffer[wxMAXPATH]; // the file-name - HWND hWnd = 0; - wxChar zTitleBuffer[wxMAXFILE + 1 + wxMAXEXT]; // the file-name, without path - wxString sDir; - size_t i; - size_t nLen = m_dir.length(); - int nCount = 0; - FILEDLG vFileDlg; - ULONG lFlags = 0L; - - memset(&vFileDlg, '\0', sizeof(FILEDLG)); - if (m_parent) - hWnd = (HWND) m_parent->GetHWND(); - if (!hWnd && wxTheApp->GetTopWindow()) - hWnd = (HWND) wxTheApp->GetTopWindow()->GetHWND(); - - - *zFileNameBuffer = wxT('\0'); - *zTitleBuffer = wxT('\0'); - - if (m_windowStyle & wxFD_SAVE) - lFlags = FDS_SAVEAS_DIALOG; - else - lFlags = FDS_OPEN_DIALOG; - - if (m_windowStyle & wxFD_SAVE) - lFlags |= FDS_SAVEAS_DIALOG; - if (m_windowStyle & wxFD_MULTIPLE) - lFlags |= FDS_OPEN_DIALOG | FDS_MULTIPLESEL; - - vFileDlg.cbSize = sizeof(FILEDLG); - vFileDlg.fl = lFlags; - vFileDlg.pszTitle = (PSZ)zTitleBuffer; - - // - // Convert forward slashes to backslashes (file selector doesn't like - // forward slashes) and also squeeze multiple consecutive slashes into one - // as it doesn't like two backslashes in a row neither - // - sDir.reserve(nLen); - for ( i = 0; i < nLen; i++ ) - { - wxChar ch = m_dir[i]; - - switch (ch) - { - case wxT('/'): - // - // Convert to backslash - // - ch = wxT('\\'); - - // - // Fall through - // - case wxT('\\'): - while (i < nLen - 1) - { - wxChar chNext = m_dir[i + 1]; - - if (chNext != wxT('\\') && chNext != wxT('/')) - break; - - // - // Ignore the next one, unless it is at the start of a UNC path - // - if (i > 0) - i++; - else - break; - } - - // - // Fall through - // - - default: - // - // Normal char - sDir += ch; - } - } - if ( wxStrlen(m_wildCard) == 0 ) - sTheFilter = wxEmptyString; - else - sTheFilter = m_wildCard; - - wxStrtok(sTheFilter.wchar_str(), wxT("|"), &pzFilterBuffer); - while(pzFilterBuffer != NULL) - { - if (nCount > 0 && !(nCount % 2)) - sDir += wxT(";"); - if (nCount % 2) - { - sDir += pzFilterBuffer; - } - wxStrtok(NULL, wxT("|"), &pzFilterBuffer); - nCount++; - } - if (nCount == 0) - sDir += m_fileName; - if (sDir.empty()) - sDir = wxT("*.*"); - wxStrcpy((wxChar*)vFileDlg.szFullFile, sDir); - sFilterBuffer = sDir; - - hWnd = ::WinFileDlg( HWND_DESKTOP - ,GetHwndOf(m_parent) - ,&vFileDlg - ); - if (hWnd && vFileDlg.lReturn == DID_OK) - { - m_fileNames.Empty(); - if ((m_windowStyle & wxFD_MULTIPLE ) && vFileDlg.ulFQFCount > 1) - { - for (int i = 0; i < (int)vFileDlg.ulFQFCount; i++) - { - if (i == 0) - { - m_dir = wxPathOnly(wxString((const wxChar*)*vFileDlg.papszFQFilename[0])); - m_path = (const wxChar*)*vFileDlg.papszFQFilename[0]; - } - m_fileName = wxFileNameFromPath(wxString((const wxChar*)*vFileDlg.papszFQFilename[i])); - m_fileNames.Add(m_fileName); - } - ::WinFreeFileDlgList(vFileDlg.papszFQFilename); - } - else if (!(m_windowStyle & wxFD_SAVE)) - { - m_path = (wxChar*)vFileDlg.szFullFile; - m_fileName = wxFileNameFromPath(wxString((const wxChar*)vFileDlg.szFullFile)); - m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile); - } - else // save file - { - const wxChar* pzExtension = NULL; - - wxStrcpy(zFileNameBuffer, (const wxChar*)vFileDlg.szFullFile); - - int nIdx = wxStrlen(zFileNameBuffer) - 1; - wxString sExt; - - wxFileName::SplitPath( zFileNameBuffer - ,&m_path - ,&m_fileName - ,&sExt - ); - if (zFileNameBuffer[nIdx] == wxT('.') || sExt.empty()) - { - zFileNameBuffer[nIdx] = wxT('\0'); - - // - // User has typed a filename without an extension: - // - // A filename can end in a "." here ("abc."), this means it - // does not have an extension. Because later on a "." with - // the default extension is appended we remove the "." if - // filename ends with one (We don't want files called - // "abc..ext") - // - pzExtension = sFilterBuffer.c_str(); - - for( int i = 0; i < (int)sFilterBuffer.length(); i++ ) - { - // - // Get extension - // - pzExtension = wxStrrchr(pzExtension, wxT('.')); - if ( pzExtension && - !wxStrrchr(pzExtension, wxT('*')) && - !wxStrrchr(pzExtension, wxT('?')) && - pzExtension[1] && - pzExtension[1] != wxT(' ') - ) // != "blabla. " - { - // - // Now concat extension to the fileName: - // - m_path = wxString(zFileNameBuffer) + pzExtension; - } - } - } - else - { - m_path = (wxChar*)vFileDlg.szFullFile; - } - m_fileName = wxFileNameFromPath((const wxChar*)vFileDlg.szFullFile); - m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile); - - // - // === Simulating the wxFD_OVERWRITE_PROMPT >>============================ - // - if ((m_windowStyle & wxFD_OVERWRITE_PROMPT) && - (m_windowStyle & wxFD_SAVE) && - (wxFileExists(m_path.c_str()))) - { - wxString sMessageText; - - sMessageText.Printf( _("File '%s' already exists.\nDo you want to replace it?") - ,m_path.c_str() - ); - if (wxMessageBox( sMessageText - ,wxT("Save File As") - ,wxYES_NO | wxICON_EXCLAMATION - ) != wxYES) - { - return wxID_CANCEL; - } - } - } - return wxID_OK; - } - return wxID_CANCEL; -} // end of wxFileDialog::ShowModal - -#endif // wxUSE_FILEDLG diff --git a/src/os2/font.cpp b/src/os2/font.cpp deleted file mode 100644 index 7cbe615bbb..0000000000 --- a/src/os2/font.cpp +++ /dev/null @@ -1,1145 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/font.cpp -// Purpose: wxFont class -// Author: David Webster -// Modified by: -// Created: 10/06/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/font.h" - -#ifndef WX_PRECOMP - #include - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/log.h" -#endif // WX_PRECOMP - -#include "wx/os2/private.h" - -#include "wx/fontutil.h" -#include "wx/fontmap.h" -#include "wx/encinfo.h" - -#include "wx/tokenzr.h" - -#include - -// ---------------------------------------------------------------------------- -// wxFontRefData - the internal description of the font -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxFontRefData: public wxGDIRefData -{ -public: - wxFontRefData() - { - Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, - wxEmptyString, wxFONTENCODING_DEFAULT); - } - - wxFontRefData( int nSize - ,wxFontFamily nFamily - ,wxFontStyle nStyle - ,wxFontWeight nWeight - ,bool bUnderlined - ,const wxString& sFaceName - ,wxFontEncoding vEncoding - ) - { - Init( nSize - ,nFamily - ,nStyle - ,nWeight - ,bUnderlined - ,sFaceName - ,vEncoding - ); - } - - wxFontRefData( const wxNativeFontInfo& rInfo - ,WXHFONT hFont = 0 - ,WXHANDLE hPS = 0 - ) - { - Init( rInfo - ,hFont - ,hPS - ); - } - - wxFontRefData(const wxFontRefData& rData) - { - Init( rData.m_nPointSize - ,rData.m_nFamily - ,rData.m_nStyle - ,rData.m_nWeight - ,rData.m_bUnderlined - ,rData.m_sFaceName - ,rData.m_vEncoding - ); - m_nFontId = rData.m_nFontId; - } - - virtual ~wxFontRefData(); - - // - // Operations - // - bool Alloc(wxFont* pFont); - void Free(void); - - // - // All wxFont accessors - // - inline int GetPointSize(void) const - { - // - // We don't use the actual native font point size since it is - // the chosen physical font, which is usually only and approximation - // of the desired outline font. The actual displayable point size - // is the one stored in the refData - // - return m_nPointSize; - } - - inline wxFontFamily GetFamily(void) const - { - return m_nFamily; - } - - inline wxFontStyle GetStyle(void) const - { - return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle() - : m_nStyle; - } - - inline wxFontWeight GetWeight(void) const - { - return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight() - : m_nWeight; - } - - inline bool GetUnderlined(void) const - { - return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetUnderlined() - : m_bUnderlined; - } - - inline wxString GetFaceName(void) const - { - wxString sFaceName; - - if (m_bNativeFontInfoOk) - sFaceName = m_vNativeFontInfo.GetFaceName(); - else - sFaceName = m_sFaceName; - - return sFaceName; - } - - inline wxFontEncoding GetEncoding(void) const - { - return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetEncoding() - : m_vEncoding; - } - - inline WXHFONT GetHFONT(void) const { return m_hFont; } - inline HPS GetPS(void) const { return m_hPS; } - inline PFONTMETRICS GetFM(void) const { return m_pFM; } - inline int GetNumFonts(void) const { return m_nNumFonts; } - - // ... and setters - inline void SetPointSize(int nPointSize) - { - if (m_bNativeFontInfoOk) - m_vNativeFontInfo.SetPointSize(nPointSize); - else - m_nPointSize = nPointSize; - } - - inline void SetFamily(wxFontFamily nFamily) - { - m_nFamily = nFamily; - } - - inline void SetStyle(wxFontStyle nStyle) - { - if (m_bNativeFontInfoOk) - m_vNativeFontInfo.SetStyle(nStyle); - else - m_nStyle = nStyle; - } - - inline void SetWeight(wxFontWeight nWeight) - { - if (m_bNativeFontInfoOk) - m_vNativeFontInfo.SetWeight(nWeight); - else - m_nWeight = nWeight; - } - - inline bool SetFaceName(const wxString& sFaceName) - { - if (m_bNativeFontInfoOk) - return m_vNativeFontInfo.SetFaceName(sFaceName); - else - m_sFaceName = sFaceName; - return true; - } - - inline void SetUnderlined(bool bUnderlined) - { - if (m_bNativeFontInfoOk) - m_vNativeFontInfo.SetUnderlined(bUnderlined); - else - m_bUnderlined = bUnderlined; - } - - inline void SetEncoding(wxFontEncoding vEncoding) - { - if (m_bNativeFontInfoOk) - m_vNativeFontInfo.SetEncoding(vEncoding); - else - m_vEncoding = vEncoding; - } - - inline void SetPS(HPS hPS) - { - m_hPS = hPS; - } - - inline void SetFM(PFONTMETRICS pFM) - { - m_pFM = pFM; - } - - inline void SetNumFonts(int nNumFonts) - { - m_nNumFonts = nNumFonts; - } - - // - // Native font info tests - // - bool HasNativeFontInfo() const { return m_bNativeFontInfoOk; } - - const wxNativeFontInfo& GetNativeFontInfo() const - { return m_vNativeFontInfo; } - -protected: - // - // Common part of all ctors - // - void Init( int nSize - ,wxFontFamily nFamily - ,wxFontStyle nStyle - ,wxFontWeight nWeight - ,bool bUnderlined - ,const wxString& rsFaceName - ,wxFontEncoding vEncoding - ); - - void Init( const wxNativeFontInfo& rInfo - ,WXHFONT hFont = 0 - ,WXHANDLE hPS = 0 - ); - // - // If true, the pointer to the actual font is temporary and SHOULD NOT BE - // DELETED by destructor - // - bool m_bTemporary; - int m_nFontId; - - // - // Font characterstics - // - int m_nPointSize; - wxFontFamily m_nFamily; - wxFontStyle m_nStyle; - wxFontWeight m_nWeight; - bool m_bUnderlined; - wxString m_sFaceName; - wxFontEncoding m_vEncoding; - WXHFONT m_hFont; - - // - // Native font info - // - wxNativeFontInfo m_vNativeFontInfo; - bool m_bNativeFontInfoOk; - - // - // Some PM specific stuff - // - PFONTMETRICS m_pFM; // array of FONTMETRICS structs - int m_nNumFonts; // number of fonts in array - HPS m_hPS; // PS handle this font belongs to - FATTRS m_vFattrs; // Current fattrs struct - FACENAMEDESC m_vFname; // Current facename struct - bool m_bInternalPS; // Internally generated PS? -}; // end of CLASS wxFontRefData - -#define M_FONTDATA ((wxFontRefData*)m_refData) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFontRefData -// ---------------------------------------------------------------------------- - -void wxFontRefData::Init( - int nPointSize -, wxFontFamily nFamily -, wxFontStyle nStyle -, wxFontWeight nWeight -, bool bUnderlined -, const wxString& rsFaceName -, wxFontEncoding vEncoding -) -{ - m_nStyle = nStyle; - m_nPointSize = nPointSize; - m_nFamily = nFamily; - m_nStyle = nStyle; - m_nWeight = nWeight; - m_bUnderlined = bUnderlined; - m_sFaceName = rsFaceName; - m_vEncoding = vEncoding; - m_hFont = 0; - - m_bNativeFontInfoOk = false; - - m_nFontId = 0; - m_bTemporary = false; - m_pFM = (PFONTMETRICS)NULL; - m_hPS = NULLHANDLE; - m_nNumFonts = 0; -} // end of wxFontRefData::Init - -void wxFontRefData::Init( - const wxNativeFontInfo& rInfo -, WXHFONT hFont //this is the FontId -- functions as the hFont for OS/2 -, WXHANDLE hPS // Presentation Space we are using -) -{ - // - // hFont may be zero, or it be passed in case we really want to - // use the exact font created in the underlying system - // (for example where we can't guarantee conversion from HFONT - // to LOGFONT back to HFONT) - // - m_hFont = hFont; - m_nFontId = (int)hFont; - - m_bNativeFontInfoOk = true; - m_vNativeFontInfo = rInfo; - - if (hPS == NULLHANDLE) - { - m_hPS = ::WinGetPS(HWND_DESKTOP); - m_bInternalPS = true; - } - else - m_hPS = (HPS)hPS; - - m_nFontId = 0; - m_bTemporary = false; - m_pFM = (PFONTMETRICS)NULL; - m_nNumFonts = 0; -} // end of wxFontRefData::Init - -wxFontRefData::~wxFontRefData() -{ - Free(); -} - -bool wxFontRefData::Alloc( wxFont* pFont ) -{ - wxString sFaceName; - long flId = m_hFont; - long lRc; - ERRORID vError; - wxString sError; - - if (!m_bNativeFontInfoOk) - { - wxFillLogFont( &m_vNativeFontInfo.fa - ,&m_vNativeFontInfo.fn - ,&m_hPS - ,&m_bInternalPS - ,&flId - ,sFaceName - ,pFont - ); - m_bNativeFontInfoOk = true; - } - else - { - if (flId == 0L) - flId = 1L; - else - flId++; - if (flId > 254) - flId = 1L; - } - if((lRc = ::GpiCreateLogFont( m_hPS - ,NULL - ,flId - ,&m_vNativeFontInfo.fa - )) != GPI_ERROR) - { - m_hFont = (WXHFONT)flId; - m_nFontId = flId; - } - if (!m_hFont) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogLastError(wxT("CreateFont")); - } - - ::GpiSetCharSet(m_hPS, flId); // sets font for presentation space - ::GpiQueryFontMetrics(m_hPS, sizeof(FONTMETRICS), &m_vNativeFontInfo.fm); - - // - // Set refData members with the results - // - memcpy(&m_vFattrs, &m_vNativeFontInfo.fa, sizeof(m_vFattrs)); - memcpy(&m_vFname, &m_vNativeFontInfo.fn, sizeof(m_vFname)); - // - // Going to leave the point size alone. Mostly we use outline fonts - // that can be set to any point size inside of Presentation Parameters, - // regardless of whether or not the actual font is registered in the system. - // The GpiCreateLogFont will do enough by selecting the right family, - // and face name. - // - if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0) - m_nFamily = wxFONTFAMILY_ROMAN; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0) - m_nFamily = wxFONTFAMILY_ROMAN; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0) - m_nFamily = wxFONTFAMILY_ROMAN; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0) - m_nFamily = wxFONTFAMILY_ROMAN; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0) - m_nFamily = wxFONTFAMILY_DECORATIVE; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0) - m_nFamily = wxFONTFAMILY_SWISS; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0) - m_nFamily = wxFONTFAMILY_SWISS; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0) - m_nFamily = wxFONTFAMILY_SCRIPT; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0) - m_nFamily = wxFONTFAMILY_TELETYPE; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0) - m_nFamily = wxFONTFAMILY_TELETYPE; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0) - m_nFamily = wxFONTFAMILY_TELETYPE; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0) - m_nFamily = wxFONTFAMILY_MODERN; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0) - m_nFamily = wxFONTFAMILY_MODERN; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0) - m_nFamily = wxFONTFAMILY_SWISS; - else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0) - m_nFamily = wxFONTFAMILY_SWISS; - else - m_nFamily = wxFONTFAMILY_SWISS; - - if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC) - m_nStyle = wxFONTSTYLE_ITALIC; - else - m_nStyle = wxFONTSTYLE_NORMAL; - switch(m_vNativeFontInfo.fn.usWeightClass) - { - case FWEIGHT_DONT_CARE: - m_nWeight = wxFONTWEIGHT_NORMAL; - break; - - case FWEIGHT_NORMAL: - m_nWeight = wxFONTWEIGHT_NORMAL; - break; - - case FWEIGHT_LIGHT: - m_nWeight = wxFONTWEIGHT_LIGHT; - break; - - case FWEIGHT_BOLD: - m_nWeight = wxFONTWEIGHT_BOLD; - break; - - case FWEIGHT_ULTRA_BOLD: - m_nWeight = wxFONTWEIGHT_MAX; - break; - - default: - m_nWeight = wxFONTWEIGHT_NORMAL; - } - m_bUnderlined = ((m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0); - m_sFaceName = (wxChar*)m_vNativeFontInfo.fa.szFacename; - m_vEncoding = wxGetFontEncFromCharSet(m_vNativeFontInfo.fa.usCodePage); - - // - // We don't actuall keep the font around if using a temporary PS - // - if (m_bInternalPS) - { - if(m_hFont) - ::GpiDeleteSetId( m_hPS - ,flId - ); - - ::WinReleasePS(m_hPS); - } - else - // - // Select the font into the Presentation space - // - ::GpiSetCharSet(m_hPS, flId); // sets font for presentation space - return true; -} // end of wxFontRefData::Alloc - -void wxFontRefData::Free() -{ - if (m_pFM) - delete [] m_pFM; - m_pFM = (PFONTMETRICS)NULL; - - if ( m_hFont ) - { - ::GpiDeleteSetId(m_hPS, 1L); /* delete the logical font */ - m_nFontId = 0; - m_hFont = 0; - } - if (m_bInternalPS) - ::WinReleasePS(m_hPS); - m_hPS = NULLHANDLE; -} // end of wxFontRefData::Free - -// ---------------------------------------------------------------------------- -// wxNativeFontInfo -// ---------------------------------------------------------------------------- - -void wxNativeFontInfo::Init() -{ - memset(&fa, '\0', sizeof(FATTRS)); -} // end of wxNativeFontInfo::Init - -int wxNativeFontInfo::GetPointSize() const -{ - return fm.lEmHeight; -} // end of wxNativeFontInfo::GetPointSize - -wxFontStyle wxNativeFontInfo::GetStyle() const -{ - return fa.fsSelection & FATTR_SEL_ITALIC ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL; -} // end of wxNativeFontInfo::GetStyle - -wxFontWeight wxNativeFontInfo::GetWeight() const -{ - switch(fn.usWeightClass) - { - case FWEIGHT_DONT_CARE: - return wxFONTWEIGHT_NORMAL; - - case FWEIGHT_NORMAL: - return wxFONTWEIGHT_NORMAL; - - case FWEIGHT_LIGHT: - return wxFONTWEIGHT_LIGHT; - - case FWEIGHT_BOLD: - return wxFONTWEIGHT_BOLD; - - case FWEIGHT_ULTRA_BOLD: - return wxFONTWEIGHT_MAX; - } - return wxFONTWEIGHT_NORMAL; -} // end of wxNativeFontInfo::GetWeight - -bool wxNativeFontInfo::GetUnderlined() const -{ - return ((fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0); -} // end of wxNativeFontInfo::GetUnderlined - -wxString wxNativeFontInfo::GetFaceName() const -{ - return (wxChar*)fm.szFacename; -} // end of wxNativeFontInfo::GetFaceName - -wxFontFamily wxNativeFontInfo::GetFamily() const -{ - int nFamily; - - // - // Extract family from facename - // - if (strcmp(fm.szFamilyname, "Times New Roman") == 0) - nFamily = wxFONTFAMILY_ROMAN; - else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0) - nFamily = wxFONTFAMILY_ROMAN; - else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0) - nFamily = wxFONTFAMILY_ROMAN; - else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0) - nFamily = wxFONTFAMILY_ROMAN; - else if (strcmp(fm.szFamilyname, "WarpSans") == 0) - nFamily = wxFONTFAMILY_DECORATIVE; - else if (strcmp(fm.szFamilyname, "Helvetica") == 0) - nFamily = wxFONTFAMILY_SWISS; - else if (strcmp(fm.szFamilyname, "Helv") == 0) - nFamily = wxFONTFAMILY_SWISS; - else if (strcmp(fm.szFamilyname, "Script") == 0) - nFamily = wxFONTFAMILY_SCRIPT; - else if (strcmp(fm.szFamilyname, "Courier New") == 0) - nFamily = wxFONTFAMILY_TELETYPE; - else if (strcmp(fm.szFamilyname, "Courier") == 0) - nFamily = wxFONTFAMILY_TELETYPE; - else if (strcmp(fm.szFamilyname, "System Monospaced") == 0) - nFamily = wxFONTFAMILY_TELETYPE; - else if (strcmp(fm.szFamilyname, "System VIO") == 0) - nFamily = wxFONTFAMILY_MODERN; - else if (strcmp(fm.szFamilyname, "System Proportional") == 0) - nFamily = wxFONTFAMILY_MODERN; - else if (strcmp(fm.szFamilyname, "Arial") == 0) - nFamily = wxFONTFAMILY_SWISS; - else if (strcmp(fm.szFamilyname, "Swiss") == 0) - nFamily = wxFONTFAMILY_SWISS; - else - nFamily = wxFONTFAMILY_SWISS; - return (wxFontFamily)nFamily; -} // end of wxNativeFontInfo::GetFamily - -wxFontEncoding wxNativeFontInfo::GetEncoding() const -{ - return wxGetFontEncFromCharSet(fa.usCodePage); -} // end of wxNativeFontInfo::GetEncoding - -void wxNativeFontInfo::SetPointSize( - int nPointsize -) -{ - fm.lEmHeight = (LONG)nPointsize; -} // end of wxNativeFontInfo::SetPointSize - -void wxNativeFontInfo::SetStyle( - wxFontStyle eStyle -) -{ - switch (eStyle) - { - default: - wxFAIL_MSG( wxT("unknown font style") ); - // fall through - - case wxFONTSTYLE_NORMAL: - break; - - case wxFONTSTYLE_ITALIC: - case wxFONTSTYLE_SLANT: - fa.fsSelection |= FATTR_SEL_ITALIC; - break; - } -} // end of wxNativeFontInfo::SetStyle - -void wxNativeFontInfo::SetWeight( - wxFontWeight eWeight -) -{ - switch (eWeight) - { - default: - wxFAIL_MSG( wxT("unknown font weight") ); - // fall through - - case wxFONTWEIGHT_NORMAL: - fn.usWeightClass = FWEIGHT_NORMAL; - break; - - case wxFONTWEIGHT_LIGHT: - fn.usWeightClass = FWEIGHT_LIGHT; - break; - - case wxFONTWEIGHT_BOLD: - fn.usWeightClass = FWEIGHT_BOLD; - break; - } -} // end of wxNativeFontInfo::SetWeight - -void wxNativeFontInfo::SetUnderlined( - bool bUnderlined -) -{ - if(bUnderlined) - fa.fsSelection |= FATTR_SEL_UNDERSCORE; -} // end of wxNativeFontInfo::SetUnderlined - -bool wxNativeFontInfo::SetFaceName( - const wxString& sFacename -) -{ - wxStrlcpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename)); - return true; -} // end of wxNativeFontInfo::SetFaceName - -void wxNativeFontInfo::SetFamily( - wxFontFamily eFamily -) -{ - wxString sFacename; - - switch (eFamily) - { - case wxFONTFAMILY_SCRIPT: - sFacename = wxT("Tms Rmn"); - break; - - case wxFONTFAMILY_DECORATIVE: - sFacename = wxT("WarpSans"); - break; - - case wxFONTFAMILY_ROMAN: - sFacename = wxT("Tms Rmn"); - break; - - case wxFONTFAMILY_TELETYPE: - sFacename = wxT("Courier") ; - break; - - case wxFONTFAMILY_MODERN: - sFacename = wxT("System VIO") ; - break; - - case wxFONTFAMILY_SWISS: - sFacename = wxT("Helv") ; - break; - - case wxFONTFAMILY_DEFAULT: - default: - sFacename = wxT("System VIO") ; - } - - if (!wxStrlen((wxChar*)fa.szFacename) ) - { - SetFaceName(sFacename); - } -} // end of wxNativeFontInfo::SetFamily - -void wxNativeFontInfo::SetEncoding( wxFontEncoding eEncoding ) -{ - wxNativeEncodingInfo vInfo; - - if ( !wxGetNativeFontEncoding( eEncoding - ,&vInfo - )) - { - if (wxFontMapper::Get()->GetAltForEncoding( eEncoding - ,&vInfo - )) - { - if (!vInfo.facename.empty()) - { - // - // If we have this encoding only in some particular facename, use - // the facename - it is better to show the correct characters in a - // wrong facename than unreadable text in a correct one - // - SetFaceName(vInfo.facename); - } - } - else - { - // unsupported encoding, replace with the default - vInfo.charset = 850; - } - } - fa.usCodePage = (USHORT)vInfo.charset; -} // end of wxNativeFontInfo::SetFaceName - -bool wxNativeFontInfo::FromString( const wxString& rsStr ) -{ - long lVal; - - wxStringTokenizer vTokenizer(rsStr, wxT(";")); - - // - // First the version - // - wxString sToken = vTokenizer.GetNextToken(); - - if (sToken != wxT('0')) - return false; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fm.lEmHeight = lVal; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fa.lAveCharWidth = lVal; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fa.fsSelection = (USHORT)lVal; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fa.fsType = (USHORT)lVal; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fa.fsFontUse = (USHORT)lVal; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fa.idRegistry = (USHORT)lVal; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fa.usCodePage = (USHORT)lVal; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fa.lMatch = lVal; - - sToken = vTokenizer.GetNextToken(); - if (!sToken.ToLong(&lVal)) - return false; - fn.usWeightClass = (USHORT)lVal; - - sToken = vTokenizer.GetNextToken(); - if(!sToken) - return false; - wxStrcpy((wxChar*)fa.szFacename, sToken.c_str()); - return true; -} // end of wxNativeFontInfo::FromString - -wxString wxNativeFontInfo::ToString() const -{ - wxString sStr; - - sStr.Printf(wxT("%d;%ld;%ld;%ld;%d;%d;%d;%d;%d;%ld;%d;%s"), - 0, // version, in case we want to change the format later - fm.lEmHeight, - fa.lAveCharWidth, - fa.lMaxBaselineExt, - fa.fsSelection, - fa.fsType, - fa.fsFontUse, - fa.idRegistry, - fa.usCodePage, - fa.lMatch, - fn.usWeightClass, - (char *)fa.szFacename); - return sStr; -} // end of wxNativeFontInfo::ToString - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -bool wxFont::Create( const wxNativeFontInfo& rInfo, - WXHFONT hFont ) -{ - UnRef(); - m_refData = new wxFontRefData( rInfo - ,hFont - ); - RealizeResource(); - return true; -} // end of wxFont::Create - -wxFont::wxFont( - const wxString& rsFontdesc -) -{ - wxNativeFontInfo vInfo; - - if (vInfo.FromString(rsFontdesc)) - (void)Create(vInfo); -} // end of wxFont::wxFont - -// ---------------------------------------------------------------------------- -// Constructor for a font. Note that the real construction is done -// in wxDC::SetFont, when information is available about scaling etc. -// ---------------------------------------------------------------------------- -bool wxFont::Create( int nPointSize, - wxFontFamily nFamily, - wxFontStyle nStyle, - wxFontWeight nWeight, - bool bUnderlined, - const wxString& rsFaceName, - wxFontEncoding vEncoding ) -{ - UnRef(); - - // - // wxDEFAULT is a valid value for the font size too so we must treat it - // specially here (otherwise the size would be 70 == wxDEFAULT value) - // - if (nPointSize == wxDEFAULT) - { - nPointSize = wxNORMAL_FONT->GetPointSize(); - } - m_refData = new wxFontRefData( nPointSize - ,nFamily - ,nStyle - ,nWeight - ,bUnderlined - ,rsFaceName - ,vEncoding - ); - RealizeResource(); - return true; -} // end of wxFont::Create - -wxFont::~wxFont() -{ -} // end of wxFont::~wxFont - -// ---------------------------------------------------------------------------- -// real implementation -// Boris' Kovalenko comments: -// Because OS/2 fonts are associated with PS we cannot create the font -// here, but we may check that font definition is true -// ---------------------------------------------------------------------------- - -wxGDIRefData *wxFont::CreateGDIRefData() const -{ - return new wxFontRefData(); -} - -wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxFontRefData(*static_cast(data)); -} - -bool wxFont::RealizeResource() -{ - if ( GetResourceHandle() ) - { - return true; - } - return M_FONTDATA->Alloc(this); -} // end of wxFont::RealizeResource - -bool wxFont::FreeResource( bool WXUNUSED(bForce) ) -{ - if (GetResourceHandle()) - { - M_FONTDATA->Free(); - return true; - } - return false; -} // end of wxFont::FreeResource - -WXHANDLE wxFont::GetResourceHandle() const -{ - return GetHFONT(); -} // end of wxFont::GetResourceHandle - -WXHFONT wxFont::GetHFONT() const -{ - return M_FONTDATA ? M_FONTDATA->GetHFONT() : 0; -} // end of wxFont::GetHFONT - -bool wxFont::IsFree() const -{ - return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0); -} // end of wxFont::IsFree - -// ---------------------------------------------------------------------------- -// change font attribute: we recreate font when doing it -// ---------------------------------------------------------------------------- - -void wxFont::SetPointSize( - int nPointSize -) -{ - AllocExclusive(); - - M_FONTDATA->SetPointSize(nPointSize); - - RealizeResource(); -} // end of wxFont::SetPointSize - -void wxFont::SetFamily( - wxFontFamily nFamily -) -{ - AllocExclusive(); - - M_FONTDATA->SetFamily(nFamily); - - RealizeResource(); -} // end of wxFont::SetFamily - -void wxFont::SetStyle( - wxFontStyle nStyle -) -{ - AllocExclusive(); - - M_FONTDATA->SetStyle(nStyle); - - RealizeResource(); -} // end of wxFont::SetStyle - -void wxFont::SetWeight( - wxFontWeight nWeight -) -{ - AllocExclusive(); - - M_FONTDATA->SetWeight(nWeight); - - RealizeResource(); -} // end of wxFont::SetWeight - -bool wxFont::SetFaceName( - const wxString& rsFaceName -) -{ - AllocExclusive(); - - bool refdataok = M_FONTDATA->SetFaceName(rsFaceName); - - RealizeResource(); - - return refdataok && wxFontBase::SetFaceName(rsFaceName); -} // end of wxFont::SetFaceName - -void wxFont::SetUnderlined( - bool bUnderlined -) -{ - AllocExclusive(); - - M_FONTDATA->SetUnderlined(bUnderlined); - - RealizeResource(); -} // end of wxFont::SetUnderlined - -void wxFont::SetEncoding( - wxFontEncoding vEncoding -) -{ - AllocExclusive(); - - M_FONTDATA->SetEncoding(vEncoding); - - RealizeResource(); -} // end of wxFont::SetEncoding - -void wxFont::DoSetNativeFontInfo( - const wxNativeFontInfo& rInfo -) -{ - AllocExclusive(); - - FreeResource(); - - *M_FONTDATA = wxFontRefData(rInfo); - - RealizeResource(); -} - -// ---------------------------------------------------------------------------- -// accessors -// ---------------------------------------------------------------------------- - -int wxFont::GetPointSize() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); - - return M_FONTDATA->GetPointSize(); -} // end of wxFont::GetPointSize - -wxFontFamily wxFont::DoGetFamily() const -{ - return M_FONTDATA->GetFamily(); -} // end of wxFont::DoGetFamily - -wxFontStyle wxFont::GetStyle() const -{ - wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); - - return M_FONTDATA->GetStyle(); -} // end of wxFont::GetStyle - -wxFontWeight wxFont::GetWeight() const -{ - wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); - - return M_FONTDATA->GetWeight(); -} - -bool wxFont::GetUnderlined() const -{ - wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - - return M_FONTDATA->GetUnderlined(); -} // end of wxFont::GetUnderlined - -wxString wxFont::GetFaceName() const -{ - wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - - return M_FONTDATA->GetFaceName(); -} // end of wxFont::GetFaceName - -wxFontEncoding wxFont::GetEncoding() const -{ - wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); - - return M_FONTDATA->GetEncoding(); -} // end of wxFont::GetEncoding - -const wxNativeFontInfo* wxFont::GetNativeFontInfo() const -{ - return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo()) - : NULL; -} // end of wxFont::GetNativeFontInfo - -// -// Internal use only method to set the FONTMETRICS array -// -void wxFont::SetFM( PFONTMETRICS pFM, int nNumFonts ) -{ - M_FONTDATA->SetFM(pFM); - M_FONTDATA->SetNumFonts(nNumFonts); -} // end of wxFont::SetFM - - -void wxFont::SetPS( HPS hPS ) -{ - AllocExclusive(); - - M_FONTDATA->SetPS(hPS); - - RealizeResource(); -} // end of wxFont::SetPS diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp deleted file mode 100644 index fc1c4d8b27..0000000000 --- a/src/os2/fontdlg.cpp +++ /dev/null @@ -1,101 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/fontdlg.cpp -// Purpose: wxFontDialog class. NOTE: you can use the generic class -// if you wish, instead of implementing this. -// Author: David Webster -// Modified by: -// Created: 10/06/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/fontdlg.h" - -#ifndef WX_PRECOMP - #include - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/math.h" -#endif - -#include "wx/fontutil.h" -#include "wx/modalhook.h" - -#define INCL_PM -#include - -#include "wx/os2/private.h" - -#include -#include - -IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) - -int wxFontDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - FONTDLG vFontDlg; - char zCurrentFont[FACESIZE]; - HWND hWndFontDlg; - FACENAMEDESC vFn; - - memset(&vFontDlg, '\0', sizeof(FONTDLG)); - zCurrentFont[0] = '\0'; - - // - // Set the fontdlg fields - // - vFontDlg.cbSize = sizeof(FONTDLG); - vFontDlg.hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - vFontDlg.hpsPrinter = NULL; - vFontDlg.pszFamilyname = zCurrentFont; - vFontDlg.fxPointSize = MAKEFIXED(12,0); - vFontDlg.usFamilyBufLen = FACESIZE; - vFontDlg.fl = FNTS_CENTER; - vFontDlg.clrFore = CLR_BLACK; - vFontDlg.clrBack = CLR_WHITE; - - hWndFontDlg = WinFontDlg( HWND_DESKTOP - ,GetParent()->GetHWND() - ,&vFontDlg - ); - if (hWndFontDlg && vFontDlg.lReturn == DID_OK) - { - wxColour vColour((unsigned long)0x00000000); - wxNativeFontInfo vInfo; - - m_fontData.m_fontColour = vColour; - - memset(&vFn, '\0', sizeof(FACENAMEDESC)); - vFn.usSize = sizeof(FACENAMEDESC); - vFn.usWeightClass = vFontDlg.usWeight; - vFn.usWidthClass = vFontDlg.usWidth; - - memset(&vInfo.fa, '\0', sizeof(FATTRS)); - memcpy(&vInfo.fn, &vFn, sizeof(FACENAMEDESC)); - - vInfo.fa.usRecordLength = vFontDlg.fAttrs.usRecordLength; - strcpy(vInfo.fa.szFacename, vFontDlg.fAttrs.szFacename); - vInfo.fa.lMatch = vFontDlg.fAttrs.lMatch; - - // - // Debugging - // - wxFont vChosenFont(vInfo); - - int nPointSize = vFontDlg.fxPointSize >> 16; - - vChosenFont.SetPointSize(nPointSize); - m_fontData.m_chosenFont = vChosenFont; - - m_fontData.EncodingInfo().facename = (wxChar*)vFontDlg.fAttrs.szFacename; - m_fontData.EncodingInfo().charset = vFontDlg.fAttrs.usCodePage; - - return wxID_OK; - } - return wxID_CANCEL; -} // end of wxFontDialg::ShowModal diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp deleted file mode 100644 index c67015163a..0000000000 --- a/src/os2/fontenum.cpp +++ /dev/null @@ -1,218 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/fontenum.cpp -// Purpose: wxFontEnumerator class for Windows -// Author: Julian Smart -// Modified by: David Webster to add support for font encodings -// Created: 01/03/00 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_FONTMAP - -#include "wx/fontenum.h" - -#ifndef WX_PRECOMP - #include "wx/font.h" -#endif - -#include "wx/fontmap.h" -#include "wx/encinfo.h" - -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -class wxFontEnumeratorHelper -{ -public: - wxFontEnumeratorHelper(wxFontEnumerator *fontEnum); - - // control what exactly are we enumerating - bool SetEncoding(wxFontEncoding encoding); - void SetFixedOnly(bool fixedOnly) - { m_fixedOnly = fixedOnly; } - - // call to start enumeration - void DoEnumerate(); - - // called by our font enumeration proc - bool OnFont(/*const LPLOGFONT lf, const LPTEXTMETRIC tm*/) const; - -private: - // the object we forward calls to OnFont() to - wxFontEnumerator *m_fontEnum; - - // if != -1, enum only fonts which have this encoding - int m_charset; - - // if not empty, enum only the fonts with this facename - wxString m_facename; - - // if true, enum only fixed fonts - bool m_fixedOnly; -}; - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// TODO: -/* -int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm, - DWORD dwStyle, LONG lParam); -*/ - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxFontEnumeratorHelper -// ---------------------------------------------------------------------------- - -wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum) -{ - m_fontEnum = fontEnum; - m_charset = -1; - m_fixedOnly = FALSE; -} - -bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) -{ - wxNativeEncodingInfo info; - if ( !wxGetNativeFontEncoding(encoding, &info) ) - { - if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) ) - { - // no such encodings at all - return FALSE; - } - } - m_charset = info.charset; - m_facename = info.facename; - - return true; -} - -#define wxFONTENUMPROC FONTENUMPROC - -void wxFontEnumeratorHelper::DoEnumerate() -{ - // TODO: - /* - HDC hDC = ::GetDC(NULL); - -#ifdef __WIN32__ - LOGFONT lf; - lf.lfCharSet = m_charset; - wxStrlcpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName)); - lf.lfPitchAndFamily = 0; - ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc, - (LPARAM)this, 0) ; -#else // Win16 - ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc, - #ifdef STRICT - (LPARAM) - #else - (LPSTR) - #endif - this); -#endif // Win32/16 - - ::ReleaseDC(NULL, hDC); - */ -} - -bool wxFontEnumeratorHelper::OnFont(/*const LPLOGFONT lf, - const LPTEXTMETRIC tm */) const -{ - // TODO: - /* - if ( m_fixedOnly ) - { - // check that it's a fixed pitch font (there is *no* error here, the - // flag name is misleading!) - if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH ) - { - // not a fixed pitch font - return true; - } - } - - if ( m_charset != -1 ) - { - // check that we have the right encoding - if ( lf->lfCharSet != m_charset ) - { - return true; - } - } - - return m_fontEnum->OnFacename(lf->lfFaceName); - */ - return true; -} - -// ---------------------------------------------------------------------------- -// wxFontEnumerator -// ---------------------------------------------------------------------------- - -bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, - bool fixedWidthOnly) -{ - wxFontEnumeratorHelper fe(this); - if ( fe.SetEncoding(encoding) ) - { - fe.SetFixedOnly(fixedWidthOnly); - - fe.DoEnumerate(); - } - // else: no such fonts, unknown encoding - - return true; -} - -bool wxFontEnumerator::EnumerateEncodings(const wxString& WXUNUSED(family)) -{ - wxFAIL_MSG(wxT("TODO")); - - return true; -} - -// ---------------------------------------------------------------------------- -// Windows callbacks -// ---------------------------------------------------------------------------- - -// TODO: -/* -int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm, - DWORD dwStyle, LONG lParam) -{ - // Get rid of any fonts that we don't want... - if ( dwStyle != TRUETYPE_FONTTYPE ) - { - // continue enumeration - return TRUE; - } - - wxFontEnumeratorHelper *fontEnum = (wxFontEnumeratorHelper *)lParam; - - return fontEnum->OnFont(lplf, lptm); -} -*/ - -#endif // wxUSE_FONTMAP diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp deleted file mode 100644 index 135ecc7511..0000000000 --- a/src/os2/fontutil.cpp +++ /dev/null @@ -1,704 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/msw/fontutil.cpp -// Purpose: font-related helper functions for wxMSW -// Author: Modified by David Webster for OS/2 -// Modified by: -// Created: 01.03.00 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#define DEBUG_PRINTF(NAME) \ - { \ - static int raz=0; \ - printf( #NAME " %i\n",raz); fflush(stdout); \ - raz++; \ - } - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/string.h" - #include "wx/log.h" - #include "wx/intl.h" -#endif //WX_PRECOMP - -#include "wx/os2/private.h" - -#include "wx/fontutil.h" -#include "wx/fontmap.h" -#include "wx/encinfo.h" - -#include "wx/tokenzr.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxNativeEncodingInfo -// ---------------------------------------------------------------------------- - -// convert to/from the string representation: format is -// encodingid;facename[;charset] - -bool wxNativeEncodingInfo::FromString( const wxString& rsStr ) -{ - wxStringTokenizer vTokenizer(rsStr, wxT(";")); - wxString sEncid = vTokenizer.GetNextToken(); - long lEnc; - - if (!sEncid.ToLong(&lEnc)) - return FALSE; - encoding = (wxFontEncoding)lEnc; - facename = vTokenizer.GetNextToken(); - if (!facename) - return FALSE; - - wxString sTmp = vTokenizer.GetNextToken(); - - if (!sTmp) - { - charset = 850; - } - else - { - if ( wxSscanf(sTmp, wxT("%u"), &charset) != 1 ) - { - // should be a number! - return FALSE; - } - } - return true; -} // end of wxNativeEncodingInfo::FromString - -wxString wxNativeEncodingInfo::ToString() const -{ - wxString sStr; - - sStr << (long)encoding << wxT(';') << facename; - - if (charset != 850) - { - sStr << wxT(';') << charset; - } - return sStr; -} // end of wxNativeEncodingInfo::ToString - -// ---------------------------------------------------------------------------- -// helper functions -// ---------------------------------------------------------------------------- - -bool wxGetNativeFontEncoding( wxFontEncoding vEncoding, - wxNativeEncodingInfo* pInfo ) -{ - wxCHECK_MSG(pInfo, FALSE, wxT("bad pointer in wxGetNativeFontEncoding") ); - if (vEncoding == wxFONTENCODING_DEFAULT) - { - vEncoding = wxFont::GetDefaultEncoding(); - } - switch (vEncoding) - { - case wxFONTENCODING_ISO8859_1: - case wxFONTENCODING_ISO8859_15: - case wxFONTENCODING_CP1250: - pInfo->charset = 1250; - break; - - case wxFONTENCODING_ISO8859_2: - case wxFONTENCODING_CP1252: - pInfo->charset = 1252; - break; - - case wxFONTENCODING_ISO8859_4: - case wxFONTENCODING_ISO8859_10: - pInfo->charset = 921; // what is baltic? - break; - - case wxFONTENCODING_ISO8859_5: - case wxFONTENCODING_CP1251: - pInfo->charset = 1251; - break; - - case wxFONTENCODING_ISO8859_6: - pInfo->charset = 864; - break; - - case wxFONTENCODING_ISO8859_7: - pInfo->charset = 869; - break; - - case wxFONTENCODING_ISO8859_8: - pInfo->charset = 862; - break; - - case wxFONTENCODING_ISO8859_9: - pInfo->charset = 857; - break; - - case wxFONTENCODING_ISO8859_11: - pInfo->charset = 874; // what is thai - break; - - case wxFONTENCODING_CP437: - pInfo->charset = 437; - break; - - default: - wxFAIL_MSG(wxT("unsupported encoding")); - // fall through - - case wxFONTENCODING_SYSTEM: - pInfo->charset = 850; - break; - } - return true; -} // end of wxGetNativeFontEncoding - -wxFontEncoding wxGetFontEncFromCharSet( - int nCharSet -) -{ - wxFontEncoding eFontEncoding; - - switch (nCharSet) - { - default: - case 1250: - eFontEncoding = wxFONTENCODING_CP1250; - break; - - case 1252: - eFontEncoding = wxFONTENCODING_CP1252; - break; - - case 921: - eFontEncoding = wxFONTENCODING_ISO8859_4; - break; - - case 1251: - eFontEncoding = wxFONTENCODING_CP1251; - break; - - case 864: - eFontEncoding = wxFONTENCODING_ISO8859_6; - break; - - case 869: - eFontEncoding = wxFONTENCODING_ISO8859_7; - break; - - case 862: - eFontEncoding = wxFONTENCODING_ISO8859_8; - break; - - case 857: - eFontEncoding = wxFONTENCODING_ISO8859_9; - break; - - case 874: - eFontEncoding = wxFONTENCODING_ISO8859_11; - break; - - case 437: - eFontEncoding = wxFONTENCODING_CP437; - break; - } - return eFontEncoding; -} // end of wxGetNativeFontEncoding - -bool wxTestFontEncoding( const wxNativeEncodingInfo& rInfo ) -{ - FATTRS vLogFont; - HPS hPS; - - hPS = ::WinGetPS(HWND_DESKTOP); - - memset(&vLogFont, '\0', sizeof(FATTRS)); // all default values - vLogFont.usRecordLength = sizeof(FATTRS); - vLogFont.usCodePage = (USHORT)rInfo.charset; - vLogFont.lMaxBaselineExt = 0L; // Outline fonts should use 0 - vLogFont.lAveCharWidth = 0L; // Outline fonts should use 0 - vLogFont.fsFontUse = FATTR_FONTUSE_OUTLINE | // only outline fonts allowed - FATTR_FONTUSE_TRANSFORMABLE; // may be transformed - - wxStrlcpy((wxChar*)vLogFont.szFacename, rInfo.facename.c_str(), WXSIZEOF(vLogFont.szFacename)); - - if (!::GpiCreateLogFont( hPS - ,NULL - ,1L - ,&vLogFont - )) - { - ::WinReleasePS(hPS); - return FALSE; - } - ::WinReleasePS(hPS); - return true; -} // end of wxTestFontEncoding - -// ---------------------------------------------------------------------------- -// wxFont <-> LOGFONT conversion -// ---------------------------------------------------------------------------- - -void wxConvertVectorFontSize( - FIXED fxPointSize -, PFATTRS pFattrs -) -{ - HPS hPS; - HDC hDC; - LONG lXFontResolution; - LONG lYFontResolution; - SIZEF vSizef; - - hPS = WinGetScreenPS(HWND_DESKTOP); // Screen presentation space - - // - // Query device context for the screen and then query - // the resolution of the device for the device context. - // - - hDC = GpiQueryDevice(hPS); - DevQueryCaps( hDC, CAPS_HORIZONTAL_FONT_RES, (LONG)1, &lXFontResolution); - DevQueryCaps( hDC, CAPS_VERTICAL_FONT_RES, (LONG)1, &lYFontResolution); - - // - // Calculate the size of the character box, based on the - // point size selected and the resolution of the device. - // The size parameters are of type FIXED, NOT int. - // NOTE: 1 point == 1/72 of an inch. - // - - // multiply first to avoid getting vSizef.cx,cy = 0 since fxPointSize - // is normally < 72 and FontResolution is typically ca. 100 - vSizef.cx = (FIXED)( (fxPointSize * lXFontResolution) / 72 ); - vSizef.cy = (FIXED)( (fxPointSize * lYFontResolution) / 72 ); - - if (pFattrs) - { - pFattrs->lMaxBaselineExt = MAKELONG( HIUSHORT( vSizef.cy ), 0 ); - pFattrs->lAveCharWidth = MAKELONG( HIUSHORT( vSizef.cx ), 0 ); - } - WinReleasePS(hPS); - -} // end of wxConvertVectorPointSize - -void wxFillLogFont( LOGFONT* pFattrs, // OS2 GPI FATTRS - PFACENAMEDESC pFaceName, - HPS* phPS, - bool* pbInternalPS, - long* pflId, - wxString& sFaceName, - wxFont* pFont ) -{ - LONG lNumFonts = 0L; // For system font count - ERRORID vError; // For logging API errors - LONG lTemp = 0L; - bool bInternalPS = false; // if we have to create one - PFONTMETRICS pFM = NULL; - - // - // Initial house cleaning to free data buffers and ensure we have a - // functional PS to work with - // - if (!*phPS) - { - *phPS = ::WinGetPS(HWND_DESKTOP); - bInternalPS = true; - } - - // - // Determine the number of fonts. - // - if((lNumFonts = ::GpiQueryFonts( *phPS - ,QF_PUBLIC | QF_PRIVATE - ,NULL - ,&lTemp - ,(LONG) sizeof(FONTMETRICS) - ,NULL - )) < 0L) - { - ERRORID vError; - wxString sError; - - vError = ::WinGetLastError(wxGetInstance()); - sError = wxPMErrorToStr(vError); - return; - } - - // - // Allocate space for the font metrics. - // - pFM = new FONTMETRICS[lNumFonts + 1]; - - // - // Retrieve the font metrics. - // - lTemp = lNumFonts; - lTemp = ::GpiQueryFonts( *phPS - ,QF_PUBLIC - ,NULL - ,&lTemp - ,(LONG) sizeof(FONTMETRICS) - ,pFM - ); - pFont->SetFM( pFM - ,(int)lNumFonts - ); - - // - // Initialize FATTR and FACENAMEDESC - // - pFattrs->usRecordLength = sizeof(FATTRS); - pFattrs->fsFontUse = FATTR_FONTUSE_OUTLINE; // only outline fonts allowed - pFattrs->fsType = 0; - pFattrs->lMaxBaselineExt = pFattrs->lAveCharWidth = 0; - pFattrs->idRegistry = 0; - pFattrs->lMatch = 0; - - pFaceName->usSize = sizeof(FACENAMEDESC); - pFaceName->usWeightClass = FWEIGHT_DONT_CARE; - pFaceName->usWidthClass = FWIDTH_DONT_CARE; - pFaceName->usReserved = 0; - pFaceName->flOptions = 0; - - // - // This does the actual selection of fonts - // - wxOS2SelectMatchingFontByName( pFattrs - ,pFaceName - ,pFM - ,(int)lNumFonts - ,pFont - ); - // - // We should now have the correct FATTRS set with the selected - // font, so now we need to generate an ID - // - long lNumLids = ::GpiQueryNumberSetIds(*phPS); - - if(lNumLids ) - { - long alTypes[255]; - STR8 azNames[255]; - long alIds[255]; - - memset(alIds, 0, sizeof(long) * 255); - if(!::GpiQuerySetIds( *phPS - ,lNumLids - ,alTypes - ,azNames - ,alIds - )) - { - if (bInternalPS) - ::WinReleasePS(*phPS); - return; - } - if (*pflId == 0L) - *pflId = 1L; - for(unsigned long LCNum = 0; LCNum < (unsigned long)lNumLids; LCNum++) - if(alIds[LCNum] == *pflId) - ++*pflId; - if(*pflId > 254) // wow, no id available! - { - if (bInternalPS) - ::WinReleasePS(*phPS); - return; - } - } - else - *pflId = 1L; - // - // Release and delete the current font - // - ::GpiSetCharSet(*phPS, LCID_DEFAULT);/* release the font before deleting */ - ::GpiDeleteSetId(*phPS, 1L); /* delete the logical font */ - - // - // Now build a facestring - // - char zFacename[128]; - - strcpy(zFacename, pFattrs->szFacename); - - if(::GpiQueryFaceString( *phPS - ,zFacename - ,pFaceName - ,FACESIZE - ,pFattrs->szFacename - ) == GPI_ERROR) - { - vError = ::WinGetLastError(vHabmain); - } - sFaceName = (wxChar*)zFacename; - *pbInternalPS = bInternalPS; - - // - // That's it, we now have everything we need to actually create the font - // -} // end of wxFillLogFont - -void wxOS2SelectMatchingFontByName( - PFATTRS pFattrs -, PFACENAMEDESC pFaceName -, PFONTMETRICS pFM -, int nNumFonts -, const wxFont* pFont -) -{ - int i; - int nPointSize; - int nIs; - int nMinDiff0; - int anDiff[16]; - int anMinDiff[16]; - int nIndex = 0; - wxChar zFontFaceName[FACESIZE]; - wxString sFaceName; - USHORT usWeightClass; - int fsSelection = 0; - - nMinDiff0 = 0xf000; - for(i = 0;i < 16; i++) - anMinDiff[i] = nMinDiff0; - - switch (pFont->GetFamily()) - { - case wxSCRIPT: - sFaceName = wxT("Tms Rmn"); - break; - - case wxDECORATIVE: - sFaceName = wxT("WarpSans"); - break; - - case wxROMAN: - sFaceName = wxT("Tms Rmn"); - break; - - case wxTELETYPE: - sFaceName = wxT("Courier") ; - break; - - case wxMODERN: - sFaceName = wxT("System VIO") ; - break; - - case wxSWISS: - sFaceName = wxT("Helv") ; - break; - - case wxDEFAULT: - default: - sFaceName = wxT("System VIO") ; - } - - switch (pFont->GetWeight()) - { - default: - wxFAIL_MSG(wxT("unknown font weight")); - // fall through - usWeightClass = FWEIGHT_DONT_CARE; - break; - - case wxNORMAL: - usWeightClass = FWEIGHT_NORMAL; - break; - - case wxLIGHT: - usWeightClass = FWEIGHT_LIGHT; - break; - - case wxBOLD: - usWeightClass = FWEIGHT_BOLD; - break; - - case wxFONTWEIGHT_MAX: - usWeightClass = FWEIGHT_ULTRA_BOLD; - break; - } - pFaceName->usWeightClass = usWeightClass; - - switch (pFont->GetStyle()) - { - case wxITALIC: - case wxSLANT: - fsSelection = FM_SEL_ITALIC; - pFaceName->flOptions = FTYPE_ITALIC; - break; - - default: - wxFAIL_MSG(wxT("unknown font slant")); - // fall through - - case wxNORMAL: - fsSelection = 0; - break; - } - - wxStrlcpy(zFontFaceName, sFaceName.c_str(), WXSIZEOF(zFontFaceName)); - nPointSize = pFont->GetPointSize(); - - // - // Matching logic to find the right FM struct - // - nIndex = 0; - for(i = 0, nIs = 0; i < nNumFonts; i++) - { - anDiff[0] = wxGpiStrcmp((wxChar*)pFM[i].szFacename, zFontFaceName); - anDiff[1] = abs(pFM[i].lEmHeight - nPointSize); - anDiff[2] = abs(pFM[i].usWeightClass - usWeightClass); - anDiff[3] = abs((pFM[i].fsSelection & 0x2f) - fsSelection); - if(anDiff[0] == 0) - { - if( (nIs & 0x01) == 0) - { - nIs = 1; - nIndex = i; - anMinDiff[1] = anDiff[1]; - anMinDiff[2] = anDiff[2]; - anMinDiff[3] = anDiff[3]; - } - else if(anDiff[3] < anMinDiff[3]) - { - nIndex = i; - anMinDiff[3] = anDiff[3]; - } - else if(anDiff[2] < anMinDiff[2]) - { - nIndex = i; - anMinDiff[2] = anDiff[2]; - } - else if(anDiff[1] < anMinDiff[1]) - { - nIndex = i; - anMinDiff[1] = anDiff[1]; - } - anMinDiff[0] = 0; - } - else if(anDiff[0] < anMinDiff[0]) - { - nIs = 2; - nIndex = i; - anMinDiff[3] = anDiff[3]; - anMinDiff[2] = anDiff[2]; - anMinDiff[1] = anDiff[1]; - anMinDiff[0] = anDiff[0]; - } - else if(anDiff[0] == anMinDiff[0]) - { - if(anDiff[3] < anMinDiff[3]) - { - nIndex = i; - anMinDiff[3] = anDiff[3]; - nIs = 2; - } - else if(anDiff[2] < anMinDiff[2]) - { - nIndex = i; - anMinDiff[2] = anDiff[2]; - nIs = 2; - } - else if(anDiff[1] < anMinDiff[1]) - { - nIndex = i; - anMinDiff[1] = anDiff[1]; - nIs = 2; - } - } - } - - // - // Fill in the FATTRS with the best match from FONTMETRICS - // - pFattrs->usRecordLength = sizeof(FATTRS); // Sets size of structure - pFattrs->lMatch = pFM[nIndex].lMatch; // Force match - pFattrs->idRegistry = 0; - pFattrs->usCodePage = 0; - pFattrs->fsFontUse = 0; - pFattrs->fsType = 0; - pFattrs->lMaxBaselineExt = 0; - pFattrs->lAveCharWidth = 0; - wxStrcpy((wxChar*)pFattrs->szFacename, (wxChar*)pFM[nIndex].szFacename); - if (pFont->GetWeight() == wxNORMAL) - pFattrs->fsSelection = 0; - else - pFattrs->fsSelection = FATTR_SEL_BOLD; - - if (pFont->GetStyle() == wxITALIC || pFont->GetStyle() == wxSLANT) - pFattrs->fsSelection |= FATTR_SEL_ITALIC; - - if (pFont->GetUnderlined()) - pFattrs->fsSelection |= FATTR_SEL_UNDERSCORE; -} // end of wxOS2SelectMatchingFontByName - -wxFont wxCreateFontFromLogFont( - const LOGFONT* pLogFont -, const PFONTMETRICS pFM -, PFACENAMEDESC pFaceName -) -{ - wxNativeFontInfo vInfo; - - vInfo.fa = *pLogFont; - vInfo.fm = *pFM; - vInfo.fn = *pFaceName; - return wxFont(vInfo); -} // end of wxCreateFontFromLogFont - -int wxGpiStrcmp( - wxChar* s0 -, wxChar* s1 -) -{ int l0; - int l1; - int l; - int d; - int d1; - int i; - int rc; - - rc = 0; - if(s0 == NULL) - { - if(s1 == NULL) - return 0; - else - return 32; - } - else if(s1 == NULL) - return 32; - - l0 = wxStrlen(s0); - l1 = wxStrlen(s1); - l = l0; - if(l0 != l1) - { - rc++; - if(l1 < l0) - l = l1; - } - for(i=0;iGetHWND() - ,HWND_TOP - ,0 - ,0 - ,0 - ,0 - ,SWP_ZORDER - ); -} - -#if wxUSE_STATUSBAR -wxStatusBar* wxFrame::OnCreateStatusBar( - int nNumber -, long lulStyle -, wxWindowID vId -, const wxString& rName -) -{ - wxStatusBar* pStatusBar = NULL; - wxString sError; - - pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber - ,lulStyle - ,vId - ,rName - ); - - if( !pStatusBar ) - return NULL; - - wxClientDC vDC(pStatusBar); - int nY; - - // - // Set the height according to the font and the border size - // - vDC.SetFont(pStatusBar->GetFont()); // Screws up the menues for some reason - vDC.GetTextExtent( wxT("X") - ,NULL - ,&nY - ); - - int nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY()); - - pStatusBar->SetSize( wxDefaultCoord - ,wxDefaultCoord - ,wxDefaultCoord - ,nHeight - ); - - ::WinSetParent( pStatusBar->GetHWND(), m_hFrame, FALSE ); - ::WinSetOwner( pStatusBar->GetHWND(), m_hFrame); - // - // to show statusbar - // - if(::WinIsWindowShowing(m_hFrame)) - ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); - - return pStatusBar; -} // end of wxFrame::OnCreateStatusBar - -void wxFrame::PositionStatusBar() -{ - SWP vSwp; - ERRORID vError; - wxString sError; - - // - // Native status bar positions itself - // - if (m_frameStatusBar) - { - int nWidth; - int nY; - int nStatbarWidth; - int nStatbarHeight; - RECTL vRect; - RECTL vFRect; - - ::WinQueryWindowRect(m_hFrame, &vRect); - nY = vRect.yTop; - ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2); - vFRect = vRect; - ::WinCalcFrameRect(m_hFrame, &vRect, TRUE); - nWidth = vRect.xRight - vRect.xLeft; - nY = nY - (vRect.yBottom - vFRect.yBottom); - - m_frameStatusBar->GetSize( &nStatbarWidth - ,&nStatbarHeight - ); - - nY= nY - nStatbarHeight; - // - // Since we wish the status bar to be directly under the client area, - // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS. - // - m_frameStatusBar->SetSize( vRect.xLeft - vFRect.xLeft - ,nY - ,nWidth - ,nStatbarHeight - ); - if (!::WinQueryWindowPos(m_frameStatusBar->GetHWND(), &vSwp)) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error setting parent for StatusBar. Error: %s\n"), sError.c_str()); - return; - } - } -} // end of wxFrame::PositionStatusBar -#endif // wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR -wxToolBar* wxFrame::OnCreateToolBar( long lStyle, wxWindowID vId, const wxString& rsName ) -{ - wxToolBar* pToolBar = wxFrameBase::OnCreateToolBar( lStyle - ,vId - ,rsName - ); - - ::WinSetParent( pToolBar->GetHWND(), m_hFrame, FALSE); - ::WinSetOwner( pToolBar->GetHWND(), m_hFrame); - return pToolBar; -} // end of WinGuiBase_CFrame::OnCreateToolBar -#endif - -#if wxUSE_MENUS_NATIVE -void wxFrame::DetachMenuBar() -{ - if (m_frameMenuBar) - { - m_frameMenuBar->Detach(); - m_frameMenuBar = NULL; - } -} // end of wxFrame::DetachMenuBar - -void wxFrame::SetMenuBar( - wxMenuBar* pMenuBar -) -{ - wxString sError; - - if (!pMenuBar) - { - DetachMenuBar(); - - // - // Actually remove the menu from the frame - // - m_hMenu = (WXHMENU)0; - InternalSetMenuBar(); - } - else // set new non NULL menu bar - { - m_frameMenuBar = NULL; - - // - // Can set a menubar several times. - // TODO: how to prevent a memory leak if you have a currently-unattached - // menubar? wxWidgets assumes that the frame will delete the menu (otherwise - // there are problems for MDI). - // - if (pMenuBar->GetHMenu()) - { - m_hMenu = pMenuBar->GetHMenu(); - } - else - { - pMenuBar->Detach(); - m_hMenu = pMenuBar->Create(); - if (!m_hMenu) - return; - } - InternalSetMenuBar(); - m_frameMenuBar = pMenuBar; - pMenuBar->Attach((wxFrame*)this); - } -} // end of wxFrame::SetMenuBar - -void wxFrame::AttachMenuBar( - wxMenuBar* pMenubar -) -{ - wxFrameBase::AttachMenuBar(pMenubar); - - m_frameMenuBar = pMenubar; - - if (!pMenubar) - { - // - // Actually remove the menu from the frame - // - m_hMenu = (WXHMENU)0; - InternalSetMenuBar(); - } - else // Set new non NULL menu bar - { - // - // Can set a menubar several times. - // - if (pMenubar->GetHMenu()) - { - m_hMenu = pMenubar->GetHMenu(); - } - else - { - if (pMenubar->IsAttached()) - pMenubar->Detach(); - - m_hMenu = pMenubar->Create(); - - if (!m_hMenu) - return; - } - InternalSetMenuBar(); - } -} // end of wxFrame::AttachMenuBar - -void wxFrame::InternalSetMenuBar() -{ - ERRORID vError; - wxString sError; - // - // Set the parent and owner of the menubar to be the frame - // - if (!::WinSetParent(m_hMenu, m_hFrame, FALSE)) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str()); - } - - if (!::WinSetOwner(m_hMenu, m_hFrame)) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str()); - } - ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); -} // end of wxFrame::InternalSetMenuBar -#endif // wxUSE_MENUS_NATIVE - -// -// Responds to colour changes, and passes event on to children -// -void wxFrame::OnSysColourChanged( - wxSysColourChangedEvent& rEvent -) -{ - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - Refresh(); - -#if wxUSE_STATUSBAR - if (m_frameStatusBar) - { - wxSysColourChangedEvent vEvent2; - - vEvent2.SetEventObject(m_frameStatusBar); - m_frameStatusBar->HandleWindowEvent(vEvent2); - } -#endif //wxUSE_STATUSBAR - - // - // Propagate the event to the non-top-level children - // - wxWindow::OnSysColourChanged(rEvent); -} // end of wxFrame::OnSysColourChanged - -// Pass true to show full screen, false to restore. -bool wxFrame::ShowFullScreen( bool bShow, long lStyle ) -{ - if (bShow) - { - if (IsFullScreen()) - return false; - - m_bFsIsShowing = true; - m_lFsStyle = lStyle; - -#if wxUSE_TOOLBAR - wxToolBar* pTheToolBar = GetToolBar(); -#endif //wxUSE_TOOLBAR - -#if wxUSE_STATUSBAR - wxStatusBar* pTheStatusBar = GetStatusBar(); -#endif //wxUSE_STATUSBAR - - int nDummyWidth; - -#if wxUSE_TOOLBAR - if (pTheToolBar) - pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight); -#endif //wxUSE_TOOLBAR - -#if wxUSE_STATUSBAR - if (pTheStatusBar) - pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight); -#endif //wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR - // - // Zap the toolbar, menubar, and statusbar - // - if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar) - { - pTheToolBar->SetSize(wxDefaultCoord,0); - pTheToolBar->Show(false); - } -#endif //wxUSE_TOOLBAR - - if (lStyle & wxFULLSCREEN_NOMENUBAR) - { - ::WinSetParent(m_hMenu, m_hFrame, FALSE); - ::WinSetOwner(m_hMenu, m_hFrame); - ::WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); - } - -#if wxUSE_STATUSBAR - // - // Save the number of fields in the statusbar - // - if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar) - { - m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount(); - SetStatusBar(NULL); - delete pTheStatusBar; - } - else - m_nFsStatusBarFields = 0; -#endif //wxUSE_STATUSBAR - - // - // Zap the frame borders - // - - // - // Save the 'normal' window style - // - m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE); - - // - // Save the old position, width & height, maximize state - // - m_vFsOldSize = GetRect(); - m_bFsIsMaximized = IsMaximized(); - - // - // Decide which window style flags to turn off - // - LONG lNewStyle = m_lFsOldWindowStyle; - LONG lOffFlags = 0; - - if (lStyle & wxFULLSCREEN_NOBORDER) - lOffFlags |= FCF_BORDER; - if (lStyle & wxFULLSCREEN_NOCAPTION) - lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU); - - lNewStyle &= (~lOffFlags); - - // - // Change our window style to be compatible with full-screen mode - // - ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle); - - // - // Resize to the size of the desktop - int nWidth; - int nHeight; - - RECTL vRect; - - ::WinQueryWindowRect(HWND_DESKTOP, &vRect); - nWidth = vRect.xRight - vRect.xLeft; - // - // Remember OS/2 is backwards! - // - nHeight = vRect.yTop - vRect.yBottom; - - SetSize( nWidth, nHeight); - - // - // Now flush the window style cache and actually go full-screen - // - ::WinSetWindowPos( (HWND) GetParent()->GetHWND() - ,HWND_TOP - ,0 - ,0 - ,nWidth - ,nHeight - ,SWP_SIZE | SWP_SHOW - ); - - wxSize sz( nWidth, nHeight ); - wxSizeEvent vEvent( sz, GetId() ); - - HandleWindowEvent(vEvent); - return true; - } - else - { - if (!IsFullScreen()) - return false; - - m_bFsIsShowing = false; - -#if wxUSE_TOOLBAR - wxToolBar* pTheToolBar = GetToolBar(); - - // - // Restore the toolbar, menubar, and statusbar - // - if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR)) - { - pTheToolBar->SetSize(wxDefaultCoord, m_nFsToolBarHeight); - pTheToolBar->Show(true); - } -#endif //wxUSE_TOOLBAR - -#if wxUSE_STATUSBAR - if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0)) - { - CreateStatusBar(m_nFsStatusBarFields); -// PositionStatusBar(); - } -#endif //wxUSE_STATUSBAR - - if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) - { - ::WinSetParent(m_hMenu, m_hFrame, FALSE); - ::WinSetOwner(m_hMenu, m_hFrame); - ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); - } - Maximize(m_bFsIsMaximized); - - ::WinSetWindowULong( m_hFrame - ,QWL_STYLE - ,(ULONG)m_lFsOldWindowStyle - ); - ::WinSetWindowPos( (HWND) GetParent()->GetHWND() - ,HWND_TOP - ,m_vFsOldSize.x - ,m_vFsOldSize.y - ,m_vFsOldSize.width - ,m_vFsOldSize.height - ,SWP_SIZE | SWP_SHOW - ); - } - return wxFrameBase::ShowFullScreen(bShow, lStyle); -} // end of wxFrame::ShowFullScreen - -// -// Frame window -// -// ---------------------------------------------------------------------------- -// wxFrame size management: we exclude the areas taken by menu/status/toolbars -// from the client area, so the client area is what's really available for the -// frame contents -// ---------------------------------------------------------------------------- - -// Checks if there is a toolbar, and returns the first free client position -wxPoint wxFrame::GetClientAreaOrigin() const -{ - wxPoint vPoint = wxTopLevelWindow::GetClientAreaOrigin(); - - // - // In OS/2 the toolbar and statusbar are frame extensions so there is no - // adjustment. The client is supposedly resized for a toolbar in OS/2 - // as it is for the status bar. - // - return vPoint; -} // end of wxFrame::GetClientAreaOrigin - -// ---------------------------------------------------------------------------- -// tool/status bar stuff -// ---------------------------------------------------------------------------- - -#if wxUSE_TOOLBAR - -wxToolBar* wxFrame::CreateToolBar( - long lStyle -, wxWindowID vId -, const wxString& rName -) -{ - if (wxFrameBase::CreateToolBar( lStyle - ,vId - ,rName - )) - { - PositionToolBar(); - } - return m_frameToolBar; -} // end of wxFrame::CreateToolBar - -void wxFrame::PositionToolBar() -{ - wxToolBar* pToolBar = GetToolBar(); - wxCoord vWidth; - wxCoord vHeight; - wxCoord vTWidth; - wxCoord vTHeight; - - if (!pToolBar) - return; - - RECTL vRect; - RECTL vFRect; - wxPoint vPos; - - ::WinQueryWindowRect(m_hFrame, &vRect); - vPos.y = (wxCoord)vRect.yTop; - ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2); - vFRect = vRect; - ::WinCalcFrameRect(m_hFrame, &vRect, TRUE); - - vPos.y = (wxCoord)(vFRect.yTop - vRect.yTop); - pToolBar->GetSize( &vTWidth - ,&vTHeight - ); - - if (pToolBar->GetWindowStyleFlag() & wxTB_TOP) - { - vWidth = (wxCoord)(vRect.xRight - vRect.xLeft); - pToolBar->SetSize( vRect.xLeft - vFRect.xLeft - ,vPos.y - ,vWidth - ,vTHeight - ); - } - else if (pToolBar->GetWindowStyleFlag() & wxTB_BOTTOM) - { - wxCoord vSwidth = 0; - wxCoord vSheight = 0; - - if (m_frameStatusBar) - m_frameStatusBar->GetSize( &vSwidth - ,&vSheight - ); - vWidth = (wxCoord)(vRect.xRight - vRect.xLeft); - pToolBar->SetSize( vRect.xLeft - vFRect.xLeft - ,vFRect.yTop - vRect.yBottom - vTHeight - vSheight - ,vWidth - ,vTHeight - ); - } - else if (pToolBar->GetWindowStyleFlag() & wxTB_LEFT) - { - wxCoord vSwidth = 0; - wxCoord vSheight = 0; - - if (m_frameStatusBar) - m_frameStatusBar->GetSize( &vSwidth - ,&vSheight - ); - vHeight = (wxCoord)(vRect.yTop - vRect.yBottom); - pToolBar->SetSize( vRect.xLeft - vRect.xLeft - ,vPos.y - ,vTWidth - ,vHeight - vSheight - ); - } - else - { - wxCoord vSwidth = 0; - wxCoord vSheight = 0; - - if (m_frameStatusBar) - m_frameStatusBar->GetSize( &vSwidth - ,&vSheight - ); - vHeight = (wxCoord)(vRect.yTop - vRect.yBottom); - pToolBar->SetSize( vRect.xRight - vFRect.xLeft - vTWidth - ,vPos.y - ,vTWidth - ,vHeight - vSheight - ); - } - if( ::WinIsWindowShowing(m_hFrame) ) - ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); -} // end of wxFrame::PositionToolBar -#endif // wxUSE_TOOLBAR - -// ---------------------------------------------------------------------------- -// frame state (iconized/maximized/...) -// ---------------------------------------------------------------------------- - -// -// propagate our state change to all child frames: this allows us to emulate X -// Windows behaviour where child frames float independently of the parent one -// on the desktop, but are iconized/restored with it -// -void wxFrame::IconizeChildFrames( bool WXUNUSED(bIconize) ) -{ - // FIXME: Generic MDI does not use Frames for the Childs, so this does _not_ - // work. Possibly, the right thing is simply to eliminate this - // functions and all the calls to it from within this file. -#if 0 - for (wxWindowList::Node* pNode = GetChildren().GetFirst(); - pNode; - pNode = pNode->GetNext() ) - { - wxWindow* pWin = pNode->GetData(); - wxFrame* pFrame = wxDynamicCast(pWin, wxFrame); - - if ( pFrame -#if wxUSE_MDI_ARCHITECTURE - && !wxDynamicCast(pFrame, wxMDIChildFrame) -#endif // wxUSE_MDI_ARCHITECTURE - ) - { - // - // We don't want to restore the child frames which had been - // iconized even before we were iconized, so save the child frame - // status when iconizing the parent frame and check it when - // restoring it. - // - if (bIconize) - { - pFrame->m_bWasMinimized = pFrame->IsIconized(); - } - - // - // This test works for both iconizing and restoring - // - if (!pFrame->m_bWasMinimized) - pFrame->Iconize(bIconize); - } - } -#endif -} // end of wxFrame::IconizeChildFrames - -WXHICON wxFrame::GetDefaultIcon() const -{ - return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON - : wxDEFAULT_FRAME_ICON); -} -// =========================================================================== -// message processing -// =========================================================================== - -// --------------------------------------------------------------------------- -// preprocessing -// --------------------------------------------------------------------------- -bool wxFrame::OS2TranslateMessage( WXMSG* pMsg ) -{ - // - // try the menu bar accels - // - wxMenuBar* pMenuBar = GetMenuBar(); - - if (!pMenuBar) - return false; - -#if wxUSE_ACCEL && wxUSE_MENUS_NATIVE - const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable(); - return rAcceleratorTable.Translate(GetHWND(), pMsg); -#else - return false; -#endif //wxUSE_ACCEL -} // end of wxFrame::OS2TranslateMessage - -// --------------------------------------------------------------------------- -// our private (non virtual) message handlers -// --------------------------------------------------------------------------- -bool wxFrame::HandlePaint() -{ - RECTL vRect; - - if (::WinQueryUpdateRect(GetHWND(), &vRect)) - { - if (m_bIconized) - { - // - // Icons in PM are the same as "pointers" - // - const wxIcon& vIcon = GetIcon(); - HPOINTER hIcon; - - if (vIcon.IsOk()) - hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L); - else - hIcon = (HPOINTER)m_hDefaultIcon; - - // - // Hold a pointer to the dc so long as the OnPaint() message - // is being processed - // - RECTL vRect2; - HPS hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2); - - // - // Erase background before painting or we get white background - // - OS2DefWindowProc(WM_ERASEBACKGROUND, (MPARAM)hPs, (MPARAM)&vRect2); - - if (hIcon) - { - RECTL vRect3; - - ::WinQueryWindowRect(GetHwnd(), &vRect3); - - static const int nIconWidth = 32; - static const int nIconHeight = 32; - int nIconX = (int)((vRect3.xRight - nIconWidth)/2); - int nIconY = (int)((vRect3.yBottom + nIconHeight)/2); - - ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL); - } - ::WinEndPaint(hPs); - } - else - { - if (!wxWindow::HandlePaint()) - { - HPS hPS; - RECTL vRect; - - hPS = ::WinBeginPaint( GetHwnd() - ,NULLHANDLE - ,&vRect - ); - if(hPS) - { - ::GpiCreateLogColorTable( hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - ); - ::GpiCreateLogColorTable( hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - ); - - ::WinFillRect( hPS - ,&vRect - ,GetBackgroundColour().GetPixel() - ); - ::WinEndPaint(hPS); - } - } - } - } - - return true; -} // end of wxFrame::HandlePaint - -bool wxFrame::HandleSize( int nX, int nY, WXUINT nId ) -{ - bool bProcessed = false; - - switch (nId) - { - case kSizeNormal: - // - // Only do it it if we were iconized before, otherwise resizing the - // parent frame has a curious side effect of bringing it under it's - // children - if (!m_bIconized ) - break; - - // - // restore all child frames too - // - IconizeChildFrames(false); - (void)SendIconizeEvent(false); - - // - // fall through - // - - case kSizeMax: - m_bIconized = false; - break; - - case kSizeMin: - // - // Iconize all child frames too - // - IconizeChildFrames(true); - (void)SendIconizeEvent(); - m_bIconized = true; - break; - } - - if (!m_bIconized) - { - // - // forward WM_SIZE to status bar control - // -#if wxUSE_NATIVE_STATUSBAR - if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))) - { - wxSizeEvent vEvent( wxSize( nX - ,nY - ) - ,m_frameStatusBar->GetId() - ); - - vEvent.SetEventObject(m_frameStatusBar); - m_frameStatusBar->OnSize(vEvent); - } -#endif // wxUSE_NATIVE_STATUSBAR - - PositionStatusBar(); -#if wxUSE_TOOLBAR - PositionToolBar(); -#endif // wxUSE_TOOLBAR - - bProcessed = wxWindow::HandleSize( nX - ,nY - ,nId - ); - } - return bProcessed; -} // end of wxFrame::HandleSize - -bool wxFrame::HandleCommand( WXWORD nId, - WXWORD nCmd, - WXHWND hControl ) -{ - if (hControl) - { - // - // In case it's e.g. a toolbar. - // - wxWindow* pWin = wxFindWinFromHandle(hControl); - - if (pWin) - return pWin->OS2Command( nCmd, nId ); - } - - // - // Handle here commands from menus and accelerators - // - if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR) - { -#if wxUSE_MENUS_NATIVE - if (wxCurrentPopupMenu) - { - wxMenu* pPopupMenu = wxCurrentPopupMenu; - - wxCurrentPopupMenu = NULL; - - return pPopupMenu->OS2Command( nCmd, nId ); - } -#endif - - if (ProcessCommand(nId)) - { - return true; - } - } - return false; -} // end of wxFrame::HandleCommand - -bool wxFrame::HandleMenuSelect( WXWORD nItem, - WXWORD nFlags, - WXHMENU hMenu ) -{ - if( !nFlags ) - { - MENUITEM mItem; - MRESULT rc; - - rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem); - - if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR))) - { - wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nItem); - - vEvent.SetEventObject(this); - HandleWindowEvent(vEvent); // return value would be ignored by PM - } - else - { - DoGiveHelp(wxEmptyString, true); - return false; - } - } - return true; -} // end of wxFrame::HandleMenuSelect - -// --------------------------------------------------------------------------- -// Main Frame window proc -// --------------------------------------------------------------------------- -MRESULT EXPENTRY wxFrameMainWndProc( HWND hWnd, - ULONG ulMsg, - MPARAM wParam, - MPARAM lParam ) -{ - MRESULT rc = (MRESULT)0; - bool bProcessed = false; - - wxFrame* pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); - switch (ulMsg) - { - case WM_QUERYFRAMECTLCOUNT: - if(pWnd && pWnd->m_fnOldWndProc) - { - USHORT uItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam)); - - rc = MRFROMSHORT(uItemCount); - } - break; - - case WM_FORMATFRAME: -///////////////////////////////////////////////////////////////////////////////// -// Applications that subclass frame controls may find that the frame is already -// subclassed the number of frame controls is variable. -// The WM_FORMATFRAME and WM_QUERYFRAMECTLCOUNT messages must always be -// subclassed by calling the previous window procedure and modifying its result. -//////////////////////////////////////////////////////////////////////////////// - { - int nItemCount; - int i; - PSWP pSWP = NULL; - RECTL vRectl; - RECTL vRstb; - RECTL vRtlb; - int nHeight = 0; - int nHeight2 = 0; - int nWidth = 0; - - pSWP = (PSWP)PVOIDFROMMP(wParam); - nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam)); - if(pWnd->m_frameStatusBar) - { - ::WinQueryWindowRect(pWnd->m_frameStatusBar->GetHWND(), &vRstb); - pWnd->m_frameStatusBar->GetSize(NULL, &nHeight); - } - if(pWnd->m_frameToolBar) - { - ::WinQueryWindowRect(pWnd->m_frameToolBar->GetHWND(), &vRtlb); - pWnd->m_frameToolBar->GetSize(&nWidth, &nHeight2); - } - ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl); - ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2); - ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE); - ::WinMapWindowPoints(HWND_DESKTOP, pWnd->m_hFrame, (PPOINTL)&vRectl, 2); - for(i = 0; i < nItemCount; i++) - { - if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd) - { - if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_TOP) - { - pSWP[i].x = vRectl.xLeft; - pSWP[i].y = vRectl.yBottom + nHeight; - pSWP[i].cx = vRectl.xRight - vRectl.xLeft; - pSWP[i].cy = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2); - } - else if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_BOTTOM) - { - pSWP[i].x = vRectl.xLeft; - pSWP[i].y = vRectl.yBottom + nHeight + nHeight2; - pSWP[i].cx = vRectl.xRight - vRectl.xLeft; - pSWP[i].cy = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2); - } - else if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_LEFT) - { - pSWP[i].x = vRectl.xLeft + nWidth; - pSWP[i].y = vRectl.yBottom + nHeight; - pSWP[i].cx = vRectl.xRight - (vRectl.xLeft + nWidth); - pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight; - } - else - { - pSWP[i].x = vRectl.xLeft; - pSWP[i].y = vRectl.yBottom + nHeight; - pSWP[i].cx = vRectl.xRight - (vRectl.xLeft + nWidth); - pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight; - } - pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW; - pSWP[i].hwndInsertBehind = HWND_TOP; - } - } - bProcessed = true; - rc = MRFROMSHORT(nItemCount); - } - break; - - default: - if(pWnd && pWnd->m_fnOldWndProc) - rc = pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam); - else - rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); - } - return rc; -} // end of wxFrameMainWndProc - -MRESULT EXPENTRY wxFrameWndProc( - HWND hWnd -, ULONG ulMsg -, MPARAM wParam -, MPARAM lParam -) -{ - // - // Trace all ulMsgs - useful for the debugging - // - HWND parentHwnd; - wxFrame* pWnd = NULL; - - parentHwnd = WinQueryWindow(hWnd,QW_PARENT); - pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); - - // - // When we get the first message for the HWND we just created, we associate - // it with wxWindow stored in wxWndHook - // - - MRESULT rc = (MRESULT)0; - - // - // Stop right here if we don't have a valid handle in our wxWindow object. - // - if (pWnd && !pWnd->GetHWND()) - { - pWnd->SetHWND((WXHWND) hWnd); - rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam ); - pWnd->SetHWND(0); - } - else - { - if (pWnd) - rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam); - else - rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); - } - return rc; -} // end of wxFrameWndProc - -MRESULT wxFrame::OS2WindowProc( WXUINT uMessage, - WXWPARAM wParam, - WXLPARAM lParam ) -{ - MRESULT mRc = 0L; - bool bProcessed = false; - - switch (uMessage) - { - case WM_CLOSE: - // - // If we can't close, tell the system that we processed the - // message - otherwise it would close us - // - bProcessed = !Close(); - break; - - case WM_PAINT: - bProcessed = HandlePaint(); - mRc = (MRESULT)FALSE; - break; - - case WM_ERASEBACKGROUND: - // - // Returning TRUE to requests PM to paint the window background - // in SYSCLR_WINDOW. We capture this here because the PS returned - // in Frames is the PS for the whole frame, which we can't really - // use at all. If you want to paint a different background, do it - // in an OnPaint using a wxPaintDC. - // - mRc = (MRESULT)(TRUE); - break; - - case WM_COMMAND: - { - WORD wId; - WORD wCmd; - WXHWND hWnd; - - UnpackCommand( (WXWPARAM)wParam - ,(WXLPARAM)lParam - ,&wId - ,&hWnd - ,&wCmd - ); - - bProcessed = HandleCommand( wId - ,wCmd - ,(WXHWND)hWnd - ); - } - break; - - case WM_MENUSELECT: - { - WXWORD wItem; - WXWORD wFlags; - WXHMENU hMenu; - - UnpackMenuSelect( wParam - ,lParam - ,&wItem - ,&wFlags - ,&hMenu - ); - bProcessed = HandleMenuSelect( wItem - ,wFlags - ,hMenu - ); - mRc = (MRESULT)TRUE; - } - break; - - case WM_SIZE: - { - SHORT nScxnew = SHORT1FROMMP(lParam); // New horizontal size. - SHORT nScynew = SHORT2FROMMP(lParam); // New vertical size. - - lParam = MRFROM2SHORT( nScxnew - 20 - ,nScynew - 30 - ); - } - bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); - mRc = (MRESULT)FALSE; - break; - - case CM_QUERYDRAGIMAGE: - { - const wxIcon& vIcon = GetIcon(); - HPOINTER hIcon; - - if (vIcon.IsOk()) - hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L); - else - hIcon = (HPOINTER)m_hDefaultIcon; - mRc = (MRESULT)hIcon; - bProcessed = mRc != 0; - } - break; - } - - if (!bProcessed ) - mRc = wxWindow::OS2WindowProc( uMessage - ,wParam - ,lParam - ); - return (MRESULT)mRc; -} // wxFrame::OS2WindowProc - -void wxFrame::SetClient(WXHWND WXUNUSED(c_Hwnd)) -{ - // Duh...nothing to do under OS/2 -} - -void wxFrame::SetClient( wxWindow* pWindow ) -{ - wxWindow* pOldClient = this->GetClient(); - bool bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus()); - - if(pOldClient == pWindow) // nothing to do - return; - if(pWindow == NULL) // just need to remove old client - { - if(pOldClient == NULL) // nothing to do - return; - - if(bClientHasFocus ) - this->SetFocus(); - - pOldClient->Enable( false ); - pOldClient->Show( false ); - ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId()); - // to avoid OS/2 bug need to update frame - ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0); - return; - } - - // - // Else need to change client - // - if(bClientHasFocus) - this->SetFocus(); - - ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE); - if(pOldClient) - { - pOldClient->Enable(false); - pOldClient->Show(false); - ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId()); - } - pWindow->Reparent(this); - ::WinSetWindowUShort(pWindow->GetHWND(), QWS_ID, FID_CLIENT); - ::WinEnableWindowUpdate((HWND)GetHWND(), TRUE); - pWindow->Enable(); - pWindow->Show(); // ensure client is showing - if( this->IsShown() ) - { - this->Show(); - ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); - } -} - -wxWindow* wxFrame::GetClient() -{ - return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT)); -} - diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp deleted file mode 100644 index b007f8b359..0000000000 --- a/src/os2/gauge.cpp +++ /dev/null @@ -1,297 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/gauge.cpp -// Purpose: wxGauge class -// Author: David Webster -// Modified by: -// Created: 10/06/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#if wxUSE_GAUGE - -#include "wx/gauge.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/scrolwin.h" -#endif - -#include "wx/os2/private.h" - -static WXFARPROC fnWndProcGauge = (WXFARPROC)NULL; -extern void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); - -MRESULT EXPENTRY wxGaugeWndProc( HWND hWnd, - UINT uMessage, - MPARAM wParam, - MPARAM lParam ) -{ - wxGauge* pGauge = (wxGauge *)::WinQueryWindowULong( hWnd - ,QWL_USER - ); - HPS hPS; - RECTL vRect; - RECTL vRect2; - RECTL vRect3; - double dPixelToRange = 0.0; - double dRange = 0.0; - - switch (uMessage ) - { - case WM_PAINT: - hPS = ::WinBeginPaint( hWnd - ,NULLHANDLE - ,&vRect - ); - if(hPS) - { - ::WinQueryWindowRect(hWnd, &vRect); - ::GpiCreateLogColorTable( hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - ); - ::GpiCreateLogColorTable( hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - ); - // - // Draw the guage box - // - LONG lColor = 0x00FFFFFF; // White - POINTL vPoint = {vRect.xLeft + 1, vRect.yBottom + 1}; - - ::GpiSetColor(hPS, lColor); - ::GpiMove(hPS, &vPoint); - vPoint.x = vRect.xRight - 1; - ::GpiLine(hPS, &vPoint); - vPoint.y = vRect.yTop - 1; - ::GpiLine(hPS, &vPoint); - lColor = 0x000C0C0C; // Darkish Grey to give depth feel - ::GpiSetColor(hPS, lColor); - vPoint.x = vRect.xLeft + 1; - ::GpiLine(hPS, &vPoint); - vPoint.y = vRect.yBottom + 1; - ::GpiLine(hPS, &vPoint); - vRect3.xLeft = vRect.xLeft + 2; - vRect3.xRight = vRect.xRight - 2; - vRect3.yTop = vRect.yTop - 2; - vRect3.yBottom = vRect.yBottom + 2; - - if (pGauge->GetWindowStyleFlag() & wxGA_VERTICAL) - { - dRange = (double)(vRect3.yTop - vRect3.yBottom); - dPixelToRange = dRange/(double)pGauge->GetRange(); - vRect2.yTop = (int)(pGauge->GetValue() * dPixelToRange); - vRect2.yBottom = vRect3.yBottom; - vRect2.xLeft = vRect3.xLeft; - vRect2.xRight = vRect3.xRight; - vRect3.yBottom = vRect2.yTop; - if (vRect3.yBottom <= 1) - vRect3.yBottom = 2; - ::WinFillRect(hPS, &vRect3, pGauge->GetBackgroundColour().GetPixel()); - ::WinFillRect(hPS, &vRect2, pGauge->GetForegroundColour().GetPixel()); - } - else - { - dRange = (double)(vRect3.xRight - vRect3.xLeft); - dPixelToRange = dRange/(double)pGauge->GetRange(); - vRect2.yTop = vRect3.yTop; - vRect2.yBottom = vRect3.yBottom; - vRect2.xLeft = vRect3.xLeft; - vRect2.xRight = (int)(pGauge->GetValue() * dPixelToRange); - vRect3.xLeft = vRect2.xRight; - if (vRect3.xLeft <= 1) - vRect3.xLeft = 2; - ::WinFillRect(hPS, &vRect3, pGauge->GetBackgroundColour().GetPixel()); - ::WinFillRect(hPS, &vRect2, pGauge->GetForegroundColour().GetPixel()); - } - ::WinEndPaint(hPS); - } - } - return (fnWndProcGauge( hWnd - ,(ULONG)uMessage - ,(MPARAM)wParam - ,(MPARAM)lParam - ) - ); -} // end of wxGaugeWndProc - -bool wxGauge::Create( wxWindowOS2* pParent, - wxWindowID vId, - int nRange, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxValidator& rValidator, - const wxString& rsName ) -{ - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - long lMsStyle = 0L; - SWP vSwp; - - SetName(rsName); -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - if (pParent) - pParent->AddChild(this); - m_backgroundColour.Set(wxString(wxT("LIGHT GREY"))); - m_foregroundColour.Set(wxString(wxT("NAVY"))); - - m_nRangeMax = nRange; - m_nGaugePos = 0; - m_windowStyle = lStyle; - - if (vId == wxID_ANY) - m_windowId = (int)NewControlId(); - else - m_windowId = vId; - - if (m_windowStyle & wxCLIP_SIBLINGS ) - lMsStyle |= WS_CLIPSIBLINGS; - - // - // OS/2 will use an edit control for this, since there is not a native gauge - // Other choices include using an armless slider but they are more difficult - // to control and manipulate - // - - lMsStyle = WS_VISIBLE | ES_MARGIN | ES_LEFT | ES_READONLY; - if (m_windowStyle & wxCLIP_SIBLINGS) - lMsStyle |= WS_CLIPSIBLINGS; - - m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,WC_ENTRYFIELD // Window class - ,(PSZ)NULL // Initial Text - ,(ULONG)lMsStyle // Style flags - ,0L, 0L, 0L, 0L // Origin -- 0 size - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(HMENU)m_windowId // Window identifier - ,NULL // Slider control data - ,NULL // no Presentation parameters - ); - - wxAssociateWinWithHandle( m_hWnd - ,(wxWindowOS2*)this - ); - ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this); - fnWndProcGauge = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxGaugeWndProc); - ::WinQueryWindowPos(m_hWnd, &vSwp); - SetXComp(vSwp.x); - SetYComp(vSwp.y); - wxFont* pTextFont = new wxFont( 10 - ,wxMODERN - ,wxNORMAL - ,wxNORMAL - ); - SetFont(*pTextFont); - if (nWidth == -1L) - nWidth = 50L; - if (nHeight == -1L) - nHeight = 28L; - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - m_nWidth = nWidth; // Save for GetBestSize - m_nHeight = nHeight; - ::WinShowWindow((HWND)GetHWND(), TRUE); - delete pTextFont; - return true; -} // end of wxGauge::Create - -int wxGauge::GetBezelFace() const -{ - return 0; -} // end of wxGauge::GetBezelFace - -int wxGauge::GetRange() const -{ - return m_nRangeMax; -} // end of wxGauge::GetRange - -int wxGauge::GetShadowWidth() const -{ - return 0; -} // end of wxGauge::GetShadowWidth - -int wxGauge::GetValue() const -{ - return m_nGaugePos; -} // end of wxGauge::GetValue - -bool wxGauge::SetBackgroundColour( const wxColour& rColour ) -{ - if (!wxControl::SetBackgroundColour(rColour)) - return false; - - LONG lColor = (LONG)rColour.GetPixel(); - - ::WinSetPresParam( GetHwnd() - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - return true; -} // end of wxGauge::SetBackgroundColour - -void wxGauge::SetBezelFace( int WXUNUSED(nWidth) ) -{ -} // end of wxGauge::SetBezelFace - -bool wxGauge::SetForegroundColour( const wxColour& rColour ) -{ - if (!wxControl::SetForegroundColour(rColour)) - return false; - - LONG lColor = (LONG)rColour.GetPixel(); - - ::WinSetPresParam( GetHwnd() - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - - return true; -} // end of wxGauge::SetForegroundColour - -void wxGauge::SetRange( int nRange ) -{ - m_nRangeMax = nRange; -} // end of wxGauge::SetRange - -void wxGauge::SetShadowWidth( int WXUNUSED(nWidth) ) -{ -} // end of wxGauge::SetShadowWidth - -void wxGauge::SetValue( int nPos ) -{ - RECT vRect; - - m_nGaugePos = nPos; - ::WinQueryWindowRect(GetHwnd(), &vRect); - ::WinInvalidateRect(GetHwnd(), &vRect, FALSE); -} // end of wxGauge::SetValue - -wxSize wxGauge::DoGetBestSize() const -{ - return wxSize(m_nWidth,m_nHeight); -} - -#endif // wxUSE_GAUGE diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp deleted file mode 100644 index 3b1775cdcc..0000000000 --- a/src/os2/gdiimage.cpp +++ /dev/null @@ -1,480 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/gdiimage.cpp -// Purpose: wxGDIImage implementation -// Author: Vadim Zeitlin -// Modified by: -// Created: 20.11.99 -// Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/app.h" -#endif // WX_PRECOMP - -#include "wx/os2/private.h" -#include "wx/os2/gdiimage.h" - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxGDIImageHandlerList) - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -// all image handlers are declared/defined in this file because the outside -// world doesn't have to know about them (but only about wxBITMAP_TYPE_XXX ids) - -class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler -{ -public: - wxBMPFileHandler() : wxBitmapHandler(wxT("Windows bitmap file"), wxT("bmp"), - wxBITMAP_TYPE_BMP) - { - } - - virtual bool LoadFile( wxBitmap* pBitmap - ,const wxString& rName - ,HPS hPs - ,wxBitmapType lFlags - ,int nDesiredWidth - ,int nDesiredHeight - ); - virtual bool SaveFile( wxBitmap* pBitmap - ,const wxString& rName - ,wxBitmapType lType - ,const wxPalette* pPalette = NULL - ); - -private: - inline virtual bool LoadFile( wxBitmap* pBitmap - ,int nId - ,wxBitmapType lFlags - ,int nDesiredWidth - ,int nDesiredHeight - ) - { - return wxBitmapHandler::LoadFile( pBitmap - ,nId - ,lFlags - ,nDesiredWidth - ,nDesiredHeight - ); - } - DECLARE_DYNAMIC_CLASS(wxBMPFileHandler) -}; - -class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler -{ -public: - wxBMPResourceHandler() : wxBitmapHandler(wxT("Windows bitmap resource"), - wxEmptyString, - wxBITMAP_TYPE_BMP_RESOURCE) - { - } - - virtual bool LoadFile( wxBitmap* pBitmap - ,int nId - ,wxBitmapType lFlags - ,int nDesiredWidth - ,int nDesiredHeight - ); - -private: - DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler) -}; - -class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler -{ -public: - wxIconHandler( const wxString& rName - ,const wxString& rExt - ,wxBitmapType lType - ) : wxGDIImageHandler( rName - ,rExt - ,lType - ) - { - } - - // creating and saving icons is not supported - virtual bool Create( wxGDIImage* WXUNUSED(pImage) - ,const void* WXUNUSED(pData) - ,wxBitmapType WXUNUSED(lFlags) - ,int WXUNUSED(nWidth) - ,int WXUNUSED(nHeight) - ,int WXUNUSED(nDepth) = 1 - ) - { - return false; - } - - virtual bool Save( const wxGDIImage* WXUNUSED(pImage) - ,const wxString& WXUNUSED(rName) - ,wxBitmapType WXUNUSED(nType) - ) const - { - return false; - } - virtual bool Load( wxGDIImage* pImage - ,const wxString& rName - ,HPS hPs - ,wxBitmapType lFlags - ,int nDesiredWidth - ,int nDesiredHeight - ) - { - wxIcon* pIcon = wxDynamicCast(pImage, wxIcon); - wxCHECK_MSG(pIcon, false, wxT("wxIconHandler only works with icons")); - - return LoadIcon( pIcon - ,rName - ,hPs - ,lFlags - ,nDesiredWidth - ,nDesiredHeight - ); - } - -protected: - virtual bool LoadIcon( wxIcon* pIcon - ,const wxString& rName - ,HPS hPs - ,wxBitmapType lFlags - ,int nDesiredWidth = -1 - ,int nDesiredHeight = -1 - ) = 0; -private: - inline virtual bool Load( wxGDIImage* WXUNUSED(pImage), - int WXUNUSED(nId), - wxBitmapType WXUNUSED(lFlags), - int WXUNUSED(nDesiredWidth), - int WXUNUSED(nDesiredHeight) ) - { - return false; - } -}; - -class WXDLLEXPORT wxICOFileHandler : public wxIconHandler -{ -public: - wxICOFileHandler() : wxIconHandler(wxT("ICO icon file"), - wxT("ico"), - wxBITMAP_TYPE_ICO) - { - } - - virtual bool LoadIcon( wxIcon * pIcon - ,const wxString& rName - ,HPS hPs - ,wxBitmapType lFlags - ,int nDesiredWidth = -1 - ,int nDesiredHeight = -1 - ); - -private: - DECLARE_DYNAMIC_CLASS(wxICOFileHandler) -}; - -class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler -{ -public: - wxICOResourceHandler() : wxIconHandler(wxT("ICO resource"), - wxT("ico"), - wxBITMAP_TYPE_ICO_RESOURCE) - { - } - - virtual bool LoadIcon( wxIcon* pIcon - ,const wxString& rName - ,HPS hPs - ,wxBitmapType lFlags - ,int nDesiredWidth = -1 - ,int nDesiredHeight = -1 - ); - -private: - DECLARE_DYNAMIC_CLASS(wxICOResourceHandler) -}; - -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler) -IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) -IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject) -IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject) - -// ============================================================================ -// implementation -// ============================================================================ - -wxGDIImageHandlerList wxGDIImage::ms_handlers; - -// ---------------------------------------------------------------------------- -// wxGDIImage functions forwarded to wxGDIImageRefData -// ---------------------------------------------------------------------------- - -bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) ) -{ - if ( !IsNull() ) - { - GetGDIImageData()->Free(); - GetGDIImageData()->m_hHandle = 0; - } - - return true; -} - -WXHANDLE wxGDIImage::GetResourceHandle() const -{ - return GetHandle(); -} - -// ---------------------------------------------------------------------------- -// wxGDIImage handler stuff -// ---------------------------------------------------------------------------- - -void wxGDIImage::AddHandler( wxGDIImageHandler* pHandler ) -{ - ms_handlers.Append(pHandler); -} - -void wxGDIImage::InsertHandler( wxGDIImageHandler* pHandler ) -{ - ms_handlers.Insert(pHandler); -} - -bool wxGDIImage::RemoveHandler( const wxString& rName ) -{ - wxGDIImageHandler* pHandler = FindHandler(rName); - - if (pHandler) - { - ms_handlers.DeleteObject(pHandler); - return true; - } - else - return false; -} - -wxGDIImageHandler* wxGDIImage::FindHandler( - const wxString& rName -) -{ - wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst(); - - while ( pNode ) - { - wxGDIImageHandler* pHandler = pNode->GetData(); - - if ( pHandler->GetName() == rName ) - return pHandler; - pNode = pNode->GetNext(); - } - return(NULL); -} - -wxGDIImageHandler* wxGDIImage::FindHandler( - const wxString& rExtension -, wxBitmapType lType -) -{ - wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst(); - while ( pNode ) - { - wxGDIImageHandler* pHandler = pNode->GetData(); - - if ( (pHandler->GetExtension() == rExtension) && - (lType == -1 || pHandler->GetType() == lType) ) - { - return pHandler; - } - pNode = pNode->GetNext(); - } - return(NULL); -} - -wxGDIImageHandler* wxGDIImage::FindHandler( - wxBitmapType lType -) -{ - wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst(); - - while ( pNode ) - { - wxGDIImageHandler* pHandler = pNode->GetData(); - - if ( pHandler->GetType() == lType ) - return pHandler; - pNode = pNode->GetNext(); - } - return(NULL); -} - -void wxGDIImage::CleanUpHandlers() -{ - wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst(); - - while ( pNode ) - { - wxGDIImageHandler* pHandler = pNode->GetData(); - wxGDIImageHandlerList::compatibility_iterator pNext = pNode->GetNext(); - - delete pHandler; - ms_handlers.Erase( pNode ); - pNode = pNext; - } -} - -void wxGDIImage::InitStandardHandlers() -{ - AddHandler(new wxBMPResourceHandler); - AddHandler(new wxBMPFileHandler); - AddHandler(new wxICOResourceHandler); - AddHandler(new wxICOFileHandler); -} - -// ---------------------------------------------------------------------------- -// wxBitmap handlers -// ---------------------------------------------------------------------------- - -bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap, - int nId, - wxBitmapType WXUNUSED(lFlags), - int WXUNUSED(nDesiredWidth), - int WXUNUSED(nDesiredHeight) ) -{ - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); - - pBitmap->SetHBITMAP((WXHBITMAP)::GpiLoadBitmap( hPS - ,NULLHANDLE - ,nId - ,0 - ,0 - )); - ::GpiDestroyPS(hPS); - ::DevCloseDC(hDC); - - wxBitmapRefData* pData = pBitmap->GetBitmapData(); - - if ( pBitmap->IsOk() ) - { - BITMAPINFOHEADER vBmph; - - ::GpiQueryBitmapParameters(GetHbitmapOf(*pBitmap), &vBmph); - pData->m_nWidth = vBmph.cx; - pData->m_nHeight = vBmph.cy; - pData->m_nDepth = vBmph.cBitCount; - } - return(pBitmap->IsOk()); -} // end of wxBMPResourceHandler::LoadFile - -bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap, - const wxString& WXUNUSED(rName), - HPS WXUNUSED(hPs), - wxBitmapType WXUNUSED(lFlags), - int WXUNUSED(nDesiredWidth), - int WXUNUSED(nDesiredHeight) ) -{ -#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2 - wxPalette* pPalette = NULL; - - bool bSuccess = false; /* wxLoadIntoBitmap( WXSTRINGCAST rName - ,pBitmap - ,&pPalette - ) != 0; */ - if (bSuccess && pPalette) - { - pBitmap->SetPalette(*pPalette); - } - - // it was copied by the bitmap if it was loaded successfully - delete pPalette; - - return(bSuccess); -#else - wxUnusedVar(pBitmap); - return false; -#endif -} - -bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap, - const wxString& WXUNUSED(rName), - wxBitmapType WXUNUSED(nType), - const wxPalette* pPal ) -{ -#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2 - wxPalette* pActualPalette = (wxPalette *)pPal; - - if (!pActualPalette) - pActualPalette = pBitmap->GetPalette(); - /* return(wxSaveBitmap( WXSTRINGCAST rName - ,pBitmap - ,pActualPalette - ) != 0); */ - return false; -#else - wxUnusedVar(pBitmap); - wxUnusedVar(pPal); - return false; -#endif -} - -// ---------------------------------------------------------------------------- -// wxIcon handlers -// ---------------------------------------------------------------------------- - -bool wxICOFileHandler::LoadIcon( wxIcon* pIcon, - const wxString& WXUNUSED(rName), - HPS WXUNUSED(hPs), - wxBitmapType WXUNUSED(lFlags), - int WXUNUSED(nDesiredWidth), - int WXUNUSED(nDesiredHeight) ) -{ -#if defined(wxUSE_RESOURCE_LOADING_IN_OS2) && wxUSE_RESOURCE_LOADING_IN_OS2 - pIcon->UnRef(); - - return false; -#else - wxUnusedVar(pIcon); - return false; -#endif -} - -bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon, - const wxString& rName, - HPS WXUNUSED(hPs), - wxBitmapType WXUNUSED(lFlags), - int WXUNUSED(nDesiredWidth), - int WXUNUSED(nDesiredHeight) ) -{ - HPOINTER hIcon; - - hIcon = ::WinLoadFileIcon( rName.c_str() - ,TRUE // load for private use - ); - - pIcon->SetSize(32, 32); // all OS/2 icons are 32 x 32 - - pIcon->SetHICON((WXHICON)hIcon); - - return pIcon->IsOk(); -} // end of wxICOResourceHandler::LoadIcon diff --git a/src/os2/helpwin.cpp b/src/os2/helpwin.cpp deleted file mode 100644 index 79f9975ada..0000000000 --- a/src/os2/helpwin.cpp +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/helpwin.cpp -// Purpose: Help system: native implementation -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_HELP - -#ifndef WX_PRECOMP -#endif - -#include "wx/os2/helpwin.h" - -#include - -#include "wx/os2/private.h" - -#include - -// MAX path length -#define _MAXPATHLEN 500 - -// MAX length of Help descriptor -#define _MAX_HELP_LEN 500 - -IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase) - -wxWinHelpController::wxWinHelpController() -{ - m_helpFile = wxEmptyString; -} - -wxWinHelpController::~wxWinHelpController() -{ -} - -bool wxWinHelpController::Initialize(const wxString& filename) -{ - m_helpFile = filename; - // TODO any other inits - return true; -} - -bool wxWinHelpController::LoadFile(const wxString& file) -{ - m_helpFile = file; - // TODO - return true; -} - -bool wxWinHelpController::DisplayContents() -{ - if (m_helpFile.empty()) - return false; - - wxString str = m_helpFile; - size_t len = str.length(); - if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.'))) - str += wxT(".hlp"); - - if (wxTheApp->GetTopWindow()) - { - // TODO : display the help - return true; - } - return false; -} - -bool wxWinHelpController::DisplaySection(int WXUNUSED(section)) -{ - // Use context number - if (m_helpFile.empty()) - return false; - - wxString str = m_helpFile; - size_t len = str.length(); - if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.'))) - str += wxT(".hlp"); - - if (wxTheApp->GetTopWindow()) - { - // TODO :: - // WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section); - return true; - } - - return false; -} - -bool wxWinHelpController::DisplayBlock(long WXUNUSED(block)) -{ - // Use context number -- a very rough equivalent to block id! - if (m_helpFile.empty()) - return false; - - wxString str = m_helpFile; - size_t len = str.length(); - if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.'))) - str += wxT(".hlp"); - - if (wxTheApp->GetTopWindow()) - { - // TODO: - // WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)block); - return true; - } - return false; -} - -bool wxWinHelpController::KeywordSearch(const wxString& WXUNUSED(k), - wxHelpSearchMode WXUNUSED(mode)) -{ - if (m_helpFile == wxEmptyString) return false; - - wxString str = m_helpFile; - size_t len = str.length(); - if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.'))) - str += wxT(".hlp"); - - if (wxTheApp->GetTopWindow()) - { - // TODO: - // WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k); - return true; - } - return false; -} - -// Can't close the help window explicitly in WinHelp -bool wxWinHelpController::Quit() -{ - if (wxTheApp->GetTopWindow()) - { - // TODO: - // WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), 0, HELP_QUIT, 0L); - return true; - } - - return false; -} - -void wxWinHelpController::OnQuit() -{ -} - -#endif // wxUSE_HELP diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp deleted file mode 100644 index 3d1a4cc723..0000000000 --- a/src/os2/icon.cpp +++ /dev/null @@ -1,279 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/icon.cpp -// Purpose: wxIcon class -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/icon.h" - -#ifndef WX_PRECOMP - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/log.h" -#endif - -#include "wx/os2/private.h" -#include "assert.h" - -IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxIconRefData -// ---------------------------------------------------------------------------- - -void wxIconRefData::Free() -{ - if (m_hIcon) - ::WinFreeFileIcon((HPOINTER)m_hIcon); -} - -// ---------------------------------------------------------------------------- -// wxIcon -// ---------------------------------------------------------------------------- - -wxIcon::wxIcon() - :m_bIsXpm(false) -{ -} - -wxIcon::wxIcon( const char WXUNUSED(bits)[], - int WXUNUSED(nWidth), - int WXUNUSED(nHeight) ) - :m_bIsXpm(false) -{ -} - -wxIcon::wxIcon( const wxString& rIconFile, - wxBitmapType lFlags, - int nDesiredWidth, - int nDesiredHeight ) - :m_bIsXpm(false) -{ - // - // A very poor hack, but we have to have separate icon files from windows - // So we have a modified name where replace the last three characters - // with os2. Also need the extension. - // - wxString sOs2Name = rIconFile.Mid(0, rIconFile.length() - 3); - - sOs2Name += wxT("Os2.ico"); - LoadFile( sOs2Name - ,lFlags - ,nDesiredWidth - ,nDesiredHeight - ); -} - -wxIcon::~wxIcon() -{ -} - -void wxIcon::CreateIconFromXpm(const char* const* ppData) -{ - wxBitmap vBmp(ppData); - - CopyFromBitmap(vBmp); - if (GetHICON()) - { - m_bIsXpm = true; - m_vXpmSrc = vBmp; - } -} // end of wxIcon::CreateIconFromXpm - -void wxIcon::CopyFromBitmap( const wxBitmap& rBmp ) -{ - wxMask* pMask = rBmp.GetMask(); - HBITMAP hBmp = NULLHANDLE; - HBITMAP hBmpMask = NULLHANDLE; - HBITMAP hOldBitmap = NULLHANDLE; - ERRORID vError; - wxString sError; - LONG lHits; - - if (!pMask) - { - // - // We must have a mask for an icon, so even if it's probably incorrect, - // do create it (grey is the "standard" transparent colour) - // - pMask = new wxMask( rBmp - ,*wxLIGHT_GREY - ); - } - - BITMAPINFOHEADER2 vHeader; - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); - HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}, - {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()} - }; - POINTL vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2}, - {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()} - }; - POINTERINFO vIconInfo; - - memset(&vIconInfo, '\0', sizeof(POINTERINFO)); - vIconInfo.fPointer = FALSE; // we want an icon, not a pointer - - memset(&vHeader, '\0', 16); - vHeader.cbFix = 16; - vHeader.cx = (ULONG)rBmp.GetWidth(); - vHeader.cy = (ULONG)rBmp.GetHeight(); - vHeader.cPlanes = 1L; - vHeader.cBitCount = 24; - - hBmp = ::GpiCreateBitmap( hPSDst - ,&vHeader - ,0L - ,NULL - ,NULL - ); - - if ((hOldBitmap = ::GpiSetBitmap(hPSDst, hBmp)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, (HBITMAP)rBmp.GetHBITMAP())) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((lHits = ::GpiBitBlt( hPSDst - ,hPSSrc - ,4L - ,vPoint - ,ROP_SRCCOPY - ,BBO_IGNORE - )) == GPI_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((hOldBitmap = ::GpiSetBitmap(hPSDst, NULLHANDLE)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, NULLHANDLE)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - vIconInfo.hbmColor = hBmp; - - vHeader.cy = (ULONG)rBmp.GetHeight() * 2; - hBmpMask = ::GpiCreateBitmap( hPSDst - ,&vHeader - ,0L - ,NULL - ,NULL - ); - - if ((hOldBitmap = ::GpiSetBitmap(hPSDst, hBmpMask)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, (HBITMAP)pMask->GetMaskBitmap())) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((lHits = ::GpiBitBlt( hPSDst - ,hPSSrc - ,4L - ,vPointMask - ,ROP_SRCCOPY - ,BBO_IGNORE - )) == GPI_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((hOldBitmap = ::GpiSetBitmap(hPSSrc, NULLHANDLE)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((hOldBitmap = ::GpiSetBitmap(hPSDst, NULLHANDLE)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - - vIconInfo.hbmPointer = hBmpMask; - - HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP, &vIconInfo); - - if (!hIcon) - { - wxLogLastError(wxT("WinCreatePointerIndirect")); - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - else - { - SetHICON((WXHICON)hIcon); - SetSize( rBmp.GetWidth() - ,rBmp.GetHeight() - ); - } - - if (!rBmp.GetMask()) - { - // - // We created the mask, now delete it - // - delete pMask; - } - ::GpiSetBitmap(hPSSrc, NULL); - ::GpiSetBitmap(hPSDst, NULL); - ::GpiDestroyPS(hPSSrc); - ::GpiDestroyPS(hPSDst); - ::DevCloseDC(hDCSrc); - ::DevCloseDC(hDCDst); -} // end of wxIcon::CopyFromBitmap - -bool wxIcon::LoadFile( const wxString& rFilename, - wxBitmapType lType, - int nDesiredWidth, - int nDesiredHeight ) -{ - HPS hPs = NULLHANDLE; - - UnRef(); - - wxGDIImageHandler* pHandler = FindHandler(lType); - - if (pHandler) - return(pHandler->Load( this - ,rFilename - ,hPs - ,lType - ,nDesiredWidth - ,nDesiredHeight - )); - else - return false; -} diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp deleted file mode 100644 index 1f714e019e..0000000000 --- a/src/os2/iniconf.cpp +++ /dev/null @@ -1,490 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/iniconf.cpp -// Purpose: implementation of wxIniConfig class -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_CONFIG - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/event.h" - #include "wx/app.h" - #include "wx/utils.h" - #include "wx/log.h" -#endif //WX_PRECOMP - -#include "wx/config.h" - -#include "wx/os2/iniconf.h" - -#define INCL_PM -#include - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// we replace all path separators with this character -#define PATH_SEP_REPLACE '_' - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// ctor & dtor -// ---------------------------------------------------------------------------- - -wxIniConfig::wxIniConfig(const wxString& strAppName, - const wxString& strVendor, - const wxString& localFilename, - const wxString& globalFilename, - long style) - : wxConfigBase(!strAppName && wxTheApp ? wxTheApp->GetAppName() - : strAppName, - !strVendor ? (wxTheApp ? wxTheApp->GetVendorName() - : strAppName) - : strVendor, - localFilename, globalFilename, style) -{ - m_strLocalFilename = localFilename; - if (m_strLocalFilename.empty()) - { - m_strLocalFilename = GetAppName() + wxT(".ini"); - } - - // append the extension if none given and it's not an absolute file name - // (otherwise we assume that they know what they're doing) - if ( !wxIsPathSeparator(m_strLocalFilename[(size_t) 0]) && - m_strLocalFilename.Find('.') == wxNOT_FOUND ) - { - m_strLocalFilename << wxT(".ini"); - } - - // set root path - SetPath(wxEmptyString); -} - -wxIniConfig::~wxIniConfig() -{ -} - -// ---------------------------------------------------------------------------- -// path management -// ---------------------------------------------------------------------------- - -void wxIniConfig::SetPath(const wxString& strPath) -{ - wxArrayString aParts; - - if ( strPath.empty() ) - { - // nothing - } - else if ( strPath[(size_t) 0] == wxCONFIG_PATH_SEPARATOR ) - { - // absolute path - wxSplitPath(aParts, strPath); - } - else - { - // relative path, combine with current one - wxString strFullPath = GetPath(); - strFullPath << wxCONFIG_PATH_SEPARATOR << strPath; - wxSplitPath(aParts, strFullPath); - } - - size_t nPartsCount = aParts.Count(); - m_strPath.Empty(); - if ( nPartsCount == 0 ) - { - // go to the root - m_strGroup = (wxChar*)PATH_SEP_REPLACE; - } - else - { - // translate - m_strGroup = aParts[(size_t) 0]; - for ( size_t nPart = 1; nPart < nPartsCount; nPart++ ) - { - if ( nPart > 1 ) - m_strPath << PATH_SEP_REPLACE; - m_strPath << aParts[nPart]; - } - } - - // other functions assume that all this is true, i.e. there are no trailing - // underscores at the end except if the group is the root one - wxASSERT( (m_strPath.empty() || m_strPath.Last() != PATH_SEP_REPLACE) && - (m_strGroup == wxString((wxChar)PATH_SEP_REPLACE) || - m_strGroup.Last() != PATH_SEP_REPLACE) ); -} - -const wxString& wxIniConfig::GetPath() const -{ - static wxString s_str; - - // always return abs path - s_str = wxCONFIG_PATH_SEPARATOR; - - if ( m_strGroup == wxString((wxChar)PATH_SEP_REPLACE) ) - { - // we're at the root level, nothing to do - } - else - { - s_str << m_strGroup; - if ( !m_strPath.empty() ) - s_str << wxCONFIG_PATH_SEPARATOR; - for ( const wxChar *p = m_strPath; *p != '\0'; p++ ) - { - s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p); - } - } - - return s_str; -} - -wxString wxIniConfig::GetPrivateKeyName(const wxString& szKey) const -{ - wxString strKey; - - if ( !m_strPath.empty() ) - strKey << m_strPath << PATH_SEP_REPLACE; - - strKey << szKey; - - return strKey; -} - -wxString wxIniConfig::GetKeyName(const wxString& szKey) const -{ - wxString strKey; - - if (m_strGroup != wxString((wxChar)PATH_SEP_REPLACE)) - strKey << m_strGroup << PATH_SEP_REPLACE; - if ( !m_strPath.empty() ) - strKey << m_strPath << PATH_SEP_REPLACE; - - strKey << szKey; - - return strKey; -} - -// ---------------------------------------------------------------------------- -// enumeration -// ---------------------------------------------------------------------------- - -// not implemented -bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const -{ - wxFAIL_MSG(wxT("not implemeted")); - - return false; -} - -bool wxIniConfig::GetNextGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const -{ - wxFAIL_MSG(wxT("not implemeted")); - - return false; -} - -bool wxIniConfig::GetFirstEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const -{ - wxFAIL_MSG(wxT("not implemeted")); - - return false; -} - -bool wxIniConfig::GetNextEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const -{ - wxFAIL_MSG(wxT("not implemeted")); - - return false; -} - -// ---------------------------------------------------------------------------- -// misc info -// ---------------------------------------------------------------------------- - -// not implemented -size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const -{ - wxFAIL_MSG(wxT("not implemeted")); - - return (size_t)-1; -} - -size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const -{ - wxFAIL_MSG(wxT("not implemeted")); - - return (size_t)-1; -} - -bool wxIniConfig::HasGroup(const wxString& WXUNUSED(strName)) const -{ - wxFAIL_MSG(wxT("not implemeted")); - - return false; -} - -bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const -{ - wxFAIL_MSG(wxT("not implemeted")); - - return false; -} - -// is current group empty? -bool wxIniConfig::IsEmpty() const -{ - char szBuf[1024]; - -// GetPrivateProfileString(m_strGroup, NULL, "", -// szBuf, WXSIZEOF(szBuf), m_strLocalFilename); - if ( !::wxIsEmpty(szBuf) ) - return false; - -// GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf)); -// if ( !::wxIsEmpty(szBuf) ) -// return false; - - return true; -} - -// ---------------------------------------------------------------------------- -// read/write -// ---------------------------------------------------------------------------- - -bool wxIniConfig::Read(const wxString& szKey, wxString *pstr) const -{ - wxConfigPathChanger path(this, szKey); - wxString strKey = GetPrivateKeyName(path.Name()); - - wxChar szBuf[1024]; // @@ should dynamically allocate memory... - - // first look in the private INI file - - // NB: the lpDefault param to GetPrivateProfileString can't be NULL -// GetPrivateProfileString(m_strGroup, strKey, "", -// szBuf, WXSIZEOF(szBuf), m_strLocalFilename); - if ( ::wxIsEmpty((PSZ)szBuf) ) - { - // now look in win.ini - wxString strKey = GetKeyName(path.Name()); - // GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf)); - } - - if ( ::wxIsEmpty((PSZ)szBuf) ) - { - return false; - } - - *pstr = szBuf ; - return true; -} - -bool wxIniConfig::Read(const wxString& szKey, wxString *pstr, - const wxString& szDefault) const -{ - wxConfigPathChanger path(this, szKey); - wxString strKey = GetPrivateKeyName(path.Name()); - - wxChar szBuf[1024]; // @@ should dynamically allocate memory... - - // first look in the private INI file - - // NB: the lpDefault param to GetPrivateProfileString can't be NULL - // GetPrivateProfileString(m_strGroup, strKey, "", - // szBuf, WXSIZEOF(szBuf), m_strLocalFilename); - if ( ::wxIsEmpty((PSZ)szBuf) ) - { - // now look in win.ini - wxString strKey = GetKeyName(path.Name()); - // GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf)); - } - - if ( ::wxIsEmpty((PSZ)szBuf) ) - { - *pstr = szDefault; - return false; - } - else - { - *pstr = szBuf ; - return true; - } -} - -bool wxIniConfig::Read(const wxString& szKey, long *pl) const -{ - wxConfigPathChanger path(this, szKey); - wxString strKey = GetPrivateKeyName(path.Name()); - - // hack: we have no mean to know if it really found the default value or - // didn't find anything, so we call it twice - - static const int nMagic = 17; // 17 is some "rare" number - static const int nMagic2 = 28; // arbitrary number != nMagic - long lVal = 0; // = GetPrivateProfileInt(m_strGroup, strKey, nMagic, m_strLocalFilename); - - if ( lVal != nMagic ) - { - // the value was read from the file - *pl = lVal; - return true; - } - - // is it really nMagic? - // lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename); - if ( lVal == nMagic2 ) - { - // the nMagic it returned was indeed read from the file - *pl = lVal; - return true; - } - - // no, it was just returning the default value, so now look in win.ini - // *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl); - - return true; -} - -bool wxIniConfig::Write(const wxString& szKey, const wxString& WXUNUSED(szValue)) -{ - wxConfigPathChanger path(this, szKey); - wxString strKey = GetPrivateKeyName(path.Name()); - - bool bOk = false; // = WritePrivateProfileString(m_strGroup, strKey, -// szValue, m_strLocalFilename) != 0; - - if ( !bOk ) - { - wxLogLastError(wxT("WritePrivateProfileString")); - } - - return bOk; -} - -bool wxIniConfig::Write(const wxString& szKey, long lValue) -{ - // ltoa() is not ANSI :-( - wxChar szBuf[40]; // should be good for sizeof(long) <= 16 (128 bits) - wxSprintf(szBuf, wxT("%ld"), lValue); - - return Write(szKey, szBuf); -} - -bool wxIniConfig::Flush(bool /* bCurrentOnly */) -{ - // this is just the way it works - // return WritePrivateProfileString(NULL, NULL, NULL, m_strLocalFilename) != 0; - return false; -} - -// ---------------------------------------------------------------------------- -// delete -// ---------------------------------------------------------------------------- - -bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso) -{ - // passing NULL as value to WritePrivateProfileString deletes the key - // if ( !Write(szKey, (const char *)NULL) ) - // return false; - wxConfigPathChanger path(this, szKey); - wxString strKey = GetPrivateKeyName(path.Name()); - - // if (WritePrivateProfileString(m_strGroup, szKey, - // (const char*) NULL, m_strLocalFilename) == 0) - // return false; - - if ( !bGroupIfEmptyAlso || !IsEmpty() ) - return true; - - // delete the current group too - bool bOk = false; // = WritePrivateProfileString(m_strGroup, NULL, - // NULL, m_strLocalFilename) != 0; - - if ( !bOk ) - { - wxLogLastError(wxT("WritePrivateProfileString")); - } - - return bOk; -} - -bool wxIniConfig::DeleteGroup(const wxString& szKey) -{ - wxConfigPathChanger path(this, szKey); - - // passing NULL as section name to WritePrivateProfileString deletes the - // whole section according to the docs - bool bOk = false; // = WritePrivateProfileString(path.Name(), NULL, - // NULL, m_strLocalFilename) != 0; - - if ( !bOk ) - { - wxLogLastError(wxT("WritePrivateProfileString")); - } - - return bOk; -} - -#ifndef MAX_PATH -#define MAX_PATH 256 -#endif - -bool wxIniConfig::DeleteAll() -{ - // first delete our group in win.ini - // WriteProfileString(GetVendorName(), NULL, NULL); - - // then delete our own ini file - wxChar szBuf[MAX_PATH]; - size_t nRc = 0; // = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf)); - if ( nRc == 0 ) - { - wxLogLastError(wxT("GetWindowsDirectory")); - } - else if ( nRc > WXSIZEOF(szBuf) ) - { - wxFAIL_MSG(_("buffer is too small for Windows directory.")); - } - - wxString strFile = szBuf; - strFile << wxT('\\') << m_strLocalFilename; - - if ( !wxRemoveFile(strFile) ) - { - wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str()); - return false; - } - - return true; -} - -bool wxIniConfig::RenameEntry(const wxString& WXUNUSED(oldName), const wxString& WXUNUSED(newName)) -{ - // Not implemented - return false; -} - -bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName), const wxString& WXUNUSED(newName)) -{ - // Not implemented - return false; -} - -#endif //wxUSE_CONFIG diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp deleted file mode 100644 index d12fa211be..0000000000 --- a/src/os2/joystick.cpp +++ /dev/null @@ -1,291 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/joystick.cpp -// Purpose: wxJoystick class -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_JOYSTICK - -#include "wx/joystick.h" - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/window.h" -#endif - -#define INCL_PM -#define INCL_DOS -#include "wx/os2/private.h" - -#define NO_JOYGETPOSEX - -IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject) - -// Attributes -//////////////////////////////////////////////////////////////////////////// - -wxPoint wxJoystick::GetPosition() const -{ - // TODO - return wxPoint(0, 0); -} - -int wxJoystick::GetZPosition() const -{ - // TODO - return 0; -} - -int wxJoystick::GetButtonState() const -{ - // TODO - return 0; -} - -int wxJoystick::GetPOVPosition() const -{ - // TODO - return 0; -} - -int wxJoystick::GetPOVCTSPosition() const -{ - // TODO - return 0; -} - -int wxJoystick::GetRudderPosition() const -{ - // TODO - return 0; -} - -int wxJoystick::GetUPosition() const -{ - // TODO - return 0; -} - -int wxJoystick::GetVPosition() const -{ - // TODO - return 0; -} - -int wxJoystick::GetMovementThreshold() const -{ - // TODO - return 0; -} - -void wxJoystick::SetMovementThreshold(int WXUNUSED(threshold)) -{ - // TODO -} - -// Capabilities -//////////////////////////////////////////////////////////////////////////// - -bool wxJoystick::IsOk() const -{ - // TODO - return false; -} - -int wxJoystick::GetNumberJoysticks() -{ - // TODO - return 0; -} - -int wxJoystick::GetManufacturerId() const -{ - // TODO - return 0; -} - -int wxJoystick::GetProductId() const -{ - // TODO - return 0; -} - -wxString wxJoystick::GetProductName() const -{ - // TODO - return wxEmptyString; -} - -int wxJoystick::GetXMin() const -{ - // TODO - return 0; -} - -int wxJoystick::GetYMin() const -{ - // TODO - return 0; -} - -int wxJoystick::GetZMin() const -{ - // TODO - return 0; -} - -int wxJoystick::GetXMax() const -{ - // TODO - return 0; -} - -int wxJoystick::GetYMax() const -{ - // TODO - return 0; -} - -int wxJoystick::GetZMax() const -{ - // TODO - return 0; -} - -int wxJoystick::GetNumberButtons() const -{ - // TODO - return 0; -} - -int wxJoystick::GetNumberAxes() const -{ - // TODO - return 0; -} - -int wxJoystick::GetMaxButtons() const -{ - // TODO - return 0; -} - -int wxJoystick::GetMaxAxes() const -{ - // TODO - return 0; -} - -int wxJoystick::GetPollingMin() const -{ - // TODO - return 0; -} - -int wxJoystick::GetPollingMax() const -{ - // TODO - return 0; -} - -int wxJoystick::GetRudderMin() const -{ - // TODO - return 0; -} - -int wxJoystick::GetRudderMax() const -{ - // TODO - return 0; -} - -int wxJoystick::GetUMin() const -{ - // TODO - return 0; -} - -int wxJoystick::GetUMax() const -{ - // TODO - return 0; -} - -int wxJoystick::GetVMin() const -{ - // TODO - return 0; -} - -int wxJoystick::GetVMax() const -{ - // TODO - return 0; -} - -bool wxJoystick::HasRudder() const -{ - // TODO - return false; -} - -bool wxJoystick::HasZ() const -{ - // TODO - return false; -} - -bool wxJoystick::HasU() const -{ - // TODO - return false; -} - -bool wxJoystick::HasV() const -{ - // TODO - return false; -} - -bool wxJoystick::HasPOV() const -{ - // TODO - return false; -} - -bool wxJoystick::HasPOV4Dir() const -{ - // TODO - return false; -} - -bool wxJoystick::HasPOVCTS() const -{ - // TODO - return false; -} - -// Operations -//////////////////////////////////////////////////////////////////////////// - -bool wxJoystick::SetCapture(wxWindow* WXUNUSED(win), int WXUNUSED(pollingFreq)) -{ - // TODO - return false; -} - -bool wxJoystick::ReleaseCapture() -{ - // TODO - return false; -} - -#endif // wxUSE_JOYSTICK diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp deleted file mode 100644 index 9960d92fc0..0000000000 --- a/src/os2/listbox.cpp +++ /dev/null @@ -1,776 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/listbox.cpp -// Purpose: wxListBox -// Author: David Webster -// Modified by: -// Created: 10/09/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_LISTBOX - -#include "wx/listbox.h" - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/settings.h" - #include "wx/brush.h" - #include "wx/font.h" - #include "wx/dc.h" - #include "wx/dcscreen.h" - #include "wx/utils.h" - #include "wx/scrolwin.h" - #include "wx/log.h" - #include "wx/window.h" -#endif - -#include "wx/os2/dcclient.h" -#include "wx/os2/private.h" - -#define INCL_M -#include - -#if wxUSE_OWNER_DRAWN - #include "wx/ownerdrw.h" -#endif - -// ============================================================================ -// list box item declaration and implementation -// ============================================================================ - -#if wxUSE_OWNER_DRAWN - -class wxListBoxItem : public wxOwnerDrawn -{ -public: - wxListBoxItem(wxListBox *parent) - { m_parent = parent; } - - wxListBox *GetParent() const - { return m_parent; } - - int GetIndex() const - { return m_parent->GetItemIndex(const_cast(this)); } - - wxString GetName() const - { return m_parent->GetString(GetIndex()); } - -private: - wxListBox *m_parent; -}; - -wxOwnerDrawn* wxListBox::CreateItem( size_t WXUNUSED(n) ) -{ - return new wxListBoxItem(this); -} // end of wxListBox::CreateItem - -#endif //USE_OWNER_DRAWN - -// ============================================================================ -// list box control implementation -// ============================================================================ - -// Listbox item -wxListBox::wxListBox() -{ - m_nNumItems = 0; - m_nSelected = 0; -} // end of wxListBox::wxListBox - -bool wxListBox::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, const wxArrayString& asChoices -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) -{ - wxCArrayString chs(asChoices); - - return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(), - lStyle, rValidator, rsName); -} - -bool wxListBox::Create( wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - int n, - const wxString asChoices[], - long lStyle, - const wxValidator& rValidator, - const wxString& rsName ) -{ - m_nNumItems = 0; - m_hWnd = 0; - m_nSelected = 0; - - SetName(rsName); -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - - if (pParent) - pParent->AddChild(this); - - wxSystemSettings vSettings; - - SetBackgroundColour(vSettings.GetColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(pParent->GetForegroundColour()); - - m_windowId = (vId == -1) ? (int)NewControlId() : vId; - - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - - m_windowStyle = lStyle; - - lStyle = WS_VISIBLE; - - if (m_windowStyle & wxCLIP_SIBLINGS ) - lStyle |= WS_CLIPSIBLINGS; - if (m_windowStyle & wxLB_MULTIPLE) - lStyle |= LS_MULTIPLESEL; - else if (m_windowStyle & wxLB_EXTENDED) - lStyle |= LS_EXTENDEDSEL; - if (m_windowStyle & wxLB_HSCROLL) - lStyle |= LS_HORZSCROLL; - if (m_windowStyle & wxLB_OWNERDRAW) - lStyle |= LS_OWNERDRAW; - - // - // Without this style, you get unexpected heights, so e.g. constraint layout - // doesn't work properly - // - lStyle |= LS_NOADJUSTPOS; - - m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent) // Parent - ,WC_LISTBOX // Default Listbox class - ,"LISTBOX" // Control's name - ,lStyle // Initial Style - ,0, 0, 0, 0 // Position and size - ,GetWinHwnd(pParent) // Owner - ,HWND_TOP // Z-Order - ,(HMENU)m_windowId // Id - ,NULL // Control Data - ,NULL // Presentation Parameters - ); - if (m_hWnd == 0) - { - return false; - } - - // - // Subclass again for purposes of dialog editing mode - // - SubclassWin(m_hWnd); - - LONG lUi; - - for (lUi = 0; lUi < (LONG)n; lUi++) - { - Append(asChoices[lUi]); - } - wxFont* pTextFont = new wxFont( 10 - ,wxMODERN - ,wxNORMAL - ,wxNORMAL - ); - SetFont(*pTextFont); - - // - // Set OS/2 system colours for Listbox items and highlighting - // - wxColour vColour; - - vColour = wxSystemSettingsNative::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); - - LONG lColor = (LONG)vColour.GetPixel(); - - ::WinSetPresParam( m_hWnd - ,PP_HILITEFOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - vColour = wxSystemSettingsNative::GetColour(wxSYS_COLOUR_HIGHLIGHT); - lColor = (LONG)vColour.GetPixel(); - ::WinSetPresParam( m_hWnd - ,PP_HILITEBACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - - SetXComp(0); - SetYComp(0); - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - delete pTextFont; - return true; -} // end of wxListBox::Create - -wxListBox::~wxListBox() -{ - Clear(); -} // end of wxListBox::~wxListBox - -void wxListBox::SetupColours() -{ - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(GetParent()->GetForegroundColour()); -} // end of wxListBox::SetupColours - -// ---------------------------------------------------------------------------- -// implementation of wxListBoxBase methods -// ---------------------------------------------------------------------------- - -void wxListBox::DoSetFirstItem(int N) -{ - wxCHECK_RET( IsValid(N), - wxT("invalid index in wxListBox::SetFirstItem") ); - - ::WinSendMsg(GetHwnd(), LM_SETTOPINDEX, MPFROMLONG(N), (MPARAM)0); -} // end of wxListBox::DoSetFirstItem - -void wxListBox::DoDeleteOneItem(unsigned int n) -{ - wxCHECK_RET( IsValid(n), - wxT("invalid index in wxListBox::Delete") ); - -#if wxUSE_OWNER_DRAWN - delete m_aItems[n]; - m_aItems.RemoveAt(n); -#endif // wxUSE_OWNER_DRAWN - - ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0); - m_nNumItems--; -} // end of wxListBox::DoSetFirstItem - -int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, - unsigned int pos, - void **clientData, - wxClientDataType type) -{ - LONG lIndexType = 0; - bool incrementPos = false; - - if (IsSorted()) - lIndexType = LIT_SORTASCENDING; - else if (pos == GetCount()) - lIndexType = LIT_END; - else - { - lIndexType = (LONG)pos; - incrementPos = true; - } - - int n = wxNOT_FOUND; - - unsigned int count = items.GetCount(); - for (unsigned int i = 0; i < count; i++) - { - n = (int)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)items[i].wx_str()); - if (n < 0) - { - wxLogLastError(wxT("WinSendMsg(LM_INSERTITEM)")); - n = wxNOT_FOUND; - break; - } - ++m_nNumItems; - -#if wxUSE_OWNER_DRAWN - if (HasFlag(wxLB_OWNERDRAW)) - { - wxOwnerDrawn* pNewItem = CreateItem(n); // dummy argument - pNewItem->SetFont(GetFont()); - m_aItems.Insert(pNewItem, n); - } -#endif - AssignNewItemClientData(n, clientData, i, type); - - if (incrementPos) - ++lIndexType; - } - - return n; -} // end of wxListBox::DoInsertAppendItemsWithData - -void wxListBox::DoClear() -{ -#if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) - { - WX_CLEAR_ARRAY(m_aItems); - } -#endif // wxUSE_OWNER_DRAWN - ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0); - - m_nNumItems = 0; -} // end of wxListBox::Clear - -void wxListBox::DoSetSelection( int N, bool bSelect) -{ - wxCHECK_RET( IsValid(N), - wxT("invalid index in wxListBox::SetSelection") ); - ::WinSendMsg( GetHwnd() - ,LM_SELECTITEM - ,MPFROMLONG(N) - ,(MPARAM)bSelect - ); - if(m_windowStyle & wxLB_OWNERDRAW) - Refresh(); -} // end of wxListBox::SetSelection - -bool wxListBox::IsSelected( int N ) const -{ - wxCHECK_MSG( IsValid(N), false, - wxT("invalid index in wxListBox::Selected") ); - - LONG lItem; - - if (GetWindowStyleFlag() & wxLB_EXTENDED) - { - if (N == 0) - lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0)); - else - lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)(N - 1), (MPARAM)0)); - } - else - { - lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0)); - } - return (lItem == (LONG)N && lItem != LIT_NONE); -} // end of wxListBox::IsSelected - -void* wxListBox::DoGetItemClientData(unsigned int n) const -{ - wxCHECK_MSG( IsValid(n), NULL, - wxT("invalid index in wxListBox::GetClientData") ); - - return((void *)::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, MPFROMLONG(n), (MPARAM)0)); -} // end of wxListBox::DoGetItemClientData - -void wxListBox::DoSetItemClientData(unsigned int n, void* pClientData) -{ - wxCHECK_RET( IsValid(n), - wxT("invalid index in wxListBox::SetClientData") ); - - ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(n), MPFROMP(pClientData)); -} // end of wxListBox::DoSetItemClientData - -bool wxListBox::HasMultipleSelection() const -{ - return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED); -} // end of wxListBox::HasMultipleSelection - -int wxListBox::GetSelections( wxArrayInt& raSelections ) const -{ - int nCount = 0; - LONG lItem; - - - raSelections.Empty(); - if (HasMultipleSelection()) - { - lItem = LONGFROMMR(::WinSendMsg( GetHwnd() - ,LM_QUERYSELECTION - ,(MPARAM)LIT_FIRST - ,(MPARAM)0 - ) - ); - if (lItem != LIT_NONE) - { - nCount++; - while ((lItem = LONGFROMMR(::WinSendMsg( GetHwnd() - ,LM_QUERYSELECTION - ,(MPARAM)lItem - ,(MPARAM)0 - ) - )) != LIT_NONE) - { - nCount++; - } - raSelections.Alloc(nCount); - lItem = LONGFROMMR(::WinSendMsg( GetHwnd() - ,LM_QUERYSELECTION - ,(MPARAM)LIT_FIRST - ,(MPARAM)0 - ) - ); - - raSelections.Add((int)lItem); - while ((lItem = LONGFROMMR(::WinSendMsg( GetHwnd() - ,LM_QUERYSELECTION - ,(MPARAM)lItem - ,(MPARAM)0 - ) - )) != LIT_NONE) - { - raSelections.Add((int)lItem); - } - return nCount; - } - } - else // single-selection listbox - { - lItem = LONGFROMMR(::WinSendMsg( GetHwnd() - ,LM_QUERYSELECTION - ,(MPARAM)LIT_FIRST - ,(MPARAM)0 - ) - ); - raSelections.Add((int)lItem); - return 1; - } - return 0; -} // end of wxListBox::GetSelections - -int wxListBox::GetSelection() const -{ - wxCHECK_MSG( !HasMultipleSelection(), - -1, - wxT("GetSelection() can't be used with multiple-selection " - "listboxes, use GetSelections() instead.") ); - - return(LONGFROMMR(::WinSendMsg( GetHwnd() - ,LM_QUERYSELECTION - ,(MPARAM)LIT_FIRST - ,(MPARAM)0 - ) - )); -} // end of wxListBox::GetSelection - -wxString wxListBox::GetString(unsigned int n) const -{ - LONG lLen = 0; - wxChar* zBuf; - wxString sResult; - - wxCHECK_MSG( IsValid(n), wxEmptyString, - wxT("invalid index in wxListBox::GetClientData") ); - - lLen = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0)); - zBuf = new wxChar[lLen + 1]; - ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)n, (SHORT)lLen), (MPARAM)zBuf); - zBuf[lLen] = '\0'; - sResult = zBuf; - delete [] zBuf; - return sResult; -} // end of wxListBox::GetString - -void wxListBox::SetString(unsigned int n, const wxString& rsString) -{ - wxCHECK_RET( IsValid(n), - wxT("invalid index in wxListBox::SetString") ); - - // - // Remember the state of the item - // - bool bWasSelected = IsSelected(n); - void* pOldData = NULL; - wxClientData* pOldObjData = NULL; - - if ( HasClientUntypedData() ) - pOldData = GetClientData(n); - else if ( HasClientObjectData() ) - pOldObjData = GetClientObject(n); - - // - // Delete and recreate it - // - ::WinSendMsg( GetHwnd() - ,LM_DELETEITEM - ,(MPARAM)n - ,(MPARAM)0 - ); - - int nNewN = n; - - if (n == (m_nNumItems - 1)) - nNewN = -1; - - ::WinSendMsg( GetHwnd() - ,LM_INSERTITEM - ,(MPARAM)nNewN - ,(MPARAM)rsString.wx_str() - ); - - // - // Restore the client data - // - if (pOldData) - SetClientData(n, pOldData); - else if (pOldObjData) - SetClientObject(n, pOldObjData); - - // - // We may have lost the selection - // - if (bWasSelected) - Select(n); -} // end of wxListBox::SetString - -unsigned int wxListBox::GetCount() const -{ - return m_nNumItems; -} - -// ---------------------------------------------------------------------------- -// helpers -// ---------------------------------------------------------------------------- - -wxSize wxListBox::DoGetBestSize() const -{ - // - // Find the widest string - // - int nLine; - int nListbox = 0; - int nCx; - int nCy; - wxFont vFont = (wxFont)GetFont(); - - for (unsigned int i = 0; i < m_nNumItems; i++) - { - wxString vStr(GetString(i)); - - GetTextExtent( vStr, &nLine, NULL ); - if (nLine > nListbox) - nListbox = nLine; - } - - // - // Give it some reasonable default value if there are no strings in the - // list. - // - if (nListbox == 0) - nListbox = 100; - - // - // The listbox should be slightly larger than the widest string - // - wxGetCharSize( GetHWND() - ,&nCx - ,&nCy - ,&vFont - ); - nListbox += 3 * nCx; - - int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * (wxMax(m_nNumItems, 7)); - - return wxSize( nListbox - ,hListbox - ); -} // end of wxListBox::DoGetBestSize - -// ---------------------------------------------------------------------------- -// callbacks -// ---------------------------------------------------------------------------- - -bool wxListBox::OS2Command( - WXUINT uParam -, WXWORD WXUNUSED(wId)) -{ - wxEventType eEvtType; - - if (uParam == LN_SELECT) - { - eEvtType = wxEVT_LISTBOX; - } - else if (uParam == LN_ENTER) - { - eEvtType = wxEVT_LISTBOX_DCLICK; - } - else - { - // - // Some event we're not interested in - // - return false; - } - wxCommandEvent vEvent( eEvtType - ,m_windowId - ); - - vEvent.SetEventObject(this); - - wxArrayInt aSelections; - int n; - int nCount = GetSelections(aSelections); - - if (nCount > 0) - { - n = aSelections[0]; - if (HasClientObjectData()) - vEvent.SetClientObject(GetClientObject(n)); - else if ( HasClientUntypedData() ) - vEvent.SetClientData(GetClientData(n)); - vEvent.SetString(GetString(n)); - } - else - { - n = -1; - } - vEvent.SetInt(n); - return HandleWindowEvent(vEvent); -} // end of wxListBox::OS2Command - -// ---------------------------------------------------------------------------- -// wxCheckListBox support -// ---------------------------------------------------------------------------- - -#if wxUSE_OWNER_DRAWN - -// -// Drawing -// ------- -// -#define OWNER_DRAWN_LISTBOX_EXTRA_SPACE (1) - -long wxListBox::OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem) -{ - if (!pItem) - pItem = (WXMEASUREITEMSTRUCT*)new OWNERITEM; - - POWNERITEM pMeasureStruct = (POWNERITEM)pItem; - wxScreenDC vDc; - - // - // Only owner-drawn control should receive this message - // - wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE ); - - vDc.SetFont(GetFont()); - - wxCoord vHeight; - wxCoord vWidth; - - GetSize( &vWidth - ,NULL - ); - - pMeasureStruct->rclItem.xRight = (USHORT)vWidth; - pMeasureStruct->rclItem.xLeft = 0; - pMeasureStruct->rclItem.yTop = 0; - pMeasureStruct->rclItem.yBottom = 0; - - vHeight = (wxCoord)(vDc.GetCharHeight() * 2.5); - pMeasureStruct->rclItem.yTop = (USHORT)vHeight; - - return long(MRFROM2SHORT((USHORT)vHeight, (USHORT)vWidth)); -} // end of wxListBox::OS2OnMeasure - -bool wxListBox::OS2OnDraw ( - WXDRAWITEMSTRUCT* pItem -) -{ - POWNERITEM pDrawStruct = (POWNERITEM)pItem; - int eAction = 0; - int eStatus = 0; - - // - // Only owner-drawn control should receive this message - // - wxCHECK(((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), false); - - - // - // The item may be -1 for an empty listbox - // - if (pDrawStruct->idItem == -1L) - return false; - - wxListBoxItem* pData = (wxListBoxItem*)m_aItems[pDrawStruct->idItem]; - - wxClientDC vDc(this); - wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl(); - wxPoint pt1( pDrawStruct->rclItem.xLeft, pDrawStruct->rclItem.yTop ); - wxPoint pt2( pDrawStruct->rclItem.xRight, pDrawStruct->rclItem.yBottom ); - wxRect vRect( pt1, pt2 ); - - impl->SetHPS(pDrawStruct->hps); - - if (pDrawStruct->fsAttribute == pDrawStruct->fsAttributeOld) - { - // - // Entire Item needs to be redrawn (either it has reappeared from - // behind another window or is being displayed for the first time - // - eAction = wxOwnerDrawn::wxODDrawAll; - - if (pDrawStruct->fsAttribute & MIA_HILITED) - { - // - // If it is currently selected we let the system handle it - // - eStatus |= wxOwnerDrawn::wxODSelected; - } - if (pDrawStruct->fsAttribute & MIA_CHECKED) - { - // - // If it is currently checked we draw our own - // - eStatus |= wxOwnerDrawn::wxODChecked; - pDrawStruct->fsAttributeOld = pDrawStruct->fsAttribute &= ~MIA_CHECKED; - } - if (pDrawStruct->fsAttribute & MIA_DISABLED) - { - // - // If it is currently disabled we let the system handle it - // - eStatus |= wxOwnerDrawn::wxODDisabled; - } - // - // Don't really care about framed (indicationg focus) or NoDismiss - // - } - else - { - if (pDrawStruct->fsAttribute & MIA_HILITED) - { - eAction = wxOwnerDrawn::wxODDrawAll; - eStatus |= wxOwnerDrawn::wxODSelected; - // - // Keep the system from trying to highlight with its bogus colors - // - pDrawStruct->fsAttributeOld = pDrawStruct->fsAttribute &= ~MIA_HILITED; - } - else if (!(pDrawStruct->fsAttribute & MIA_HILITED)) - { - eAction = wxOwnerDrawn::wxODDrawAll; - eStatus = 0; - // - // Keep the system from trying to highlight with its bogus colors - // - pDrawStruct->fsAttribute = pDrawStruct->fsAttributeOld &= ~MIA_HILITED; - } - else - { - // - // For now we don't care about anything else - // just ignore the entire message! - // - return true; - } - } - return pData->OnDrawItem( vDc - ,vRect - ,(wxOwnerDrawn::wxODAction)eAction - ,(wxOwnerDrawn::wxODStatus)(eStatus | wxOwnerDrawn::wxODHidePrefix) - ); -} // end of wxListBox::OS2OnDraw - -#endif // ndef for wxUSE_OWNER_DRAWN - -#endif // wxUSE_LISTBOX diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp deleted file mode 100644 index 5954c424d1..0000000000 --- a/src/os2/listctrl.cpp +++ /dev/null @@ -1,2741 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/listctrl.cpp -// Purpose: wxListCtrl -// Author: David Webster -// Modified by: -// Created: 01/21/03 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_LISTCTRL - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/settings.h" - #include "wx/dcclient.h" - #include "wx/textctrl.h" -#endif - -#include "wx/imaglist.h" -#include "wx/listctrl.h" - -#include "wx/os2/private.h" - -// -// FIELDOFFSET in DETAIL view as defined in the OS2TK45 simply doesn't work -// We use this, which does! -// -#undef FIELDOFFSET -#define FIELDOFFSET(type, field) ((ULONG)&(((type *)0)->field)) - -// ---------------------------------------------------------------------------- -// private helper classes -// ---------------------------------------------------------------------------- - -///////////////////////////////////////////////////////////////////////////// -// STRUCT SMYRECORD -// Under OS/2 we have to use our own RECORDCORE based struct if we have -// user data to store in a PM Container Control (and wxListCtrl is a PM -// Container in ICON, NAME, TEXT or DETAIL view). m_ulUserData is a four -// byte value containing a pointer to our CListIntemInternalData class -// instance. -// -// And now for the big time OS/2 Kludge. In traditional OS/2 PM -// applications using containers, programmers determine BEFORE creation -// how many records the view will have, initially, and how many columns -// the detail view of the container will have, as the container represents -// a known data block. Thus the OS/2 PM CV_DETAIL view, i.e. -// the wxWidgets wxLC_REPORT view, relies on STATIC structure for its -// columnar data. It gets the data to display by telling it the specific -// offset of the field in the struct containing the displayable data. That -// data has be of OS/2 Types, PSZ (char string), CDATE or CTIME format. -// wxWidgets is dynamic in nature, however. We insert columns, one at a -// time and do not know how many until the app is done inserting them. So -// for OS/2 I have to set a max allowable since they are fixed. We return -// an error to the app if they include more than we can handle. -// -// For example to display the data "Col 4 of Item 6" in a report view, I'd -// have to do: -// pRecord->m_pzColumn4 = "Col 4 of Item 6"; -// pField->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn4); -// and then call the PM API to set it. -// -// This really stinks but I can't use a pointer to another struct as the -// FIELDOFFSET call could only tell OS/2 the four byte value offset of -// pointer field and it would display giberish in the column. -///////////////////////////////////////////////////////////////////////////// -typedef struct _MYRECORD -{ - RECORDCORE m_vRecord; - unsigned long m_ulItemId; - unsigned long m_ulUserData; //actually a pointer value to real data (a CListItemInternalData class instance) - PSZ m_pzColumn1; - PSZ m_pzColumn2; - PSZ m_pzColumn3; - PSZ m_pzColumn4; - PSZ m_pzColumn5; - PSZ m_pzColumn6; - PSZ m_pzColumn7; - PSZ m_pzColumn8; - PSZ m_pzColumn9; - PSZ m_pzColumn10; -} MYRECORD, *PMYRECORD; - -///////////////////////////////////////////////////////////////////////////// -// CLASS CListItemInternalData -// -// Problem: -// The MSW version had problems with SetTextColour() et al as the -// CListItemAttr's were stored keyed on the item index. If a item was -// inserted anywhere but the end of the list the text attributes -// (colour etc) for the following items were out of sync. -// -// Solution: -// Under MSW the only way to associate data with a -// List item independent of its position in the list is to store a pointer -// to it in its lParam attribute. However user programs are already using -// this (via the SetItemData() GetItemData() calls). -// -// However what we can do is store a pointer to a structure which contains -// the attributes we want *and* a lParam for the users data, e.g. -// -// class CListItemInternalData -// { -// public: -// GuiAdvCtrl_CListItemAttr* pAttr; -// long lParam; // user data -// }; -// -// To conserve memory, a CListItemInternalData is only allocated for a -// LV_ITEM if text attributes or user data(lparam) are being set. -// -// For OS/2, the lParam value points to whatever actual data we have -///////////////////////////////////////////////////////////////////////////// -class CListItemInternalData -{ -public: - - CListItemInternalData(): m_pAttr(NULL) - ,m_lParam(0) - {} - - ~CListItemInternalData() - { - wxDELETE(m_pAttr); - } - - wxListItemAttr* m_pAttr; - WXLPARAM m_lParam; // user data - PMYRECORD m_pMyRecord; // so we can set the m_ulUserData to 0 when this is deleted -}; // end of CLASS CListItemInternalData - -///////////////////////////////////////////////////////////////////////////// -// STRUCT SInternalDataSort -// -// Sort items. -// -// fn is a function which takes 3 long arguments: item1, item2, data. -// item1 is the long data associated with a first item (NOT the index). -// item2 is the long data associated with a second item (NOT the index). -// data is the same value as passed to SortItems. -// -// The return value is a negative number if the first item should precede the -// second item, a positive number of the second item should precede the first, -// or zero if the two items are equivalent. -// -// data is arbitrary data to be passed to the sort function. -// -// Internal structures for proxying the user compare function -// so that we can pass it the *real* user data -///////////////////////////////////////////////////////////////////////////// -typedef struct internalDataSort -{ - wxListCtrlCompare m_fnUser; - long m_lData; -} SInternalDataSort; // end of STRUCT SInternalDataSort - -// ---------------------------------------------------------------------------- -// private helper functions -// ---------------------------------------------------------------------------- - -///////////////////////////////////////////////////////////////////////////// -// -// FindOS2ListFieldByColNum -// -// There is no way, under OS/2 to get a field in a container by index, -// directly, so you must get the first one, then cycle through the list -// until you get to where you want to be. -// -// PARAMETERS -// hWnd -- window handle of container to search -// lIndex -- index to set -// -// RETURN VALUE -// pointer to the FIELDINFO struct at the index in the container record -// -///////////////////////////////////////////////////////////////////////////// -PFIELDINFO FindOS2ListFieldByColNum ( - HWND hWnd -, long lIndex -) -{ - PFIELDINFO pFieldInfo = NULL; - CNRINFO vCnrInfo; - ULONG i; - - if (!::WinSendMsg( hWnd - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return NULL; - for (i = 0; i < vCnrInfo.cFields; i++) - { - if (i == 0) - pFieldInfo = (PFIELDINFO)PVOIDFROMMR(::WinSendMsg( hWnd - ,CM_QUERYDETAILFIELDINFO - ,MPFROMP(pFieldInfo) - ,(MPARAM)CMA_FIRST - )); - else - pFieldInfo = (PFIELDINFO)PVOIDFROMMR(::WinSendMsg( hWnd - ,CM_QUERYDETAILFIELDINFO - ,MPFROMP(pFieldInfo) - ,(MPARAM)CMA_NEXT - )); - if (!pFieldInfo) - return NULL; - if (i == (ULONG)lIndex) - break; - } - if (!pFieldInfo) - return NULL; - return pFieldInfo; -} // end of FindOS2ListFieldByColNum - -///////////////////////////////////////////////////////////////////////////// -// -// FindOS2ListRecordByID -// -// There is no way, under OS/2 to get a record in a container by index, -// directly, so you must get the first one, then cycle through the list -// until you get to where you want to be. -// -// PARAMETERS -// hWnd -- window handle of container to search -// lItemId -- index to set -// -// RETURN VALUE -// pointer to the internal RECORDCORE struct at the index in the container -// -///////////////////////////////////////////////////////////////////////////// -PMYRECORD FindOS2ListRecordByID ( - HWND hWnd -, long lItemId -) -{ - PMYRECORD pRecord = NULL; - CNRINFO vCnrInfo; - unsigned long i; - - if (!::WinSendMsg( hWnd - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return NULL; - for (i = 0; i < vCnrInfo.cRecords; i++) - { - if (i == 0) - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( hWnd - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER) - )); - else - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( hWnd - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - if (!pRecord) - return NULL; - if (pRecord->m_ulItemId == (ULONG)lItemId) - break; - } - return pRecord; -} // end of FindOS2ListRecordByID - -///////////////////////////////////////////////////////////////////////////// -// -// BumpRecordIds -// -// Since OS/2 does not keep native record id's but wx insists on inserting -// and selecting via ID's, when we insert a record in the middle we need -// to bump the id's of each record after the one we just inserted. -// -// PARAMETERS -// hWnd -- window handle of container to search -// pRecord -- record after which we starting bumping id's -// -// RETURN VALUE -// none -// -///////////////////////////////////////////////////////////////////////////// -void BumpRecordIds ( - HWND hWnd -, PMYRECORD pRecord -) -{ - while(pRecord) - { - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( hWnd - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - if (pRecord) - pRecord->m_ulItemId++; - } -} // end of BumpRecordIds - -///////////////////////////////////////////////////////////////////////////// -// -// GetInternalData -// -// Get the internal data given a handle and an id -// -// PARAMETERS -// hWnd -- window handle to the control in which item is located -// lItemId -- ID to get -// -// RETURN VALUE -// pointer to the internal data -// -// Note: -// Under OS/2 PM a container item cannot be obtained via a simple index or -// id retrieval. We have to walk the record list if we are looking for -// a record at a specific index location -///////////////////////////////////////////////////////////////////////////// -CListItemInternalData* GetInternalData ( - HWND hWnd -, long lItemId -) -{ - PMYRECORD pRecord = FindOS2ListRecordByID( hWnd - ,lItemId - ); - // - // Internal user data is stored AFTER the last field of the RECORDCORE - // - if (!pRecord) - return NULL; - return((CListItemInternalData *)(pRecord->m_ulUserData)); -} // end of GetInternalData - -///////////////////////////////////////////////////////////////////////////// -// -// GetInternalData -// -// Get the internal data given a pointer to a list control and an id -// -// PARAMETERS -// pCtl -- pointer to control inwhich item is located -// lItemId -- ID to get -// -// RETURN VALUE -// pointer to the internal data -// -///////////////////////////////////////////////////////////////////////////// -CListItemInternalData* GetInternalData ( - wxListCtrl* pCtl -, long lItemId -) -{ - return(GetInternalData( (HWND)pCtl->GetHWND() - ,lItemId - )); -} // end of GetInternalData - -///////////////////////////////////////////////////////////////////////////// -// -// DeleteInternalData -// -// Delete the internal data for a record -// -// PARAMETERS -// pCtl -- pointer to the list control containing the record -// lItemId -- the record index to delete the internal data from -// -// RETURN VALUE -// pointer to the internal data attribute -// -///////////////////////////////////////////////////////////////////////////// -void DeleteInternalData ( - wxListCtrl* pCtl -, long lItemId -) -{ - CListItemInternalData* pData = GetInternalData( pCtl - ,lItemId - ); - if (pData) - { - if (pData->m_pMyRecord) - pData->m_pMyRecord->m_ulUserData = 0; - delete pData; - } -} // end of DeleteInternalData - -// #pragma page "GetInternalDataAttr" -///////////////////////////////////////////////////////////////////////////// -// -// GetInternalDataAttr -// -// Get the internal data item attribute given a pointer to a list control -// and an id -// -// PARAMETERS -// pCtl -- pointer to control to set -// lItemId -- ID to set -// -// RETURN VALUE -// pointer to the internal data attribute -// -///////////////////////////////////////////////////////////////////////////// -wxListItemAttr* GetInternalDataAttr ( - wxListCtrl* pCtl -, long lItemId -) -{ - CListItemInternalData* pData = GetInternalData( pCtl - ,lItemId - ); - - if (pData) - return(pData->m_pAttr); - else - return NULL; -} // end of GetInternalDataAttr - -///////////////////////////////////////////////////////////////////////////// -// -// InternalDataCompareFunc -// -// This is compare function we pass to PM. It wraps the real compare -// function in SInternalDataSort -// -// PARAMETERS -// p1 -- is the first record structure to compare -// p2 -- is the second record structure to compare -// lStorage -- is the same value as passed to SortItems. -// -// RETURN VALUE -// pointer to the internal data attribute -// -///////////////////////////////////////////////////////////////////////////// -SHORT EXPENTRY InternalDataCompareFunc ( - PMYRECORD p1 -, PMYRECORD p2 -, PVOID pStorage -) -{ - SInternalDataSort* pInternalData = (SInternalDataSort *)pStorage; - CListItemInternalData* pData1 = (CListItemInternalData *)p1->m_ulUserData; - CListItemInternalData* pData2 = (CListItemInternalData *)p2->m_ulUserData; - long lD1 = (pData1 == NULL ? 0 : (long)pData1->m_lParam); - long lD2 = (pData2 == NULL ? 0 : (long)pData2->m_lParam); - - return(pInternalData->m_fnUser( lD1 - ,lD2 - ,pInternalData->m_lData - )); -} // end of InternalDataCompareFunc - -///////////////////////////////////////////////////////////////////////////// -// -// ConvertFromOS2ListItem -// -// Convert from an internal PM List item to a Toolkit List item -// -// PARAMETERS -// hWndListCtrl -- the control's windows handle -// rInfo -- the library list control to convert to -// pRecord -- the OS list control to convert from -// -// RETURN VALUE -// none -// -///////////////////////////////////////////////////////////////////////////// -void ConvertFromOS2ListItem ( HWND hWndListCtrl, - wxListItem& rInfo, - PMYRECORD pRecord ) -{ - CListItemInternalData* pInternaldata = (CListItemInternalData *)pRecord->m_ulUserData; - bool bNeedText = false; - - if (pInternaldata) - rInfo.SetData(pInternaldata->m_lParam); - - rInfo.SetMask(0); - rInfo.SetState(0); - rInfo.SetStateMask(0); - rInfo.SetId((long)pRecord->m_ulItemId); - if (hWndListCtrl != 0) - { - pRecord = FindOS2ListRecordByID( hWndListCtrl - ,rInfo.GetId() - ); - } - - // - // The wxListItem class is really set up to handle the WIN32 list item - // and OS/2 are not as complicated. Just set both state members to the - // same thing under OS/2 - // - if (pRecord->m_vRecord.flRecordAttr & CRA_DROPONABLE) - { - rInfo.SetStateMask(rInfo.m_stateMask | wxLIST_STATE_DROPHILITED); - rInfo.SetState(rInfo.m_state | wxLIST_STATE_DROPHILITED); - } - if (pRecord->m_vRecord.flRecordAttr & CRA_SELECTED) - { - rInfo.SetStateMask(rInfo.m_stateMask | wxLIST_STATE_SELECTED); - rInfo.SetState(rInfo.m_state | wxLIST_STATE_SELECTED); - } - if (pRecord->m_vRecord.flRecordAttr & CRA_DISABLED) - { - rInfo.SetStateMask(rInfo.m_stateMask | wxLIST_STATE_DISABLED); - rInfo.SetState(rInfo.m_state | wxLIST_STATE_DISABLED); - } - if (pRecord->m_vRecord.flRecordAttr & CRA_FILTERED) - { - rInfo.SetStateMask(rInfo.m_stateMask | wxLIST_STATE_FILTERED); - rInfo.SetState(rInfo.m_state | wxLIST_STATE_FILTERED); - } - if (pRecord->m_vRecord.flRecordAttr & CRA_INUSE) - { - rInfo.SetStateMask(rInfo.m_stateMask | wxLIST_STATE_INUSE); - rInfo.SetState(rInfo.m_state | wxLIST_STATE_INUSE); - } - if (pRecord->m_vRecord.flRecordAttr & CRA_PICKED) - { - rInfo.SetStateMask(rInfo.m_stateMask | wxLIST_STATE_PICKED); - rInfo.SetState(rInfo.m_state | wxLIST_STATE_PICKED); - } - if (pRecord->m_vRecord.flRecordAttr & CRA_SOURCE) - { - rInfo.SetStateMask(rInfo.m_stateMask | wxLIST_STATE_SOURCE); - rInfo.SetState(rInfo.m_state | wxLIST_STATE_SOURCE); - } - - if (pRecord->m_vRecord.pszText != (PSZ)NULL) - { - rInfo.SetMask(rInfo.GetMask() | wxLIST_MASK_TEXT); - rInfo.SetText(pRecord->m_vRecord.pszText); - } - if (pRecord->m_vRecord.pszIcon != (PSZ)NULL || - pRecord->m_vRecord.pszName != (PSZ)NULL) - { - rInfo.SetMask(rInfo.GetMask() | wxLIST_MASK_IMAGE); - rInfo.SetImage(pRecord->m_vRecord.hptrIcon); - } - if (pRecord->m_ulUserData) - rInfo.SetMask(rInfo.GetMask() | wxLIST_MASK_DATA); -} // end of ConvertFromOS2ListItem - -///////////////////////////////////////////////////////////////////////////// -// -// ConvertToOS2Flags -// -// Convert from an library states to OS states -// -// PARAMETERS -// lState -- the state -// pRecord -- the OS list control to use -// -// RETURN VALUE -// none -// -///////////////////////////////////////////////////////////////////////////// -void ConvertToOS2Flags ( - long lState -, PMYRECORD pRecord -) -{ - if (lState & wxLIST_STATE_DROPHILITED) - pRecord->m_vRecord.flRecordAttr |= CRA_DROPONABLE; - if (lState & wxLIST_STATE_SELECTED) - pRecord->m_vRecord.flRecordAttr |= CRA_SELECTED; - if (lState & wxLIST_STATE_DISABLED) - pRecord->m_vRecord.flRecordAttr |= CRA_DISABLED; - if (lState & wxLIST_STATE_FILTERED) - pRecord->m_vRecord.flRecordAttr |= CRA_FILTERED; - if (lState & wxLIST_STATE_INUSE) - pRecord->m_vRecord.flRecordAttr |= CRA_INUSE; - if (lState & wxLIST_STATE_PICKED) - pRecord->m_vRecord.flRecordAttr |= CRA_PICKED; - if (lState & wxLIST_STATE_SOURCE) - pRecord->m_vRecord.flRecordAttr |= CRA_SOURCE; -} // end of ConvertToOS2Flags - -///////////////////////////////////////////////////////////////////////////// -// -// ConvertToOS2ListItem -// -// Convert from a library List item to an internal OS2 List item. We set -// only the fields we need to set. Some of them are set by the API when -// they are added to the container. -// -// PARAMETERS -// pCtrl -- the control to use -// rInfo -- the item to convert -// pRecord -- the OS list control to use, should be zeroed out -// pFieldinfo -- a field struct that may contain columnar data for detail view -// -// RETURN VALUE -// none -// -///////////////////////////////////////////////////////////////////////////// -void ConvertToOS2ListItem ( - const wxListCtrl* pCtrl -, const wxListItem& rInfo -, PMYRECORD pRecord -, PFIELDINFO pFieldInfo -) -{ - pRecord->m_ulItemId = (ULONG)rInfo.GetId(); - pRecord->m_vRecord.cb = sizeof(RECORDCORE); - if (rInfo.GetMask() & wxLIST_MASK_STATE) - { - ConvertToOS2Flags( rInfo.m_state - ,pRecord - ); - } - if (pCtrl->GetWindowStyleFlag() & wxLC_ICON || - pCtrl->GetWindowStyleFlag() & wxLC_SMALL_ICON) - { - pRecord->m_vRecord.pszIcon = (char*)rInfo.GetText().c_str(); - } - if (pCtrl->GetWindowStyleFlag() & wxLC_LIST) // PM TEXT view - { - pRecord->m_vRecord.pszText = (char*)rInfo.GetText().c_str(); - } - // - // In the case of a report view the text will be the data in the lead column - // ???? Don't know why, but that is how it works in other ports. - // - if (pCtrl->GetWindowStyleFlag() & wxLC_REPORT) - { - if (pFieldInfo) - { - switch(rInfo.GetColumn()) - { - case 0: - pRecord->m_pzColumn1 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn1); - break; - - case 1: - pRecord->m_pzColumn2 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn2); - break; - - case 2: - pRecord->m_pzColumn3 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn3); - break; - - case 3: - pRecord->m_pzColumn4 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn4); - break; - - case 4: - pRecord->m_pzColumn5 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn5); - break; - - case 5: - pRecord->m_pzColumn6 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn6); - break; - - case 6: - pRecord->m_pzColumn7 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn7); - break; - - case 7: - pRecord->m_pzColumn8 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn8); - break; - - case 8: - pRecord->m_pzColumn9 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn9); - break; - - case 9: - pRecord->m_pzColumn10 = (char*)rInfo.GetText().c_str(); - pFieldInfo->offStruct = FIELDOFFSET(MYRECORD, m_pzColumn10); - break; - - default: - wxFAIL_MSG( wxT("wxOS2 does not support more than 10 columns in REPORT view") ); - break; - } - } - } - if (rInfo.GetMask() & wxLIST_MASK_IMAGE) - { - pRecord->m_vRecord.hptrIcon = (HPOINTER)rInfo.GetImage(); - pRecord->m_vRecord.hptrMiniIcon = (HPOINTER)rInfo.m_miniImage; - } -} // end of ConvertToOS2ListItem - -///////////////////////////////////////////////////////////////////////////// -// -// ConvertToOS2ListCol -// -// Convert from a library List column to an internal PM List column -// -// PARAMETERS -// lCol -- the columnd to convert -// rItem -- the item to convert -// pField -- the OS list column to use -// -// RETURN VALUE -// none -// -///////////////////////////////////////////////////////////////////////////// -void ConvertToOS2ListCol ( - long lCol -, const wxListItem& rItem -, PFIELDINFO pField -) -{ - memset(pField, '\0', sizeof(FIELDINFO)); - pField->cb = sizeof(FIELDINFO); - - // - // Default some settings - // - pField->flData = CFA_HORZSEPARATOR | CFA_SEPARATOR; - pField->flTitle = CFA_CENTER; - - if (rItem.GetMask() & wxLIST_MASK_TEXT) - { - pField->flData |= CFA_STRING; - pField->pTitleData = (PVOID)rItem.GetText().c_str(); // text is column title not data - } - if (rItem.GetMask() & wxLIST_MASK_FORMAT) - { - if (rItem.m_format == wxLIST_FORMAT_LEFT) - pField->flData |= CFA_LEFT; - else if (rItem.m_format == wxLIST_FORMAT_RIGHT) - pField->flData |= CFA_RIGHT; - else if (rItem.m_format == wxLIST_FORMAT_CENTRE) - pField->flData |= CFA_CENTER; - } - else - pField->flData |= CFA_CENTER; // Just ensure the default is centered - if (rItem.GetMask() & wxLIST_MASK_WIDTH) - { - if (!(rItem.GetWidth() == wxLIST_AUTOSIZE || - rItem.GetWidth() == wxLIST_AUTOSIZE_USEHEADER)) - pField->cxWidth = rItem.GetWidth(); - // else: OS/2 automatically sets the width if created with the approppriate style - } - - // - // Still need to set the actual data - // - pField->offStruct = 0; -} // end of ConvertToOS2ListCol - -BEGIN_EVENT_TABLE(wxListCtrl, wxControl) - EVT_PAINT(wxListCtrl::OnPaint) -END_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxListCtrl construction -// ---------------------------------------------------------------------------- - -void wxListCtrl::Init () -{ - m_pImageListNormal = NULL; - m_pImageListSmall = NULL; - m_pImageListState = NULL; - m_bOwnsImageListNormal = false; - m_bOwnsImageListSmall = false; - m_bOwnsImageListState = false; - m_lBaseStyle = 0L; - m_nColCount = 0; - m_pTextCtrl = NULL; - m_bAnyInternalData = false; - m_bHasAnyAttr = false; -} // end of wxListCtrl::Init - -bool wxListCtrl::Create ( wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxValidator& rValidator, - const wxString& rsName ) -{ - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif // wxUSE_VALIDATORS - - SetName(rsName); - SetWindowStyleFlag(lStyle); - SetParent(pParent); - if (nWidth <= 0) - nWidth = 100; - if (nHeight <= 0) - nHeight = 30; - if (nX < 0) - nX = 0; - if (nY < 0) - nY = 0; - - m_windowId = (vId == -1) ? NewControlId() : vId; - - long lSstyle = WS_VISIBLE | WS_TABSTOP; - - if (GetWindowStyleFlag() & wxCLIP_SIBLINGS) - lSstyle |= WS_CLIPSIBLINGS; - m_lBaseStyle = lSstyle; - if (!DoCreateControl( nX - ,nY - ,nWidth - ,nHeight - )) - return false; - if (pParent) - pParent->AddChild(this); - return true; -} // end of wxListCtrl::Create - -bool wxListCtrl::DoCreateControl ( int nX, int nY, - int nWidth, int nHeight ) -{ - DWORD lWstyle = m_lBaseStyle; - long lOldStyle = 0; // Dummy - - CNRINFO vCnrInfo; - - lWstyle |= ConvertToOS2Style( lOldStyle - ,GetWindowStyleFlag() - ); - - m_hWnd = (WXHWND)::WinCreateWindow( GetParent()->GetHWND() - ,WC_CONTAINER - ,NULL - ,m_lBaseStyle - ,0, 0, 0, 0 - ,GetParent()->GetHWND() - ,HWND_BOTTOM - ,(ULONG)m_windowId - ,NULL - ,NULL - ); - if (!m_hWnd) - { - return false; - } - - // - // Now set the display attributes of the container - // - if (!::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return false; - lWstyle = ConvertViewToOS2Style(GetWindowStyleFlag()); - vCnrInfo.flWindowAttr |= lWstyle; - if (!::WinSendMsg( GetHWND() - ,CM_SETCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)CMA_FLWINDOWATTR - )) - return false; - - // - // And now set needed arrangement flags - // - lWstyle = ConvertArrangeToOS2Style(GetWindowStyleFlag()); - if (!::WinSendMsg( GetHWND() - ,CM_ARRANGE - ,(MPARAM)CMA_ARRANGEGRID - ,(MPARAM)lWstyle - )) - return false; - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(GetParent()->GetForegroundColour()); - SubclassWin(m_hWnd); - SetFont(*wxSMALL_FONT); - SetXComp(0); - SetYComp(0); - SetSize( nX, nY, nWidth, nHeight ); - return true; -} // end of wxListCtrl::DoCreateControl - -void wxListCtrl::UpdateStyle () -{ - if (GetHWND()) - { - long lDummy; - DWORD dwStyleNew = ConvertToOS2Style( lDummy, GetWindowStyleFlag() ); - - dwStyleNew |= m_lBaseStyle; - - // - // Get the current window style. - // - ULONG dwStyleOld = ::WinQueryWindowULong(GetHWND(), QWL_STYLE); - - // - // Only set the window style if the view bits have changed. - // - if (dwStyleOld != dwStyleNew) - { - ::WinSetWindowULong(GetHWND(), QWL_STYLE, dwStyleNew); - } - } -} // end of wxListCtrl::UpdateStyle - -void wxListCtrl::FreeAllInternalData () -{ - if (m_bAnyInternalData) - { - int n = GetItemCount(); - int i = 0; - - for (i = 0; i < n; i++) - DeleteInternalData(this, (long)i); - m_bAnyInternalData = false; - } -} // end of wxListCtrl::FreeAllInternalData - -wxListCtrl::~wxListCtrl () -{ - FreeAllInternalData(); - if (m_pTextCtrl ) - { - m_pTextCtrl->SetHWND(0); - m_pTextCtrl->UnsubclassWin(); - wxDELETE(m_pTextCtrl); - } - - if (m_bOwnsImageListNormal) - delete m_pImageListNormal; - if (m_bOwnsImageListSmall) - delete m_pImageListSmall; - if (m_bOwnsImageListState) - delete m_pImageListState; -} // end of wxListCtrl::~wxListCtrl - -// ---------------------------------------------------------------------------- -// set/get/change style -// ---------------------------------------------------------------------------- - -// Add or remove a single window style -void wxListCtrl::SetSingleStyle ( - long lStyle -, bool bAdd -) -{ - long lFlag = GetWindowStyleFlag(); - - // - // Get rid of conflicting styles - // - if (bAdd) - { - if (lStyle & wxLC_MASK_TYPE) - lFlag = lFlag & ~wxLC_MASK_TYPE; - if (lStyle & wxLC_MASK_ALIGN ) - lFlag = lFlag & ~wxLC_MASK_ALIGN; - if (lStyle & wxLC_MASK_SORT ) - lFlag = lFlag & ~wxLC_MASK_SORT; - } - if (lFlag & lStyle) - { - if (!bAdd) - lFlag -= lStyle; - } - else - { - if (bAdd) - { - lFlag |= lStyle; - } - } - m_windowStyle = lFlag; - UpdateStyle(); -} // end of wxListCtrl::SetSingleStyle - -// Set the whole window style -void wxListCtrl::SetWindowStyleFlag ( - long lFlag -) -{ - m_windowStyle = lFlag; - UpdateStyle(); -} // end of wxListCtrl::SetWindowStyleFlag - -long wxListCtrl::ConvertToOS2Style ( - long& rOldStyle -, long lStyle -) const -{ - long lWstyle = 0L; - - // - // The only styles OS2 uses on creation are auto arrange, read only, and - // and selection styles. This lib does not support OS/2 MINIRECORDCORE - // or VERIFYPOINTER styles - // - if (lStyle & wxLC_AUTOARRANGE) - lWstyle |= CCS_AUTOPOSITION; - if (lStyle & wxLC_SINGLE_SEL) - lWstyle |= CCS_SINGLESEL; - else - lWstyle |= CCS_EXTENDSEL; - if (!(lStyle & wxLC_EDIT_LABELS)) - lWstyle |= CCS_READONLY; - return lWstyle; -} // end of wxListCtrl::ConvertToOS2Style - -long wxListCtrl::ConvertArrangeToOS2Style ( - long lStyle -) -{ - long lWstyle = 0; - - if (lStyle & wxLC_ALIGN_LEFT) - { - lWstyle |= CMA_LEFT; - } - - if (lStyle & wxLC_ALIGN_TOP) - { - lWstyle |= CMA_TOP; - } - return lWstyle; -} // end of wxListCtrl::ConvertArrangeToOS2Style - -long wxListCtrl::ConvertViewToOS2Style ( - long lStyle -) -{ - long lWstyle = CA_DRAWICON; // we will only use icons - - if (lStyle & wxLC_ICON) - { - lWstyle |= CV_ICON; - } - if (lStyle & wxLC_SMALL_ICON) - { - lWstyle |= (CV_ICON | CV_MINI); - } - if (lStyle & wxLC_LIST) - { - lWstyle |= CV_TEXT; - } - if (lStyle & wxLC_REPORT) - { - lWstyle |= CV_DETAIL; - } - if (lStyle & wxLC_VIRTUAL) - { - lWstyle |= CA_OWNERDRAW; - } - if (lStyle & wxLC_AUTOARRANGE) - { - lWstyle |= CV_FLOW; - } - if (!(lStyle & wxLC_NO_HEADER)) - { - lWstyle |= CA_DETAILSVIEWTITLES; - } - return lWstyle; -} // end of wxListCtrl::ConvertViewToOS2Style - -// ---------------------------------------------------------------------------- -// accessors -// ---------------------------------------------------------------------------- - -// Sets the foreground, i.e. text, colour -bool wxListCtrl::SetForegroundColour (const wxColour& rCol) -{ - ULONG ulColor = wxColourToRGB(rCol); - - if (!wxWindow::SetForegroundColour(rCol)) - return false; - - ::WinSetPresParam( GetHWND() - ,PP_FOREGROUNDCOLOR - ,sizeof(ULONG) - ,&ulColor - ); - return true; -} // end of wxListCtrl::SetForegroundColour - -// Sets the background colour -bool wxListCtrl::SetBackgroundColour ( const wxColour& rCol ) -{ - if (!wxWindow::SetBackgroundColour(rCol)) - return false; - - // - // We set the same colour for both the "empty" background and the items - // background - // - ULONG ulColor = wxColourToRGB(rCol); - - ::WinSetPresParam( GetHWND() - ,PP_BACKGROUNDCOLOR - ,sizeof(ULONG) - ,&ulColor - ); - return true; -} // end of wxListCtrl::SetBackgroundColour - -// Gets information about this column -bool wxListCtrl::GetColumn ( int nCol, wxListItem& rItem ) const -{ - PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND(), nCol ); - - if (!pFieldInfo) - return false; - rItem.SetWidth(pFieldInfo->cxWidth); - if ((rItem.GetMask() & wxLIST_MASK_TEXT) && - (pFieldInfo->flData & CFA_STRING) && - (pFieldInfo->pUserData != NULL)) - { - rItem.SetText((char*)pFieldInfo->pUserData); - } - if (rItem.GetMask() & wxLIST_MASK_FORMAT ) - { - if (pFieldInfo->flData & CFA_LEFT) - rItem.m_format = wxLIST_FORMAT_LEFT; - else if (pFieldInfo->flData & CFA_RIGHT) - rItem.m_format = wxLIST_FORMAT_RIGHT; - else if (pFieldInfo->flData & CFA_CENTER) - rItem.m_format = wxLIST_FORMAT_CENTRE; - } - return true; -} // end of wxListCtrl::GetColumn - -// Sets information about this column -bool wxListCtrl::SetColumn ( int nCol, wxListItem& rItem ) -{ - PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum( GetHWND(), nCol ); - ConvertToOS2ListCol( nCol, rItem, pFieldInfo ); - // - // Since we changed the field pointed to, we invalidate to see the result - // - ::WinSendMsg(GetHWND(), CM_INVALIDATEDETAILFIELDINFO, NULL, NULL); - return true; -} // end of wxListCtrl::SetColumn - -// Gets the column width -int wxListCtrl::GetColumnWidth ( int nCol ) const -{ - PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND(), nCol ); - - if (!pFieldInfo) - return 0; - return((int)pFieldInfo->cxWidth); -} // end of wxListCtrl::GetColumnWidth - -// Sets the column width -bool wxListCtrl::SetColumnWidth ( int nCol, int nWidth ) -{ - int nCol2 = nCol; - int nWidth2 = nWidth; - - if (GetWindowStyleFlag() & wxLC_LIST) - nCol2 = -1; - - PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum( GetHWND(), nCol ); - pFieldInfo->cxWidth = nWidth; - ::WinSendMsg(GetHWND(), CM_INVALIDATEDETAILFIELDINFO, NULL, NULL); - return true; -} // end of wxListCtrl::SetColumnWidth - -// Gets the number of items that can fit vertically in the -// visible area of the list control (list or report view) -// or the total number of items in the list control (icon -// or small icon view) -int wxListCtrl::GetCountPerPage () const -{ - QUERYRECORDRECT vQueryRect; - CNRINFO vCnrInfo; - RECTL vRectRecord; - RECTL vRectControl; - int nCount; - - if (!::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return 0; - memset(&vQueryRect, '\0', sizeof(QUERYRECORDRECT)); - vQueryRect.cb = sizeof(QUERYRECORDRECT); - if (vCnrInfo.flWindowAttr & CV_ICON) - vQueryRect.fsExtent = CMA_ICON | CMA_TEXT; - else if (vCnrInfo.flWindowAttr & CV_NAME) - vQueryRect.fsExtent = CMA_ICON | CMA_TEXT; - else if (vCnrInfo.flWindowAttr & CV_TEXT) - vQueryRect.fsExtent = CMA_TEXT; - else if (vCnrInfo.flWindowAttr & CV_DETAIL) - vQueryRect.fsExtent = CMA_TEXT; - if (!::WinSendMsg( GetHWND() - ,CM_QUERYRECORDRECT - ,MPFROMP(&vRectRecord) - ,MPFROMP(&vQueryRect) - )) - return 0; - if (!::WinSendMsg( GetHWND() - ,CM_QUERYVIEWPORTRECT - ,MPFROMP(&vRectControl) - ,MPFROM2SHORT(CMA_WINDOW, (USHORT)FALSE) - )) - return 0; - nCount = (int)((int)((vRectControl.xRight - vRectControl.xLeft) / (vRectRecord.xRight - vRectRecord.xLeft)) * - (int)((vRectControl.yTop - vRectControl.yBottom) / (vRectRecord.yTop - vRectRecord.yBottom)) - ); - if (nCount > (int)vCnrInfo.cFields) - nCount = (int)vCnrInfo.cFields; - return nCount; -} // end of wxListCtrl::GetCountPerPage - -// Gets the edit control for editing labels. -wxTextCtrl* wxListCtrl::GetEditControl() const -{ - return m_pTextCtrl; -} - -// Gets information about the item -bool wxListCtrl::GetItem ( wxListItem& rInfo ) const -{ - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), rInfo.GetId() ); - - // - // Give NULL as hwnd as we already have everything we need - // - ConvertFromOS2ListItem( NULL, rInfo, pRecord ); - return true; -} // end of wxListCtrl::GetItem - -// Sets information about the item -bool wxListCtrl::SetItem ( wxListItem& rInfo ) -{ - PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND(), rInfo.GetColumn() ); - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), rInfo.GetId() ); - - ConvertToOS2ListItem( this - ,rInfo - ,pRecord - ,pFieldInfo - ); - - // - // Check if setting attributes or lParam - // - if (rInfo.HasAttributes() || (rInfo.GetMask() & wxLIST_MASK_DATA)) - { - // - // Get internal item data - // perhaps a cache here ? - // - CListItemInternalData* pData = GetInternalData( this - ,rInfo.GetId() - ); - - if (!pData) - { - // - // Need to set it - // - m_bAnyInternalData = true; - pData = new CListItemInternalData(); - pRecord->m_ulUserData = (unsigned long)pData; - }; - - // - // User data - // - if (rInfo.GetMask() & wxLIST_MASK_DATA) - pData->m_lParam = (WXLPARAM)rInfo.GetData(); - - // attributes - if (rInfo.HasAttributes()) - { - if (pData->m_pAttr) - *pData->m_pAttr = *rInfo.GetAttributes(); - else - pData->m_pAttr = new wxListItemAttr(*rInfo.GetAttributes()); - } - pData->m_pMyRecord = pRecord; // they point to each other - } - - // - // We need to update the item immediately to show the new image - // - bool bUpdateNow = (rInfo.GetMask() & wxLIST_MASK_IMAGE) != 0; - - // - // Check whether it has any custom attributes - // - if (rInfo.HasAttributes()) - { - m_bHasAnyAttr = true; - - // - // If the colour has changed, we must redraw the item - // - bUpdateNow = true; - } - if (::WinIsWindowVisible(GetHWND())) - { - ::WinSendMsg( GetHWND() - ,CM_INVALIDATERECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION | CMA_TEXTCHANGED) - ); - RefreshItem(pRecord->m_ulItemId); - } - ::WinSendMsg( GetHWND() - ,CM_INVALIDATEDETAILFIELDINFO - ,NULL - ,NULL - ); - return true; -} // end of wxListCtrl::SetItem - -long wxListCtrl::SetItem ( - long lIndex -, int nCol -, const wxString& rsLabel -, int nImageId -) -{ - wxListItem vInfo; - - vInfo.m_text = rsLabel; - vInfo.m_mask = wxLIST_MASK_TEXT; - vInfo.m_itemId = lIndex; - vInfo.m_col = nCol; - if (nImageId > -1) - { - vInfo.m_image = nImageId; - vInfo.m_mask |= wxLIST_MASK_IMAGE; - } - return SetItem(vInfo); -} // end of wxListCtrl::SetItem - -// Gets the item state -int wxListCtrl::GetItemState ( - long lItem -, long lStateMask -) const -{ - wxListItem vInfo; - - vInfo.m_mask = wxLIST_MASK_STATE; - vInfo.m_stateMask = lStateMask; - vInfo.m_itemId = lItem; - - if (!GetItem(vInfo)) - return 0; - return vInfo.m_state; -} // end of wxListCtrl::GetItemState - -// Sets the item state -bool wxListCtrl::SetItemState ( long lItem, long lState, long lStateMask ) -{ - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), lItem ); - - // - // Don't use SetItem() here as it doesn't work with the virtual list - // controls - // - ConvertToOS2Flags( lState, pRecord ); - - // - // for the virtual list controls we need to refresh the previously focused - // item manually when changing focus without changing selection - // programmatically because otherwise it keeps its focus rectangle until - // next repaint (yet another comctl32 bug) - // - long lFocusOld; - - if (IsVirtual() && - (lStateMask & wxLIST_STATE_FOCUSED) && - (lState & wxLIST_STATE_FOCUSED) ) - { - lFocusOld = GetNextItem( -1 - ,wxLIST_NEXT_ALL - ,wxLIST_STATE_FOCUSED - ); - } - else - { - lFocusOld = -1; - } - ::WinSendMsg( GetHWND() - ,CM_INVALIDATERECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION | CMA_TEXTCHANGED) - ); - - if (lFocusOld != -1) - { - // - // No need to refresh the item if it was previously selected, it would - // only result in annoying flicker - // - if (!(GetItemState( lFocusOld - ,wxLIST_STATE_SELECTED - ) & wxLIST_STATE_SELECTED)) - { - RefreshItem(lFocusOld); - } - } - return true; -} // end of wxListCtrl::SetItemState - -// Sets the item image -bool wxListCtrl::SetItemImage ( - long lItem -, int nImage -, int WXUNUSED(nSelImage)) -{ - return SetItemColumnInfo(lItem, 0, nImage); -} // end of wxListCtrl::SetItemImage - -// Sets the item image -bool wxListCtrl::SetItemColumnImage ( - long lItem -, long lColumn -, int nImage) -{ - wxListItem vInfo; - - vInfo.m_mask = wxLIST_MASK_IMAGE; - vInfo.m_image = nImage; - vInfo.m_itemId = lItem; - vInfo.m_col = lColumn; - return SetItem(vInfo); -} // end of wxListCtrl::SetItemColumnImage - -// Gets the item text -wxString wxListCtrl::GetItemText ( - long lItem -) const -{ - wxListItem vInfo; - - vInfo.m_mask = wxLIST_MASK_TEXT; - vInfo.m_itemId = lItem; - - if (!GetItem(vInfo)) - return wxEmptyString; - return vInfo.m_text; -} // end of wxListCtrl::GetItemText - -// Sets the item text -void wxListCtrl::SetItemText ( - long lItem -, const wxString& rsStr -) -{ - wxListItem vInfo; - - vInfo.m_mask = wxLIST_MASK_TEXT; - vInfo.m_itemId = lItem; - vInfo.m_text = rsStr; - SetItem(vInfo); -} // end of wxListCtrl::SetItemText - -// Gets the item data -long wxListCtrl::GetItemData ( - long lItem -) const -{ - wxListItem vInfo; - - vInfo.m_mask = wxLIST_MASK_DATA; - vInfo.m_itemId = lItem; - if (!GetItem(vInfo)) - return 0; - return vInfo.m_data; -} // end of wxListCtrl::GetItemData - -// Sets the item data -bool wxListCtrl::SetItemPtrData ( - long lItem -, wxUIntPtr lData -) -{ - wxListItem vInfo; - - vInfo.m_mask = wxLIST_MASK_DATA; - vInfo.m_itemId = lItem; - vInfo.m_data = lData; - return SetItem(vInfo); -} // end of wxListCtrl::SetItemPtrData - -// Gets the item rectangle -bool wxListCtrl::GetItemRect ( long lItem, - wxRect& rRect, - int nCode ) const -{ - bool bSuccess; - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), lItem ); - QUERYRECORDRECT vQueryRect; - RECTL vRect; - int nHeight; - - if (!pRecord) - return false; - vQueryRect.cb = sizeof(QUERYRECORDRECT); - vQueryRect.pRecord = &pRecord->m_vRecord; - vQueryRect.fRightSplitWindow = TRUE; - vQueryRect.fsExtent = CMA_ICON | CMA_TEXT; - ::WinSendMsg( GetHWND() - ,CM_QUERYRECORDRECT - ,MPFROMP(&vRect) - ,MPFROMP(&vQueryRect) - ); - // - // remember OS/2 is backwards - // - GetClientSize( NULL, &nHeight ); - rRect.x = vRect.xLeft; - rRect.y = nHeight - vRect.yTop; - rRect.width = vRect.xRight; - rRect.height = nHeight - vRect.yBottom; - bSuccess = true; - return bSuccess; -} // end of wxListCtrl::GetItemRect - -// Gets the item position -bool wxListCtrl::GetItemPosition ( long lItem, wxPoint& rPos ) const -{ - bool bSuccess; - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND() , lItem ); - QUERYRECORDRECT vQueryRect; - RECTL vRect; - int nHeight; - - if (!pRecord) - return false; - vQueryRect.cb = sizeof(QUERYRECORDRECT); - vQueryRect.pRecord = &pRecord->m_vRecord; - vQueryRect.fRightSplitWindow = TRUE; - vQueryRect.fsExtent = CMA_ICON | CMA_TEXT; - ::WinSendMsg( GetHWND() - ,CM_QUERYRECORDRECT - ,MPFROMP(&vRect) - ,MPFROMP(&vQueryRect) - ); - // - // remember OS/2 is backwards - // - GetClientSize( NULL, &nHeight ); - rPos.x = vRect.xLeft; - rPos.y = nHeight - vRect.yTop; - bSuccess = true; - return bSuccess; -} // end of wxListCtrl::GetItemPosition - -// Sets the item position. -bool wxListCtrl::SetItemPosition ( long lItem, const wxPoint& rPos ) -{ - // - // Items cannot be positioned in X/Y coord in OS/2 - // - return false; -} // end of wxListCtrl::SetItemPosition - -// Gets the number of items in the list control -int wxListCtrl::GetItemCount () const -{ - CNRINFO vCnrInfo; - - if (!::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return -1; - return vCnrInfo.cRecords; -} // end of wxListCtrl::GetItemCount - -// Retrieves the spacing between icons in pixels. -// If bIsSmall is true, gets the spacing for the small icon -// view, otherwise the large icon view. -int wxListCtrl::GetItemSpacing ( bool bIsSmall ) const -{ - CNRINFO vCnrInfo; - - if (!::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return -1; - return vCnrInfo.cyLineSpacing; -} // end of wxListCtrl::GetItemSpacing - -void wxListCtrl::SetItemTextColour ( - long lItem -, const wxColour& rCol -) -{ - wxListItem vInfo; - - vInfo.m_itemId = lItem; - vInfo.SetTextColour(rCol); - SetItem(vInfo); -} // end of wxListCtrl::SetItemTextColour - -wxColour wxListCtrl::GetItemTextColour ( - long lItem -) const -{ - wxListItem vInfo; - - vInfo.m_itemId = lItem; - GetItem(vInfo); - return vInfo.GetTextColour(); -} // end of wxListCtrl::GetItemTextColour - -void wxListCtrl::SetItemBackgroundColour ( - long lItem -, const wxColour& rCol -) -{ - wxListItem vInfo; - - vInfo.m_itemId = lItem; - vInfo.SetBackgroundColour(rCol); - SetItem(vInfo); -} // end of wxListCtrl::SetItemBackgroundColour - -wxColour wxListCtrl::GetItemBackgroundColour ( - long lItem -) const -{ - wxListItem vInfo; - - vInfo.m_itemId = lItem; - GetItem(vInfo); - return vInfo.GetBackgroundColour(); -} // end of wxListCtrl::GetItemBackgroundColour - -// Gets the number of selected items in the list control -int wxListCtrl::GetSelectedItemCount () const -{ - PMYRECORD pRecord = NULL; - int nCount = 0; - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORDEMPHASIS - ,(MPARAM)CMA_FIRST - ,(MPARAM)CRA_SELECTED - )); - if (pRecord) - nCount++; - else - return 0; - while (pRecord) - { - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORDEMPHASIS - ,MPFROMP(pRecord) - ,(MPARAM)CRA_SELECTED - )); - if (pRecord) - nCount++; - } - return nCount; -} // end of wxListCtrl::GetSelectedItemCount - -// Gets the text colour of the listview -wxColour wxListCtrl::GetTextColour () const -{ - wxColour vCol; - ULONG ulColor; - - ::WinQueryPresParam( GetHWND() - ,PP_FOREGROUNDCOLOR - ,0 - ,NULL - ,sizeof(ULONG) - ,&ulColor - ,QPF_PURERGBCOLOR - ); - vCol.Set(ulColor); - return vCol; -} // end of wxListCtrl::GetTextColour - -// Sets the text colour of the listview -void wxListCtrl::SetTextColour ( - const wxColour& rCol -) -{ - ULONG ulColor = wxColourToRGB(rCol); - - ::WinSetPresParam( GetHWND() - ,PP_FOREGROUNDCOLOR - ,sizeof(ULONG) - ,&ulColor - ); -} // end of wxListCtrl::SetTextColour - -// Gets the index of the topmost visible item when in -// list or report view -long wxListCtrl::GetTopItem () const -{ - PMYRECORD pRecord = NULL; - QUERYRECFROMRECT vQueryRect; - RECTL vRect; - - ::WinSendMsg( GetHWND() - ,CM_QUERYVIEWPORTRECT - ,MPFROMP(&vRect) - ,MPFROM2SHORT(CMA_WINDOW, TRUE) - ); - vQueryRect.cb = sizeof(QUERYRECFROMRECT); - vQueryRect.rect = vRect; - vQueryRect.fsSearch = CMA_PARTIAL; - - pRecord = (PMYRECORD)::WinSendMsg( GetHWND() - ,CM_QUERYRECORDFROMRECT - ,(MPARAM)CMA_FIRST - ,MPFROMP(&vQueryRect) - ); - - if (!pRecord) - return -1L; - return (long)pRecord->m_ulItemId; -} // end of wxListCtrl::GetTopItem - -// Searches for an item, starting from 'item'. -// 'geometry' is one of -// wxLIST_NEXT_ABOVE/ALL/BELOW/LEFT/RIGHT. -// 'state' is a state bit flag, one or more of -// wxLIST_STATE_DROPHILITED/FOCUSED/SELECTED/CUT. -// item can be -1 to find the first item that matches the -// specified flags. -// Returns the item or -1 if unsuccessful. -long wxListCtrl::GetNextItem ( - long lItem -, int WXUNUSED(nGeom) -, int WXUNUSED(nState) -) const -{ - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND() - ,lItem - ); - - pRecord = (PMYRECORD)pRecord->m_vRecord.preccNextRecord; - if (pRecord) - return((long)pRecord->m_ulItemId); - return -1L; -} // end of wxListCtrl::GetNextItem - -wxImageList* wxListCtrl::GetImageList ( - int nWhich -) const -{ - if (nWhich == wxIMAGE_LIST_NORMAL ) - { - return m_pImageListNormal; - } - else if (nWhich == wxIMAGE_LIST_SMALL ) - { - return m_pImageListSmall; - } - else if (nWhich == wxIMAGE_LIST_STATE ) - { - return m_pImageListState; - } - return NULL; -} // end of wxListCtrl::GetImageList - -void wxListCtrl::SetImageList ( wxImageList* pImageList, - int nWhich ) -{ - if (nWhich == wxIMAGE_LIST_NORMAL) - { - if (m_bOwnsImageListNormal) - delete m_pImageListNormal; - m_pImageListNormal = pImageList; - m_bOwnsImageListNormal = false; - } - else if (nWhich == wxIMAGE_LIST_SMALL) - { - if (m_bOwnsImageListSmall) - delete m_pImageListSmall; - m_pImageListSmall = pImageList; - m_bOwnsImageListSmall = false; - } - else if (nWhich == wxIMAGE_LIST_STATE) - { - if (m_bOwnsImageListState) - delete m_pImageListState; - m_pImageListState = pImageList; - m_bOwnsImageListState = false; - } -} // end of wxListCtrl::SetImageList - -void wxListCtrl::AssignImageList ( wxImageList* pImageList, int nWhich ) -{ - SetImageList( pImageList, nWhich ); - - if (nWhich == wxIMAGE_LIST_NORMAL ) - m_bOwnsImageListNormal = true; - else if (nWhich == wxIMAGE_LIST_SMALL ) - m_bOwnsImageListSmall = true; - else if (nWhich == wxIMAGE_LIST_STATE ) - m_bOwnsImageListState = true; -} // end of wxListCtrl::AssignImageList - -// ---------------------------------------------------------------------------- -// Operations -// ---------------------------------------------------------------------------- - -// Arranges the items -bool wxListCtrl::Arrange ( int nFlag ) -{ - ULONG ulType = 0L; - ULONG ulFlags = 0L; - - if (nFlag == wxLIST_ALIGN_SNAP_TO_GRID) - { - ulType = CMA_ARRANGEGRID; - if (nFlag == wxLIST_ALIGN_LEFT) - ulFlags |= CMA_LEFT; - else if (nFlag == wxLIST_ALIGN_TOP) - ulFlags |= CMA_TOP; - else if (nFlag == wxLIST_ALIGN_DEFAULT) - ulFlags |= CMA_LEFT; - } - else - ulType = CMA_ARRANGESTANDARD; - ::WinSendMsg( GetHWND() - ,CM_ARRANGE - ,(MPARAM)ulType - ,(MPARAM)ulFlags - ); - // - // We do not support CMA_ARRANGESELECTED - // - return true; -} // end of wxListCtrl::Arrange - -// Deletes an item -bool wxListCtrl::DeleteItem ( long lItem ) -{ - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), lItem ); - if (LONGFROMMR(::WinSendMsg( GetHWND() - ,CM_REMOVERECORD - ,(MPARAM)pRecord - ,MPFROM2SHORT(1, CMA_FREE) - )) == -1L) - { - return false; - } - - // - // The virtual list control doesn't refresh itself correctly, help it - // - if (IsVirtual()) - { - // - // We need to refresh all the lines below the one which was deleted - // - wxRect vRectItem; - - if (lItem > 0 && GetItemCount()) - { - GetItemRect( lItem - 1 - ,vRectItem - ); - } - else - { - vRectItem.y = vRectItem.height = 0; - } - wxRect vRectWin = GetRect(); - - vRectWin.height = vRectWin.GetBottom() - vRectItem.GetBottom(); - vRectWin.y = vRectItem.GetBottom(); - RefreshRect(vRectWin); - } - return true; -} // end of wxListCtrl::DeleteItem - -// Deletes all items -bool wxListCtrl::DeleteAllItems () -{ - return((LONG)::WinSendMsg( GetHWND() - ,CM_REMOVERECORD - ,NULL - ,MPFROM2SHORT(0, CMA_FREE) - ) != -1L); -} // end of wxListCtrl::DeleteAllItems - -// Deletes all items -bool wxListCtrl::DeleteAllColumns () -{ - while (m_nColCount > 0) - { - DeleteColumn(m_nColCount - 1); - m_nColCount--; - } - - wxASSERT_MSG(m_nColCount == 0, wxT("no columns should be left")); - return true; -} // end of wxListCtrl::DeleteAllColumns - -// Deletes a column -bool wxListCtrl::DeleteColumn ( int nCol ) -{ - bool bSuccess = false; - PFIELDINFO pField = FindOS2ListFieldByColNum( GetHWND(), nCol ); - bSuccess = ((LONG)::WinSendMsg( GetHWND() - ,CM_REMOVEDETAILFIELDINFO - ,MPFROMP(pField) - ,MPFROM2SHORT((SHORT)1, CMA_FREE) - ) == -1L); - if (bSuccess && (m_nColCount > 0)) - m_nColCount--; - return bSuccess; -} // end of wxListCtrl::DeleteColumn - -// Clears items, and columns if there are any. -void wxListCtrl::ClearAll () -{ - DeleteAllItems(); - if (m_nColCount > 0) - DeleteAllColumns(); -} // end of wxListCtrl::ClearAll - -// -// OS/2 does not use a text control for its container labels. You merely -// "open" a record for editting. -// -wxTextCtrl* wxListCtrl::EditLabel ( - long lItem -, wxClassInfo* WXUNUSED(pTextControlClass) -) -{ - CNREDITDATA vEdit; - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND() - ,lItem - ); - - vEdit.cb = sizeof(CNREDITDATA); - vEdit.hwndCnr = GetHWND(); - vEdit.pRecord = &pRecord->m_vRecord; - vEdit.pFieldInfo = NULL; - vEdit.ppszText = NULL; - vEdit.cbText = 0; - vEdit.id = 0; - - ::WinSendMsg( GetHWND() - ,CM_OPENEDIT - ,MPFROMP(&vEdit) - ,(MPARAM)0 - ); - return m_pTextCtrl; -} // end of wxListCtrl::EditLabel - -// End label editing, optionally cancelling the edit. Under OS/2 you close -// the record for editting -bool wxListCtrl::EndEditLabel ( bool WXUNUSED(bCancel) ) -{ - ::WinSendMsg( GetHWND() - ,CM_CLOSEEDIT - ,(MPARAM)0 - ,(MPARAM)0 - ); - return true; -} // end of wxListCtrl::EndEditLabel - -// Ensures this item is visible -bool wxListCtrl::EnsureVisible ( long lItem ) -{ - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), lItem ); - ::WinSendMsg( GetHWND() - ,CM_INVALIDATERECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT((SHORT)1, CMA_NOREPOSITION) - ); - return true; -} // end of wxListCtrl::EnsureVisible - -// Find an item whose label matches this string, starting from the item after 'start' -// or the beginning if 'start' is -1. -long wxListCtrl::FindItem ( - long lStart -, const wxString& rsStr -, bool bPartial -) -{ - CNRINFO vCnrInfo; - SEARCHSTRING vSearch; - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND() - ,lStart - ); - ULONG ulFlag; - - - if (!::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return -1L; - - if (vCnrInfo.flWindowAttr & CV_ICON) - ulFlag = CV_ICON; - if (vCnrInfo.flWindowAttr & CV_NAME) - ulFlag = CV_NAME; - if (vCnrInfo.flWindowAttr & CV_TEXT) - ulFlag = CV_TEXT; - if (vCnrInfo.flWindowAttr & CV_DETAIL) - ulFlag = CV_DETAIL; - if (!bPartial) - ulFlag |= CV_EXACTLENGTH; - - vSearch.cb = sizeof(SEARCHSTRING); - vSearch.pszSearch = (char*)rsStr.c_str(); - vSearch.fsPrefix = TRUE; - vSearch.fsCaseSensitive = TRUE; - vSearch.usView = ulFlag; - - if (lStart == -1) - { - pRecord = (PMYRECORD)::WinSendMsg( GetHWND() - ,CM_SEARCHSTRING - ,MPFROMP(&vSearch) - ,(MPARAM)CMA_FIRST - ); - } - else - { - pRecord = (PMYRECORD)::WinSendMsg( GetHWND() - ,CM_SEARCHSTRING - ,MPFROMP(&vSearch) - ,MPFROMP(pRecord) - ); - } - if (!pRecord) - return -1L; - return pRecord->m_ulItemId; -} // end of wxListCtrl::FindItem - -// Find an item whose data matches this data, starting from the item after 'start' -// or the beginning if 'start' is -1. -long wxListCtrl::FindItem ( - long lStart -, long lData -) -{ - long lIdx = lStart + 1; - long lCount = GetItemCount(); - - while (lIdx < lCount) - { - if (GetItemData(lIdx) == lData) - return lIdx; - lIdx++; - }; - return -1; -} // end of wxListCtrl::FindItem - -// Find an item nearest this position in the specified direction, starting from -// the item after 'start' or the beginning if 'start' is -1. -long wxListCtrl::FindItem ( - long lStart -, const wxPoint& rPoint -, int nDirection -) -{ - RECTL vRect; - QUERYRECORDRECT vQueryRect; - PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND() - ,lStart - ); - CNRINFO vCnrInfo; - ULONG i; - wxRect vLibRect; - - if (!::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return -1L; - - vQueryRect.cb = sizeof(QUERYRECORDRECT); - vQueryRect.pRecord = &pRecord->m_vRecord; - vQueryRect.fRightSplitWindow = TRUE; - vQueryRect.fsExtent = CMA_ICON | CMA_TEXT; - - ::WinSendMsg( GetHWND() - ,CM_QUERYRECORDRECT - ,MPFROMP(&vRect) - ,MPFROMP(&vQueryRect) - ); - vLibRect.SetLeft(vRect.xLeft); - vLibRect.SetTop(vRect.yTop); - vLibRect.SetRight(vRect.xRight); - vLibRect.SetBottom(vRect.yBottom); - if (vLibRect.Contains(rPoint)) - return pRecord->m_ulItemId; - - for (i = lStart + 1; i < vCnrInfo.cRecords; i++) - { - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - vQueryRect.pRecord = (PRECORDCORE)pRecord; - ::WinSendMsg( GetHWND() - ,CM_QUERYRECORDRECT - ,MPFROMP(&vRect) - ,MPFROMP(&vQueryRect) - ); - vLibRect.SetLeft(vRect.xLeft); - vLibRect.SetTop(vRect.yTop); - vLibRect.SetRight(vRect.xRight); - vLibRect.SetBottom(vRect.yBottom); - if (vLibRect.Contains(rPoint)) - return pRecord->m_ulItemId; - } - return -1L; -} // end of wxListCtrl::FindItem - -// Determines which item (if any) is at the specified point, -// giving details in 'flags' (see wxLIST_HITTEST_... flags above) -long wxListCtrl::HitTest ( - const wxPoint& rPoint -, int& WXUNUSED(rFlags) -) -{ - PMYRECORD pRecord = NULL; - QUERYRECFROMRECT vQueryRect; - RECTL vRect; - long lHeight; - - // - // Get height for OS/2 point conversion - // - ::WinSendMsg( GetHWND() - ,CM_QUERYVIEWPORTRECT - ,MPFROMP(&vRect) - ,MPFROM2SHORT(CMA_WINDOW, TRUE) - ); - lHeight = vRect.yTop - vRect.yBottom; - - // - // For now just try and get a record in the general vicinity and forget - // the flag - // - vRect.xLeft = rPoint.x - 2; - vRect.xRight = rPoint.x + 2; - vRect.yTop = (lHeight - rPoint.y) + 2; - vRect.yBottom = (lHeight - rPoint.y) - 2; - - vQueryRect.cb = sizeof(QUERYRECFROMRECT); - vQueryRect.rect = vRect; - vQueryRect.fsSearch = CMA_PARTIAL; - - pRecord = (PMYRECORD)::WinSendMsg( GetHWND() - ,CM_QUERYRECORDFROMRECT - ,(MPARAM)CMA_FIRST - ,MPFROMP(&vQueryRect) - ); - - if (!pRecord) - return -1L; - return pRecord->m_ulItemId; -} // end of wxListCtrl::HitTest - -// Inserts an item, returning the index of the new item if successful, -// -1 otherwise. -long wxListCtrl::InsertItem ( - wxListItem& rInfo -) -{ - wxASSERT_MSG( !IsVirtual(), wxT("can't be used with virtual controls") ); - - PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND() - ,rInfo.GetColumn() - ); - PMYRECORD pRecordAfter = NULL; - PMYRECORD pRecord = (PMYRECORD)::WinSendMsg( GetHWND() - ,CM_ALLOCRECORD - ,MPFROMLONG(sizeof(MYRECORD) - sizeof(RECORDCORE)) - ,MPFROMSHORT(1) - ); - - ConvertToOS2ListItem( this - ,rInfo - ,pRecord - ,pFieldInfo - ); - - if (rInfo.GetId() > 0) - pRecordAfter = FindOS2ListRecordByID( GetHWND() - ,rInfo.GetId() - 1 - ); - - RECORDINSERT vInsert; - - vInsert.cb = sizeof(RECORDINSERT); - vInsert.pRecordParent = NULL; - if (!pRecordAfter) - vInsert.pRecordOrder = (PRECORDCORE)CMA_FIRST; - else - vInsert.pRecordOrder = (PRECORDCORE)pRecordAfter; - vInsert.zOrder = CMA_TOP; - vInsert.cRecordsInsert = 1; - vInsert.fInvalidateRecord = TRUE; - - // - // Check whether we need to allocate our internal data - // - bool bNeedInternalData = ((rInfo.GetMask() & wxLIST_MASK_DATA) || - rInfo.HasAttributes() - ); - if (bNeedInternalData) - { - m_bAnyInternalData = true; - - // - // Internal stucture that manages data - // - CListItemInternalData* pData = new CListItemInternalData(); - - pRecord->m_ulUserData = (unsigned long)pData; - if (rInfo.GetMask() & wxLIST_MASK_DATA) - pData->m_lParam = (WXLPARAM)rInfo.GetData(); - - // - // Check whether it has any custom attributes - // - if (rInfo.HasAttributes()) - { - // - // Take copy of attributes - // - pData->m_pAttr = new wxListItemAttr(*rInfo.GetAttributes()); - } - } - if (!::WinSendMsg( GetHWND() - ,CM_INSERTRECORD - ,MPFROMP(pRecord) - ,MPFROMP(&vInsert) - )) - return -1; - // - // OS/2 must mannually bump the index's of following records - // - BumpRecordIds( GetHWND() - ,pRecord - ); - ::WinSendMsg( GetHWND() - ,CM_INVALIDATEDETAILFIELDINFO - ,NULL - ,NULL - ); - return pRecord->m_ulItemId; -} // end of wxListCtrl::InsertItem - -long wxListCtrl::InsertItem ( - long lIndex -, const wxString& rsLabel -) -{ - wxListItem vInfo; - - memset(&vInfo, '\0', sizeof(wxListItem)); - vInfo.m_text = rsLabel; - vInfo.m_mask = wxLIST_MASK_TEXT; - vInfo.m_itemId = lIndex; - return InsertItem(vInfo); -} // end of wxListCtrl::InsertItem - -// Inserts an image item -long wxListCtrl::InsertItem ( - long lIndex -, int nImageIndex -) -{ - wxListItem vInfo; - - vInfo.m_image = nImageIndex; - vInfo.m_mask = wxLIST_MASK_IMAGE; - vInfo.m_itemId = lIndex; - return InsertItem(vInfo); -} // end of wxListCtrl::InsertItem - -// Inserts an image/string item -long wxListCtrl::InsertItem ( - long lIndex -, const wxString& rsLabel -, int nImageIndex -) -{ - wxListItem vInfo; - - vInfo.m_image = nImageIndex; - vInfo.m_text = rsLabel; - vInfo.m_mask = wxLIST_MASK_IMAGE | wxLIST_MASK_TEXT; - vInfo.m_itemId = lIndex; - return InsertItem(vInfo); -} // end of wxListCtrl::InsertItem - -// For details view mode (only), inserts a column. -long wxListCtrl::InsertColumn ( - long lCol -, wxListItem& rItem -) -{ - bool bSuccess; - PFIELDINFO pField = (PFIELDINFO)::WinSendMsg( GetHWND() - ,CM_ALLOCDETAILFIELDINFO - ,MPFROMLONG(1) - ,NULL - ); - PFIELDINFO pFieldAfter = FindOS2ListFieldByColNum ( GetHWND() - ,lCol - 1 - ); - FIELDINFOINSERT vInsert; - - ConvertToOS2ListCol ( lCol - ,rItem - ,pField - ); - - vInsert.cb = sizeof(FIELDINFOINSERT); - vInsert.pFieldInfoOrder = pFieldAfter; - vInsert.fInvalidateFieldInfo = TRUE; - vInsert.cFieldInfoInsert = 1; - - bSuccess = ::WinSendMsg( GetHWND() - ,CM_INSERTDETAILFIELDINFO - ,MPFROMP(pField) - ,MPFROMP(&vInsert) - ) != (MRESULT)0; - return bSuccess; -} // end of wxListCtrl::InsertColumn - -long wxListCtrl::InsertColumn ( - long lCol -, const wxString& rsHeading -, int nFormat -, int nWidth -) -{ - wxListItem vItem; - - vItem.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT; - vItem.m_text = rsHeading; - if (nWidth > -1) - { - vItem.m_mask |= wxLIST_MASK_WIDTH; - vItem.m_width = nWidth; - } - vItem.m_format = nFormat; - - return InsertColumn( lCol - ,vItem - ); -} // end of wxListCtrl::InsertColumn - -// scroll the control by the given number of pixels (exception: in list view, -// dx is interpreted as number of columns) -bool wxListCtrl::ScrollList ( int nDx, int nDy ) -{ - if (nDx > 0) - ::WinSendMsg( GetHWND() - ,CM_SCROLLWINDOW - ,(MPARAM)CMA_HORIZONTAL - ,(MPARAM)nDx - ); - if (nDy > 0) - ::WinSendMsg( GetHWND() - ,CM_SCROLLWINDOW - ,(MPARAM)CMA_VERTICAL - ,(MPARAM)nDy - ); - return true; -} // end of wxListCtrl::ScrollList - -bool wxListCtrl::SortItems ( wxListCtrlCompare fn, long lData ) -{ - SInternalDataSort vInternalData; - - vInternalData.m_fnUser = fn; - vInternalData.m_lData = lData; - - // WPARAM cast is needed for mingw/cygwin - if (!::WinSendMsg( GetHWND() - ,CM_SORTRECORD - ,(PFN)InternalDataCompareFunc - ,(PVOID)&vInternalData - )) - { - wxLogDebug(wxT("CM_SORTRECORD failed")); - return false; - } - return true; -} // end of wxListCtrl::SortItems - -// ---------------------------------------------------------------------------- -// message processing -// ---------------------------------------------------------------------------- - -bool wxListCtrl::OS2Command ( WXUINT uCmd, WXWORD wId ) -{ - if (uCmd == CN_ENDEDIT) - { - wxCommandEvent vEvent( wxEVT_TEXT, wId ); - - vEvent.SetEventObject( this ); - ProcessCommand(vEvent); - return true; - } - else if (uCmd == CN_KILLFOCUS) - { - wxCommandEvent vEvent( wxEVT_KILL_FOCUS, wId ); - vEvent.SetEventObject( this ); - ProcessCommand(vEvent); - return true; - } - else - return false; -} // end of wxListCtrl::OS2Command - -// Necessary for drawing hrules and vrules, if specified -void wxListCtrl::OnPaint ( wxPaintEvent& rEvent ) -{ - wxPaintDC vDc(this); - wxPen vPen(wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT) - ,1 - ,wxSOLID - ); - wxSize vClientSize = GetClientSize(); - wxRect vItemRect; - int nItemCount = GetItemCount(); - int nCy = 0; - int i; - bool bDrawHRules = ((GetWindowStyle() & wxLC_HRULES) != 0); - bool bDrawVRules = ((GetWindowStyle() & wxLC_VRULES) != 0); - - wxControl::OnPaint(rEvent); - - // - // Reset the device origin since it may have been set - // - vDc.SetDeviceOrigin(0, 0); - if (!bDrawHRules && !bDrawVRules) - return; - if ((GetWindowStyle() & wxLC_REPORT) == 0) - return; - vDc.SetPen(vPen); - vDc.SetBrush(*wxTRANSPARENT_BRUSH); - - if (bDrawHRules) - { - long lTop = GetTopItem(); - - for (i = lTop; i < lTop + GetCountPerPage() + 1; i++) - { - if (GetItemRect( i - ,vItemRect - )) - { - nCy = vItemRect.GetTop(); - if (i != 0) // Don't draw the first one - { - vDc.DrawLine( 0 - ,nCy - ,vClientSize.x - ,nCy - ); - } - // Draw last line - if (i == nItemCount - 1) - { - nCy = vItemRect.GetBottom(); - vDc.DrawLine( 0 - ,nCy - ,vClientSize.x - ,nCy - ); - } - } - } - } - i = nItemCount - 1; - if (bDrawVRules && (i > -1)) - { - wxRect vFirstItemRect; - - GetItemRect( 0 - ,vFirstItemRect - ); - if (GetItemRect( i - ,vItemRect - )) - { - int nCol; - int nX = vItemRect.GetX(); - - for (nCol = 0; nCol < GetColumnCount(); nCol++) - { - int nColWidth = GetColumnWidth(nCol); - - nX += nColWidth ; - vDc.DrawLine( nX - 1 - ,vFirstItemRect.GetY() - 2 - ,nX - 1 - ,vItemRect.GetBottom() - ); - } - } - } -} // end of wxListCtrl::OnPaint - -// ---------------------------------------------------------------------------- -// virtual list controls -// ---------------------------------------------------------------------------- - -wxString wxListCtrl::OnGetItemText ( - long WXUNUSED(lItem) -, long WXUNUSED(lCol) -) const -{ - // this is a pure virtual function, in fact - which is not really pure - // because the controls which are not virtual don't need to implement it - wxFAIL_MSG( wxT("not supposed to be called") ); - return wxEmptyString; -} // end of wxListCtrl::OnGetItemText - -int wxListCtrl::OnGetItemImage ( - long WXUNUSED(lItem) -) const -{ - // same as above - wxFAIL_MSG( wxT("not supposed to be called") ); - return -1; -} // end of wxListCtrl::OnGetItemImage - -int wxListCtrl::OnGetItemColumnImage ( - long lItem, - long lColumn -) const -{ - if (!lColumn) - return OnGetItemImage(lItem); - - return -1; -} // end of wxListCtrl::OnGetItemColumnImage - -void wxListCtrl::SetItemCount ( - long lCount -) -{ - wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") ); - - // - // Cannot explicitly set the record count in OS/2 - // -} // end of wxListCtrl::SetItemCount - -void wxListCtrl::RefreshItem ( - long lItem -) -{ - wxRect vRect; - - GetItemRect( lItem - ,vRect - ); - RefreshRect(vRect); -} // end of wxListCtrl::RefreshItem - -void wxListCtrl::RefreshItems ( long lItemFrom, long lItemTo ) -{ - wxRect vRect1; - wxRect vRect2; - - GetItemRect( lItemFrom , vRect1 ); - GetItemRect( lItemTo , vRect2 ); - - wxRect vRect = vRect1; - - vRect.height = vRect2.GetBottom() - vRect1.GetTop(); - RefreshRect(vRect); -} // end of wxListCtrl::RefreshItems - -MRESULT wxListCtrl::OS2WindowProc( WXUINT uMsg, - WXWPARAM wParam, - WXLPARAM lParam ) -{ - bool bProcessed = false; - MRESULT lRc; - wxListEvent vEvent( wxEVT_NULL - ,m_windowId - ); - wxEventType vEventType = wxEVT_NULL; - PCNRDRAGINIT pDragInit = NULL; - PCNREDITDATA pEditData = NULL; - PNOTIFYRECORDENTER pNotifyEnter = NULL; - - vEvent.SetEventObject(this); - switch (uMsg) - { - case WM_CONTROL: - // - // First off let's set some internal data - // - switch(SHORT2FROMMP(wParam)) - { - case CN_INITDRAG: - case CN_DRAGOVER: - case CN_DRAGAFTER: - { - CListItemInternalData* pInternaldata = (CListItemInternalData *)lParam; - - if (pInternaldata) - { - wxListItem* pItem = (wxListItem*)&vEvent.GetItem(); - - pItem->SetData((long)pInternaldata->m_lParam); - } - } - break; - } - // - // Now let's go through the codes we're interested in - // - switch(SHORT2FROMMP(wParam)) - { - case CN_INITDRAG: - pDragInit = (PCNRDRAGINIT)lParam; - if (pDragInit) - { - PMYRECORD pRecord = (PMYRECORD)pDragInit->pRecord; - - vEventType = wxEVT_LIST_BEGIN_RDRAG; - vEvent.m_itemIndex = pRecord->m_ulItemId; - vEvent.m_pointDrag.x = pDragInit->x; - vEvent.m_pointDrag.y = pDragInit->y; - } - break; - - case CN_BEGINEDIT: - pEditData = (PCNREDITDATA)lParam; - if (pEditData) - { - vEventType = wxEVT_LIST_BEGIN_LABEL_EDIT; - ConvertFromOS2ListItem( GetHWND() - ,(wxListItem &)vEvent.GetItem() - ,(PMYRECORD)pEditData->pRecord - ); - vEvent.m_itemIndex = vEvent.GetItem().GetId(); - } - break; - - case CN_ENDEDIT: - pEditData = (PCNREDITDATA)lParam; - if (pEditData) - { - vEventType = wxEVT_LIST_END_LABEL_EDIT; - ConvertFromOS2ListItem( GetHWND() - ,(wxListItem &)vEvent.GetItem() - ,(PMYRECORD)pEditData->pRecord - ); - if (pEditData->cbText == 0) - return (MRESULT)FALSE; - vEvent.m_itemIndex = vEvent.GetItem().GetId(); - } - break; - - case CN_ENTER: - pNotifyEnter = (PNOTIFYRECORDENTER)lParam; - if (pNotifyEnter) - { - wxListItem* pItem = (wxListItem*)&vEvent.GetItem(); - PMYRECORD pMyRecord = (PMYRECORD)pNotifyEnter->pRecord; - - vEventType = wxEVT_LIST_ITEM_ACTIVATED; - vEvent.m_itemIndex = pMyRecord->m_ulItemId; - pItem->SetText(GetItemText(pMyRecord->m_ulItemId)); - pItem->SetData(GetItemData(pMyRecord->m_ulItemId)); - } - break; - - // - // Add the CN_DROP messages for Direct Manipulation - // - } - vEvent.SetEventType(vEventType); - bProcessed = HandleWindowEvent(vEvent); - break; - } - if (!bProcessed) - lRc = wxControl::OS2WindowProc( uMsg - ,wParam - ,lParam - ); - return lRc; -} // end of wxListCtrl::WindowProc - -#endif // wxUSE_LISTCTRL diff --git a/src/os2/main.cpp b/src/os2/main.cpp deleted file mode 100644 index d2f3dfdb9e..0000000000 --- a/src/os2/main.cpp +++ /dev/null @@ -1,12 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/main.cpp -// Purpose: Entry point -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// We don't put main() in the library any more. SN. - diff --git a/src/os2/makefile.va b/src/os2/makefile.va deleted file mode 100644 index 6b662e3db8..0000000000 --- a/src/os2/makefile.va +++ /dev/null @@ -1,1172 +0,0 @@ -# -# File: makefile.va -# Author: Dave Webster -# Created: 1999 -# Updated: -# Copyright: (c) 1999, Dave Webster -# -# "%W% %G%" -# -# Makefile : Builds wxWindows library wx.lib for VisualAge C++ -# Arguments: -# -# FINAL=1 argument to nmake to build version with no debugging info. -# dll builds a library (wxdll.lib) suitable for creating DLLs -# -!include <..\makeva.env> - -THISDIR=$(WXWIN)\src\os2 - -!if "$(WXMAKINGDLL)" == "1" -LIBTARGET=$(WXDIR)\lib\$(WXLIBNAME).dll -DUMMYOBJ=$D\dummydll.obj -!else -LIBTARGET=$(WXLIB) -COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib -COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib -COMTEMPTGT3=$(WXDIR)\lib\wxcom3.lib -COMTEMPTGT4=$(WXDIR)\lib\wxcom4.lib -GENTEMPTGT=$(WXDIR)\lib\wxgen.lib -NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib -OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib -OS2TEMPTGT2=$(WXDIR)\lib\wxos22.lib -HTMLTEMPTGT=$(WXDIR)\lib\wxhtml.lib -DUMMYOBJ=$D\dummy.obj -!endif - -# Please set these according to the settings in setup.h, so we can include -# the appropriate libraries in wx.lib - -# This one overrides the others, to be consistent with the settings in wx_setup.h -MINIMAL_WXWINDOWS_SETUP=0 - -PERIPH_LIBS= -PERIPH_TARGET= -PERIPH_CLEAN_TARGET= - -# These are absolute paths, so that the compiler -# generates correct __FILE__ symbols for debugging. -# Otherwise you don't be able to double-click on a memory -# error to load that file. -GENDIR=$(WXDIR)\src\generic -COMMDIR=$(WXDIR)\src\common -OS2DIR=$(WXDIR)\src\os2 -HTMLDIR = $(WXDIR)\src\html - -!if [md $(COMMDIR)\$D] -!endif - -!if [md $(OS2DIR)\$D] -!endif - -!if [md $(GENDIR)\$D] -!endif - -!if [md $(HTMLDIR)\$D] -!endif - -{..\generic}.cpp{..\generic\$D}.obj: - @echo $< - icc @<< -$(CPPFLAGS) /Fo$@ /Tp $< -<< - -{..\common}.cpp{..\common\$D}.obj: - @echo $< - icc @<< -$(CPPFLAGS) /Fo$@ /Tp $< -<< - -{..\os2}.cpp{..\os2\$D}.obj: - @echo $< - icc @<< -$(CPPFLAGS) /Fo$@ /Tp $< -<< - -{..\os2}.c{..\os2\$D}.obj: - @echo $< - icc @<< -$(CPPFLAGS) /Fo$@ /Tp $< -<< - -{..\html}.cpp{..\html\$D}.obj: - @echo $< - icc @<< -$(CPPFLAGS) /Fo$@ /Tp $< -<< - -GENERICOBJS= \ - ..\generic\$D\busyinfo.obj \ - ..\generic\$D\calctrl.obj \ - ..\generic\$D\caret.obj \ - ..\generic\$D\choicdgg.obj \ - ..\generic\$D\colrdlgg.obj \ - ..\generic\$D\dcbuffer.obj \ - ..\generic\$D\dcpsg.obj \ - ..\generic\$D\dirdlgg.obj \ - ..\generic\$D\dirctrlg.obj \ - ..\generic\$D\dragimgg.obj \ - ..\generic\$D\fdrepdlg.obj \ - ..\generic\$D\grid.obj \ - ..\generic\$D\gridctrl.obj \ - ..\generic\$D\gridsel.obj \ - ..\generic\$D\helpext.obj \ - ..\generic\$D\helphtml.obj \ - ..\generic\$D\imaglist.obj \ - ..\generic\$D\laywin.obj \ - ..\generic\$D\logg.obj \ - ..\generic\$D\mdig.obj \ - ..\generic\$D\numdlgg.obj \ - ..\generic\$D\panelg.obj \ - ..\generic\$D\printps.obj \ - ..\generic\$D\prntdlgg.obj \ - ..\generic\$D\progdlgg.obj \ - ..\generic\$D\prop.obj \ - ..\generic\$D\propform.obj \ - ..\generic\$D\proplist.obj \ - ..\generic\$D\sashwin.obj \ - ..\generic\$D\scrlwing.obj \ - ..\generic\$D\spinctlg.obj \ - ..\generic\$D\splitter.obj \ - ..\generic\$D\statusbr.obj \ - ..\generic\$D\tabg.obj \ - ..\generic\$D\tbarsmpl.obj \ - ..\generic\$D\textdlgg.obj \ - ..\generic\$D\tipdlg.obj \ - ..\generic\$D\tipwin.obj \ - ..\generic\$D\wizard.obj - -# ..\generic\$D\gridg.obj \ -# ..\generic\$D\notebook.obj \ - -GENLIBOBJS= \ - busyinfo.obj \ - calctrl.obj \ - caret.obj \ - choicdgg.obj \ - colrdlgg.obj \ - dcbuffer.obj \ - dcpsg.obj \ - dirdlgg.obj \ - dirctrlg.obj \ - dragimgg.obj \ - fdrepdlg.obj \ - grid.obj \ - gridctrl.obj \ - gridsel.obj \ - helpext.obj \ - helphtml.obj \ - imaglist.obj \ - laywin.obj \ - logg.obj \ - mdig.obj \ - numdlgg.obj \ - panelg.obj \ - printps.obj \ - prntdlgg.obj \ - progdlgg.obj \ - prop.obj \ - propform.obj \ - proplist.obj \ - sashwin.obj \ - scrlwing.obj \ - spinctlg.obj \ - splitter.obj \ - statusbr.obj \ - tabg.obj \ - tbarsmpl.obj \ - textdlgg.obj \ - tipdlg.obj \ - tipwin.obj \ - wizard.obj - -# These are generic things that don't need to be compiled on PM, -# but sometimes it's useful to do so for testing purposes. -NONESSENTIALOBJS= \ - ..\generic\$D\msgdlgg.obj - -COMMONOBJS = \ - ..\common\$D\accesscmn.obj \ - ..\common\$D\artprov.obj \ - ..\common\$D\artstd.obj \ - ..\common\$D\appcmn.obj \ - ..\common\$D\choiccmn.obj \ - ..\common\$D\clipcmn.obj \ - ..\common\$D\clntdata.obj \ - ..\common\$D\cmdline.obj \ - ..\common\$D\cmndata.obj \ - ..\common\$D\cmdproc.obj \ - ..\common\$D\config.obj \ - ..\common\$D\containr.obj \ - ..\common\$D\cshelp.obj \ - ..\common\$D\ctrlcmn.obj \ - ..\common\$D\ctrlsub.obj \ - ..\common\$D\datacmn.obj \ - ..\common\$D\datetime.obj \ - ..\common\$D\datstrm.obj \ - ..\common\$D\dcbase.obj \ - ..\common\$D\dircmn.obj \ - ..\common\$D\dlgcmn.obj \ - ..\common\$D\dndcmn.obj \ - ..\common\$D\dobjcmn.obj \ - ..\common\$D\docmdi.obj \ - ..\common\$D\docview.obj \ - ..\common\$D\dpycmn.obj \ - ..\common\$D\dseldlg.obj \ - ..\common\$D\dynarray.obj \ - ..\common\$D\dynlib.obj \ - ..\common\$D\dynload.obj \ - ..\common\$D\effects.obj \ - ..\common\$D\encconv.obj \ - ..\common\$D\event.obj \ - ..\common\$D\extended.obj \ - ..\common\$D\fddlgcmn.obj \ - ..\common\$D\ffile.obj \ - ..\common\$D\file.obj \ - ..\common\$D\fileconf.obj \ - ..\common\$D\filefn.obj \ - ..\common\$D\filename.obj \ - ..\common\$D\filesys.obj \ - ..\common\$D\fontcmn.obj \ - ..\common\$D\fontmap.obj \ - ..\common\$D\framecmn.obj \ - ..\common\$D\fs_inet.obj \ - ..\common\$D\fs_mem.obj \ - ..\common\$D\fs_zip.obj \ - ..\common\$D\ftp.obj \ - ..\common\$D\gaugecmn.obj \ - ..\common\$D\gdicmn.obj \ - ..\common\$D\geometry.obj \ - ..\common\$D\gifdecod.obj \ - ..\common\$D\hash.obj \ - ..\common\$D\hashmap.obj \ - ..\common\$D\helpbase.obj \ - ..\common\$D\http.obj \ - ..\common\$D\iconbndl.obj \ - ..\common\$D\imagall.obj \ - ..\common\$D\imagbmp.obj \ - ..\common\$D\image.obj \ - ..\common\$D\imagfill.obj \ - ..\common\$D\imaggif.obj \ - ..\common\$D\imagiff.obj \ - ..\common\$D\imagjpeg.obj \ - ..\common\$D\imagpcx.obj \ - ..\common\$D\imagpng.obj \ - ..\common\$D\imagpnm.obj \ - ..\common\$D\imagtiff.obj \ - ..\common\$D\imagxpm.obj \ - ..\common\$D\intl.obj \ - ..\common\$D\ipcbase.obj \ - ..\common\$D\layout.obj \ - ..\common\$D\lboxcmn.obj \ - ..\common\$D\list.obj \ - ..\common\$D\log.obj \ - ..\common\$D\longlong.obj \ - ..\common\$D\matrix.obj \ - ..\common\$D\memory.obj \ - ..\common\$D\menucmn.obj \ - ..\common\$D\mimecmn.obj \ - ..\common\$D\module.obj \ - ..\common\$D\msgout.obj \ - ..\common\$D\mstream.obj \ - ..\common\$D\nbkbase.obj \ - ..\common\$D\object.obj \ - ..\common\$D\paper.obj \ - ..\common\$D\popupcmn.obj \ - ..\common\$D\prntbase.obj \ - ..\common\$D\process.obj \ - ..\common\$D\protocol.obj \ - ..\common\$D\quantize.obj \ - ..\common\$D\radiocmn.obj \ - ..\common\$D\regex.obj \ - ..\common\$D\rgncmn.obj \ - ..\common\$D\sckaddr.obj \ - ..\common\$D\sckfile.obj \ - ..\common\$D\sckipc.obj \ - ..\common\$D\sckstrm.obj \ - ..\common\$D\settcmn.obj \ - ..\common\$D\sizer.obj \ - ..\common\$D\socket.obj \ - ..\common\$D\statbar.obj \ - ..\common\$D\strconv.obj \ - ..\common\$D\stream.obj \ - ..\common\$D\string.obj \ - ..\common\$D\sysopt.obj \ - ..\common\$D\tbarbase.obj \ - ..\common\$D\textbuf.obj \ - ..\common\$D\textcmn.obj \ - ..\common\$D\textfile.obj \ - ..\common\$D\timercmn.obj \ - ..\common\$D\tokenzr.obj \ - ..\common\$D\toplvcmn.obj \ - ..\common\$D\treebase.obj \ - ..\common\$D\txtstrm.obj \ - ..\common\$D\unzip.obj \ - ..\common\$D\url.obj \ - ..\common\$D\utilscmn.obj \ - ..\common\$D\valgen.obj \ - ..\common\$D\validate.obj \ - ..\common\$D\valtext.obj \ - ..\common\$D\wfstream.obj \ - ..\common\$D\wincmn.obj \ - ..\common\$D\wxchar.obj \ - ..\common\$D\xpmdecod.obj \ - ..\common\$D\zipstrm.obj \ - ..\common\$D\zstream.obj - -COMLIBOBJS1 = \ - accesscmn.obj \ - artprov.obj \ - artstd.obj \ - appcmn.obj \ - choiccmn.obj \ - clipcmn.obj \ - clntdata.obj \ - cmdline.obj \ - cmndata.obj \ - cmdproc.obj \ - config.obj \ - containr.obj \ - cshelp.obj \ - ctrlcmn.obj \ - ctrlsub.obj \ - datacmn.obj \ - datetime.obj \ - datstrm.obj \ - dcbase.obj \ - dircmn.obj \ - dndcmn.obj \ - dlgcmn.obj \ - dobjcmn.obj \ - docmdi.obj \ - docview.obj \ - dseldlg.obj \ - dpycmn.obj \ - dynarray.obj \ - dynlib.obj \ - dynload.obj \ - effects.obj \ - encconv.obj \ - event.obj \ - extended.obj \ - fddlgcmn.obj \ - ffile.obj \ - file.obj \ - fileconf.obj \ - filefn.obj \ - filename.obj \ - filesys.obj \ - fontcmn.obj \ - fontmap.obj \ - -COMLIBOBJS2 = \ - framecmn.obj \ - fs_inet.obj \ - fs_mem.obj \ - fs_zip.obj \ - ftp.obj \ - gaugecmn.obj \ - gdicmn.obj \ - geometry.obj \ - gifdecod.obj \ - hash.obj \ - hashmap.obj \ - helpbase.obj \ - http.obj \ - iconbndl.obj \ - imagall.obj \ - imagbmp.obj \ - image.obj \ - imagfill.obj \ - imaggif.obj \ - imagiff.obj \ - imagjpeg.obj \ - imagpcx.obj \ - imagpng.obj \ - imagpnm.obj \ - imagtiff.obj \ - imagxpm.obj \ - intl.obj \ - ipcbase.obj \ - layout.obj \ - lboxcmn.obj \ - list.obj \ - log.obj \ - longlong.obj \ - matrix.obj \ - memory.obj \ - menucmn.obj \ - mimecmn.obj \ - module.obj \ - msgout.obj \ - mstream.obj \ - nbkbase.obj \ - object.obj - -COMLIBOBJS3 = \ - paper.obj \ - popupcmn.obj \ - prntbase.obj \ - process.obj \ - protocol.obj \ - quantize.obj \ - radiocmn.obj \ - regex.obj \ - rgncmn.obj \ - sckaddr.obj \ - sckfile.obj \ - sckipc.obj \ - sckstrm.obj \ - settcmn.obj \ - sizer.obj \ - socket.obj \ - statbar.obj \ - strconv.obj \ - stream.obj \ - string.obj \ - sysopt.obj \ - tbarbase.obj \ - textbuf.obj \ - textcmn.obj \ - textfile.obj \ - timercmn.obj \ - tokenzr.obj \ - toplvcmn.obj \ - treebase.obj \ - txtstrm.obj \ - unzip.obj \ - url.obj \ - utilscmn.obj \ - valgen.obj \ - validate.obj \ - valtext.obj \ - wfstream.obj \ - wincmn.obj \ - wxchar.obj \ - xpmdecod.obj - -COMLIBOBJS4 = \ - zipstrm.obj \ - zstream.obj - -OS2OBJS = \ - ..\os2\$D\accel.obj \ - ..\os2\$D\app.obj \ - ..\os2\$D\bitmap.obj \ - ..\os2\$D\bmpbuttn.obj \ - ..\os2\$D\brush.obj \ - ..\os2\$D\button.obj \ - ..\os2\$D\checkbox.obj \ - ..\os2\$D\checklst.obj \ - ..\os2\$D\choice.obj \ - ..\os2\$D\clipbrd.obj \ - ..\os2\$D\colour.obj \ - ..\os2\$D\combobox.obj \ - ..\os2\$D\control.obj \ - ..\os2\$D\cursor.obj \ - ..\os2\$D\data.obj \ - ..\os2\$D\dataobj.obj \ - ..\os2\$D\dc.obj \ - ..\os2\$D\dcclient.obj \ - ..\os2\$D\dcmemory.obj \ - ..\os2\$D\dcprint.obj \ - ..\os2\$D\dcscreen.obj \ - ..\os2\$D\dialog.obj \ - ..\os2\$D\dir.obj \ - ..\os2\$D\dnd.obj \ - ..\os2\$D\filedlg.obj \ - ..\os2\$D\font.obj \ - ..\os2\$D\fontdlg.obj \ - ..\os2\$D\fontenum.obj \ - ..\os2\$D\fontutil.obj \ - ..\os2\$D\frame.obj \ - ..\os2\$D\gauge.obj \ - ..\os2\$D\gdiimage.obj \ - ..\os2\$D\gdiobj.obj \ - ..\os2\$D\gsocket.obj \ - ..\os2\$D\gsockpm.obj \ - ..\os2\$D\helpwin.obj \ - ..\os2\$D\icon.obj \ - ..\os2\$D\iniconf.obj \ - ..\os2\$D\joystick.obj \ - ..\os2\$D\listbox.obj \ - ..\os2\$D\listctrl.obj \ - ..\os2\$D\main.obj \ - ..\os2\$D\menu.obj \ - ..\os2\$D\menuitem.obj \ - ..\os2\$D\metafile.obj \ - ..\os2\$D\mimetype.obj \ - ..\os2\$D\msgdlg.obj \ - ..\os2\$D\nativdlg.obj \ - ..\os2\$D\notebook.obj \ - ..\os2\$D\ownerdrw.obj \ - ..\os2\$D\palette.obj \ - ..\os2\$D\pen.obj \ - ..\os2\$D\popupwin.obj \ - ..\os2\$D\print.obj \ - ..\os2\$D\radiobox.obj \ - ..\os2\$D\radiobut.obj \ - ..\os2\$D\region.obj \ - ..\os2\$D\scrolbar.obj \ - ..\os2\$D\settings.obj \ - ..\os2\$D\slider.obj \ - ..\os2\$D\spinbutt.obj \ - ..\os2\$D\spinctrl.obj \ - ..\os2\$D\statbmp.obj \ - ..\os2\$D\statbox.obj \ - ..\os2\$D\statline.obj \ - ..\os2\$D\stattext.obj \ - ..\os2\$D\tabctrl.obj \ - ..\os2\$D\textctrl.obj \ - ..\os2\$D\thread.obj \ - ..\os2\$D\timer.obj \ - ..\os2\$D\toolbar.obj \ - ..\os2\$D\tooltip.obj \ - ..\os2\$D\toplevel.obj \ - ..\os2\$D\treectrl.obj \ - ..\os2\$D\utils.obj \ - ..\os2\$D\utilsexc.obj \ - ..\os2\$D\wave.obj \ - ..\os2\$D\window.obj - -OS2LIBOBJS1 = \ - accel.obj \ - app.obj \ - bitmap.obj \ - bmpbuttn.obj \ - brush.obj \ - button.obj \ - checkbox.obj \ - checklst.obj \ - choice.obj \ - clipbrd.obj \ - colour.obj \ - combobox.obj \ - control.obj \ - cursor.obj \ - data.obj \ - dataobj.obj \ - dc.obj \ - dcclient.obj \ - dcmemory.obj \ - dcprint.obj \ - dcscreen.obj \ - dialog.obj \ - dir.obj \ - dnd.obj \ - filedlg.obj \ - font.obj \ - fontdlg.obj \ - fontenum.obj \ - fontutil.obj \ - frame.obj \ - gauge.obj \ - gdiimage.obj \ - gdiobj.obj \ - gsocket.obj \ - gsockpm.obj \ - helpwin.obj \ - icon.obj \ - iniconf.obj \ - joystick.obj \ - listbox.obj \ - listctrl.obj \ - main.obj \ - menu.obj \ - menuitem.obj \ - metafile.obj - -OS2LIBOBJS2 = \ - mimetype.obj \ - msgdlg.obj \ - nativdlg.obj \ - notebook.obj \ - ownerdrw.obj \ - palette.obj \ - pen.obj \ - popupwin.obj \ - print.obj \ - radiobox.obj \ - radiobut.obj \ - region.obj \ - scrolbar.obj \ - settings.obj \ - slider.obj \ - spinbutt.obj \ - spinctrl.obj \ - statbmp.obj \ - statbox.obj \ - stattext.obj \ - statline.obj \ - tabctrl.obj \ - textctrl.obj \ - thread.obj \ - timer.obj \ - toolbar.obj \ - tooltip.obj \ - toplevel.obj \ - treectrl.obj \ - utils.obj \ - utilsexc.obj \ - wave.obj \ - window.obj - -HTMLOBJS = \ - ..\html\$D\helpctrl.obj \ - ..\html\$D\helpdata.obj \ - ..\html\$D\helpfrm.obj \ - ..\html\$D\htmlcell.obj \ - ..\html\$D\htmlfilt.obj \ - ..\html\$D\htmlpars.obj \ - ..\html\$D\htmltag.obj \ - ..\html\$D\htmlwin.obj \ - ..\html\$D\htmprint.obj \ - ..\html\$D\m_dflist.obj \ - ..\html\$D\m_fonts.obj \ - ..\html\$D\m_hline.obj \ - ..\html\$D\m_image.obj \ - ..\html\$D\m_layout.obj \ - ..\html\$D\m_links.obj \ - ..\html\$D\m_list.obj \ - ..\html\$D\m_pre.obj \ - ..\html\$D\m_style.obj \ - ..\html\$D\m_tables.obj \ - ..\html\$D\winpars.obj - -HTMLLIBOBJS = \ - helpctrl.obj \ - helpdata.obj \ - helpfrm.obj \ - htmlcell.obj \ - htmlfilt.obj \ - htmlpars.obj \ - htmltag.obj \ - htmlwin.obj \ - htmprint.obj \ - m_dflist.obj \ - m_fonts.obj \ - m_hline.obj \ - m_image.obj \ - m_layout.obj \ - m_links.obj \ - m_list.obj \ - m_pre.obj \ - m_style.obj \ - m_tables.obj \ - winpars.obj - -# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS) - -# Normal, static library -all: $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg tiff $(LIBTARGET) - -dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D - - -test: $(OS2DIR)\$D\wave.obj -test2: ..\common\Debug\config.obj - -# If taking wxWindows from CVS, setup.h doesn't exist yet. -$(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h - copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h - -$(WXDIR)\include\wx\setup.h: $(WXDIR)\include\wx\os2\setup.h - copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\setup.h - -$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h - icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp - -$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h - icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp - -$(COMLIBOBJS1): - copy ..\common\$D\accesscmn.obj - copy ..\common\$D\artprov.obj - copy ..\common\$D\artstd.obj - copy ..\common\$D\appcmn.obj - copy ..\common\$D\choiccmn.obj - copy ..\common\$D\clipcmn.obj - copy ..\common\$D\clntdata.obj - copy ..\common\$D\cmdline.obj - copy ..\common\$D\cmndata.obj - copy ..\common\$D\cmdproc.obj - copy ..\common\$D\config.obj - copy ..\common\$D\containr.obj - copy ..\common\$D\cshelp.obj - copy ..\common\$D\ctrlcmn.obj - copy ..\common\$D\ctrlsub.obj - copy ..\common\$D\datacmn.obj - copy ..\common\$D\datetime.obj - copy ..\common\$D\datstrm.obj - copy ..\common\$D\dcbase.obj - copy ..\common\$D\dlgcmn.obj - copy ..\common\$D\dircmn.obj - copy ..\common\$D\dndcmn.obj - copy ..\common\$D\dobjcmn.obj - copy ..\common\$D\docmdi.obj - copy ..\common\$D\docview.obj - copy ..\common\$D\dpycmn.obj - copy ..\common\$D\dseldlg.obj - copy ..\common\$D\dynarray.obj - copy ..\common\$D\dynlib.obj - copy ..\common\$D\dynload.obj - copy ..\common\$D\effects.obj - copy ..\common\$D\encconv.obj - copy ..\common\$D\event.obj - copy ..\common\$D\extended.obj - copy ..\common\$D\fddlgcmn.obj - copy ..\common\$D\ffile.obj - copy ..\common\$D\file.obj - copy ..\common\$D\fileconf.obj - copy ..\common\$D\filefn.obj - copy ..\common\$D\filename.obj - copy ..\common\$D\filesys.obj - copy ..\common\$D\fontcmn.obj - copy ..\common\$D\fontmap.obj - -$(COMLIBOBJS2): - copy ..\common\$D\framecmn.obj - copy ..\common\$D\fs_inet.obj - copy ..\common\$D\fs_mem.obj - copy ..\common\$D\fs_zip.obj - copy ..\common\$D\ftp.obj - copy ..\common\$D\gaugecmn.obj - copy ..\common\$D\gdicmn.obj - copy ..\common\$D\geometry.obj - copy ..\common\$D\gifdecod.obj - copy ..\common\$D\hash.obj - copy ..\common\$D\hashmap.obj - copy ..\common\$D\helpbase.obj - copy ..\common\$D\http.obj - copy ..\common\$D\iconbndl.obj - copy ..\common\$D\imagall.obj - copy ..\common\$D\imagbmp.obj - copy ..\common\$D\image.obj - copy ..\common\$D\imagfill.obj - copy ..\common\$D\imaggif.obj - copy ..\common\$D\imagiff.obj - copy ..\common\$D\imagjpeg.obj - copy ..\common\$D\imagpcx.obj - copy ..\common\$D\imagpng.obj - copy ..\common\$D\imagpnm.obj - copy ..\common\$D\imagtiff.obj - copy ..\common\$D\imagxpm.obj - copy ..\common\$D\intl.obj - copy ..\common\$D\ipcbase.obj - copy ..\common\$D\layout.obj - copy ..\common\$D\lboxcmn.obj - copy ..\common\$D\list.obj - copy ..\common\$D\log.obj - copy ..\common\$D\longlong.obj - copy ..\common\$D\matrix.obj - copy ..\common\$D\memory.obj - copy ..\common\$D\menucmn.obj - copy ..\common\$D\mimecmn.obj - copy ..\common\$D\module.obj - copy ..\common\$D\msgout.obj - copy ..\common\$D\mstream.obj - copy ..\common\$D\nbkbase.obj - copy ..\common\$D\object.obj - -$(COMLIBOBJS3): - copy ..\common\$D\paper.obj - copy ..\common\$D\popupcmn.obj - copy ..\common\$D\prntbase.obj - copy ..\common\$D\process.obj - copy ..\common\$D\protocol.obj - copy ..\common\$D\quantize.obj - copy ..\common\$D\radiocmn.obj - copy ..\common\$D\regex.obj - copy ..\common\$D\rgncmn.obj - copy ..\common\$D\sckaddr.obj - copy ..\common\$D\sckfile.obj - copy ..\common\$D\sckipc.obj - copy ..\common\$D\sckstrm.obj - copy ..\common\$D\settcmn.obj - copy ..\common\$D\sizer.obj - copy ..\common\$D\socket.obj - copy ..\common\$D\statbar.obj - copy ..\common\$D\strconv.obj - copy ..\common\$D\stream.obj - copy ..\common\$D\string.obj - copy ..\common\$D\sysopt.obj - copy ..\common\$D\tbarbase.obj - copy ..\common\$D\textbuf.obj - copy ..\common\$D\textcmn.obj - copy ..\common\$D\textfile.obj - copy ..\common\$D\timercmn.obj - copy ..\common\$D\tokenzr.obj - copy ..\common\$D\toplvcmn.obj - copy ..\common\$D\treebase.obj - copy ..\common\$D\txtstrm.obj - copy ..\common\$D\unzip.obj - copy ..\common\$D\url.obj - copy ..\common\$D\utilscmn.obj - copy ..\common\$D\valgen.obj - copy ..\common\$D\validate.obj - copy ..\common\$D\valtext.obj - copy ..\common\$D\wfstream.obj - copy ..\common\$D\wincmn.obj - copy ..\common\$D\wxchar.obj - copy ..\common\$D\xpmdecod.obj - -$(COMLIBOBJS4): - copy ..\common\$D\zipstrm.obj - copy ..\common\$D\zstream.obj - -$(GENLIBOBJS): - copy ..\generic\$D\busyinfo.obj - copy ..\generic\$D\calctrl.obj - copy ..\generic\$D\caret.obj - copy ..\generic\$D\choicdgg.obj - copy ..\generic\$D\colrdlgg.obj - copy ..\generic\$D\dragimgg.obj - copy ..\generic\$D\dcbuffer.obj - copy ..\generic\$D\dcpsg.obj - copy ..\generic\$D\dirdlgg.obj - copy ..\generic\$D\dirctrlg.obj - copy ..\generic\$D\fdrepdlg.obj - copy ..\generic\$D\grid.obj - copy ..\generic\$D\gridctrl.obj - copy ..\generic\$D\gridsel.obj - copy ..\generic\$D\helpext.obj - copy ..\generic\$D\helphtml.obj - copy ..\generic\$D\imaglist.obj - copy ..\generic\$D\laywin.obj - copy ..\generic\$D\logg.obj - copy ..\generic\$D\mdig.obj - copy ..\generic\$D\numdlgg.obj - copy ..\generic\$D\panelg.obj - copy ..\generic\$D\printps.obj - copy ..\generic\$D\prntdlgg.obj - copy ..\generic\$D\progdlgg.obj - copy ..\generic\$D\prop.obj - copy ..\generic\$D\propform.obj - copy ..\generic\$D\proplist.obj - copy ..\generic\$D\sashwin.obj - copy ..\generic\$D\scrlwing.obj - copy ..\generic\$D\spinctlg.obj - copy ..\generic\$D\splitter.obj - copy ..\generic\$D\statusbr.obj - copy ..\generic\$D\tabg.obj - copy ..\generic\$D\tbarsmpl.obj - copy ..\generic\$D\textdlgg.obj - copy ..\generic\$D\tipdlg.obj - copy ..\generic\$D\tipwin.obj - copy ..\generic\$D\wizard.obj - -$(HTMLLIBOBJS): - copy ..\html\$D\helpctrl.obj - copy ..\html\$D\helpdata.obj - copy ..\html\$D\helpfrm.obj - copy ..\html\$D\htmlcell.obj - copy ..\html\$D\htmlfilt.obj - copy ..\html\$D\htmlpars.obj - copy ..\html\$D\htmltag.obj - copy ..\html\$D\htmlwin.obj - copy ..\html\$D\htmprint.obj - copy ..\html\$D\m_dflist.obj - copy ..\html\$D\m_fonts.obj - copy ..\html\$D\m_hline.obj - copy ..\html\$D\m_image.obj - copy ..\html\$D\m_layout.obj - copy ..\html\$D\m_links.obj - copy ..\html\$D\m_list.obj - copy ..\html\$D\m_pre.obj - copy ..\html\$D\m_style.obj - copy ..\html\$D\m_tables.obj - copy ..\html\$D\winpars.obj - -$(OS2LIBOBJS1): - copy ..\os2\$D\accel.obj - copy ..\os2\$D\app.obj - copy ..\os2\$D\bitmap.obj - copy ..\os2\$D\bmpbuttn.obj - copy ..\os2\$D\brush.obj - copy ..\os2\$D\button.obj - copy ..\os2\$D\checkbox.obj - copy ..\os2\$D\checklst.obj - copy ..\os2\$D\choice.obj - copy ..\os2\$D\clipbrd.obj - copy ..\os2\$D\colour.obj - copy ..\os2\$D\combobox.obj - copy ..\os2\$D\control.obj - copy ..\os2\$D\cursor.obj - copy ..\os2\$D\data.obj - copy ..\os2\$D\dataobj.obj - copy ..\os2\$D\dc.obj - copy ..\os2\$D\dcclient.obj - copy ..\os2\$D\dcmemory.obj - copy ..\os2\$D\dcprint.obj - copy ..\os2\$D\dcscreen.obj - copy ..\os2\$D\dialog.obj - copy ..\os2\$D\dir.obj - copy ..\os2\$D\dnd.obj - copy ..\os2\$D\filedlg.obj - copy ..\os2\$D\font.obj - copy ..\os2\$D\fontdlg.obj - copy ..\os2\$D\fontenum.obj - copy ..\os2\$D\fontutil.obj - copy ..\os2\$D\frame.obj - copy ..\os2\$D\gauge.obj - copy ..\os2\$D\gdiimage.obj - copy ..\os2\$D\gdiobj.obj - copy ..\os2\$D\gsocket.obj - copy ..\os2\$D\gsockpm.obj - copy ..\os2\$D\helpwin.obj - copy ..\os2\$D\icon.obj - copy ..\os2\$D\iniconf.obj - copy ..\os2\$D\joystick.obj - copy ..\os2\$D\listbox.obj - copy ..\os2\$D\listctrl.obj - copy ..\os2\$D\main.obj - copy ..\os2\$D\menu.obj - copy ..\os2\$D\menuitem.obj - copy ..\os2\$D\metafile.obj - -$(OS2LIBOBJS2): - copy ..\os2\$D\mimetype.obj - copy ..\os2\$D\msgdlg.obj - copy ..\os2\$D\nativdlg.obj - copy ..\os2\$D\notebook.obj - copy ..\os2\$D\ownerdrw.obj - copy ..\os2\$D\palette.obj - copy ..\os2\$D\pen.obj - copy ..\os2\$D\popupwin.obj - copy ..\os2\$D\print.obj - copy ..\os2\$D\radiobox.obj - copy ..\os2\$D\radiobut.obj - copy ..\os2\$D\region.obj - copy ..\os2\$D\scrolbar.obj - copy ..\os2\$D\settings.obj - copy ..\os2\$D\slider.obj - copy ..\os2\$D\spinbutt.obj - copy ..\os2\$D\spinctrl.obj - copy ..\os2\$D\statbmp.obj - copy ..\os2\$D\statbox.obj - copy ..\os2\$D\statline.obj - copy ..\os2\$D\stattext.obj - copy ..\os2\$D\tabctrl.obj - copy ..\os2\$D\textctrl.obj - copy ..\os2\$D\thread.obj - copy ..\os2\$D\timer.obj - copy ..\os2\$D\toolbar.obj - copy ..\os2\$D\tooltip.obj - copy ..\os2\$D\toplevel.obj - copy ..\os2\$D\treectrl.obj - copy ..\os2\$D\utils.obj - copy ..\os2\$D\utilsexc.obj - copy ..\os2\$D\wave.obj - copy ..\os2\$D\window.obj - -# wxWindows library as DLL -dll: - nmake -f makefile.va all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) - -cleandll: - nmake -f makefile.va clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) - -# wxWindows + app as DLL. Only affects main.cpp. -dllapp: - nmake -f makefile.va all FINAL=$(FINAL) DLL=1 - -# wxWindows + app as DLL, for Netscape plugin - remove DllMain. -dllnp: - nmake -f makefile.va all FINAL=$(FINAL) DLL=1 - -# Use this to make dummy.obj and generate a PCH. -# You might use the dll target, then the pch target, in order to -# generate a DLL, then a PCH/dummy.obj for compiling your applications with. -# -# Explanation: Normally, when compiling a static version of wx.lib, your dummy.obj/PCH -# are associated with wx.lib. When using a DLL version of wxWindows, however, -# the DLL is compiled without a PCH, so you only need it for compiling the app. -# In fact headers are compiled differently depending on whether a DLL is being made -# or an app is calling the DLL exported functionality (WXDLLEXPORT is different -# in each case) so you couldn't use the same PCH. -pch: - nmake -f makefile.va pch1 WXUSINGDLL=1 FINAL=$(FINAL) NEW_WXLIBNAME=$(NEW_WXLIBNAME) - -pch1: dirs $(DUMMYOBJ) - echo $(DUMMYOBJ) - -!if "$(WXMAKINGDLL)" != "1" - -### Static library - -$(WXDIR)\lib\wxcom1.lib: $(COMLIBOBJS1) - -touch $(WXDIR)\lib\wxcom1.lib - -del $(WXDIR)\lib\wxcom1.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - -$(WXDIR)\lib\wxcom2.lib: $(COMLIBOBJS2) - -touch $(WXDIR)\lib\wxcom2.lib - -del $(WXDIR)\lib\wxcom2.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - -$(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3) - -touch $(WXDIR)\lib\wxcom3.lib - -del $(WXDIR)\lib\wxcom3.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - -$(WXDIR)\lib\wxcom4.lib: $(COMLIBOBJS4) - -touch $(WXDIR)\lib\wxcom4.lib - -del $(WXDIR)\lib\wxcom4.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - -$(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS) - -touch $(WXDIR)\lib\wxgen.lib - -del $(WXDIR)\lib\wxgen.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - -$(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS) - -touch $(WXDIR)\lib\wxhtml.lib - -del $(WXDIR)\lib\wxhtml.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - -$(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS) - -touch $(WXDIR)\lib\wxnones.lib - -del $(WXDIR)\lib\wxnones.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - -$(WXDIR)\lib\wxos21.lib: $(OS2LIBOBJS1) - -touch $(WXDIR)\lib\wxos21.lib - -del $(WXDIR)\lib\wxos21.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - -$(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2) - -touch $(WXDIR)\lib\wxos22.lib - -del $(WXDIR)\lib\wxos22.lib - ilib $(LIBFLAGS) $@ @<< - $**; -<< - del *.obj - -$(WXDIR)\lib\wx.lib: \ - $D\dummy.obj \ - $(COMTEMPTGT1) \ - $(COMTEMPTGT2) \ - $(COMTEMPTGT3) \ - $(COMTEMPTGT4) \ - $(GENTEMPTGT) \ - $(HTMLTEMPTGT) \ - $(NONESTEMPTGT) \ - $(OS2TEMPTGT1) \ - $(OS2TEMPTGT2) \ - $(PERIPH_LIBS) - -touch $(LIBTARGET) - -del $(LIBTARGET) - ilib $(LIBFLAGS) $@ @<< - $**; -<< - del $(COMTEMPTGT1) - del $(COMTEMPTGT2) - del $(COMTEMPTGT3) - del $(COMTEMPTGT4) - del $(GENTEMPTGT) - del $(HTMLTEMPTGT) - del $(NONESTEMPTGT) - del $(OS2TEMPTGT1) - del $(OS2TEMPTGT2) - -!else - -# Update the dynamic link library -$(WXDIR)\lib\wx25.dll: $(OBJECTS) - icc @<< - /B" $(LINKFLAGS)" /Fe$@ - $(LIBS) - $(DUMMYOBJ) - $(OBJECTS) - $(WXDIR)\src\os2\wx25.def -<< - implib $(WXDIR)\lib\wx25.lib $(WXDIR)\src\os2\wx25.def - -!endif - -..\common\$D\extended.obj: ..\common\extended.c - icc @<< -$(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c -<< - -$(OBJECTS): $(WXDIR)/include/wx/setup.h - -..\common\$D\unzip.obj: ..\common\unzip.c - icc @<< -$(CPPFLAGS2) /Fo$@ $(COMMDIR)\unzip.c -<< - -png: - cd $(WXDIR)\src\png - nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) - cd $(WXDIR)\src\os2 - -clean_png: - cd $(WXDIR)\src\png - nmake -f makefile.va clean - cd $(WXDIR)\src\os2 - -zlib: - cd $(WXDIR)\src\zlib - nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) - cd $(WXDIR)\src\os2 - -clean_zlib: - cd $(WXDIR)\src\zlib - nmake -f makefile.va clean - cd $(WXDIR)\src\os2 - -jpeg: - cd $(WXDIR)\src\jpeg - nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) - cd $(WXDIR)\src\os2 - -clean_jpeg: - cd $(WXDIR)\src\jpeg - nmake -f makefile.va clean - cd $(WXDIR)\src\os2 - -tiff: - cd $(WXDIR)\src\tiff - nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) - cd $(WXDIR)\src\os2 - -clean_tiff: - cd $(WXDIR)\src\tiff - nmake -f makefile.va clean - cd $(WXDIR)\src\os2 - -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff - erase /N $(GENDIR)\$D\*.obj - erase /N $(COMMDIR)\$D\*.obj - erase /N $(HTMLDIR)\$D\*.obj - erase /N $(OS2DIR)\$D\*.obj - rd $(D) - rd ..\generic\$D - rd ..\common\$D - rd ..\html\$D - rd ..\os2\$D - del ..\lib\wx.lib -!if "$(WXMAKINGDLL)" == "1" - del ..\lib\wx25.lib -!endif - -cleanall: clean - diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp deleted file mode 100644 index 1360bf6430..0000000000 --- a/src/os2/menu.cpp +++ /dev/null @@ -1,1174 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/menu.cpp -// Purpose: wxMenu, wxMenuBar, wxMenuItem -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/menu.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/frame.h" - #include "wx/utils.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#if wxUSE_OWNER_DRAWN - #include "wx/ownerdrw.h" -#endif - -#include "wx/os2/private.h" - -// other standard headers -#include - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -extern wxMenu* wxCurrentPopupMenu; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// -// The (popup) menu title has this special id -// -static const int idMenuTitle = -3; - -// -// The unique ID for Menus -// -USHORT wxMenu::m_nextMenuId = 0; - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// ============================================================================ -// implementation -// ============================================================================ - -// --------------------------------------------------------------------------- -// wxMenu construction, adding and removing menu items -// --------------------------------------------------------------------------- - -// -// Construct a menu with optional title (then use append) -// -void wxMenu::Init() -{ - m_bDoBreak = false; - m_nStartRadioGroup = -1; - - // - // Create the menu (to be used as a submenu or a popup) - // - if ((m_hMenu = ::WinCreateWindow( HWND_DESKTOP - ,WC_MENU - ,"Menu" - ,0L - ,0L - ,0L - ,0L - ,0L - ,NULLHANDLE - ,HWND_TOP - ,0L - ,NULL - ,NULL - )) == 0) - { - wxLogLastError(wxT("WinLoadMenu")); - } - m_vMenuData.iPosition = 0; - m_vMenuData.afStyle = MIS_SUBMENU | MIS_TEXT; - m_vMenuData.afAttribute = (USHORT)0; - m_vMenuData.id = m_nextMenuId++; - m_vMenuData.hwndSubMenu = m_hMenu; - m_vMenuData.hItem = NULLHANDLE; - - // - // If we have a title, insert it in the beginning of the menu - // - if (!m_title.empty()) - { - Append( idMenuTitle - ,m_title - ,wxEmptyString - ,wxITEM_NORMAL - ); - AppendSeparator(); - } -} // end of wxMenu::Init - -// -// The wxWindow destructor will take care of deleting the submenus. -// -wxMenu::~wxMenu() -{ - // - // We should free PM resources only if PM doesn't do it for us - // which happens if we're attached to a menubar or a submenu of another - // menu - if (!IsAttached() && !GetParent()) - { - if (!::WinDestroyWindow((HWND)GetHmenu()) ) - { - wxLogLastError(wxT("WinDestroyWindow")); - } - } - -#if wxUSE_ACCEL - // - // Delete accels - // - WX_CLEAR_ARRAY(m_vAccels); -#endif // wxUSE_ACCEL -} // end of wxMenu::~wxMenu - -void wxMenu::Break() -{ - // this will take effect during the next call to Append() - m_bDoBreak = true; -} // end of wxMenu::Break - -void wxMenu::Attach( - wxMenuBarBase* pMenubar -) -{ - wxMenuBase::Attach(pMenubar); - EndRadioGroup(); -} // end of wxMenu::Break; - -#if wxUSE_ACCEL - -int wxMenu::FindAccel( - int nId -) const -{ - size_t n; - size_t nCount = m_vAccels.GetCount(); - - for (n = 0; n < nCount; n++) - if (m_vAccels[n]->m_command == nId) - return n; - return wxNOT_FOUND; -} // end of wxMenu::FindAccel - -void wxMenu::UpdateAccel( - wxMenuItem* pItem -) -{ - if (pItem->IsSubMenu()) - { - wxMenu* pSubmenu = pItem->GetSubMenu(); - wxMenuItemList::compatibility_iterator node = pSubmenu->GetMenuItems().GetFirst(); - - while (node) - { - UpdateAccel(node->GetData()); - node = node->GetNext(); - } - } - else if (!pItem->IsSeparator()) - { - // - // Recurse upwards: we should only modify m_accels of the top level - // menus, not of the submenus as wxMenuBar doesn't look at them - // (alternative and arguable cleaner solution would be to recurse - // downwards in GetAccelCount() and CopyAccels()) - // - if (GetParent()) - { - GetParent()->UpdateAccel(pItem); - return; - } - - // - // Find the (new) accel for this item - // - wxAcceleratorEntry* pAccel = wxAcceleratorEntry::Create(pItem->GetItemLabel()); - - if (pAccel) - pAccel->m_command = pItem->GetId(); - - // - // Find the old one - // - size_t n = FindAccel(pItem->GetId()); - - if (n == (size_t)wxNOT_FOUND) - { - // - // No old, add new if any - // - if (pAccel) - m_vAccels.Add(pAccel); - else - return; - } - else - { - // - // Replace old with new or just remove the old one if no new - // - delete m_vAccels[n]; - if (pAccel) - m_vAccels[n] = pAccel; - else - m_vAccels.RemoveAt(n); - } - - if (IsAttached()) - { - GetMenuBar()->RebuildAccelTable(); - } - } -} // wxMenu::UpdateAccel - -#endif // wxUSE_ACCEL - -// -// Append a new item or submenu to the menu -// -bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem, - size_t nPos ) -{ - wxMenu* pSubmenu = pItem->GetSubMenu(); - MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData: - pItem->m_vMenuData; - - ERRORID vError; - wxString sError; - -#if wxUSE_ACCEL - UpdateAccel(pItem); -#endif // wxUSE_ACCEL - - // - // If "Break" has just been called, insert a menu break before this item - // (and don't forget to reset the flag) - // - if (m_bDoBreak) - { - rItem.afStyle |= MIS_BREAK; - m_bDoBreak = false; - } - - // - // Id is the numeric id for normal menu items and HMENU for submenus as - // required by ::MM_INSERTITEM message API - // - if (pSubmenu != NULL) - { - wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu")); - pSubmenu->SetParent(this); - - rItem.iPosition = 0; // submenus have a 0 position - rItem.id = (USHORT)pSubmenu->GetHMenu(); - rItem.afStyle |= MIS_SUBMENU | MIS_TEXT; - } - else - { - rItem.id = (USHORT)pItem->GetId(); - } - - char *pData = NULL; - -#if wxUSE_OWNER_DRAWN - if (pItem->IsOwnerDrawn()) - { - // - // Want to get {Measure|Draw}Item messages? - // item draws itself, passing pointer to data doesn't work in OS/2 - // Will eventually need to set the image handle somewhere into vItem.hItem - // - rItem.afStyle |= MIS_OWNERDRAW; - pData = NULL; - rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP(); - pItem->m_vMenuData.afStyle = rItem.afStyle; - pItem->m_vMenuData.hItem = rItem.hItem; - } - else -#endif - if (pItem->IsSeparator()) - { - rItem.afStyle = MIS_SEPARATOR; - } - else - { - if (pItem->GetId() == idMenuTitle) - { - // Item is an unselectable title to be passed via pData - rItem.afStyle = MIS_STATIC; - } - else - { - // - // Menu is just a normal string (passed in data parameter) - // - rItem.afStyle |= MIS_TEXT; - } - pData = (char*) pItem->GetItemLabel().wx_str(); - } - - if (nPos == (size_t)-1) - { - rItem.iPosition = MIT_END; - } - else - { - rItem.iPosition = (SHORT)nPos; - } - - APIRET rc; - - rc = (APIRET)::WinSendMsg( GetHmenu() - ,MM_INSERTITEM - ,(MPARAM)&rItem - ,(MPARAM)pData - ); -#if wxUSE_OWNER_DRAWN - if (pItem->IsOwnerDrawn()) - { - MENUITEM vMenuItem; - - ::WinSendMsg( GetHmenu() - ,MM_QUERYITEM - ,MPFROM2SHORT( (USHORT)pItem->GetId() - ,(USHORT)(FALSE) - ) - ,&vMenuItem - ); - } -#endif - - if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error inserting or appending a menuitem. Error: %s\n"), sError.c_str()); - wxLogLastError(wxT("Insert or AppendMenu")); - return false; - } - - // - // If we're already attached to the menubar, we must update it - // - if (IsAttached() && GetMenuBar()->IsAttached()) - { - GetMenuBar()->Refresh(); - } - - return true; -} // end of wxMenu::DoInsertOrAppend - -void wxMenu::EndRadioGroup() -{ - // - // We're not inside a radio group any longer - // - m_nStartRadioGroup = -1; -} // end of wxMenu::EndRadioGroup - -wxMenuItem* wxMenu::DoAppend( wxMenuItem* pItem ) -{ - wxCHECK_MSG( pItem, NULL, wxT("NULL item in wxMenu::DoAppend") ); - - bool bCheck = false; - - if (pItem->GetKind() == wxITEM_RADIO) - { - int nCount = GetMenuItemCount(); - - if (m_nStartRadioGroup == -1) - { - // - // Start a new radio group - // - m_nStartRadioGroup = nCount; - - // - // For now it has just one element - // - pItem->SetAsRadioGroupStart(); - pItem->SetRadioGroupEnd(m_nStartRadioGroup); - - // - // Ensure that we have a checked item in the radio group - // - bCheck = true; - } - else // extend the current radio group - { - // - // We need to update its end item - // - pItem->SetRadioGroupStart(m_nStartRadioGroup); - - wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_nStartRadioGroup); - - if (node) - { - node->GetData()->SetRadioGroupEnd(nCount); - } - else - { - wxFAIL_MSG( wxT("where is the radio group start item?") ); - } - } - } - else // not a radio item - { - EndRadioGroup(); - } - - if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem)) - { - return NULL; - } - if (bCheck) - { - // - // Check the item initially - // - pItem->Check(true); - } - return pItem; -} // end of wxMenu::DoAppend - -wxMenuItem* wxMenu::DoInsert( - size_t nPos -, wxMenuItem* pItem -) -{ - if ( wxMenuBase::DoInsert( nPos - ,pItem) && - DoInsertOrAppend( pItem - ,nPos - )) - return pItem; - else - return NULL; -} // end of wxMenu::DoInsert - -wxMenuItem* wxMenu::DoRemove( - wxMenuItem* pItem -) -{ - // - // We need to find the items position in the child list - // - size_t nPos; - wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); - - for (nPos = 0; node; nPos++) - { - if (node->GetData() == pItem) - break; - node = node->GetNext(); - } - - // - // DoRemove() (unlike Remove) can only be called for existing item! - // - wxCHECK_MSG(node, NULL, wxT("bug in wxMenu::Remove logic")); - -#if wxUSE_ACCEL - // - // Remove the corresponding accel from the accel table - // - int n = FindAccel(pItem->GetId()); - - if (n != wxNOT_FOUND) - { - delete m_vAccels[n]; - m_vAccels.RemoveAt(n); - } - -#endif // wxUSE_ACCEL - // - // Remove the item from the menu - // - ::WinSendMsg( GetHmenu() - ,MM_REMOVEITEM - ,MPFROM2SHORT(pItem->GetId(), TRUE) - ,(MPARAM)0 - ); - if (IsAttached() && GetMenuBar()->IsAttached()) - { - // - // Otherwise, the chane won't be visible - // - GetMenuBar()->Refresh(); - } - - // - // And from internal data structures - // - return wxMenuBase::DoRemove(pItem); -} // end of wxMenu::DoRemove - -// --------------------------------------------------------------------------- -// accelerator helpers -// --------------------------------------------------------------------------- - -#if wxUSE_ACCEL - -// -// Create the wxAcceleratorEntries for our accels and put them into provided -// array - return the number of accels we have -// -size_t wxMenu::CopyAccels( - wxAcceleratorEntry* pAccels -) const -{ - size_t nCount = GetAccelCount(); - - for (size_t n = 0; n < nCount; n++) - { - *pAccels++ = *m_vAccels[n]; - } - return nCount; -} // end of wxMenu::CopyAccels - -#endif // wxUSE_ACCEL - -// --------------------------------------------------------------------------- -// set wxMenu title -// --------------------------------------------------------------------------- - -void wxMenu::SetTitle( const wxString& rLabel ) -{ - bool bHasNoTitle = m_title.empty(); - HWND hMenu = GetHmenu(); - - m_title = rLabel; - if (bHasNoTitle) - { - if (!rLabel.empty()) - { - if (!::WinSetWindowText(hMenu, rLabel.c_str())) - { - wxLogLastError(wxT("SetMenuTitle")); - } - } - } - else - { - if (rLabel.empty() ) - { - ::WinSendMsg( GetHmenu() - ,MM_REMOVEITEM - ,MPFROM2SHORT(hMenu, TRUE) - ,(MPARAM)0 - ); - } - else - { - // - // Modify the title - // - if (!::WinSetWindowText(hMenu, rLabel.c_str())) - { - wxLogLastError(wxT("SetMenuTitle")); - } - } - } -} // end of wxMenu::SetTitle - -// --------------------------------------------------------------------------- -// event processing -// --------------------------------------------------------------------------- - -bool wxMenu::OS2Command( WXUINT WXUNUSED(uParam), - WXWORD vId ) -{ - // - // Ignore commands from the menu title - // - - if (vId != (WXWORD)idMenuTitle) - { - SendEvent( vId - ,(int)::WinSendMsg( GetHmenu() - ,MM_QUERYITEMATTR - ,MPFROMSHORT(vId) - ,(MPARAM)MIA_CHECKED - ) - ); - } - return true; -} // end of wxMenu::OS2Command - -// --------------------------------------------------------------------------- -// other -// --------------------------------------------------------------------------- - -wxWindow* wxMenu::GetWindow() const -{ - if (m_invokingWindow != NULL) - return m_invokingWindow; - else if ( GetMenuBar() != NULL) - return GetMenuBar()->GetFrame(); - - return NULL; -} // end of wxMenu::GetWindow - -// recursive search for item by id -wxMenuItem* wxMenu::FindItem( - int nItemId -, ULONG hItem -, wxMenu** ppItemMenu -) const -{ - if ( ppItemMenu ) - *ppItemMenu = NULL; - - wxMenuItem* pItem = NULL; - - for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst(); - node && !pItem; - node = node->GetNext() ) - { - pItem = node->GetData(); - - if ( pItem->GetId() == nItemId && pItem->m_vMenuData.hItem == hItem) - { - if ( ppItemMenu ) - *ppItemMenu = (wxMenu *)this; - } - else if ( pItem->IsSubMenu() ) - { - pItem = pItem->GetSubMenu()->FindItem( nItemId - ,hItem - ,ppItemMenu - ); - if (pItem) - break; - } - else - { - // don't exit the loop - pItem = NULL; - } - } - return pItem; -} // end of wxMenu::FindItem - -// --------------------------------------------------------------------------- -// Menu Bar -// --------------------------------------------------------------------------- - -void wxMenuBar::Init() -{ - m_eventHandler = this; - m_menuBarFrame = NULL; - m_hMenu = 0; -} // end of wxMenuBar::Init - -wxMenuBar::wxMenuBar() -{ - Init(); -} // end of wxMenuBar::wxMenuBar - -wxMenuBar::wxMenuBar( - long WXUNUSED(lStyle) -) -{ - Init(); -} // end of wxMenuBar::wxMenuBar - -wxMenuBar::wxMenuBar( - int nCount -, wxMenu* vMenus[] -, const wxString sTitles[] -, long WXUNUSED(lStyle) -) -{ - Init(); - - m_titles.Alloc(nCount); - for ( int i = 0; i < nCount; i++ ) - { - m_menus.Append(vMenus[i]); - m_titles.Add(sTitles[i]); - vMenus[i]->Attach(this); - } -} // end of wxMenuBar::wxMenuBar - -wxMenuBar::~wxMenuBar() -{ - // - // We should free PM's resources only if PM doesn't do it for us - // which happens if we're attached to a frame - // - if (m_hMenu && !IsAttached()) - { - ::WinDestroyWindow((HMENU)m_hMenu); - m_hMenu = (WXHMENU)NULL; - } -} // end of wxMenuBar::~wxMenuBar - -// --------------------------------------------------------------------------- -// wxMenuBar helpers -// --------------------------------------------------------------------------- - -void wxMenuBar::Refresh() -{ - wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") ); - - WinSendMsg(GetWinHwnd(m_menuBarFrame), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); -} // end of wxMenuBar::Refresh - -WXHMENU wxMenuBar::Create() -{ - HWND hFrame; - - if (m_hMenu != 0 ) - return m_hMenu; - - wxCHECK_MSG(!m_hMenu, TRUE, wxT("menubar already created")); - - // - // Menubars should be associated with a frame otherwise they are popups - // - if (m_menuBarFrame != NULL) - hFrame = GetWinHwnd(m_menuBarFrame); - else - hFrame = HWND_DESKTOP; - // - // Create an empty menu and then fill it with insertions - // - if ((m_hMenu = ::WinCreateWindow( hFrame - ,WC_MENU - ,NULL - ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE - ,0L - ,0L - ,0L - ,0L - ,hFrame - ,HWND_TOP - ,FID_MENU - ,NULL - ,NULL - )) == 0) - { - wxLogLastError(wxT("WinLoadMenu")); - } - else - { - size_t nCount = GetMenuCount(), i; - wxMenuList::iterator it; - for (i = 0, it = m_menus.begin(); i < nCount; i++, it++) - { - APIRET rc; - ERRORID vError; - wxString sError; - HWND hSubMenu; - - // - // Set the parent and owner of the submenues to be the menubar, not the desktop - // - hSubMenu = (*it)->m_vMenuData.hwndSubMenu; - if (!::WinSetParent((*it)->m_vMenuData.hwndSubMenu, m_hMenu, FALSE)) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str()); - return NULLHANDLE; - } - - if (!::WinSetOwner((*it)->m_vMenuData.hwndSubMenu, m_hMenu)) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str()); - return NULLHANDLE; - } - - (*it)->m_vMenuData.iPosition = (SHORT)i; - - rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].wx_str()); - if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error inserting or appending a menuitem. Error: %s\n"), sError.c_str()); - return NULLHANDLE; - } - } - } - return m_hMenu; -} // end of wxMenuBar::Create - -// --------------------------------------------------------------------------- -// wxMenuBar functions to work with the top level submenus -// --------------------------------------------------------------------------- - -// -// NB: we don't support owner drawn top level items for now, if we do these -// functions would have to be changed to use wxMenuItem as well -// -void wxMenuBar::EnableTop( - size_t nPos -, bool bEnable -) -{ - wxCHECK_RET(IsAttached(), wxT("doesn't work with unattached menubars")); - USHORT uFlag = 0; - SHORT nId; - - if(!bEnable) - uFlag = MIA_DISABLED; - - nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0)); - if (nId == MIT_ERROR) - { - wxLogLastError(wxT("LogLastError")); - return; - } - ::WinSendMsg((HWND)m_hMenu, MM_SETITEMATTR, MPFROM2SHORT(nId, TRUE), MPFROM2SHORT(MIA_DISABLED, uFlag)); - Refresh(); -} // end of wxMenuBar::EnableTop - -void wxMenuBar::SetMenuLabel( - size_t nPos -, const wxString& rLabel -) -{ - SHORT nId; - MENUITEM vItem; - - wxCHECK_RET(nPos < GetMenuCount(), wxT("invalid menu index")); - m_titles[nPos] = rLabel; - - if (!IsAttached()) - { - return; - } - - nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0)); - if (nId == MIT_ERROR) - { - wxLogLastError(wxT("LogLastError")); - return; - } - if(!::WinSendMsg( (HWND)m_hMenu - ,MM_QUERYITEM - ,MPFROM2SHORT(nId, TRUE) - ,MPARAM(&vItem) - )) - { - wxLogLastError(wxT("QueryItem")); - } - nId = vItem.id; - - if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.wx_str())); - { - wxLogLastError(wxT("ModifyMenu")); - } - Refresh(); -} // end of wxMenuBar::SetMenuLabel - -wxString wxMenuBar::GetMenuLabel( - size_t nPos -) const -{ - wxCHECK_MSG( nPos < GetMenuCount(), wxEmptyString, - wxT("invalid menu index in wxMenuBar::GetMenuLabel") ); - return m_titles[nPos]; -} // end of wxMenuBar::GetMenuLabel - -// --------------------------------------------------------------------------- -// wxMenuBar construction -// --------------------------------------------------------------------------- - -wxMenu* wxMenuBar::Replace( - size_t nPos -, wxMenu* pMenu -, const wxString& rTitle -) -{ - SHORT nId; - wxString sTitle = wxPMTextToLabel(rTitle); - wxMenu* pMenuOld = wxMenuBarBase::Replace( nPos - ,pMenu - ,sTitle - ); - - - nId = SHORT1FROMMR(::WinSendMsg((HWND)m_hMenu, MM_ITEMIDFROMPOSITION, MPFROMSHORT(nPos), (MPARAM)0)); - if (nId == MIT_ERROR) - { - wxLogLastError(wxT("LogLastError")); - return NULL; - } - if (!pMenuOld) - return NULL; - m_titles[nPos] = sTitle; - if (IsAttached()) - { - ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0); - ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str()); - -#if wxUSE_ACCEL - if (pMenuOld->HasAccels() || pMenu->HasAccels()) - { - // - // Need to rebuild accell table - // - RebuildAccelTable(); - } -#endif // wxUSE_ACCEL - Refresh(); - } - return pMenuOld; -} // end of wxMenuBar::Replace - -bool wxMenuBar::Insert( size_t nPos, - wxMenu* pMenu, - const wxString& rTitle ) -{ - wxString sTitle = wxPMTextToLabel(rTitle); - - if (!wxMenuBarBase::Insert( nPos, pMenu, sTitle )) - return false; - - m_titles.Insert( sTitle, nPos ); - - if (IsAttached()) - { - pMenu->m_vMenuData.iPosition = (SHORT)nPos; - ::WinSendMsg( (HWND)m_hMenu - ,MM_INSERTITEM - ,(MPARAM)&pMenu->m_vMenuData - ,(MPARAM)sTitle.wx_str() - ); -#if wxUSE_ACCEL - if (pMenu->HasAccels()) - { - // need to rebuild accell table - RebuildAccelTable(); - } -#endif // wxUSE_ACCEL - Refresh(); - } - - return true; -} // end of wxMenuBar::Insert - -bool wxMenuBar::Append( wxMenu* pMenu, - const wxString& rsTitle ) -{ - WXHMENU hSubmenu = pMenu ? pMenu->GetHMenu() : 0; - - wxCHECK_MSG(hSubmenu, false, wxT("can't append invalid menu to menubar")); - - wxString sTitle = wxPMTextToLabel(rsTitle); - - if (!wxMenuBarBase::Append(pMenu, sTitle)) - return false; - - m_titles.Add(sTitle); - - if ( IsAttached() ) - { - pMenu->m_vMenuData.iPosition = MIT_END; - ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str()); -#if wxUSE_ACCEL - if (pMenu->HasAccels()) - { - // - // Need to rebuild accell table - // - RebuildAccelTable(); - } -#endif // wxUSE_ACCEL - Refresh(); - } - return true; -} // end of wxMenuBar::Append - -wxMenu* wxMenuBar::Remove( - size_t nPos -) -{ - wxMenu* pMenu = wxMenuBarBase::Remove(nPos); - SHORT nId; - - if (!pMenu) - return NULL; - - nId = SHORT1FROMMR(::WinSendMsg( (HWND)GetHmenu() - ,MM_ITEMIDFROMPOSITION - ,MPFROMSHORT(nPos) - ,(MPARAM)0) - ); - if (nId == MIT_ERROR) - { - wxLogLastError(wxT("LogLastError")); - return NULL; - } - if (IsAttached()) - { - ::WinSendMsg( (HWND)GetHmenu() - ,MM_REMOVEITEM - ,MPFROM2SHORT(nId, TRUE) - ,(MPARAM)0 - ); - -#if wxUSE_ACCEL - if (pMenu->HasAccels()) - { - // - // Need to rebuild accell table - // - RebuildAccelTable(); - } -#endif // wxUSE_ACCEL - Refresh(); - } - m_titles.RemoveAt(nPos); - return pMenu; -} // end of wxMenuBar::Remove - -#if wxUSE_ACCEL - -void wxMenuBar::RebuildAccelTable() -{ - // - // Merge the accelerators of all menus into one accel table - // - size_t nAccelCount = 0; - size_t i; - size_t nCount = GetMenuCount(); - wxMenuList::iterator it; - for (i = 0, it = m_menus.begin(); i < nCount; i++, it++) - { - nAccelCount += (*it)->GetAccelCount(); - } - - if (nAccelCount) - { - wxAcceleratorEntry* pAccelEntries = new wxAcceleratorEntry[nAccelCount]; - - nAccelCount = 0; - for (i = 0, it = m_menus.begin(); i < nCount; i++, it++) - { - nAccelCount += (*it)->CopyAccels(&pAccelEntries[nAccelCount]); - } - m_vAccelTable = wxAcceleratorTable( nAccelCount - ,pAccelEntries - ); - delete [] pAccelEntries; - } -} // end of wxMenuBar::RebuildAccelTable - -#endif // wxUSE_ACCEL - -void wxMenuBar::Attach( - wxFrame* pFrame -) -{ - wxMenuBarBase::Attach(pFrame); - -#if wxUSE_ACCEL - RebuildAccelTable(); - // - // Ensure the accelerator table is set to the frame (not the client!) - // - if (!::WinSetAccelTable( vHabmain - ,m_vAccelTable.GetHACCEL() - ,(HWND)pFrame->GetFrame() - )) - { - wxLogLastError(wxT("WinSetAccelTable")); - } -#endif // wxUSE_ACCEL -} // end of wxMenuBar::Attach - -void wxMenuBar::Detach() -{ - ::WinDestroyWindow((HWND)m_hMenu); - m_hMenu = (WXHMENU)NULL; - m_menuBarFrame = NULL; -} // end of wxMenuBar::Detach - -// --------------------------------------------------------------------------- -// wxMenuBar searching for menu items -// --------------------------------------------------------------------------- - -// -// Find the itemString in menuString, and return the item id or wxNOT_FOUND -// -int wxMenuBar::FindMenuItem( - const wxString& rMenuString -, const wxString& rItemString -) const -{ - wxString sMenuLabel = wxStripMenuCodes(rMenuString); - size_t nCount = GetMenuCount(), i; - wxMenuList::const_iterator it; - for (i = 0, it = m_menus.begin(); i < nCount; i++, it++) - { - wxString sTitle = wxStripMenuCodes(m_titles[i]); - - if (rMenuString == sTitle) - return (*it)->FindItem(rItemString); - } - return wxNOT_FOUND; -} // end of wxMenuBar::FindMenuItem - -wxMenuItem* wxMenuBar::FindItem( - int nId -, wxMenu** ppItemMenu -) const -{ - if (ppItemMenu) - *ppItemMenu = NULL; - - wxMenuItem* pItem = NULL; - size_t nCount = GetMenuCount(), i; - wxMenuList::const_iterator it; - for (i = 0, it = m_menus.begin(); !pItem && (i < nCount); i++, it++) - { - pItem = (*it)->FindItem( nId - ,ppItemMenu - ); - } - return pItem; -} // end of wxMenuBar::FindItem - -wxMenuItem* wxMenuBar::FindItem( - int nId -, ULONG hItem -, wxMenu** ppItemMenu -) const -{ - if (ppItemMenu) - *ppItemMenu = NULL; - - wxMenuItem* pItem = NULL; - size_t nCount = GetMenuCount(), i; - wxMenuList::const_iterator it; - for (i = 0, it = m_menus.begin(); !pItem && (i < nCount); i++, it++) - { - pItem = (*it)->FindItem( nId - ,hItem - ,ppItemMenu - ); - } - return pItem; -} // end of wxMenuBar::FindItem diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp deleted file mode 100644 index d94f1ffaad..0000000000 --- a/src/os2/menuitem.cpp +++ /dev/null @@ -1,812 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/menuitem.cpp -// Purpose: wxMenuItem implementation -// Author: David Webster -// Modified by: -// Created: 10/10/98 -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// headers & declarations -// ============================================================================ - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/menuitem.h" -#include "wx/stockitem.h" - -#ifndef WX_PRECOMP - #include "wx/font.h" - #include "wx/bitmap.h" - #include "wx/settings.h" - #include "wx/window.h" - #include "wx/accel.h" - #include "wx/menu.h" - #include "wx/string.h" - #include "wx/log.h" -#endif - -#if wxUSE_ACCEL - #include "wx/accel.h" -#endif // wxUSE_ACCEL - -#include "wx/os2/private.h" - -// --------------------------------------------------------------------------- -// macro -// --------------------------------------------------------------------------- - -// hide the ugly cast -#define GetHMenuOf(menu) ((HMENU)menu->GetHMenu()) - -// conditional compilation -#if wxUSE_OWNER_DRAWN - #define OWNER_DRAWN_ONLY( code ) if ( IsOwnerDrawn() ) code -#else // !wxUSE_OWNER_DRAWN - #define OWNER_DRAWN_ONLY( code ) -#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// dynamic classes implementation -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// wxMenuItem -// ---------------------------------------------------------------------------- - -// ctor & dtor -// ----------- - -wxMenuItem::wxMenuItem( - wxMenu* pParentMenu -, int nId -, const wxString& rsText -, const wxString& rsHelp -, wxItemKind eKind -, wxMenu* pSubMenu -) -: wxMenuItemBase( pParentMenu - ,nId - ,wxPMTextToLabel(rsText) - ,rsHelp - ,eKind - ,pSubMenu - ) -{ - wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); - memset(&m_vMenuData, '\0', sizeof(m_vMenuData)); - m_vMenuData.id = (USHORT)nId; - - Init(); -} // end of wxMenuItem::wxMenuItem - -wxMenuItem::wxMenuItem( - wxMenu* pParentMenu -, int nId -, const wxString& rsText -, const wxString& rsHelp -, bool bIsCheckable -, wxMenu* pSubMenu -) -: wxMenuItemBase( pParentMenu - ,nId - ,wxPMTextToLabel(rsText) - ,rsHelp - ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL - ,pSubMenu - ) -{ - wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); - memset(&m_vMenuData, '\0', sizeof(m_vMenuData)); - m_vMenuData.id = (USHORT)nId; - - Init(); -} // end of wxMenuItem::wxMenuItem - -void wxMenuItem::Init() -{ - m_vRadioGroup.m_nStart = -1; - m_bIsRadioGroupStart = FALSE; - -#if wxUSE_OWNER_DRAWN - // - // Set default menu colors - // - SetTextColour(wxNullColour); - SetBackgroundColour(wxNullColour); - - // - // We don't want normal items be owner-drawn - // - SetOwnerDrawn(false); -#endif // wxUSE_OWNER_DRAWN -} // end of wxMenuItem::Init - -wxMenuItem::~wxMenuItem() -{ -} // end of wxMenuItem::~wxMenuItem - -// -// Misc -// ---- - -// -// Return the id for calling Win32 API functions -// -int wxMenuItem::GetRealId() const -{ - return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId(); -} // end of wxMenuItem::GetRealId - -// -// Get item state -// -------------- -bool wxMenuItem::IsChecked() const -{ - USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu) - ,MM_QUERYITEMATTR - ,MPFROM2SHORT(GetId(), TRUE) - ,MPFROMSHORT(MIA_CHECKED) - )); - - return (uFlag & MIA_CHECKED) == MIA_CHECKED ; -} // end of wxMenuItem::IsChecked - -wxString wxMenuItemBase::GetLabelText( - const wxString& rsText -) -{ - wxString sLabel; - - for (const wxChar* zPc = rsText.c_str(); *zPc; zPc++) - { - if (*zPc == wxT('~') || *zPc == wxT('&')) - { - // - // '~' is the escape character for OS/2PM and '&' is the one for - // wxWidgets - skip both of them - // - continue; - } - sLabel += *zPc; - } - return sLabel; -} // end of wxMenuItemBase::GetLabelText - -// -// Radio group stuff -// ----------------- -// -void wxMenuItem::SetAsRadioGroupStart() -{ - m_bIsRadioGroupStart = true; -} // end of wxMenuItem::SetAsRadioGroupStart - -void wxMenuItem::SetRadioGroupStart( - int nStart -) -{ - wxASSERT_MSG( !m_bIsRadioGroupStart - ,wxT("should only be called for the next radio items") - ); - - m_vRadioGroup.m_nStart = nStart; -} // wxMenuItem::SetRadioGroupStart - -void wxMenuItem::SetRadioGroupEnd( - int nEnd -) -{ - wxASSERT_MSG( m_bIsRadioGroupStart - ,wxT("should only be called for the first radio item") - ); - m_vRadioGroup.m_nEnd = nEnd; -} // end of wxMenuItem::SetRadioGroupEnd - -// change item state -// ----------------- - -void wxMenuItem::Enable( - bool bEnable -) -{ - bool bOk; - - if (m_isEnabled == bEnable) - return; - if (bEnable) - bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) - ,MM_SETITEMATTR - ,MPFROM2SHORT(GetRealId(), TRUE) - ,MPFROM2SHORT(MIA_DISABLED, FALSE) - ); - else - bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) - ,MM_SETITEMATTR - ,MPFROM2SHORT(GetRealId(), TRUE) - ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED) - ); - if (!bOk) - { - wxLogLastError(wxT("EnableMenuItem")); - } - wxMenuItemBase::Enable(bEnable); -} // end of wxMenuItem::Enable - -void wxMenuItem::Check( - bool bCheck -) -{ - bool bOk; - - wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") ); - if (m_isChecked == bCheck) - return; - - HMENU hMenu = GetHmenuOf(m_parentMenu); - - if (GetKind() == wxITEM_RADIO) - { - // - // It doesn't make sense to uncheck a radio item - what would this do? - // - if (!bCheck) - return; - - // - // Get the index of this item in the menu - // - const wxMenuItemList& rItems = m_parentMenu->GetMenuItems(); - int nPos = rItems.IndexOf(this); - - wxCHECK_RET( nPos != wxNOT_FOUND - ,wxT("menuitem not found in the menu items list?") - ); - - // - // Get the radio group range - // - int nStart; - int nEnd; - - if (m_bIsRadioGroupStart) - { - // - // We already have all information we need - // - nStart = nPos; - nEnd = m_vRadioGroup.m_nEnd; - } - else // next radio group item - { - // - // Get the radio group end from the start item - // - nStart = m_vRadioGroup.m_nStart; - nEnd = rItems.Item(nStart)->GetData()->m_vRadioGroup.m_nEnd; - } - - // - // Also uncheck all the other items in this radio group - // - wxMenuItemList::compatibility_iterator node = rItems.Item(nStart); - - for (int n = nStart; n <= nEnd && node; n++) - { - if (n == nPos) - { - ::WinSendMsg( hMenu - ,MM_SETITEMATTR - ,MPFROM2SHORT(n, TRUE) - ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) - ); - } - if (n != nPos) - { - node->GetData()->m_isChecked = FALSE; - ::WinSendMsg( hMenu - ,MM_SETITEMATTR - ,MPFROM2SHORT(n, TRUE) - ,MPFROM2SHORT(MIA_CHECKED, FALSE) - ); - } - node = node->GetNext(); - } - } - else // check item - { - if (bCheck) - bOk = (bool)::WinSendMsg( hMenu - ,MM_SETITEMATTR - ,MPFROM2SHORT(GetRealId(), TRUE) - ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) - ); - else - bOk = (bool)::WinSendMsg( hMenu - ,MM_SETITEMATTR - ,MPFROM2SHORT(GetRealId(), TRUE) - ,MPFROM2SHORT(MIA_CHECKED, FALSE) - ); - } - if (!bOk) - { - wxLogLastError(wxT("CheckMenuItem")); - } - wxMenuItemBase::Check(bCheck); -} // end of wxMenuItem::Check - -void wxMenuItem::SetItemLabel( const wxString& rText ) -{ - // - // Don't do anything if label didn't change - // - - wxString sText = wxPMTextToLabel(rText); - if (m_text == sText) - return; - - // wxMenuItemBase will do stock ID checks - wxMenuItemBase::SetItemLabel(sText); - - HWND hMenu = GetHmenuOf(m_parentMenu); - - wxCHECK_RET(hMenu, wxT("menuitem without menu")); - -#if wxUSE_ACCEL - m_parentMenu->UpdateAccel(this); -#endif // wxUSE_ACCEL - - USHORT uId = (USHORT)GetRealId(); - MENUITEM vItem; - USHORT uFlagsOld; - - if (!::WinSendMsg( hMenu - ,MM_QUERYITEM - ,MPFROM2SHORT(uId, TRUE) - ,(MPARAM)&vItem - )) - { - wxLogLastError(wxT("GetMenuState")); - } - else - { - uFlagsOld = vItem.afStyle; - if (IsSubMenu()) - { - uFlagsOld |= MIS_SUBMENU; - } - - char* pData; - -#if wxUSE_OWNER_DRAWN - if (IsOwnerDrawn()) - { - uFlagsOld |= MIS_OWNERDRAW; - pData = (char*)this; - } - else -#endif //owner drawn - { - uFlagsOld |= MIS_TEXT; - pData = (char*) m_text.wx_str(); - } - - // - // Set the style - // - if (!::WinSendMsg( hMenu - ,MM_SETITEM - ,MPFROM2SHORT(uId, TRUE) - ,(MPARAM)&vItem - )) - { - wxLogLastError(wxT("ModifyMenu")); - } - - // - // Set the text - // - if (::WinSendMsg( hMenu - ,MM_SETITEMTEXT - ,MPFROMSHORT(uId) - ,(MPARAM)pData - )) - { - wxLogLastError(wxT("ModifyMenu")); - } - } -} // end of wxMenuItem::SetText - -#if wxUSE_OWNER_DRAWN - -wxString wxMenuItem::GetName() const -{ - return GetItemLabelText(); -} - -bool wxMenuItem::OnMeasureItem( size_t* pWidth, size_t* pHeight ) -{ - wxMemoryDC vDC; - - wxString sStr = GetName(); - - // - // If we have a valid accel string, then pad out - // the menu string so that the menu and accel string are not - // placed on top of each other. - wxString accel = GetItemLabel().AfterFirst(wxT('\t')); - if (!accel.empty() ) - { - sStr.Pad(sStr.length()%8); - sStr += accel; - } - vDC.SetFont(GetFont()); - vDC.GetTextExtent( sStr - ,(wxCoord *)pWidth - ,(wxCoord *)pHeight - ); - if (!accel.empty()) - { - // - // Measure the accelerator string, and add its width to - // the total item width, plus 16 (Accelerators are right justified, - // with the right edge of the text rectangle 16 pixels left of - // the right edge of the menu) - // - int nAccelWidth; - int nAccelHeight; - - vDC.GetTextExtent( m_strAccel - ,&nAccelWidth - ,&nAccelHeight - ); - *pWidth += nAccelWidth; - } - - // - // Add space at the end of the menu for the submenu expansion arrow. - // This will also allow offsetting the accel string from the right edge - // - *pWidth = (size_t)(*pWidth + GetDefaultMarginWidth() * 1.5); - - // - // JACS: items still look too tightly packed, so adding 5 pixels. - // - (*pHeight) += 5; - - // - // Ray Gilbert's changes - Corrects the problem of a BMP - // being placed next to text in a menu item, and the BMP does - // not match the size expected by the system. This will - // resize the space so the BMP will fit. Without this, BMPs - // must be no larger or smaller than 16x16. - // - if (m_bmpChecked.IsOk()) - { - // - // Is BMP height larger than text height? - // - size_t nAdjustedHeight = m_bmpChecked.GetHeight() + - wxSystemSettings::GetMetric(wxSYS_EDGE_Y); - if (*pHeight < nAdjustedHeight) - *pHeight = nAdjustedHeight; - - // - // Does BMP encroach on default check menu position? - // - size_t nAdjustedWidth = m_bmpChecked.GetWidth() + - (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2); - - // - // Do we need to widen margin to fit BMP? - // - if ((size_t)GetMarginWidth() < nAdjustedWidth) - SetMarginWidth(nAdjustedWidth); - - // - // Add the size of the bitmap to our total size... - // - *pWidth += GetMarginWidth(); - } - - // - // Add the size of the bitmap to our total size - even if we don't have - // a bitmap we leave room for one... - // - *pWidth += GetMarginWidth(); - - // - // Make sure that this item is at least as - // tall as the user's system settings specify - // - const size_t heightStd = 6; // FIXME: get value from the system - if ( *pHeight < heightStd ) - *pHeight = heightStd; - m_nHeight = *pHeight; // remember height for use in OnDrawItem - return true; -} // end of wxOwnerDrawn::OnMeasureItem - -bool wxMenuItem::OnDrawItem( wxDC& rDC, - const wxRect& rRect, - wxODAction eAction, - wxODStatus eStatus ) -{ - - // - // Select the font and draw the text - // --------------------------------- - // - - CHARBUNDLE vCbnd; - wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); - HPS hPS= impl->GetHPS(); - wxFont vFont; - wxColour vColBack; - wxColour vColText; - COLORREF vRef; - RECTL vRect = {rRect.x + 4, rRect.y + 1, rRect.x + (rRect.width - 2), rRect.y + rRect.height}; - - memset(&vCbnd, 0, sizeof(CHARBUNDLE)); - - GetFontToUse(vFont); - GetColourToUse(eStatus, vColText, vColBack); - - rDC.SetFont(vFont); - rDC.SetTextBackground(vColBack); - rDC.SetTextForeground(vColText); - rDC.SetBackgroundMode(wxTRANSPARENT); - - vCbnd.lColor = vColText.GetPixel(); - vCbnd.lBackColor = vColBack.GetPixel(); - ::GpiSetAttrs( hPS - ,PRIM_CHAR - ,CBB_BACK_COLOR | CBB_COLOR - ,0 - ,&vCbnd - ); - ::GpiSetBackMix( hPS - ,BM_LEAVEALONE - ); - - // - // Paint the background - // - ::WinFillRect(hPS, &vRect, vColBack.GetPixel()); - - // - // Determine where to draw and leave space for a check-mark. - // - int nX = rRect.x + GetMarginWidth(); - - // - // Unfortunately, unlike Win32, PM has no owner drawn specific text - // drawing methods like ::DrawState that can cleanly handle accel - // mnemonics and deal, automatically, with various states, so we have - // to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn - // strings either. We cannot handle mnemonics either. We display - // them, though, in the hope we can figure them out some day. - // - - // - // Display main text and accel text separately to align better - // - wxString sTgt = wxT("\t"); - wxString sFullString = GetItemLabel(); // need to save the original text - wxString sAccel; - int nIndex; - size_t nWidth; - size_t nCharWidth; - size_t nHeight; - bool bFoundMnemonic = false; - bool bFoundAccel = false; - - // - // Deal with the tab, extracting the Accel text - // - nIndex = sFullString.Find(sTgt); - if (nIndex != -1) - { - bFoundAccel = true; - sAccel = sFullString.Mid(nIndex + 1); - sFullString.Remove(nIndex); - } - - // - // Deal with the mnemonic character - // - sTgt = wxT("~"); - nIndex = sFullString.Find(sTgt); - if (nIndex != -1) - { - wxString sTmp = sFullString; - - bFoundMnemonic = true; - sTmp.Remove(nIndex); - rDC.GetTextExtent( sTmp - ,(wxCoord *)&nWidth - ,(wxCoord *)&nHeight - ); - sTmp = sFullString[(size_t)(nIndex + 1)]; - rDC.GetTextExtent( sTmp - ,(wxCoord *)&nCharWidth - ,(wxCoord *)&nHeight - ); - sFullString.Replace(sTgt.c_str(), wxEmptyString, true); - } - - // - // Draw the main item text sans the accel text - // - POINTL vPntStart = {nX, rRect.y + 4}; - ::GpiCharStringAt( impl->GetHPS() - ,&vPntStart - ,sFullString.length() - ,sFullString.char_str() - ); - if (bFoundMnemonic) - { - // - // Underline the mnemonic -- still won't work, but at least it "looks" right - // - wxPen vPen; - POINTL vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide - - vPntStart.x = nX + nWidth - 1; - vPntStart.y = rRect.y + 2; // Make it look pretty! - vPen = wxPen(vColText, 1, wxSOLID); // Assuming we are always black - rDC.SetPen(vPen); - ::GpiMove(hPS, &vPntStart); - ::GpiLine(hPS, &vPntEnd); - } - - // - // Now draw the accel text - // - if (bFoundAccel) - { - size_t nWidth; - size_t nHeight; - - rDC.GetTextExtent( sAccel - ,(wxCoord *)&nWidth - ,(wxCoord *)&nHeight - ); - // - // Back off the starting position from the right edge - // - vPntStart.x = rRect.width - (nWidth + 7); - vPntStart.y = rRect.y + 4; - ::GpiCharStringAt( impl->GetHPS() - ,&vPntStart - ,sAccel.length() - ,sAccel.char_str() - ); - } - - // - // Draw the bitmap - // --------------- - // - if (IsCheckable() && !m_bmpChecked.IsOk()) - { - if (eStatus & wxODChecked) - { - RECTL vRect; - HBITMAP hBmpCheck = ::WinGetSysBitmap(HWND_DESKTOP, SBMP_MENUCHECK); - - vRect.xLeft = rRect.x; - vRect.xRight = rRect.x + GetMarginWidth(); - vRect.yBottom = rRect.y; - vRect.yTop = rRect.y + m_nHeight - 3; - - ::WinDrawBitmap( hPS // PS for this menuitem - ,hBmpCheck // system checkmark - ,NULL // draw the whole bitmap - ,(PPOINTL)&vRect // destination -- bottom left corner of the menuitem area - ,0L // ignored - ,0L // draw a bitmap - ,DBM_NORMAL // draw normal size - ); - } - } - else - { - // - // For uncheckable item we use only the 'checked' bitmap - // - wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE)); - - if (vBmp.IsOk()) - { - - wxMemoryDC vDCMem(&rDC); - wxMemoryDC* pOldDC = (wxMemoryDC*)vBmp.GetSelectedInto(); - - if(pOldDC != NULL) - { - vBmp.SetSelectedInto(NULL); - } - vDCMem.SelectObject(vBmp); - - // - // Center bitmap - // - int nBmpWidth = vBmp.GetWidth(); - int nBmpHeight = vBmp.GetHeight(); - - // - // There should be enough space! - // - wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height)); - - int nHeightDiff = m_nHeight - nBmpHeight; - - rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2 - ,rRect.y + nHeightDiff / 2 - ,nBmpWidth - ,nBmpHeight - ,&vDCMem - ,0 - ,0 - ,wxCOPY - ,true - ); - - if (eStatus & wxODSelected) - { - POINTL vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border - POINTL vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3}; - - LINEBUNDLE vLine; - - vLine.lColor = vColBack.GetPixel(); - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR - ,0 - ,&vLine - ); - ::GpiMove(hPS, &vPnt1); - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPnt2 - ,0L - ,0L - ); - } - vBmp.SetSelectedInto(NULL); - } - } - return true; -} // end of wxOwnerDrawn::OnDrawItem - -#endif // wxUSE_OWNER_DRAWN - -// ---------------------------------------------------------------------------- -// wxMenuItemBase -// ---------------------------------------------------------------------------- - -wxMenuItem* wxMenuItemBase::New( - wxMenu* pParentMenu -, int nId -, const wxString& rName -, const wxString& rHelp -, wxItemKind kind -, wxMenu* pSubMenu -) -{ - return new wxMenuItem( pParentMenu - ,nId - ,rName - ,rHelp - ,kind - ,pSubMenu - ); -} // end of wxMenuItemBase::New diff --git a/src/os2/metafile.cpp b/src/os2/metafile.cpp deleted file mode 100644 index fa53786d37..0000000000 --- a/src/os2/metafile.cpp +++ /dev/null @@ -1,442 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/metafile.cpp -// Purpose: wxMetaFile, wxMetaFileDC etc. These classes are optional. -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_METAFILE - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/app.h" -#endif - -#include "wx/metafile.h" -#include "wx/clipbrd.h" -#include "wx/os2/private.h" - -#include -#include - -extern bool wxClipboardIsOpen; - -IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject) -IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC) - -/* - * Metafiles - * Currently, the only purpose for making a metafile is to put - * it on the clipboard. - */ - -wxMetafileRefData::wxMetafileRefData(void) -{ - m_metafile = 0; - m_windowsMappingMode = MM_ANISOTROPIC; -} - -wxMetafileRefData::~wxMetafileRefData(void) -{ - if (m_metafile) - { -// TODO: DeleteMetaFile((HMETAFILE) m_metafile); - m_metafile = 0; - } -} - -wxMetafile::wxMetafile(const wxString& file) -{ - m_refData = new wxMetafileRefData; - - M_METAFILEDATA->m_windowsMappingMode = MM_ANISOTROPIC; - M_METAFILEDATA->m_metafile = 0; - if (!file.empty()) - M_METAFILEDATA->m_metafile = (WXHANDLE)0; // TODO: GetMetaFile(file); -} - -wxMetafile::~wxMetafile(void) -{ -} - -wxGDIRefData *wxMetafile::CreateGDIRefData() const -{ - return new wxMetafileRefData; -} - -wxGDIRefData *wxMetafile::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxMetafileRefData(*static_cast(data)); -} - -bool wxMetafile::SetClipboard(int width, int height) -{ -#if !wxUSE_CLIPBOARD - wxUnusedVar(width); - wxUnusedVar(height); - return false; -#else - if (!m_refData) - return false; - - bool alreadyOpen=wxClipboardOpen(); - if (!alreadyOpen) - { - wxOpenClipboard(); - if (!wxEmptyClipboard()) return false; - } - bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height); - if (!alreadyOpen) wxCloseClipboard(); - return (bool) success; -#endif -} - -bool wxMetafile::Play(wxDC *dc) -{ - if (!m_refData) - return false; - - // if (dc->GetHDC() && M_METAFILEDATA->m_metafile) - // PlayMetaFile((HDC) dc->GetHDC(), (HMETAFILE) M_METAFILEDATA->m_metafile); - - return true; -} - -void wxMetafile::SetHMETAFILE(WXHANDLE mf) -{ - if (m_refData) - m_refData = new wxMetafileRefData; - - M_METAFILEDATA->m_metafile = mf; -} - -void wxMetafile::SetWindowsMappingMode(int mm) -{ - if (m_refData) - m_refData = new wxMetafileRefData; - - M_METAFILEDATA->m_windowsMappingMode = mm; -} - -/* - * Metafile device context - * - */ - -// Original constructor that does not takes origin and extent. If you use this, -// *DO* give origin/extent arguments to wxMakeMetafilePlaceable. -wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file) - : wxPMDCImpl(owner) -{ - m_metaFile = NULL; - m_minX = 10000; - m_minY = 10000; - m_maxX = -10000; - m_maxY = -10000; -// m_title = NULL; - - if ( wxFileExists(file) ) - wxRemoveFile(file); - - // TODO -/* - if (!file.empty()) - m_hDC = (WXHDC) CreateMetaFile(file); - else - m_hDC = (WXHDC) CreateMetaFile(NULL); -*/ - - m_ok = (m_hDC != (WXHDC) 0) ; - - // Actual Windows mapping mode, for future reference. - m_windowsMappingMode = wxMM_TEXT; - - SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct) -} - -// New constructor that takes origin and extent. If you use this, don't -// give origin/extent arguments to wxMakeMetafilePlaceable. -wxMetafileDCImpl::wxMetafileDCImpl( wxDC *owner, const wxString& file, - int WXUNUSED(xext), - int WXUNUSED(yext), - int WXUNUSED(xorg), - int WXUNUSED(yorg) ) - : wxPMDCImpl(owner) -{ - m_minX = 10000; - m_minY = 10000; - m_maxX = -10000; - m_maxY = -10000; - if (!file.empty() && wxFileExists(file)) - wxRemoveFile(file); - -// m_hDC = (WXHDC) CreateMetaFile(file); - - m_ok = true; - -// ::SetWindowOrgEx((HDC) m_hDC,xorg,yorg, NULL); -// ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL); - - // Actual Windows mapping mode, for future reference. - m_windowsMappingMode = MM_ANISOTROPIC; - - SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct) -} - -wxMetafileDCImpl::~wxMetafileDCImpl(void) -{ - m_hDC = 0; -} - -void wxMetafileDCImpl::DoGetTextExtent(const wxString& WXUNUSED(string), - wxCoord *WXUNUSED(x), - wxCoord *WXUNUSED(y), - wxCoord *WXUNUSED(descent), - wxCoord *WXUNUSED(externalLeading), - const wxFont *theFont) const -{ - const wxFont *fontToUse = theFont; - if (!fontToUse) - fontToUse = &m_font; - - // TODO: -/* - HDC dc = GetDC(NULL); - - SIZE sizeRect; - TEXTMETRIC tm; - GetTextExtentPoint(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect); - GetTextMetrics(dc, &tm); - - ReleaseDC(NULL, dc); - - if ( x ) - *x = sizeRect.cx; - if ( y ) - *y = sizeRect.cy; - if ( descent ) - *descent = tm.tmDescent; - if ( externalLeading ) - *externalLeading = tm.tmExternalLeading; -*/ -} - -wxMetafile *wxMetafileDCImpl::Close(void) -{ - SelectOldObjects(m_hDC); - HANDLE mf = 0; // TODO: CloseMetaFile((HDC) m_hDC); - m_hDC = 0; - if (mf) - { - wxMetafile *wx_mf = new wxMetafile; - wx_mf->SetHMETAFILE((WXHANDLE) mf); - wx_mf->SetWindowsMappingMode(m_windowsMappingMode); - return wx_mf; - } - return NULL; -} - -void wxMetafileDCImpl::SetMapMode(wxMappingMode mode) -{ - m_mappingMode = mode; - -// int pixel_width = 0; -// int pixel_height = 0; -// int mm_width = 0; -// int mm_height = 0; - - float mm2pixelsX = 10.0; - float mm2pixelsY = 10.0; - - switch (mode) - { - case wxMM_TWIPS: - { - m_logicalScaleX = (float)(twips2mm * mm2pixelsX); - m_logicalScaleY = (float)(twips2mm * mm2pixelsY); - break; - } - case wxMM_POINTS: - { - m_logicalScaleX = (float)(pt2mm * mm2pixelsX); - m_logicalScaleY = (float)(pt2mm * mm2pixelsY); - break; - } - case wxMM_METRIC: - { - m_logicalScaleX = mm2pixelsX; - m_logicalScaleY = mm2pixelsY; - break; - } - case wxMM_LOMETRIC: - { - m_logicalScaleX = (float)(mm2pixelsX/10.0); - m_logicalScaleY = (float)(mm2pixelsY/10.0); - break; - } - default: - case wxMM_TEXT: - { - m_logicalScaleX = 1.0; - m_logicalScaleY = 1.0; - break; - } - } - m_nWindowExtX = 100; - m_nWindowExtY = 100; -} - -#ifdef __WIN32__ -struct RECT32 -{ - short left; - short top; - short right; - short bottom; -}; - -struct mfPLACEABLEHEADER { - DWORD key; - short hmf; - RECT32 bbox; - WORD inch; - DWORD reserved; - WORD checksum; -}; -#else -struct mfPLACEABLEHEADER { - DWORD key; - HANDLE hmf; - RECT bbox; - WORD inch; - DWORD reserved; - WORD checksum; -}; -#endif - -/* - * Pass filename of existing non-placeable metafile, and bounding box. - * Adds a placeable metafile header, sets the mapping mode to anisotropic, - * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode. - * - */ - -bool wxMakeMetafilePlaceable(const wxString& filename, float scale) -{ - return wxMakeMetafilePlaceable(filename, 0, 0, 0, 0, scale, FALSE); -} - -bool wxMakeMetafilePlaceable(const wxString& WXUNUSED(filename), - int WXUNUSED(x1), - int WXUNUSED(y1), - int WXUNUSED(x2), - int WXUNUSED(y2), - float WXUNUSED(scale), - bool WXUNUSED(useOriginAndExtent)) -{ -// TODO: the OS/2 PM/MM way to do this -/* - // I'm not sure if this is the correct way of suggesting a scale - // to the client application, but it's the only way I can find. - int unitsPerInch = (int)(576/scale); - - mfPLACEABLEHEADER header; - header.key = 0x9AC6CDD7L; - header.hmf = 0; - header.bbox.xLeft = (int)(x1); - header.bbox.yTop = (int)(y1); - header.bbox.xRight = (int)(x2); - header.bbox.yBottom = (int)(y2); - header.inch = unitsPerInch; - header.reserved = 0; - - // Calculate checksum - WORD *p; - mfPLACEABLEHEADER *pMFHead = &header; - for (p =(WORD *)pMFHead,pMFHead -> checksum = 0; p < (WORD *)&pMFHead ->checksum; ++p) - pMFHead ->checksum ^= *p; - - FILE *fd = fopen(filename.fn_str(), "rb"); - if (!fd) - return false; - - wxChar tempFileBuf[256]; - wxGetTempFileName(wxT("mf"), tempFileBuf); - FILE *fHandle = fopen(wxConvFile.cWX2MB(tempFileBuf), "wb"); - if (!fHandle) - return false; - fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle); - - // Calculate origin and extent - int originX = x1; - int originY = y1; - int extentX = x2 - x1; - int extentY = (y2 - y1); - - // Read metafile header and write - METAHEADER metaHeader; - fread((void *)&metaHeader, sizeof(unsigned char), sizeof(metaHeader), fd); - - if (useOriginAndExtent) - metaHeader.mtSize += 15; - else - metaHeader.mtSize += 5; - - fwrite((void *)&metaHeader, sizeof(unsigned char), sizeof(metaHeader), fHandle); - - // Write SetMapMode, SetWindowOrigin and SetWindowExt records - char modeBuffer[8]; - char originBuffer[10]; - char extentBuffer[10]; - METARECORD *modeRecord = (METARECORD *)&modeBuffer; - - METARECORD *originRecord = (METARECORD *)&originBuffer; - METARECORD *extentRecord = (METARECORD *)&extentBuffer; - - modeRecord->rdSize = 4; - modeRecord->rdFunction = META_SETMAPMODE; - modeRecord->rdParm[0] = MM_ANISOTROPIC; - - originRecord->rdSize = 5; - originRecord->rdFunction = META_SETWINDOWORG; - originRecord->rdParm[0] = originY; - originRecord->rdParm[1] = originX; - - extentRecord->rdSize = 5; - extentRecord->rdFunction = META_SETWINDOWEXT; - extentRecord->rdParm[0] = extentY; - extentRecord->rdParm[1] = extentX; - - fwrite((void *)modeBuffer, sizeof(char), 8, fHandle); - - if (useOriginAndExtent) - { - fwrite((void *)originBuffer, sizeof(char), 10, fHandle); - fwrite((void *)extentBuffer, sizeof(char), 10, fHandle); - } - - int ch = -2; - while (ch != EOF) - { - ch = getc(fd); - if (ch != EOF) - { - putc(ch, fHandle); - } - } - fclose(fHandle); - fclose(fd); - wxRemoveFile(filename); - wxCopyFile(tempFileBuf, filename); - wxRemoveFile(tempFileBuf); -*/ - return true; -} - -#endif // wxUSE_METAFILE diff --git a/src/os2/mimetype.cpp b/src/os2/mimetype.cpp deleted file mode 100644 index 16bedac9d3..0000000000 --- a/src/os2/mimetype.cpp +++ /dev/null @@ -1,449 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/mimetype.cpp -// Purpose: classes and functions to manage MIME types -// Author: David Webster -// Modified by: -// Created: 01.21.00 -// Copyright: Adopted from msw port --(c) 1998 Vadim Zeitlin -// Licence: wxWindows licence (part of wxExtra library) -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_MIMETYPE - -#include "wx/os2/mimetype.h" - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/log.h" - #if wxUSE_GUI - #include "wx/icon.h" - #endif -#endif //WX_PRECOMP - -#define INCL_DOS -#define INCL_GPI -#define INCL_WIN -#include - -#include "wx/file.h" -#include "wx/iconloc.h" -#include "wx/confbase.h" - -// other standard headers -#include - -// in case we're compiling in non-GUI mode -class WXDLLEXPORT wxIcon; - -// These classes use Windows registry to retrieve the required information. -// -// Keys used (not all of them are documented, so it might actually stop working -// in futur versions of Windows...): -// 1. "HKCR\MIME\Database\Content Type" contains subkeys for all known MIME -// types, each key has a string value "Extension" which gives (dot preceded) -// extension for the files of this MIME type. -// -// 2. "HKCR\.ext" contains -// a) unnamed value containing the "filetype" -// b) value "Content Type" containing the MIME type -// -// 3. "HKCR\filetype" contains -// a) unnamed value containing the description -// b) subkey "DefaultIcon" with single unnamed value giving the icon index in -// an icon file -// c) shell\open\command and shell\open\print subkeys containing the commands -// to open/print the file (the positional parameters are introduced by %1, -// %2, ... in these strings, we change them to %s ourselves) - -// although I don't know of any official documentation which mentions this -// location, uses it, so it isn't likely to change -static const wxChar *MIME_DATABASE_KEY = wxT("MIME\\Database\\Content Type\\"); - -wxString wxFileTypeImpl::GetCommand(const wxChar *WXUNUSED(verb)) const -{ -// TODO: OS/2 doesn't have a registry but uses Prf -/* - // suppress possible error messages - wxLogNull nolog; - wxString strKey; - - if ( wxRegKey(wxRegKey::HKCR, m_ext + wxT("\\shell")).Exists() ) - strKey = m_ext; - if ( wxRegKey(wxRegKey::HKCR, m_strFileType + wxT("\\shell")).Exists() ) - strKey = m_strFileType; - - if ( !strKey ) - { - // no info - return wxEmptyString; - } - - strKey << wxT("\\shell\\") << verb; - wxRegKey key(wxRegKey::HKCR, strKey + wxT("\\command")); - wxString command; - if ( key.Open() ) { - // it's the default value of the key - if ( key.QueryValue(wxT(""), command) ) { - // transform it from '%1' to '%s' style format string (now also - // test for %L - apparently MS started using it as well for the - // same purpose) - - // NB: we don't make any attempt to verify that the string is valid, - // i.e. doesn't contain %2, or second %1 or .... But we do make - // sure that we return a string with _exactly_ one '%s'! - bool foundFilename = false; - size_t len = command.Len(); - for ( size_t n = 0; (n < len) && !foundFilename; n++ ) { - if ( command[n] == wxT('%') && - (n + 1 < len) && - (command[n + 1] == wxT('1') || - command[n + 1] == wxT('L')) ) { - // replace it with '%s' - command[n + 1] = wxT('s'); - - foundFilename = true; - } - } - -#if wxUSE_DDE - // look whether we must issue some DDE requests to the application - // (and not just launch it) - strKey += wxT("\\DDEExec"); - wxRegKey keyDDE(wxRegKey::HKCR, strKey); - if ( keyDDE.Open() ) { - wxString ddeCommand, ddeServer, ddeTopic; - keyDDE.QueryValue(wxT(""), ddeCommand); - ddeCommand.Replace(wxT("%1"), wxT("%s")); - - wxRegKey(wxRegKey::HKCR, strKey + wxT("\\Application")). - QueryValue(wxT(""), ddeServer); - wxRegKey(wxRegKey::HKCR, strKey + wxT("\\Topic")). - QueryValue(wxT(""), ddeTopic); - - // HACK: we use a special feature of wxExecute which exists - // just because we need it here: it will establish DDE - // conversation with the program it just launched - command.Prepend(wxT("WX_DDE#")); - command << wxT('#') << ddeServer - << wxT('#') << ddeTopic - << wxT('#') << ddeCommand; - } - else -#endif // wxUSE_DDE - if ( !foundFilename ) { - // we didn't find any '%1' - the application doesn't know which - // file to open (note that we only do it if there is no DDEExec - // subkey) - // - // HACK: append the filename at the end, hope that it will do - command << wxT(" %s"); - } - } - } - //else: no such file type or no value, will return empty string - - return command; -*/ - return wxEmptyString; -} - -bool -wxFileTypeImpl::GetOpenCommand(wxString *openCmd, - const wxFileType::MessageParameters& params) - const -{ - wxString cmd; - if ( m_info ) { - cmd = m_info->GetOpenCommand(); - } - else { - cmd = GetCommand(wxT("open")); - } - - *openCmd = wxFileType::ExpandCommand(cmd, params); - - return !openCmd->empty(); -} - -bool -wxFileTypeImpl::GetPrintCommand(wxString *printCmd, - const wxFileType::MessageParameters& params) - const -{ - wxString cmd; - if ( m_info ) { - cmd = m_info->GetPrintCommand(); - } - else { - cmd = GetCommand(wxT("print")); - } - - *printCmd = wxFileType::ExpandCommand(cmd, params); - - return !printCmd->empty(); -} - -// TODO this function is half implemented -bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) -{ - if ( m_info ) { - extensions = m_info->GetExtensions(); - - return true; - } - else if ( m_ext.empty() ) { - // the only way to get the list of extensions from the file type is to - // scan through all extensions in the registry - too slow... - return false; - } - else { - extensions.Empty(); - extensions.Add(m_ext); - - // it's a lie too, we don't return _all_ extensions... - return true; - } -} - -bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const -{ - if ( m_info ) { - // we already have it - *mimeType = m_info->GetMimeType(); - - return true; - } - - // suppress possible error messages - wxLogNull nolog; -// TODO: substitue reg key stuff (maybe make a Prf class for OS/2??) -/* - wxRegKey key(wxRegKey::HKCR, wxT(".") + m_ext); - if ( key.Open() && key.QueryValue(wxT("Content Type"), *mimeType) ) { - return true; - } - else { - return false; - } -*/ - return false; -} - -bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const -{ - wxString s; - - if (GetMimeType(&s)) - { - mimeTypes.Clear(); - mimeTypes.Add(s); - return true; - } - else - return false; -} - -bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(iconLoc)) const -{ - if ( m_info ) { - // we don't have icons in the fallback resources - return false; - } - - wxString strIconKey; - strIconKey << m_strFileType << wxT("\\DefaultIcon"); - - // suppress possible error messages - wxLogNull nolog; -//TODO: -/* - wxRegKey key(wxRegKey::HKCR, strIconKey); - - if ( key.Open() ) { - wxString strIcon; - // it's the default value of the key - if ( key.QueryValue(wxEmptyString, strIcon) ) { - // the format is the following: , - // NB: icon index may be negative as well as positive and the full - // path may contain the environment variables inside '%' - wxString strFullPath = strIcon.BeforeLast(wxT(',')), - strIndex = strIcon.AfterLast(wxT(',')); - - // index may be omitted, in which case BeforeLast(',') is empty and - // AfterLast(',') is the whole string - if ( strFullPath.empty() ) { - strFullPath = strIndex; - strIndex = wxT("0"); - } - - if ( iconLoc ) - { - iconLoc->SetFileName(wxExpandEnvVars(strFullPath)); - - iconLoc->SetIndex(wxAtoi(strIndex)); - } - - return true; - } - } - - // no such file type or no value or incorrect icon entry -*/ - return false; -} - -bool wxFileTypeImpl::GetDescription(wxString *desc) const -{ - if ( m_info ) { - // we already have it - *desc = m_info->GetDescription(); - - return true; - } - - // suppress possible error messages - wxLogNull nolog; -// TODO: -/* - wxRegKey key(wxRegKey::HKCR, m_strFileType); - - if ( key.Open() ) { - // it's the default value of the key - if ( key.QueryValue(wxT(""), *desc) ) { - return true; - } - } -*/ - return false; -} - -// extension -> file type -wxFileType * -wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext) -{ - // add the leading point if necessary - wxString str; - if ( ext[(size_t) 0] != wxT('.') ) { - str = wxT('.'); - } - str << ext; - - // suppress possible error messages - wxLogNull nolog; - - bool knownExtension = false; - - wxString strFileType; -// TODO: -/* - wxRegKey key(wxRegKey::HKCR, str); - if ( key.Open() ) { - // it's the default value of the key - if ( key.QueryValue(wxT(""), strFileType) ) { - // create the new wxFileType object - wxFileType *fileType = new wxFileType; - fileType->m_impl->Init(strFileType, ext); - - return fileType; - } - else { - // this extension doesn't have a filetype, but it's known to the - // system and may be has some other useful keys (open command or - // content-type), so still return a file type object for it - knownExtension = true; - } - } -*/ - // check the fallbacks - // TODO linear search is potentially slow, perhaps we should use a sorted - // array? - size_t count = m_fallbacks.GetCount(); - for ( size_t n = 0; n < count; n++ ) { - if ( m_fallbacks[n].GetExtensions().Index(ext) != wxNOT_FOUND ) { - wxFileType *fileType = new wxFileType; - fileType->m_impl->Init(m_fallbacks[n]); - - return fileType; - } - } - - if ( knownExtension ) - { - wxFileType *fileType = new wxFileType; - fileType->m_impl->Init(wxEmptyString, ext); - - return fileType; - } - else - { - // unknown extension - return NULL; - } -} - -// MIME type -> extension -> file type -wxFileType * -wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType) -{ - wxString strKey = MIME_DATABASE_KEY; - strKey << mimeType; - - // suppress possible error messages - wxLogNull nolog; - - wxString ext; -// TODO: -/* - wxRegKey key(wxRegKey::HKCR, strKey); - if ( key.Open() ) { - if ( key.QueryValue(wxT("Extension"), ext) ) { - return GetFileTypeFromExtension(ext); - } - } - - // check the fallbacks - // TODO linear search is potentially slow, perhaps we should use a sorted - // array? - size_t count = m_fallbacks.GetCount(); - for ( size_t n = 0; n < count; n++ ) { - if ( wxMimeTypesManager::IsOfType(mimeType, - m_fallbacks[n].GetMimeType()) ) { - wxFileType *fileType = new wxFileType; - fileType->m_impl->Init(m_fallbacks[n]); - - return fileType; - } - } -*/ - // unknown MIME type - return NULL; -} - -size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& WXUNUSED(mimetypes)) -{ - // enumerate all keys under MIME_DATABASE_KEY -// TODO: -/* - wxRegKey key(wxRegKey::HKCR, MIME_DATABASE_KEY); - - wxString type; - long cookie; - bool cont = key.GetFirstKey(type, cookie); - while ( cont ) - { - mimetypes.Add(type); - - cont = key.GetNextKey(type, cookie); - } - - return mimetypes.GetCount(); -*/ - return 0; -} - -#endif //wxUSE_MIMETYPE diff --git a/src/os2/minifram.cpp b/src/os2/minifram.cpp deleted file mode 100644 index f23eb1e87f..0000000000 --- a/src/os2/minifram.cpp +++ /dev/null @@ -1,20 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/minifram.cpp -// Purpose: wxMiniFrame -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_MINIFRAME - -#include "wx/minifram.h" - -IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) - -#endif // wxUSE_MINIFRAME diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp deleted file mode 100644 index 858ff3d73d..0000000000 --- a/src/os2/msgdlg.cpp +++ /dev/null @@ -1,135 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/msgdlg.cpp -// Purpose: wxMessageDialog -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/msgdlg.h" - -#ifndef WX_PRECOMP - #include - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/app.h" - #include "wx/math.h" -#endif - -#include "wx/modalhook.h" -#include "wx/os2/private.h" - -#include -#include - -#define wxDIALOG_DEFAULT_X 300 -#define wxDIALOG_DEFAULT_Y 300 - -IMPLEMENT_CLASS(wxMessageDialog, wxDialog) - -int wxMessageDialog::ShowModal() -{ - WX_HOOK_MODAL_DIALOG(); - - HWND hWnd = 0; - ULONG ulStyle = MB_OK; - int nAns = wxOK; - const long lStyle = GetMessageDialogStyle(); - - if (!wxTheApp->GetTopWindow()) - { - // - // when the message box is shown from wxApp::OnInit() (i.e. before the - // message loop is entered), this must be done or the next message box - // will never be shown - just try putting 2 calls to wxMessageBox() in - // OnInit() to see it - // - while (wxTheApp->Pending()) - wxTheApp->Dispatch(); - } - - if (m_parent) - hWnd = (HWND) m_parent->GetHWND(); - else - hWnd = HWND_DESKTOP; - if (lStyle & wxYES_NO) - { - if (lStyle & wxCANCEL) - ulStyle = MB_YESNOCANCEL; - else - ulStyle = MB_YESNO; - - if (lStyle & wxNO_DEFAULT) - ulStyle |= MB_DEFBUTTON2; - } - - if (lStyle & wxOK) - { - if (lStyle & wxCANCEL) - ulStyle = MB_OKCANCEL; - else - ulStyle = MB_OK; - } - - switch ( GetEffectiveIcon() ) - { - case wxICON_ERROR: - ulStyle |= MB_ERROR; - break; - - case wxICON_WARNING: - ulStyle |= MB_WARNING; - break; - - case wxICON_QUESTION: - ulStyle |= MB_QUERY; - break; - - case wxICON_INFORMATION: - ulStyle |= MB_INFORMATION; - break; - } - - if (hWnd != HWND_DESKTOP) - ulStyle |= MB_APPLMODAL; - else - ulStyle |= MB_SYSTEMMODAL; - - // - // This little line of code is get message boxes under OS/2 to - // behve like the other ports. In OS/2 if the parent is a window - // it displays, clipped, in the window. This centers it on the - // desktop, like the other ports but still allows control over modality - // - hWnd = HWND_DESKTOP; - - ULONG ulAns = ::WinMessageBox( hWnd - ,hWnd - ,GetFullMessage().c_str() - ,m_caption.c_str() - ,0L - ,ulStyle); - switch (ulAns) - { - case MBID_CANCEL: - nAns = wxID_CANCEL; - break; - case MBID_OK: - nAns = wxID_OK; - break; - case MBID_YES: - nAns = wxID_YES; - break; - case MBID_NO: - nAns = wxID_NO; - break; - default: - nAns = wxID_CANCEL; - } - return nAns; -} // end of wxMessageDialog::ShowModal diff --git a/src/os2/nativdlg.cpp b/src/os2/nativdlg.cpp deleted file mode 100644 index b4c225db4f..0000000000 --- a/src/os2/nativdlg.cpp +++ /dev/null @@ -1,289 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/nativdlg.cpp -// Purpose: Native dialog loading code (part of wxWindow) -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// =========================================================================== -// declarations -// =========================================================================== - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include - #include "wx/wx.h" -#endif - -#include "wx/os2/private.h" -#include "wx/spinbutt.h" - -// --------------------------------------------------------------------------- -// global functions -// --------------------------------------------------------------------------- - -extern wxWindow* wxWndHook; -extern MRESULT EXPENTRY wxDlgProc( HWND hWnd - ,UINT message - ,MPARAM wParam - ,MPARAM lParam - ); - -// =========================================================================== -// implementation -// =========================================================================== - -bool wxWindow::LoadNativeDialog ( - wxWindow* pParent -, wxWindowID& vId -) -{ - wxWindow* pChild = NULL; - HWND hWndOwner; - HWND hWndNext = NULLHANDLE; - HENUM hEnum; - - if (pParent) - hWndOwner = GetHwndOf(pParent); - else - hWndOwner = HWND_DESKTOP; - - m_windowId = vId; - wxWndHook = this; - - m_hWnd = ::WinLoadDlg( HWND_DESKTOP - ,hWndOwner - ,(PFNWP)wxDlgProc - ,NULL - ,(ULONG)131 // Caption dialog from the resource file - ,(PVOID)this - ); - wxWndHook = NULL; - - if ( !m_hWnd ) - return FALSE; - - SubclassWin(GetHWND()); - - if (pParent) - pParent->AddChild(this); - else - wxTopLevelWindows.Append(this); - - // - // Enumerate the children - // - hEnum = ::WinBeginEnumWindows(GetHwndOf(pParent)); - while ((hWndNext = ::WinGetNextWindow(hEnum)) != NULLHANDLE) - pChild = CreateWindowFromHWND( this - ,(WXHWND)hWndNext - ); - ::WinEndEnumWindows(hEnum); - return TRUE; -} // end of wxWindow::LoadNativeDialog - -bool wxWindow::LoadNativeDialog ( - wxWindow* pParent -, const wxString& rsName -) -{ - HWND hWndOwner; - - if (pParent) - hWndOwner = GetHwndOf(pParent); - else - hWndOwner = HWND_DESKTOP; - SetName(rsName); - - wxWndHook = this; - m_hWnd = ::WinLoadDlg( HWND_DESKTOP - ,hWndOwner - ,(PFNWP)wxDlgProc - ,NULL - ,(ULONG)131 // Caption dialog from the resource file - ,(PVOID)this - ); - wxWndHook = NULL; - - if (!m_hWnd) - return FALSE; - - SubclassWin(GetHWND()); - - if (pParent) - pParent->AddChild(this); - else - wxTopLevelWindows.Append(this); - return TRUE; -} // end of wxWindow::LoadNativeDialog - -// --------------------------------------------------------------------------- -// look for child by id -// --------------------------------------------------------------------------- -wxWindow* wxWindow::GetWindowChild1 ( - wxWindowID vId -) -{ - if (m_windowId == vId) - return this; - - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - - while (node) - { - wxWindow* pChild = node->GetData(); - wxWindow* pWin = pChild->GetWindowChild1(vId); - - if (pWin) - return pWin; - - node = node->GetNext(); - } - return NULL; -} // end of wxWindow::GetWindowChild1 - -wxWindow* wxWindow::GetWindowChild ( - wxWindowID vId -) -{ - wxWindow* pWin = GetWindowChild1(vId); - - if (!pWin) - { - HWND hWnd = 0; // TODO: ::GetDlgItem((HWND) GetHWND(), id); - - if (hWnd) - { - wxWindow* pChild = CreateWindowFromHWND( this - ,(WXHWND)hWnd - ); - if (pChild) - { - pChild->AddChild(this); - return pChild; - } - } - } - return NULL; -} // end of wxWindow::GetWindowChild - -// --------------------------------------------------------------------------- -// create wxWin window from a native HWND -// --------------------------------------------------------------------------- - -wxWindow* wxWindow::CreateWindowFromHWND ( - wxWindow* pParent -, WXHWND hWnd -) -{ - wxString sStr(wxGetWindowClass(hWnd)); - long lId = wxGetWindowId(hWnd); - long lStyle = ::WinQueryWindowULong((HWND)hWnd - ,QWL_STYLE - ); - wxWindow* pWin = NULL; - - sStr.UpperCase(); - - - - if (sStr == wxT("BUTTON")) - { - if (lStyle == BS_AUTOCHECKBOX) - { - pWin = new wxCheckBox; - } - else if (lStyle == BS_AUTORADIOBUTTON) - { - pWin = new wxRadioButton; - } - else if (lStyle & BS_BITMAP || lStyle == BS_USERBUTTON) - { - pWin = new wxBitmapButton; - } - else if (lStyle == BS_PUSHBUTTON) - { - pWin = new wxButton; - } - else if (lStyle == SS_GROUPBOX) - { - pWin = new wxStaticBox; - } - else - { - wxLogError(wxT("Don't know what kind of button this is: id = %ld"), - lId); - } - } - else if (sStr == wxT("COMBOBOX")) - { - pWin = new wxComboBox; - } - else if (sStr == wxT("EDIT")) - { - pWin = new wxTextCtrl; - } - else if (sStr == wxT("LISTBOX")) - { - pWin = new wxListBox; - } - else if (sStr == wxT("SCROLLBAR")) - { - pWin = new wxScrollBar; - } - else if (sStr == wxT("MSCTLS_UPDOWN32")) - { - pWin = new wxSpinButton; - } - else if (sStr == wxT("MSCTLS_TRACKBAR32")) - { - pWin = new wxSlider; - } - else if (sStr == wxT("STATIC")) - { - if (lStyle == SS_TEXT) - pWin = new wxStaticText; - else if (lStyle == SS_ICON) - { - pWin = new wxStaticBitmap; - } - } - else - { - wxString sMsg(wxT("Don't know how to convert from Windows class ")); - - sMsg += sStr; - wxLogError(sMsg); - } - if (pWin) - { - pParent->AddChild(pWin); - pWin->SetEventHandler(pWin); - pWin->SetHWND(hWnd); - pWin->SetId(lId); - pWin->SubclassWin(hWnd); - pWin->AdoptAttributesFromHWND(); - pWin->SetupColours(); - return pWin; - } - else - return NULL; -} // end of wxWindow::CreateWindowFromHWND - -// -// Make sure the window style (etc.) reflects the HWND style (roughly) -// -void wxWindow::AdoptAttributesFromHWND() -{ - // Does nothing under OS/2 -} // end of wxWindow::AdoptAttributesFromHWND - diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp deleted file mode 100644 index aefab123b2..0000000000 --- a/src/os2/notebook.cpp +++ /dev/null @@ -1,851 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/notebook.cpp -// Purpose: implementation of wxNotebook -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_NOTEBOOK - -#include "wx/notebook.h" - -// wxWidgets -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/dcclient.h" - #include "wx/string.h" - #include "wx/settings.h" - #include "wx/log.h" - #include "wx/event.h" - #include "wx/control.h" -#endif // WX_PRECOMP - -#include "wx/imaglist.h" - -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// check that the page index is valid -#define IS_VALID_PAGE(nPage) ( \ - /* size_t is _always_ >= 0 */ \ - /* ((nPage) >= 0) && */ \ - ((nPage) < GetPageCount()) \ - ) - -// hide the ugly cast -#define m_hWnd (HWND)GetHWND() - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) - EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) - EVT_SIZE(wxNotebook::OnSize) - EVT_SET_FOCUS(wxNotebook::OnSetFocus) - EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) -END_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxNotebook construction -// ---------------------------------------------------------------------------- - -// -// Common part of all ctors -// -void wxNotebook::Init() -{ - m_nTabSize = 0; -} // end of wxNotebook::Init - -// -// Default for dynamic class -// -wxNotebook::wxNotebook() -{ - Init(); -} // end of wxNotebook::wxNotebook - -// -// The same arguments as for wxControl -// -wxNotebook::wxNotebook( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxString& rsName -) -{ - Init(); - Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rsName - ); -} // end of wxNotebook::wxNotebook - -// -// Create() function -// -bool wxNotebook::Create( wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxString& rsName ) -{ - if ( (lStyle & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) - lStyle |= wxBK_TOP; - // - // Base init - // - if (!CreateControl( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,wxDefaultValidator - ,rsName - )) - return false; - - // - // Notebook, so explicitly specify 0 as last parameter - // - if (!OS2CreateControl( wxT("NOTEBOOK") - ,wxEmptyString - ,rPos - ,rSize - ,lStyle | wxTAB_TRAVERSAL - )) - return false; - - SetBackgroundColour(wxColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))); - return true; -} // end of wxNotebook::Create - -WXDWORD wxNotebook::OS2GetStyle ( - long lStyle -, WXDWORD* pdwExstyle -) const -{ - WXDWORD dwTabStyle = wxControl::OS2GetStyle( lStyle - ,pdwExstyle - ); - - dwTabStyle |= WS_TABSTOP | BKS_SOLIDBIND | BKS_ROUNDEDTABS | BKS_TABTEXTCENTER | BKS_TABBEDDIALOG; - - if (lStyle & wxBK_BOTTOM) - dwTabStyle |= BKS_MAJORTABBOTTOM | BKS_BACKPAGESBL; - else if (lStyle & wxBK_RIGHT) - dwTabStyle |= BKS_MAJORTABRIGHT | BKS_BACKPAGESBR; - else if (lStyle & wxBK_LEFT) - dwTabStyle |= BKS_MAJORTABLEFT | BKS_BACKPAGESTL; - else // default to top - dwTabStyle |= BKS_MAJORTABTOP | BKS_BACKPAGESTR; - - // - // Ex style - // - if (pdwExstyle ) - { - // - // Note that we never want to have the default WS_EX_CLIENTEDGE style - // as it looks too ugly for the notebooks - // - *pdwExstyle = 0; - } - return dwTabStyle; -} // end of wxNotebook::OS2GetStyle - -// ---------------------------------------------------------------------------- -// wxNotebook accessors -// ---------------------------------------------------------------------------- - -size_t wxNotebook::GetPageCount() const -{ - // - // Consistency check - // - wxASSERT((int)m_pages.Count() == (int)::WinSendMsg(GetHWND(), BKM_QUERYPAGECOUNT, (MPARAM)0, (MPARAM)BKA_END)); - return m_pages.Count(); -} // end of wxNotebook::GetPageCount - -int wxNotebook::GetRowCount() const -{ - return (int)::WinSendMsg( GetHWND() - ,BKM_QUERYPAGECOUNT - ,(MPARAM)0 - ,(MPARAM)BKA_MAJOR - ); -} // end of wxNotebook::GetRowCount - -int wxNotebook::SetSelection( size_t nPage ) -{ - wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); - - if (nPage != (size_t)m_selection) - { - wxBookCtrlEvent vEvent( wxEVT_NOTEBOOK_PAGE_CHANGING - ,m_windowId - ); - - vEvent.SetSelection(nPage); - vEvent.SetOldSelection(m_selection); - vEvent.SetEventObject(this); - if (!HandleWindowEvent(vEvent) || vEvent.IsAllowed()) - { - - // - // Program allows the page change - // - vEvent.SetEventType(wxEVT_NOTEBOOK_PAGE_CHANGED); - HandleWindowEvent(vEvent); - - ::WinSendMsg( GetHWND() - ,BKM_TURNTOPAGE - ,MPFROMLONG((ULONG)m_alPageId[nPage]) - ,(MPARAM)0 - ); - } - } - m_selection = nPage; - return nPage; -} // end of wxNotebook::SetSelection - -int wxNotebook::ChangeSelection( size_t nPage ) -{ - wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); - - if (nPage != (size_t)m_selection) - { - ::WinSendMsg( GetHWND() - ,BKM_TURNTOPAGE - ,MPFROMLONG((ULONG)m_alPageId[nPage]) - ,(MPARAM)0 - ); - } - m_selection = nPage; - return nPage; -} - -bool wxNotebook::SetPageText( size_t nPage, - const wxString& rsStrText ) -{ - wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("notebook page out of range") ); - return (bool)::WinSendMsg( m_hWnd - ,BKM_SETTABTEXT - ,MPFROMLONG((ULONG)m_alPageId[nPage]) - ,MPFROMP((const char*)rsStrText.c_str()) - ); -} // end of wxNotebook::SetPageText - -wxString wxNotebook::GetPageText ( size_t nPage ) const -{ - BOOKTEXT vBookText; - wxChar zBuf[256]; - wxString sStr; - ULONG ulRc; - - wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") ); - - memset(&vBookText, '\0', sizeof(BOOKTEXT)); - vBookText.textLen = 0; // This will get the length - ulRc = LONGFROMMR(::WinSendMsg( m_hWnd - ,BKM_QUERYTABTEXT - ,MPFROMLONG((ULONG)m_alPageId[nPage]) - ,MPFROMP(&vBookText) - )); - if (ulRc == (ULONG)BOOKERR_INVALID_PARAMETERS || ulRc == 0L) - { - if (ulRc == (ULONG)BOOKERR_INVALID_PARAMETERS) - { - wxLogError(wxT("Invalid Page Id for page text querry.")); - } - return wxEmptyString; - } - vBookText.textLen = ulRc + 1; // To get the null terminator - vBookText.pString = (char*)zBuf; - - // - // Now get the actual text - // - ulRc = LONGFROMMR(::WinSendMsg( m_hWnd - ,BKM_QUERYTABTEXT - ,MPFROMLONG((ULONG)m_alPageId[nPage]) - ,MPFROMP(&vBookText) - )); - if (ulRc == (ULONG)BOOKERR_INVALID_PARAMETERS || ulRc == 0L) - { - return wxEmptyString; - } - if (ulRc > 255L) - ulRc = 255L; - - vBookText.pString[ulRc] = '\0'; - sStr = (wxChar*)vBookText.pString; - return sStr; -} // end of wxNotebook::GetPageText - -int wxNotebook::GetPageImage ( size_t nPage ) const -{ - wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); - - // - // For OS/2 just return the page - // - return nPage; -} // end of wxNotebook::GetPageImage - -bool wxNotebook::SetPageImage ( - size_t nPage -, int nImage -) -{ - wxBitmap vBitmap = (wxBitmap)GetImageList()->GetBitmap(nImage); - - return (bool)::WinSendMsg( GetHWND() - ,BKM_SETTABBITMAP - ,MPFROMLONG((ULONG)m_alPageId[nPage]) - ,(MPARAM)wxCopyBmp(vBitmap.GetHBITMAP(), true) - ); -} // end of wxNotebook::SetPageImage - -void wxNotebook::SetImageList ( - wxImageList* pImageList -) -{ - // - // Does not really do anything yet, but at least we need to - // update the base class. - // - wxNotebookBase::SetImageList(pImageList); -} // end of wxNotebook::SetImageList - -// ---------------------------------------------------------------------------- -// wxNotebook size settings -// ---------------------------------------------------------------------------- -void wxNotebook::SetPageSize ( - const wxSize& rSize -) -{ - SetSize(rSize); -} // end of wxNotebook::SetPageSize - -void wxNotebook::SetPadding ( - const wxSize& WXUNUSED(rPadding) -) -{ - // - // No padding in OS/2 - // -} // end of wxNotebook::SetPadding - -void wxNotebook::SetTabSize ( - const wxSize& rSize -) -{ - ::WinSendMsg( GetHWND() - ,BKM_SETDIMENSIONS - ,MPFROM2SHORT( (USHORT)rSize.x - ,(USHORT)rSize.y - ) - ,(MPARAM)BKA_MAJORTAB - ); -} // end of wxNotebook::SetTabSize - -// ---------------------------------------------------------------------------- -// wxNotebook operations -// ---------------------------------------------------------------------------- - -// -// Remove one page from the notebook, without deleting -// -wxNotebookPage* wxNotebook::DoRemovePage ( size_t nPage ) -{ - wxNotebookPage* pPageRemoved = wxNotebookBase::DoRemovePage(nPage); - - if (!pPageRemoved) - return NULL; - - ::WinSendMsg( GetHWND() - ,BKM_DELETEPAGE - ,MPFROMLONG((ULONG)m_alPageId[nPage]) - ,(MPARAM)BKA_TAB - ); - if (m_pages.IsEmpty()) - { - // - // No selection any more, the notebook becamse empty - // - m_selection = wxNOT_FOUND; - } - else // notebook still not empty - { - // - // Change the selected page if it was deleted or became invalid - // - int nSelNew; - - if (m_selection == (int)GetPageCount()) - { - // - // Last page deleted, make the new last page the new selection - // - nSelNew = m_selection - 1; - } - else if (nPage <= (size_t)m_selection) - { - // - // We must show another page, even if it has the same index - // - nSelNew = m_selection; - } - else // nothing changes for the currently selected page - { - nSelNew = wxNOT_FOUND; - - // - // We still must refresh the current page: this needs to be done - // for some unknown reason if the tab control shows the up-down - // control (i.e. when there are too many pages) -- otherwise after - // deleting a page nothing at all is shown - // - m_pages[m_selection]->Refresh(); - } - - if (nSelNew != wxNOT_FOUND) - { - // - // m_selection must be always valid so reset it before calling - // SetSelection() - // - m_selection = wxNOT_FOUND; - SetSelection(nSelNew); - } - } - return pPageRemoved; -} // end of wxNotebook::DoRemovePage - -// -// Remove all pages -// -bool wxNotebook::DeleteAllPages() -{ - int nPageCount = GetPageCount(); - int nPage; - - for (nPage = 0; nPage < nPageCount; nPage++) - delete m_pages[nPage]; - m_pages.Clear(); - ::WinSendMsg( GetHWND() - ,BKM_DELETEPAGE - ,(MPARAM)0 - ,(MPARAM)BKA_ALL - ); - m_selection = wxNOT_FOUND; - - return true; -} // end of wxNotebook::DeleteAllPages - -// -// Add a page to the notebook -// -bool wxNotebook::AddPage ( - wxNotebookPage* pPage -, const wxString& rStrText -, bool bSelect -, int nImageId -) -{ - return InsertPage( GetPageCount() - ,pPage - ,rStrText - ,bSelect - ,nImageId - ); -} // end of wxNotebook::AddPage - -// -// Same as AddPage() but does it at given position -// -bool wxNotebook::InsertPage ( size_t nPage, - wxNotebookPage* pPage, - const wxString& rsStrText, - bool bSelect, - int nImageId ) -{ - ULONG ulApiPage; - - wxASSERT( pPage != NULL ); - wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false ); - - // - // Under OS/2 we can only insert FIRST, LAST, NEXT or PREV. Requires - // two different calls to the API. Page 1 uses the BKA_FIRST. Subsequent - // pages use the previous page ID coupled with a BKA_NEXT call. Unlike - // Windows, OS/2 uses an internal Page ID to ID the pages. - // - // OS/2 also has a nice auto-size feature that automatically sizes the - // the attached window so we don't have to worry about the size of the - // window on the page. - // - if (nPage == 0) - { - ulApiPage = LONGFROMMR(::WinSendMsg( GetHWND() - ,BKM_INSERTPAGE - ,(MPARAM)0 - ,MPFROM2SHORT(BKA_AUTOPAGESIZE | BKA_MAJOR, BKA_FIRST) - )); - if (ulApiPage == 0L) - { - ERRORID vError; - wxString sError; - - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - return false; - } - m_alPageId.Insert((long)ulApiPage, nPage); - } - else - { - ulApiPage = LONGFROMMR(::WinSendMsg( GetHWND() - ,BKM_INSERTPAGE - ,MPFROMLONG((ULONG)m_alPageId[nPage - 1]) - ,MPFROM2SHORT(BKA_AUTOPAGESIZE | BKA_MAJOR, BKA_NEXT) - )); - if (ulApiPage == 0L) - { - ERRORID vError; - wxString sError; - - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - return false; - } - m_alPageId.Insert((long)ulApiPage, nPage); - } - - // - // Associate a window handle with the page - // - if (pPage) - { - if (!::WinSendMsg( GetHWND() - ,BKM_SETPAGEWINDOWHWND - ,MPFROMLONG((ULONG)m_alPageId[nPage]) - ,MPFROMHWND(pPage->GetHWND()) - )) - return false; - } - // - // If the inserted page is before the selected one, we must update the - // index of the selected page - // - if (nPage <= (size_t)m_selection) - { - // - // One extra page added - // - m_selection++; - } - - if (pPage) - { - // - // Save the pointer to the page - // - m_pages.Insert( pPage - ,nPage - ); - } - - // - // Now set TAB dimenstions - // - - wxWindowDC vDC(this); - wxCoord nTextX; - wxCoord nTextY; - - vDC.GetTextExtent(rsStrText, &nTextX, &nTextY); - nTextY *= 2; - nTextX = (wxCoord)(nTextX * 1.3); - if (nTextX > m_nTabSize) - { - m_nTabSize = nTextX; - ::WinSendMsg( GetHWND() - ,BKM_SETDIMENSIONS - ,MPFROM2SHORT((USHORT)m_nTabSize, (USHORT)nTextY) - ,(MPARAM)BKA_MAJORTAB - ); - } - // - // Now set any TAB text - // - if (!rsStrText.empty()) - { - if (!SetPageText( nPage - ,rsStrText - )) - return false; - } - - // - // Now set any TAB bitmap image - // - if (nImageId != -1) - { - if (!SetPageImage( nPage - ,nImageId - )) - return false; - } - - if (pPage) - { - // - // Don't show pages by default (we'll need to adjust their size first) - // - HWND hWnd = GetWinHwnd(pPage); - - WinSetWindowULong( hWnd - ,QWL_STYLE - ,WinQueryWindowULong( hWnd - ,QWL_STYLE - ) & ~WS_VISIBLE - ); - - // - // This updates internal flag too - otherwise it will get out of sync - // - pPage->Show(false); - } - - DoSetSelectionAfterInsertion(nPage, bSelect); - - InvalidateBestSize(); - - return true; -} // end of wxNotebook::InsertPage - -// ---------------------------------------------------------------------------- -// wxNotebook callbacks -// ---------------------------------------------------------------------------- -void wxNotebook::OnSize( - wxSizeEvent& rEvent -) -{ - rEvent.Skip(); -} // end of wxNotebook::OnSize - -void wxNotebook::OnSelChange ( - wxBookCtrlEvent& rEvent -) -{ - // - // Is it our tab control? - // - if (rEvent.GetEventObject() == this) - { - int nPageCount = GetPageCount(); - int nSel; - ULONG ulOS2Sel = (ULONG)rEvent.GetOldSelection(); - bool bFound = false; - - for (nSel = 0; nSel < nPageCount; nSel++) - { - if (ulOS2Sel == (ULONG)m_alPageId[nSel]) - { - bFound = true; - break; - } - } - - if (!bFound) - return; - - m_pages[nSel]->Show(false); - - ulOS2Sel = (ULONG)rEvent.GetSelection(); - - bFound = false; - - for (nSel = 0; nSel < nPageCount; nSel++) - { - if (ulOS2Sel == (ULONG)m_alPageId[nSel]) - { - bFound = true; - break; - } - } - - if (!bFound) - return; - - wxNotebookPage* pPage = m_pages[nSel]; - - pPage->Show(true); - m_selection = nSel; - } - - // - // We want to give others a chance to process this message as well - // - rEvent.Skip(); -} // end of wxNotebook::OnSelChange - -void wxNotebook::OnSetFocus ( - wxFocusEvent& rEvent -) -{ - // - // This function is only called when the focus is explicitly set (i.e. from - // the program) to the notebook - in this case we don't need the - // complicated OnNavigationKey() logic because the programmer knows better - // what [s]he wants - // - // set focus to the currently selected page if any - // - if (m_selection != wxNOT_FOUND) - m_pages[m_selection]->SetFocus(); - rEvent.Skip(); -} // end of wxNotebook::OnSetFocus - -void wxNotebook::OnNavigationKey ( - wxNavigationKeyEvent& rEvent -) -{ - if (rEvent.IsWindowChange()) - { - // - // Change pages - // - AdvanceSelection(rEvent.GetDirection()); - } - else - { - // - // We get this event in 2 cases - // - // a) one of our pages might have generated it because the user TABbed - // out from it in which case we should propagate the event upwards and - // our parent will take care of setting the focus to prev/next sibling - // - // or - // - // b) the parent panel wants to give the focus to us so that we - // forward it to our selected page. We can't deal with this in - // OnSetFocus() because we don't know which direction the focus came - // from in this case and so can't choose between setting the focus to - // first or last panel child - // - wxWindow* pParent = GetParent(); - - if (rEvent.GetEventObject() == pParent) - { - // - // No, it doesn't come from child, case (b): forward to a page - // - if (m_selection != wxNOT_FOUND) - { - // - // So that the page knows that the event comes from it's parent - // and is being propagated downwards - // - rEvent.SetEventObject(this); - - wxWindow* pPage = m_pages[m_selection]; - - if (!pPage->HandleWindowEvent(rEvent)) - { - pPage->SetFocus(); - } - //else: page manages focus inside it itself - } - else - { - // - // We have no pages - still have to give focus to _something_ - // - SetFocus(); - } - } - else - { - // - // It comes from our child, case (a), pass to the parent - // - if (pParent) - { - rEvent.SetCurrentFocus(this); - pParent->HandleWindowEvent(rEvent); - } - } - } -} // end of wxNotebook::OnNavigationKey - -// ---------------------------------------------------------------------------- -// wxNotebook base class virtuals -// ---------------------------------------------------------------------------- - -// -// Override these 2 functions to do nothing: everything is done in OnSize -// -void wxNotebook::SetConstraintSizes( bool WXUNUSED(bRecurse) ) -{ - // - // Don't set the sizes of the pages - their correct size is not yet known - // - wxControl::SetConstraintSizes(false); -} // end of wxNotebook::SetConstraintSizes - -bool wxNotebook::DoPhase ( int WXUNUSED(nPhase) ) -{ - return true; -} // end of wxNotebook::DoPhase - -// ---------------------------------------------------------------------------- -// wxNotebook Windows message handlers -// ---------------------------------------------------------------------------- -bool wxNotebook::OS2OnScroll ( int nOrientation, - WXWORD wSBCode, - WXWORD wPos, - WXHWND wControl ) -{ - // - // Don't generate EVT_SCROLLWIN events for the WM_SCROLLs coming from the - // up-down control - // - if (wControl) - return false; - return wxNotebookBase::OS2OnScroll( nOrientation - ,wSBCode - ,wPos - ,wControl - ); -} // end of wxNotebook::OS2OnScroll - -#endif // wxUSE_NOTEBOOK diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp deleted file mode 100644 index a6daa630cf..0000000000 --- a/src/os2/ownerdrw.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/ownerdrw.cpp -// Purpose: implementation of wxOwnerDrawn class -// Author: David Webster -// Modified by: Marcin Malich -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_OWNER_DRAWN - -#include "wx/ownerdrw.h" -#include "wx/os2/private.h" -#include "wx/os2/dcclient.h" - -// ---------------------------------------------------------------------------- -// constants for base class -// ---------------------------------------------------------------------------- - -int wxOwnerDrawnBase::ms_defaultMargin = 3; - -// ============================================================================ -// implementation of wxOwnerDrawn class -// ============================================================================ - -// draw the item -bool wxOwnerDrawn::OnDrawItem( wxDC& rDC, - const wxRect& rRect, - wxODAction eAction, - wxODStatus eStatus ) -{ - - // - // Select the font and draw the text - // --------------------------------- - // - - CHARBUNDLE vCbnd; - wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); - HPS hPS= impl->GetHPS(); - wxFont vFont; - wxColour vColBack; - wxColour vColText; - COLORREF vRef; - RECTL vRect = {rRect.x + 4, rRect.y + 1, rRect.x + (rRect.width - 2), rRect.y + rRect.height}; - - memset(&vCbnd, 0, sizeof(CHARBUNDLE)); - - GetFontToUse(vFont); - GetColourToUse(eStatus, vColText, vColBack); - - rDC.SetFont(vFont); - rDC.SetTextBackground(vColBack); - rDC.SetTextForeground(vColText); - rDC.SetBackgroundMode(wxTRANSPARENT); - - vCbnd.lColor = vColText.GetPixel(); - vCbnd.lBackColor = vColBack.GetPixel(); - ::GpiSetAttrs( hPS - ,PRIM_CHAR - ,CBB_BACK_COLOR | CBB_COLOR - ,0 - ,&vCbnd - ); - ::GpiSetBackMix( hPS - ,BM_LEAVEALONE - ); - - // - // Paint the background - // - ::WinFillRect(hPS, &vRect, vColBack.GetPixel()); - - // - // Determine where to draw and leave space for a check-mark. - // - int nX = rRect.x + GetMarginWidth(); - - // - // Unfortunately, unlike Win32, PM has no owner drawn specific text - // drawing methods like ::DrawState that can cleanly handle accel - // mnemonics and deal, automatically, with various states, so we have - // to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn - // strings either. We cannot handle mnemonics either. We display - // them, though, in the hope we can figure them out some day. - // - - // - // Display main text - // - wxString sFullString = GetItemLabel(); // need to save the original text - int nIndex; - size_t nWidth; - size_t nCharWidth; - size_t nHeight; - bool bFoundMnemonic = false; - - // - // Deal with the mnemonic character - // - nIndex = sFullString.Find(wxT("~")); - if (nIndex != -1) - { - wxString sTmp = sFullString; - - bFoundMnemonic = true; - sTmp.Remove(nIndex); - rDC.GetTextExtent( sTmp - ,(wxCoord *)&nWidth - ,(wxCoord *)&nHeight - ); - sTmp = sFullString[(size_t)(nIndex + 1)]; - rDC.GetTextExtent( sTmp - ,(wxCoord *)&nCharWidth - ,(wxCoord *)&nHeight - ); - sFullString.Replace(sTgt.c_str(), wxEmptyString, true); - } - - // - // Draw the main item text sans the accel text - // - POINTL vPntStart = {nX, rRect.y + 4}; - ::GpiCharStringAt( impl->GetHPS() - ,&vPntStart - ,sFullString.length() - ,sFullString.char_str() - ); - if (bFoundMnemonic) - { - // - // Underline the mnemonic -- still won't work, but at least it "looks" right - // - wxPen vPen; - POINTL vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide - - vPntStart.x = nX + nWidth - 1; - vPntStart.y = rRect.y + 2; // Make it look pretty! - vPen = wxPen(vColText, 1, wxSOLID); // Assuming we are always black - rDC.SetPen(vPen); - ::GpiMove(hPS, &vPntStart); - ::GpiLine(hPS, &vPntEnd); - } - - return true; -} // end of wxOwnerDrawn::OnDrawItem - -#endif //wxUSE_OWNER_DRAWN diff --git a/src/os2/palette.cpp b/src/os2/palette.cpp deleted file mode 100644 index d59ca7564a..0000000000 --- a/src/os2/palette.cpp +++ /dev/null @@ -1,235 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/palette.cpp -// Purpose: wxPalette -// Author: AUTHOR -// Modified by: -// Created: ??/??/98 -// Copyright: (c) AUTHOR -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include - #include "wx/string.h" - #include "wx/os2/private.h" - #include "wx/palette.h" - #include "wx/app.h" -#endif - -#define INCL_PM -#define INCL_GPI - -#include "assert.h" - -IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) - -/* - * Palette - * - */ - -wxPaletteRefData::wxPaletteRefData() -{ - m_hPalette = NULLHANDLE; - m_hPS = NULLHANDLE; -} // end of wxPaletteRefData::wxPaletteRefData - -wxPaletteRefData::~wxPaletteRefData() -{ - if ( m_hPalette ) - return; -} // end of wxPaletteRefData::~wxPaletteRefData - -wxPalette::wxPalette() -{ -} // end of wxPalette::wxPalette - -wxPalette::wxPalette( - int n -, const unsigned char* pRed -, const unsigned char* pGreen -, const unsigned char* pBlue -) -{ - Create( n - ,pRed - ,pGreen - ,pBlue - ); -} // end of wxPalette::wxPalette - -wxPalette::~wxPalette() -{ -} // end of wxPalette::~wxPalette - -bool wxPalette::FreeResource( bool WXUNUSED(bForce) ) -{ - if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette) - { - ::GpiSelectPalette(M_PALETTEDATA->m_hPS, NULLHANDLE); - ::GpiDeletePalette((HPAL)M_PALETTEDATA->m_hPalette); - } - return true; -} // end of wxPalette::FreeResource - -bool wxPalette::Create( int n, - const unsigned char* pRed, - const unsigned char* pGreen, - const unsigned char* pBlue ) -{ - PULONG pualTable; - - UnRef(); - - m_refData = new wxPaletteRefData; - pualTable = new ULONG[n]; - if (!pualTable) - return false; - - for (int i = 0; i < n; i ++) - { - pualTable[i] = (PC_RESERVED * 16777216) + ((int)pRed[i] * 65536) + ((int)pGreen[i] * 256) + (int)pBlue[i]; - } - M_PALETTEDATA->m_hPalette = (WXHPALETTE)::GpiCreatePalette( vHabmain - ,LCOL_PURECOLOR - ,LCOLF_CONSECRGB - ,(LONG)n - ,pualTable - ); - delete [] pualTable; - return true; -} // end of wxPalette::Create - -wxGDIRefData *wxPalette::CreateGDIRefData() const -{ - return new wxPaletteRefData; -} - -wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxPaletteRefData(*static_cast(data)); -} - -int wxPalette::GetPixel( unsigned char cRed, - unsigned char cGreen, - unsigned char cBlue) const -{ - bool bFound = false; - PULONG pualTable = NULL; - ULONG ulNumEntries; - ULONG ulRGB = (PC_RESERVED * 16777216) + - ((int)cRed * 65536) + - ((int)cGreen * 256) + - (int)cBlue; - - if (!m_refData) - return wxNOT_FOUND; - - // - // Get number of entries first - // - ulNumEntries = ::GpiQueryPaletteInfo( M_PALETTEDATA->m_hPalette - ,M_PALETTEDATA->m_hPS - ,0 // No options - ,0 // No start index - ,0 // Force return of number entries - ,NULL // No array - ); - - pualTable = new ULONG[ulNumEntries]; - - // - // Now get the entries - // - ulNumEntries = ::GpiQueryPaletteInfo( M_PALETTEDATA->m_hPalette - ,M_PALETTEDATA->m_hPS - ,0 // No options - ,0 // start at 0 - ,ulNumEntries // Force return of number entries - ,pualTable // Palette entry array with RGB values - ); - // - // Now loop through and find the matching entry - // - ULONG i; - for (i = 0; i < ulNumEntries; i++) - { - if (pualTable[i] == ulRGB) - { - bFound = true; - break; - } - } - if (!bFound) - return wxNOT_FOUND; - return (i + 1); -} // end of wxPalette::GetPixel - -bool wxPalette::GetRGB( int nIndex, - unsigned char* pRed, - unsigned char* pGreen, - unsigned char* pBlue) const -{ - PULONG pualTable = NULL; - RGB2 vRGB; - ULONG ulNumEntries; - - if (!m_refData) - return false; - - if (nIndex < 0 || nIndex > 255) - return false; - // - // Get number of entries first - // - ulNumEntries = ::GpiQueryPaletteInfo( M_PALETTEDATA->m_hPalette - ,M_PALETTEDATA->m_hPS - ,0 // No options - ,0 // No start index - ,0 // Force return of number entries - ,NULL // No array - ); - - pualTable = new ULONG[ulNumEntries]; - - // - // Now get the entries - // - ulNumEntries = ::GpiQueryPaletteInfo( M_PALETTEDATA->m_hPalette - ,M_PALETTEDATA->m_hPS - ,0 // No options - ,0 // start at 0 - ,ulNumEntries // Force return of number entries - ,pualTable // Palette entry array with RGB values - ); - - memcpy(&vRGB, &pualTable[nIndex], sizeof(RGB2)); - *pBlue = vRGB.bBlue; - *pGreen = vRGB.bGreen; - *pRed = vRGB.bRed; - return true; -} // end of wxPalette::GetRGB - -void wxPalette::SetHPALETTE( - WXHPALETTE hPal -) -{ - if ( !m_refData ) - m_refData = new wxPaletteRefData; - - M_PALETTEDATA->m_hPalette = hPal; -} // end of wxPalette::SetHPALETTE - -void wxPalette::SetPS( - HPS hPS -) -{ - if ( !m_refData ) - m_refData = new wxPaletteRefData; - - ::GpiSelectPalette(M_PALETTEDATA->m_hPS, M_PALETTEDATA->m_hPalette); - M_PALETTEDATA->m_hPS = hPS; -} // end of wxPalette::SetHPALETTE diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp deleted file mode 100644 index c9c2e47454..0000000000 --- a/src/os2/pen.cpp +++ /dev/null @@ -1,597 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/pen.cpp -// Purpose: wxPen -// Author: David Webster -// Modified by: -// Created: 10/10/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/pen.h" - -#ifndef WX_PRECOMP - #include - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/log.h" -#endif - -#include "wx/os2/private.h" - -class WXDLLIMPEXP_FWD_CORE wxPen; - -// ---------------------------------------------------------------------------- -// wxPenRefData: contains information about an HPEN and its handle -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxPenRefData: public wxGDIRefData -{ - friend class WXDLLIMPEXP_FWD_CORE wxPen; -public: - wxPenRefData(); - wxPenRefData(const wxPenRefData& rData); - wxPenRefData(const wxColour& col, int width, wxPenStyle style); - wxPenRefData(const wxBitmap& stipple, int width); - virtual ~wxPenRefData(); - - bool operator==(const wxPenRefData& data) const - { - // we intentionally don't compare m_hPen fields here - return m_nStyle == data.m_nStyle && - m_nWidth == data.m_nWidth && - m_nJoin == data.m_nJoin && - m_nCap == data.m_nCap && - m_vColour == data.m_vColour && - (m_nStyle != wxPENSTYLE_STIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) && - (m_nStyle != wxPENSTYLE_USER_DASH || - (m_dash == data.m_dash && - memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); - } - -private: - // initialize the fields which have reasonable default values - // - // doesn't initialize m_width and m_style which must be initialize in ctor - void Init() - { - m_nJoin = wxJOIN_ROUND; - m_nCap = wxCAP_ROUND; - m_nbDash = 0; - m_dash = NULL; - m_hPen = 0; - } - - int m_nWidth; - wxPenStyle m_nStyle; - wxPenJoin m_nJoin; - wxPenCap m_nCap; - wxBitmap m_vStipple; - int m_nbDash; - wxDash * m_dash; - wxColour m_vColour; - WXHPEN m_hPen;// in OS/2 GPI this will be the PS the pen is associated with - - wxDECLARE_NO_ASSIGN_CLASS(wxPenRefData); -}; - -#define M_PENDATA ((wxPenRefData *)m_refData) - -// ---------------------------------------------------------------------------- -// wxPenRefData ctors/dtor -// ---------------------------------------------------------------------------- - -wxPenRefData::wxPenRefData() -{ - Init(); - - m_nStyle = wxPENSTYLE_SOLID; - m_nWidth = 1; -} // end of wxPenRefData::wxPenRefData - -wxPenRefData::wxPenRefData( - const wxPenRefData& rData -) -{ - m_nStyle = rData.m_nStyle; - m_nWidth = rData.m_nWidth; - m_nJoin = rData.m_nJoin; - m_nCap = rData.m_nCap; - m_nbDash = rData.m_nbDash; - m_dash = rData.m_dash; - m_vColour = rData.m_vColour; - m_hPen = 0L; -} // end of wxPenRefData::wxPenRefData - -wxPenRefData::wxPenRefData(const wxColour& col, int width, wxPenStyle style) -{ - Init(); - - m_nStyle = style; - m_nWidth = width; - - m_vColour = col; -} - -wxPenRefData::wxPenRefData(const wxBitmap& stipple, int width) -{ - Init(); - - m_nStyle = wxPENSTYLE_STIPPLE; - m_nWidth = width; - - m_vStipple = stipple; -} - -wxPenRefData::~wxPenRefData() -{ -} // end of wxPenRefData::~wxPenRefData - -// ---------------------------------------------------------------------------- -// wxPen -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) - -wxPen::wxPen( - const wxColour& rColour -, int nWidth -, wxPenStyle nStyle -) -{ - m_refData = new wxPenRefData(rColour, nWidth, nStyle); - - RealizeResource(); -} // end of wxPen::wxPen - -wxPen::wxPen(const wxColour& colour, int width, int style) -{ - m_refData = new wxPenRefData(colour, width, (wxPenStyle)style); - - RealizeResource(); -} - -wxPen::wxPen( - const wxBitmap& rStipple -, int nWidth -) -{ - m_refData = new wxPenRefData (rStipple, nWidth); - - RealizeResource(); -} // end of wxPen::wxPen - -bool wxPen::operator==(const wxPen& pen) const -{ - const wxPenRefData * - penData = static_cast(pen.m_refData); - - // an invalid pen is only equal to another invalid pen - return m_refData ? penData && *M_PENDATA == *penData : !penData; -} - -int wx2os2PenStyle( - wxPenStyle nWxStyle -); - -bool wxPen::RealizeResource() -{ - BOOL bOk; - ERRORID vError; - wxString sError; - - if (M_PENDATA && M_PENDATA->m_hPen == 0L) - { - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDC = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,5L - ,(PDEVOPENDATA)&vDop - ,NULLHANDLE - ); - M_PENDATA->m_hPen = (WXHPEN)::GpiCreatePS( vHabmain - ,hDC - ,&vSize - ,PU_PELS | GPIT_MICRO | GPIA_ASSOC - ); - } - if (M_PENDATA) - { - // - // Set the color table to RGB mode - // - if (!::GpiCreateLogColorTable( (HPS)M_PENDATA->m_hPen - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str()); - return false; - } - if (M_PENDATA->m_nStyle == wxPENSTYLE_TRANSPARENT) - { - return true; - } - - COLORREF vPmColour = 0L; - USHORT uLineType = (USHORT)wx2os2PenStyle(M_PENDATA->m_nStyle); - - vPmColour = M_PENDATA->m_vColour.GetPixel(); - - USHORT uJoin = 0L; - - switch(M_PENDATA->m_nJoin) - { - case wxJOIN_BEVEL: - uJoin = LINEJOIN_BEVEL; - break; - - case wxJOIN_MITER: - uJoin = LINEJOIN_MITRE; - break; - - case wxJOIN_ROUND: - uJoin = LINEJOIN_ROUND; - break; - } - - USHORT uCap = 0L; - - switch(M_PENDATA->m_nCap) - { - case wxCAP_PROJECTING: - uCap = LINEEND_SQUARE; - break; - - case wxCAP_BUTT: - uCap = LINEEND_FLAT; - break; - - case wxCAP_ROUND: - uCap = LINEEND_ROUND; - break; - } - m_vLineBundle.lColor = (LONG)vPmColour; - m_vLineBundle.usMixMode = FM_OVERPAINT; - if (M_PENDATA->m_nWidth < 1) - M_PENDATA->m_nWidth = 1; - m_vLineBundle.fxWidth = M_PENDATA->m_nWidth; - m_vLineBundle.lGeomWidth = M_PENDATA->m_nWidth; - m_vLineBundle.usType = uLineType; - m_vLineBundle.usEnd = uCap; - m_vLineBundle.usJoin = uJoin; - - bOk = ::GpiSetAttrs( M_PENDATA->m_hPen - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE | LBB_END | LBB_JOIN - ,0L - ,&m_vLineBundle - ); - if (!bOk) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n"), sError.c_str()); - return false; - } - - ULONG flAttrMask = 0L; - ULONG flDefMask = 0L; - switch(M_PENDATA->m_nStyle) - { - case wxPENSTYLE_STIPPLE: - ::GpiSetBitmapId( M_PENDATA->m_hPen - ,(USHORT)M_PENDATA->m_vStipple.GetHBITMAP() - ,(USHORT)M_PENDATA->m_vStipple.GetId() - ); - ::GpiSetPatternSet( M_PENDATA->m_hPen - ,(USHORT)M_PENDATA->m_vStipple.GetId() - ); - flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SET | ABB_SYMBOL; - flDefMask = ABB_REF_POINT; - break; - - case wxPENSTYLE_BDIAGONAL_HATCH: - m_vAreaBundle.usSymbol = PATSYM_DIAG3; - m_vAreaBundle.usSet = LCID_DEFAULT; - flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL; - flDefMask = ABB_SET | ABB_REF_POINT; - break; - - case wxPENSTYLE_CROSSDIAG_HATCH: - m_vAreaBundle.usSymbol = PATSYM_DIAGHATCH; - m_vAreaBundle.usSet = LCID_DEFAULT; - flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL; - flDefMask = ABB_SET | ABB_REF_POINT; - break; - - case wxPENSTYLE_FDIAGONAL_HATCH: - m_vAreaBundle.usSymbol = PATSYM_DIAG1; - m_vAreaBundle.usSet = LCID_DEFAULT; - flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL; - flDefMask = ABB_SET | ABB_REF_POINT; - break; - - case wxPENSTYLE_CROSS_HATCH: - m_vAreaBundle.usSymbol = PATSYM_HATCH; - m_vAreaBundle.usSet = LCID_DEFAULT; - flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL; - flDefMask = ABB_SET | ABB_REF_POINT; - break; - - case wxPENSTYLE_HORIZONTAL_HATCH: - m_vAreaBundle.usSymbol = PATSYM_HORIZ; - m_vAreaBundle.usSet = LCID_DEFAULT; - flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL; - flDefMask = ABB_SET | ABB_REF_POINT; - break; - - case wxPENSTYLE_VERTICAL_HATCH: - m_vAreaBundle.usSymbol = PATSYM_VERT; - m_vAreaBundle.usSet = LCID_DEFAULT; - flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL; - flDefMask = ABB_SET | ABB_REF_POINT; - break; - - default: - m_vAreaBundle.usSymbol = PATSYM_SOLID; - m_vAreaBundle.usSet = LCID_DEFAULT; - flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL; - flDefMask = ABB_SET | ABB_REF_POINT; - break; - } - - m_vAreaBundle.lColor = vPmColour; - m_vAreaBundle.lBackColor = RGB_WHITE; - m_vAreaBundle.usMixMode = FM_OVERPAINT; - m_vAreaBundle.usBackMixMode = BM_OVERPAINT; - - bOk = ::GpiSetAttrs( M_PENDATA->m_hPen - ,PRIM_AREA - ,flAttrMask - ,flDefMask - ,&m_vAreaBundle - ); - if (!bOk) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n"), sError.c_str()); - } - - return (bool)bOk; - } - return false; -} // end of wxPen::RealizeResource - -WXHANDLE wxPen::GetResourceHandle() const -{ - if (!M_PENDATA) - return 0; - else - return (WXHANDLE)M_PENDATA->m_hPen; -} // end of wxPen::GetResourceHandle - -bool wxPen::FreeResource( bool WXUNUSED(bForce) ) -{ - if (M_PENDATA && (M_PENDATA->m_hPen != 0)) - { - M_PENDATA->m_hPen = 0; - return true; - } - else return false; -} // end of wxPen::FreeResource - -bool wxPen::IsFree() const -{ - return (M_PENDATA && M_PENDATA->m_hPen == 0); -} - -wxGDIRefData* wxPen::CreateGDIRefData() const -{ - return new wxPenRefData; -} - -wxGDIRefData* wxPen::CloneGDIRefData(const wxGDIRefData* data) const -{ - return new wxPenRefData(*static_cast(data)); -} - -void wxPen::SetColour( const wxColour& rColour ) -{ - AllocExclusive(); - M_PENDATA->m_vColour = rColour; - RealizeResource(); -} // end of wxPen::SetColour - -void wxPen::SetColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue) -{ - AllocExclusive(); - M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue); - RealizeResource(); -} // end of wxPen::SetColour - -void wxPen::SetPS( HPS hPS ) -{ - AllocExclusive(); - if (M_PENDATA->m_hPen) - ::GpiDestroyPS(M_PENDATA->m_hPen); - M_PENDATA->m_hPen = hPS; - RealizeResource(); -} // end of WxWinGdi_CPen::SetPS - -void wxPen::SetWidth( - int nWidth -) -{ - AllocExclusive(); - M_PENDATA->m_nWidth = nWidth; - RealizeResource(); -} // end of wxPen::SetWidth - -void wxPen::SetStyle( - wxPenStyle nStyle -) -{ - AllocExclusive(); - M_PENDATA->m_nStyle = nStyle; - RealizeResource(); -} // end of wxPen::SetStyle - -void wxPen::SetStipple( - const wxBitmap& rStipple -) -{ - AllocExclusive(); - M_PENDATA->m_vStipple = rStipple; - M_PENDATA->m_nStyle = wxPENSTYLE_STIPPLE; - RealizeResource(); -} // end of wxPen::SetStipple - -void wxPen::SetDashes( int WXUNUSED(nNbDashes), - const wxDash* WXUNUSED(pDash) ) -{ - // - // Does nothing under OS/2 - // -} // end of wxPen::SetDashes - -void wxPen::SetJoin( - wxPenJoin nJoin -) -{ - AllocExclusive(); - M_PENDATA->m_nJoin = nJoin; - RealizeResource(); -} // end of wxPen::SetJoin - -void wxPen::SetCap( - wxPenCap nCap -) -{ - AllocExclusive(); - M_PENDATA->m_nCap = nCap; - RealizeResource(); -} // end of wxPen::SetCap - -wxColour wxPen::GetColour() const -{ - wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); - - return M_PENDATA->m_vColour; -} - -int wxPen::GetWidth() const -{ - wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); - - return M_PENDATA->m_nWidth; -} - -wxPenStyle wxPen::GetStyle() const -{ - wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); - - return M_PENDATA->m_nStyle; -} - -wxPenJoin wxPen::GetJoin() const -{ - wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); - - return M_PENDATA->m_nJoin; -} - -wxPenCap wxPen::GetCap() const -{ - wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); - - return M_PENDATA->m_nCap; -} - -int wxPen::GetPS() const -{ - wxCHECK_MSG( IsOk(), 0, wxT("invalid pen") ); - - return M_PENDATA->m_hPen; -} - -int wxPen::GetDashes(wxDash** ptr) const -{ - wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); - - *ptr = M_PENDATA->m_dash; - return M_PENDATA->m_nbDash; -} - -wxDash* wxPen::GetDash() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); - - return M_PENDATA->m_dash; -} - -int wxPen::GetDashCount() const -{ - wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); - - return M_PENDATA->m_nbDash; -} - -wxBitmap* wxPen::GetStipple() const -{ - wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); - - return &(M_PENDATA->m_vStipple); -} - -int wx2os2PenStyle( - wxPenStyle nWxStyle -) -{ - int nPMStyle = 0; - - switch (nWxStyle) - { - case wxPENSTYLE_DOT: - nPMStyle = LINETYPE_DOT; - break; - - case wxPENSTYLE_DOT_DASH: - nPMStyle = LINETYPE_DASHDOT; - break; - - case wxPENSTYLE_SHORT_DASH: - nPMStyle = LINETYPE_SHORTDASH; - break; - - case wxPENSTYLE_LONG_DASH: - nPMStyle = LINETYPE_LONGDASH; - break; - - case wxPENSTYLE_TRANSPARENT: - nPMStyle = LINETYPE_INVISIBLE; - break; - - case wxPENSTYLE_USER_DASH: - nPMStyle = LINETYPE_DASHDOUBLEDOT; // We must make a choice... This is mine! - break; - - case wxPENSTYLE_SOLID: - default: - nPMStyle = LINETYPE_SOLID; - break; - } - return nPMStyle; -} // end of wx2os2PenStyle diff --git a/src/os2/popupwin.cpp b/src/os2/popupwin.cpp deleted file mode 100644 index c222600c09..0000000000 --- a/src/os2/popupwin.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/popupwin.cpp -// Purpose: implements wxPopupWindow for OS2 -// Author: Dave Webster -// Modified by: -// Created: 13.05.02 -// Copyright: (c) 2002 Dave Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - -#ifndef WX_PRECOMP -#endif //WX_PRECOMP - -#if wxUSE_POPUPWIN -#include "wx/popupwin.h" - -// ============================================================================ -// implementation -// ============================================================================ - -bool wxPopupWindow::Create( wxWindow* pParent, - int nFlags ) -{ - return wxPopupWindowBase::Create(pParent) && - wxWindow::Create( pParent - ,-1 - ,wxDefaultPosition - ,wxDefaultSize - ,nFlags | wxPOPUP_WINDOW - ); -} // end of wxPopupWindow::Create - -void wxPopupWindow::DoGetPosition( int* pnX, - int* pnY ) const -{ - // - // The position of a "top level" window such as this should be in - // screen coordinates, not in the client ones which MSW gives us - // (because we are a child window) - // - wxPopupWindowBase::DoGetPosition(pnX, pnY); - GetParent()->ClientToScreen(pnX, pnY); -} // end of wxPopupWindow::DoGetPosition - -WXHWND wxPopupWindow::OS2GetParent() const -{ - // we must be a child of the desktop to be able to extend beyond the parent - // window client area (like the comboboxes drop downs do) - // - return (WXHWND)HWND_DESKTOP; -} // end of wxPopupWindow::OS2GetParent - -WXDWORD wxPopupWindow::OS2GetStyle( long lFlags, - WXDWORD* dwExstyle ) const -{ - WXDWORD dwStyle = wxWindow::OS2GetStyle( lFlags & wxBORDER_MASK - ,dwExstyle - ); - - return dwStyle; -} // end of wxPopupWindow::OS2GetStyle -#endif diff --git a/src/os2/print.cpp b/src/os2/print.cpp deleted file mode 100644 index 37908a98cf..0000000000 --- a/src/os2/print.cpp +++ /dev/null @@ -1,103 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/print.cpp -// Purpose: Print framework -// Author: David Webster -// Modified by: -// Created: 10/14/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#if wxUSE_PRINTING_ARCHITECTURE - -#ifndef WX_PRECOMP - #include - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" -#endif - -#include "wx/os2/printos2.h" -#include "wx/generic/prntdlgg.h" - -IMPLEMENT_DYNAMIC_CLASS(wxOS2Printer, wxPrinterBase) -IMPLEMENT_CLASS(wxOS2PrintPreview, wxPrintPreviewBase) - -/* - * Printer - */ - -wxOS2Printer::wxOS2Printer(wxPrintDialogData *data): - wxPrinterBase(data) -{ -} - -wxOS2Printer::~wxOS2Printer() -{ -} - -bool wxOS2Printer::Print(wxWindow *WXUNUSED(parent), - wxPrintout *WXUNUSED(printout), - bool WXUNUSED(prompt)) -{ - // TODO. See wxPostScriptPrinter::Print for hints. - return false; -} - -wxDC* wxOS2Printer::PrintDialog(wxWindow *WXUNUSED(parent)) -{ -// TODO: -/* - wxPrintDialog dialog(parent, & m_printData); - return (dialog.GetPrintDC()); -*/ - return NULL; -} - -bool wxOS2Printer::Setup(wxWindow *WXUNUSED(parent)) -{ -// TODO: -/* - wxPrintDialog dialog(parent, & m_printData); - return (dialog.ShowModal() == wxID_OK); -*/ - return false; -} - -/* - * Print preview - */ - -wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintDialogData *data): - wxPrintPreviewBase(printout, printoutForPrinting, data) -{ - DetermineScaling(); -} - -wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data): - wxPrintPreviewBase(printout, printoutForPrinting, data) -{ - DetermineScaling(); -} - -wxOS2PrintPreview::~wxOS2PrintPreview() -{ -} - -bool wxOS2PrintPreview::Print(bool WXUNUSED(interactive)) -{ - if (!m_printPrintout) - return false; -// wxOS2Printer printer(&m_printData); -// return printer.Print(m_previewFrame, m_printPrintout, interactive); - return false; -} - -void wxOS2PrintPreview::DetermineScaling() -{ - // TODO -} - -#endif //wxUSE_PRINTING_ARCHITECTURE diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp deleted file mode 100644 index 7ce8bab75f..0000000000 --- a/src/os2/radiobox.cpp +++ /dev/null @@ -1,940 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/radiobox.cpp -// Purpose: wxRadioBox -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_RADIOBOX - -#include "wx/radiobox.h" - -#ifndef WX_PRECOMP - #include - #include "wx/crt.h" - #include "wx/string.h" - #include "wx/bitmap.h" - #include "wx/brush.h" -#endif - -#include "wx/os2/private.h" - -IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) - -// --------------------------------------------------------------------------- -// private functions -// --------------------------------------------------------------------------- - -// wnd proc for radio buttons -MRESULT EXPENTRY wxRadioBtnWndProc( HWND hWnd - ,UINT uMessage - ,MPARAM wParam - ,MPARAM lParam - ); -MRESULT EXPENTRY wxRadioBoxWndProc( HWND hWnd - ,UINT uMessage - ,MPARAM wParam - ,MPARAM lParam - ); - -// --------------------------------------------------------------------------- -// global vars -// --------------------------------------------------------------------------- - -extern void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); -extern void wxRemoveHandleAssociation( wxWindowOS2 *pWin ); -// the pointer to standard radio button & box wnd procs -static WXFARPROC fnWndProcRadioBtn = NULL; -static WXFARPROC fnWndProcRadioBox = NULL; - -// =========================================================================== -// implementation -// =========================================================================== - -// --------------------------------------------------------------------------- -// wxRadioBox -// --------------------------------------------------------------------------- - -// Radio box item -wxRadioBox::wxRadioBox() -{ - m_nSelectedButton = -1; - m_nNoItems = 0; - m_ahRadioButtons = NULL; - m_pnRadioWidth = NULL; - m_pnRadioHeight = NULL; -} // end of wxRadioBox::wxRadioBox - -wxRadioBox::~wxRadioBox() -{ - SendDestroyEvent(); - - if (m_hWnd) - wxRemoveHandleAssociation(this); - if (m_ahRadioButtons) - { - for (unsigned int i = 0; i < m_nNoItems; i++) - { - wxWindow* pWin = wxFindWinFromHandle((WXHWND)m_ahRadioButtons[i]); - wxRemoveHandleAssociation(pWin); - - ::WinDestroyWindow((HWND)m_ahRadioButtons[i]); - } - delete[] m_ahRadioButtons; - } - if (m_pnRadioWidth) - delete[] m_pnRadioWidth; - if (m_pnRadioHeight) - delete[] m_pnRadioHeight; -} // end of wxRadioBox::~wxRadioBox - -void wxRadioBox::Command ( wxCommandEvent& rEvent ) -{ - SetSelection (rEvent.GetInt()); - ProcessCommand(rEvent); -} // end of wxRadioBox::Command - -bool wxRadioBox::ContainsHWND( WXHWND hWnd ) const -{ - unsigned int nCount = GetCount(); - unsigned int i; - - for (i = 0; i < nCount; i++) - { - if (GetRadioButtons()[i] == hWnd) - return true; - } - return false; -} // end of wxRadioBox::ContainsHWND - -bool wxRadioBox::Create( wxWindow* pParent, - wxWindowID vId, - const wxString& rsTitle, - const wxPoint& rPos, - const wxSize& rSize, - const wxArrayString& asChoices, - int nMajorDim, - long lStyle, - const wxValidator& rVal, - const wxString& rsName ) -{ - wxCArrayString chs(asChoices); - - return Create(pParent, vId, rsTitle, rPos, rSize, chs.GetCount(), - chs.GetStrings(), nMajorDim, lStyle, rVal, rsName); -} - -bool wxRadioBox::Create( wxWindow* pParent, - wxWindowID vId, - const wxString& rsTitle, - const wxPoint& rPos, - const wxSize& rSize, - int nNum, - const wxString asChoices[], - int nMajorDim, - long lStyle, - const wxValidator& rVal, - const wxString& rsName ) -{ - wxColour vColour(*wxBLACK); - LONG lColor; - HWND hWndParent = GetHwndOf(pParent); - - m_backgroundColour = pParent->GetBackgroundColour(); - m_nSelectedButton = -1; - m_nNoItems = 0; - - // - // Common initialization - // - if (!CreateControl( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rVal - ,rsName - )) - return false; - if (!OS2CreateControl( wxT("STATIC") - ,SS_GROUPBOX - ,rPos - ,rSize - ,rsTitle - )) - return false; - - wxAssociateWinWithHandle(m_hWnd, this); - - // - // Now we can set m_nNoItems and let SetMajorDim set m_numCols/m_numRows - // - m_nNoItems = (unsigned int)nNum; - SetMajorDim(nMajorDim == 0 ? nNum : nMajorDim, lStyle); - - m_ahRadioButtons = new WXHWND[nNum]; - m_pnRadioWidth = new int[nNum]; - m_pnRadioHeight = new int[nNum]; - - for (int i = 0; i < nNum; i++) - { - m_pnRadioWidth[i] = m_pnRadioHeight[i] = -1; - long lStyleBtn = BS_AUTORADIOBUTTON | WS_VISIBLE; - int nNewId = NewControlId(); - - if (i == 0) - lStyleBtn |= WS_GROUP | WS_TABSTOP; - - wxString sLabel = ::wxPMTextToLabel(asChoices[i]); - - HWND hWndBtn = (WXHWND)::WinCreateWindow ( hWndParent, - WC_BUTTON, - sLabel.c_str(), - lStyleBtn, - 0, 0, 0, 0, - hWndParent, - HWND_BOTTOM, - (HMENU)nNewId, - NULL, - NULL - ); - if (!hWndBtn) - { - return false; - } - lColor = (LONG)vColour.GetPixel(); - ::WinSetPresParam( hWndBtn - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - - lColor = (LONG)m_backgroundColour.GetPixel(); - ::WinSetPresParam( hWndBtn - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - m_ahRadioButtons[i] = (WXHWND)hWndBtn; - SubclassRadioButton((WXHWND)hWndBtn); - wxAssociateWinWithHandle(hWndBtn, this); - wxOS2SetFont( hWndBtn - ,*wxSMALL_FONT - ); - ::WinSetWindowULong(hWndBtn, QWL_USER, (ULONG)this); - m_aSubControls.Add(nNewId); - } - - // - // Create a dummy control to end the group. - // - (void)::WinCreateWindow ( hWndParent, - WC_BUTTON, - "", - WS_GROUP, - 0, 0, 0, 0, - hWndParent, - HWND_TOP, - (HMENU)NewControlId(), - NULL, - NULL - ); - fnWndProcRadioBox = (WXFARPROC)::WinSubclassWindow( GetHwnd() - ,(PFNWP)wxRadioBoxWndProc - ); - ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this); - lColor = (LONG)vColour.GetPixel(); - ::WinSetPresParam( m_hWnd - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - - lColor = (LONG)m_backgroundColour.GetPixel(); - ::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - SetXComp(0); - SetYComp(0); - SetSelection(0); - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); - return true; -} // end of wxRadioBox::Create - -wxSize wxRadioBox::DoGetBestSize() const -{ - return (GetTotalButtonSize(GetMaxButtonSize())); -} // end of wxRadioBox::DoGetBestSize - -void wxRadioBox::DoSetSize( - int nX -, int nY -, int nWidth -, int nHeight -, int nSizeFlags -) -{ - // - // Input parameters assume wxWidgets coordinate system - // - int nCurrentX; - int nCurrentY; - int nWidthOld; - int nHeightOld; - int nXx = nX; - int nYy = nY; - int nXOffset = nXx; - int nYOffset = nYy; - int nCx1; - int nCy1; - wxSize vMaxSize = GetMaxButtonSize(); - int nMaxWidth; - int nMaxHeight; - wxSize vTotSize; - int nTotWidth; - int nTotHeight; - int nStartX; - int nStartY; - wxFont vFont = GetFont(); - - m_nSizeFlags = nSizeFlags; - GetPosition( &nCurrentX - ,&nCurrentY - ); - GetSize( &nWidthOld - ,&nHeightOld - ); - - if (nX == wxDefaultCoord && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - nXx = nCurrentX; - if (nY == wxDefaultCoord && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - nYy = nCurrentY; - if (nYy < 0) - nYy = 0; - if (nXx < 0) - nXx = 0; - - wxGetCharSize( m_hWnd - ,&nCx1 - ,&nCy1 - ,&vFont - ); - - // - // Attempt to have a look coherent with other platforms: We compute the - // biggest toggle dim, then we align all items according this value. - // - vMaxSize = GetMaxButtonSize(); - nMaxWidth = vMaxSize.x; - nMaxHeight = vMaxSize.y; - - vTotSize = GetTotalButtonSize(vMaxSize); - nTotWidth = vTotSize.x; - nTotHeight = vTotSize.y; - - // - // Only change our width/height if asked for - // - if (nWidth == -1) - { - if (nSizeFlags & wxSIZE_AUTO_WIDTH ) - nWidth = nTotWidth; - else - nWidth = nWidthOld; - } - - if (nHeight == -1) - { - if (nSizeFlags & wxSIZE_AUTO_HEIGHT) - nHeight = nTotHeight; - else - nHeight = nHeightOld; - } - - // - // Now convert to OS/2 coordinate system - // - wxWindowOS2* pParent = (wxWindowOS2*)GetParent(); - if (pParent) - nYy = GetOS2ParentHeight(pParent) - nYy - nHeight; - else - { - RECTL vRect; - ::WinQueryWindowRect(HWND_DESKTOP, &vRect); - nYy = vRect.yTop - nYy - nHeight; - } - nYOffset = nYy + nHeight; - ::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,(LONG)nXx - ,(LONG)nYy - ,(LONG)nWidth - ,(LONG)nHeight - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - - // - // Now position all the buttons: the current button will be put at - // wxPoint(x_offset, y_offset) and the new row/column will start at - // startX/startY. The size of all buttons will be the same wxSize(maxWidth, - // maxHeight) except for the buttons in the last column which should extend - // to the right border of radiobox and thus can be wider than this. - // - // Also, remember that wxRA_SPECIFY_COLS means that we arrange buttons in - // left to right order and m_majorDim is the number of columns while - // wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and - // m_majorDim is the number of rows. - // - nXOffset += nCx1; - nYOffset -= (nMaxHeight + ((3*nCy1)/2)); - - nStartX = nXOffset; - nStartY = nYOffset; - - for (unsigned int i = 0; i < m_nNoItems; i++) - { - // - // The last button in the row may be wider than the other ones as the - // radiobox may be wider than the sum of the button widths (as it - // happens, for example, when the radiobox label is very long) - // - bool bIsLastInTheRow; - - if (m_windowStyle & wxRA_SPECIFY_COLS) - { - // - // Item is the last in its row if it is a multiple of the number of - // columns or if it is just the last item - // - int n = i + 1; - - bIsLastInTheRow = ((n % GetMajorDim()) == 0) || (n == (int)m_nNoItems); - } - else // winRA_SPECIFY_ROWS - { - // - // Item is the last in the row if it is in the last columns - // - bIsLastInTheRow = i >= (m_nNoItems/GetMajorDim()) * GetMajorDim(); - } - - // - // Is this the start of new row/column? - // - if (i && (i % GetMajorDim() == 0)) - { - if (m_windowStyle & wxRA_SPECIFY_ROWS) - { - // - // Start of new column - // - nYOffset = nStartY; - nXOffset += nMaxWidth + nCx1; - } - else // start of new row - { - nXOffset = nStartX; - nYOffset -= nMaxHeight; - if (m_pnRadioWidth[0] > 0L) - nYOffset -= nCy1/2; - } - } - - int nWidthBtn; - - if (bIsLastInTheRow) - { - // - // Make the button go to the end of radio box - // - nWidthBtn = nStartX + nWidth - nXOffset - (2 * nCx1); - if (nWidthBtn < nMaxWidth) - nWidthBtn = nMaxWidth; - } - else - { - // - // Normal button, always of the same size - // - nWidthBtn = nMaxWidth; - } - - // - // Make all buttons of the same, maximal size - like this they - // cover the radiobox entirely and the radiobox tooltips are always - // shown (otherwise they are not when the mouse pointer is in the - // radiobox part not belonging to any radiobutton) - // - ::WinSetWindowPos( (HWND)m_ahRadioButtons[i] - ,HWND_BOTTOM - ,(LONG)nXOffset - ,(LONG)nYOffset - ,(LONG)nWidthBtn - ,(LONG)nMaxHeight - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - // - // Where do we put the next button? - // - if (m_windowStyle & wxRA_SPECIFY_ROWS) - { - // - // Below this one - // - nYOffset -= nMaxHeight; - if (m_pnRadioWidth[0] > 0) - nYOffset -= nCy1/2; - } - else - { - // - // To the right of this one - // - nXOffset += nWidthBtn + nCx1; - } - } -} // end of wxRadioBox::DoSetSize - -bool wxRadioBox::Enable(unsigned int nItem, bool bEnable) -{ - wxCHECK_MSG( IsValid(nItem), false, - wxT("invalid item in wxRadioBox::Enable()") ); - - ::WinEnableWindow((HWND) m_ahRadioButtons[nItem], bEnable); - return true; -} // end of wxRadioBox::Enable - -bool wxRadioBox::Enable(bool bEnable) -{ - if ( !wxControl::Enable(bEnable) ) - return false; - for (unsigned int i = 0; i < m_nNoItems; i++) - ::WinEnableWindow((HWND)m_ahRadioButtons[i], bEnable); - return true; -} // end of wxRadioBox::Enable - -unsigned int wxRadioBox::GetCount() const -{ - return m_nNoItems; -} // end of wxRadioBox::GetCount - -wxString wxRadioBox::GetLabel(int nItem) const -{ - wxCHECK_MSG( IsValid(nItem), wxEmptyString, wxT("invalid radiobox index") ); - - return wxGetWindowText(m_ahRadioButtons[nItem]); -} // end of wxRadioBox::GetLabel - -wxSize wxRadioBox::GetMaxButtonSize() const -{ - int nWidthMax = 0; - int nHeightMax = 0; - - for (unsigned int i = 0 ; i < m_nNoItems; i++) - { - int nWidth; - int nHeight; - - if (m_pnRadioWidth[i] < 0L) - { - GetTextExtent( wxGetWindowText(m_ahRadioButtons[i]) - ,&nWidth - ,&nHeight - ); - - // - // Adjust the size to take into account the radio box itself - // FIXME this is totally bogus! - // - nWidth += RADIO_SIZE; - nHeight *= 3; - nHeight /= 2; - } - else - { - nWidth = m_pnRadioWidth[i]; - nHeight = m_pnRadioHeight[i]; - } - if (nWidthMax < nWidth ) - nWidthMax = nWidth; - if (nHeightMax < nHeight ) - nHeightMax = nHeight; - } - wxSize maxsize( nWidthMax, nHeightMax); - return maxsize; -} // end of wxRadioBox::GetMaxButtonSize - -// Get single selection, for single choice list items -int wxRadioBox::GetSelection() const -{ - return m_nSelectedButton; -} // end of wxRadioBox::GetSelection - -void wxRadioBox::GetSize( int* pnWidth, int* pnHeight ) const -{ - RECT vRect; - - vRect.xLeft = -1; - vRect.xRight = -1; - vRect.yTop = -1; - vRect.yBottom = -1; - - if (m_hWnd) - wxFindMaxSize( m_hWnd, &vRect ); - - for (unsigned int i = 0; i < m_nNoItems; i++) - wxFindMaxSize( m_ahRadioButtons[i], &vRect ); - - if (pnWidth) - *pnWidth = vRect.xRight - vRect.xLeft; - if (pnHeight) - *pnHeight = vRect.yTop - vRect.yBottom; -} // end of wxRadioBox::GetSize - -// Find string for position -wxString wxRadioBox::GetString(unsigned int nNum) const -{ - wxCHECK_MSG( IsValid(nNum), wxEmptyString, wxT("invalid radiobox index") ); - return wxGetWindowText(m_ahRadioButtons[nNum]); -} // end of wxRadioBox::GetString - -// For single selection items only -wxString wxRadioBox::GetStringSelection() const -{ - wxString sResult; - int nSel = GetSelection(); - - if (nSel != wxNOT_FOUND) - sResult = GetString(nSel); - - return sResult; -} // end of wxRadioBox::GetStringSelection - -wxSize wxRadioBox::GetTotalButtonSize( const wxSize& rSizeBtn ) const -{ - int nCx1; - int nCy1; - int nHeight; - int nWidth; - int nWidthLabel = 0; - - nCx1 = GetCharWidth(); - nCy1 = GetCharHeight(); - nHeight = GetRowCount() * rSizeBtn.y + (2 * nCy1); - nWidth = GetColumnCount() * (rSizeBtn.x + nCx1) + nCx1; - - // - // And also wide enough for its label - // - wxString sStr = wxGetWindowText(GetHwnd()); - if (!sStr.empty()) - { - GetTextExtent( sStr - ,&nWidthLabel - ,NULL - ); - nWidthLabel += 2*nCx1; - } - if (nWidthLabel > nWidth) - nWidth = nWidthLabel; - - wxSize total( nWidth, nHeight ); - return total; -} // end of wxRadioBox::GetTotalButtonSize - -WXHBRUSH wxRadioBox::OnCtlColor( WXHDC hwinDC, - WXHWND WXUNUSED(hWnd), - WXUINT WXUNUSED(uCtlColor), - WXUINT WXUNUSED(uMessage), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam) ) -{ - HPS hPS = (HPS)hwinDC; // pass in a PS handle in OS/2 - - if (GetParent()->GetTransparentBackground()) - ::GpiSetBackMix(hPS, BM_LEAVEALONE); - else - ::GpiSetBackMix(hPS, BM_OVERPAINT); - - wxColour vColBack = GetBackgroundColour(); - - ::GpiSetBackColor(hPS, vColBack.GetPixel()); - ::GpiSetColor(hPS, vColBack.GetPixel()); - - wxBrush* pBrush = wxTheBrushList->FindOrCreateBrush( vColBack, wxSOLID ); - return ((WXHBRUSH)pBrush->GetResourceHandle()); -} // end of wxRadioBox::OnCtlColor - -bool wxRadioBox::OS2Command( WXUINT uCmd, - WXWORD wId) -{ - int nSelectedButton = -1; - - if (uCmd == BN_CLICKED) - { - if (wId == GetId()) - return true; - - for (unsigned int i = 0; i < m_nNoItems; i++) - { - if (wId == wxGetWindowId(m_ahRadioButtons[i])) - { - nSelectedButton = i; - break; - } - } - if (nSelectedButton == -1) - { - // - // Just ignore it - // - return false; - } - if (nSelectedButton != m_nSelectedButton) - { - m_nSelectedButton = nSelectedButton; - SendNotificationEvent(); - } - return true; - } - else - return false; -} // end of wxRadioBox::OS2Command - -void wxRadioBox::SendNotificationEvent() -{ - wxCommandEvent vEvent( - wxEVT_RADIOBOX, - m_windowId - ); - - vEvent.SetInt( m_nSelectedButton ); - vEvent.SetString( GetString(m_nSelectedButton) ); - vEvent.SetEventObject(this); - ProcessCommand(vEvent); -} // end of wxRadioBox::SendNotificationEvent - -void wxRadioBox::SetFocus() -{ - if (m_nNoItems > 0) - { - if (m_nSelectedButton == -1) - ::WinSetFocus(HWND_DESKTOP, (HWND)m_ahRadioButtons[0]); - else - ::WinSetFocus(HWND_DESKTOP, (HWND)m_ahRadioButtons[m_nSelectedButton]); - } -} // end of wxRadioBox::SetFocus - -bool wxRadioBox::SetFont(const wxFont& rFont) -{ - if (!wxControl::SetFont(rFont)) - { - // - // Nothing to do - // - return false; - } - // - // Also set the font of our radio buttons - // - for (unsigned int n = 0; n < m_nNoItems; n++) - { - HWND hWndBtn = (HWND)m_ahRadioButtons[n]; - - wxOS2SetFont( hWndBtn, rFont ); - ::WinInvalidateRect(hWndBtn, NULL, FALSE); - } - return true; -} // end of wxRadioBox::SetFont - -void wxRadioBox::SetSelection( - int nNum -) -{ - wxCHECK_RET( IsValid(nNum), wxT("invalid radiobox index") ); - - if ( IsValid(m_nSelectedButton) ) - ::WinSendMsg((HWND)m_ahRadioButtons[m_nSelectedButton], BM_SETCHECK, (MPARAM)0, (MPARAM)0); - - ::WinSendMsg((HWND)m_ahRadioButtons[nNum], BM_SETCHECK, (MPARAM)1, (MPARAM)0); - ::WinSetFocus(HWND_DESKTOP, (HWND)m_ahRadioButtons[nNum]); - m_nSelectedButton = nNum; -} // end of wxRadioBox::SetSelection - -void wxRadioBox::SetString(unsigned int nItem, const wxString& rsLabel) -{ - wxCHECK_RET( IsValid(nItem), wxT("invalid radiobox index") ); - - m_pnRadioWidth[nItem] = m_pnRadioHeight[nItem] = -1; - ::WinSetWindowText((HWND)m_ahRadioButtons[nItem], rsLabel.c_str()); -} // end of wxRadioBox::SetString - -bool wxRadioBox::SetStringSelection(const wxString& rsStr) -{ - int nSel = FindString(rsStr); - - if (nSel > -1) - { - SetSelection(nSel); - return true; - } - else - return false; -} // end of wxRadioBox::SetStringSelection - -bool wxRadioBox::Show(bool bShow) -{ - if (!wxControl::Show(bShow)) - return false; - - for (unsigned int i = 0; i < m_nNoItems; i++) - { - ::WinShowWindow((HWND)m_ahRadioButtons[i], (BOOL)bShow); - } - return true; -} // end of wxRadioBox::Show - -// Show a specific button -bool wxRadioBox::Show(unsigned int nItem, bool bShow) -{ - wxCHECK_MSG( IsValid(nItem), false, - wxT("invalid item in wxRadioBox::Show()") ); - - ::WinShowWindow((HWND)m_ahRadioButtons[nItem], bShow); - - return true; -} // end of wxRadioBox::Show - -void wxRadioBox::SubclassRadioButton( - WXHWND hWndBtn -) -{ - fnWndProcRadioBtn = (WXFARPROC)::WinSubclassWindow(hWndBtn, (PFNWP)wxRadioBtnWndProc); -} // end of wxRadioBox::SubclassRadioButton - -MRESULT wxRadioBox::WindowProc( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) -{ - return (wxControl::OS2WindowProc( uMsg - ,wParam - ,lParam - )); -} // end of wxRadioBox::WindowProc - -// --------------------------------------------------------------------------- -// window proc for radio buttons -// --------------------------------------------------------------------------- - -MRESULT wxRadioBtnWndProc( - HWND hWnd -, UINT uMessage -, MPARAM wParam -, MPARAM lParam -) -{ - switch (uMessage) - { - case WM_CHAR: - { - USHORT uKeyFlags = SHORT1FROMMP((MPARAM)wParam); - - if (!(uKeyFlags & KC_KEYUP)) // Key Down event - { - if (uKeyFlags & KC_VIRTUALKEY) - { - wxRadioBox* pRadiobox = (wxRadioBox *)::WinQueryWindowULong( hWnd - ,QWL_USER - ); - USHORT uVk = SHORT2FROMMP((MPARAM)lParam); - bool bProcessed = true; - wxDirection eDir; - - switch(uVk) - { - case VK_LEFT: - eDir = wxLEFT; - break; - - case VK_RIGHT: - eDir = wxRIGHT; - break; - - case VK_DOWN: - eDir = wxDOWN; - break; - - case VK_UP: - eDir = wxUP; - break; - - default: - bProcessed = false; - - // - // Just to suppress the compiler warning - // - eDir = wxALL; - } - - if (bProcessed) - { - int nSelOld = pRadiobox->GetSelection(); - int nSelNew = pRadiobox->GetNextItem( nSelOld - ,eDir - ,pRadiobox->GetWindowStyleFlag() - ); - - if (nSelNew != nSelOld) - { - pRadiobox->SetSelection(nSelNew); - - // - // Emulate the button click - // - pRadiobox->SendNotificationEvent(); - return 0; - } - } - } - } - } - break; - } - - return fnWndProcRadioBtn( hWnd - ,(ULONG)uMessage - ,(MPARAM)wParam - ,(MPARAM)lParam - ); -} // end of wxRadioBtnWndProc - -MRESULT EXPENTRY wxRadioBoxWndProc( HWND hWnd, - UINT uMessage, - MPARAM wParam, - MPARAM lParam ) -{ - return (fnWndProcRadioBox( hWnd, - (ULONG)uMessage, - (MPARAM)wParam, - (MPARAM)lParam ) - ); -} // end of wxRadioBoxWndProc - -#endif // wxUSE_RADIOBOX diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp deleted file mode 100644 index 27435fdc1c..0000000000 --- a/src/os2/radiobut.cpp +++ /dev/null @@ -1,284 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/radiobut.cpp -// Purpose: wxRadioButton -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/radiobut.h" - -#ifndef WX_PRECOMP - #include - #include "wx/brush.h" - #include "wx/dcscreen.h" - #include "wx/settings.h" -#endif - -#include "wx/os2/private.h" - -extern void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); - -void wxRadioButton::Init() -{ - m_bFocusJustSet = false; -} // end of wxRadioButton::Init - -void wxRadioButton::Command ( wxCommandEvent& rEvent ) -{ - SetValue ((rEvent.GetInt() != 0) ); - ProcessCommand (rEvent); -} // end of wxRadioButton::Command - -bool wxRadioButton::Create( wxWindow* pParent, - wxWindowID vId, - const wxString& rsLabel, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxValidator& rValidator, - const wxString& rsName ) -{ - if ( !CreateControl( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName)) - return false; - - long lSstyle = WS_TABSTOP; - - if (HasFlag(wxRB_GROUP)) - lSstyle |= WS_GROUP; - - // - // wxRB_SINGLE is a temporary workaround for the following problem: if you - // have 2 radiobuttons in the same group but which are not consecutive in - // the dialog, Windows can enter an infinite loop! The simplest way to - // reproduce it is to create radio button, then a panel and then another - // radio button: then checking the last button hangs the app. - // - // Ideally, we'd detect (and avoid) such situation automatically but for - // now, as I don't know how to do it, just allow the user to create - // BS_RADIOBUTTON buttons for such situations. - // - lSstyle |= HasFlag(wxRB_SINGLE) ? BS_RADIOBUTTON : BS_AUTORADIOBUTTON; - - if (HasFlag(wxCLIP_SIBLINGS)) - lSstyle |= WS_CLIPSIBLINGS; - - if (!OS2CreateControl( wxT("BUTTON") - ,lSstyle - ,rPos - ,rSize - ,rsLabel - ,0 - )) - return false; - - wxAssociateWinWithHandle(m_hWnd, this); - if (HasFlag(wxRB_GROUP)) - SetValue(true); - - SetFont(*wxSMALL_FONT); - SetSize( rPos.x, rPos.y, rSize.x, rSize.y ); - return true; -} // end of wxRadioButton::Create - -wxSize wxRadioButton::DoGetBestSize() const -{ - // We should probably compute snRadioSize but it seems to be a constant - // independent of its label's font size and not made available by OS/2. - static int snRadioSize = RADIO_SIZE; - - wxString sStr = wxGetWindowText(GetHwnd()); - int nRadioWidth; - int nRadioHeight; - - if (!sStr.empty()) - { - GetTextExtent( sStr - ,&nRadioWidth - ,&nRadioHeight - ); - nRadioWidth += snRadioSize; - if (nRadioHeight < snRadioSize) - nRadioHeight = snRadioSize; - } - else - { - nRadioWidth = snRadioSize; - nRadioHeight = snRadioSize; - } - return wxSize( nRadioWidth - ,nRadioHeight - ); -} // end of wxRadioButton::DoGetBestSize - -// -// Get single selection, for single choice list items -// -bool wxRadioButton::GetValue() const -{ - return((::WinSendMsg((HWND) GetHWND(), BM_QUERYCHECK, (MPARAM)0L, (MPARAM)0L) != 0)); -} // end of wxRadioButton::GetValue - -bool wxRadioButton::OS2Command( WXUINT wParam, WXWORD WXUNUSED(wId) ) -{ - if (wParam != BN_CLICKED) - return false; - - if (m_bFocusJustSet) - { - // - // See above: we want to ignore this event - // - m_bFocusJustSet = false; - } - else - { - bool bIsChecked = GetValue(); - - if (HasFlag(wxRB_SINGLE)) - { - // - // When we use a "manual" radio button, we have to check the button - // ourselves -- but it's reset to unchecked state by the user code - // (presumably when another button is pressed) - // - if (!bIsChecked ) - SetValue(true); - } - wxCommandEvent rEvent( wxEVT_RADIOBUTTON, m_windowId ); - rEvent.SetEventObject(this); - ProcessCommand(rEvent); - } - return true; -} // end of wxRadioButton::OS2Command - -void wxRadioButton::SetFocus() -{ - // when the radio button receives a WM_SETFOCUS message it generates a - // BN_CLICKED which is totally unexpected and leads to catastrophic results - // if you pop up a dialog from the radio button event handler as, when the - // dialog is dismissed, the focus is returned to the radio button which - // generates BN_CLICKED which leads to showing another dialog and so on - // without end! - // - // to avoid this, we drop the pseudo BN_CLICKED events generated when the - // button gains focus - m_bFocusJustSet = true; - - wxControl::SetFocus(); -} - -void wxRadioButton::SetLabel( const wxString& rsLabel ) -{ - wxString sLabel = ::wxPMTextToLabel(rsLabel); - ::WinSetWindowText((HWND)GetHWND(), (const char *)sLabel.c_str()); -} // end of wxRadioButton::SetLabel - -void wxRadioButton::SetValue( bool bValue ) -{ - ::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0); - if (bValue) - { - const wxWindowList& rSiblings = GetParent()->GetChildren(); - wxWindowList::compatibility_iterator nodeThis = rSiblings.Find(this); - - wxCHECK_RET(nodeThis, wxT("radio button not a child of its parent?")); - - // - // If it's not the first item of the group ... - // - if ( !HasFlag(wxRB_GROUP) ) - { - // - // ...turn off all radio buttons before this one - // - for ( wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious(); - nodeBefore; - nodeBefore = nodeBefore->GetPrevious() ) - { - wxRadioButton* pBtn = wxDynamicCast( nodeBefore->GetData() - ,wxRadioButton - ); - if (!pBtn) - { - // - // The radio buttons in a group must be consecutive, so there - // are no more of them - // - break; - } - pBtn->SetValue(false); - if (pBtn->HasFlag(wxRB_GROUP)) - { - // - // Even if there are other radio buttons before this one, - // they're not in the same group with us - // - break; - } - } - } - - // - // ... and all after this one - // - for (wxWindowList::compatibility_iterator nodeAfter = nodeThis->GetNext(); - nodeAfter; - nodeAfter = nodeAfter->GetNext()) - { - wxRadioButton* pBtn = wxDynamicCast( nodeAfter->GetData() - ,wxRadioButton - ); - - if (!pBtn || pBtn->HasFlag(wxRB_GROUP) ) - { - // - // No more buttons or the first button of the next group - // - break; - } - pBtn->SetValue(false); - } - } -} // end of wxRadioButton::SetValue - -MRESULT wxRadioButton::OS2WindowProc( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) -{ - if (uMsg == WM_SETFOCUS) - { - m_bFocusJustSet = true; - - MRESULT mRc = wxControl::OS2WindowProc( uMsg - ,wParam - ,lParam - ); - - m_bFocusJustSet = false; - return mRc; - } - return wxControl::OS2WindowProc( uMsg - ,wParam - ,lParam - ); -} // end of wxRadioButton::OS2WindowProc diff --git a/src/os2/region.cpp b/src/os2/region.cpp deleted file mode 100644 index 45b8d43049..0000000000 --- a/src/os2/region.cpp +++ /dev/null @@ -1,658 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// File: src/os2/region.cpp -// Purpose: Region class -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/window.h" - #include "wx/gdicmn.h" -#endif - -#include "wx/os2/region.h" - -#include "wx/os2/private.h" - -IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) - -//----------------------------------------------------------------------------- -// wxRegionRefData implementation -//----------------------------------------------------------------------------- - -class WXDLLEXPORT wxRegionRefData : public wxGDIRefData { -public: - wxRegionRefData() - { - m_hRegion = 0; - m_hPS = 0; - } - - wxRegionRefData(const wxRegionRefData& rData) - { - RGNRECT vRgnData; - PRECTL pRect = NULL; - - vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT; - if (::GpiQueryRegionRects( rData.m_hPS // Pres space - ,rData.m_hRegion // Handle of region to query - ,NULL // Return all RECTs - ,&vRgnData // Will contain number or RECTs in region - ,NULL // NULL to return number of RECTs - )) - { - pRect = new RECTL[vRgnData.crcReturned]; - vRgnData.crc = vRgnData.crcReturned; - vRgnData.ircStart = 1; - if (::GpiQueryRegionRects( rData.m_hPS // Pres space of source - ,rData.m_hRegion // Handle of source region - ,NULL // Return all RECTs - ,&vRgnData // Operations set to return rects - ,pRect // Will contain the actual RECTS - )) - { - m_hRegion = ::GpiCreateRegion( rData.m_hPS - ,vRgnData.crcReturned - ,pRect - ); - m_hPS = rData.m_hPS; - } - delete [] pRect; - } - } - - virtual ~wxRegionRefData() - { - ::GpiDestroyRegion(m_hPS, m_hRegion); - } - - HRGN m_hRegion; - HPS m_hPS; -}; - -#define M_REGION (((wxRegionRefData*)m_refData)->m_hRegion) -#define M_REGION_OF(rgn) (((wxRegionRefData*)(rgn.m_refData))->m_hRegion) - -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- - -// General remark: -// wxRegion is always basically stored in wx coordinates. However, since -// OS/2's internal functions rely on "top > bottom", the values of top and -// bottom values of a region need to be interchanged, as compared to wx. -// This needs to be taken into account when feeding any rectangle to wx _or_ -// when accessing the region data via GetBox, wxRegionIterator or otherwise. - -/*! - * Create an empty region. - */ -wxRegion::wxRegion() -{ - m_refData = new wxRegionRefData; -} // end of wxRegion::wxRegion - -wxRegion::wxRegion( - WXHRGN hRegion, - WXHDC hPS -) -{ - m_refData = new wxRegionRefData; - M_REGION = (HRGN) hRegion; - (((wxRegionRefData*)m_refData)->m_hPS) = hPS; -} // end of wxRegion::wxRegion - -wxRegion::wxRegion( - wxCoord x -, wxCoord y -, wxCoord vWidth -, wxCoord vHeight -) -{ - RECTL vRect; - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDC = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,5L - ,(PDEVOPENDATA)&vDop - ,NULLHANDLE - ); - - - vRect.xLeft = x; - vRect.xRight = x + vWidth; - vRect.yBottom = y; - vRect.yTop = y + vHeight; - - m_refData = new wxRegionRefData; - - // - // Need a PS to create a Region - // - ((wxRegionRefData*)m_refData)->m_hPS = ::GpiCreatePS( vHabmain - ,hDC - ,&vSize - ,PU_PELS | GPIT_MICRO | GPIA_ASSOC - ); - M_REGION = ::GpiCreateRegion( ((wxRegionRefData*)m_refData)->m_hPS - ,1 - ,&vRect - ); -} // end of wxRegion::wxRegion - -wxRegion::wxRegion(const wxPoint& rTopLeft, - const wxPoint& rBottomRight) -{ - RECTL vRect; - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDC = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,5L - ,(PDEVOPENDATA)&vDop - ,NULLHANDLE - ); - - vRect.xLeft = rTopLeft.x; - vRect.xRight = rBottomRight.x; - vRect.yBottom = rTopLeft.y; - vRect.yTop = rBottomRight.y; - - m_refData = new wxRegionRefData; - - // - // Need a PS to create a Region - // - ((wxRegionRefData*)m_refData)->m_hPS = ::GpiCreatePS( vHabmain - ,hDC - ,&vSize - ,PU_PELS | GPIT_MICRO | GPIA_ASSOC - ); - M_REGION = ::GpiCreateRegion( ((wxRegionRefData*)m_refData)->m_hPS - ,1 - ,&vRect - ); -} // end of wxRegion::wxRegion - -wxRegion::wxRegion(const wxRect& rRect) -{ - RECTL vRect; - SIZEL vSize = {0, 0}; - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDC = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,5L - ,(PDEVOPENDATA)&vDop - ,NULLHANDLE - ); - - - vRect.xLeft = rRect.x; - vRect.xRight = rRect.x + rRect.width; - vRect.yBottom = rRect.y; - vRect.yTop = rRect.y + rRect.height; - - m_refData = new wxRegionRefData; - - // - // Need a PS to create a Region - // - ((wxRegionRefData*)m_refData)->m_hPS = ::GpiCreatePS( vHabmain - ,hDC - ,&vSize - ,PU_PELS | GPIT_MICRO | GPIA_ASSOC - ); - M_REGION = ::GpiCreateRegion( ((wxRegionRefData*)m_refData)->m_hPS - ,1 - ,&vRect - ); -} // end of wxRegion::wxRegion - -wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode WXUNUSED(fillStyle)) -{ - // TO DO -} - -// -// Destroy the region. -// -wxRegion::~wxRegion() -{ -} // end of wxRegion::~wxRegion - -wxGDIRefData *wxRegion::CreateGDIRefData() const -{ - return new wxRegionRefData; -} - -wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const -{ - return new wxRegionRefData(*(wxRegionRefData *)data); -} - -//----------------------------------------------------------------------------- -//# Modify region -//----------------------------------------------------------------------------- - -bool wxRegion::DoOffset( wxCoord x, wxCoord y ) -{ - if ( !x && !y ) - { - // nothing to do - return true; - } - - AllocExclusive(); - -#if 0 - if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR ) - { - wxLogLastError(wxT("OffsetRgn")); - - return false; - } -#endif - return true; -} - -// -// Clear current region -// -void wxRegion::Clear() -{ - UnRef(); -} // end of wxRegion::Clear - -// -// Union region with this. -// -bool wxRegion::DoCombine( const wxRegion& rRegion, wxRegionOp eOp ) -{ - // - // We can't use the API functions if we don't have a valid region handle - // - if (!m_refData) - { - // combining with an empty/invalid region works differently depending - // on the operation - switch (eOp) - { - case wxRGN_COPY: - case wxRGN_OR: - case wxRGN_XOR: - *this = rRegion; - break; - - default: - wxFAIL_MSG( wxT("unknown region operation") ); - // fall through - - case wxRGN_AND: - case wxRGN_DIFF: - // leave empty/invalid - return false; - } - } - else // we have a valid region - { - - LONG lMode = 0; - - switch (eOp) - { - case wxRGN_AND: - lMode = CRGN_AND; - break; - - case wxRGN_OR: - lMode = CRGN_OR; - break; - - case wxRGN_XOR: - lMode = CRGN_XOR; - break; - - case wxRGN_DIFF: - lMode = CRGN_DIFF; - break; - - case wxRGN_COPY: - default: - lMode = CRGN_COPY; - break; - } - return (::GpiCombineRegion( ((wxRegionRefData*)rRegion.m_refData)->m_hPS - ,M_REGION - ,M_REGION - ,((wxRegionRefData*)rRegion.m_refData)->m_hRegion - ,lMode - ) != RGN_ERROR); - } - return true; -} // end of wxRegion::Combine - -//----------------------------------------------------------------------------- -//# Information on region -//----------------------------------------------------------------------------- - -bool wxRegion::DoIsEqual(const wxRegion& WXUNUSED(region)) const -{ - return false; -} - -// -// Outer bounds of region -// -bool wxRegion::DoGetBox( - wxCoord& x -, wxCoord& y -, wxCoord& vWidth -, wxCoord& vHeight -) const -{ - if (m_refData) - { - RECTL vRect; - APIRET rc; - - rc = ::GpiQueryRegionBox( ((wxRegionRefData*)m_refData)->m_hPS - ,M_REGION - ,&vRect - ); - x = vRect.xLeft; - y = vRect.yBottom; - vWidth = vRect.xRight - vRect.xLeft; - vHeight = vRect.yTop - vRect.yBottom; - return true; - } - else - { - x = y = vWidth = vHeight = 0L; - return false; - } -} // end of wxRegion::GetBox - -// -// Is region empty? -// -bool wxRegion::IsEmpty() const -{ - wxCoord x; - wxCoord y; - wxCoord vWidth; - wxCoord vHeight; - - if (M_REGION == 0) - return true; - - GetBox( x - ,y - ,vWidth - ,vHeight - ); - return ((vWidth == 0) && (vHeight == 0)); -} // end of wxRegion::IsEmpty - -//----------------------------------------------------------------------------- -// Tests -//----------------------------------------------------------------------------- -// -// Does the region contain the point pt? -// -wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const -{ - POINTL vPoint = { x, y }; - - if (!m_refData) - return wxOutRegion; - - LONG lInside = ::GpiPtInRegion( ((wxRegionRefData*)m_refData)->m_hPS, - M_REGION, - &vPoint - ); - if (lInside == PRGN_INSIDE) - return wxInRegion; - else - return wxOutRegion; -} // end of wxRegion::Contains - -// -// Does the region contain the rectangle (x, y, w, h)? -// -wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const -{ - if (!m_refData) - return wxOutRegion; - - RECTL vRect; - vRect.xLeft = rect.x; - vRect.xRight = rect.x + rect.width; - vRect.yTop = rect.y + rect.height; - vRect.yBottom = rect.y; - - LONG lInside = ::GpiRectInRegion( ((wxRegionRefData*)m_refData)->m_hPS, - M_REGION, - &vRect - ); - switch (lInside) - { - case RRGN_INSIDE : return wxInRegion; - case RRGN_PARTIAL : return wxPartRegion; - case RRGN_ERROR : - default : return wxOutRegion; - } - -} // end of wxRegion::Contains - -// -// Get internal region handle -// -WXHRGN wxRegion::GetHRGN() const -{ - if (!m_refData) - return (WXHRGN) 0; - return (WXHRGN) M_REGION; -} - -// -// Set a new PS, this means we have to recreate the old region in the new -// PS -// -void wxRegion::SetPS( - HPS hPS -) -{ - RGNRECT vRgnData; - PRECTL pRect = NULL; - - vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT; - if (::GpiQueryRegionRects( ((wxRegionRefData*)m_refData)->m_hPS - ,((wxRegionRefData*)m_refData)->m_hRegion - ,NULL - ,&vRgnData - ,NULL - )) - { - pRect = new RECTL[vRgnData.crcReturned]; - vRgnData.crc = vRgnData.crcReturned; - vRgnData.ircStart = 1; - if (::GpiQueryRegionRects( ((wxRegionRefData*)m_refData)->m_hPS - ,((wxRegionRefData*)m_refData)->m_hRegion - ,NULL - ,&vRgnData - ,pRect - )) - { - // - // First destroy the region out of the old PS - // and then create it in the new and set the new to current - // - ::GpiDestroyRegion( ((wxRegionRefData*)m_refData)->m_hPS - ,M_REGION - ); - ((wxRegionRefData*)m_refData)->m_hRegion = ::GpiCreateRegion( hPS - ,vRgnData.crcReturned - ,pRect - ); - ((wxRegionRefData*)m_refData)->m_hPS = hPS; - } - delete [] pRect; - } -} // end of wxRegion::SetPS - -/////////////////////////////////////////////////////////////////////////////// -// // -// wxRegionIterator // -// // -/////////////////////////////////////////////////////////////////////////////// - -// -// Initialize empty iterator -// -wxRegionIterator::wxRegionIterator() -: m_lCurrent(0) -, m_lNumRects(0) -, m_pRects(NULL) -{ -} // end of wxRegionIterator::wxRegionIterator - -wxRegionIterator::~wxRegionIterator() -{ - if (m_pRects) - delete[] m_pRects; -} // end of wxRegionIterator::~wxRegionIterator - -// -// Initialize iterator for region -// -wxRegionIterator::wxRegionIterator( - const wxRegion& rRegion -) -{ - m_pRects = NULL; - Reset(rRegion); -} // end of wxRegionIterator::wxRegionIterator - -// -// Reset iterator for a new /e region. -// -void wxRegionIterator::Reset( - const wxRegion& rRegion -) -{ - m_lCurrent = 0; - m_lNumRects = 0; - m_vRegion = rRegion; - - if (m_pRects) - delete[] m_pRects; - - m_pRects = NULL; - - if (m_vRegion.Empty()) - m_lNumRects = 0; - else - { - RGNRECT vRgnData; - PRECTL pRect; - - vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT; - if (::GpiQueryRegionRects( ((wxRegionRefData*)rRegion.m_refData)->m_hPS // Pres space - ,((wxRegionRefData*)rRegion.m_refData)->m_hRegion // Handle of region to query - ,NULL // Return all RECTs - ,&vRgnData // Will contain number or RECTs in region - ,NULL // NULL to return number of RECTs - )) - { - pRect = new RECTL[vRgnData.crcReturned]; - m_pRects = new wxRect[vRgnData.crcReturned]; - vRgnData.crc = vRgnData.crcReturned; - m_lNumRects = vRgnData.crcReturned; - vRgnData.ircStart = 1; - if (::GpiQueryRegionRects( ((wxRegionRefData*)rRegion.m_refData)->m_hPS // Pres space of source - ,((wxRegionRefData*)rRegion.m_refData)->m_hRegion // Handle of source region - ,NULL // Return all RECTs - ,&vRgnData // Operations set to return rects - ,pRect // Will contain the actual RECTS - )) - { -#if 0 - M_REGION = ::GpiCreateRegion( ((wxRegionRefData*)rRegion.m_refData)->m_hPS - ,vRgnData.crcReturned - ,pRect - ); -#endif - for( LONG i = 0; i < m_lNumRects; i++) - { - m_pRects[i].x = pRect[i].xLeft; - m_pRects[i].width = pRect[i].xRight - pRect[i].xLeft; - m_pRects[i].y = pRect[i].yBottom; - m_pRects[i].height = pRect[i].yTop - pRect[i].yBottom; - } -#if 0 - ((wxRegionRefData*)m_refData)->m_hPS = ((wxRegionRefData*)rRegion.m_refData)->m_hPS; -#endif - } - } - } -} // end of wxRegionIterator::Reset - -// -// Increment iterator. The rectangle returned is the one after the -// incrementation. -// -void wxRegionIterator::operator++ () -{ - if (m_lCurrent < m_lNumRects) - ++m_lCurrent; -} // end of wxRegionIterator::operator ++ - -// -// Increment iterator. The rectangle returned is the one before the -// incrementation. -// -void wxRegionIterator::operator++ (int) -{ - if (m_lCurrent < m_lNumRects) - ++m_lCurrent; -} // end of wxRegionIterator::operator++ - -wxCoord wxRegionIterator::GetX() const -{ - if (m_lCurrent < m_lNumRects) - return m_pRects[m_lCurrent].x; - return 0L; -} // end of wxRegionIterator::GetX - -wxCoord wxRegionIterator::GetY() const -{ - if (m_lCurrent < m_lNumRects) - return m_pRects[m_lCurrent].y; - return 0L; -} // end of wxRegionIterator::GetY - -wxCoord wxRegionIterator::GetW() const -{ - if (m_lCurrent < m_lNumRects) - return m_pRects[m_lCurrent].width ; - return 0L; -} // end of wxRegionIterator::GetW - -wxCoord wxRegionIterator::GetH() const -{ - if (m_lCurrent < m_lNumRects) - return m_pRects[m_lCurrent].height; - return 0L; -} // end of wxRegionIterator::GetH diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp deleted file mode 100644 index fbb1fb2e9a..0000000000 --- a/src/os2/scrolbar.cpp +++ /dev/null @@ -1,297 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/scrolbar.cpp -// Purpose: wxScrollBar -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/scrolbar.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" -#endif - -#include "wx/os2/private.h" - -// Scrollbar -bool wxScrollBar::Create(wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, -#if wxUSE_VALIDATORS - const wxValidator& rValidator, -#endif - const wxString& rsName - ) -{ - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - - if (!pParent) - return false; - - pParent->AddChild(this); - SetName(rsName); -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - SetBackgroundColour(pParent->GetBackgroundColour()) ; - SetForegroundColour(pParent->GetForegroundColour()) ; - - if (vId == wxID_ANY) - m_windowId = (int)NewControlId(); - else - m_windowId = vId; - - if (nWidth == wxDefaultCoord) - { - if (lStyle & wxHORIZONTAL) - nWidth = 140; - else - nWidth = 14; - } - if (nHeight == wxDefaultCoord) - { - if (lStyle & wxVERTICAL) - nHeight = 140; - else - nHeight = 14; - } - - DWORD dwStyle = WS_VISIBLE; - - if (GetWindowStyleFlag() & wxCLIP_SIBLINGS) - dwStyle |= WS_CLIPSIBLINGS; - - DWORD dwDirection = (lStyle & wxHORIZONTAL) ? SBS_HORZ: SBS_VERT; - - HWND hScrollBar = ::WinCreateWindow( (HWND)GetHwndOf(pParent) - ,WC_SCROLLBAR - ,(PSZ)NULL - ,dwDirection | dwStyle - ,0, 0, 0, 0 - ,(HWND)GetHwndOf(pParent) - ,HWND_TOP - ,(HMENU)m_windowId - ,NULL - ,NULL - ); - - m_nPageSize = 1; - m_nViewSize = 1; - m_nObjectSize = 1; - ::WinSendMsg( hScrollBar - ,SBM_SETSCROLLBAR - ,(MPARAM)0 - ,MPFROM2SHORT(0,1) - ); - ::WinShowWindow( hScrollBar, TRUE ); - SetFont(*wxSMALL_FONT); - - m_hWnd = hScrollBar; - - // - // Subclass again for purposes of dialog editing mode - // - SubclassWin((WXHWND)hScrollBar); - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - return true; -} // end of wxScrollBar::Create - -wxScrollBar::~wxScrollBar() -{ -} - -bool wxScrollBar::OS2OnScroll ( int WXUNUSED(nOrientation), - WXWORD wParam, - WXWORD wPos, - WXHWND WXUNUSED(hControl) ) -{ - int nPosition; - int nMaxPos; - int nTrackPos = wPos; - int nMinPos; - int nScrollInc; - wxEventType vScrollEvent = wxEVT_NULL; - - MRESULT vRange; - - // - // When we're dragging the scrollbar we can't use pos parameter because it - // is limited to 16 bits - // - if (wParam == SB_SLIDERPOSITION || wParam == SB_SLIDERTRACK) - { - SBCDATA vScrollInfo; - - vScrollInfo.sHilite = SB_SLIDERTRACK; - - ::WinSendMsg((HWND)GetHwnd(), WM_QUERYWINDOWPARAMS, (PVOID)&vScrollInfo, NULL); - - nTrackPos = vScrollInfo.posThumb; - nPosition = vScrollInfo.posFirst; - nMaxPos = vScrollInfo.posLast; - } - else - { - nPosition = (int)(MRESULT)::WinSendMsg((HWND)GetHwnd(), SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL); - vRange = ::WinSendMsg((HWND)GetHwnd(), SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL); - nMinPos = SHORT1FROMMR(vRange); - nMaxPos = SHORT2FROMMR(vRange); - } - // - // A page size greater than one has the effect of reducing the effective - // range, therefore the range has already been boosted artificially - so - // reduce it again. - // - if (m_nPageSize > 1) - nMaxPos -= (m_nPageSize - 1); - switch (wParam) - { - case SB_LINEUP: - nScrollInc = -1; - vScrollEvent = wxEVT_SCROLL_LINEUP; - break; - - case SB_LINEDOWN: - nScrollInc = 1; - vScrollEvent = wxEVT_SCROLL_LINEDOWN; - break; - - case SB_PAGEUP: - nScrollInc = -GetPageSize(); - vScrollEvent = wxEVT_SCROLL_PAGEUP; - break; - - case SB_PAGEDOWN: - nScrollInc = GetPageSize(); - vScrollEvent = wxEVT_SCROLL_PAGEDOWN; - break; - - case SB_SLIDERTRACK: - nScrollInc = nTrackPos - nPosition; - vScrollEvent = wxEVT_SCROLL_THUMBTRACK; - break; - - case SB_ENDSCROLL: - nScrollInc = 0; - vScrollEvent = wxEVT_SCROLL_CHANGED; - break; - - default: - nScrollInc = 0; - } - if (nScrollInc) - { - nPosition += nScrollInc; - - if (nPosition < 0) - nPosition = 0; - if (nPosition > nMaxPos) - nPosition = nMaxPos; - SetThumbPosition(nPosition); - } - else if ( vScrollEvent != wxEVT_SCROLL_THUMBRELEASE && - vScrollEvent != wxEVT_SCROLL_CHANGED - ) - { - // - // Don't process the event if there is no displacement, - // unless this is a thumb release or end scroll event. - // - return false; - } - - wxScrollEvent vEvent( vScrollEvent - ,m_windowId - ); - - vEvent.SetOrientation(IsVertical() ? wxVERTICAL : wxHORIZONTAL); - vEvent.SetPosition(nPosition); - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxScrollBar::OS2OnScroll - -void wxScrollBar::SetThumbPosition ( int nViewStart ) -{ - SBCDATA vInfo; - - memset(&vInfo, '\0', sizeof(SBCDATA)); - vInfo.cb = sizeof(SBCDATA); - vInfo.posThumb = (SHORT)nViewStart; - - ::WinSendMsg((HWND)GetHwnd(), WM_SETWINDOWPARAMS, (MPARAM)&vInfo, (MPARAM)NULL); - ::WinSendMsg((HWND)GetHwnd(), SBM_SETPOS, (MPARAM)nViewStart, (MPARAM)NULL); -} // end of wxScrollBar::SetThumbPosition - -int wxScrollBar::GetThumbPosition() const -{ - return((int)(MRESULT)::WinSendMsg((HWND)GetHwnd(), SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL)); -} // end of wxScrollBar::GetThumbPosition - -void wxScrollBar::SetScrollbar ( int nPosition, - int nThumbSize, - int nRange, - int nPageSize, - bool WXUNUSED(bRefresh) ) -{ - SBCDATA vInfo; - // - // The lRange (number of scroll steps) is the - // object length minus the page size. - // - int nRange1 = wxMax((m_nObjectSize - m_nPageSize), 0); - - m_nViewSize = nPageSize; - m_nPageSize = nThumbSize; - m_nObjectSize = nRange; - - - // - // Try to adjust the lRange to cope with page size > 1 - // (see comment for SetPageLength) - // - if (m_nPageSize > 1 ) - { - nRange1 += (m_nPageSize - 1); - } - vInfo.cb = sizeof(SBCDATA); - vInfo.cVisible = (SHORT)m_nPageSize; - vInfo.posFirst = 0; - vInfo.posLast = (SHORT)nRange1; - vInfo.posThumb = (SHORT)nPosition; - - ::WinSendMsg((HWND)GetHwnd(), WM_SETWINDOWPARAMS, (MPARAM)&vInfo, (MPARAM)NULL); -} // end of wxScrollBar::SetScrollbar - -WXHBRUSH wxScrollBar::OnCtlColor ( WXHDC WXUNUSED(hDC), - WXHWND WXUNUSED(hWnd), - WXUINT WXUNUSED(uCtlColor), - WXUINT WXUNUSED(uMessage), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam) ) -{ - // - // Does nothing under OS/2 - // - return 0; -} // end of wxScrollBar::OnCtlColor - -void wxScrollBar::Command ( wxCommandEvent& rEvent ) -{ - SetThumbPosition(rEvent.GetInt()); - ProcessCommand(rEvent); -} // end of wxScrollBar::Command diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp deleted file mode 100644 index 00c39ebab1..0000000000 --- a/src/os2/settings.cpp +++ /dev/null @@ -1,337 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/settings.cpp -// Purpose: wxSettings -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include - #include "wx/pen.h" - #include "wx/brush.h" - #include "wx/gdicmn.h" - #include "wx/window.h" - #include "wx/settings.h" - #include "wx/module.h" -#endif - -#include "wx/fontutil.h" - -#include "wx/os2/private.h" - -// the module which is used to clean up wxSystemSettings data (this is a -// singleton class so it can't be done in the dtor) -class wxSystemSettingsModule : public wxModule -{ - friend class wxSystemSettings; -public: - virtual bool OnInit(); - virtual void OnExit(); - -private: - DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule) - - static wxArrayString sm_optionNames; - static wxArrayString sm_optionValues; -}; - -// ---------------------------------------------------------------------------- -// global data -// ---------------------------------------------------------------------------- - -static wxFont *gs_fontDefault = NULL; - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxSystemSettingsModule -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule) - -wxArrayString wxSystemSettingsModule::sm_optionNames; -wxArrayString wxSystemSettingsModule::sm_optionValues; - -bool wxSystemSettingsModule::OnInit() -{ - return true; -} - -void wxSystemSettingsModule::OnExit() -{ - sm_optionNames.Clear(); - sm_optionValues.Clear(); - wxDELETE(gs_fontDefault); -} - -wxColour wxSystemSettingsNative::GetColour( - wxSystemColour nIndex -) -{ - COLORREF vRef; - wxColour vCol; - LONG vSysClr; - switch (nIndex) - { - // - // PM actually has values for these - // - case wxSYS_COLOUR_WINDOW: - vSysClr = SYSCLR_WINDOW; - break; - - case wxSYS_COLOUR_WINDOWFRAME: - vSysClr = SYSCLR_WINDOWFRAME; - break; - - case wxSYS_COLOUR_MENUTEXT: - vSysClr = SYSCLR_MENUTEXT; - break; - - case wxSYS_COLOUR_MENUHILIGHT: - vSysClr = SYSCLR_MENUHILITE; - break; - - case wxSYS_COLOUR_BTNFACE: - vSysClr = SYSCLR_BUTTONMIDDLE; - break; - - case wxSYS_COLOUR_BTNSHADOW: - vSysClr = SYSCLR_BUTTONDARK; - break; - - case wxSYS_COLOUR_BTNHIGHLIGHT: - vSysClr = SYSCLR_BUTTONLIGHT; - break; - - case wxSYS_COLOUR_BACKGROUND: - vSysClr = SYSCLR_BACKGROUND; - break; - - case wxSYS_COLOUR_APPWORKSPACE: - vSysClr = SYSCLR_APPWORKSPACE; - break; - - case wxSYS_COLOUR_MENUBAR: - case wxSYS_COLOUR_MENU: - vSysClr = SYSCLR_MENU; - break; - - case wxSYS_COLOUR_INACTIVECAPTION: - vSysClr = SYSCLR_INACTIVETITLE; - break; - - case wxSYS_COLOUR_INACTIVEBORDER: - vSysClr = SYSCLR_INACTIVEBORDER; - break; - - case wxSYS_COLOUR_LISTBOX: - vSysClr = SYSCLR_ENTRYFIELD; - break; - - case wxSYS_COLOUR_CAPTIONTEXT: - vSysClr = SYSCLR_TITLETEXT; - break; - - case wxSYS_COLOUR_INACTIVECAPTIONTEXT: - vSysClr = SYSCLR_INACTIVETITLETEXT; - break; - - case wxSYS_COLOUR_WINDOWTEXT: - case wxSYS_COLOUR_BTNTEXT: - vSysClr = SYSCLR_WINDOWTEXT; - break; - - case wxSYS_COLOUR_INFOTEXT: - vSysClr = SYSCLR_HELPTEXT; - break; - - case wxSYS_COLOUR_ACTIVECAPTION: - vSysClr = SYSCLR_ACTIVETITLE; - break; - - case wxSYS_COLOUR_ACTIVEBORDER: - vSysClr = SYSCLR_ACTIVEBORDER; - break; - - case wxSYS_COLOUR_HIGHLIGHT: - vSysClr = SYSCLR_HILITEBACKGROUND; - break; - - case wxSYS_COLOUR_SCROLLBAR: - vSysClr = SYSCLR_SCROLLBAR; - break; - - case wxSYS_COLOUR_HIGHLIGHTTEXT: - case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT: - vSysClr = SYSCLR_HILITEFOREGROUND; - break; - - case wxSYS_COLOUR_INFOBK: - vSysClr = SYSCLR_HELPBACKGROUND; - break; - - // Don't know what these should be, so leave them grey (normally) - case wxSYS_COLOUR_GRAYTEXT: - case wxSYS_COLOUR_3DDKSHADOW: - case wxSYS_COLOUR_3DLIGHT: - case wxSYS_COLOUR_HOTLIGHT: - case wxSYS_COLOUR_GRADIENTACTIVECAPTION: - case wxSYS_COLOUR_GRADIENTINACTIVECAPTION: - vSysClr = SYSCLR_BUTTONMIDDLE; - break; - - default: - vSysClr = SYSCLR_WINDOW; - break; - } - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP, - vSysClr, - 0L ); - vCol.Set( GetRValue(vRef), - GetGValue(vRef), - GetBValue(vRef) ); - return(vCol); -} // end of wxSystemSettingsNative::GetColour - -// ---------------------------------------------------------------------------- -// fonts -// ---------------------------------------------------------------------------- - -wxFont wxSystemSettingsNative::GetFont( - wxSystemFont index -) -{ - const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT; - if ( isDefaultRequested ) - { - if ( gs_fontDefault ) - return *gs_fontDefault; - } - - wxFont font; - // FIXME: The mapping could be improved and also OS/2 system fonts - // should be taken into account e.g. by using PrfQueryProfileString - // to look for PM_System_Fonts in HINI_USERPROFILE. - // FIXME2: Creating a font from the native font info does not - // seem to work properly. - switch (index) - { - case wxSYS_SYSTEM_FIXED_FONT: - case wxSYS_OEM_FIXED_FONT: - case wxSYS_ANSI_FIXED_FONT: - font.Create( 10, - wxFONTFAMILY_TELETYPE, - wxFONTSTYLE_NORMAL, - wxFONTWEIGHT_NORMAL ); - break; - case wxSYS_ANSI_VAR_FONT: - font.Create( 10, - wxFONTFAMILY_MODERN, - wxFONTSTYLE_NORMAL, - wxFONTWEIGHT_NORMAL ); - break; - case wxSYS_SYSTEM_FONT: - case wxSYS_DEFAULT_GUI_FONT: - font.Create( 10, - wxFONTFAMILY_SWISS, - wxFONTSTYLE_NORMAL, - wxFONTWEIGHT_NORMAL ); - break; - default: - wxFAIL_MSG( wxT("stock font not found") ); - return GetFont(wxSYS_ANSI_VAR_FONT); - } - - - if ( isDefaultRequested ) - { - // if we got here it means we hadn't cached it yet - do now - gs_fontDefault = new wxFont(font); - } - - return font; -} - -// Get a system metric, e.g. scrollbar size -int wxSystemSettingsNative::GetMetric( wxSystemMetric index, - wxWindow* WXUNUSED(win) ) -{ - switch ( index) - { - // TODO case wxSYS_MOUSE_BUTTONS: - // TODO case wxSYS_BORDER_X: - // TODO case wxSYS_BORDER_Y: - // TODO case wxSYS_CURSOR_X: - // TODO case wxSYS_CURSOR_Y: - // TODO case wxSYS_DCLICK_X: - // TODO case wxSYS_DCLICK_Y: - // TODO case wxSYS_DRAG_X: - // TODO case wxSYS_DRAG_Y: - // TODO case wxSYS_EDGE_X: - // TODO case wxSYS_EDGE_Y: - // TODO case wxSYS_HSCROLL_ARROW_X: - // TODO case wxSYS_HSCROLL_ARROW_Y: - // TODO case wxSYS_HTHUMB_X: - // TODO case wxSYS_ICON_X: - // TODO case wxSYS_ICON_Y: - // TODO case wxSYS_ICONSPACING_X: - // TODO case wxSYS_ICONSPACING_Y: - // TODO case wxSYS_WINDOWMIN_X: - // TODO case wxSYS_WINDOWMIN_Y: - - case wxSYS_SCREEN_X: - return ::WinQuerySysValue(HWND_DESKTOP,SV_CXSCREEN); - case wxSYS_SCREEN_Y: - return ::WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN); - - // TODO case wxSYS_FRAMESIZE_X: - // TODO case wxSYS_FRAMESIZE_Y: - // TODO case wxSYS_SMALLICON_X: - // TODO case wxSYS_SMALLICON_Y: - - case wxSYS_HSCROLL_Y: - return ::WinQuerySysValue(HWND_DESKTOP,SV_CYHSCROLL); - case wxSYS_VSCROLL_X: - return ::WinQuerySysValue(HWND_DESKTOP,SV_CXVSCROLL); - - // TODO case wxSYS_VSCROLL_ARROW_X: - // TODO case wxSYS_VSCROLL_ARROW_Y: - // TODO case wxSYS_VTHUMB_Y: - // TODO case wxSYS_CAPTION_Y: - // TODO case wxSYS_MENU_Y: - // TODO case wxSYS_NETWORK_PRESENT: - // TODO case wxSYS_PENWINDOWS_PRESENT: - // TODO case wxSYS_SHOW_SOUNDS: - // TODO case wxSYS_SWAP_BUTTONS: - - default: - break; - } - return -1; // unsupported metric -} - -bool wxSystemSettingsNative::HasFeature( wxSystemFeature index ) -{ - switch (index) - { - case wxSYS_CAN_ICONIZE_FRAME: - return true; - - // TODO case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - // TODO case wxSYS_TABLET_PRESENT: - - default: - break; - } - - return false; -} diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp deleted file mode 100644 index 5537d730c0..0000000000 --- a/src/os2/slider.cpp +++ /dev/null @@ -1,1153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/slider.cpp -// Purpose: wxSlider -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include - #include "wx/utils.h" - #include "wx/brush.h" - #include "wx/scrolwin.h" -#endif - -#if wxUSE_SLIDER - -#include "wx/slider.h" -#include "wx/os2/private.h" - -wxSlider::wxSlider() -{ - m_hStaticValue = 0L; - m_hStaticMin = 0L; - m_hStaticMax = 0L; - m_nPageSize = 1; - m_nLineSize = 1; - m_nRangeMax = 0; - m_nRangeMin = 0; - m_nTickFreq = 0; -} // end of wxSlider::wxSlider - -wxSlider::~wxSlider() -{ - if (m_hStaticMin) - ::WinDestroyWindow((HWND)m_hStaticMin); - if (m_hStaticMax) - ::WinDestroyWindow((HWND)m_hStaticMax); - if (m_hStaticValue) - ::WinDestroyWindow((HWND)m_hStaticValue); -} // end of wxSlider::~wxSlider - -void wxSlider::AdjustSubControls( int nX, - int nY, - int nWidth, - int nHeight, - int WXUNUSED(nSizeFlags) ) -{ - int nXOffset = nX; - int nYOffset = nY; - int nCx; // slider,min,max sizes - int nCy; - int nCyf; - wxChar zBuf[300]; - wxFont vFont = this->GetFont(); - - wxGetCharSize( GetHWND() - ,&nCx - ,&nCy - ,&vFont - ); - - if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL) - { - if (m_windowStyle & wxSL_LABELS ) - { - int nMinLen = 0; - int nMaxLen = 0; - - ::WinQueryWindowText((HWND)m_hStaticMin, 300, (PSZ)zBuf); - GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &vFont); - - ::WinQueryWindowText((HWND)m_hStaticMax, 300, (PSZ)zBuf); - GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &vFont); - - if (m_hStaticValue) - { - int nNewWidth = wxMax(nMinLen, nMaxLen); - int nValueHeight = nCyf; - - ::WinSetWindowPos( (HWND)m_hStaticValue - ,HWND_TOP - ,(LONG)nXOffset - (nNewWidth + nCx + nMinLen + nCx) - ,(LONG)nYOffset - ,(LONG)nNewWidth - ,(LONG)nValueHeight - ,SWP_SIZE | SWP_MOVE - ); - } - ::WinSetWindowPos( (HWND)m_hStaticMin - ,HWND_TOP - ,(LONG)nXOffset - (nMinLen + nCx) - ,(LONG)nYOffset - ,(LONG)nMinLen - ,(LONG)nCyf - ,SWP_SIZE | SWP_MOVE - ); - nXOffset += nWidth + nCx; - - ::WinSetWindowPos( (HWND)m_hStaticMax - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset - ,(LONG)nMaxLen - ,(LONG)nCyf - ,SWP_ZORDER | SWP_SHOW - ); - } - } - else - { - // - // Now deal with a vertical slider - // - - if (m_windowStyle & wxSL_LABELS ) - { - int nMinLen = 0; - int nMaxLen = 0; - - ::WinQueryWindowText((HWND)m_hStaticMin, 300, (PSZ)zBuf); - GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &vFont); - - ::WinQueryWindowText((HWND)m_hStaticMax, 300, (PSZ)zBuf); - GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &vFont); - - if (m_hStaticValue) - { - int nNewWidth = (wxMax(nMinLen, nMaxLen)); - - ::WinSetWindowPos( (HWND)m_hStaticValue - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset + nHeight + nCyf - ,(LONG)nNewWidth - ,(LONG)nCyf - ,SWP_SIZE | SWP_MOVE - ); - } - ::WinSetWindowPos( (HWND)m_hStaticMax - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset + nHeight - ,(LONG)nMaxLen - ,(LONG)nCyf - ,SWP_SIZE | SWP_MOVE - ); - ::WinSetWindowPos( (HWND)m_hStaticMin - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset - nCyf - ,(LONG)nMinLen - ,(LONG)nCyf - ,SWP_SIZE | SWP_MOVE - ); - } - } -} // end of wxSlider::AdjustSubControls - -void wxSlider::ClearSel() -{ -} // end of wxSlider::ClearSel - -void wxSlider::ClearTicks() -{ -} // end of wxSlider::ClearTicks - -void wxSlider::Command ( - wxCommandEvent& rEvent -) -{ - SetValue(rEvent.GetInt()); - ProcessCommand(rEvent); -} // end of wxSlider::Command - -bool wxSlider::ContainsHWND( - WXHWND hWnd -) const -{ - return ( hWnd == GetStaticMin() || - hWnd == GetStaticMax() || - hWnd == GetEditValue() - ); -} // end of wxSlider::ContainsHWND - -bool wxSlider::Create( - wxWindow* pParent -, wxWindowID vId -, int nValue -, int nMinValue -, int nMaxValue -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) -{ - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - long lMsStyle = 0L; - long lWstyle = 0L; - - SetName(rsName); -#if wxUSE_VALIDATORS - SetValidator(rValidator); -#endif - if (pParent) - pParent->AddChild(this); - SetBackgroundColour(pParent->GetBackgroundColour()) ; - SetForegroundColour(pParent->GetForegroundColour()) ; - - m_hStaticValue = 0L; - m_hStaticMin = 0L; - m_hStaticMax = 0L; - m_nPageSize = 1; - m_nLineSize = 1; - m_windowStyle = lStyle; - m_nTickFreq = 0; - - if (vId == wxID_ANY) - m_windowId = (int)NewControlId(); - else - m_windowId = vId; - - if (m_windowStyle & wxCLIP_SIBLINGS ) - lMsStyle |= WS_CLIPSIBLINGS; - - if (m_windowStyle & wxSL_LABELS) - { - lMsStyle |= WS_VISIBLE | SS_TEXT | DT_VCENTER; - - m_hStaticValue = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,WC_STATIC // Window class - ,(PSZ)NULL // Initial Text - ,(ULONG)lMsStyle // Style flags - ,0L, 0L, 0L, 0L // Origin -- 0 size - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(ULONG)NewControlId() // Window identifier - ,NULL // no control data - ,NULL // no Presentation parameters - ); - - // - // Now create min static control - // - wxSprintf(wxBuffer, wxT("%d"), nMinValue); - lWstyle = SS_TEXT|DT_LEFT|WS_VISIBLE; - if (m_windowStyle & wxCLIP_SIBLINGS) - lWstyle |= WS_CLIPSIBLINGS; - - m_hStaticMin = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,WC_STATIC // Window class - ,(PSZ)wxBuffer // Initial Text - ,(ULONG)lWstyle // Style flags - ,0L, 0L, 0L, 0L // Origin -- 0 size - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(ULONG)NewControlId() // Window identifier - ,NULL // no control data - ,NULL // no Presentation parameters - ); - } - lMsStyle = 0; - - SLDCDATA vSlData; - - vSlData.cbSize = sizeof(SLDCDATA); - if (m_windowStyle & wxSL_VERTICAL) - lMsStyle = SLS_VERTICAL | SLS_HOMEBOTTOM | WS_VISIBLE | WS_TABSTOP; - else - lMsStyle = SLS_HORIZONTAL | SLS_HOMELEFT | WS_VISIBLE | WS_TABSTOP; - - if (m_windowStyle & wxCLIP_SIBLINGS) - lMsStyle |= WS_CLIPSIBLINGS; - - if (m_windowStyle & wxSL_AUTOTICKS) - { - vSlData.usScale1Spacing = 0; - vSlData.usScale2Spacing = 0; - } - - if (m_windowStyle & wxSL_LEFT) - lMsStyle |= SLS_PRIMARYSCALE2; // if SLS_VERTICAL then SCALE2 is to the left - else if (m_windowStyle & wxSL_RIGHT) - lMsStyle |= SLS_PRIMARYSCALE1; // if SLS_VERTICAL then SCALE2 is to the right - else if (m_windowStyle & wxSL_TOP) - lMsStyle |= SLS_PRIMARYSCALE1; // if SLS_HORIZONTAL then SCALE1 is to the top - else if (m_windowStyle & wxSL_BOTTOM ) - lMsStyle |= SLS_PRIMARYSCALE2; // if SLS_HORIZONTAL then SCALE1 is to the bottom - else if ( m_windowStyle & wxSL_BOTH ) - lMsStyle |= SLS_PRIMARYSCALE1 | SLS_PRIMARYSCALE2; - else - lMsStyle |= SLS_PRIMARYSCALE2; - lMsStyle |= SLS_RIBBONSTRIP; - - m_nPageSize = ((nMaxValue - nMinValue)/10); - vSlData.usScale1Increments = (USHORT)m_nPageSize; - vSlData.usScale2Increments = (USHORT)m_nPageSize; - - HWND hScrollBar = ::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,WC_SLIDER // Window class - ,(PSZ)wxBuffer // Initial Text - ,(ULONG)lMsStyle // Style flags - ,0L, 0L, 0L, 0L // Origin -- 0 size - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_BOTTOM // initial z position - ,(HMENU)m_windowId // Window identifier - ,&vSlData // Slider control data - ,NULL // no Presentation parameters - ); - m_nRangeMax = nMaxValue; - m_nRangeMin = nMinValue; - - // - // Set the size of the ticks ... default to 6 pixels - // - ::WinSendMsg( hScrollBar - ,SLM_SETTICKSIZE - ,MPFROM2SHORT(SMA_SETALLTICKS, (USHORT)12) - ,NULL - ); - // - // Set the position to the initial value - // - ::WinSendMsg( hScrollBar - ,SLM_SETSLIDERINFO - ,MPFROM2SHORT(SMA_SLIDERARMPOSITION, SMA_RANGEVALUE) - ,(MPARAM)nValue - ); - - m_hWnd = (WXHWND)hScrollBar; - SubclassWin(GetHWND()); - ::WinSetWindowText((HWND)m_hWnd, ""); - - SetFont(*wxSMALL_FONT); - if (m_windowStyle & wxSL_LABELS) - { - // - // Finally, create max value static item - // - wxSprintf(wxBuffer, wxT("%d"), nMaxValue); - lWstyle = SS_TEXT|DT_LEFT|WS_VISIBLE; - if (m_windowStyle & wxCLIP_SIBLINGS) - lMsStyle |= WS_CLIPSIBLINGS; - - m_hStaticMax = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,WC_STATIC // Window class - ,(PSZ)wxBuffer // Initial Text - ,(ULONG)lWstyle // Style flags - ,0L, 0L, 0L, 0L // Origin -- 0 size - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(ULONG)NewControlId() // Window identifier - ,NULL // no control data - ,NULL // no Presentation parameters - ); - if (GetFont().IsOk()) - { - if (GetFont().GetResourceHandle()) - { - if (m_hStaticMin) - wxOS2SetFont( m_hStaticMin - ,GetFont() - ); - if (m_hStaticMax) - wxOS2SetFont( m_hStaticMax - ,GetFont() - ); - if (m_hStaticValue) - wxOS2SetFont( m_hStaticValue - ,GetFont() - ); - } - } - } - - SetXComp(0); - SetYComp(0); - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - m_nThumbLength = SHORT1FROMMR(::WinSendMsg( GetHwnd() - ,SLM_QUERYSLIDERINFO - ,MPFROM2SHORT( SMA_SLIDERARMDIMENSIONS - ,SMA_RANGEVALUE - ) - ,(MPARAM)0 - ) - ) + 4; // for bordersizes - - wxColour vColour(*wxBLACK); - - LONG lColor = (LONG)vColour.GetPixel(); - - ::WinSetPresParam( m_hStaticMin - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - ::WinSetPresParam( m_hStaticMax - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - ::WinSetPresParam( m_hStaticValue - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - ::WinSetPresParam( m_hWnd - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - lColor = (LONG)m_backgroundColour.GetPixel(); - ::WinSetPresParam( m_hStaticMin - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - ::WinSetPresParam( m_hStaticMax - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - ::WinSetPresParam( m_hStaticValue - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - ::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - vColour.Set(wxString(wxT("BLUE"))); - lColor = (LONG)vColour.GetPixel(); - ::WinSetPresParam( m_hWnd - ,PP_HILITEBACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - SetValue(nValue); - return true; -} // end of wxSlider::Create - -void wxSlider::DoSetSize( int nX, - int nY, - int nWidth, - int nHeight, - int nSizeFlags ) -{ - int nX1 = nX; - int nY1 = nY; - int nWidth1 = nWidth; - int nHeight1 = nHeight; - int nXOffset = nX; - int nYOffset = nY; - int nCx; // slider,min,max sizes - int nCy; - int nCyf; - int nCurrentX; - int nCurrentY; - wxChar zBuf[300]; - wxFont vFont = this->GetFont(); - - // - // Adjust for OS/2's reverse coordinate system - // - wxWindowOS2* pParent = (wxWindowOS2*)GetParent(); - int nUsedHeight = 0; - int nOS2Height = nHeight; - - if (nOS2Height < 0) - nOS2Height = 20; - CacheBestSize(wxSize(nWidth,nOS2Height)); - - if (pParent) - { - int nOS2ParentHeight = GetOS2ParentHeight(pParent); - - nYOffset = nOS2ParentHeight - (nYOffset + nOS2Height); - if (nY != wxDefaultCoord) - nY1 = nOS2ParentHeight - (nY1 + nOS2Height); - } - else - { - RECTL vRect; - - ::WinQueryWindowRect(HWND_DESKTOP, &vRect); - nYOffset = vRect.yTop - (nYOffset + nOS2Height); - if (nY != wxDefaultCoord) - nY1 = vRect.yTop - (nY1 + nOS2Height); - } - m_nSizeFlags = nSizeFlags; - - GetPosition( &nCurrentX, &nCurrentY ); - if (nX == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - nX1 = nCurrentX; - if (nY == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - nY1 = nCurrentY; - - AdjustForParentClientOrigin( nX1 - ,nY1 - ,nSizeFlags - ); - wxGetCharSize( GetHWND() - ,&nCx - ,&nCy - ,&vFont - ); - - if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL) - { - if (m_windowStyle & wxSL_LABELS ) - { - int nMinLen = 0; - int nMaxLen = 0; - - ::WinQueryWindowText((HWND)m_hStaticMin, 300, (PSZ)zBuf); - GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &vFont); - ::WinQueryWindowText((HWND)m_hStaticMax, 300, (PSZ)zBuf); - GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &vFont); - - if (m_hStaticValue) - { - int nNewWidth = (wxMax(nMinLen, nMaxLen)); - int nValueHeight = nCyf; - - ::WinSetWindowPos( (HWND)m_hStaticValue - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset - (LONG)(nCyf * 1.2) - ,(LONG)nNewWidth - ,(LONG)nValueHeight - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - nXOffset += nNewWidth + nCx; - } - ::WinSetWindowPos( (HWND)m_hStaticMin - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset - (LONG)(nCyf * 1.2) - ,(LONG)nMinLen - ,(LONG)nCy - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - nXOffset += nMinLen + nCx; - - int nSliderLength = nWidth1 - nXOffset - nMaxLen - nCx; - int nSliderHeight = nHeight1; - - if (nSliderHeight < 0) - nSliderHeight = 20; - - // - // Slider must have a minimum/default length/height - // - if (nSliderLength < 100) - nSliderLength = 100; - - ::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset - ,(LONG)nSliderLength - ,(LONG)nSliderHeight - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - ::WinQueryWindowPos(GetHwnd(), GetSwp()); - ::WinSendMsg( GetHwnd() - ,SLM_SETSLIDERINFO - ,MPFROM2SHORT( SMA_SHAFTDIMENSIONS - ,0 - ) - ,MPFROMLONG((ULONG)(nSliderHeight/2)) - ); - nXOffset += nSliderLength + nCx; - - ::WinSetWindowPos( (HWND)m_hStaticMax - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset - (LONG)(nCyf * 1.2) - ,(LONG)nMaxLen - ,(LONG)nCy - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - } - else - { - // - // No labels - // If we're prepared to use the existing size, then... - // - if (nWidth == -1 && nHeight == -1 && - ((nSizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) - { - GetSize( &nWidth1 - ,&nHeight1 - ); - } - if (nWidth1 < 0) - nWidth1 = 200; - if (nHeight1 < 0) - nHeight1 = 20; - ::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,(LONG)nX1 - ,(LONG)nY1 - ,(LONG)nWidth1 - ,(LONG)nHeight1 - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - } - } - - // - // Now deal with a vertical slider - // - else - { - if (m_windowStyle & wxSL_LABELS ) - { - int nMinLen; - int nMaxLen; - - ::WinQueryWindowText((HWND)m_hStaticMin, 300, (PSZ)zBuf); - GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &vFont); - ::WinQueryWindowText((HWND)m_hStaticMax, 300, (PSZ)zBuf); - GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &vFont); - if (m_hStaticValue) - { - int nNewWidth = wxMax(nMinLen, nMaxLen); - int nValueHeight = nCyf; - - ::WinSetWindowPos( (HWND)m_hStaticValue - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset + nHeight - ,(LONG)nNewWidth - ,(LONG)nValueHeight - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - nUsedHeight += nCyf; - } - ::WinSetWindowPos( (HWND)m_hStaticMin - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset + nHeight - nCyf - ,(LONG)nMinLen - ,(LONG)nCy - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - nUsedHeight += nCy; - - int nSliderLength = nHeight1 - (nUsedHeight + (2 * nCy)); - int nSliderWidth = nWidth1; - - if (nSliderWidth < 0) - nSliderWidth = 20; - - // - // Slider must have a minimum/default length - // - if (nSliderLength < 100) - nSliderLength = 100; - - ::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset + nCyf - ,(LONG)nSliderWidth - ,(LONG)nSliderLength - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - ::WinQueryWindowPos(GetHwnd(), GetSwp()); - ::WinSendMsg( GetHwnd() - ,SLM_SETSLIDERINFO - ,MPFROM2SHORT( SMA_SHAFTDIMENSIONS - ,0 - ) - ,MPFROMLONG((ULONG)(nSliderWidth/2)) - ); - nUsedHeight += nSliderLength; - ::WinSetWindowPos( (HWND)m_hStaticMax - ,HWND_TOP - ,(LONG)nXOffset - ,(LONG)nYOffset - nCyf - ,(LONG)nMaxLen - ,(LONG)nCy - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - } - else - { - // - // No labels - // If we're prepared to use the existing size, then... - // - if (nWidth == -1 && nHeight == -1 && - ((nSizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) - { - GetSize( &nWidth1 - ,&nHeight1 - ); - } - if (nWidth1 < 0) - nWidth1 = 20; - if (nHeight1 < 0) - nHeight1 = 200; - ::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,(LONG)nX1 - ,(LONG)nY1 - ,(LONG)nWidth1 - ,(LONG)nHeight1 - ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW - ); - } - } -} // end of void wxSlider::DoSetSize - -int wxSlider::GetLineSize() const -{ - return 1; -} // end of wxSlider::GetLineSize - -int wxSlider::GetPageSize() const -{ - return m_nPageSize; -} // end of wxSlider::GetPageSize - -void wxSlider::GetPosition( - int* pnX -, int* pnY -) const -{ - wxWindowOS2* pParent = GetParent(); - RECTL vRect; - - vRect.xLeft = -1; - vRect.xRight = -1; - vRect.yTop = -1; - vRect.yBottom = -1; - wxFindMaxSize( GetHWND() - ,&vRect - ); - - if (m_hStaticMin) - wxFindMaxSize( m_hStaticMin - ,&vRect - ); - if (m_hStaticMax) - wxFindMaxSize( m_hStaticMax - ,&vRect - ); - if (m_hStaticValue) - wxFindMaxSize( m_hStaticValue - ,&vRect - ); - - // - // Since we now have the absolute screen coords, - // if there's a parent we must subtract its top left corner - // - POINTL vPoint; - - vPoint.x = vRect.xLeft; - vPoint.y = vRect.yTop; - - if (pParent) - { - SWP vSwp; - - ::WinQueryWindowPos((HWND)pParent->GetHWND(), &vSwp); - vPoint.x = vSwp.x; - vPoint.y = vSwp.y; - } - - // - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - // - if (GetParent()) - { - wxPoint vPt(GetParent()->GetClientAreaOrigin()); - - vPoint.x -= vPt.x; - vPoint.y -= vPt.y; - } - if (pnX) - *pnX = vPoint.x; - if (pnY) - *pnY = vPoint.y; -} // end of wxSlider::GetPosition - -int wxSlider::GetSelEnd() const -{ - return 0; -} // end of wxSlider::GetSelEnd - -int wxSlider::GetSelStart() const -{ - return 0; -} // end of wxSlider::GetSelStart - -void wxSlider::DoGetSize( - int* pnWidth -, int* pnHeight -) const -{ - GetSize( pnWidth - ,pnHeight - ); -} // end of wxSlider::DoGetSize - -void wxSlider::GetSize( - int* pnWidth -, int* pnHeight -) const -{ - RECTL vRect; - - vRect.xLeft = -1; - vRect.xRight = -1; - vRect.yTop = -1; - vRect.yBottom = -1; - - wxFindMaxSize( GetHWND() - ,&vRect - ); - - if (m_hStaticMin) - wxFindMaxSize( m_hStaticMin - ,&vRect - ); - if (m_hStaticMax) - wxFindMaxSize( m_hStaticMax - ,&vRect - ); - if (m_hStaticValue) - wxFindMaxSize( m_hStaticValue - ,&vRect - ); - if (pnWidth) - *pnWidth = vRect.xRight - vRect.xLeft; - if (pnHeight) - *pnHeight = vRect.yTop - vRect.yBottom; -} // end of wxSlider::GetSize - -int wxSlider::GetThumbLength() const -{ - return m_nThumbLength; -} // end of wxSlider::GetThumbLength - -int wxSlider::GetValue() const -{ - int nPixelRange = SHORT1FROMMR(::WinSendMsg( GetHwnd() - ,SLM_QUERYSLIDERINFO - ,MPFROM2SHORT( SMA_SHAFTDIMENSIONS - ,SMA_RANGEVALUE - ) - ,(MPARAM)0 - ) - ); - double dPixelToRange = (double)(nPixelRange - m_nThumbLength)/(double)(m_nRangeMax - m_nRangeMin); - int nPixelPos = SHORT1FROMMR(::WinSendMsg( GetHwnd() - ,SLM_QUERYSLIDERINFO - ,MPFROM2SHORT( SMA_SLIDERARMPOSITION - ,SMA_RANGEVALUE - ) - ,(MPARAM)0 - ) - ); - int nNewPos = (int)(nPixelPos/dPixelToRange); - if (nNewPos > (m_nRangeMax - m_nRangeMin)/2) - nNewPos++; - return nNewPos; -} // end of wxSlider::GetValue - -WXHBRUSH wxSlider::OnCtlColor( - WXHDC hDC -, WXHWND hWnd -, WXUINT uCtlColor -, WXUINT uMessage -, WXWPARAM wParam -, WXLPARAM lParam -) -{ - return (wxControl::OnCtlColor( hDC - ,hWnd - ,uCtlColor - ,uMessage - ,wParam - ,lParam - ) - ); -} // end of wxSlider::OnCtlColor - -bool wxSlider::OS2OnScroll( int WXUNUSED(nOrientation), - WXWORD wParam, - WXWORD WXUNUSED(wPos), - WXHWND WXUNUSED(hControl) ) -{ - wxEventType eScrollEvent = wxEVT_NULL; - - switch (wParam) - { - case SLN_CHANGE: - if (m_windowStyle & wxSL_TOP) - eScrollEvent = wxEVT_SCROLL_TOP; - else if (m_windowStyle & wxSL_BOTTOM) - eScrollEvent = wxEVT_SCROLL_BOTTOM; - break; - - case SLN_SLIDERTRACK: - eScrollEvent = wxEVT_SCROLL_THUMBTRACK; - break; - - default: - return false; - } - - int nPixelRange = SHORT1FROMMR(::WinSendMsg( GetHwnd() - , SLM_QUERYSLIDERINFO - , MPFROM2SHORT( SMA_SHAFTDIMENSIONS, SMA_RANGEVALUE ) - , (MPARAM)0 - ) - ); - m_dPixelToRange = (double)(nPixelRange - m_nThumbLength)/(double)(m_nRangeMax - m_nRangeMin); - int nNewPos = 0; - int nPixelPos = SHORT1FROMMR(::WinSendMsg( GetHwnd() - , SLM_QUERYSLIDERINFO - , MPFROM2SHORT( SMA_SLIDERARMPOSITION, SMA_RANGEVALUE ) - , (MPARAM)0 - ) - ); - - nNewPos = (int)(nPixelPos/m_dPixelToRange); - if (nNewPos > (m_nRangeMax - m_nRangeMin)/2) - nNewPos++; - if ((nNewPos < GetMin()) || (nNewPos > GetMax())) - { - // - // Out of range - but we did process it - // - return true; - } - SetValue(nNewPos); - - wxScrollEvent vEvent( eScrollEvent, m_windowId ); - - vEvent.SetPosition(nNewPos); - vEvent.SetEventObject(this); - HandleWindowEvent(vEvent); - - wxCommandEvent vCevent( wxEVT_SLIDER, GetId() ); - - vCevent.SetInt(nNewPos); - vCevent.SetEventObject(this); - return (HandleWindowEvent(vCevent)); -} // end of wxSlider::OS2OnScroll - -void wxSlider::SetLineSize( int nLineSize ) -{ - m_nLineSize = nLineSize; -} // end of wxSlider::SetLineSize - - -void wxSlider::SetPageSize( int nPageSize ) -{ - m_nPageSize = nPageSize; -} // end of wxSlider::SetPageSize - -void wxSlider::SetRange( - int nMinValue -, int nMaxValue -) -{ - wxChar zBuf[10]; - - m_nRangeMin = nMinValue; - m_nRangeMax = nMaxValue; - - int nPixelRange = SHORT1FROMMR(::WinSendMsg( GetHwnd() - ,SLM_QUERYSLIDERINFO - ,MPFROM2SHORT( SMA_SHAFTDIMENSIONS - ,SMA_RANGEVALUE - ) - ,(MPARAM)0 - ) - ); - m_dPixelToRange = (double)(nPixelRange - m_nThumbLength)/(double)(m_nRangeMax - m_nRangeMin); - if (m_hStaticMin) - { - wxSprintf(zBuf, wxT("%d"), m_nRangeMin); - ::WinSetWindowText((HWND)m_hStaticMin, (PSZ)zBuf); - } - - if (m_hStaticMax) - { - wxSprintf(zBuf, wxT("%d"), m_nRangeMax); - ::WinSetWindowText((HWND)m_hStaticMax, (PSZ)zBuf); - } -} // end of wxSlider::SetRange - -void wxSlider::SetSelection( - int WXUNUSED(nMinPos) -, int WXUNUSED(nMaxPos) -) -{ -} // end of wxSlider::SetSelection - -void wxSlider::SetThumbLength( - int nLen -) -{ - int nBreadth; - - m_nThumbLength = SHORT1FROMMR(::WinSendMsg( GetHwnd() - ,SLM_QUERYSLIDERINFO - ,MPFROM2SHORT( SMA_SLIDERARMDIMENSIONS - ,SMA_RANGEVALUE - ) - ,(MPARAM)0 - ) - ) + 4; // for bordersizes - nBreadth = SHORT2FROMMR(::WinSendMsg( GetHwnd() - ,SLM_QUERYSLIDERINFO - ,MPFROM2SHORT( SMA_SLIDERARMDIMENSIONS - ,SMA_RANGEVALUE - ) - ,(MPARAM)0 - ) - ); - ::WinSendMsg( GetHwnd() - ,SLM_SETSLIDERINFO - ,MPFROM2SHORT( SMA_SLIDERARMDIMENSIONS - ,SMA_RANGEVALUE - ) - ,MPFROM2SHORT(nLen, nBreadth) - ); - m_nThumbLength = nLen + 4; // Borders -} // end of wxSlider::SetThumbLength - -void wxSlider::SetTick( - int nTickPos -) -{ - nTickPos = (int)(nTickPos * m_dPixelToRange); - ::WinSendMsg( GetHwnd() - ,SLM_ADDDETENT - ,MPFROMSHORT(nTickPos) - ,NULL - ); -} // end of wxSlider::SetTick - -// For trackbars only -void wxSlider::DoSetTickFreq( int n ) -{ - SLDCDATA vSlData; - WNDPARAMS vWndParams; - int nPixelPos; - int i; - - vSlData.cbSize = sizeof(SLDCDATA); - if (m_windowStyle & wxSL_AUTOTICKS) - { - vSlData.usScale1Spacing = 0; - vSlData.usScale2Spacing = 0; - } - vSlData.usScale1Increments = (USHORT)((m_nRangeMax - m_nRangeMin)/n); - vSlData.usScale2Increments = (USHORT)((m_nRangeMax - m_nRangeMin)/n); - - vWndParams.fsStatus = WPM_CTLDATA; - vWndParams.cchText = 0L; - vWndParams.pszText = NULL; - vWndParams.cbPresParams = 0L; - vWndParams.pPresParams = NULL; - vWndParams.cbCtlData = vSlData.cbSize; - vWndParams.pCtlData = (PVOID)&vSlData; - ::WinSendMsg(GetHwnd(), WM_SETWINDOWPARAMS, (MPARAM)&vWndParams, (MPARAM)0); - for (i = 1; i < (m_nRangeMax - m_nRangeMin)/n; i++) - { - nPixelPos = (int)(i * n * m_dPixelToRange); - ::WinSendMsg( GetHwnd() - ,SLM_ADDDETENT - ,MPFROMSHORT(nPixelPos) - ,NULL - ); - } -} // end of wxSlider::SetTickFreq - -void wxSlider::SetValue( - int nValue -) -{ - int nPixelRange = SHORT1FROMMR(::WinSendMsg( GetHwnd() - ,SLM_QUERYSLIDERINFO - ,MPFROM2SHORT( SMA_SHAFTDIMENSIONS - ,SMA_RANGEVALUE - ) - ,(MPARAM)0 - ) - ); - m_dPixelToRange = (double)(nPixelRange - m_nThumbLength)/(double)(m_nRangeMax - m_nRangeMin); - int nNewPos = (int)(nValue * m_dPixelToRange); - - ::WinSendMsg( GetHwnd() - ,SLM_SETSLIDERINFO - ,MPFROM2SHORT( SMA_SLIDERARMPOSITION - ,SMA_RANGEVALUE - ) - ,(MPARAM)nNewPos - ); - if (m_hStaticValue) - { - wxSprintf(wxBuffer, wxT("%d"), nValue); - ::WinSetWindowText((HWND)m_hStaticValue, (PSZ)wxBuffer); - } -} // end of wxSlider::SetValue - -bool wxSlider::Show( - bool bShow -) -{ - wxWindowOS2::Show(bShow); - if(m_hStaticValue) - ::WinShowWindow((HWND)m_hStaticValue, bShow); - if(m_hStaticMin) - ::WinShowWindow((HWND)m_hStaticMin, bShow); - if(m_hStaticMax) - ::WinShowWindow((HWND)m_hStaticMax, bShow); - return true; -} // end of wxSlider::Show - -#endif // wxUSE_SLIDER diff --git a/src/os2/snglinst.cpp b/src/os2/snglinst.cpp deleted file mode 100644 index 37f3bf7f19..0000000000 --- a/src/os2/snglinst.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/snglinst.cpp -// Purpose: implements wxSingleInstanceChecker class for OS/2 using -// named mutexes -// Author: Vadim Zeitlin -// Modified by: Lauri Nurmi (modified for OS/2) -// Created: 08.02.2009 -// Copyright: (c) 2001 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_SNGLINST_CHECKER - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/log.h" -#endif //WX_PRECOMP - -#include "wx/snglinst.h" - -#define INCL_DOSSEMAPHORES -#define INCL_DOSERRORS -#include - -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// wxSingleInstanceCheckerImpl: the real implementation class -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxSingleInstanceCheckerImpl -{ -public: - wxSingleInstanceCheckerImpl() - { - m_hMutex = NULL; - m_anotherRunning = false; - } - - bool Create(const wxString& name) - { - wxString semName; - semName.Printf(wxT("\\SEM32\\%s"), name.c_str()); - int rc = DosCreateMutexSem(semName.c_str(), &m_hMutex, DC_SEM_SHARED, 1); - - if ( rc == NO_ERROR ) { - m_anotherRunning = false; - return true; - } else if ( rc == ERROR_DUPLICATE_NAME ) { - m_anotherRunning = true; - return true; - } else { - m_anotherRunning = false; // we don't know for sure in this case - wxLogLastError(wxT("DosCreateMutexSem")); - return false; - } - } - - bool IsAnotherRunning() const - { - return m_anotherRunning; - } - - ~wxSingleInstanceCheckerImpl() - { - if ( m_hMutex ) - { - if ( !::DosCloseMutexSem(m_hMutex) ) - { - wxLogLastError(wxT("DosCloseMutexSem")); - } - } - } - -private: - // if true, creating the mutex either succeeded - // or we know it failed because another app is running. - bool m_anotherRunning; - - // the mutex handle, may be NULL - HMTX m_hMutex; - - DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl) -}; - -// ============================================================================ -// wxSingleInstanceChecker implementation -// ============================================================================ - -bool wxSingleInstanceChecker::Create(const wxString& name, - const wxString& WXUNUSED(path)) -{ - wxASSERT_MSG( !m_impl, - wxT("calling wxSingleInstanceChecker::Create() twice?") ); - - // creating unnamed mutex doesn't have the same semantics! - wxASSERT_MSG( !name.empty(), wxT("mutex name can't be empty") ); - - m_impl = new wxSingleInstanceCheckerImpl; - - return m_impl->Create(name); -} - -bool wxSingleInstanceChecker::DoIsAnotherRunning() const -{ - wxCHECK_MSG( m_impl, false, wxT("must call Create() first") ); - - return m_impl->IsAnotherRunning(); -} - -wxSingleInstanceChecker::~wxSingleInstanceChecker() -{ - delete m_impl; -} - -#endif // wxUSE_SNGLINST_CHECKER diff --git a/src/os2/sockpm.cpp b/src/os2/sockpm.cpp deleted file mode 100644 index 782567383b..0000000000 --- a/src/os2/sockpm.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/sockpm.cpp -// Purpose: implementation of OS-2-specific handler event handling -// Author: Guilhem Lavaux, Vadim Zeitlin -// Created: 1999 -// Copyright: (c) 1999-2008 wxWidgets dev team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_SOCKETS - -#include -#include "wx/private/socket.h" -#include "wx/app.h" -#include "wx/apptrait.h" - -#define wxSockReadMask 0x01 -#define wxSockWriteMask 0x02 - -static void wxSocket_PM_Input(void *data) -{ - wxFDIOHandler *handler = static_cast(data); - - handler->OnReadWaiting(); -} - -static void wxSocket_PM_Output(void *data) -{ - wxFDIOHandler *handler = static_cast(data); - - handler->OnWriteWaiting(); -} - -class PMFDIOManager : public wxFDIOManager -{ -public: - virtual int AddInput(wxFDIOHandler *handler, - int fd, - wxFDIOManager::Direction d) - { - if (d == FD_OUTPUT) - return wxTheApp->AddSocketHandler(fd, wxSockWriteMask, - wxSocket_PM_Output, handler); - else - return wxTheApp->AddSocketHandler(fd, wxSockReadMask, - wxSocket_PM_Input, handler); - } - - virtual void - RemoveInput(wxFDIOHandler * WXUNUSED(handler), - int fd, - wxFDIOManager::Direction WXUNUSED(dir)) - { - wxTheApp->RemoveSocketHandler(fd); - } -}; - -wxFDIOManager *wxGUIAppTraits::GetFDIOManager() -{ - static PMFDIOManager s_manager; - return &s_manager; -} - - -#else /* !wxUSE_SOCKETS */ - -/* some compilers don't like having empty source files */ -static int wxDummyGsockVar = 0; - -#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */ diff --git a/src/os2/sound.cpp b/src/os2/sound.cpp deleted file mode 100644 index 48fa95740d..0000000000 --- a/src/os2/sound.cpp +++ /dev/null @@ -1,161 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/sound.cpp -// Purpose: wxSound class implementation: optional -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#include "wx/file.h" -#include "wx/sound.h" -#define INCL_32 /* force 32 bit compile */ -#define INCL_GPIBITMAPS -#define INCL_DOSFILEMGR -#define INCL_WIN -#define INCL_GPI -#define INCL_PM -#include -#include -#include -#include -#include -#include - -wxSound::wxSound() - : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE) -{ -} - -wxSound::wxSound(const wxString& sFileName, bool isResource) - : m_waveData(NULL), m_waveLength(0), m_isResource(isResource) -{ - Create(sFileName, isResource); -} - -wxSound::wxSound(size_t size, const void* data) - : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE) -{ - Create(size, data); -} - -wxSound::~wxSound() -{ - Free(); -} - -bool wxSound::Create(const wxString& fileName, bool isResource) -{ - Free(); - - if (isResource) - { - m_isResource = TRUE; -// TODO: -/* - HRSRC hresInfo; -#ifdef _UNICODE - hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, wxT("WAVE")); -#else - hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, wxT("WAVE")); -#endif - if (!hresInfo) - return FALSE; - - HGLOBAL waveData = ::LoadResource((HMODULE) wxhInstance, hresInfo); - - if (waveData) - { - m_waveData= (wxByte*)::LockResource(waveData); - m_waveLength = (int) ::SizeofResource((HMODULE) wxhInstance, hresInfo); - } - - return (m_waveData ? TRUE : FALSE); -*/ - return FALSE; - } - else - { - m_isResource = FALSE; -#if wxUSE_FILE - - wxFile fileWave; - if (!fileWave.Open(fileName, wxFile::read)) - return FALSE; - - m_waveLength = (int) fileWave.Length(); -// TODO: -/* - m_waveData = (wxByte*)::GlobalLock(::GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength)); - if (!m_waveData) - return FALSE; - - fileWave.Read(m_waveData, m_waveLength); -*/ - return TRUE; -#else - return FALSE; -#endif //wxUSE_FILE - } -} - -bool wxSound::Create(size_t size, const void* data) -{ - Free(); - m_isResource = FALSE; - m_waveLength=size; - m_waveData = NULL; // (wxByte*)::GlobalLock(::GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength)); - if (!m_waveData) - return FALSE; - - memcpy(m_waveData, data, size); - return TRUE; -} - -bool wxSound::DoPlay(unsigned WXUNUSED(flags)) const -{ - if (!IsOk()) - return false; - -// TODO: -/* - return ( ::PlaySound((LPCTSTR)m_waveData, NULL, SND_MEMORY | - SND_NODEFAULT | (async ? SND_ASYNC : SND_SYNC) | (looped ? (SND_LOOP | SND_ASYNC) : 0)) != 0 ); -*/ - return false; -} - -bool wxSound::Free() -{ - if (m_waveData) - { -// HGLOBAL waveData = ::GlobalHandle(m_waveData); - -// TODO: -/* - if (waveData) - { - if (m_isResource) - ::FreeResource(waveData); - else - { - ::GlobalUnlock(waveData); - ::GlobalFree(waveData); - } - - m_waveData = NULL; - m_waveLength = 0; - return TRUE; - } -*/ - } - return false; -} diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp deleted file mode 100644 index 07942af8dd..0000000000 --- a/src/os2/spinbutt.cpp +++ /dev/null @@ -1,224 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/spinbutt.cpp -// Purpose: wxSpinButton -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif -#if wxUSE_SPINBTN - -// Can't resolve reference to CreateUpDownControl in -// TWIN32, but could probably use normal CreateWindow instead. - - -#include "wx/spinbutt.h" - -extern void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); - -#include "wx/os2/private.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -bool wxSpinButton::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxString& rsName -) -{ - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - SWP vSwp; - - m_min = 0; - m_max = 100; - if (vId == -1) - m_windowId = NewControlId(); - else - m_windowId = vId; - if (pParent) - { - m_backgroundColour = pParent->GetBackgroundColour(); - m_foregroundColour = pParent->GetForegroundColour(); - } - SetName(rsName); - SetParent(pParent); - m_windowStyle = lStyle; - - // - // Get the right size for the control - // - if (nWidth <= 0 || nHeight <= 0 ) - { - wxSize vSize = DoGetBestSize(); - - if (nWidth <= 0 ) - nWidth = vSize.x; - if (nHeight <= 0 ) - nHeight = vSize.y; - } - if (nX < 0 ) - nX = 0; - if (nY < 0 ) - nY = 0; - - long lSstyle = WS_VISIBLE | - WS_TABSTOP | - SPBS_MASTER | // We use only single field spin buttons - SPBS_NUMERICONLY; // We default to numeric data - - if (m_windowStyle & wxCLIP_SIBLINGS ) - lSstyle |= WS_CLIPSIBLINGS; - - m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent) - ,WC_SPINBUTTON - ,(PSZ)NULL - ,lSstyle - ,0L, 0L, 0L, 0L - ,GetWinHwnd(pParent) - ,HWND_TOP - ,(HMENU)vId - ,NULL - ,NULL - ); - if (m_hWnd == 0) - { - return FALSE; - } - SetRange(m_min, m_max); - if(pParent) - pParent->AddChild((wxSpinButton *)this); - - ::WinQueryWindowPos(m_hWnd, &vSwp); - SetXComp(vSwp.x); - SetYComp(vSwp.y-5); // compensate for the associated TextControl border - - SetFont(*wxSMALL_FONT); - // - // For OS/2 we want to hide the text portion so we can substitute an - // independent text ctrl in its place. - // Therefore we must override any user given width with our best guess. - // - SetSize( nX - GetXComp() - ,nY - GetYComp() - ,nWidth - ,nHeight - ); - wxAssociateWinWithHandle( m_hWnd - ,(wxWindowOS2*)this - ); -#if 0 - // FIXME: - // Apparently, this does not work, as it crashes in setvalue/setrange calls - // What's it supposed to do anyway? - ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this); - fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc); -#endif - return TRUE; -} // end of wxSpinButton::Create - -wxSpinButton::~wxSpinButton() -{ -} // end of wxSpinButton::~wxSpinButton - -// ---------------------------------------------------------------------------- -// size calculation -// ---------------------------------------------------------------------------- - -wxSize wxSpinButton::DoGetBestSize() const -{ - // - // OS/2 PM does not really have system metrics so we'll just set it to - // a square based on its height. - // - RECTL vRect; - ::WinQueryWindowRect(GetHwnd(),&vRect); - return wxSize(vRect.yTop,vRect.yTop); -} // end of wxSpinButton::DoGetBestSize - -// ---------------------------------------------------------------------------- -// Attributes -// ---------------------------------------------------------------------------- - -int wxSpinButton::GetValue() const -{ - long lVal = 0L; - char zVal[10]; - - ::WinSendMsg( GetHwnd() - ,SPBM_QUERYVALUE - ,MPFROMP(zVal) - ,MPFROM2SHORT( (USHORT)10 - ,SPBQ_UPDATEIFVALID - ) - ); - lVal = atol(zVal); - return ((int)lVal); -} // end of wxSpinButton::GetValue - -bool wxSpinButton::OS2OnScroll( int WXUNUSED(nOrientation), - WXWORD WXUNUSED(wParam), - WXWORD wPos, - WXHWND hControl ) -{ - wxCHECK_MSG(hControl, false, wxT("scrolling what?") ); - - wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK, m_windowId ); - int nVal = (int)wPos; // cast is important for negative values! - - vEvent.SetPosition(nVal); - vEvent.SetEventObject(this); - return(HandleWindowEvent(vEvent)); -} // end of wxSpinButton::OS2OnScroll - -bool wxSpinButton::OS2Command( WXUINT WXUNUSED(uCmd), - WXWORD WXUNUSED(wId) ) -{ - return false; -} // end of wxSpinButton::OS2Command - -void wxSpinButton::SetRange( - int nMinVal -, int nMaxVal -) -{ - m_min = nMinVal; - m_max = nMaxVal; - - ::WinSendMsg( GetHwnd() - ,SPBM_SETLIMITS - ,MPFROMLONG(nMaxVal) - ,MPFROMLONG(nMinVal) - ); -} // end of wxSpinButton::SetRange - -void wxSpinButton::SetValue( - int nValue -) -{ - ::WinSendMsg(GetHwnd(), SPBM_SETCURRENTVALUE, MPFROMLONG(nValue), MPARAM(0)); -} // end of wxSpinButton::SetValue - -#endif //wxUSE_SPINBTN diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp deleted file mode 100644 index 61f87ec5ef..0000000000 --- a/src/os2/spinctrl.cpp +++ /dev/null @@ -1,490 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/spinctrl.cpp -// Purpose: wxSpinCtrl class implementation for OS/2 -// Author: David Webster -// Modified by: -// Created: 10/15/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#if wxUSE_SPINCTRL - -#include "wx/spinctrl.h" -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -extern void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); -static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL; -wxArraySpins wxSpinCtrl::m_svAllSpins; - -BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton) - EVT_CHAR(wxSpinCtrl::OnChar) - EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange) - EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus) -END_EVENT_TABLE() -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// the margin between the up-down control and its buddy -static const int MARGIN_BETWEEN = 5; - -// ============================================================================ -// implementation -// ============================================================================ -MRESULT EXPENTRY wxSpinCtrlWndProc( - HWND hWnd -, UINT uMessage -, MPARAM wParam -, MPARAM lParam -) -{ - wxSpinCtrl* pSpin = (wxSpinCtrl *)::WinQueryWindowULong( hWnd - ,QWL_USER - ); - - // - // Forward some messages (the key ones only so far) to the spin ctrl - // - switch (uMessage ) - { - case WM_CHAR: - pSpin->OS2WindowProc( uMessage - ,wParam - ,lParam - ); - - // - // The control may have been deleted at this point, so check. - // - if (!(::WinIsWindow(vHabmain, hWnd) && ((wxSpinCtrl *)::WinQueryWindowULong( hWnd - ,QWL_USER - ) - ) == pSpin)) - return 0; - break; - - } - return (fnWndProcSpinCtrl( hWnd - ,(ULONG)uMessage - ,(MPARAM)wParam - ,(MPARAM)lParam - ) - ); -} // end of wxSpinCtrlWndProc - -wxSpinCtrl::~wxSpinCtrl() -{ - m_svAllSpins.Remove(this); - - // This removes spurious memory leak reporting - if (m_svAllSpins.GetCount() == 0) - m_svAllSpins.Clear(); -} // end of wxSpinCtrl::~wxSpinCtrl - -// ---------------------------------------------------------------------------- -// construction -// ---------------------------------------------------------------------------- - -bool wxSpinCtrl::Create( wxWindow* pParent, - wxWindowID vId, - const wxString& WXUNUSED(rsValue), - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - int nMin, - int nMax, - int nInitial, - const wxString& rsName ) -{ - if (vId == wxID_ANY) - m_windowId = NewControlId(); - else - m_windowId = vId; - if (pParent) - { - m_backgroundColour = pParent->GetBackgroundColour(); - m_foregroundColour = pParent->GetForegroundColour(); - } - SetName(rsName); - SetParent(pParent); - m_windowStyle = lStyle; - - int lSstyle = 0L; - - lSstyle = WS_VISIBLE | - WS_TABSTOP | - SPBS_MASTER | // We use only single field spin buttons - SPBS_NUMERICONLY; // We default to numeric data - - if (m_windowStyle & wxCLIP_SIBLINGS ) - lSstyle |= WS_CLIPSIBLINGS; - - SPBCDATA vCtrlData; - - vCtrlData.cbSize = sizeof(SPBCDATA); - vCtrlData.ulTextLimit = 10L; - vCtrlData.lLowerLimit = 0L; - vCtrlData.lUpperLimit = 100L; - vCtrlData.idMasterSpb = vId; - vCtrlData.pHWXCtlData = NULL; - - m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent) - ,WC_SPINBUTTON - ,(PSZ)NULL - ,lSstyle - ,0L, 0L, 0L, 0L - ,GetWinHwnd(pParent) - ,HWND_TOP - ,(HMENU)vId - ,(PVOID)&vCtrlData - ,NULL - ); - if (m_hWnd == 0) - { - return false; - } - m_hWndBuddy = m_hWnd; // One in the same for OS/2 - if(pParent) - pParent->AddChild((wxSpinButton *)this); - - SetFont(*wxSMALL_FONT); - SetXComp(0); - SetYComp(0); - SetSize( rPos.x, rPos.y, rSize.x, rSize.y ); - - SetRange(nMin, nMax); - SetValue(nInitial); - - // - // For OS/2 we'll just set our handle into our long data - // - wxAssociateWinWithHandle( m_hWnd - ,(wxWindowOS2*)this - ); - ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this); - fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc); - m_svAllSpins.Add(this); - return true; -} // end of wxSpinCtrl::Create - -wxSize wxSpinCtrl::DoGetBestSize() const -{ - wxSize vSizeBtn = wxSpinButton::DoGetBestSize(); - int nHeight; - wxFont vFont = (wxFont)GetFont(); - - vSizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN; - - wxGetCharSize( GetHWND() - ,NULL - ,&nHeight - ,&vFont - ); - nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight)+4; - - if (vSizeBtn.y < nHeight) - { - // - // Make the text tall enough - // - vSizeBtn.y = nHeight; - } - return vSizeBtn; -} // end of wxSpinCtrl::DoGetBestSize - -void wxSpinCtrl::DoGetPosition( - int* pnX -, int* pnY -) const -{ - wxSpinButton::DoGetPosition( pnX,pnY ); -} // end of wxpinCtrl::DoGetPosition - -void wxSpinCtrl::DoGetSize( - int* pnWidth -, int* pnHeight -) const -{ - RECTL vSpinrect; - - ::WinQueryWindowRect(GetHwnd(), &vSpinrect); - - if (pnWidth) - *pnWidth = vSpinrect.xRight - vSpinrect.xLeft; - if (pnHeight) - *pnHeight = vSpinrect.yTop - vSpinrect.yBottom; -} // end of wxSpinCtrl::DoGetSize - -void wxSpinCtrl::DoMoveWindow( - int nX -, int nY -, int nWidth -, int nHeight -) -{ - wxWindowOS2* pParent = (wxWindowOS2*)GetParent(); - - if (pParent) - { - int nOS2Height = GetOS2ParentHeight(pParent); - - nY = nOS2Height - (nY + nHeight); - } - else - { - RECTL vRect; - - ::WinQueryWindowRect(HWND_DESKTOP, &vRect); - nY = vRect.yTop - (nY + nHeight); - } - ::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,nX - ,nY - ,nWidth - ,nHeight - ,SWP_SIZE | SWP_MOVE | SWP_ZORDER | SWP_SHOW - ); -} // end of wxSpinCtrl::DoMoveWindow - -bool wxSpinCtrl::Enable( - bool bEnable -) -{ - if (!wxControl::Enable(bEnable)) - { - return false; - } - ::WinEnableWindow(GetHwnd(), bEnable); - return true; -} // end of wxSpinCtrl::Enable - -wxSpinCtrl* wxSpinCtrl::GetSpinForTextCtrl( - WXHWND hWndBuddy -) -{ - wxSpinCtrl* pSpin = (wxSpinCtrl *)::WinQueryWindowULong( (HWND)hWndBuddy - ,QWL_USER - ); - int i = m_svAllSpins.Index(pSpin); - - if (i == wxNOT_FOUND) - return NULL; - - // sanity check - wxASSERT_MSG( pSpin->m_hWndBuddy == hWndBuddy, - wxT("wxSpinCtrl has incorrect buddy HWND!") ); - - return pSpin; -} // end of wxSpinCtrl::GetSpinForTextCtrl - -int wxSpinCtrl::GetValue() const -{ - long lVal = 0L; - char zVal[10]; - - ::WinSendMsg( GetHwnd() - ,SPBM_QUERYVALUE - ,MPFROMP(zVal) - ,MPFROM2SHORT( (USHORT)10 - ,SPBQ_UPDATEIFVALID - ) - ); - lVal = atol(zVal); - return (int)lVal; -} // end of wxSpinCtrl::GetValue - -void wxSpinCtrl::OnChar ( - wxKeyEvent& rEvent -) -{ - switch (rEvent.GetKeyCode()) - { - case WXK_RETURN: - { - wxCommandEvent vEvent( wxEVT_TEXT_ENTER - ,m_windowId - ); - wxString sVal = wxGetWindowText(m_hWndBuddy); - - InitCommandEvent(vEvent); - vEvent.SetString(sVal); - vEvent.SetInt(GetValue()); - if (HandleWindowEvent(vEvent)) - return; - break; - } - - case WXK_TAB: - // - // Always produce navigation event - even if we process TAB - // ourselves the fact that we got here means that the user code - // decided to skip processing of this TAB - probably to let it - // do its default job. - // - { - wxNavigationKeyEvent vEventNav; - - vEventNav.SetDirection(!rEvent.ShiftDown()); - vEventNav.SetWindowChange(rEvent.ControlDown()); - vEventNav.SetEventObject(this); - if (GetParent()->HandleWindowEvent(vEventNav)) - return; - } - break; - } - - // - // No, we didn't process it - // - rEvent.Skip(); -} // end of wxSpinCtrl::OnChar - -void wxSpinCtrl::OnSpinChange( - wxSpinEvent& rEventSpin -) -{ - wxCommandEvent vEvent( wxEVT_SPINCTRL - ,GetId() - ); - - vEvent.SetEventObject(this); - vEvent.SetInt(rEventSpin.GetPosition()); - (void)HandleWindowEvent(vEvent); - if (rEventSpin.GetSkipped()) - { - vEvent.Skip(); - } -} // end of wxSpinCtrl::OnSpinChange - -void wxSpinCtrl::OnSetFocus ( - wxFocusEvent& rEvent -) -{ - // - // When we get focus, give it to our buddy window as it needs it more than - // we do - // - ::WinSetFocus(HWND_DESKTOP, (HWND)m_hWndBuddy); - rEvent.Skip(); -} // end of wxSpinCtrl::OnSetFocus - -bool wxSpinCtrl::ProcessTextCommand( WXWORD wCmd, - WXWORD WXUNUSED(wId) ) -{ - switch (wCmd) - { - case SPBN_CHANGE: - { - wxCommandEvent vEvent( wxEVT_TEXT, GetId() ); - vEvent.SetEventObject(this); - - wxString sVal = wxGetWindowText(m_hWndBuddy); - - vEvent.SetString(sVal); - vEvent.SetInt(GetValue()); - return (HandleWindowEvent(vEvent)); - } - - case SPBN_SETFOCUS: - case SPBN_KILLFOCUS: - { - wxFocusEvent vEvent( wCmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS : wxEVT_SET_FOCUS - ,m_windowId - ); - - vEvent.SetEventObject(this); - return(HandleWindowEvent(vEvent)); - } - default: - break; - } - - // - // Not processed - // - return false; -} // end of wxSpinCtrl::ProcessTextCommand - -void wxSpinCtrl::SetFocus() -{ - ::WinSetFocus(HWND_DESKTOP, GetHwnd()); -} // end of wxSpinCtrl::SetFocus - -bool wxSpinCtrl::SetFont( - const wxFont& rFont -) -{ - if (!wxWindowBase::SetFont(rFont)) - { - // nothing to do - return false; - } - - wxOS2SetFont( m_hWnd - ,rFont - ); - return true; -} // end of wxSpinCtrl::SetFont - -void wxSpinCtrl::SetValue( - const wxString& rsText -) -{ - long lVal; - - lVal = atol(rsText.c_str()); - wxSpinButton::SetValue(lVal); -} // end of wxSpinCtrl::SetValue - -bool wxSpinCtrl::Show( - bool bShow -) -{ - if (!wxControl::Show(bShow)) - { - return false; - } - return true; -} // end of wxSpinCtrl::Show - -void wxSpinCtrl::SetSelection ( - long lFrom -, long lTo -) -{ - // - // If from and to are both -1, it means (in wxWidgets) that all text should - // be selected - translate into Windows convention - // - if ((lFrom == -1) && (lTo == -1)) - { - lFrom = 0; - } - ::WinSendMsg(m_hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), (MPARAM)0); -} // end of wxSpinCtrl::SetSelection - -#endif //wxUSE_SPINCTRL diff --git a/src/os2/standard.txt b/src/os2/standard.txt deleted file mode 100644 index 912fc2f120..0000000000 --- a/src/os2/standard.txt +++ /dev/null @@ -1,144 +0,0 @@ -This is just a note explaining the additional coding standards I use in -the OS/2 port. These are in addition to the project standards and are designed -to enhance the readability and maintenance of the code. There are two main -standards I employ and few minor ones. Indentation/columner aligned code -and variable naming are the key conventions I use. - -Indentations allow for a very clean look and feel to the code as well as assisting -in debugging. This is really more a stylistic option that just makes the code -look better and easier to read. Basically I put the data declaration type to the left -and the variable in column 37 or 41 (9 or ten 4 space tabs from the left margin). -All indentations are multiples of 4. Probably the most important indentation -standard I use concerns if/else constructs. - -I find code like: - - if (var == 1) MyFunc(); - else return FALSE; - -and: - if (eVal == ENUM1) { - DoSomething(); - DoSomethingElse(); - } else if (eVal == ENUM2) { - DoAnotherThing(); - DoSomethingElse(); - } else return FALSE; - -to be ugly, hard to match openning and closing braces, and a bit of pain for -some debuggers. So I use this instead: - - if (var == 1) - MyFunc(); - else - return FALSE; - -and: - if (eVal == ENUM1) - { - DoSomething(); - DoSomethingElse(); - } - else if (eVal == ENUM2) - { - DoAnotherThing(); - DoSomethingElse(); - } - else - return FALSE; - -This is infinitely more readable, allows for easy matchup of openning and -closing braces and is friendlier to debuggers. - -Another issue in this category is the function call with large number of parameters. -Especially if some of the parameters are function calls themselves. I find code -like - - MyCall2( param, someotherparam, CallAnotherProc(), CallYetAnotherProc(), param2, param3, Yourproc(), param4); - -to be ugly and hard on some debuggers and some editors/printers don't like trailing -out over 100 columns. I prefer something like this: - - MyCall2( param - ,someotherparam - ,CallAnotherProc() - ,CallYetAnotherProc() - ,param2 - ,param3 - ,Yourproc() - ,param4 - ); - -Much more readable, and debugger and editor friendly. - -Like I said above all that is mostly style, but below is something that I find -partiuclarly irritating about a lot of code in this and other public projects, -the haphazard and lazy use of variable names. How often have you found yourself -deep down in a large function and run across something like xd = p or CallProc(val, val2) -and you have no idea what xd or p is or where val or val2 are delcared and you -have to go spend time to find them? Waste of time. Or something like -if (val). Is val an integer you are testing for nonzero or a pointer for nonNULL? -You have to back up somewhere or into a class header to find it in order to know. -Coders that use one or two character identifiers in anything other than loop -controls are basically just lazy. - -To alleviate a lot of this poor readability I have instuted the following naming -conventions in this port. - -Class data members are alway preceded with a m_. - -Datatype prefixes are as follows: - - n -- int, short - l -- long, size_t (specific 32 bit integer) - ll -- longlong (64 bit integer) - f -- float - d -- double - w -- word - dw -- dword - h -- handle - u -- unsigned - c -- char/byte (8 bit) - z -- char* string - s -- string class string - p -- pointer - q -- smart (counted) pointer - r -- reference - a -- array - v -- user or library defined datatype (can be a struct, typedef, or even - a class variable). - -So a class member that is a pointer to something is m_pVar. A pointer to an -unsigned long is a pulVal. rsVal is a reference to a string. - -Also I use as many desriptive names as possible. So an int for a box width is -nWidth, not w or x. An unsigned long for a datalength is ulLength not len or l. -A class member that is a pointer to client window is m_pClient or -m_pvClient, not just client. A wxBrush is vBrush or a handle to a brush is -hBrush as opposed to br or hbr and if they were class members then m_vBrush and -m_hBrush. - -Some other things you will not find in this port are things like: - -Large numbers of nested function calls on one line or if statement. - -Obtuse nonsense like while (*d++ = *s). What is that? Instead you will see - - while (*d != '\0') - { - . - . - . - *d++; - *d = s; - } - -I hope you will find wxOS2 extremely easy to read, follow, and debug. Unlike -a lot of programmers I find writing code to be every bit as much a work of -art as of science. The neatness and appearance of one's code tells a every -bit as much about the person writing it as its functionality and correctness. - -Dave Webster, -Struggling OS/2 developer. - - diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp deleted file mode 100644 index b813bdfc29..0000000000 --- a/src/os2/statbmp.cpp +++ /dev/null @@ -1,211 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/statbmp.cpp -// Purpose: wxStaticBitmap -// Author: David Webster -// Modified by: -// Created: 11/27/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/statbmp.h" - -#ifndef WX_PRECOMP - #include "wx/icon.h" - #include "wx/window.h" - #include "wx/dcclient.h" -#endif - -#include "wx/os2/private.h" - -#include - -// --------------------------------------------------------------------------- -// macros -// --------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow) - EVT_PAINT(wxStaticBitmap::OnPaint) -END_EVENT_TABLE() - -static wxGDIImage* ConvertImage( - const wxGDIImage& rBitmap -) -{ - bool bIsIcon = rBitmap.IsKindOf( CLASSINFO(wxIcon) ); - - if(!bIsIcon ) - { - wxASSERT_MSG( wxDynamicCast(&rBitmap, wxBitmap), - wxT("not an icon and not a bitmap?") ); - - const wxBitmap& rBmp = (const wxBitmap&)rBitmap; - wxMask* pMask = rBmp.GetMask(); - - if (pMask && pMask->GetMaskBitmap()) - { - wxIcon* pIcon = new wxIcon; - - pIcon->CopyFromBitmap(rBmp); - return pIcon; - } - return new wxBitmap(rBmp); - } - - // copying a bitmap is a cheap operation - return new wxIcon( (const wxIcon&)rBitmap ); -} // end of ConvertImage - -// --------------------------------------------------------------------------- -// wxStaticBitmap -// --------------------------------------------------------------------------- - -bool wxStaticBitmap::Create( wxWindow* pParent, - wxWindowID nId, - const wxGDIImage& rBitmap, - const wxPoint& rPos, - const wxSize& WXUNUSED(rSize), - long lStyle, - const wxString& rName ) -{ - ERRORID vError; - wxString sError; - - Init(); - - SetName(rName); - if (pParent) - pParent->AddChild(this); - - if (nId == -1) - m_windowId = (int)NewControlId(); - else - m_windowId = nId; - - m_windowStyle = lStyle; - - int nX= rPos.x; - int nY = rPos.y; - char zId[16]; - - m_windowStyle = lStyle; - - m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon)); - - // - // For now we only support an ICON - // - int nWinstyle = SS_ICON; - - m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND() - ,(PSZ)wxCanvasClassName - ,zId - ,nWinstyle | WS_VISIBLE - ,0,0,0,0 - ,pParent->GetHWND() - ,HWND_TOP - ,m_windowId - ,NULL - ,NULL - ); - if (!m_hWnd) - { - vError = ::WinGetLastError(wxGetInstance()); - sError = wxPMErrorToStr(vError); - return false; - } - wxCHECK_MSG( m_hWnd, false, wxT("Failed to create static bitmap") ); - m_pImage = ConvertImage(rBitmap); - ::WinSendMsg( m_hWnd, - SM_SETHANDLE, - MPFROMHWND(rBitmap.GetHandle()), - (MPARAM)0); - - // Subclass again for purposes of dialog editing mode - SubclassWin(m_hWnd); - SetSize(nX, nY, m_pImage->GetWidth(), m_pImage->GetHeight()); - - return true; -} // end of wxStaticBitmap::Create - -bool wxStaticBitmap::ImageIsOk() const -{ - return(m_pImage && m_pImage->IsOk()); -} - -void wxStaticBitmap::Free() -{ - wxDELETE(m_pImage); -} // end of wxStaticBitmap::Free - -wxSize wxStaticBitmap::DoGetBestSize() const -{ - // - // Reuse the current size (as wxWindow does) instead of using some - // arbitrary default size (as wxControl, our immediate base class, does) - // - return wxWindow::DoGetBestSize(); -} - -void wxStaticBitmap::OnPaint ( wxPaintEvent& WXUNUSED(rEvent) ) -{ - wxPaintDC vDc(this); - wxBitmap* pBitmap; - - if (m_pImage->IsKindOf(CLASSINFO(wxIcon))) - { - wxIcon* pIcon; - - pIcon = wxDynamicCast(m_pImage, wxIcon); - pBitmap = new wxBitmap(*pIcon); - vDc.DrawBitmap(*pBitmap, 0, 0); - delete pBitmap; - } - else - { - pBitmap = wxDynamicCast(m_pImage, wxBitmap); - vDc.DrawBitmap(*pBitmap, 0, 0); - } -} // end of wxStaticBitmap::OnPaint - -void wxStaticBitmap::SetImage( const wxGDIImage& rBitmap ) -{ - int nX = 0; - int nY = 0; - int nWidth = 0; - int nHeight = 0; - - Free(); - ::WinSendMsg( GetHwnd() - ,SM_SETHANDLE - ,MPFROMHWND(rBitmap.GetHandle()) - ,NULL - ); - m_pImage = ConvertImage(rBitmap); - - GetPosition(&nX, &nY); - GetSize(&nWidth, &nHeight); - // Convert to OS/2 coordinate system - nY = wxWindow::GetOS2ParentHeight(GetParent()) - nY - nHeight; - - RECTL vRect; - - vRect.xLeft = nX; - vRect.yTop = nY + nHeight; - vRect.xRight = nX + nWidth; - vRect.yBottom = nY; - - ::WinInvalidateRect(GetHwndOf(GetParent()), &vRect, TRUE); -} - -MRESULT wxStaticBitmap::OS2WindowProc( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) -{ - return wxWindow::OS2WindowProc(uMsg, wParam, lParam); -} // end of wxStaticBitmap::OS2WindowProc diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp deleted file mode 100644 index 94d826ec8d..0000000000 --- a/src/os2/statbox.cpp +++ /dev/null @@ -1,109 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/statbox.cpp -// Purpose: wxStaticBox -// Author: David Webster -// Modified by: -// Created: ??/??/98 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/statbox.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/dcclient.h" - #include "wx/window.h" -#endif - -#include "wx/os2/private.h" - -bool wxStaticBox::Create( wxWindow* pParent, - wxWindowID vId, - const wxString& rsLabel, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxString& rsName ) -{ - if(!CreateControl( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,wxDefaultValidator - ,rsName - )) - { - return false; - } - - wxPoint vPos(0,0); - wxSize vSize(0,0); - - if (!OS2CreateControl( wxT("STATIC") - ,SS_GROUPBOX - ,vPos - ,vSize - ,rsLabel - )) - { - return false; - } - - // - // To be transparent we should have the same colour as the parent as well - // - SetBackgroundColour(GetParent()->GetBackgroundColour()); - - LONG lColor = (LONG)wxBLACK->GetPixel(); - ::WinSetPresParam( m_hWnd - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - - lColor = (LONG)m_backgroundColour.GetPixel(); - ::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); - return true; -} // end of wxStaticBox::Create - -wxSize wxStaticBox::DoGetBestSize() const -{ - int nCx; - int nCy; - int wBox; - - nCx = GetCharWidth(); - nCy = GetCharHeight(); - GetTextExtent( wxGetWindowText(m_hWnd) - ,&wBox - ,NULL - ); - wBox += 3 * nCx; - - int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy); - - return wxSize( wBox - ,hBox - ); -} // end of wxStaticBox::DoGetBestSize - -MRESULT wxStaticBox::OS2WindowProc( WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam ) -{ - return wxControl::OS2WindowProc(nMsg, wParam, lParam); -} // end of wxStaticBox::OS2WindowProc diff --git a/src/os2/statline.cpp b/src/os2/statline.cpp deleted file mode 100644 index 1bda2b1008..0000000000 --- a/src/os2/statline.cpp +++ /dev/null @@ -1,100 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/statline.cpp -// Purpose: OS2 version of wxStaticLine class -// Author: David Webster -// Created: 10/23/99 -// Copyright: (c) 1999 David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_STATLINE - -#include "wx/statline.h" - -#ifndef WX_PRECOMP - #include "wx/log.h" -#endif - -#include "wx/os2/private.h" - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -bool wxStaticLine::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxString& rsName -) -{ - wxSize vSize = AdjustSize(rSize); - - if ( !CreateControl( pParent - ,vId - ,rPos - ,vSize - ,lStyle - ,wxDefaultValidator - ,rsName - )) - return FALSE; - if (!OS2CreateControl( wxT("STATIC") - ,SS_FGNDFRAME - ,rPos - ,rSize - ,rsName - )) - return FALSE; - - wxColour vColour; - - vColour.Set(wxString(wxT("GREY"))); - - LONG lColor = (LONG)vColour.GetPixel(); - - ::WinSetPresParam( m_hWnd - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - return TRUE; -} // end of wxStaticLine::Create - -WXDWORD wxStaticLine::OS2GetStyle( - long lStyle -, WXDWORD* pdwExstyle -) const -{ - // - // We never have border - // - lStyle &= ~wxBORDER_MASK; - lStyle |= wxBORDER_NONE; - - WXDWORD dwStyle = wxControl::OS2GetStyle( lStyle - ,pdwExstyle - ); - // - // Add our default styles - // - return dwStyle | WS_CLIPSIBLINGS; -} -#endif // wxUSE_STATLINE diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp deleted file mode 100644 index 92c56f7fa9..0000000000 --- a/src/os2/stattext.cpp +++ /dev/null @@ -1,284 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/stattext.cpp -// Purpose: wxStaticText -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/stattext.h" - -#ifndef WX_PRECOMP - #include "wx/event.h" - #include "wx/app.h" - #include "wx/brush.h" - #include "wx/scrolwin.h" -#endif - -#include "wx/os2/private.h" -#include - -bool wxStaticText::Create( wxWindow* pParent, - wxWindowID vId, - const wxString& rsLabel, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxString& rsName ) -{ - SetName(rsName); - if (pParent) - pParent->AddChild(this); - - SetBackgroundColour(pParent->GetBackgroundColour()) ; - SetForegroundColour(pParent->GetForegroundColour()) ; - - if ( vId == wxID_ANY ) - m_windowId = (int)NewControlId(); - else - m_windowId = vId; - - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - - m_windowStyle = lStyle; - - long lSstyle = 0L; - - // Used to have DT_VCENTER but that doesn't work correctly with - // multiline strings and DT_WORDBREAK. Accept a reasonable - // compromise for now - lSstyle = WS_VISIBLE | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC; - if (m_windowStyle & wxALIGN_CENTRE) - lSstyle |= DT_CENTER; - else if (m_windowStyle & wxALIGN_RIGHT) - lSstyle |= DT_RIGHT; - else - lSstyle |= DT_LEFT; - - m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,WC_STATIC // Window class - ,NULL // Initial Text - ,(ULONG)lSstyle // Style flags - ,0L, 0L, 0L, 0L // Origin -- 0 size - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(ULONG)m_windowId // Window identifier - ,NULL // no control data - ,NULL // no Presentation parameters - ); - - wxCHECK_MSG(m_hWnd, false, wxT("Failed to create static ctrl")); - - LONG lColor = (LONG)wxBLACK->GetPixel(); - - ::WinSetPresParam( m_hWnd - ,PP_FOREGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - lColor = (LONG)m_backgroundColour.GetPixel(); - - ::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - - SubclassWin(m_hWnd); - SetFont(*wxSMALL_FONT); - SetXComp(0); - SetYComp(0); - SetSize( nX, nY, nWidth, nHeight ); - - SetLabel(rsLabel); - - return true; -} // end of wxStaticText::Create - -wxSize wxStaticText::DoGetBestSize() const -{ - wxString sText(GetLabel()); - int nWidthTextMax = 0; - int nWidthLine = 0; - int nHeightTextTotal = 0; - int nHeightLineDefault = 0; - int nHeightLine = 0; - wxString sCurLine; - bool bLastWasTilde = false; - - for (const wxChar *pc = sText; ; pc++) - { - if ( *pc == wxT('\n') || *pc == wxT('\0') ) - { - if (!sCurLine ) - { - // - // We can't use GetTextExtent - it will return 0 for both width - // and height and an empty line should count in height - // calculation - // - if (!nHeightLineDefault) - nHeightLineDefault = nHeightLine; - if (!nHeightLineDefault) - GetTextExtent(wxT("W"), NULL, &nHeightLineDefault); - nHeightTextTotal += nHeightLineDefault; - } - else - { - GetTextExtent( sCurLine - ,&nWidthLine - ,&nHeightLine - ); - if (nWidthLine > nWidthTextMax) - nWidthTextMax = nWidthLine; - nHeightTextTotal += nHeightLine; - } - - if ( *pc == wxT('\n') ) - { - sCurLine.Empty(); - } - else - { - break; - } - } - else - { - // - // We shouldn't take into account the '~' which just introduces the - // mnemonic characters and so are not shown on the screen -- except - // when it is preceded by another '~' in which case it stands for a - // literal tilde - // - if (*pc == wxT('~')) - { - if (!bLastWasTilde) - { - bLastWasTilde = true; - - // - // Skip the statement adding pc to curLine below - // - continue; - } - - // - // It is a literal tilde - // - bLastWasTilde = false; - } - sCurLine += *pc; - } - } - return wxSize( nWidthTextMax - ,nHeightTextTotal - ); -} // end of wxStaticText::DoGetBestSize - -void wxStaticText::DoSetSize( - int nX -, int nY -, int nWidth -, int nHeight -, int nSizeFlags -) -{ - // - // We need to refresh the window after changing its size as the standard - // control doesn't always update itself properly. - // - wxStaticTextBase::DoSetSize( nX - ,nY - ,nWidth - ,nHeight - ,nSizeFlags - ); - - // eventually update label (if ellipsizing is on): - UpdateLabel(); - - Refresh(); -} // end of wxStaticText::DoSetSize - -bool wxStaticText::SetFont( - const wxFont& rFont -) -{ - bool bRet = wxControl::SetFont(rFont); - - // - // Adjust the size of the window to fit to the label unless autoresizing is - // disabled - // - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - { - DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT); - } - return bRet; -} // end of wxStaticText::SetFont - -void wxStaticText::SetLabel( - const wxString& rsLabel -) -{ - m_labelOrig = rsLabel; // save original label - - // OS/2 does not support ellipsized labels in static text: - DoSetLabel(GetEllipsizedLabel()); - - // - // Adjust the size of the window to fit to the label unless autoresizing is - // disabled - // - if (!(GetWindowStyle() & wxST_NO_AUTORESIZE) && - !IsEllipsized()) - { - wxCoord vX; - wxCoord vY; - wxCoord vWidth; - wxCoord vHeight; - - GetPosition(&vX, &vY); - GetSize(&vWidth, &vHeight); - if (!(vX == -1 && vY == -1 && vWidth == -1 && vHeight == -1)) - DoSetSize(vX, vY, vWidth, vHeight, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT); - else - DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT); - } -} // end of wxStaticText::SetLabel - -MRESULT wxStaticText::OS2WindowProc( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) -{ - return wxWindow::OS2WindowProc( uMsg - ,wParam - ,lParam - ); -} // end of wxStaticText::OS2WindowProc - - -// for wxST_ELLIPSIZE_* support: - -void wxStaticText::DoSetLabel(const wxString& str) -{ - wxString sLabel = ::wxPMTextToLabel(str); - ::WinSetWindowText(GetHwnd(), sLabel.c_str()); -} - -wxString wxStaticText::DoGetLabel() const -{ - return wxGetWindowText(GetHwnd()); -} - diff --git a/src/os2/stdpaths.cpp b/src/os2/stdpaths.cpp deleted file mode 100644 index d66be92580..0000000000 --- a/src/os2/stdpaths.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/stdpaths.cpp -// Purpose: wxStandardPaths implementation for OS/2 systems -// Author: Stefan Neis -// Modified by: -// Created: 2004-11-06 -// Copyright: (c) 2004 Stefan Neis -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_STDPATHS - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/app.h" -#endif //WX_PRECOMP - -#include "wx/filename.h" - -#include "wx/stdpaths.h" - - -// ============================================================================ -// wxStandardPaths implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// prefix management -// ---------------------------------------------------------------------------- - -wxString wxStandardPaths::m_prefix; - -void wxStandardPaths::SetInstallPrefix(const wxString& prefix) -{ - m_prefix = prefix; -} - -wxString wxStandardPaths::GetInstallPrefix() const -{ - if ( m_prefix.empty() ) - { - wxStandardPaths *self = const_cast(this); - - self->m_prefix = wxT("/usr/local"); - } - return m_prefix; -} - -// ---------------------------------------------------------------------------- -// public functions -// ---------------------------------------------------------------------------- - -wxString wxStandardPaths::GetConfigDir() const -{ - return m_prefix; -} - -wxString wxStandardPaths::GetUserConfigDir() const -{ - return wxFileName::GetHomeDir(); -} - -wxString wxStandardPaths::GetDataDir() const -{ - return GetInstallPrefix() + wxT("\\data"); -} - -wxString wxStandardPaths::GetUserDataDir() const -{ - return AppendAppInfo(wxFileName::GetHomeDir() + wxT("\\.")); -} - -wxString wxStandardPaths::GetPluginsDir() const -{ - return wxString(); -} - -#endif // wxUSE_STDPATHS diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp deleted file mode 100644 index 7f7fabda87..0000000000 --- a/src/os2/textctrl.cpp +++ /dev/null @@ -1,1354 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/textctrl.cpp -// Purpose: wxTextCtrl -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/textctrl.h" - -#ifndef WX_PRECOMP - #include "wx/scrolwin.h" - #include "wx/settings.h" - #include "wx/brush.h" - #include "wx/utils.h" - #include "wx/log.h" - #include "wx/app.h" -#endif - -#if wxUSE_CLIPBOARD - #include "wx/clipbrd.h" -#endif - -#include "wx/textfile.h" - -#include "wx/os2/private.h" - -#include -#include -#include - -#if wxUSE_IOSTREAMH -# include -#else -# include -#endif - -#if !defined(MLE_INDEX) -#define MLE_INDEX 0 -#define MLE_RGB 1 -#endif - - -// ---------------------------------------------------------------------------- -// event tables and other macros -// ---------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) - EVT_CHAR(wxTextCtrl::OnChar) - EVT_DROP_FILES(wxTextCtrl::OnDropFiles) - - EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) - EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy) - EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste) - EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo) - EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo) - - EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut) - EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy) - EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste) - EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) - EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) -END_EVENT_TABLE() - - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// creation -// ---------------------------------------------------------------------------- - -wxTextCtrl::wxTextCtrl() -{ -} - -wxTextCtrl::~wxTextCtrl() -{ -} - -bool wxTextCtrl::Create( - wxWindow* pParent -, wxWindowID vId -, const wxString& rsValue -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) -{ - // - // Base initialization - // - if ( !CreateBase( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - )) - return false; - - wxPoint vPos = rPos; // The OS/2 position - SWP vSwp; - - if (pParent ) - { - pParent->AddChild(this); - } - - m_windowStyle = lStyle; - m_bIsMLE = false; - m_bSkipUpdate = false; - - long lSstyle = WS_VISIBLE | WS_TABSTOP; - - // - // Single and multiline edit fields are two different controls in PM - // - if ( m_windowStyle & wxTE_MULTILINE ) - { - lSstyle |= MLS_BORDER | MLS_WORDWRAP; - m_bIsMLE = true; - - if ((m_windowStyle & wxTE_NO_VSCROLL) == 0) - lSstyle |= MLS_VSCROLL; - if (m_windowStyle & wxHSCROLL) - lSstyle |= MLS_HSCROLL; - if (m_windowStyle & wxTE_READONLY) - lSstyle |= MLS_READONLY; - } - else - { - lSstyle |= ES_LEFT | ES_AUTOSCROLL | ES_MARGIN; - - if (m_windowStyle & wxHSCROLL) - lSstyle |= ES_AUTOSCROLL; - if (m_windowStyle & wxTE_READONLY) - lSstyle |= ES_READONLY; - if (m_windowStyle & wxTE_PASSWORD) // hidden input - lSstyle |= ES_UNREADABLE; - } - - if (m_bIsMLE) - { - m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,WC_MLE // Window class - ,rsValue.c_str() // Initial Text - ,(ULONG)lSstyle // Style flags - ,(LONG)0 // X pos of origin - ,(LONG)0 // Y pos of origin - ,(LONG)0 // field width - ,(LONG)0 // field height - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(ULONG)vId // Window identifier - ,NULL // no control data - ,NULL // no Presentation parameters - ); - } - else - { - m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,WC_ENTRYFIELD // Window class - ,rsValue.c_str() // Initial Text - ,(ULONG)lSstyle // Style flags - ,(LONG)0 // X pos of origin - ,(LONG)0 // Y pos of origin - ,(LONG)0 // field width - ,(LONG)0 // field height - ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(ULONG)vId // Window identifier - ,NULL // no control data - ,NULL // no Presentation parameters - ); - } - - if (m_hWnd == 0) - { - return false; - } - - SubclassWin(GetHWND()); - - // - // Set font, position, size and initial value - // - wxFont* pTextFont = new wxFont( 8 - ,wxMODERN - ,wxNORMAL - ,wxNORMAL - ); - SetFont(*pTextFont); - if (!rsValue.empty()) - { - SetValue(rsValue); - } - SetupColours(); - // - // If X and/or Y are not zero the difference is the compensation value - // for margins for OS/2 controls. - // - ::WinQueryWindowPos(m_hWnd, &vSwp); - SetXComp(vSwp.x); - SetYComp(vSwp.y); - SetSize( vPos.x - GetXComp() - ,vPos.y - GetYComp() - ,rSize.x - ,rSize.y - ); - delete pTextFont; - return true; -} // end of wxTextCtrl::Create - -// -// Make sure the window style (etc.) reflects the HWND style (roughly) -// -void wxTextCtrl::AdoptAttributesFromHWND() -{ - HWND hWnd = GetHwnd(); - LONG lStyle = ::WinQueryWindowULong(hWnd, QWL_STYLE); - - wxWindow::AdoptAttributesFromHWND(); - - if (m_bIsMLE) - { - m_windowStyle |= wxTE_MULTILINE; - if (lStyle & MLS_READONLY) - m_windowStyle |= wxTE_READONLY; - } - else - { - if (lStyle & ES_UNREADABLE) - m_windowStyle |= wxTE_PASSWORD; - if (lStyle & ES_READONLY) - m_windowStyle |= wxTE_READONLY; - } -} // end of wxTextCtrl::AdoptAttributesFromHWND - -WXDWORD wxTextCtrl::OS2GetStyle( - long lStyle -, WXDWORD* pdwExstyle -) const -{ - // - // Default border for the text controls is the sunken one - // - if ((lStyle & wxBORDER_MASK) == wxBORDER_DEFAULT ) - { - lStyle |= wxBORDER_SUNKEN; - } - - long dwStyle = wxControl::OS2GetStyle( lStyle - ,pdwExstyle - ); - - dwStyle = WS_VISIBLE | WS_TABSTOP; - - // - // Single and multiline edit fields are two different controls in PM - // - if ( m_windowStyle & wxTE_MULTILINE ) - { - dwStyle |= MLS_BORDER | MLS_WORDWRAP; - if ((m_windowStyle & wxTE_NO_VSCROLL) == 0) - dwStyle |= MLS_VSCROLL; - if (m_windowStyle & wxHSCROLL) - dwStyle |= MLS_HSCROLL; - if (m_windowStyle & wxTE_READONLY) - dwStyle |= MLS_READONLY; - } - else - { - dwStyle |= ES_LEFT | ES_AUTOSCROLL | ES_MARGIN; - if (m_windowStyle & wxHSCROLL) - dwStyle |= ES_AUTOSCROLL; - if (m_windowStyle & wxTE_READONLY) - dwStyle |= ES_READONLY; - if (m_windowStyle & wxTE_PASSWORD) // hidden input - dwStyle |= ES_UNREADABLE; - } - return dwStyle; -} // end of wxTextCtrl::OS2GetStyle - -void wxTextCtrl::SetWindowStyleFlag( - long lStyle -) -{ - wxControl::SetWindowStyleFlag(lStyle); -} // end of wxTextCtrl::SetWindowStyleFlag - -void wxTextCtrl::SetupColours() -{ - wxColour vBkgndColour; - - vBkgndColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - SetBackgroundColour(vBkgndColour); - SetForegroundColour(GetParent()->GetForegroundColour()); - if (m_bIsMLE) - { - ::WinSendMsg( GetHwnd() - ,MLM_SETTEXTCOLOR - ,(MPARAM)GetParent()->GetForegroundColour().GetPixel() - ,(MPARAM)MLE_RGB - ); - } -} // end of wxTextCtrl::SetupColours - -// ---------------------------------------------------------------------------- -// set/get the controls text -// ---------------------------------------------------------------------------- - -wxString wxTextCtrl::GetValue() const -{ - wxString sStr = wxGetWindowText(GetHWND()); - wxCharBuffer buf(sStr.char_str()); - char* zStr = buf.data(); - - for ( ; *zStr; zStr++ ) - { - // - // this will replace \r\n with just \n - // - if (*zStr == '\n') - *zStr = '\0'; - if (*zStr == '\r') - *zStr = '\n'; - } - return zStr; -} // end of wxTextCtrl::GetValue - -void wxTextCtrl::DoSetValue( - const wxString& rsValue, - int flags -) -{ - // - // If the text is long enough, it's faster to just set it instead of first - // comparing it with the old one (chances are that it will be different - // anyhow, this comparison is there to avoid flicker for small single-line - // edit controls mostly) - // - if ((rsValue.length() > 0x400) || (rsValue != GetValue())) - { - if ( flags & SetValue_SendEvent ) - m_bSkipUpdate = true; - - ::WinSetWindowText(GetHwnd(), rsValue.c_str()); - AdjustSpaceLimit(); - } -} // end of wxTextCtrl::SetValue - -void wxTextCtrl::WriteText( - const wxString& rsValue -) -{ - if (m_bIsMLE) - ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM(rsValue.wx_str()), MPARAM(0)); - else - ::WinSetWindowText(GetHwnd(), rsValue.c_str()); - AdjustSpaceLimit(); -} // end of wxTextCtrl::WriteText - -void wxTextCtrl::AppendText( - const wxString& rsText -) -{ - SetInsertionPointEnd(); - WriteText(rsText); -} // end of wxTextCtrl::AppendText - -void wxTextCtrl::Clear() -{ - ::WinSetWindowText(GetHwnd(), ""); -} // end of wxTextCtrl::Clear - -bool wxTextCtrl::EmulateKeyPress( - const wxKeyEvent& rEvent -) -{ - SetFocus(); - return(wxTextCtrlBase::EmulateKeyPress(rEvent)); -} // end of wxTextCtrl::EmulateKeyPress - -// ---------------------------------------------------------------------------- -// Clipboard operations -// ---------------------------------------------------------------------------- - -void wxTextCtrl::Copy() -{ - if (CanCopy()) - { - HWND hWnd = GetHwnd(); - if (m_bIsMLE) - ::WinSendMsg(hWnd, MLM_COPY, 0, 0); - else - ::WinSendMsg(hWnd, EM_COPY, 0, 0); - } -} // end of wxTextCtrl::Copy - -void wxTextCtrl::Cut() -{ - if (CanCut()) - { - HWND hWnd = GetHwnd(); - - if (m_bIsMLE) - ::WinSendMsg(hWnd, MLM_CUT, 0, 0); - else - ::WinSendMsg(hWnd, EM_CUT, 0, 0); - } -} // end of wxTextCtrl::Cut - -void wxTextCtrl::Paste() -{ - if (CanPaste()) - { - HWND hWnd = GetHwnd(); - - ::WinSendMsg(hWnd, EM_PASTE, 0, 0); - } -} // end of wxTextCtrl::Paste - -bool wxTextCtrl::CanCopy() const -{ - // - // Can copy if there's a selection - // - long lFrom = 0L; - long lTo = 0L; - - GetSelection(&lFrom, &lTo); - return (lFrom != lTo); -} // end of wxTextCtrl::CanCopy - -bool wxTextCtrl::CanCut() const -{ - // - // Can cut if there's a selection - // - long lFrom = 0L; - long lTo = 0L; - - GetSelection(&lFrom, &lTo); - return (lFrom != lTo); -} // end of wxTextCtrl::CanCut - -bool wxTextCtrl::CanPaste() const -{ - bool bIsTextAvailable = false; - - if (!IsEditable()) - return false; - - // - // Check for straight text on clipboard - // - if (::WinOpenClipbrd(vHabmain)) - { - bIsTextAvailable = (::WinQueryClipbrdData(vHabmain, CF_TEXT) != 0); - ::WinCloseClipbrd(vHabmain); - } - return bIsTextAvailable; -} // end of wxTextCtrl::CanPaste - -// ---------------------------------------------------------------------------- -// Accessors -// ---------------------------------------------------------------------------- - -void wxTextCtrl::SetEditable( - bool bEditable -) -{ - HWND hWnd = GetHwnd(); - - if (m_bIsMLE) - ::WinSendMsg(hWnd, MLM_SETREADONLY, MPFROMLONG(!bEditable), (MPARAM)0); - else - ::WinSendMsg(hWnd, EM_SETREADONLY, MPFROMLONG(!bEditable), (MPARAM)0); -} // end of wxTextCtrl::SetEditable - -void wxTextCtrl::SetInsertionPoint( - long lPos -) -{ - HWND hWnd = GetHwnd(); - - if (m_bIsMLE) - ::WinSendMsg(hWnd, MLM_SETSEL, (MPARAM)lPos, (MPARAM)lPos); - else - ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lPos, (USHORT)lPos), (MPARAM)0); -} // end of wxTextCtrl::SetInsertionPoint - -void wxTextCtrl::SetInsertionPointEnd() -{ - wxTextPos lPos = GetLastPosition(); - - // - // We must not do anything if the caret is already there because calling - // SetInsertionPoint() thaws the controls if Freeze() had been called even - // if it doesn't actually move the caret anywhere and so the simple fact of - // doing it results in horrible flicker when appending big amounts of text - // to the control in a few chunks (see DoAddText() test in the text sample) - // - if (GetInsertionPoint() == GetLastPosition()) - return; - SetInsertionPoint(lPos); -} // end of wxTextCtrl::SetInsertionPointEnd - -long wxTextCtrl::GetInsertionPoint() const -{ - WXDWORD dwPos = 0L; - - if (m_bIsMLE) - dwPos = (WXDWORD)::WinSendMsg(GetHwnd(), MLM_QUERYSEL, (MPARAM)MLFQS_MINSEL, 0); - else - { - dwPos = (WXDWORD)::WinSendMsg(GetHwnd(), EM_QUERYSEL, 0, 0); - dwPos = SHORT1FROMMP((MPARAM)dwPos); // the first 16 bit value is the min pos - } - return (dwPos & 0xFFFF); -} // end of wxTextCtrl::GetInsertionPoint - -wxTextPos wxTextCtrl::GetLastPosition() const -{ - HWND hWnd = GetHwnd(); - long lCharIndex; - long lLineLength; - - if (m_bIsMLE) - { - lCharIndex = 0; - - // - // This just gets the total text length. The last will be this value - // - lLineLength = (long)::WinSendMsg(hWnd, MLM_QUERYTEXTLENGTH, 0, 0); - } - else - { - WNDPARAMS vParams; - - lCharIndex = 0; - vParams.fsStatus = WPM_CCHTEXT; - if (::WinSendMsg( GetHwnd() - ,WM_QUERYWINDOWPARAMS - ,&vParams - ,0 - )) - { - lLineLength = (long)vParams.cchText; - } - else - lLineLength = 0; - } - return(lCharIndex + lLineLength); -} // end of wxTextCtrl::GetLastPosition - -// If the return values from and to are the same, there is no -// selection. -void wxTextCtrl::GetSelection( - long* plFrom -, long* plTo -) const -{ - WXDWORD dwPos; - - if (m_bIsMLE) - dwPos = (WXDWORD)::WinSendMsg(GetHwnd(), MLM_QUERYSEL, (MPARAM)MLFQS_MINSEL, 0); - else - { - dwPos = (WXDWORD)::WinSendMsg(GetHwnd(), EM_QUERYSEL, 0, 0); - } - *plFrom = SHORT1FROMMP((MPARAM)dwPos); // the first 16 bit value is the min pos - *plTo = SHORT2FROMMP((MPARAM)dwPos); // the first 16 bit value is the min pos -} // end of wxTextCtrl::GetSelection - -bool wxTextCtrl::IsEditable() const -{ - if (m_bIsMLE) - return((bool)LONGFROMMR(::WinSendMsg(GetHwnd(), MLM_QUERYREADONLY, 0, 0))); - else - return((bool)LONGFROMMR(::WinSendMsg(GetHwnd(), EM_QUERYREADONLY, 0, 0))); -} // end of wxTextCtrl::IsEditable - -// ---------------------------------------------------------------------------- -// Editing -// ---------------------------------------------------------------------------- - -void wxTextCtrl::Replace( long lFrom, - long lTo, - const wxString& rsValue ) -{ -#if wxUSE_CLIPBOARD - HWND hWnd = GetHwnd(); - - // - // Set selection and remove it - // - if (m_bIsMLE) - { - ::WinSendMsg(hWnd, MLM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0); - ::WinSendMsg(hWnd, MLM_CUT, 0, 0); - } - else - { - ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0); - ::WinSendMsg(hWnd, EM_CUT, 0, 0); - } - - // - // Now replace with 'value', by pasting. - // - wxSetClipboardData(wxDF_TEXT, (wxObject *) (const wxChar *)rsValue, 0, 0); - - // Paste into edit control - if (m_bIsMLE) - ::WinSendMsg(hWnd, MLM_PASTE, (MPARAM)0, (MPARAM)0); - else - ::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0); -#else - wxUnusedVar(lFrom); - wxUnusedVar(lTo); - wxUnusedVar(rsValue); - wxFAIL_MSG("wxTextCtrl::Replace not implemented if wxUSE_CLIPBOARD is 0."); -#endif -} // end of wxTextCtrl::Replace - -void wxTextCtrl::Remove( - long lFrom -, long lTo -) -{ - HWND hWnd = GetHwnd(); - - if (m_bIsMLE) - { - ::WinSendMsg(hWnd, MLM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0); - ::WinSendMsg(hWnd, MLM_CUT, 0, 0); - } - else - { - ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0); - ::WinSendMsg(hWnd, EM_CUT, 0, 0); - } -} // end of wxTextCtrl::Remove - -void wxTextCtrl::SetSelection( - long lFrom -, long lTo -) -{ - HWND hWnd = GetHwnd(); - long lFromChar = lFrom; - long lToChar = lTo; - - // - // If from and to are both -1, it means (in wxWidgets) that all text should - // be selected. Translate into Windows convention - // - if ((lFrom == -1L) && (lTo == -1L)) - { - lFromChar = 0L; - lToChar = -1L; - } - if (m_bIsMLE) - ::WinSendMsg(hWnd, MLM_SETSEL, (MPARAM)lFromChar, (MPARAM)lToChar); - else - ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFromChar, (USHORT)lToChar), (MPARAM)0); -} // end of wxTextCtrl::SetSelection - -bool wxTextCtrl::DoLoadFile( - const wxString& rsFile, - int fileType -) -{ - if ( wxTextCtrlBase::DoLoadFile(rsFile, fileType) ) - { - // - // Update the size limit if needed - // - AdjustSpaceLimit(); - return true; - } - return false; -} // end of wxTextCtrl::DoLoadFile - -bool wxTextCtrl::IsModified() const -{ - bool bRc; - - if (m_bIsMLE) - bRc = (bool)LONGFROMMR(::WinSendMsg(GetHwnd(), MLM_QUERYCHANGED, 0, 0)); - else - bRc = (bool)LONGFROMMR(::WinSendMsg(GetHwnd(), EM_QUERYCHANGED, 0, 0)); - return bRc; -} // end of wxTextCtrl::IsModified - -void wxTextCtrl::MarkDirty() -{ - if (m_bIsMLE) - ::WinSendMsg(GetHwnd(), MLM_SETCHANGED, MPFROMLONG(TRUE), 0); - else - // EM controls do not have a SETCHANGED, what can we do?? - wxFAIL_MSG( wxT("not implemented") ); -} - -// -// Makes 'unmodified' -// -void wxTextCtrl::DiscardEdits() -{ - if (m_bIsMLE) - ::WinSendMsg(GetHwnd(), MLM_SETCHANGED, MPFROMLONG(FALSE), 0); - else - // - // EM controls do not have a SETCHANGED but issuing a query should reset it - // - ::WinSendMsg(GetHwnd(), EM_QUERYCHANGED, 0, 0); -} // end of wxTextCtrl::DiscardEdits - -int wxTextCtrl::GetNumberOfLines() const -{ - int nNumLines; - - if (m_bIsMLE) - nNumLines = (int)::WinSendMsg(GetHwnd(), MLM_QUERYLINECOUNT, 0, 0); - else - nNumLines = 1; - return nNumLines; -} // end of wxTextCtrl::GetNumberOfLines - -long wxTextCtrl::XYToPosition( - long lX -, long lY -) const -{ - long lCharIndex = 0L; - long lLen; - - if (m_bIsMLE) - { - lLen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYLINELENGTH, 0, 0); - lCharIndex = ((lLen * lY) + lX); - } - else - lCharIndex = lX; - return lCharIndex; -} // end of wxTextCtrl::XYToPosition - -bool wxTextCtrl::PositionToXY( - long lPos -, long* plX -, long* plY -) const -{ - HWND hWnd = GetHwnd(); - long nLineNo = -1; - long lCharIndex = 0; - - if (m_bIsMLE) - nLineNo = (long)::WinSendMsg(hWnd, MLM_LINEFROMCHAR, (MPARAM)lPos, 0); - else - nLineNo = 0; - - if (nLineNo == -1) - { - // no such line - return false; - } - - // - // This gets the char index for the _beginning_ of this line - // - long lLineWidth; - - if (m_bIsMLE) - { - lLineWidth = (long)::WinSendMsg(hWnd, MLM_QUERYLINELENGTH, (MPARAM)0, (MPARAM)0); - lCharIndex = (nLineNo + 1) * lLineWidth; - } - else - { - WNDPARAMS vParams; - - vParams.fsStatus = WPM_CCHTEXT; - if (::WinSendMsg( hWnd - ,WM_QUERYWINDOWPARAMS - ,&vParams - ,0 - )) - { - lCharIndex = vParams.cchText; - } - else - lCharIndex = 32; - } - - if (lCharIndex == -1) - { - return false; - } - - // - // The X position must therefore be the difference between pos and charIndex - // - if (plX) - *plX = lPos - lCharIndex; - if (plY) - *plY = nLineNo; - - return true; -} // end of wxTextCtrl::PositionToXY - -void wxTextCtrl::ShowPosition( long WXUNUSED(lPos) ) -{ - HWND hWnd = GetHwnd(); - long lCurrentLineLineNo = 0L; - - // To scroll to a position, we pass the number of lines and characters - // to scroll *by*. This means that we need to: - // (1) Find the line position of the current line. - // (2) Find the line position of pos. - // (3) Scroll by (pos - current). - // For now, ignore the horizontal scrolling. - - // - // Is this where scrolling is relative to - the line containing the caret? - // Or is the first visible line??? Try first visible line. - // - if (m_bIsMLE) - { - // - // In PM this is the actual char position - // - lCurrentLineLineNo = (long)::WinSendMsg(hWnd, MLM_QUERYFIRSTCHAR, (MPARAM)0, (MPARAM)0); - - // - // This will cause a scroll to the selected position - // - ::WinSendMsg(hWnd, MLM_SETSEL, (MPARAM)lCurrentLineLineNo, (MPARAM)lCurrentLineLineNo); - } -} // end of wxTextCtrl::ShowPosition - -int wxTextCtrl::GetLineLength( long WXUNUSED(lLineNo) ) const -{ - long lLen = 0L; - - if (m_bIsMLE) - { - lLen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYLINELENGTH, 0, 0); - } - else - { - WNDPARAMS vParams; - - vParams.fsStatus = WPM_CCHTEXT; - if (::WinSendMsg( GetHwnd() - ,WM_QUERYWINDOWPARAMS - ,&vParams - ,0 - )) - { - lLen = vParams.cchText; - } - else - lLen = 32; - } - return lLen; -} // end ofwxTextCtrl::GetLineLength - -wxString wxTextCtrl::GetLineText( - long lLineNo -) const -{ - long lLen = (long)GetLineLength((long)lLineNo) + 1; - wxString sStr; - wxChar* zBuf; - - // - // There must be at least enough place for the length WORD in the - // buffer - // - lLen += sizeof(WORD); - zBuf = new wxChar[lLen]; - if (m_bIsMLE) - { - long lIndex; - long lBuflen; - long lCopied; - - lLen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYLINELENGTH, 0, 0); - lIndex = lLen * lLineNo; - - ::WinSendMsg(GetHwnd(), MLM_SETSEL, (MPARAM)lIndex, (MPARAM)lIndex); - ::WinSendMsg(GetHwnd(), MLM_SETIMPORTEXPORT, MPFROMP(zBuf), MPFROMSHORT((USHORT)WXSIZEOF(zBuf))); - lBuflen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYFORMATTEXTLENGTH, MPFROMLONG(lIndex), MPFROMLONG(-1)); - lCopied = (long)::WinSendMsg(GetHwnd(), MLM_EXPORT, MPFROMP(&lIndex), MPFROMP(&lBuflen)); - zBuf[lCopied] = '\0'; - } - else - { - WNDPARAMS vParams; - - vParams.fsStatus = WPM_CCHTEXT; - if (::WinSendMsg( GetHwnd() - ,WM_QUERYWINDOWPARAMS - ,&vParams - ,0 - )) - memcpy((char*)zBuf, vParams.pszText, vParams.cchText); - zBuf[vParams.cchText] = '\0'; - } - sStr = zBuf; - delete [] zBuf; - return sStr; -} // end of wxTextCtrl::GetLineText - -// ---------------------------------------------------------------------------- -// Undo/redo -// ---------------------------------------------------------------------------- - -void wxTextCtrl::Undo() -{ - if (CanUndo()) - { - if (m_bIsMLE) - ::WinSendMsg(GetHwnd(), MLM_UNDO, 0, 0); - // Simple entryfields cannot be undone - } -} // end of wxTextCtrl::Undo - -void wxTextCtrl::Redo() -{ - if (CanRedo()) - { - if (m_bIsMLE) - ::WinSendMsg(GetHwnd(), MLM_UNDO, 0, 0); - // Simple entryfields cannot be undone - } -} // end of wxTextCtrl::Redo - -bool wxTextCtrl::CanUndo() const -{ - bool bOk; - - if (m_bIsMLE) - bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0); - else - bOk = false; // can't undo regular edit fields in PM - return bOk; -} // end of wxTextCtrl::CanUndo - -bool wxTextCtrl::CanRedo() const -{ - bool bOk; - - if (m_bIsMLE) - bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0); - else - bOk = false; // can't undo regular edit fields in PM - return bOk; -} // end of wxTextCtrl::CanRedo - -// ---------------------------------------------------------------------------- -// implemenation details -// ---------------------------------------------------------------------------- - -void wxTextCtrl::Command( - wxCommandEvent& rEvent -) -{ - SetValue(rEvent.GetString()); - ProcessCommand (rEvent); -} // end of wxTextCtrl::Command - -void wxTextCtrl::OnDropFiles( - wxDropFilesEvent& rEvent -) -{ - // By default, load the first file into the text window. - if (rEvent.GetNumberOfFiles() > 0) - { - LoadFile(rEvent.GetFiles()[0]); - } -} // end of wxTextCtrl::OnDropFiles - -WXHBRUSH wxTextCtrl::OnCtlColor( WXHDC hWxDC, - WXHWND WXUNUSED(hWnd), - WXUINT WXUNUSED(uCtlColor), - WXUINT WXUNUSED(uMessage), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam) ) -{ - HPS hPS = (HPS)hWxDC; - wxColour vColBack = GetBackgroundColour(); - wxColour vColFore = GetForegroundColour(); - wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( vColBack, wxSOLID ); - - if (m_bUseCtl3D) - { - HBRUSH hBrush = NULLHANDLE; - - return hBrush; - } - if (GetParent()->GetTransparentBackground()) - ::GpiSetBackMix(hPS, BM_LEAVEALONE); - else - ::GpiSetBackMix(hPS, BM_OVERPAINT); - if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0) - vColBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - ::GpiSetBackColor(hPS, vColBack.GetPixel()); - ::GpiSetColor(hPS, vColFore.GetPixel()); - return (WXHBRUSH)pBackgroundBrush->GetResourceHandle(); -} // end of wxTextCtrl::OnCtlColor - -bool wxTextCtrl::OS2ShouldPreProcessMessage( - WXMSG* pMsg -) -{ - return wxControl::OS2ShouldPreProcessMessage(pMsg); -} // end of wxTextCtrl::OS2ShouldPreProcessMessage - -void wxTextCtrl::OnChar( - wxKeyEvent& rEvent -) -{ - switch (rEvent.GetKeyCode()) - { - case WXK_RETURN: - if ( !(m_windowStyle & wxTE_MULTILINE) ) - { - wxCommandEvent vEvent(wxEVT_TEXT_ENTER, m_windowId); - - vEvent.SetEventObject(this); - if ( HandleWindowEvent(vEvent)) - return; - } - //else: multiline controls need Enter for themselves - - break; - - case WXK_TAB: - // always produce navigation event - even if we process TAB - // ourselves the fact that we got here means that the user code - // decided to skip processing of this TAB - probably to let it - // do its default job. - // - // NB: Notice that Ctrl-Tab is handled elsewhere and Alt-Tab is - // handled by Windows - { - wxNavigationKeyEvent vEventNav; - - vEventNav.SetDirection(!rEvent.ShiftDown()); - vEventNav.SetWindowChange(false); - vEventNav.SetEventObject(this); - - if ( HandleWindowEvent(vEventNav) ) - return; - } - break; - } - rEvent.Skip(); -} // end of wxTextCtrl::OnChar - -bool wxTextCtrl::OS2Command( - WXUINT uParam -, WXWORD WXUNUSED(vId) -) -{ - switch (uParam) - { - case EN_SETFOCUS: - case EN_KILLFOCUS: - { - wxFocusEvent vEvent( uParam == EN_KILLFOCUS ? wxEVT_KILL_FOCUS - : wxEVT_SET_FOCUS - ,m_windowId - ); - - vEvent.SetEventObject(this); - HandleWindowEvent(vEvent); - } - break; - - case EN_CHANGE: - { - if (m_bSkipUpdate) - { - m_bSkipUpdate = false; - break; - } - - wxCommandEvent vEvent( wxEVT_TEXT - ,m_windowId - ); - - InitCommandEvent(vEvent); - ProcessCommand(vEvent); - } - break; - - case EN_OVERFLOW: - // - // The text size limit has been hit - increase it - // - AdjustSpaceLimit(); - break; - - case EN_SCROLL: - case EN_INSERTMODETOGGLE: - case EN_MEMERROR: - return false; - default: - return false; - } - - // - // Processed - // - return true; -} // end of wxTextCtrl::OS2Command - -void wxTextCtrl::AdjustSpaceLimit() -{ - unsigned int uLen = 0; - unsigned int uLimit = 0; - - uLen = ::WinQueryWindowTextLength(GetHwnd()); - if (m_bIsMLE) - { - uLimit = (unsigned int)::WinSendMsg( GetHwnd() - ,MLM_QUERYTEXTLIMIT - ,0 - ,0 - ); - } - else - { - ENTRYFDATA Efd; - WNDPARAMS vParams; - - vParams.fsStatus = WPM_CBCTLDATA; - vParams.pCtlData = &Efd; - vParams.cbCtlData = sizeof(ENTRYFDATA); - - if (::WinSendMsg( GetHwnd() - ,WM_QUERYWINDOWPARAMS - ,&vParams - ,0 - )) - uLimit = (unsigned int)Efd.cchEditLimit; - else - uLimit = 32; //PM's default - } - if (uLen >= uLimit) - { - if (m_bIsMLE) - { - uLimit = uLen + 0x8000; // 32Kb - if (uLimit > 0xffff) - { - uLimit = 0L; - } - } - else - uLimit = 0x7fff; - - if (m_bIsMLE) - ::WinSendMsg(GetHwnd(), MLM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0); - else - ::WinSendMsg(GetHwnd(), EM_SETTEXTLIMIT, MPFROMSHORT(uLimit), 0); - } -} // end of wxTextCtrl::AdjustSpaceLimit - -bool wxTextCtrl::AcceptsFocus() const -{ - // - // We don't want focus if we can't be edited unless we're a multiline - // control because then it might be still nice to get focus from keyboard - // to be able to scroll it without mouse - // - return (IsEditable() || IsMultiLine()) && wxControl::AcceptsFocus(); -} // end of wxTextCtrl::Command - -wxSize wxTextCtrl::DoGetBestSize() const -{ - int nCx; - int nCy; - wxFont vFont = (wxFont)GetFont(); - - wxGetCharSize(GetHWND(), &nCx, &nCy, &vFont); - - int wText = DEFAULT_ITEM_WIDTH; - int hText = (int)(EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * .8); - - if (m_windowStyle & wxTE_MULTILINE) - { - hText *= wxMax(GetNumberOfLines(), 5); - } - //else: for single line control everything is ok - return wxSize(wText, hText); -} // end of wxTextCtrl::DoGetBestSize - -// ---------------------------------------------------------------------------- -// standard handlers for standard edit menu events -// ---------------------------------------------------------------------------- - -void wxTextCtrl::OnCut( wxCommandEvent& WXUNUSED(rEvent) ) -{ - Cut(); -} // end of wxTextCtrl::OnCut - -void wxTextCtrl::OnCopy( wxCommandEvent& WXUNUSED(rEvent) ) -{ - Copy(); -} // end of wxTextCtrl::OnCopy - -void wxTextCtrl::OnPaste( wxCommandEvent& WXUNUSED(rEvent) ) -{ - Paste(); -} // end of wxTextCtrl::OnPaste - -void wxTextCtrl::OnUndo( wxCommandEvent& WXUNUSED(rEvent) ) -{ - Undo(); -} // end of wxTextCtrl::OnUndo - -void wxTextCtrl::OnRedo( wxCommandEvent& WXUNUSED(rEvent) ) -{ - Redo(); -} // end of wxTextCtrl::OnRedo - -void wxTextCtrl::OnDelete( wxCommandEvent& WXUNUSED(rEvent) ) -{ - long lFrom, lTo; - - GetSelection( &lFrom, &lTo ); - - if (lFrom != -1 && lTo != -1) - Remove( lFrom, lTo ); -} // end of wxTextCtrl::OnDelete - -void wxTextCtrl::OnSelectAll( wxCommandEvent& WXUNUSED(rEvent) ) -{ - SetSelection(-1, -1); -} // end of wxTextCtrl::OnSelectAll - -void wxTextCtrl::OnUpdateCut( wxUpdateUIEvent& rEvent ) -{ - rEvent.Enable(CanCut()); -} // end of wxTextCtrl::OnUpdateCut - -void wxTextCtrl::OnUpdateCopy( wxUpdateUIEvent& rEvent ) -{ - rEvent.Enable(CanCopy()); -} // end of wxTextCtrl::OnUpdateCopy - -void wxTextCtrl::OnUpdatePaste( wxUpdateUIEvent& rEvent ) -{ - rEvent.Enable(CanPaste()); -} // end of wxTextCtrl::OnUpdatePaste - -void wxTextCtrl::OnUpdateUndo( wxUpdateUIEvent& rEvent ) -{ - rEvent.Enable(CanUndo()); -} // end of wxTextCtrl::OnUpdateUndo - -void wxTextCtrl::OnUpdateRedo( wxUpdateUIEvent& rEvent ) -{ - rEvent.Enable(CanRedo()); -} // end of wxTextCtrl::OnUpdateRedo - -void wxTextCtrl::OnUpdateDelete( wxUpdateUIEvent& rEvent ) -{ - long lFrom, lTo; - - GetSelection( &lFrom, &lTo ); - rEvent.Enable( lFrom != -1L && lTo != -1L && lFrom != lTo && IsEditable()) ; -} // end of wxTextCtrl::OnUpdateDelete - -void wxTextCtrl::OnUpdateSelectAll( wxUpdateUIEvent& rEvent ) -{ - rEvent.Enable(GetLastPosition() > 0); -} // end of wxTextCtrl::OnUpdateSelectAll - -bool wxTextCtrl::SetBackgroundColour( const wxColour& rColour ) -{ - if (m_bIsMLE) - ::WinSendMsg(GetHwnd(), MLM_SETBACKCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX); - return true; -} // end of wxTextCtrl::SetBackgroundColour - -bool wxTextCtrl::SetForegroundColour( const wxColour& rColour ) -{ - if (m_bIsMLE) - ::WinSendMsg(GetHwnd(), MLM_SETTEXTCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX); - return true; -} // end of wxTextCtrl::SetForegroundColour - -bool wxTextCtrl::SetStyle( long lStart, - long lEnd, - const wxTextAttr& WXUNUSED(rStyle) ) -{ - HWND hWnd = GetHwnd(); - - if (lStart > lEnd) - { - long lTmp = lStart; - - lStart = lEnd; - lEnd = lTmp; - } - - // - // We can only change the format of the selection, so select the range we - // want and restore the old selection later - // - long lStartOld, lEndOld; - - GetSelection( &lStartOld, &lEndOld ); - - // - // But do we really have to change the selection? - // - bool bChangeSel = lStart != lStartOld || - lEnd != lEndOld; - - if (bChangeSel) - { - if (m_bIsMLE) - ::WinSendMsg(hWnd, MLM_SETSEL, MPFROM2SHORT((USHORT)lStart, (USHORT)lEnd), 0); - else - ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lStart, (USHORT)lEnd), 0); - } - - // - // TODO:: finish this part - // - return true; -} // end of wxTextCtrl::SetStyle diff --git a/src/os2/textentry.cpp b/src/os2/textentry.cpp deleted file mode 100644 index 8d2f321977..0000000000 --- a/src/os2/textentry.cpp +++ /dev/null @@ -1,205 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/textentry.cpp -// Purpose: wxTextEntry implementation for wxOS2 -// Author: Stefan Neis -// Created: 2007-11-18 -// Copyright: (c) 2007 Stefan Neis -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/arrstr.h" - #include "wx/string.h" -#endif // WX_PRECOMP - -#if wxUSE_TEXTCTRL || wxUSE_COMBOBOX - -#include "wx/textentry.h" -#include "wx/dynlib.h" - -#include "wx/os2/private.h" - -#define GetEditHwnd() ((HWND)(GetEditHWND())) - -// ============================================================================ -// wxTextEntry implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// operations on text -// ---------------------------------------------------------------------------- - -void wxTextEntry::WriteText(const wxString& text) -{ - wxString newText = wxGetWindowText(GetEditHWND()); - long from, to; - GetSelection(&from, &to); - if (from > to){ - long swp = to; - to = from; - from = swp; - } - // Compose the new Text by replacing the selection of the old text - newText.replace(from, to - from, text); - // Set control to the new text - ::WinSetWindowText(GetEditHwnd(), text.c_str()); -} - -wxString wxTextEntry::DoGetValue() const -{ - return wxGetWindowText(GetEditHWND()); -} - -void wxTextEntry::Remove(long from, long to) -{ - DoSetSelection(from, to, SetSel_NoScroll); - WriteText(wxString()); -} - -// ---------------------------------------------------------------------------- -// clipboard operations -// ---------------------------------------------------------------------------- - -void wxTextEntry::Copy() -{ - ::WinSendMsg(GetEditHwnd(), EM_COPY, 0, 0); -} - -void wxTextEntry::Cut() -{ - ::WinSendMsg(GetEditHwnd(), EM_CUT, 0, 0); -} - -void wxTextEntry::Paste() -{ - ::WinSendMsg(GetEditHwnd(), EM_PASTE, 0, 0); -} - -// ---------------------------------------------------------------------------- -// undo/redo -// ---------------------------------------------------------------------------- - -void wxTextEntry::Undo() -{ -} - -void wxTextEntry::Redo() -{ - // same as Undo, since Undo undoes the undo - Undo(); - return; -} - -bool wxTextEntry::CanUndo() const -{ - return false; -} - -bool wxTextEntry::CanRedo() const -{ - // see comment in Redo() - return CanUndo(); -} - -// ---------------------------------------------------------------------------- -// insertion point and selection -// ---------------------------------------------------------------------------- - -void wxTextEntry::SetInsertionPoint(long pos) -{ - // be careful to call DoSetSelection() which is overridden in wxTextCtrl - // and not just SetSelection() here - DoSetSelection(pos, pos); -} - -long wxTextEntry::GetInsertionPoint() const -{ - long from; - GetSelection(&from, NULL); - return from; -} - -long wxTextEntry::GetLastPosition() const -{ - WNDPARAMS vParams; - - vParams.fsStatus = WPM_CCHTEXT; - if (::WinSendMsg( GetEditHwnd() - ,WM_QUERYWINDOWPARAMS - ,&vParams - ,0 - )) - { - return vParams.cchText; - } - return 0; -} - -void wxTextEntry::DoSetSelection(long from, long to, int WXUNUSED(flags)) -{ - // if from and to are both -1, it means (in wxWidgets) that all text should - // be selected, translate this into Windows convention - if ( (from == -1) && (to == -1) ) - { - from = 0; - } - - ::WinSendMsg(GetEditHwnd(), EM_SETSEL, MPFROM2SHORT((USHORT)from, (USHORT)to), 0); -} - -void wxTextEntry::GetSelection(long *from, long *to) const -{ - long dwPos; - dwPos = (long)::WinSendMsg(GetEditHwnd(), EM_QUERYSEL, 0, 0); - - if ( from ) - *from = SHORT1FROMMP((MPARAM)dwPos); - if ( to ) - *to = SHORT2FROMMP((MPARAM)dwPos); -} - -// ---------------------------------------------------------------------------- -// editable state -// ---------------------------------------------------------------------------- - -bool wxTextEntry::IsEditable() const -{ - return (bool)LONGFROMMR(::WinSendMsg(GetEditHwnd(), EM_QUERYREADONLY, 0, 0)); -} - -void wxTextEntry::SetEditable(bool editable) -{ - ::WinSendMsg(GetEditHwnd(), EM_SETREADONLY, MPFROMLONG(!editable), 0); -} - -// ---------------------------------------------------------------------------- -// max length -// ---------------------------------------------------------------------------- - -void wxTextEntry::SetMaxLength(unsigned long len) -{ - if ( len >= 0x7fff ) - { - // this will set it to a platform-specific maximum (32Kb under OS/2) - len = 0x7fff; - } - - ::WinSendMsg(GetEditHwnd(), EM_SETTEXTLIMIT, MPFROMSHORT(len), 0); -} - -#endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX diff --git a/src/os2/tglbtn.cpp b/src/os2/tglbtn.cpp deleted file mode 100644 index 86e5dc030c..0000000000 --- a/src/os2/tglbtn.cpp +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/tglbtn.cpp -// Purpose: Definition of the wxToggleButton class, which implements a -// toggle button under wxMSW. -// Author: John Norris, minor changes by Axel Schlueter -// and William Gallafent. -// Modified by: -// Created: 08.02.01 -// Copyright: (c) 2000 Johnny C. Norris II -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declatations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TOGGLEBTN - -#include "wx/tglbtn.h" - -#ifndef WX_PRECOMP - #include "wx/button.h" - #include "wx/brush.h" - #include "wx/dcscreen.h" - #include "wx/settings.h" - - #include "wx/log.h" -#endif // WX_PRECOMP - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl) -wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent ); - -#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10) - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxToggleButton -// ---------------------------------------------------------------------------- - -bool wxToggleButton::OS2Command(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) -{ - wxCommandEvent event(wxEVT_TOGGLEBUTTON, m_windowId); - event.SetInt(GetValue()); - event.SetEventObject(this); - ProcessCommand(event); - return true; -} - -// Single check box item -bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) -{ - if ( !CreateControl(parent, id, pos, size, style, validator, name) ) - return false; - - if ( !OS2CreateControl(wxT("BUTTON"), label, pos, size, 0) ) - return false; - - return true; -} - -wxBorder wxToggleButton::GetDefaultBorder() const -{ - return wxBORDER_NONE; -} - -WXDWORD wxToggleButton::OS2GetStyle(long style, WXDWORD *exstyle) const -{ - WXDWORD msStyle = wxControl::OS2GetStyle(style, exstyle); - -#ifndef BS_PUSHLIKE -#define BS_PUSHLIKE 0x00001000L -#endif - - msStyle |= BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP; - - return msStyle; -} - -wxSize wxToggleButton::DoGetBestSize() const -{ - wxString label = wxGetWindowText(GetHWND()); - int wBtn; - wxFont vFont = GetFont(); - int wChar; - int hChar; - - GetTextExtent(label, &wBtn, NULL); - - - wxGetCharSize(GetHWND(), &wChar, &hChar, &vFont); - - // add a margin - the button is wider than just its label - wBtn += 3*wChar; - - // the button height is proportional to the height of the font used - int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar); - -#if wxUSE_BUTTON - wxSize sz = wxButton::GetDefaultSize(); - if (wBtn > sz.x) - sz.x = wBtn; - if (hBtn > sz.y) - sz.y = hBtn; -#else - wxSize sz(wBtn, hBtn); -#endif - - return sz; -} - -void wxToggleButton::SetValue(bool val) -{ - ::WinSendMsg(GetHwnd(), BM_SETCHECK, MPFROMSHORT(val), (MPARAM)0); -} - -#ifndef BST_CHECKED -#define BST_CHECKED 0x0001 -#endif - -bool wxToggleButton::GetValue() const -{ - return (::WinSendMsg(GetHwnd(), BM_QUERYCHECK, 0, 0) == (MRESULT)BST_CHECKED); -} - -void wxToggleButton::Command(wxCommandEvent & event) -{ - SetValue((event.GetInt() != 0)); - ProcessCommand(event); -} - -#endif // wxUSE_TOGGLEBTN diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp deleted file mode 100644 index f3277d5332..0000000000 --- a/src/os2/thread.cpp +++ /dev/null @@ -1,1064 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/thread.cpp -// Purpose: wxThread Implementation -// Author: Original from Wolfram Gloger/Guilhem Lavaux/David Webster -// Modified by: Stefan Neis -// Created: 04/22/98 -// Copyright: (c) Stefan Neis (2003) -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_THREADS - -#include "wx/thread.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/app.h" - #include "wx/module.h" -#endif //WX_PRECOMP - -#include "wx/apptrait.h" -#include "wx/utils.h" - -#include - -#define INCL_DOSSEMAPHORES -#define INCL_DOSPROCESS -#define INCL_DOSMISC -#define INCL_ERRORS -#include -#ifndef __EMX__ -#include -#endif -// the possible states of the thread ("=>" shows all possible transitions from -// this state) -enum wxThreadState -{ - STATE_NEW, // didn't start execution yet (=> RUNNING) - STATE_RUNNING, // thread is running (=> PAUSED, CANCELED) - STATE_PAUSED, // thread is temporarily suspended (=> RUNNING) - STATE_CANCELED, // thread should terminate a.s.a.p. (=> EXITED) - STATE_EXITED // thread is terminating -}; - -// ---------------------------------------------------------------------------- -// this module's globals -// ---------------------------------------------------------------------------- - -// id of the main thread - the one which can call GUI functions without first -// calling wxMutexGuiEnter() -wxThreadIdType wxThread::ms_idMainThread = 0; -wxMutex* p_wxMainMutex; - -// OS2 substitute for Tls pointer the current parent thread object -wxThread* m_pThread; // pointer to the wxWidgets thread object - -// if it's false, some secondary thread is holding the GUI lock -static bool gs_bGuiOwnedByMainThread = true; - -// critical section which controls access to all GUI functions: any secondary -// thread (i.e. except the main one) must enter this crit section before doing -// any GUI calls -static wxCriticalSection *gs_pCritsectGui = NULL; - -// critical section which protects s_nWaitingForGui variable -static wxCriticalSection *gs_pCritsectWaitingForGui = NULL; - -// number of threads waiting for GUI in wxMutexGuiEnter() -static size_t gs_nWaitingForGui = 0; - -// are we waiting for a thread termination? -static bool gs_bWaitingForThread = false; - -// ============================================================================ -// OS/2 implementation of thread and related classes -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxMutex implementation -// ---------------------------------------------------------------------------- -class wxMutexInternal -{ -public: - wxMutexInternal(wxMutexType mutexType); - ~wxMutexInternal(); - - bool IsOk() const { return m_vMutex != NULL; } - - wxMutexError Lock() { return LockTimeout(SEM_INDEFINITE_WAIT); } - wxMutexError Lock(unsigned long ms) { return LockTimeout(ms); } - wxMutexError TryLock(); - wxMutexError Unlock(); - -private: - wxMutexError LockTimeout(ULONG ulMilliseconds); - HMTX m_vMutex; -}; - -// all mutexes are "pseudo-"recursive under OS2 so we don't use mutexType -// (Calls to DosRequestMutexSem and DosReleaseMutexSem can be nested, but -// the request count for a semaphore cannot exceed 65535. If an attempt is -// made to exceed this number, ERROR_TOO_MANY_SEM_REQUESTS is returned.) -wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(eMutexType)) -{ - APIRET ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE); - if (ulrc != 0) - { - wxLogSysError(_("Cannot create mutex.")); - m_vMutex = NULL; - } -} - -wxMutexInternal::~wxMutexInternal() -{ - if (m_vMutex) - { - if (::DosCloseMutexSem(m_vMutex)) - { - wxLogLastError(wxT("DosCloseMutexSem(mutex)")); - } - } -} - -wxMutexError wxMutexInternal::TryLock() -{ - const wxMutexError rc = LockTimeout( SEM_IMMEDIATE_RETURN ); - - // we have a special return code for timeout in this case - return rc == wxMUTEX_TIMEOUT ? wxMUTEX_BUSY : rc; -} - -wxMutexError wxMutexInternal::LockTimeout(ULONG ulMilliseconds) -{ - APIRET ulrc; - - ulrc = ::DosRequestMutexSem(m_vMutex, ulMilliseconds); - - switch (ulrc) - { - case ERROR_TIMEOUT: - return wxMUTEX_TIMEOUT; - case ERROR_TOO_MANY_SEM_REQUESTS: - return wxMUTEX_BUSY; - - case NO_ERROR: - // ok - break; - - case ERROR_INVALID_HANDLE: - case ERROR_INTERRUPT: - case ERROR_SEM_OWNER_DIED: - wxLogSysError(_("Couldn't acquire a mutex lock")); - return wxMUTEX_MISC_ERROR; - - default: - wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock")); - return wxMUTEX_MISC_ERROR; - } - return wxMUTEX_NO_ERROR; -} - -wxMutexError wxMutexInternal::Unlock() -{ - APIRET ulrc; - - ulrc = ::DosReleaseMutexSem(m_vMutex); - if (ulrc != 0) - { - wxLogSysError(_("Couldn't release a mutex")); - return wxMUTEX_MISC_ERROR; - } - return wxMUTEX_NO_ERROR; -} - -// -------------------------------------------------------------------------- -// wxSemaphore -// -------------------------------------------------------------------------- - -// a trivial wrapper around OS2 event semaphore -class wxSemaphoreInternal -{ -public: - wxSemaphoreInternal(int initialcount, int maxcount); - ~wxSemaphoreInternal(); - - bool IsOk() const { return m_vEvent != NULL; } - - wxSemaError Wait() { return WaitTimeout(SEM_INDEFINITE_WAIT); } - wxSemaError TryWait() { return WaitTimeout(SEM_IMMEDIATE_RETURN); } - wxSemaError WaitTimeout(unsigned long milliseconds); - - wxSemaError Post(); - -private: - HEV m_vEvent; - HMTX m_vMutex; - int m_count; - int m_maxcount; -}; - -wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount) -{ - APIRET ulrc; - if ( maxcount == 0 ) - { - // make it practically infinite - maxcount = INT_MAX; - } - - m_count = initialcount; - m_maxcount = maxcount; - ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE); - if (ulrc != 0) - { - wxLogLastError(wxT("DosCreateMutexSem()")); - m_vMutex = NULL; - m_vEvent = NULL; - return; - } - ulrc = ::DosCreateEventSem(NULL, &m_vEvent, 0L, FALSE); - if ( ulrc != 0) - { - wxLogLastError(wxT("DosCreateEventSem()")); - ::DosCloseMutexSem(m_vMutex); - m_vMutex = NULL; - m_vEvent = NULL; - } - if (initialcount) - ::DosPostEventSem(m_vEvent); -} - -wxSemaphoreInternal::~wxSemaphoreInternal() -{ - if ( m_vEvent ) - { - if ( ::DosCloseEventSem(m_vEvent) ) - { - wxLogLastError(wxT("DosCloseEventSem(semaphore)")); - } - if ( ::DosCloseMutexSem(m_vMutex) ) - { - wxLogLastError(wxT("DosCloseMutexSem(semaphore)")); - } - else - m_vEvent = NULL; - } -} - -wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long ulMilliseconds) -{ - APIRET ulrc; - do { - ulrc = ::DosWaitEventSem(m_vEvent, ulMilliseconds ); - switch ( ulrc ) - { - case NO_ERROR: - break; - - case ERROR_TIMEOUT: - if (ulMilliseconds == SEM_IMMEDIATE_RETURN) - return wxSEMA_BUSY; - else - return wxSEMA_TIMEOUT; - - default: - wxLogLastError(wxT("DosWaitEventSem(semaphore)")); - return wxSEMA_MISC_ERROR; - } - ulrc = :: DosRequestMutexSem(m_vMutex, ulMilliseconds); - switch ( ulrc ) - { - case NO_ERROR: - // ok - break; - - case ERROR_TIMEOUT: - case ERROR_TOO_MANY_SEM_REQUESTS: - if (ulMilliseconds == SEM_IMMEDIATE_RETURN) - return wxSEMA_BUSY; - else - return wxSEMA_TIMEOUT; - - default: - wxFAIL_MSG(wxT("DosRequestMutexSem(mutex)")); - return wxSEMA_MISC_ERROR; - } - bool OK = false; - if (m_count > 0) - { - m_count--; - OK = true; - } - else - { - ULONG ulPostCount; - ::DosResetEventSem(m_vEvent, &ulPostCount); - } - ::DosReleaseMutexSem(m_vMutex); - if (OK) - return wxSEMA_NO_ERROR; - } while (ulMilliseconds == SEM_INDEFINITE_WAIT); - - if (ulMilliseconds == SEM_IMMEDIATE_RETURN) - return wxSEMA_BUSY; - return wxSEMA_TIMEOUT; -} - -wxSemaError wxSemaphoreInternal::Post() -{ - APIRET ulrc; - ulrc = ::DosRequestMutexSem(m_vMutex, SEM_INDEFINITE_WAIT); - if (ulrc != NO_ERROR) - return wxSEMA_MISC_ERROR; - bool OK = false; - if (m_count < m_maxcount) - { - m_count++; - ulrc = ::DosPostEventSem(m_vEvent); - OK = true; - } - ::DosReleaseMutexSem(m_vMutex); - if (!OK) - return wxSEMA_OVERFLOW; - if ( ulrc != NO_ERROR && ulrc != ERROR_ALREADY_POSTED ) - { - wxLogLastError(wxT("DosPostEventSem(semaphore)")); - - return wxSEMA_MISC_ERROR; - } - - return wxSEMA_NO_ERROR; -} - -// ---------------------------------------------------------------------------- -// wxThread implementation -// ---------------------------------------------------------------------------- - -// wxThreadInternal class -// ---------------------- - -class wxThreadInternal -{ -public: - inline wxThreadInternal() - { - m_hThread = 0; - m_eState = STATE_NEW; - m_nPriority = wxPRIORITY_DEFAULT; - } - - ~wxThreadInternal() - { - m_hThread = 0; - } - - // create a new (suspended) thread (for the given thread object) - bool Create( wxThread* pThread - ,unsigned int uStackSize - ); - - // suspend/resume/terminate - bool Suspend(); - bool Resume(); - inline void Cancel() { m_eState = STATE_CANCELED; } - - // thread state - inline void SetState(wxThreadState eState) { m_eState = eState; } - inline wxThreadState GetState() const { return m_eState; } - - // thread priority - void SetPriority(unsigned int nPriority); - inline unsigned int GetPriority() const { return m_nPriority; } - - // thread handle and id - inline TID GetHandle() const { return m_hThread; } - TID GetId() const { return m_hThread; } - - // thread function - static void OS2ThreadStart(void* pParam); - -private: - // Threads in OS/2 have only an ID, so m_hThread is both it's handle and ID - // PM also has no real Tls mechanism to index pointers by so we'll just - // keep track of the wxWidgets parent object here. - TID m_hThread; // handle and ID of the thread - wxThreadState m_eState; // state, see wxThreadState enum - unsigned int m_nPriority; // thread priority in "wx" units -}; - -void wxThreadInternal::OS2ThreadStart( void * pParam ) -{ - DWORD dwRet; - bool bWasCancelled; - - wxThread *pThread = (wxThread *)pParam; - - // first of all, wait for the thread to be started. - pThread->m_critsect.Enter(); - pThread->m_critsect.Leave(); - // Now check whether we hadn't been cancelled already and don't - // start the user code at all in this case. - if ( pThread->m_internal->GetState() == STATE_EXITED ) - { - dwRet = (DWORD)-1; - bWasCancelled = true; - } - else // do run thread - { - wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; - unsigned long ulHab; - if (traits) - traits->InitializeGui(ulHab); - dwRet = (DWORD)pThread->CallEntry(); - if (traits) - traits->TerminateGui(ulHab); - - // enter m_critsect before changing the thread state - pThread->m_critsect.Enter(); - - bWasCancelled = pThread->m_internal->GetState() == STATE_CANCELED; - - pThread->m_internal->SetState(STATE_EXITED); - pThread->m_critsect.Leave(); - } - pThread->OnExit(); - - // if the thread was cancelled (from Delete()), then it the handle is still - // needed there - if (pThread->IsDetached() && !bWasCancelled) - { - // auto delete - delete pThread; - } - //else: the joinable threads handle will be closed when Wait() is done - return; -} - -void wxThreadInternal::SetPriority( - unsigned int nPriority -) -{ - // translate wxWidgets priority to the PM one - ULONG ulOS2_PriorityClass; - ULONG ulOS2_SubPriority; - ULONG ulrc; - - m_nPriority = nPriority; - if (m_nPriority <= 25) - ulOS2_PriorityClass = PRTYC_IDLETIME; - else if (m_nPriority <= 50) - ulOS2_PriorityClass = PRTYC_REGULAR; - else if (m_nPriority <= 75) - ulOS2_PriorityClass = PRTYC_TIMECRITICAL; - else if (m_nPriority <= 100) - ulOS2_PriorityClass = PRTYC_FOREGROUNDSERVER; - else - { - wxFAIL_MSG(wxT("invalid value of thread priority parameter")); - ulOS2_PriorityClass = PRTYC_REGULAR; - } - ulOS2_SubPriority = (ULONG) (((m_nPriority - 1) % 25 + 1) * 31.0 / 25); - ulrc = ::DosSetPriority( PRTYS_THREAD - ,ulOS2_PriorityClass - ,ulOS2_SubPriority - ,(ULONG)m_hThread - ); - if (ulrc != 0) - { - wxLogSysError(_("Can't set thread priority")); - } -} - -bool wxThreadInternal::Create( wxThread* pThread, - unsigned int uStackSize) -{ - int tid; - - if (!uStackSize) - uStackSize = 131072; - - pThread->m_critsect.Enter(); - tid = _beginthread(wxThreadInternal::OS2ThreadStart, - NULL, uStackSize, pThread); - if(tid == -1) - { - wxLogSysError(_("Can't create thread")); - - return false; - } - m_hThread = tid; - if (m_nPriority != wxPRIORITY_DEFAULT) - { - SetPriority(m_nPriority); - } - - return true; -} - -bool wxThreadInternal::Suspend() -{ - ULONG ulrc = ::DosSuspendThread(m_hThread); - - if (ulrc != 0) - { - wxLogSysError(_("Cannot suspend thread %lu"), m_hThread); - return false; - } - m_eState = STATE_PAUSED; - - return true; -} - -bool wxThreadInternal::Resume() -{ - ULONG ulrc = ::DosResumeThread(m_hThread); - - if (ulrc != 0) - { - wxLogSysError(_("Cannot resume thread %lu"), m_hThread); - return false; - } - - // don't change the state from STATE_EXITED because it's special and means - // we are going to terminate without running any user code - if we did it, - // the codei n Delete() wouldn't work - if ( m_eState != STATE_EXITED ) - { - m_eState = STATE_RUNNING; - } - - return true; -} - -// static functions -// ---------------- - -wxThread *wxThread::This() -{ - wxThread* pThread = m_pThread; - return pThread; -} - -#ifdef Yield - #undef Yield -#endif - -void wxThread::Yield() -{ - ::DosSleep(0); -} - -int wxThread::GetCPUCount() -{ - ULONG CPUCount; - APIRET ulrc; - ulrc = ::DosQuerySysInfo(26, 26, (void *)&CPUCount, sizeof(ULONG)); - // QSV_NUMPROCESSORS(26) is typically not defined in header files - - if (ulrc != 0) - CPUCount = 1; - - return CPUCount; -} - -wxThreadIdType wxThread::GetCurrentId() -{ - PTIB ptib; - PPIB ppib; - - ::DosGetInfoBlocks(&ptib, &ppib); - return (wxThreadIdType) ptib->tib_ptib2->tib2_ultid; -} - -bool wxThread::SetConcurrency(size_t level) -{ - wxASSERT_MSG( IsMain(), wxT("should only be called from the main thread") ); - - // ok only for the default one - if ( level == 0 ) - return 0; - - // Don't know how to realize this on OS/2. - return level == 1; -} - -// ctor and dtor -// ------------- - -wxThread::wxThread(wxThreadKind kind) -{ - m_internal = new wxThreadInternal(); - - m_isDetached = kind == wxTHREAD_DETACHED; -} - -wxThread::~wxThread() -{ - delete m_internal; -} - -// create/start thread -// ------------------- - -wxThreadError wxThread::Create( - unsigned int uStackSize -) -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - if ( !m_internal->Create(this, uStackSize) ) - return wxTHREAD_NO_RESOURCE; - - return wxTHREAD_NO_ERROR; -} - -wxThreadError wxThread::Run() -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - // Create the thread if it wasn't created yet with an explicit - // Create() call: - if ( !m_internal->GetHandle() ) - { - if ( !m_internal->Create(this, 0) ) - return wxTHREAD_NO_RESOURCE; - } - - if ( m_internal->GetState() != STATE_NEW ) - { - // actually, it may be almost any state at all, not only STATE_RUNNING - return wxTHREAD_RUNNING; - } - return Resume(); -} - -// suspend/resume thread -// --------------------- - -wxThreadError wxThread::Pause() -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - return m_internal->Suspend() ? wxTHREAD_NO_ERROR : wxTHREAD_MISC_ERROR; -} - -wxThreadError wxThread::Resume() -{ - if (m_internal->GetState() == STATE_NEW) - { - m_internal->SetState(STATE_RUNNING); - m_critsect.Leave(); - return wxTHREAD_NO_ERROR; - } - - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - return m_internal->Resume() ? wxTHREAD_NO_ERROR : wxTHREAD_MISC_ERROR; -} - -// stopping thread -// --------------- - -wxThread::ExitCode wxThread::Wait(wxThreadWait waitMode) -{ - // although under Windows we can wait for any thread, it's an error to - // wait for a detached one in wxWin API - wxCHECK_MSG( !IsDetached(), (ExitCode)-1, - wxT("can't wait for detached thread") ); - ExitCode rc = (ExitCode)-1; - (void)Delete(&rc, waitMode); - return(rc); -} - -wxThreadError wxThread::Delete(ExitCode *pRc, wxThreadWait WXUNUSED(waitMode)) -{ - ExitCode rc = 0; - - // Delete() is always safe to call, so consider all possible states - - // we might need to resume the thread, but we might also not need to cancel - // it if it doesn't run yet - bool shouldResume = false, - shouldCancel = true, - isRunning = false; - - // check if the thread already started to run - { - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - if ( m_internal->GetState() == STATE_NEW ) - { - // WinThreadStart() will see it and terminate immediately, no need - // to cancel the thread - but we still need to resume it to let it - // run - m_internal->SetState(STATE_EXITED); - - Resume(); // it knows about STATE_EXITED special case - - shouldCancel = false; - isRunning = true; - - // shouldResume is correctly set to false here - } - else - { - shouldResume = IsPaused(); - } - } - - // resume the thread if it is paused - if ( shouldResume ) - Resume(); - - TID hThread = m_internal->GetHandle(); - - if ( isRunning || IsRunning()) - { - if (IsMain()) - { - // set flag for wxIsWaitingForThread() - gs_bWaitingForThread = true; - } - - // ask the thread to terminate - if ( shouldCancel ) - { - wxCriticalSectionLocker lock(m_critsect); - - m_internal->Cancel(); - } - -#if 0 - // we can't just wait for the thread to terminate because it might be - // calling some GUI functions and so it will never terminate before we - // process the Windows messages that result from these functions - DWORD result = 0; // suppress warnings from broken compilers - do - { - if ( IsMain() ) - { - // give the thread we're waiting for chance to do the GUI call - // it might be in - if ( (gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread() ) - { - wxMutexGuiLeave(); - } - } - - result = ::DosWaitThread(&hThread, DCWW_NOWAIT); - // FIXME: We ought to have a message processing loop here!! - - switch ( result ) - { - case ERROR_INTERRUPT: - case ERROR_THREAD_NOT_TERMINATED: - break; - case ERROR_INVALID_THREADID: - case NO_ERROR: - // thread we're waiting for just terminated - // or even does not exist any more. - result = NO_ERROR; - break; - default: - wxFAIL_MSG(wxT("unexpected result of DosWaitThread")); - } - if ( IsMain() ) - { - // event processing - needed if we are the main thread - // to give other threads a chance to do remaining GUI - // processing and terminate cleanly. - wxTheApp->HandleSockets(); - if (wxTheApp->Pending()) - if ( !wxTheApp->DoMessage() ) - { - // WM_QUIT received: kill the thread - Kill(); - - return wxTHREAD_KILLED; - } - else - wxUsleep(10); - } - else - wxUsleep(10); - } while ( result != NO_ERROR ); -#else // !wxUSE_GUI - // simply wait for the thread to terminate - // - // OTOH, even console apps create windows (in wxExecute, for WinSock - // &c), so may be use MsgWaitForMultipleObject() too here? - if ( ::DosWaitThread(&hThread, DCWW_WAIT) != NO_ERROR ) - { - wxFAIL_MSG(wxT("unexpected result of DosWaitThread")); - } -#endif // wxUSE_GUI/!wxUSE_GUI - - if ( IsMain() ) - { - gs_bWaitingForThread = false; - } - } - -#if 0 - // although the thread might be already in the EXITED state it might not - // have terminated yet and so we are not sure that it has actually - // terminated if the "if" above hadn't been taken - do - { - if ( !::GetExitCodeThread(hThread, (LPDWORD)&rc) ) - { - wxLogLastError(wxT("GetExitCodeThread")); - - rc = (ExitCode)-1; - } - } while ( (DWORD)rc == STILL_ACTIVE ); -#endif - - if ( IsDetached() ) - { - // if the thread exits normally, this is done in WinThreadStart, but in - // this case it would have been too early because - // MsgWaitForMultipleObject() would fail if the thread handle was - // closed while we were waiting on it, so we must do it here - delete this; - } - - if ( pRc ) - *pRc = rc; - - return rc == (ExitCode)-1 ? wxTHREAD_MISC_ERROR : wxTHREAD_NO_ERROR; -} - -wxThreadError wxThread::Kill() -{ - if (!IsRunning()) - return wxTHREAD_NOT_RUNNING; - - ::DosKillThread(m_internal->GetHandle()); - if (IsDetached()) - { - delete this; - } - return wxTHREAD_NO_ERROR; -} - -void wxThread::Exit(ExitCode WXUNUSED(pStatus)) -{ - delete this; - _endthread(); - wxFAIL_MSG(wxT("Couldn't return from DosExit()!")); -} - -void wxThread::SetPriority( - unsigned int nPrio -) -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - m_internal->SetPriority(nPrio); -} - -unsigned int wxThread::GetPriority() const -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - return m_internal->GetPriority(); -} - -unsigned long wxThread::GetId() const -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); // const_cast - - return (unsigned long)m_internal->GetId(); -} - -bool wxThread::IsRunning() const -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - return(m_internal->GetState() == STATE_RUNNING); -} - -bool wxThread::IsAlive() const -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - return (m_internal->GetState() == STATE_RUNNING) || - (m_internal->GetState() == STATE_PAUSED); -} - -bool wxThread::IsPaused() const -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - return (m_internal->GetState() == STATE_PAUSED); -} - -bool wxThread::TestDestroy() -{ - wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); - - return m_internal->GetState() == STATE_CANCELED; -} - -// ---------------------------------------------------------------------------- -// Automatic initialization for thread module -// ---------------------------------------------------------------------------- - -class wxThreadModule : public wxModule -{ -public: - virtual bool OnInit(); - virtual void OnExit(); - -private: - DECLARE_DYNAMIC_CLASS(wxThreadModule) -}; - -IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) - -bool wxThreadModule::OnInit() -{ - gs_pCritsectWaitingForGui = new wxCriticalSection(); - - gs_pCritsectGui = new wxCriticalSection(); - gs_pCritsectGui->Enter(); - - wxThread::ms_idMainThread = wxThread::GetCurrentId(); - - return true; -} - -void wxThreadModule::OnExit() -{ - if (gs_pCritsectGui) - { - gs_pCritsectGui->Leave(); -#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) - delete gs_pCritsectGui; -#endif - gs_pCritsectGui = NULL; - } - -#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) - wxDELETE(gs_pCritsectWaitingForGui); -#endif -} - -// ---------------------------------------------------------------------------- -// Helper functions -// ---------------------------------------------------------------------------- - -// wake up the main thread if it's in ::GetMessage() -void WXDLLEXPORT wxWakeUpMainThread() -{ -#if 0 - if ( !::WinPostQueueMsg(wxTheApp->m_hMq, WM_NULL, 0, 0) ) - { - // should never happen - wxLogLastError(wxT("WinPostMessage(WM_NULL)")); - } -#endif -} - -void wxMutexGuiEnterImpl() -{ - // this would dead lock everything... - wxASSERT_MSG( !wxThread::IsMain(), - wxT("main thread doesn't want to block in wxMutexGuiEnter()!") ); - - // the order in which we enter the critical sections here is crucial!! - - // set the flag telling to the main thread that we want to do some GUI - { - wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui); - - gs_nWaitingForGui++; - } - - wxWakeUpMainThread(); - - // now we may block here because the main thread will soon let us in - // (during the next iteration of OnIdle()) - gs_pCritsectGui->Enter(); -} - -void wxMutexGuiLeaveImpl() -{ - wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui); - - if ( wxThread::IsMain() ) - { - gs_bGuiOwnedByMainThread = false; - } - else - { - // decrement the number of waiters now - wxASSERT_MSG(gs_nWaitingForGui > 0, - wxT("calling wxMutexGuiLeave() without entering it first?") ); - - gs_nWaitingForGui--; - - wxWakeUpMainThread(); - } - - gs_pCritsectGui->Leave(); -} - -void WXDLLEXPORT wxMutexGuiLeaveOrEnter() -{ - wxASSERT_MSG( wxThread::IsMain(), - wxT("only main thread may call wxMutexGuiLeaveOrEnter()!") ); - - wxCriticalSectionLocker enter(*gs_pCritsectWaitingForGui); - - if (gs_nWaitingForGui == 0) - { - // no threads are waiting for GUI - so we may acquire the lock without - // any danger (but only if we don't already have it) - if (!wxGuiOwnedByMainThread()) - { - gs_pCritsectGui->Enter(); - - gs_bGuiOwnedByMainThread = true; - } - //else: already have it, nothing to do - } - else - { - // some threads are waiting, release the GUI lock if we have it - if (wxGuiOwnedByMainThread()) - { - wxMutexGuiLeave(); - } - //else: some other worker thread is doing GUI - } -} - -bool WXDLLEXPORT wxGuiOwnedByMainThread() -{ - return gs_bGuiOwnedByMainThread; -} - -bool WXDLLEXPORT wxIsWaitingForThread() -{ - return gs_bWaitingForThread; -} - -// ---------------------------------------------------------------------------- -// include common implementation code -// ---------------------------------------------------------------------------- - -#include "wx/thrimpl.cpp" - -#endif - // wxUSE_THREADS diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp deleted file mode 100644 index ae5da9962b..0000000000 --- a/src/os2/timer.cpp +++ /dev/null @@ -1,170 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/timer.cpp -// Purpose: wxTimer implementation -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/os2/private/timer.h" - -#ifndef WX_PRECOMP - #include "wx/list.h" - #include "wx/window.h" - #include "wx/event.h" - #include "wx/app.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include "wx/os2/private.h" - -#include -#include - -#include - -// ---------------------------------------------------------------------------- -// private globals -// ---------------------------------------------------------------------------- - -// define a hash containing all the timers: it is indexed by timer id and -// contains the corresponding timer -WX_DECLARE_HASH_MAP(unsigned long, wxOS2TimerImpl *, wxIntegerHash, wxIntegerEqual, - wxTimerMap); - -// instead of using a global here, wrap it in a static function as otherwise it -// could have been used before being initialized if a timer object were created -// globally -static wxTimerMap& TimerMap() -{ - static wxTimerMap s_timerMap; - - return s_timerMap; -} - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// timer callback used for all timers -ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG); - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxTimer class -// ---------------------------------------------------------------------------- - -bool wxOS2TimerImpl::Start( int nMilliseconds, bool bOneShot ) -{ - if ( !wxTimerImpl::Start( nMilliseconds, bOneShot ) ) - return false; - - wxWindow* pWin = NULL; - - if (m_owner) - { - pWin = (wxWindow*)m_owner; - m_ulId = ::WinStartTimer( m_Hab - ,pWin->GetHWND() - ,m_idTimer - ,(ULONG)nMilliseconds - ); - } - else - { - m_ulId = ::WinStartTimer( m_Hab - ,NULLHANDLE - ,0 - ,(ULONG)nMilliseconds - ); - } - - if (m_ulId > 0L) - { - // check that SetTimer() didn't reuse an existing id: according to - // the MSDN this can happen and this would be catastrophic to us as - // we rely on ids uniquely identifying the timers because we use - // them as keys in the hash - if ( TimerMap().find(m_ulId) != TimerMap().end() ) - { - wxLogError(_("Timer creation failed.")); - - ::WinStopTimer(m_Hab, pWin?(pWin->GetHWND()):NULL, m_ulId); - m_ulId = 0; - - return false; - } - - TimerMap()[m_ulId] = this; - - return true; - } - else - { - wxLogSysError(_("Couldn't create a timer")); - - return false; - } -} - -void wxOS2TimerImpl::Stop() -{ - if ( m_ulId ) - { - if (m_owner) - { - wxWindow* pWin = (wxWindow*)m_owner; - - ::WinStopTimer(m_Hab, pWin->GetHWND(), m_ulId); - } - else - ::WinStopTimer(m_Hab, NULLHANDLE, m_ulId); - - TimerMap().erase(m_ulId); - } - m_ulId = 0L; -} - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -void wxProcessTimer( - wxOS2TimerImpl& rTimer -) -{ - // - // Avoid to process spurious timer events - // - if (rTimer.m_ulId == 0L) - return; - - if (rTimer.IsOneShot()) - rTimer.Stop(); - - rTimer.Notify(); -} - -ULONG wxTimerProc( - HWND WXUNUSED(hwnd) -, ULONG -, int nIdTimer -, ULONG -) -{ - wxTimerMap::iterator node = TimerMap().find((ULONG)nIdTimer); - - wxCHECK_MSG(node != TimerMap().end(), 0, - wxT("bogus timer id in wxTimerProc") ); - wxProcessTimer(*(node->second)); - return 0; -} diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp deleted file mode 100644 index 628fb77adb..0000000000 --- a/src/os2/toolbar.cpp +++ /dev/null @@ -1,1185 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/toolbar.cpp -// Purpose: wxToolBar -// Author: David Webster -// Modified by: -// Created: 06/30/02 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE - -#include "wx/toolbar.h" - -#ifndef WX_PRECOMP - #include "wx/settings.h" - #include "wx/window.h" - #include "wx/frame.h" - #include "wx/app.h" - #include "wx/dcclient.h" - #include "wx/dcmemory.h" -#endif - -#include "wx/tooltip.h" -#include "wx/os2/dcclient.h" - -bool wxToolBar::m_bInitialized = false; - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -class wxToolBarTool : public wxToolBarToolBase -{ -public: - inline wxToolBarTool( wxToolBar* pTbar - ,int vId - ,const wxString& rsLabel - ,const wxBitmap& rBitmap1 - ,const wxBitmap& rBitmap2 - ,wxItemKind vKind - ,wxObject* pClientData - ,const wxString& rsShortHelpString - ,const wxString& rsLongHelpString - ) : wxToolBarToolBase( pTbar - ,vId - ,rsLabel - ,rBitmap1 - ,rBitmap2 - ,vKind - ,pClientData - ,rsShortHelpString - ,rsLongHelpString - ) - { - } - - inline wxToolBarTool( wxToolBar* pTbar - ,wxControl* pControl - ,const wxString& label - ) : wxToolBarToolBase( pTbar - ,pControl - ,label - ) - { - } - - void SetSize(const wxSize& rSize) - { - m_vWidth = rSize.x; - m_vHeight = rSize.y; - } - - wxCoord GetWidth(void) const { return m_vWidth; } - wxCoord GetHeight(void) const { return m_vHeight; } - - wxCoord m_vX; - wxCoord m_vY; - wxCoord m_vWidth; - wxCoord m_vHeight; -}; // end of CLASS wxToolBarTool - -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) - -BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) - EVT_SIZE(wxToolBar::OnSize) - EVT_PAINT(wxToolBar::OnPaint) - EVT_KILL_FOCUS(wxToolBar::OnKillFocus) - EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent) - EVT_TIMER(-1, wxToolBar::OnTimer) -END_EVENT_TABLE() - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// tool bar tools creation -// ---------------------------------------------------------------------------- - -wxToolBarToolBase* wxToolBar::CreateTool( - int nId -, const wxString& rsLabel -, const wxBitmap& rBmpNormal -, const wxBitmap& rBmpDisabled -, wxItemKind eKind -, wxObject* pClientData -, const wxString& rsShortHelp -, const wxString& rsLongHelp -) -{ - return new wxToolBarTool( this - ,nId - ,rsLabel - ,rBmpNormal - ,rBmpDisabled - ,eKind - ,pClientData - ,rsShortHelp - ,rsLongHelp - ); -} // end of wxToolBarSimple::CreateTool - -wxToolBarToolBase *wxToolBar::CreateTool( - wxControl* pControl -, const wxString& label -) -{ - return new wxToolBarTool( this - ,pControl - ,label - ); -} // end of wxToolBarSimple::CreateTool - -// ---------------------------------------------------------------------------- -// wxToolBarSimple creation -// ---------------------------------------------------------------------------- - -void wxToolBar::Init() -{ - m_nCurrentRowsOrColumns = 0; - - m_vLastX = m_vLastY = 0; - m_vMaxWidth = m_vMaxHeight = 0; - m_nPressedTool = m_nCurrentTool = -1; - m_vXPos = m_vYPos = -1; - m_vTextX = m_vTextY = 0; - - m_toolPacking = 1; - m_toolSeparation = 5; - - m_defaultWidth = 16; - m_defaultHeight = 15; - - m_pToolTip = NULL; -} // end of wxToolBar::Init - -wxToolBarToolBase* wxToolBar::DoAddTool( - int vId -, const wxString& rsLabel -, const wxBitmap& rBitmap -, const wxBitmap& rBmpDisabled -, wxItemKind eKind -, const wxString& rsShortHelp -, const wxString& rsLongHelp -, wxObject* pClientData -, wxCoord vXPos -, wxCoord vYPos -) -{ - // - // Rememeber the position for DoInsertTool() - // - m_vXPos = vXPos; - m_vYPos = vYPos; - - return wxToolBarBase::DoAddTool( vId - ,rsLabel - ,rBitmap - ,rBmpDisabled - ,eKind - ,rsShortHelp - ,rsLongHelp - ,pClientData - ,vXPos - ,vYPos - ); -} // end of wxToolBar::DoAddTool - -bool wxToolBar::DeleteTool( - int nId -) -{ - bool bOk = wxToolBarBase::DeleteTool(nId); - - if (bOk) - { - Realize(); - } - return bOk; -} // end of wxToolBar::DeleteTool - -bool wxToolBar::DeleteToolByPos( - size_t nPos -) -{ - bool bOk = wxToolBarBase::DeleteToolByPos(nPos); - - if (bOk) - { - Realize(); - } - return bOk; -} // end of wxToolBar::DeleteTool - -wxToolBarToolBase* wxToolBar::InsertControl( - size_t nPos -, wxControl* pControl -) -{ - wxToolBarToolBase* pTool = wxToolBarBase::InsertControl( nPos - ,pControl - ); - if (m_bInitialized) - { - Realize(); - Refresh(); - } - return pTool; -} // end of wxToolBar::InsertControl - -wxToolBarToolBase* wxToolBar::InsertSeparator( - size_t nPos -) -{ - wxToolBarToolBase* pTool = wxToolBarBase::InsertSeparator(nPos); - - if (m_bInitialized) - { - Realize(); - Refresh(); - } - return pTool; -} // end of wxToolBar::InsertSeparator - -wxToolBarToolBase* wxToolBar::InsertTool( - size_t nPos -, int nId -, const wxString& rsLabel -, const wxBitmap& rBitmap -, const wxBitmap& rBmpDisabled -, wxItemKind eKind -, const wxString& rsShortHelp -, const wxString& rsLongHelp -, wxObject* pClientData -) -{ - wxToolBarToolBase* pTool = wxToolBarBase::InsertTool( nPos - ,nId - ,rsLabel - ,rBitmap - ,rBmpDisabled - ,eKind - ,rsShortHelp - ,rsLongHelp - ,pClientData - ); - if (m_bInitialized) - { - Realize(); - Refresh(); - } - return pTool; -} // end of wxToolBar::InsertTool - -bool wxToolBar::DoInsertTool( size_t WXUNUSED(nPos), - wxToolBarToolBase* pToolBase ) -{ - wxToolBarTool* pTool = (wxToolBarTool *)pToolBase; - - pTool->m_vX = m_vXPos; - if (pTool->m_vX == -1) - pTool->m_vX = m_xMargin; - - pTool->m_vY = m_vYPos; - if (pTool->m_vY == -1) - pTool->m_vX = m_yMargin; - - pTool->SetSize(GetToolSize()); - - if (pTool->IsButton()) - { - // - // Calculate reasonable max size in case Layout() not called - // - if ((pTool->m_vX + pTool->GetNormalBitmap().GetWidth() + m_xMargin) > m_vMaxWidth) - m_vMaxWidth = (wxCoord)((pTool->m_vX + pTool->GetWidth() + m_xMargin)); - - if ((pTool->m_vY + pTool->GetNormalBitmap().GetHeight() + m_yMargin) > m_vMaxHeight) - m_vMaxHeight = (wxCoord)((pTool->m_vY + pTool->GetHeight() + m_yMargin)); - } - return true; -} // end of wxToolBar::DoInsertTool - -bool wxToolBar::DoDeleteTool( size_t WXUNUSED(nPos), - wxToolBarToolBase* pTool ) -{ - pTool->Detach(); - Refresh(); - return true; -} // end of wxToolBar::DoDeleteTool - -bool wxToolBar::Create( wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxString& rsName ) -{ - if ( !wxWindow::Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rsName - )) - return false; - - // Set it to grey (or other 3D face colour) - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR)); - SetFont(*wxSMALL_FONT); - - if (GetWindowStyleFlag() & (wxTB_LEFT | wxTB_RIGHT)) - { - m_vLastX = 7; - m_vLastY = 3; - - m_maxRows = 32000; // a lot - m_maxCols = 1; - } - else - { - m_vLastX = 3; - m_vLastY = 7; - - m_maxRows = 1; - m_maxCols = 32000; // a lot - } - SetCursor(*wxSTANDARD_CURSOR); - - // - // The toolbar's tools, if they have labels and the winTB_TEXT - // style is set, then we need to take into account the size of - // the text when drawing tool bitmaps and the text - // - if (HasFlag(wxTB_TEXT)) - { - wxClientDC vDC(this); - - vDC.SetFont(GetFont()); - vDC.GetTextExtent( wxT("XXXX") - ,&m_vTextX - ,&m_vTextY - ); - } - - // - // Position it - // - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - - if (lStyle & (wxTB_TOP | wxTB_BOTTOM)) - { - if (nWidth <= 0) - { - nWidth = pParent->GetClientSize().x; - } - if (nHeight <= 0) - { - if (lStyle & wxTB_TEXT) - nHeight = m_defaultHeight + m_vTextY; - else - nHeight = m_defaultHeight; - } - } - else - { - if (nHeight <= 0) - { - nHeight = pParent->GetClientSize().y; - } - if (nWidth <= 0) - { - if (lStyle & wxTB_TEXT) - nWidth = m_vTextX + (int)(m_vTextX/2); // a little margin - else - nWidth = m_defaultWidth + (int)(m_defaultWidth/2); // a little margin - } - } - if (nX < 0) - nX = 0; - if (nY < 0) - nY = 0; - - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - return true; -} // end of wxToolBar::Create - -wxToolBar::~wxToolBar() -{ - wxDELETE(m_pToolTip); -} // end of wxToolBar::~wxToolBar - -bool wxToolBar::Realize() -{ - int nMaxToolWidth = 0; - int nMaxToolHeight = 0; - - m_nCurrentRowsOrColumns = 0; - m_vLastX = m_xMargin; - m_vLastY = m_yMargin; - m_vMaxWidth = 0; - m_vMaxHeight = 0; - - - // - // Find the maximum tool width and height - // - wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - - while (node ) - { - wxToolBarTool* pTool = (wxToolBarTool *)node->GetData(); - - if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty()) - { - // - // Set the height according to the font and the border size - // - if (pTool->GetWidth() > m_vTextX) - nMaxToolWidth = pTool->GetWidth() + 4; - else - nMaxToolWidth = m_vTextX; - if (pTool->GetHeight() + m_vTextY > nMaxToolHeight) - nMaxToolHeight = pTool->GetHeight() + m_vTextY; - } - else - { - if (pTool->GetWidth() > nMaxToolWidth ) - nMaxToolWidth = pTool->GetWidth() + 4; - if (pTool->GetHeight() > nMaxToolHeight) - nMaxToolHeight = pTool->GetHeight(); - } - node = node->GetNext(); - } - - wxCoord vTbWidth = 0L; - wxCoord vTbHeight = 0L; - - GetSize( &vTbWidth - ,&vTbHeight - ); - if (vTbHeight < nMaxToolHeight) - { - SetSize( -1L - ,-1L - ,vTbWidth - ,nMaxToolHeight + 4 - ); - if (GetParent()->IsKindOf(CLASSINFO(wxFrame))) - { - wxFrame* pFrame = wxDynamicCast(GetParent(), wxFrame); - - if (pFrame) - pFrame->PositionToolBar(); - } - } - - int nSeparatorSize = m_toolSeparation; - - node = m_tools.GetFirst(); - while (node) - { - wxToolBarTool* pTool = (wxToolBarTool *)node->GetData(); - - if (pTool->IsSeparator()) - { - if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM)) - { - pTool->m_vX = m_vLastX + nSeparatorSize; - pTool->m_vHeight = m_defaultHeight + m_vTextY; - if (m_nCurrentRowsOrColumns >= m_maxCols) - m_vLastY += nSeparatorSize; - else - m_vLastX += nSeparatorSize * 4; - } - else - { - pTool->m_vY = m_vLastY + nSeparatorSize; - pTool->m_vHeight = m_defaultHeight + m_vTextY; - if (m_nCurrentRowsOrColumns >= m_maxRows) - m_vLastX += nSeparatorSize; - else - m_vLastY += nSeparatorSize * 4; - } - } - else if (pTool->IsButton()) - { - if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM)) - { - if (m_nCurrentRowsOrColumns >= m_maxCols) - { - m_nCurrentRowsOrColumns = 0; - m_vLastX = m_xMargin; - m_vLastY += nMaxToolHeight + m_toolPacking; - } - pTool->m_vX = m_vLastX + (nMaxToolWidth - ((int)(nMaxToolWidth/2) + (int)(pTool->GetWidth()/2))); - if (HasFlag(wxTB_TEXT)) - pTool->m_vY = m_vLastY + nSeparatorSize - 2; // just bit of adjustment - else - pTool->m_vY = m_vLastY + (nMaxToolHeight - (int)(pTool->GetHeight()/2)); - m_vLastX += nMaxToolWidth + m_toolPacking + m_toolSeparation; - } - else - { - if (m_nCurrentRowsOrColumns >= m_maxRows) - { - m_nCurrentRowsOrColumns = 0; - m_vLastX += (nMaxToolWidth + m_toolPacking); - m_vLastY = m_yMargin; - } - pTool->m_vX = m_vLastX + pTool->GetWidth(); - if ( HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty() ) - pTool->m_vY = m_vLastY + (nMaxToolHeight - m_vTextY) + m_toolPacking; - else - pTool->m_vY = m_vLastY + (nMaxToolHeight - (int)(pTool->GetHeight()/2)); - m_vLastY += nMaxToolHeight + m_toolPacking + m_toolSeparation; - } - m_nCurrentRowsOrColumns++; - } - else - { - // TODO: support the controls - } - - if (m_vLastX > m_maxWidth) - m_maxWidth = m_vLastX; - if (m_vLastY > m_maxHeight) - m_maxHeight = m_vLastY; - - node = node->GetNext(); - } - - if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM)) - m_maxWidth += nMaxToolWidth; - else - m_maxHeight += nMaxToolHeight; - - m_maxWidth += m_xMargin; - m_maxHeight += m_yMargin; - m_bInitialized = true; - return true; -} // end of wxToolBar::Realize - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -void wxToolBar::OnPaint ( - wxPaintEvent& WXUNUSED(rEvent) -) -{ - wxPaintDC vDc(this); - - PrepareDC(vDc); - - static int nCount = 0; - - // - // Prevent reentry of OnPaint which would cause wxMemoryDC errors. - // - if (nCount > 0) - return; - nCount++; - - wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl(); - ::WinFillRect(impl->GetHPS(), &impl->m_vRclPaint, GetBackgroundColour().GetPixel()); - for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - node; - node = node->GetNext() ) - { - wxToolBarTool* pTool = (wxToolBarTool*)node->GetData(); - - if (pTool->IsButton() ) - DrawTool(vDc, pTool); - if (pTool->IsSeparator()) - { - wxColour gray85(85, 85, 85); - wxPen vDarkGreyPen( gray85, 1, wxSOLID ); - int nX; - int nY; - int nHeight = 0; - int nWidth = 0; - - vDc.SetPen(vDarkGreyPen); - if (HasFlag(wxTB_TEXT)) - { - if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM)) - { - nX = pTool->m_vX; - nY = pTool->m_vY - (m_vTextY - 6); - nHeight = (m_vTextY - 2) + pTool->GetHeight(); - } - else - { - nX = pTool->m_vX + m_xMargin + 10; - nY = pTool->m_vY + m_vTextY + m_toolSeparation; - nWidth = pTool->GetWidth() > m_vTextX ? pTool->GetWidth() : m_vTextX; - } - } - else - { - nX = pTool->m_vX; - nY = pTool->m_vY; - if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM)) - nHeight = pTool->GetHeight() - 2; - else - { - nX += m_xMargin + 10; - nY += m_yMargin + m_toolSeparation; - nWidth = pTool->GetWidth(); - } - } - vDc.DrawLine(nX, nY, nX + nWidth, nY + nHeight); - } - } - nCount--; -} // end of wxToolBar::OnPaint - -void wxToolBar::OnSize ( - wxSizeEvent& WXUNUSED(rEvent) -) -{ -#if wxUSE_CONSTRAINTS - if (GetAutoLayout()) - Layout(); -#endif -} // end of wxToolBar::OnSize - -void wxToolBar::OnKillFocus( - wxFocusEvent& WXUNUSED(rEvent) -) -{ - OnMouseEnter(m_nPressedTool = m_nCurrentTool = -1); -} // end of wxToolBar::OnKillFocus - -void wxToolBar::OnMouseEvent( - wxMouseEvent& rEvent -) -{ - POINTL vPoint; - HWND hWnd; - wxCoord vX; - wxCoord vY; - HPOINTER hPtr = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ARROW, FALSE); - - ::WinSetPointer(HWND_DESKTOP, hPtr); - ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); - hWnd = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE); - if (hWnd != (HWND)GetHwnd()) - { - m_vToolTimer.Stop(); - return; - } - - rEvent.GetPosition(&vX, &vY); - - wxToolBarTool* pTool = (wxToolBarTool *)FindToolForPosition( vX - ,vY - ); - - if (rEvent.LeftDown()) - { - CaptureMouse(); - } - if (rEvent.LeftUp()) - { - ReleaseMouse(); - } - - if (!pTool) - { - m_vToolTimer.Stop(); - if (m_nCurrentTool > -1) - { - if (rEvent.LeftIsDown()) - SpringUpButton(m_nCurrentTool); - pTool = (wxToolBarTool *)FindById(m_nCurrentTool); - if (pTool && !pTool->IsToggled()) - { - RaiseTool( pTool, FALSE ); - } - m_nCurrentTool = -1; - OnMouseEnter(-1); - } - return; - } - if (!rEvent.IsButton()) - { - if (pTool->GetId() != m_nCurrentTool) - { - // - // If the left button is kept down and moved over buttons, - // press those buttons. - // - if (rEvent.LeftIsDown() && pTool->IsEnabled()) - { - SpringUpButton(m_nCurrentTool); - if (pTool->CanBeToggled()) - { - pTool->Toggle(); - } - DrawTool(pTool); - } - wxToolBarTool* pOldTool = (wxToolBarTool*)FindById(m_nCurrentTool); - - if (pOldTool && !pTool->IsToggled()) - RaiseTool( pOldTool, FALSE ); - m_nCurrentTool = pTool->GetId(); - OnMouseEnter(m_nCurrentTool); - if (!pTool->GetShortHelp().empty()) - { - if (m_pToolTip) - delete m_pToolTip; - m_pToolTip = new wxToolTip(pTool->GetShortHelp()); - m_vXMouse = (wxCoord)vPoint.x; - m_vYMouse = (wxCoord)vPoint.y; - m_vToolTimer.Start(1000L, TRUE); - } - if (!pTool->IsToggled()) - RaiseTool(pTool); - } - return; - } - - // Left button pressed. - if (rEvent.LeftDown() && pTool->IsEnabled()) - { - if (pTool->CanBeToggled()) - { - pTool->Toggle(); - } - DrawTool(pTool); - } - else if (rEvent.RightDown()) - { - OnRightClick( pTool->GetId() - ,vX - ,vY - ); - } - - // - // Left Button Released. Only this action confirms selection. - // If the button is enabled and it is not a toggle tool and it is - // in the pressed state, then raise the button and call OnLeftClick. - // - if (rEvent.LeftUp() && pTool->IsEnabled() ) - { - // - // Pass the OnLeftClick event to tool - // - if (!OnLeftClick( pTool->GetId() - ,pTool->IsToggled()) && - pTool->CanBeToggled()) - { - // - // If it was a toggle, and OnLeftClick says No Toggle allowed, - // then change it back - // - pTool->Toggle(); - } - DrawTool(pTool); - } -} // end of wxToolBar::OnMouseEvent - -// ---------------------------------------------------------------------------- -// drawing -// ---------------------------------------------------------------------------- - -void wxToolBar::DrawTool( wxToolBarToolBase* pTool ) -{ - wxClientDC vDc(this); - - DrawTool( vDc, pTool ); -} // end of wxToolBar::DrawTool - -void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase ) -{ - wxToolBarTool* pTool = (wxToolBarTool *)pToolBase; - wxColour gray85( 85,85,85 ); - wxPen vDarkGreyPen( gray85, 1, wxSOLID ); - wxBitmap vBitmap = pTool->GetNormalBitmap(); - bool bUseMask = false; - wxMask* pMask = NULL; - - PrepareDC(rDc); - - if (!vBitmap.IsOk()) - return; - if ((pMask = vBitmap.GetMask()) != NULL) - if (pMask->GetMaskBitmap() != NULLHANDLE) - bUseMask = true; - - if (!pTool->IsToggled()) - { - LowerTool(pTool, FALSE); - if (!pTool->IsEnabled()) - { - wxColour vColor(wxT("GREY")); - - rDc.SetTextForeground(vColor); - if (!pTool->GetDisabledBitmap().IsOk()) - pTool->SetDisabledBitmap(wxDisableBitmap( vBitmap - ,(long)GetBackgroundColour().GetPixel() - )); - rDc.DrawBitmap( pTool->GetDisabledBitmap() - ,pTool->m_vX - ,pTool->m_vY - ,bUseMask - ); - } - else - { - rDc.SetTextForeground(*wxBLACK); - rDc.DrawBitmap( vBitmap - ,pTool->m_vX - ,pTool->m_vY - ,bUseMask - ); - } - if (m_windowStyle & wxTB_3DBUTTONS) - { - RaiseTool(pTool); - } - if ( HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty() ) - { - wxCoord vX; - wxCoord vY; - wxCoord vLeft = pTool->m_vX - (int)(pTool->GetWidth()/2); - - rDc.SetFont(GetFont()); - rDc.GetTextExtent( pTool->GetLabel() - ,&vX - ,&vY - ); - if (pTool->GetWidth() > vX) // large tools - { - vLeft = pTool->m_vX + (pTool->GetWidth() - vX); - GetSize(&vX, &vY); - rDc.DrawText( pTool->GetLabel() - ,vLeft - ,vY - m_vTextY - 1 - ); - } - else // normal tools - { - vLeft += (wxCoord)((m_vTextX - vX)/2); - rDc.DrawText( pTool->GetLabel() - ,vLeft - ,pTool->m_vY + m_vTextY - 1 // a bit of margin - ); - } - } - } - else - { - wxColour vColor(wxT("GREY")); - - LowerTool(pTool); - rDc.SetTextForeground(vColor); - if (!pTool->GetDisabledBitmap().IsOk()) - pTool->SetDisabledBitmap(wxDisableBitmap( vBitmap - ,(long)GetBackgroundColour().GetPixel() - )); - rDc.DrawBitmap( pTool->GetDisabledBitmap() - ,pTool->m_vX - ,pTool->m_vY - ,bUseMask - ); - if ( HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty() ) - { - wxCoord vX; - wxCoord vY; - wxCoord vLeft = pTool->m_vX - (int)(pTool->GetWidth()/2); - - rDc.SetFont(GetFont()); - rDc.GetTextExtent( pTool->GetLabel() - ,&vX - ,&vY - ); - vLeft += (wxCoord)((m_vTextX - vX)/2); - rDc.DrawText( pTool->GetLabel() - ,vLeft - ,pTool->m_vY + m_vTextY - 1 // a bit of margin - ); - } - } -} // end of wxToolBar::DrawTool - -// ---------------------------------------------------------------------------- -// toolbar geometry -// ---------------------------------------------------------------------------- - -void wxToolBar::SetRows( - int nRows -) -{ - wxCHECK_RET( nRows != 0, wxT("max number of rows must be > 0") ); - - m_maxCols = (GetToolsCount() + nRows - 1) / nRows; - Refresh(); -} // end of wxToolBar::SetRows - -wxToolBarToolBase* wxToolBar::FindToolForPosition( - wxCoord vX -, wxCoord vY -) const -{ - wxCoord vTBarHeight = 0; - - GetSize( NULL - ,&vTBarHeight - ); - vY = vTBarHeight - vY; - wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); - while (node) - { - wxToolBarTool* pTool = (wxToolBarTool *)node->GetData(); - - if ( HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty() ) - { - if ((vX >= (pTool->m_vX - ((wxCoord)(pTool->GetWidth()/2) - 2))) && - (vY >= (pTool->m_vY - 2)) && - (vX <= (pTool->m_vX + pTool->GetWidth())) && - (vY <= (pTool->m_vY + pTool->GetHeight() + m_vTextY + 2))) - { - return pTool; - } - } - else - { - if ((vX >= pTool->m_vX) && - (vY >= pTool->m_vY) && - (vX <= (pTool->m_vX + pTool->GetWidth())) && - (vY <= (pTool->m_vY + pTool->GetHeight()))) - { - return pTool; - } - } - node = node->GetNext(); - } - return NULL; -} // end of wxToolBar::FindToolForPosition - -// ---------------------------------------------------------------------------- -// tool state change handlers -// ---------------------------------------------------------------------------- - -void wxToolBar::DoEnableTool( - wxToolBarToolBase* pTool -, bool WXUNUSED(bEnable) -) -{ - DrawTool(pTool); -} // end of wxToolBar::DoEnableTool - -void wxToolBar::DoToggleTool( - wxToolBarToolBase* pTool -, bool WXUNUSED(bToggle) -) -{ - DrawTool(pTool); -} // end of wxToolBar::DoToggleTool - -void wxToolBar::DoSetToggle( - wxToolBarToolBase* WXUNUSED(pTool) -, bool WXUNUSED(bToggle) -) -{ - // nothing to do -} // end of wxToolBar::DoSetToggle - -// -// Okay, so we've left the tool we're in ... we must check if the tool we're -// leaving was a 'sprung push button' and if so, spring it back to the up -// state. -// -void wxToolBar::SpringUpButton( - int vId -) -{ - wxToolBarToolBase* pTool = FindById(vId); - - if (pTool && pTool->CanBeToggled()) - { - if (pTool->IsToggled()) - pTool->Toggle(); - - DrawTool(pTool); - } -} // end of wxToolBar::SpringUpButton - -// ---------------------------------------------------------------------------- -// private helpers -// ---------------------------------------------------------------------------- - -void wxToolBar::LowerTool ( wxToolBarToolBase* pToolBase, - bool bLower ) -{ - wxToolBarTool* pTool = (wxToolBarTool*)pToolBase; - wxCoord vX; - wxCoord vY; - wxCoord vWidth; - wxCoord vHeight; - wxColour gray85( 85,85,85 ); - wxPen vDarkGreyPen( gray85, 1, wxSOLID ); - wxPen vClearPen( GetBackgroundColour(), 1, wxSOLID ); - wxClientDC vDC(this); - - if (!pTool) - return; - - if (pTool->IsSeparator()) - return; - - // - // We only do this for flat toolbars - // - if (!HasFlag(wxTB_FLAT)) - return; - - if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty()) - { - if (pTool->GetWidth() > m_vTextX) - { - vX = pTool->m_vX - 2; - vWidth = pTool->GetWidth() + 4; - } - else - { - vX = pTool->m_vX - (wxCoord)(pTool->GetWidth()/2); - vWidth = m_vTextX + 4; - } - vY = pTool->m_vY - 2; - vHeight = pTool->GetHeight() + m_vTextY + 2; - } - else - { - vX = pTool->m_vX - 2; - vY = pTool->m_vY - 2; - vWidth = pTool->GetWidth() + 4; - vHeight = pTool->GetHeight() + 4; - } - if (bLower) - { - vDC.SetPen(*wxWHITE_PEN); - vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight); - vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight); - vDC.SetPen(vDarkGreyPen); - vDC.DrawLine(vX, vY, vX + vWidth, vY); - vDC.DrawLine(vX, vY + vHeight, vX, vY); - } - else - { - vDC.SetPen(vClearPen); - vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight); - vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight); - vDC.DrawLine(vX, vY, vX + vWidth, vY); - vDC.DrawLine(vX, vY + vHeight, vX, vY); - } -} // end of WinGuiBase_CToolBarTool::LowerTool - -void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase, - bool bRaise ) -{ - wxToolBarTool* pTool = (wxToolBarTool*)pToolBase; - wxCoord vX; - wxCoord vY; - wxCoord vWidth; - wxCoord vHeight; - wxColour gray85( 85,85,85 ); - wxPen vDarkGreyPen( gray85, 1, wxSOLID ); - wxPen vClearPen( GetBackgroundColour(), 1, wxSOLID ); - wxClientDC vDC(this); - - if (!pTool) - return; - - if (pTool->IsSeparator()) - return; - - if (!pTool->IsEnabled()) - return; - - // - // We only do this for flat toolbars - // - if (!HasFlag(wxTB_FLAT)) - return; - - if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty()) - { - if (pTool->GetWidth() > m_vTextX) - { - vX = pTool->m_vX - 2; - vWidth = pTool->GetWidth() + 4; - } - else - { - vX = pTool->m_vX - (wxCoord)(pTool->GetWidth()/2); - vWidth = m_vTextX + 4; - } - vY = pTool->m_vY - 2; - vHeight = pTool->GetHeight() + m_vTextY + 2; - } - else - { - vX = pTool->m_vX - 2; - vY = pTool->m_vY - 2; - vWidth = pTool->GetWidth() + 4; - vHeight = pTool->GetHeight() + 4; - } - if (bRaise) - { - vDC.SetPen(vDarkGreyPen); - vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight); - vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight); - vDC.SetPen(*wxWHITE_PEN); - vDC.DrawLine(vX, vY, vX + vWidth, vY); - vDC.DrawLine(vX, vY + vHeight, vX, vY); - } - else - { - vDC.SetPen(vClearPen); - vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight); - vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight); - vDC.DrawLine(vX, vY, vX + vWidth, vY); - vDC.DrawLine(vX, vY + vHeight, vX, vY); - } -} // end of wxToolBar::RaiseTool - -void wxToolBar::OnTimer ( wxTimerEvent& rEvent ) -{ - if (rEvent.GetId() == m_vToolTimer.GetId()) - { - wxPoint vPos( m_vXMouse, m_vYMouse ); - - m_pToolTip->DisplayToolTipWindow(vPos); - m_vToolTimer.Stop(); - m_vToolExpTimer.Start(4000L, TRUE); - } - else if (rEvent.GetId() == m_vToolExpTimer.GetId()) - { - m_pToolTip->HideToolTipWindow(); - GetParent()->Refresh(); - m_vToolExpTimer.Stop(); - } -} // end of wxToolBar::OnTimer - -#endif // ndef for wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE diff --git a/src/os2/tooltip.cpp b/src/os2/tooltip.cpp deleted file mode 100644 index 244d4ea77e..0000000000 --- a/src/os2/tooltip.cpp +++ /dev/null @@ -1,140 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/tooltip.cpp -// Purpose: wxToolTip class implementation for MSW -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#if wxUSE_TOOLTIPS - -#include "wx/tooltip.h" -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// ctor & dtor -// ---------------------------------------------------------------------------- - -wxToolTip::wxToolTip( - const wxString& rsTip -) -: m_sText(rsTip) -, m_pWindow(NULL) -{ - Create(rsTip); -} // end of wxToolTip::wxToolTip - -wxToolTip::~wxToolTip() -{ - if (m_hWnd) - ::WinDestroyWindow(m_hWnd); -} // end of wxToolTip::~wxToolTip - -void wxToolTip::Create( - const wxString& rsTip -) -{ - ULONG lStyle = ES_READONLY | ES_MARGIN | ES_CENTER; - LONG lColor; - char zFont[128]; - - m_hWnd = ::WinCreateWindow( HWND_DESKTOP - ,WC_ENTRYFIELD - ,rsTip.c_str() - ,lStyle - ,0, 0, 0, 0 - ,NULLHANDLE - ,HWND_TOP - ,1 - ,NULL - ,NULL - ); - if (!m_hWnd) - { - wxLogError(wxT("Unable to create tooltip window")); - } - - wxColour vColor( wxT("YELLOW") ); - lColor = (LONG)vColor.GetPixel(); - ::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - ); - strcpy(zFont, "8.Helv"); - ::WinSetPresParam( m_hWnd - ,PP_FONTNAMESIZE - ,strlen(zFont) + 1 - ,(PVOID)zFont - ); -} // end of wxToolTip::Create - -void wxToolTip::DisplayToolTipWindow( - const wxPoint& rPoint -) -{ - LONG lX = rPoint.x; - LONG lY = rPoint.y - 30; - LONG lWidth = 0L; - LONG lHeight = 0L; - - lWidth = m_sText.Length() * 8; - lHeight = 15; - ::WinSetWindowPos( m_hWnd - ,HWND_TOP - ,lX - ,lY - ,lWidth - ,lHeight - ,SWP_MOVE | SWP_SIZE | SWP_SHOW - ); -} // end of wxToolTip::DisplayToolTipWindow - -void wxToolTip::HideToolTipWindow() -{ - ::WinShowWindow(m_hWnd, FALSE); -} // end of wxToolTip::HideToolTipWindow - -void wxToolTip::SetTip( - const wxString& rsTip -) -{ - SWP vSwp; - LONG lWidth = 0L; - LONG lHeight = 0L; - - ::WinQueryWindowPos(m_hWnd, &vSwp); - m_sText = rsTip; - lWidth = rsTip.Length() * 8; - lHeight = 15; - ::WinSetWindowPos( m_hWnd - ,HWND_TOP - ,vSwp.cx - ,vSwp.cy - ,lWidth - ,lHeight - ,SWP_MOVE | SWP_SIZE | SWP_SHOW - ); -} // end of wxToolTip::SetTip - -#endif // wxUSE_TOOLTIPS diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp deleted file mode 100644 index 2ace41f553..0000000000 --- a/src/os2/toplevel.cpp +++ /dev/null @@ -1,1143 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/toplevel.cpp -// Purpose: implements wxTopLevelWindow for OS/2 -// Author: Vadim Zeitlin -// Modified by: -// Created: 30.12.01 -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/toplevel.h" - -#ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/dialog.h" - #include "wx/string.h" - #include "wx/log.h" - #include "wx/intl.h" - #include "wx/frame.h" - #include "wx/control.h" - #include "wx/containr.h" // wxSetFocusToChild() - #include "wx/settings.h" - #include "wx/module.h" // wxSetFocusToChild() -#endif //WX_PRECOMP - -#include "wx/os2/private.h" - -// ---------------------------------------------------------------------------- -// stubs for missing functions under MicroWindows -// ---------------------------------------------------------------------------- - - -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - -// the name of the default wxWidgets class -extern void wxAssociateWinWithHandle( HWND hWnd, wxWindowOS2* pWin ); - -bool wxTopLevelWindowOS2::m_sbInitialized = false; -wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL; - -// ============================================================================ -// wxTopLevelWindowOS2 implementation -// ============================================================================ - -BEGIN_EVENT_TABLE(wxTopLevelWindowOS2, wxTopLevelWindowBase) - EVT_ACTIVATE(wxTopLevelWindowOS2::OnActivate) -END_EVENT_TABLE() - -// ============================================================================ -// wxTopLevelWindowMSW implementation -// ============================================================================ - -// Dialog window proc -MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd) - ,UINT uMessage - ,void * WXUNUSED(wParam) - ,void * WXUNUSED(lParam) - ) -{ - switch(uMessage) - { - case WM_INITDLG: - // - // For this message, returning TRUE tells system to set focus to - // the first control in the dialog box, but we set the focus - // ourselves, however in OS/2 we must return true to enable the dialog - // - return (MRESULT)TRUE; - default: - // - // For all the other ones, FALSE means that we didn't process the - // message - // - return (MRESULT)FALSE; - } -} // end of wxDlgProc - -// ---------------------------------------------------------------------------- -// wxTLWHiddenParentModule: used to manage the hidden parent window (we need a -// module to ensure that the window is always deleted) -// ---------------------------------------------------------------------------- - -class wxTLWHiddenParentModule : public wxModule -{ -public: - // - // Module init/finalize - // - virtual bool OnInit(void); - virtual void OnExit(void); - - // - // Get the hidden window (creates on demand) - // - static HWND GetHWND(void); - -private: - // - // The HWND of the hidden parent - // - static HWND m_shWnd; - - // - // The class used to create it - // - static const wxChar* m_szClassName; - DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule) -}; // end of CLASS wxTLWHiddenParentModule - -IMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule) - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowOS2 creation -// ---------------------------------------------------------------------------- - -void wxTopLevelWindowOS2::Init() -{ - m_bIconized = m_bMaximizeOnShow = false; - - // - // Unlike (almost?) all other windows, frames are created hidden - // - m_isShown = false; - - // - // Data to save/restore when calling ShowFullScreen - m_lFsStyle = 0; - m_lFsOldWindowStyle = 0; - m_bFsIsMaximized = false; - m_bFsIsShowing = false; - - m_hFrame = NULLHANDLE; - memset(&m_vSwp, 0, sizeof(SWP)); - memset(&m_vSwpClient, 0, sizeof(SWP)); - m_pWinLastFocused = NULL; -} // end of wxTopLevelWindowIOS2::Init - -void wxTopLevelWindowOS2::OnActivate( - wxActivateEvent& rEvent -) -{ - if (rEvent.GetActive()) - { - // - // Restore focus to the child which was last focused - // - wxLogTrace(wxT("focus"), wxT("wxTLW %08lx activated."), m_hWnd); - - wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent() - : NULL; - if (!pParent) - { - pParent = this; - } - - wxSetFocusToChild( pParent - ,&m_pWinLastFocused - ); - } - else // deactivating - { - // - // Remember the last focused child if it is our child - // - m_pWinLastFocused = FindFocus(); - - // - // So we NULL it out if it's a child from some other frame - // - wxWindow* pWin = m_pWinLastFocused; - - while (pWin) - { - if (pWin->IsTopLevel()) - { - if (pWin != this) - { - m_pWinLastFocused = NULL; - } - break; - } - pWin = pWin->GetParent(); - } - - wxLogTrace(wxT("focus"), - wxT("wxTLW %08lx deactivated, last focused: %08lx."), - m_hWnd, - m_pWinLastFocused ? GetHwndOf(m_pWinLastFocused) - : NULL); - rEvent.Skip(); - } -} // end of wxTopLevelWindowOS2::OnActivate - -WXDWORD wxTopLevelWindowOS2::OS2GetStyle( - long lStyle -, WXDWORD* pdwExflags -) const -{ - long lMsflags = wxWindow::OS2GetStyle( (lStyle & ~wxBORDER_MASK) | wxBORDER_NONE - ,pdwExflags - ); - - if ((lStyle & wxDEFAULT_FRAME_STYLE) == wxDEFAULT_FRAME_STYLE) - lMsflags |= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | - FCF_MINMAX | FCF_TASKLIST; - - if ((lStyle & wxCAPTION) == wxCAPTION) - lMsflags |= FCF_TASKLIST; - else - lMsflags |= FCF_NOMOVEWITHOWNER; - - if ((lStyle & wxVSCROLL) == wxVSCROLL) - lMsflags |= FCF_VERTSCROLL; - if ((lStyle & wxHSCROLL) == wxHSCROLL) - lMsflags |= FCF_HORZSCROLL; - if (lStyle & wxMINIMIZE_BOX) - lMsflags |= FCF_MINBUTTON; - if (lStyle & wxMAXIMIZE_BOX) - lMsflags |= FCF_MAXBUTTON; - if (lStyle & wxRESIZE_BORDER) - lMsflags |= FCF_DLGBORDER; - if (lStyle & wxSYSTEM_MENU) - lMsflags |= FCF_SYSMENU; - if (lStyle & wxCAPTION) - lMsflags |= FCF_TASKLIST; - if (lStyle & wxCLIP_CHILDREN) - { - // Invalid for frame windows under PM - } - - if (lStyle & wxTINY_CAPTION) - lMsflags |= FCF_TASKLIST; - - if ((lStyle & wxRESIZE_BORDER) == 0) - lMsflags |= FCF_BORDER; - if (lStyle & wxFRAME_TOOL_WINDOW) - *pdwExflags = kFrameToolWindow; - - if (lStyle & wxSTAY_ON_TOP) - lMsflags |= FCF_SYSMODAL; - - return lMsflags; -} // end of wxTopLevelWindowOS2::OS2GetCreateWindowFlags - -WXHWND wxTopLevelWindowOS2::OS2GetParent() const -{ - HWND hWndParent = NULL; - - // - // For the frames without wxFRAME_FLOAT_ON_PARENT style we should use NULL - // parent HWND or it would be always on top of its parent which is not what - // we usually want (in fact, we only want it for frames with the - // wxFRAME_FLOAT_ON_PARENT flag) - // - if (HasFlag(wxFRAME_FLOAT_ON_PARENT) ) - { - const wxWindow* pParent = GetParent(); - - if (!pParent) - { - // - // This flag doesn't make sense then and will be ignored - // - wxFAIL_MSG( wxT("wxFRAME_FLOAT_ON_PARENT but no parent?") ); - } - else - { - hWndParent = GetHwndOf(pParent); - } - } - //else: don't float on parent, must not be owned - - // - // Now deal with the 2nd taskbar-related problem (see comments above in - // OS2GetStyle()) - // - if (HasFlag(wxFRAME_NO_TASKBAR) && !hWndParent) - { - // - // Use hidden parent - // - hWndParent = wxTLWHiddenParentModule::GetHWND(); - } - return (WXHWND)hWndParent; -} // end of wxTopLevelWindowOS2::OS2GetParent - - -bool wxTopLevelWindowOS2::CreateDialog( ULONG ulDlgTemplate, - const wxString& WXUNUSED(rsTitle), - const wxPoint& rPos, - const wxSize& rSize ) -{ - wxWindow* pParent = GetParent(); - - // - // For the dialogs without wxDIALOG_NO_PARENT style, use the top level - // app window as parent - this avoids creating modal dialogs without - // parent - // - if (!pParent && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT)) - { - pParent = wxTheApp->GetTopWindow(); - - if (pParent) - { - // - // Don't use transient windows as parents, this is dangerous as it - // can lead to a crash if the parent is destroyed before the child - // - // also don't use the window which is currently hidden as then the - // dialog would be hidden as well - if ((pParent->GetExtraStyle() & wxWS_EX_TRANSIENT) || - !pParent->IsShown()) - { - pParent = NULL; - } - } - } - - HWND hWndDlg; - HWND hWndOwner; - - if (pParent) - hWndOwner = GetHwndOf(pParent); - else - hWndOwner = HWND_DESKTOP; - - hWndDlg = ::WinLoadDlg( HWND_DESKTOP - ,hWndOwner - ,(PFNWP)wxDlgProc - ,NULL - ,(ULONG)ulDlgTemplate - ,(PVOID)this - ); - - m_hWnd = (WXHWND) hWndDlg; - - if ( !m_hWnd ) - { - wxFAIL_MSG(wxT("Did you forget to include wx/os2/wx.rc in your resources?")); - - wxLogSysError(wxT("Can't create dialog using template '%ld'"), ulDlgTemplate); - - return false; - } - - // - // Move the dialog to its initial position without forcing repainting - // - int nX; - int nY; - int nWidth; - int nHeight; - - if (!OS2GetCreateWindowCoords( rPos - ,rSize - ,nX - ,nY - ,nWidth - ,nHeight - )) - { - nX = nWidth = (int)CW_USEDEFAULT; - } - - // - // We can't use CW_USEDEFAULT here as we're not calling CreateWindow() - // and passing CW_USEDEFAULT to MoveWindow() results in resizing the - // window to (0, 0) size which breaks quite a lot of things, e.g. the - // sizer calculation in wxSizer::Fit() - // - if (nWidth == (int)CW_USEDEFAULT) - { - // - // The exact number doesn't matter, the dialog will be resized - // again soon anyhow but it should be big enough to allow - // calculation relying on "totalSize - clientSize > 0" work, i.e. - // at least greater than the title bar height - // - nWidth = nHeight = 100; - } - if (nX == (int)CW_USEDEFAULT) - { - // - // Centre it on the screen - what else can we do? - // - wxSize vSizeDpy = wxGetDisplaySize(); - - nX = (vSizeDpy.x - nWidth) / 2; - nY = (vSizeDpy.y - nHeight) / 2; - } - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - - LONG lColor = (LONG)m_backgroundColour.GetPixel(); - - if (!::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - )) - { - return false; - } - - // Convert to OS/2 coordinates - nY = GetOS2ParentHeight(pParent) - nY - nHeight; - - ::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,nX - ,nY - ,nWidth - ,nHeight - ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW | SWP_ACTIVATE - ); - ::WinQueryWindowPos(GetHwnd(), GetSwp()); - m_hFrame = m_hWnd; - SubclassWin(m_hWnd); - return true; -} // end of wxTopLevelWindowOS2::CreateDialog - -bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle, - const wxPoint& rPos, - const wxSize& rSize ) -{ - WXDWORD lExflags; - WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags); - long lStyle = GetWindowStyleFlag(); - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - ULONG ulStyleFlags = 0L; - ERRORID vError; - wxString sError; - wxWindow* pParent = GetParent(); - HWND hParent; - HWND hFrame; - HWND hClient; - - if (pParent) - hParent = GetHwndOf(pParent); - else - hParent = HWND_DESKTOP; - - if ((lStyle & wxMINIMIZE) || (lStyle & wxICONIZE)) - ulStyleFlags |= WS_MINIMIZED; - if (lStyle & wxMAXIMIZE) - ulStyleFlags |= WS_MAXIMIZED; - - // - // Clear the visible flag, we always call show - // - ulStyleFlags &= (unsigned long)~WS_VISIBLE; - m_bIconized = false; - - // - // Create the frame window: We break ranks with other ports now - // and instead of calling down into the base wxWindow class' OS2Create - // we do all our own stuff here. We will set the needed pieces - // of wxWindow manually, here. - // - - hFrame = ::WinCreateStdWindow( hParent - ,ulStyleFlags // frame-window style - ,(PULONG)&lFlags // window style - ,wxString(wxFrameClassName).c_str() // class name - ,rsTitle.c_str() // window title - ,0L // default client style - ,NULLHANDLE // resource in executable file - ,0 // resource id - ,&hClient // receives client window handle - ); - if (!hFrame) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error creating frame. Error: %s\n"), sError.c_str()); - return false; - } - - // - // wxWindow class' m_hWnd set here and needed associations - // - m_hFrame = hFrame; - m_hWnd = hClient; - wxAssociateWinWithHandle(m_hWnd, this); - wxAssociateWinWithHandle(m_hFrame, this); - - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - - LONG lColor = (LONG)m_backgroundColour.GetPixel(); - - if (!::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error creating frame. Error: %s\n"), sError.c_str()); - return false; - } - - // - // Now need to subclass window. Instead of calling the SubClassWin in wxWindow - // we manually subclass here because we don't want to use the main wxWndProc - // by default - // - m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(m_hFrame, (PFNWP)wxFrameMainWndProc); - - // - // Now size everything. If adding a menu the client will need to be resized. - // - - if (!OS2GetCreateWindowCoords( rPos - ,rSize - ,nX - ,nY - ,nWidth - ,nHeight - )) - { - nX = nWidth = (int)CW_USEDEFAULT; - } - - // - // We can't use CW_USEDEFAULT here as we're not calling CreateWindow() - // and passing CW_USEDEFAULT to MoveWindow() results in resizing the - // window to (0, 0) size which breaks quite a lot of things, e.g. the - // sizer calculation in wxSizer::Fit() - // - if (nWidth == (int)CW_USEDEFAULT) - { - // - // The exact number doesn't matter, the dialog will be resized - // again soon anyhow but it should be big enough to allow - // calculation relying on "totalSize - clientSize > 0" work, i.e. - // at least greater than the title bar height - // - nWidth = nHeight = 100; - } - if (nX == (int)CW_USEDEFAULT) - { - // - // Centre it on the screen for now - what else can we do? - // TODO: We could try FCF_SHELLPOSITION but it will require moving - // things around a bit. - // - wxSize vSizeDpy = wxGetDisplaySize(); - - nX = (vSizeDpy.x - nWidth) / 2; - nY = (vSizeDpy.y - nHeight) / 2; - } - - // Convert to OS/2 coordinates - nY = GetOS2ParentHeight(pParent) - nY - nHeight; - - if (!::WinSetWindowPos( m_hFrame - ,HWND_TOP - ,nX - ,nY - ,nWidth - ,nHeight - ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error sizing frame. Error: %s\n"), sError.c_str()); - return false; - } - lStyle = ::WinQueryWindowULong( m_hWnd - ,QWL_STYLE - ); - lStyle |= WS_CLIPCHILDREN; - ::WinSetWindowULong( m_hWnd - ,QWL_STYLE - ,lStyle - ); - return true; -} // end of wxTopLevelWindowOS2::CreateFrame - -bool wxTopLevelWindowOS2::Create( - wxWindow* pParent -, wxWindowID vId -, const wxString& rsTitle -, const wxPoint& rPos -, const wxSize& rSizeOrig -, long lStyle -, const wxString& rsName -) -{ - // - // Init our fields - // - Init(); - m_windowStyle = lStyle; - SetName(rsName); - m_windowId = vId == -1 ? NewControlId() : vId; - - // always create a frame of some reasonable, even if arbitrary, size (at - // least for MSW compatibility) - wxSize rSize = rSizeOrig; - if ( rSize.x == -1 || rSize.y == -1 ) - { - wxSize sizeDpy = wxGetDisplaySize(); - if ( rSize.x == -1 ) - rSize.x = sizeDpy.x / 3; - if ( rSize.y == -1 ) - rSize.y = sizeDpy.y / 5; - } - - wxTopLevelWindows.Append(this); - if (pParent) - pParent->AddChild(this); - - if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) - { - // - // We have different dialog templates to allow creation of dialogs - // with & without captions under OS2indows, resizable or not (but a - // resizable dialog always has caption - otherwise it would look too - // strange) - // - ULONG ulDlgTemplate; - - if (lStyle & wxRESIZE_BORDER) - ulDlgTemplate = (ULONG)kResizeableDialog; - else if (lStyle & wxCAPTION) - ulDlgTemplate = (ULONG)kCaptionDialog; - else - ulDlgTemplate = (ULONG)kNoCaptionDialog; - return CreateDialog( ulDlgTemplate - ,rsTitle - ,rPos - ,rSize - ); - } - else // !dialog - { - return CreateFrame( rsTitle - ,rPos - ,rSize - ); - } -} // end of wxTopLevelWindowOS2::Create - -wxTopLevelWindowOS2::~wxTopLevelWindowOS2() -{ - // - // After destroying an owned window, Windows activates the next top level - // window in Z order but it may be different from our owner (to reproduce - // this simply Alt-TAB to another application and back before closing the - // owned frame) whereas we always want to yield activation to our parent - // - if (HasFlag(wxFRAME_FLOAT_ON_PARENT)) - { - wxWindow* pParent = GetParent(); - - if (pParent) - { - ::WinSetWindowPos( GetHwndOf(pParent) - ,HWND_TOP - ,0, 0, 0, 0 - ,SWP_ZORDER - ); - } - } -} // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2 - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowOS2 client size -// ---------------------------------------------------------------------------- - -void wxTopLevelWindowOS2::DoSetClientSize( - int nWidth -, int nHeight -) -{ - // - // Call GetClientAreaOrigin() to take the toolbar into account - // - wxPoint vPt = GetClientAreaOrigin(); - - nWidth += vPt.x; - nHeight += vPt.y; - - wxWindow::DoSetClientSize( nWidth - ,nHeight - ); -} // end of wxTopLevelWindowOS2::DoSetClientSize - -void wxTopLevelWindowOS2::DoGetClientSize( - int* pnX -, int* pnY -) const -{ - wxWindow::DoGetClientSize( pnX - ,pnY - ); - - wxPoint vPt = GetClientAreaOrigin(); - - if (pnX) - *pnX -= vPt.x; - - if (pnY) - *pnY += vPt.y; -} // end of wxTopLevelWindowOS2::DoGetClientSize - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowOS2 showing -// ---------------------------------------------------------------------------- - -void wxTopLevelWindowOS2::DoShowWindow( - int nShowCmd -) -{ - ::WinShowWindow(m_hFrame, (BOOL)(nShowCmd & SWP_SHOW)); - - // - // Need to artificially send a size event as wxApps often expect to do some - // final child control sizing - SendSizeEvent(); - m_bIconized = nShowCmd == SWP_MINIMIZE; -} // end of wxTopLevelWindowOS2::DoShowWindow - -bool wxTopLevelWindowOS2::Show( bool bShow ) -{ - int nShowCmd; - SWP vSwp; - - if (bShow != IsShown() ) - { - m_isShown = bShow; - } - else - { - return false; - } - if (bShow) - { - if (m_bMaximizeOnShow) - { - nShowCmd = SWP_MAXIMIZE; - m_bMaximizeOnShow = false; - } - else - { - nShowCmd = SWP_SHOW; - } - } - else // hide - { - nShowCmd = SWP_HIDE; - } - DoShowWindow(nShowCmd); - - if (bShow) - { - wxActivateEvent vEvent(wxEVT_ACTIVATE, true, m_windowId); - - ::WinQueryWindowPos(m_hFrame, &vSwp); - m_bIconized = ( vSwp.fl & SWP_MINIMIZE ) == SWP_MINIMIZE ; - ::WinQueryWindowPos(m_hWnd, &m_vSwpClient); - ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); - ::WinQueryWindowPos(m_hWnd, &vSwp); - ::WinEnableWindow(m_hFrame, TRUE); - - vEvent.SetEventObject(this); - HandleWindowEvent(vEvent); - } - else - { - // - // Try to highlight the correct window (the parent) - // - if (GetParent()) - { - HWND hWndParent = GetHwndOf(GetParent()); - - ::WinQueryWindowPos(hWndParent, &vSwp); - m_bIconized = (vSwp.fl & SWP_MINIMIZE)==SWP_MINIMIZE; - ::WinEnableWindow(hWndParent, TRUE); - } - } - return true; -} // end of wxTopLevelWindowOS2::Show - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowOS2 maximize/minimize -// ---------------------------------------------------------------------------- - -void wxTopLevelWindowOS2::Maximize( - bool bMaximize -) -{ - if (IsShown()) - { - // - // Just maximize it directly - // - DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE); - } - else // hidden - { - // - // We can't maximize the hidden frame because it shows it as well, so - // just remember that we should do it later in this case - // - m_bMaximizeOnShow = bMaximize; - } -} // end of wxTopLevelWindowOS2::Maximize - -bool wxTopLevelWindowOS2::IsMaximized() const -{ - ::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp); - return (m_vSwp.fl & SWP_MAXIMIZE) == SWP_MAXIMIZE; -} // end of wxTopLevelWindowOS2::IsMaximized - -void wxTopLevelWindowOS2::SetTitle( const wxString& title) -{ - SetLabel(title); -} - -wxString wxTopLevelWindowOS2::GetTitle() const -{ - return GetLabel(); -} - -void wxTopLevelWindowOS2::Iconize( bool bIconize ) -{ - DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE); -} // end of wxTopLevelWindowOS2::Iconize - -bool wxTopLevelWindowOS2::IsIconized() const -{ - // also update the current state - ::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp); - if (m_vSwp.fl & SWP_MINIMIZE) - ((wxTopLevelWindow*)this)->m_bIconized = true; - else - ((wxTopLevelWindow*)this)->m_bIconized = false; - return m_bIconized; -} // end of wxTopLevelWindowOS2::IsIconized - -void wxTopLevelWindowOS2::Restore() -{ - DoShowWindow(SWP_RESTORE); -} // end of wxTopLevelWindowOS2::Restore - -// generate an artificial resize event -void wxTopLevelWindowOS2::SendSizeEvent(int flags) -{ - if (!m_bIconized) - { - RECTL vRect = wxGetWindowRect(GetHwnd()); - - if ( flags & wxSEND_EVENT_POST ) - { - (void)::WinPostMsg( m_hFrame - ,WM_SIZE - ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom) - ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom) - ); - } - else // send it - { - (void)::WinSendMsg( m_hFrame - ,WM_SIZE - ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom) - ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom) - ); - } - } -} // end of wxTopLevelWindowOS2::SendSizeEvent - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowOS2 fullscreen -// ---------------------------------------------------------------------------- - -bool wxTopLevelWindowOS2::ShowFullScreen( bool bShow, - long lStyle ) -{ - if (bShow) - { - if (IsFullScreen()) - return false; - - m_bFsIsShowing = true; - m_lFsStyle = lStyle; - - // - // Zap the frame borders - // - - // - // Save the 'normal' window lStyle - // - m_lFsOldWindowStyle = ::WinQueryWindowULong( (HWND)GetHWND() - ,QWL_STYLE - ); - - // - // Save the old position, width & height, maximize state - // - m_vFsOldSize = GetRect(); - m_bFsIsMaximized = IsMaximized(); - - // - // Decide which window lStyle flags to turn off - // - LONG lNewStyle = m_lFsOldWindowStyle; - LONG lOffFlags = 0; - - if (lStyle & wxFULLSCREEN_NOBORDER) - lOffFlags |= FCF_BORDER; - if (lStyle & wxFULLSCREEN_NOCAPTION) - lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU); - - lNewStyle &= (~lOffFlags); - - // - // Change our window style to be compatible with full-screen mode - // - ::WinSetWindowULong( (HWND)GetHWND() - ,QWL_STYLE - ,lNewStyle - ); - - // - // Resize to the size of the desktop - // - int nWidth; - int nHeight; - RECTL vRect = wxGetWindowRect(HWND_DESKTOP); - - nWidth = vRect.xRight - vRect.xLeft; - nHeight = vRect.yTop - vRect.yBottom; - - SetSize( nWidth, nHeight ); - - // - // Now flush the window style cache and actually go full-screen - // - ::WinSetWindowPos( m_hFrame - ,HWND_TOP - ,0 - ,0 - ,nWidth - ,nHeight - ,SWP_SIZE | SWP_MOVE - ); - - wxSize full( nWidth, nHeight ); - wxSizeEvent vEvent( full, GetId() ); - HandleWindowEvent(vEvent); - return true; - } - else - { - if (!IsFullScreen()) - return false; - - m_bFsIsShowing = false; - Maximize(m_bFsIsMaximized); - ::WinSetWindowULong( (HWND)GetHWND() - ,QWL_STYLE - ,m_lFsOldWindowStyle - ); - ::WinSetWindowPos( m_hFrame - ,HWND_TOP - ,m_vFsOldSize.x - ,m_vFsOldSize.y - ,m_vFsOldSize.width - ,m_vFsOldSize.height - ,SWP_SIZE | SWP_MOVE - ); - return true; - } -} // end of wxTopLevelWindowOS2::ShowFullScreen - -// ---------------------------------------------------------------------------- -// wxTopLevelWindowOS2 misc -// ---------------------------------------------------------------------------- - -void wxTopLevelWindowOS2::SetIcons( - const wxIconBundle& rIcons -) -{ - // - // This sets m_icon - // - wxTopLevelWindowBase::SetIcons(rIcons); - - const wxIcon& vIcon = rIcons.GetIconOfExactSize(32); - - if (vIcon.IsOk()) - { - ::WinSendMsg( m_hFrame - ,WM_SETICON - ,(MPARAM)((HPOINTER)vIcon.GetHICON()) - ,NULL - ); - ::WinSendMsg( m_hFrame - ,WM_UPDATEFRAME - ,(MPARAM)FCF_ICON - ,(MPARAM)0 - ); - } -} // end of wxTopLevelWindowOS2::SetIcon - -bool wxTopLevelWindowOS2::EnableCloseButton( bool bEnable ) -{ - // - // Get system (a.k.a. window) menu - // - HMENU hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU); - - if (!hMenu) - { - wxLogLastError(wxT("GetSystemMenu")); - return false; - } - - // - // Enabling/disabling the close item from it also automatically - // disables/enables the close title bar button - // - if (bEnable) - (void)::WinSendMsg( hMenu - ,MM_SETITEMATTR - ,MPFROM2SHORT(SC_CLOSE, FALSE) - ,MPFROM2SHORT(MIA_DISABLED, FALSE) - ); - else - (void)::WinSendMsg( hMenu - ,MM_SETITEMATTR - ,MPFROM2SHORT(SC_CLOSE, FALSE) - ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED) - ); - - // - // Update appearance immediately - // - ::WinSendMsg( m_hFrame - ,WM_UPDATEFRAME - ,(MPARAM)FCF_MENU - ,(MPARAM)0 - ); - return true; -} // end of wxTopLevelWindowOS2::EnableCloseButton - -// ============================================================================ -// wxTLWHiddenParentModule implementation -// ============================================================================ - -HWND wxTLWHiddenParentModule::m_shWnd = NULL; -const wxChar* wxTLWHiddenParentModule::m_szClassName = NULL; - -bool wxTLWHiddenParentModule::OnInit() -{ - m_shWnd = NULL; - m_szClassName = NULL; - return true; -} // end of wxTLWHiddenParentModule::OnInit - -void wxTLWHiddenParentModule::OnExit() -{ - if (m_shWnd) - { - if (!::WinDestroyWindow(m_shWnd)) - { - wxLogLastError(wxT("DestroyWindow(hidden TLW parent)")); - } - m_shWnd = NULL; - } - - m_szClassName = NULL; -} // end of wxTLWHiddenParentModule::OnExit - -/* static */ -HWND wxTLWHiddenParentModule::GetHWND() -{ - if (!m_shWnd) - { - if (!m_szClassName) - { - static const wxChar* zHIDDEN_PARENT_CLASS = wxT("wxTLWHiddenParent"); - - if (!::WinRegisterClass( wxGetInstance() - ,(PSZ)zHIDDEN_PARENT_CLASS - ,NULL - ,0 - ,sizeof(ULONG) - )) - { - wxLogLastError(wxT("RegisterClass(\"wxTLWHiddenParent\")")); - } - else - { - m_szClassName = zHIDDEN_PARENT_CLASS; - } - } - m_shWnd = ::WinCreateWindow( HWND_DESKTOP, - (PSZ)m_szClassName, - "", - 0L, - (LONG)0L, - (LONG)0L, - (LONG)0L, - (LONG)0L, - NULLHANDLE, - HWND_TOP, - 0L, - NULL, - NULL ); - if (!m_shWnd) - { - wxLogLastError(wxT("CreateWindow(hidden TLW parent)")); - } - } - return m_shWnd; -} // end of wxTLWHiddenParentModule::GetHWND diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp deleted file mode 100644 index 37db6a6322..0000000000 --- a/src/os2/treectrl.cpp +++ /dev/null @@ -1,2065 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/treectrl.cpp -// Purpose: wxTreeCtrl -// Author: Julian Smart -// Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98 -// Created: 1997 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_TREECTRL - -#include "wx/treectrl.h" - -#ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/log.h" - #include "wx/app.h" - #include "wx/settings.h" -#endif - -#include "wx/os2/private.h" - -#include "wx/imaglist.h" - -// a macro to hide the ugliness of nested casts -#define HITEM(item) (HTREEITEM)(WXHTREEITEM)(item) - -// the native control doesn't support multiple selections under MSW and we -// have 2 ways to emulate them: either using TVS_CHECKBOXES style and let -// checkboxes be the selection status (checked == selected) or by really -// emulating everything, i.e. intercepting mouse and key events &c. The first -// approach is much easier but doesn't work with comctl32.dll < 4.71 and also -// looks quite ugly. -#define wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE 0 - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// private classes -// ---------------------------------------------------------------------------- - -typedef struct _MYRECORD -{ - RECORDCORE m_vRecord; - ULONG m_ulItemId; - ULONG m_ulUserData; -} MYRECORD, *PMYRECORD; - -struct wxTreeViewItem : public MYRECORD -{ - wxTreeViewItem(const wxTreeItemId& rItem) - { - m_ulItemId = (ULONG)rItem.m_pItem; - } -}; // end of STRUCT wxTreeViewItem - -class wxTreeItemInternalData -{ -public: - - wxTreeItemInternalData() {} - ~wxTreeItemInternalData() - { - wxDELETE(m_pAttr); - } - - wxTreeItemAttr* m_pAttr; - WXLPARAM m_lParam; // user data -#if defined(C_CM_COS232) - PMYRECORD m_pMyRecord; // so we can set the m_ulUserData to 0 when this is deleted -#endif -}; // end of CLASS wxTreeItemInternalData - -void BumpTreeRecordIds ( - HWND hWnd -, PMYRECORD pRecord -) -{ - while(pRecord) - { - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( hWnd - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - if (pRecord) - pRecord->m_ulItemId++; - } -} // end of BumpTreeRecordIds - -PMYRECORD FindOS2TreeRecordByID ( - HWND hWnd -, long lItemId -) -{ - PMYRECORD pRecord = NULL; - CNRINFO vCnrInfo; - unsigned long i; - - if (!::WinSendMsg( hWnd - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - return NULL; - for (i = 0; i < vCnrInfo.cRecords; i++) - { - if (i == 0) - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( hWnd - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER) - )); - else - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( hWnd - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - if (!pRecord) - return NULL; - if (pRecord->m_ulItemId == (ULONG)lItemId) - break; - } - return pRecord; -} // end of FindOS2ListRecordByID - - - -class wxTreeTraversal -{ -public: - wxTreeTraversal(const wxTreeCtrl* pTree) - { - m_pTree = pTree; - } - - // - // Do traverse the tree: visit all items (recursively by default) under the - // given one; return true if all items were traversed or false if the - // traversal was aborted because OnVisit returned false - // - bool DoTraverse( const wxTreeItemId& rRoot - ,bool bRecursively = true - ); - - // - // Override this function to do whatever is needed for each item, return - // false to stop traversing - // - virtual bool OnVisit(const wxTreeItemId& rItem) = 0; - -protected: - const wxTreeCtrl* GetTree(void) const { return m_pTree; } - -private: - bool Traverse( const wxTreeItemId& rRoot - ,bool bRecursively - ); - - const wxTreeCtrl* m_pTree; - wxDECLARE_NO_COPY_CLASS(wxTreeTraversal); -}; // end of CLASS wxTreeTraversal - -// -// Internal class for getting the selected items -// -class TraverseSelections : public wxTreeTraversal -{ -public: - TraverseSelections( const wxTreeCtrl* pTree - ,wxArrayTreeItemIds& raSelections - ) - : wxTreeTraversal(pTree) - , m_aSelections(raSelections) - { - m_aSelections.Empty(); - DoTraverse(pTree->GetRootItem()); - } - - virtual bool OnVisit(const wxTreeItemId& rItem) - { - // - // Can't visit a virtual node. - // - if ((GetTree()->GetRootItem() == rItem) && (GetTree()->GetWindowStyle() & wxTR_HIDE_ROOT)) - { - return true; - } - PMYRECORD pRecord = FindOS2TreeRecordByID( (HWND)GetTree()->GetHWND() - ,rItem.m_pItem - ); - if (pRecord->m_vRecord.flRecordAttr & CRA_SELECTED) - { - m_aSelections.Add(rItem); - } - return true; - } - - size_t GetCount(void) const { return m_aSelections.GetCount(); } - -private: - wxArrayTreeItemIds& m_aSelections; -}; // end of CLASS TraverseSelections - -// -// Internal class for counting tree items -// -class TraverseCounter : public wxTreeTraversal -{ -public: - TraverseCounter( const wxTreeCtrl* pTree - ,const wxTreeItemId& rRoot - ,bool bRecursively - ) - : wxTreeTraversal(pTree) - { - m_nCount = 0; - DoTraverse(rRoot, bRecursively); - } - - virtual bool OnVisit(const wxTreeItemId& WXUNUSED(rItem)) - { - m_nCount++; - return true; - } - - size_t GetCount(void) const { return m_nCount; } - -private: - size_t m_nCount; -}; // end of CLASS TraverseCounter - -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// indices in gs_expandEvents table below -enum -{ - IDX_COLLAPSE, - IDX_EXPAND, - IDX_WHAT_MAX -}; - -enum -{ - IDX_DONE, - IDX_DOING, - IDX_HOW_MAX -}; - -// handy table for sending events - it has to be initialized during run-time -// now so can't be const any more -static /* const */ wxEventType gs_expandEvents[IDX_WHAT_MAX][IDX_HOW_MAX]; - -/* - but logically it's a const table with the following entries: -= -{ - { wxEVT_TREE_ITEM_COLLAPSED, wxEVT_TREE_ITEM_COLLAPSING }, - { wxEVT_TREE_ITEM_EXPANDED, wxEVT_TREE_ITEM_EXPANDING } -}; -*/ - -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// tree traversal -// ---------------------------------------------------------------------------- - -bool wxTreeTraversal::DoTraverse ( - const wxTreeItemId& rRoot -, bool bRecursively -) -{ - if (!OnVisit(rRoot)) - return false; - - return Traverse( rRoot - ,bRecursively - ); -} // end of wxTreeTraversal::DoTraverse - -bool wxTreeTraversal::Traverse ( - const wxTreeItemId& rRoot -, bool bRecursively -) -{ - long lCookie; - wxTreeItemId vChild = m_pTree->GetFirstChild( rRoot - ,lCookie - ); - while (vChild.IsOk()) - { - // - // Depth first traversal - // - if (bRecursively && !Traverse(vChild, true)) - return false; - if (!OnVisit(vChild)) - return false; - vChild = m_pTree->GetNextChild( rRoot - ,lCookie - ); - } - return true; -} // end of wxTreeTraversal::Traverse - -// ---------------------------------------------------------------------------- -// construction and destruction -// ---------------------------------------------------------------------------- - -void wxTreeCtrl::Init () -{ - m_pImageListNormal = NULL; - m_pImageListState = NULL; - m_bOwnsImageListNormal = false; - m_bOwnsImageListState = false; - m_bHasAnyAttr = false; - m_pDragImage = NULL; - - // - // Initialize the global array of events now as it can't be done statically - // with the wxEVT_XXX values being allocated during run-time only - // - gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_TREE_ITEM_COLLAPSED; - gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_TREE_ITEM_COLLAPSING; - gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_TREE_ITEM_EXPANDED; - gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_TREE_ITEM_EXPANDING; -} // end of wxTreeCtrl::Init - -bool wxTreeCtrl::Create ( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) -{ - CNRINFO vCnrInfo; - - Init(); - if (!CreateControl( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - )) - return false; - - DWORD dwStyle = WS_VISIBLE | WS_TABSTOP; - - if (m_windowStyle & wxCLIP_SIBLINGS) - dwStyle |= WS_CLIPSIBLINGS; - - // Create the tree control. - if (!OS2CreateControl( "CONTAINER" - ,dwStyle - )) - return false; - - // - // Now set the display attributes to show a TREE/ICON view of the - // OS/2 Container - // - if (!::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - )) - - vCnrInfo.flWindowAttr = CV_TREE|CV_ICON; - vCnrInfo.flWindowAttr |= CA_DRAWBITMAP; - if (m_windowStyle & wxTR_NO_LINES) - vCnrInfo.flWindowAttr |= CA_TREELINE; - - ::WinSendMsg( GetHWND() - ,CM_SETCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)CMA_FLWINDOWATTR - ); - - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(wxWindow::GetParent()->GetForegroundColour()); - SetFont(*wxSMALL_FONT); - SetXComp(0); - SetYComp(0); - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); - return true; -} // end of wxTreeCtrl::Create - -wxTreeCtrl::~wxTreeCtrl () -{ - // - // Delete any attributes - // - if (m_bHasAnyAttr) - { - for (wxNode* pNode = m_vAttrs.Next(); pNode; pNode = m_vAttrs.Next()) - { - delete (wxTreeItemAttr *)pNode->Data(); - } - m_bHasAnyAttr = false; - } - DeleteTextCtrl(); - - // - // Delete user data to prevent memory leaks - // also deletes hidden root node storage. - // - DeleteAllItems(); - if (m_bOwnsImageListNormal) - delete m_pImageListNormal; - if (m_bOwnsImageListState) - delete m_pImageListState; -} // end of wxTreeCtrl::~wxTreeCtrl - -// ---------------------------------------------------------------------------- -// accessors -// ---------------------------------------------------------------------------- - -// -// simple wrappers which add error checking in debug mode. These methods -// assume the items are properly filled out already. If not, you get errors -// -bool wxTreeCtrl::DoGetItem ( - wxTreeViewItem* pTvItem -) const -{ - PMYRECORD pRecord = FindOS2TreeRecordByID( GetHWND() - ,pTvItem->m_ulItemId - ); - - if (!pRecord) - { - wxLogLastError(wxT("Item not obtained")); - return false; - } - return true; -} // end of wxTreeCtrl::DoGetItem - -void wxTreeCtrl::DoSetItem ( - wxTreeViewItem* pTvItem -) -{ - // - // Just invalidate the record to redisplay it - // - if (!::WinSendMsg( GetHWND() - ,CM_INVALIDATERECORD - ,MPFROMP(pTvItem) - ,MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION | CMA_TEXTCHANGED) - )); - { - wxLogLastError(wxT("CM_INVALIDATERECORD")); - } -} // end of wxTreeCtrl::DoSetItem - -unsigned int wxTreeCtrl::GetCount () const -{ - CNRINFO vCnrInfo; - - ::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - ); - - return (unsigned int)vCnrInfo.cRecords; -} // end of wxTreeCtrl::GetCount - -unsigned int wxTreeCtrl::GetIndent () const -{ - CNRINFO vCnrInfo; - - ::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - ); - return (unsigned int)vCnrInfo.cxTreeIndent; -} // end of wxTreeCtrl::GetIndent - -void wxTreeCtrl::SetIndent ( - unsigned int uIndent -) -{ - CNRINFO vCnrInfo; - - ::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - ); - vCnrInfo.cxTreeIndent = (LONG)uIndent; - ::WinSendMsg( GetHWND() - ,CM_SETCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)CMA_CXTREEINDENT - ); -} // end of wxTreeCtrl::SetIndent - -wxImageList* wxTreeCtrl::GetImageList () const -{ - return m_pImageListNormal; -} // end of wxTreeCtrl::GetImageList - -wxImageList* wxTreeCtrl::GetStateImageList () const -{ - return m_pImageListNormal; -} // end of wxTreeCtrl::GetStateImageList - -// -// The SETS of imagelists really do nothing under OS2 as a RECORDCORE -// struct has the icon imbedded in it that it uses for the icon being -// displayed via the TREEITEMDESC member. Provided for interface -// compatibility only -// -void wxTreeCtrl::SetAnyImageList ( - wxImageList* WXUNUSED(pImageList) -, int WXUNUSED(nWhich) -) -{ -} // end of wxTreeCtrl::SetAnyImageList - -void wxTreeCtrl::SetImageList ( - wxImageList* WXUNUSED(pImageList) -) -{ - if (m_bOwnsImageListNormal) - delete m_pImageListNormal; - m_bOwnsImageListNormal = false; -} // end of wxTreeCtrl::SetImageList - -void wxTreeCtrl::SetStateImageList ( - wxImageList* WXUNUSED(pImageList) -) -{ - if (m_bOwnsImageListState) - delete m_pImageListState; - m_bOwnsImageListState = false; -} // end of wxTreeCtrl::SetStateImageList - -void wxTreeCtrl::AssignImageList ( - wxImageList* WXUNUSED(pImageList) -) -{ - m_bOwnsImageListNormal = true; -} // end of wxTreeCtrl::AssignImageList - -void wxTreeCtrl::AssignStateImageList ( - wxImageList* WXUNUSED(pImageList) -) -{ - m_bOwnsImageListState = true; -} // end of wxTreeCtrl::AssignStateImageList - -size_t wxTreeCtrl::GetChildrenCount ( - const wxTreeItemId& rItem -, bool bRecursively -) const -{ - TraverseCounter vCounter( this - ,rItem - ,bRecursively - ); - return vCounter.GetCount() - 1; -} // end of wxTreeCtrl::GetChildrenCount - -// ---------------------------------------------------------------------------- -// control colours -// ---------------------------------------------------------------------------- - -bool wxTreeCtrl::SetBackgroundColour ( - const wxColour& rColour -) -{ - ULONG ulColor = wxColourToRGB(rColour); - - if ( !wxWindowBase::SetBackgroundColour(rColour) ) - return false; - ::WinSetPresParam( GetHWND() - ,PP_BACKGROUNDCOLOR - ,sizeof(ULONG) - ,&ulColor - ); - return true; -} // end of wxTreeCtrl::SetBackgroundColour - -bool wxTreeCtrl::SetForegroundColour ( - const wxColour& rColour -) -{ - ULONG ulColor = wxColourToRGB(rColour); - - if (!wxWindowBase::SetForegroundColour(rColour)) - return false; - ::WinSetPresParam( GetHWND() - ,PP_FOREGROUNDCOLOR - ,sizeof(ULONG) - ,&ulColor - ); - return true; -} // end of wxTreeCtrl::SetForegroundColour - -// ---------------------------------------------------------------------------- -// Item access -// ---------------------------------------------------------------------------- - -wxString wxTreeCtrl::GetItemText ( - const wxTreeItemId& rItem -) const -{ - wxChar zBuf[512]; // the size is arbitrary... - wxTreeViewItem vTvItem(rItem); - - if (!DoGetItem(&vTvItem)) - { - // - // Don't return some garbage which was on stack, but an empty string - // - zBuf[0] = wxT('\0'); - } - else - strcpy(zBuf, vTvItem.m_vRecord.pszTree); - return wxString(zBuf); -} // end of wxTreeCtrl::GetItemText - -void wxTreeCtrl::SetItemText ( - const wxTreeItemId& rItem -, const wxString& rsText -) -{ - wxTreeViewItem vTvItem(rItem); - - vTvItem.m_vRecord.pszTree = (wxChar *)rsText.c_str(); // conversion is ok - DoSetItem(&vTvItem); -} // end of wxTreeCtrl::SetItemText - -// -// These functions under OS/2 PM are not needed. OS/2 containers in tree view -// provide for storing a custom expanded and collapsed icons and selected -// and non selected icons, natively. For instance, by default, a disk display -// will display a tree list of folder icons with "+" icons (collapsed) beside -// those folder which contain child members. Double clicking a folder changes -// the closed folder icon to an open folder icon with hatched selection -// highlighting indicating an ICON view container of the folder is open -// elsewhere on the desktop. So the below is not really needed, but we will -// simply return the appropriate icon requested out of OS/2's native PM -// data structures. -// -int wxTreeCtrl::DoGetItemImageFromData ( - const wxTreeItemId& WXUNUSED(rItem) -, wxTreeItemIcon nWhich -) const -{ - // - // Image handles stored in CNRINFO. - // - CNRINFO vCnrInfo; - - ::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - ); - - // - // We really only have two to chose from. If not custom (set in CNRINFO - // then return the handle to system bitmap). OS/2 automatically provides - // in_use and selected bitmaps/icons - // - switch(nWhich) - { - case wxTreeItemIcon_Normal: - if (vCnrInfo.hbmCollapsed == NULLHANDLE) - return (int)::WinGetSysBitmap(HWND_DESKTOP, SBMP_TREEPLUS); - return vCnrInfo.hbmCollapsed; - - - case wxTreeItemIcon_Expanded: - if (vCnrInfo.hbmExpanded == NULLHANDLE) - return (int)::WinGetSysBitmap(HWND_DESKTOP, SBMP_TREEMINUS); - return vCnrInfo.hbmExpanded; - - default: - return vCnrInfo.hbmCollapsed; - } -} - -void wxTreeCtrl::DoSetItemImageFromData ( - const wxTreeItemId& WXUNUSED(rItem) -, int nImage -, wxTreeItemIcon nWhich -) const -{ - // - // Image handles stored in CNRINFO. - // - CNRINFO vCnrInfo; - - ::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - ); - if (nWhich == wxTreeItemIcon_Normal) - vCnrInfo.hbmCollapsed = (HBITMAP)nImage; - if (nWhich == wxTreeItemIcon_Expanded) - vCnrInfo.hbmExpanded = (HBITMAP)nImage; - ::WinSendMsg( GetHWND() - ,CM_SETCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)CMA_TREEBITMAP - ); -} // end of wxTreeCtrl::DoSetItemImageFromData - -// Useless for OS/2 -void wxTreeCtrl::DoSetItemImages ( - const wxTreeItemId& rItem -, int nImage -, int nImageSel -) -{ -} // end of wxTreeCtrl::DoSetItemImages - -int wxTreeCtrl::GetItemImage ( - const wxTreeItemId& rItem -, wxTreeItemIcon nWhich -) const -{ - if (HasIndirectData(rItem)) - { - return DoGetItemImageFromData( rItem - ,nWhich - ); - } - - CNRINFO vCnrInfo; - - ::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - ); - switch (nWhich) - { - default: - wxFAIL_MSG( wxT("unknown tree item image type") ); - - case wxTreeItemIcon_Normal: - if (vCnrInfo.hbmCollapsed == NULLHANDLE) - return (int)::WinGetSysBitmap(HWND_DESKTOP, SBMP_TREEPLUS); - return vCnrInfo.hbmCollapsed; - - - case wxTreeItemIcon_Expanded: - if (vCnrInfo.hbmExpanded == NULLHANDLE) - return (int)::WinGetSysBitmap(HWND_DESKTOP, SBMP_TREEMINUS); - return vCnrInfo.hbmExpanded; - - case wxTreeItemIcon_Selected: - case wxTreeItemIcon_SelectedExpanded: - return -1; - } -} - -void wxTreeCtrl::SetItemImage ( - const wxTreeItemId& WXUNUSED(rItem) -, int nImage -, wxTreeItemIcon nWhich -) -{ - CNRINFO vCnrInfo; - - ::WinSendMsg( GetHWND() - ,CM_QUERYCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)(USHORT)sizeof(CNRINFO) - ); - switch (nWhich) - { - case wxTreeItemIcon_Normal: - vCnrInfo.hbmCollapsed = (HBITMAP)nImage; - break; - - case wxTreeItemIcon_Expanded: - vCnrInfo.hbmExpanded = (HBITMAP)nImage; - break; - - default: - wxFAIL_MSG( wxT("unknown tree item image type") ); - } - ::WinSendMsg( GetHWND() - ,CM_SETCNRINFO - ,MPFROMP(&vCnrInfo) - ,(MPARAM)CMA_TREEBITMAP - ); -} // end of wxTreeCtrl::SetItemImage - -wxTreeItemData* wxTreeCtrl::GetItemData ( - const wxTreeItemId& rItem -) const -{ - wxTreeViewItem vTvItem(rItem); - - if (!DoGetItem(&vTvItem)) - { - return NULL; - } - - return (wxTreeItemData *)vTvItem.m_ulUserData; -} // end of wxTreeCtrl::GetItemData - -void wxTreeCtrl::SetItemData ( - const wxTreeItemId& rItem -, wxTreeItemData* pData -) -{ - // - // first, associate this piece of data with this item - if (pData) - { - pData->SetId(rItem); - } - - wxTreeViewItem vTvItem(rItem); - - vTvItem.m_ulUserData = (ULONG)pData; - DoSetItem(&vTvItem); -} // end of wxTreeCtrl::SetItemData - -// The following two do nothing under OS/2 -void wxTreeCtrl::SetIndirectItemData ( - const wxTreeItemId& WXUNUSED(rItem) -, wxTreeItemIndirectData* WXUNUSED(pData) -) -{ -} // end of wxTreeCtrl::SetIndirectItemData - -bool wxTreeCtrl::HasIndirectData ( - const wxTreeItemId& WXUNUSED(rItem) -) const -{ - return false; -} // end of wxTreeCtrl::HasIndirectData - -// Irreleveant under OS/2 --- item either has child records or it doesn't. -void wxTreeCtrl::SetItemHasChildren ( - const wxTreeItemId& WXUNUSED(rItem) -, bool WXUNUSED(bHas) -) -{ -} // end of wxTreeCtrl::SetItemHasChildren - -// Irreleveant under OS/2 --- function of the font in PM -void wxTreeCtrl::SetItemBold ( - const wxTreeItemId& WXUNUSED(rItem) -, bool WXUNUSED(bBold) -) -{ -} // end of wxTreeCtrl::SetItemBold - -void wxTreeCtrl::SetItemDropHighlight ( - const wxTreeItemId& rItem -, bool bHighlight -) -{ - wxTreeViewItem vTvItem(rItem); - - ::WinSendMsg( GetHWND() - ,CM_SETRECORDEMPHASIS - ,MPFROMP(&vTvItem) - ,MPFROM2SHORT(bHighlight, CRA_SELECTED) - ); - DoSetItem(&vTvItem); -} // end of wxTreeCtrl::SetItemDropHighlight - -void wxTreeCtrl::RefreshItem ( - const wxTreeItemId& rItem -) -{ - wxTreeViewItem vTvItem(rItem); - - // - // This just does a record invalidate causing it to be re-displayed - // - DoSetItem(&vTvItem); -} // end of wxTreeCtrl::RefreshItem - -wxColour wxTreeCtrl::GetItemTextColour ( - const wxTreeItemId& rItem -) const -{ - long lId = (long)rItem.m_pItem; - wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); - - if (!pAttr) - { - return wxNullColour; - } - return pAttr->GetTextColour(); -} // end of wxTreeCtrl::GetItemTextColour - -wxColour wxTreeCtrl::GetItemBackgroundColour ( - const wxTreeItemId& rItem -) const -{ - long lId = (long)rItem.m_pItem; - wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); - - if (!pAttr) - { - return wxNullColour; - } - return pAttr->GetBackgroundColour(); -} // end of wxTreeCtrl::GetItemBackgroundColour - -wxFont wxTreeCtrl::GetItemFont ( - const wxTreeItemId& rItem -) const -{ - long lId = (long)rItem.m_pItem; - wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); - - if (!pAttr) - { - return wxNullFont; - } - return pAttr->GetFont(); -} // end of wxTreeCtrl::GetItemFont - -void wxTreeCtrl::SetItemTextColour ( - const wxTreeItemId& rItem -, const wxColour& rCol -) -{ - m_bHasAnyAttr = true; - - long lId = (long)rItem.m_pItem; - wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); - - if (!pAttr) - { - pAttr = new wxTreeItemAttr; - m_vAttrs.Put(lId, (wxObject *)pAttr); - } - pAttr->SetTextColour(rCol); - RefreshItem(rItem); -} // end of wxTreeCtrl::SetItemTextColour - -void wxTreeCtrl::SetItemBackgroundColour ( - const wxTreeItemId& rItem -, const wxColour& rCol -) -{ - m_bHasAnyAttr = true; - - long lId = (long)rItem.m_pItem; - wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); - - if (!pAttr) - { - pAttr = new wxTreeItemAttr; - m_vAttrs.Put(lId, (wxObject *)pAttr); - } - pAttr->SetBackgroundColour(rCol); - RefreshItem(rItem); -} // end of wxTreeCtrl::SetItemBackgroundColour - -void wxTreeCtrl::SetItemFont ( - const wxTreeItemId& rItem -, const wxFont& rFont -) -{ - m_bHasAnyAttr = true; - - long lId = (long)rItem.m_pItem; - wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); - - if (!pAttr) - { - pAttr = new wxTreeItemAttr; - m_vAttrs.Put(lId, (wxObject *)pAttr); - } - pAttr->SetFont(rFont); - RefreshItem(rItem); -} // end of wxTreeCtrl::SetItemFont - -// ---------------------------------------------------------------------------- -// Item status -// ---------------------------------------------------------------------------- - -bool wxTreeCtrl::IsVisible ( - const wxTreeItemId& rItem -) const -{ - // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect - RECTL vRectRecord; - RECTL vRectContainer; - wxRect vWxRectRecord; - wxRect vWxRectContainer; - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - QUERYRECORDRECT vQuery; - - vQuery.cb = sizeof(QUERYRECORDRECT); - vQuery.pRecord = (PRECORDCORE)pRecord; - vQuery.fRightSplitWindow = FALSE; - vQuery.fsExtent = CMA_TREEICON; - - ::WinSendMsg( GetHWND() - ,CM_QUERYVIEWPORTRECT - ,MPFROMP(&vRectContainer) - ,MPFROM2SHORT(CMA_WINDOW, FALSE) - ); - ::WinSendMsg( GetHWND() - ,CM_QUERYRECORDRECT - ,MPFROMP(&vRectRecord) - ,MPFROMP(&vQuery) - ); - vWxRectRecord.SetLeft(vRectRecord.xLeft); - vWxRectRecord.SetTop(vRectRecord.yTop); - vWxRectRecord.SetRight(vRectRecord.xRight); - vWxRectRecord.SetBottom(vRectRecord.yBottom); - - vWxRectContainer.SetLeft(vRectContainer.xLeft); - vWxRectContainer.SetTop(vRectContainer.yTop); - vWxRectContainer.SetRight(vRectContainer.xRight); - vWxRectContainer.SetBottom(vRectContainer.yBottom); - return (vWxRectContainer.Contains(wxPoint(vWxRectRecord.x, vWxRectRecord.y))); -} // end of wxTreeCtrl::IsVisible - -bool wxTreeCtrl::ItemHasChildren ( - const wxTreeItemId& rItem -) const -{ - wxTreeViewItem vTvItem(rItem); - DoGetItem(&vTvItem); - - // - // A tree record with children will have one of these attributes - // - return (vTvItem.m_vRecord.flRecordAttr & CRA_EXPANDED || - vTvItem.m_vRecord.flRecordAttr & CRA_COLLAPSED) != 0; -} - -bool wxTreeCtrl::IsExpanded ( - const wxTreeItemId& rItem -) const -{ - wxTreeViewItem vTvItem(rItem); - DoGetItem(&vTvItem); - - return (vTvItem.m_vRecord.flRecordAttr & CRA_EXPANDED) != 0; -} // end of wxTreeCtrl::IsExpanded - -bool wxTreeCtrl::IsSelected ( - const wxTreeItemId& rItem -) const -{ - wxTreeViewItem vTvItem(rItem); - DoGetItem(&vTvItem); - - return (vTvItem.m_vRecord.flRecordAttr & CRA_SELECTED) != 0; -} // end of wxTreeCtrl::IsSelected - -// Not supported -bool wxTreeCtrl::IsBold ( - const wxTreeItemId& rItem -) const -{ - return false; -} // end of wxTreeCtrl::IsBold - -// ---------------------------------------------------------------------------- -// navigation -// ---------------------------------------------------------------------------- - -wxTreeItemId wxTreeCtrl::GetRootItem () const -{ - PMYRECORD pRecord = NULL; - - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER) - )); - - if (!pRecord) - return wxTreeItemId(-1L); - return wxTreeItemId((long)pRecord->m_ulItemId); -} // end of wxTreeCtrl::GetRootItem - -wxTreeItemId wxTreeCtrl::GetSelection () const -{ - wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (long)(WXHTREEITEM)0, - wxT("this only works with single selection controls") ); - - PMYRECORD pRecord = NULL; - - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORDEMPHASIS - ,MPARAM(CMA_FIRST) - ,MPARAM(CRA_SELECTED) - )); - if (!pRecord) - return wxTreeItemId(-1L); - return wxTreeItemId((long)pRecord->m_ulItemId); -} // end of wxTreeCtrl::GetSelection - -wxTreeItemId wxTreeCtrl::GetItemParent ( - const wxTreeItemId& rItem -) const -{ - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - - if (!pRecord) - return wxTreeItemId(-1L); - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_PARENT, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - return wxTreeItemId((long)pRecord->m_ulItemId); -} // end of wxTreeCtrl::GetItemParent - -wxTreeItemId wxTreeCtrl::GetFirstChild ( - const wxTreeItemId& rItem -, long& rCookie -) const -{ - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - - if (!pRecord) - return wxTreeItemId(-1L); - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - // - // Remember the last child returned in 'cookie' - // - rCookie = (long)pRecord->m_ulItemId; - return wxTreeItemId(rCookie); -} // end of wxTreeCtrl::GetFirstChild - -wxTreeItemId wxTreeCtrl::GetNextChild ( - const wxTreeItemId& WXUNUSED(rItem) -, long& rCookie -) const -{ - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rCookie - ); - - if (!pRecord) - return wxTreeItemId(-1L); - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - rCookie = (long)pRecord->m_ulItemId; - return wxTreeItemId(rCookie); -} // end of wxTreeCtrl::GetNextChild - -wxTreeItemId wxTreeCtrl::GetLastChild ( - const wxTreeItemId& rItem -) const -{ - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - - if (!pRecord) - return wxTreeItemId(-1L); - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_LASTCHILD, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - return wxTreeItemId((long)pRecord->m_ulItemId); -} // end of wxTreeCtrl::GetLastChild - -wxTreeItemId wxTreeCtrl::GetNextSibling ( - const wxTreeItemId& rItem -) const -{ - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - - if (!pRecord) - return wxTreeItemId(-1L); - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - return wxTreeItemId((long)pRecord->m_ulItemId); -} // end of wxTreeCtrl::GetNextSibling - -wxTreeItemId wxTreeCtrl::GetPrevSibling ( - const wxTreeItemId& rItem -) const -{ - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - - if (!pRecord) - return wxTreeItemId(-1L); - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_PREV, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - return wxTreeItemId((long)pRecord->m_ulItemId); -} // end of wxTreeCtrl::GetPrevSibling - -wxTreeItemId wxTreeCtrl::GetFirstVisibleItem () const -{ - PMYRECORD pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - - if (IsVisible(wxTreeItemId((long)pRecord->m_ulItemId))) - return wxTreeItemId((long)pRecord->m_ulItemId); - while(pRecord) - { - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - if (IsVisible(wxTreeItemId((long)pRecord->m_ulItemId))) - return wxTreeItemId((long)pRecord->m_ulItemId); - } - return wxTreeItemId(-1L); -} // end of wxTreeCtrl::GetFirstVisibleItem - -wxTreeItemId wxTreeCtrl::GetNextVisible ( - const wxTreeItemId& rItem -) const -{ - wxASSERT_MSG(IsVisible(rItem), wxT("The item you call GetNextVisible() for must be visible itself!")); - - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - - if (!pRecord) - return wxTreeItemId(-1L); - while(pRecord) - { - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - if (IsVisible(wxTreeItemId((long)pRecord->m_ulItemId))) - return wxTreeItemId((long)pRecord->m_ulItemId); - } - return wxTreeItemId(-1L); -} // end of wxTreeCtrl::GetNextVisible - -wxTreeItemId wxTreeCtrl::GetPrevVisible ( - const wxTreeItemId& rItem -) const -{ - wxASSERT_MSG( IsVisible(rItem), wxT("The item you call GetPrevVisible() for must be visible itself!")); - - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - - if (!pRecord) - return wxTreeItemId(-1L); - while(pRecord) - { - pRecord = (PMYRECORD)PVOIDFROMMR(::WinSendMsg( GetHWND() - ,CM_QUERYRECORD - ,MPFROMP(pRecord) - ,MPFROM2SHORT(CMA_PREV, CMA_ITEMORDER) - )); - if (!pRecord) - return wxTreeItemId(-1L); - if (IsVisible(wxTreeItemId((long)pRecord->m_ulItemId))) - return wxTreeItemId((long)pRecord->m_ulItemId); - } - return wxTreeItemId(-1L); -} // end of wxTreeCtrl::GetPrevVisible - -// ---------------------------------------------------------------------------- -// multiple selections emulation -- under OS/2 checked tree items is not -// supported, but multisel is. So we'll just check for selections here. -// ---------------------------------------------------------------------------- - -bool wxTreeCtrl::IsItemChecked ( - const wxTreeItemId& rItem -) const -{ - wxTreeViewItem vTvItem(rItem); - - DoGetItem(&vTvItem); - return (vTvItem.m_vRecord.flRecordAttr & CRA_SELECTED); -} // end of wxTreeCtrl::IsItemChecked - -void wxTreeCtrl::SetItemCheck ( - const wxTreeItemId& rItem -, bool bCheck -) -{ - wxTreeViewItem vTvItem(rItem); - - DoGetItem(&vTvItem); - ::WinSendMsg( GetHWND() - ,CM_SETRECORDEMPHASIS - ,MPFROMP(&vTvItem) - ,MPFROM2SHORT(TRUE, CRA_SELECTED) - ); - DoSetItem(&vTvItem); -} // end of wxTreeCtrl::SetItemCheck - -size_t wxTreeCtrl::GetSelections ( - wxArrayTreeItemIds& raSelections -) const -{ - TraverseSelections vSelector( this - ,raSelections - ); - return vSelector.GetCount(); -} // end of wxTreeCtrl::GetSelections - -// ---------------------------------------------------------------------------- -// Usual operations -// ---------------------------------------------------------------------------- - -wxTreeItemId wxTreeCtrl::DoInsertItem ( - const wxTreeItemId& rParent -, wxTreeItemId vInsertAfter -, const wxString& rsText -, int nImage -, int selectedImage -, wxTreeItemData* pData -) -{ - PMYRECORD pRecordAfter = FindOS2TreeRecordByID( GetHWND() - ,vInsertAfter.m_pItem - ); - - PMYRECORD pRecordParent = FindOS2TreeRecordByID( GetHWND() - ,rParent.m_pItem - ); - - PMYRECORD pRecord = (PMYRECORD)::WinSendMsg( GetHWND() - ,CM_ALLOCRECORD - ,MPFROMLONG(sizeof(MYRECORD) - sizeof(RECORDCORE)) - ,MPFROMLONG(1) - ); - RECORDINSERT vInsert; - - vInsert.cb = sizeof(RECORDINSERT); - if (rParent.m_pItem == 0L) - { - if (vInsertAfter.m_pItem == -1) - vInsert.pRecordOrder = (PRECORDCORE)CMA_END; - else - vInsert.pRecordOrder = (PRECORDCORE)CMA_FIRST; - vInsert.pRecordParent = NULL; - } - else - { - if (vInsertAfter.m_pItem == 0) - vInsert.pRecordOrder = (PRECORDCORE)CMA_FIRST; - else if (vInsertAfter.m_pItem == -1) - vInsert.pRecordOrder = (PRECORDCORE)CMA_END; - else - vInsert.pRecordOrder = (PRECORDCORE)pRecordAfter; - vInsert.pRecordParent = (PRECORDCORE)pRecordParent; - } - vInsert.fInvalidateRecord = TRUE; - vInsert.zOrder = CMA_TOP; - vInsert.cRecordsInsert = 1; - - pRecord->m_vRecord.pszTree = (wxChar*)rsText.c_str(); - pRecord->m_vRecord.hbmBitmap = nImage; - pRecord->m_ulItemId = pRecordAfter->m_ulItemId + 1; - if (pData != NULL) - { - pRecord->m_ulUserData = (ULONG)pData; - } - ::WinSendMsg( GetHWND() - ,CM_INSERTRECORD - ,MPFROMP(pRecord) - ,MPFROMP(&vInsert) - ); - - // - // OS/2 must mannually bump the index's of following records - // - BumpTreeRecordIds( GetHWND() - ,pRecord - ); - if (pData != NULL) - { - // - // Associate the application tree item with PM tree item handle - // - pData->SetId((long)pRecord->m_ulItemId); - } - return wxTreeItemId((long)pRecord->m_ulItemId); -} - -wxTreeItemId wxTreeCtrl::AddRoot ( - const wxString& rsText -, int nImage -, int nSelectedImage -, wxTreeItemData* pData) -{ - - return DoInsertItem( wxTreeItemId((long)0) - ,wxTreeItemId((long)-1) - ,rsText - ,nImage - ,nSelectedImage - ,pData - ); -} // end of wxTreeCtrl::AddRoot - -wxTreeItemId wxTreeCtrl::PrependItem ( - const wxTreeItemId& rParent -, const wxString& rsText -, int nImage -, int nSelectedImage -, wxTreeItemData* pData -) -{ - return DoInsertItem( rParent - ,wxTreeItemId((long)0) - ,rsText - ,nImage - ,nSelectedImage - ,pData - ); -} // end of wxTreeCtrl::PrependItem - -wxTreeItemId wxTreeCtrl::InsertItem ( - const wxTreeItemId& rParent -, const wxTreeItemId& rIdPrevious -, const wxString& rsText -, int nImage -, int nSelectedImage -, wxTreeItemData* pData -) -{ - return DoInsertItem( rParent - ,rIdPrevious - ,rsText - ,nImage - ,nSelectedImage - ,pData - ); -} // end of wxTreeCtrl::InsertItem - -wxTreeItemId wxTreeCtrl::InsertItem ( - const wxTreeItemId& rParent -, size_t nIndex -, const wxString& rsText -, int nImage -, int nSelectedImage -, wxTreeItemData* pData -) -{ - return DoInsertItem( rParent - ,wxTreeItemId((long)nIndex) - ,rsText - ,nImage - ,nSelectedImage - ,pData - ); -} // end of wxTreeCtrl::InsertItem - -wxTreeItemId wxTreeCtrl::AppendItem ( - const wxTreeItemId& rParent -, const wxString& rsText -, int nImage -, int nSelectedImage -, wxTreeItemData* pData -) -{ - return DoInsertItem( rParent - ,wxTreeItemId((long)-1) - ,rsText - ,nImage - ,nSelectedImage - ,pData - ); -} // end of wxTreeCtrl::AppendItem - -void wxTreeCtrl::Delete ( - const wxTreeItemId& rItem -) -{ - // - // OS/2 does not generate DELETEITEM events so do it here - // - wxEventType vEventType = wxEVT_NULL; - wxTreeEvent vEvent( wxEVT_NULL - ,m_windowId - ); - PMYRECORD pRecord = FindOS2TreeRecordByID( GetHWND() - ,rItem.m_pItem - ); - vEvent.SetEventObject(this); - ::WinSendMsg( GetHWND() - ,CM_REMOVERECORD - ,MPFROMP(pRecord) - ,(MPARAM)(CMA_FREE | CMA_INVALIDATE) - ); - vEvent.m_item = rItem.m_pItem; - if (m_bHasAnyAttr) - { - delete (wxTreeItemAttr *)m_vAttrs.Delete((long)rItem.m_pItem); - } - vEvent.SetEventType(vEventType); - HandleWindowEvent(vEvent); -} // end of wxTreeCtrl::Delete - -// delete all children (but don't delete the item itself) -void wxTreeCtrl::DeleteChildren ( - const wxTreeItemId& rItem -) -{ - long lCookie; - wxArrayLong aChildren; - wxTreeItemId vChild = GetFirstChild( rItem - ,lCookie - ); - - while (vChild.IsOk()) - { - aChildren.Add((long)(WXHTREEITEM)vChild); - vChild = GetNextChild( rItem - ,lCookie - ); - } - - size_t nCount = aChildren.Count(); - - for (size_t n = 0; n < nCount; n++) - { - Delete(aChildren[n]); - } -} // end of wxTreeCtrl::DeleteChildren - -void wxTreeCtrl::DeleteAllItems () -{ - ::WinSendMsg( GetHWND() - ,CM_REMOVERECORD - ,NULL // Remove all - ,(MPARAM)(CMA_FREE | CMA_INVALIDATE) - ); -} // end of wxTreeCtrl::DeleteAllItems - -void wxTreeCtrl::DoExpand ( - const wxTreeItemId& rItem -, int nFlag -) -{ - PMYRECORD pRecord = FindOS2TreeRecordByID( GetHWND() - ,rItem.m_pItem - ); - switch(nFlag) - { - case wxTREE_EXPAND_EXPAND: - ::WinSendMsg( GetHWND() - ,CM_EXPANDTREE - ,MPFROMP(pRecord) - ,NULL - ); - break; - - case wxTREE_EXPAND_COLLAPSE: - ::WinSendMsg( GetHWND() - ,CM_COLLAPSETREE - ,MPFROMP(pRecord) - ,NULL - ); - break; - - case wxTREE_EXPAND_COLLAPSE_RESET: - ::WinSendMsg( GetHWND() - ,CM_COLLAPSETREE - ,MPFROMP(pRecord) - ,NULL - ); - DeleteChildren(rItem); - break; - - case wxTREE_EXPAND_TOGGLE: - if (pRecord->m_vRecord.flRecordAttr & CRA_COLLAPSED) - ::WinSendMsg( GetHWND() - ,CM_EXPANDTREE - ,MPFROMP(pRecord) - ,NULL - ); - else if (pRecord->m_vRecord.flRecordAttr & CRA_EXPANDED) - ::WinSendMsg( GetHWND() - ,CM_COLLAPSETREE - ,MPFROMP(pRecord) - ,NULL - ); - break; - - } -} // end of wxTreeCtrl::DoExpand - -void wxTreeCtrl::Expand ( - const wxTreeItemId& rItem -) -{ - DoExpand( rItem - ,wxTREE_EXPAND_EXPAND - ); -} // end of wxTreeCtrl::Expand - -void wxTreeCtrl::Collapse ( - const wxTreeItemId& rItem -) -{ - DoExpand( rItem - ,wxTREE_EXPAND_COLLAPSE - ); -} // end of wxTreeCtrl::Collapse - -void wxTreeCtrl::CollapseAndReset ( - const wxTreeItemId& rItem -) -{ - DoExpand( rItem - ,wxTREE_EXPAND_COLLAPSE_RESET - ); -} // end of wxTreeCtrl::CollapseAndReset - -void wxTreeCtrl::Toggle ( - const wxTreeItemId& rItem -) -{ - DoExpand( rItem - ,wxTREE_EXPAND_TOGGLE - ); -} // end of wxTreeCtrl::Toggle - -void wxTreeCtrl::Unselect () -{ - wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), - wxT("doesn't make sense, may be you want UnselectAll()?") ); - - // - // Just remove the selection - // - SelectItem(wxTreeItemId((long)0)); -} // end of wxTreeCtrl::Unselect - -void wxTreeCtrl::UnselectAll () -{ - if (m_windowStyle & wxTR_MULTIPLE) - { - wxArrayTreeItemIds aSelections; - size_t nCount = GetSelections(aSelections); - - for (size_t n = 0; n < nCount; n++) - { - SetItemCheck( aSelections[n] - ,false - ); - } - } - else - { - // - // Just remove the selection - // - Unselect(); - } -} // end of wxTreeCtrl::UnselectAll - -void wxTreeCtrl::SelectItem ( - const wxTreeItemId& rItem -) -{ - SetItemCheck(rItem); -} // end of wxTreeCtrl::SelectItem - -void wxTreeCtrl::EnsureVisible ( - const wxTreeItemId& rItem -) -{ - wxTreeViewItem vTvItem(rItem); - - DoGetItem(&vTvItem); - if (!::WinSendMsg( GetHWND() - ,CM_INVALIDATERECORD - ,MPFROMP(&vTvItem) - ,MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION | CMA_TEXTCHANGED) - )); -} // end of wxTreeCtrl::EnsureVisible - -void wxTreeCtrl::ScrollTo ( - const wxTreeItemId& rItem -) -{ - wxTreeViewItem vTvItem(rItem); - - DoGetItem(&vTvItem); - if (!::WinSendMsg( GetHWND() - ,CM_INVALIDATERECORD - ,MPFROMP(&vTvItem) - ,MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION | CMA_TEXTCHANGED) - )); -} - -wxTextCtrl* wxTreeCtrl::EditLabel ( - const wxTreeItemId& rItem -, wxClassInfo* WXUNUSED(pTextControlClass) -) -{ - CNREDITDATA vEdit; - PMYRECORD pRecord = FindOS2TreeRecordByID( GetHWND() - ,rItem.m_pItem - ); - - vEdit.cb = sizeof(CNREDITDATA); - vEdit.hwndCnr = GetHWND(); - vEdit.pRecord = &pRecord->m_vRecord; - vEdit.pFieldInfo = NULL; - vEdit.ppszText = NULL; - vEdit.cbText = 0; - vEdit.id = 0; - - ::WinSendMsg( GetHWND() - ,CM_OPENEDIT - ,MPFROMP(&vEdit) - ,(MPARAM)0 - ); - return NULL; -} // end of wxTreeCtrl::EditLabel - -// End label editing, optionally cancelling the edit -void wxTreeCtrl::EndEditLabel ( - const wxTreeItemId& WXUNUSED(rItem) -, bool WXUNUSED(bDiscardChanges) -) -{ - ::WinSendMsg( GetHWND() - ,CM_CLOSEEDIT - ,(MPARAM)0 - ,(MPARAM)0 - ); -} // end of wxTreeCtrl::EndEditLabel - -wxTreeItemId wxTreeCtrl::HitTest ( - const wxPoint& rPoint -, int& WXUNUSED(rFlags) -) -{ - PMYRECORD pRecord = NULL; - QUERYRECFROMRECT vQueryRect; - RECTL vRect; - long lHeight; - - // - // Get height for OS/2 point conversion - // - ::WinSendMsg( GetHWND() - ,CM_QUERYVIEWPORTRECT - ,MPFROMP(&vRect) - ,MPFROM2SHORT(CMA_WINDOW, TRUE) - ); - lHeight = vRect.yTop - vRect.yBottom; - - // - // For now just try and get a record in the general vicinity and forget - // the flag - // - vRect.xLeft = rPoint.x - 2; - vRect.xRight = rPoint.x + 2; - vRect.yTop = (lHeight - rPoint.y) + 2; - vRect.yBottom = (lHeight - rPoint.y) - 2; - - vQueryRect.cb = sizeof(QUERYRECFROMRECT); - vQueryRect.rect = vRect; - vQueryRect.fsSearch = CMA_PARTIAL; - - pRecord = (PMYRECORD)::WinSendMsg( GetHWND() - ,CM_QUERYRECORDFROMRECT - ,(MPARAM)CMA_FIRST - ,MPFROMP(&vQueryRect) - ); - - if (!pRecord) - return -1L; - return wxTreeItemId((long)pRecord->m_ulItemId); -} // end of wxTreeCtrl::HitTest - -bool wxTreeCtrl::GetBoundingRect ( - const wxTreeItemId& rItem -, wxRect& rRect -, bool bTextOnly -) const -{ - RECTL vRectRecord; - PMYRECORD pRecord = FindOS2TreeRecordByID ( GetHWND() - ,rItem.m_pItem - ); - QUERYRECORDRECT vQuery; - - vQuery.cb = sizeof(QUERYRECORDRECT); - vQuery.pRecord = (PRECORDCORE)pRecord; - vQuery.fRightSplitWindow = FALSE; - if (bTextOnly) - vQuery.fsExtent = CMA_TEXT; - else - vQuery.fsExtent = CMA_TREEICON | CMA_TEXT; - - if (!::WinSendMsg( GetHWND() - ,CM_QUERYRECORDRECT - ,MPFROMP(&vRectRecord) - ,MPFROMP(&vQuery) - )) - return false; - rRect.SetLeft(vRectRecord.xLeft); - rRect.SetTop(vRectRecord.yTop); - rRect.SetRight(vRectRecord.xRight); - rRect.SetBottom(vRectRecord.yBottom); - return true; -} // end of wxTreeCtrl::GetBoundingRect - -// ---------------------------------------------------------------------------- -// sorting stuff -// ---------------------------------------------------------------------------- - -SHORT EXPENTRY InternalDataCompareTreeFunc ( - PMYRECORD p1 -, PMYRECORD p2 -, PVOID pStorage -) -{ - wxCHECK_MSG( p1 && p2, 0, - wxT("sorting tree without data doesn't make sense") ); - - wxTreeCtrl* pTree = (wxTreeCtrl*)pStorage; - - return pTree->OnCompareItems( p1->m_ulItemId - ,p2->m_ulItemId - ); -} // end of wxTreeSortHelper::Compare - -int wxTreeCtrl::OnCompareItems ( - const wxTreeItemId& rItem1 -, const wxTreeItemId& rItem2 -) -{ - return wxStrcmp( GetItemText(rItem1) - ,GetItemText(rItem2) - ); -} // end of wxTreeCtrl::OnCompareItems - -void wxTreeCtrl::SortChildren ( - const wxTreeItemId& rItem -) -{ - ::WinSendMsg( GetHWND() - ,CM_SORTRECORD - ,(PFN)InternalDataCompareTreeFunc - ,NULL - ); -} // end of wxTreeCtrl::SortChildren - -// ---------------------------------------------------------------------------- -// implementation -// ---------------------------------------------------------------------------- - -bool wxTreeCtrl::OS2Command ( - WXUINT uCmd -, WXWORD wId -) -{ - if (uCmd == CN_ENDEDIT) - { - wxCommandEvent vEvent( wxEVT_TEXT - ,wId - ); - - vEvent.SetEventObject( this ); - ProcessCommand(vEvent); - return true; - } - else if (uCmd == CN_KILLFOCUS) - { - wxCommandEvent vEvent( wxEVT_KILL_FOCUS - ,wId - ); - vEvent.SetEventObject( this ); - ProcessCommand(vEvent); - return true; - } - else - return false; -} // end of wxTreeCtrl::OS2Command - -// -// TODO: Fully implement direct manipulation when I figure it out -// -MRESULT wxTreeCtrl::OS2WindowProc ( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) -{ - bool bProcessed = false; - MRESULT mRc = 0; - wxTreeEvent vEvent( wxEVT_NULL - ,m_windowId - ); - wxEventType vEventType = wxEVT_NULL; - PCNRDRAGINIT pDragInit = NULL; - PCNREDITDATA pEditData = NULL; - PNOTIFYRECORDENTER pNotifyEnter = NULL; - - vEvent.SetEventObject(this); - switch (uMsg) - { - case WM_CONTROL: - switch(SHORT2FROMMP(wParam)) - { - case CN_INITDRAG: - pDragInit = (PCNRDRAGINIT)lParam; - if (pDragInit) - { - PMYRECORD pRecord = (PMYRECORD)pDragInit->pRecord; - - vEventType = wxEVT_TREE_BEGIN_DRAG; - vEvent.m_item = pRecord->m_ulItemId; - vEvent.m_pointDrag.x = pDragInit->x; - vEvent.m_pointDrag.y = pDragInit->y; - } - break; - - case CN_BEGINEDIT: - pEditData = (PCNREDITDATA)lParam; - if (pEditData) - { - PMYRECORD pRecord = (PMYRECORD)pEditData->pRecord; - - vEventType = wxEVT_TREE_BEGIN_LABEL_EDIT; - vEvent.m_item = pRecord->m_ulItemId; - vEvent.m_label = pRecord->m_vRecord.pszTree; - vEvent.m_editCancelled = false; - } - break; - - case CN_ENDEDIT: - pEditData = (PCNREDITDATA)lParam; - if (pEditData) - { - PMYRECORD pRecord = (PMYRECORD)pEditData->pRecord; - - vEventType = wxEVT_TREE_END_LABEL_EDIT; - vEvent.m_item = pRecord->m_ulItemId; - vEvent.m_label = pRecord->m_vRecord.pszTree; - if (pRecord->m_vRecord.pszTree == NULL) - { - vEvent.m_editCancelled = true; - } - else - { - vEvent.m_editCancelled = false; - } - } - break; - - case CN_EXPANDTREE: - { - PMYRECORD pRecord = (PMYRECORD)lParam; - - vEventType = gs_expandEvents[IDX_EXPAND][IDX_DONE]; - vEvent.m_item = pRecord->m_ulItemId; - } - break; - } - vEvent.SetEventType(vEventType); - bProcessed = HandleWindowEvent(vEvent); - break; - } - if (!bProcessed) - mRc = wxControl::OS2WindowProc( uMsg - ,wParam - ,lParam - ); - return mRc; -} // end of wxTreeCtrl::OS2WindowProc - -#endif // wxUSE_TREECTRL diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp deleted file mode 100644 index 50a68b9b49..0000000000 --- a/src/os2/utils.cpp +++ /dev/null @@ -1,637 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/utils.cpp -// Purpose: Various utilities -// Author: David Webster -// Modified by: -// Created: 09/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/utils.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/log.h" -#endif //WX_PRECOMP - -#include "wx/os2/private.h" -#include "wx/apptrait.h" -#include "wx/filename.h" - -#include -#ifdef __EMX__ -#include -#endif - - -#include - -#include -#include -#include -#include -#include - -#define PURE_32 - -#if defined(__WATCOMC__) -extern "C" -{ - #include -} -#elif !defined(__EMX__) - #include - #include - #include -#endif - -static const wxChar WX_SECTION[] = wxT("wxWidgets"); -static const wxChar eHOSTNAME[] = wxT("HostName"); - -// For the following functions we SHOULD fill in support -// for Windows-NT (which I don't know) as I assume it begin -// a POSIX Unix (so claims MS) that it has some special -// functions beyond those provided by WinSock - -// Get full hostname (eg. DoDo.BSn-Germany.crg.de) -bool wxGetHostName( wxChar* zBuf, int nMaxSize ) -{ - if (!zBuf) return false; - -#if defined(wxUSE_NET_API) && wxUSE_NET_API - char zServer[256]; - char zComputer[256]; - unsigned long ulLevel = 0; - unsigned char* zBuffer = NULL; - unsigned long ulBuffer = 256; - unsigned long* pulTotalAvail = NULL; - - NetBios32GetInfo( (const unsigned char*)zServer - ,(const unsigned char*)zComputer - ,ulLevel - ,zBuffer - ,ulBuffer - ,pulTotalAvail - ); - strcpy(zBuf, zServer); -#else - wxChar* zSysname; - const wxChar* zDefaultHost = wxT("noname"); - - if ((zSysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL && - (zSysname = wxGetenv(wxT("HOSTNAME"))) == NULL) - { - ::PrfQueryProfileString( HINI_PROFILE - ,(PSZ)WX_SECTION - ,(PSZ)eHOSTNAME - ,(PSZ)zDefaultHost - ,(void*)zBuf - ,(ULONG)nMaxSize - 1 - ); - zBuf[nMaxSize] = wxT('\0'); - } - else - { - wxStrlcpy(zBuf, zSysname, nMaxSize); - } -#endif - - return *zBuf ? true : false; -} - -// Get user ID e.g. jacs -bool wxGetUserId(wxChar* zBuf, int nType) -{ -#if defined(__VISAGECPP__) || defined(__WATCOMC__) - // UPM procs return 0 on success - long lrc = U32ELOCU((PUCHAR)zBuf, (PULONG)&nType); - if (lrc == 0) return true; -#endif - return false; -} - -bool wxGetUserName( wxChar* zBuf, int nMaxSize ) -{ -#ifdef USE_NET_API - wxGetUserId( zBuf, nMaxSize ); -#else - wxStrlcpy(zBuf, wxT("Unknown User"), nMaxSize); -#endif - return true; -} - -int wxKill(long lPid, - wxSignal WXUNUSED(eSig), - wxKillError* WXUNUSED(peError), - int WXUNUSED(flags)) -{ - return((int)::DosKillProcess(0, (PID)lPid)); -} - -// -// Execute a program in an Interactive Shell -// -bool wxShell( const wxString& rCommand ) -{ - wxChar* zShell = wxT("CMD.EXE"); - wxString sInputs; - STARTDATA SData = {0}; - PSZ PgmTitle = "Command Shell"; - APIRET rc; - PID vPid = 0; - ULONG ulSessID = 0; - UCHAR achObjBuf[256] = {0}; //error data if DosStart fails - RESULTCODES vResult; - - SData.Length = sizeof(STARTDATA); - SData.Related = SSF_RELATED_INDEPENDENT; - SData.FgBg = SSF_FGBG_FORE; - SData.TraceOpt = SSF_TRACEOPT_NONE; - SData.PgmTitle = PgmTitle; - SData.PgmName = (char*)zShell; - - sInputs = wxT("/C ") + rCommand; - SData.PgmInputs = (BYTE*)sInputs.wx_str(); - SData.TermQ = 0; - SData.Environment = 0; - SData.InheritOpt = SSF_INHERTOPT_SHELL; - SData.SessionType = SSF_TYPE_WINDOWABLEVIO; - SData.IconFile = 0; - SData.PgmHandle = 0; - SData.PgmControl = SSF_CONTROL_VISIBLE | SSF_CONTROL_MAXIMIZE; - SData.InitXPos = 30; - SData.InitYPos = 40; - SData.InitXSize = 200; - SData.InitYSize = 140; - SData.Reserved = 0; - SData.ObjectBuffer = (char*)achObjBuf; - SData.ObjectBuffLen = (ULONG)sizeof(achObjBuf); - - rc = ::DosStartSession(&SData, &ulSessID, &vPid); - if (rc == 0 || rc == 457) // NO_ERROR or SMG_START_IN_BACKGROUND - { - PTIB ptib; - PPIB ppib; - - ::DosGetInfoBlocks(&ptib, &ppib); - - ::DosWaitChild( DCWA_PROCESS - ,DCWW_WAIT - ,&vResult - ,&ppib->pib_ulpid - ,vPid - ); - } - return (rc != 0); -} - -// Shutdown or reboot the PC -bool wxShutdown(wxShutdownFlags WXUNUSED(wFlags)) -{ - // TODO - return false; -} - -// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) -wxMemorySize wxGetFreeMemory() -{ - void* pMemptr = NULL; - LONG lSize; - ULONG lMemFlags; - APIRET rc; - - lMemFlags = PAG_FREE; - rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags); - if (rc != 0) - lSize = -1L; - return (wxMemorySize)lSize; -} - -// Get Process ID -unsigned long wxGetProcessId() -{ - return (unsigned long)getpid(); -} - -// ---------------------------------------------------------------------------- -// env vars -// ---------------------------------------------------------------------------- - -bool wxGetEnv(const wxString& var, wxString *value) -{ - // wxGetenv is defined as getenv() - wxChar *p = wxGetenv((const wxChar *)var); - if ( !p ) - return false; - - if ( value ) - { - *value = p; - } - - return true; -} - -static bool wxDoSetEnv(const wxString& variable, const char *value) -{ -#if defined(HAVE_SETENV) - if ( !value ) - { -#ifdef HAVE_UNSETENV - return unsetenv(variable.mb_str()) == 0; -#else - value = wxT(""); // mustn't pass NULL to setenv() -#endif - } - return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0; -#elif defined(HAVE_PUTENV) - wxString s = variable; - if ( value ) - s << wxT('=') << value; - - // transform to ANSI - const char *p = s.mb_str(); - - // the string will be free()d by libc - char *buf = (char *)malloc(strlen(p) + 1); - strcpy(buf, p); - - return putenv(buf) == 0; -#else // no way to set an env var - wxUnusedVar(variable); - wxUnusedVar(value); - return false; -#endif -} - -bool wxSetEnv(const wxString& variable, const wxString& value) -{ - return wxDoSetEnv(variable, value.mb_str()); -} - -bool wxUnsetEnv(const wxString& variable) -{ - return wxDoSetEnv(variable, NULL); -} - -void wxMilliSleep( - unsigned long ulMilliseconds -) -{ - ::DosSleep(ulMilliseconds); -} - -void wxMicroSleep( - unsigned long ulMicroseconds -) -{ - ::DosSleep(ulMicroseconds/1000); -} - -void wxSleep( - int nSecs -) -{ - ::DosSleep(1000 * nSecs); -} - -// Consume all events until no more left -void wxFlushEvents() -{ -// wxYield(); -} - -wxString wxGetOsDescription() -{ - wxString strVer(wxT("OS/2")); - ULONG ulSysInfo = 0; - - if (::DosQuerySysInfo( QSV_VERSION_MINOR, - QSV_VERSION_MINOR, - (PVOID)&ulSysInfo, - sizeof(ULONG) - ) == 0L ) - { - wxString ver; - ver.Printf( wxT(" ver. %d.%d"), - int(ulSysInfo / 10), - int(ulSysInfo % 10) - ); - strVer += ver; - } - - return strVer; -} - -bool wxIsPlatform64Bit() -{ - // FIXME: No idea how to test for 64 bit processor - // (Probably irrelevant anyhow, though). - return false; -} - -void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab)) -{ -} - -void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab)) -{ -} - -wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin) -{ - ULONG ulSysInfo = 0; - APIRET ulrc; - - ulrc = ::DosQuerySysInfo( QSV_VERSION_MINOR, - QSV_VERSION_MINOR, - (PVOID)&ulSysInfo, - sizeof(ULONG) - ); - - if (ulrc == 0L) - { - if ( verMaj ) - *verMaj = ulSysInfo / 10; - if ( verMin ) - *verMin = ulSysInfo % 10; - } - - return wxOS_OS2; -} - - -// --------------------------------------------------------------------------- -const wxChar* wxGetHomeDir( - wxString* pStr -) -{ - wxString& rStrDir = *pStr; - - // OS/2 has no idea about home, - // so use the working directory instead. - // However, we might have a valid HOME directory, - // as is used on many machines that have unix utilities - // on them, so we should use that, if available. - - // 256 was taken from os2def.h -#ifndef MAX_PATH -# define MAX_PATH 256 -#endif - - const wxChar *szHome = wxGetenv((wxChar*)"HOME"); - if ( szHome == NULL ) { - // we're homeless, use current directory. - rStrDir = wxT("."); - } - else - rStrDir = szHome; - - return rStrDir.c_str(); -} - -wxString wxGetUserHome ( const wxString &rUser ) -{ - wxChar* zHome; - wxString sUser(rUser); - - wxString home; - -#ifndef __EMX__ - if (!sUser.empty()) - { - const wxString currentUser = wxGetUserId(); - - // Guests belong in the temp dir - if ( currentUser == "annonymous" ) - { - zHome = wxGetenv(wxT("TMP")); - if ( !zHome ) - zHome = wxGetenv(wxT("TMPDIR")); - if ( !zHome ) - zHome = wxGetenv(wxT("TEMP")); - - if ( zHome && *zHome ) - return zHome; - } - - if ( sUser == currentUser ) - sUser.clear(); - } -#endif - if (sUser.empty()) - { - if ((zHome = wxGetenv(wxT("HOME"))) != NULL) - { - home = zHome; - home.Replace("/", "\\"); - } - } - - return home; -} - -bool wxGetDiskSpace(const wxString& path, - wxDiskspaceSize_t *pTotal, - wxDiskspaceSize_t *pFree) -{ - if (path.empty()) - return false; - - wxFileName fn(path); - FSALLOCATE fsaBuf = {0}; - APIRET rc = NO_ERROR; - ULONG disknum = 0; - - fn.MakeAbsolute(); - - if (wxDirExists(fn.GetFullPath()) == false) - return false; - - disknum = wxToupper(fn.GetVolume().GetChar(0)) - wxT('A') + 1; - - rc = ::DosQueryFSInfo(disknum, // 1 = A, 2 = B, 3 = C, ... - FSIL_ALLOC, // allocation info - (PVOID)&fsaBuf, - sizeof(FSALLOCATE)); - - if (rc != NO_ERROR) - return false; - else - { - if(pTotal) - { - // to try to avoid 32-bit overflow, let's not multiply right away - // (num of alloc units) - *pTotal = fsaBuf.cUnit; - // * (num of sectors per alloc unit) * (num of bytes per sector) - (*pTotal) *= fsaBuf.cSectorUnit * fsaBuf.cbSector; - } - if(pFree) - { - *pFree = fsaBuf.cUnitAvail; - (*pFree) *= fsaBuf.cSectorUnit * fsaBuf.cbSector; - } - return true; - } -} - -wxString wxPMErrorToStr(ERRORID vError) -{ - wxString sError; - - // - // Remove the high order byte -- it is useless - // - vError &= 0x0000ffff; - switch(vError) - { - case PMERR_INVALID_HWND: - sError = wxT("Invalid window handle specified"); - break; - - case PMERR_INVALID_FLAG: - sError = wxT("Invalid flag bit set"); - break; - - case PMERR_NO_MSG_QUEUE: - sError = wxT("No message queue available"); - break; - - case PMERR_INVALID_PARM: - sError = wxT("Parameter contained invalid data"); - break; - - case PMERR_INVALID_PARAMETERS: - sError = wxT("Parameter value is out of range"); - break; - - case PMERR_PARAMETER_OUT_OF_RANGE: - sError = wxT("Parameter value is out of range"); - break; - - case PMERR_INVALID_INTEGER_ATOM: - sError = wxT("Not a valid atom"); - break; - - case PMERR_INVALID_HATOMTBL: - sError = wxT("Atom table handle is invalid"); - break; - - case PMERR_INVALID_ATOM_NAME: - sError = wxT("Not a valid atom name"); - break; - - case PMERR_ATOM_NAME_NOT_FOUND: - sError = wxT("Valid name format, but cannot find name in atom table"); - break; - - case PMERR_INV_HPS: - sError = wxT("PMERR_INV_HPS"); - break; - - case PMERR_PS_BUSY: - sError = wxT("PMERR_PS_BUSY"); - break; - - case PMERR_INV_PRIMITIVE_TYPE: - sError = wxT("PMERR_INV_PRIMITIVE_TYPE"); - break; - - case PMERR_UNSUPPORTED_ATTR: - sError = wxT("PMERR_UNSUPPORTED_ATTR"); - break; - - case PMERR_INV_COLOR_ATTR: - sError = wxT("PMERR_INV_COLOR_ATTR"); - break; - - case PMERR_INV_BACKGROUND_COL_ATTR: - sError = wxT("PMERR_INV_BACKGROUND_COL_ATTR"); - break; - - case PMERR_INV_MIX_ATTR: - sError = wxT("PMERR_INV_MIX_ATTR"); - break; - - case PMERR_INV_LINE_WIDTH_ATTR: - sError = wxT("PMERR_INV_LINE_WIDTH_ATTR"); - break; - - case PMERR_INV_GEOM_LINE_WIDTH_ATTR: - sError = wxT("PMERR_INV_GEOM_LINE_WIDTH_ATTR"); - break; - - case PMERR_INV_LINE_TYPE_ATTR: - sError = wxT("PMERR_INV_LINE_TYPE_ATTR"); - break; - - case PMERR_INV_LINE_END_ATTR: - sError = wxT("PMERR_INV_LINE_END_ATTR"); - break; - - case PMERR_INV_LINE_JOIN_ATTR: - sError = wxT("PMERR_INV_LINE_JOIN_ATTR"); - break; - - case PMERR_INV_CHAR_SET_ATTR: - sError = wxT("PMERR_INV_CHAR_SET_ATTR"); - break; - - case PMERR_INV_CHAR_MODE_ATTR: - sError = wxT("PMERR_INV_CHAR_MODE_ATTR"); - break; - - case PMERR_INV_CHAR_DIRECTION_ATTR: - sError = wxT("PMERR_INV_CHAR_DIRECTION_ATTR"); - break; - - case PMERR_INV_CHAR_SHEAR_ATTR: - sError = wxT("PMERR_INV_CHAR_SHEAR_ATTR"); - break; - - case PMERR_INV_CHAR_ANGLE_ATTR: - sError = wxT("PMERR_INV_CHAR_ANGLE_ATTR"); - break; - - case PMERR_INV_MARKER_SET_ATTR: - sError = wxT("PMERR_INV_MARKER_SET_ATTR"); - break; - - case PMERR_INV_MARKER_SYMBOL_ATTR: - sError = wxT("PMERR_INV_MARKER_SYMBOL_ATTR"); - break; - - case PMERR_INV_PATTERN_SET_ATTR: - sError = wxT("PMERR_INV_PATTERN_SET_ATTR"); - break; - - case PMERR_INV_PATTERN_ATTR: - sError = wxT("PMERR_INV_PATTERN_ATTR"); - break; - - case PMERR_INV_COORDINATE: - sError = wxT("PMERR_INV_COORDINATE"); - break; - - case PMERR_UNSUPPORTED_ATTR_VALUE: - sError = wxT("PMERR_UNSUPPORTED_ATTR_VALUE"); - break; - - case PMERR_INV_PATTERN_SET_FONT: - sError = wxT("PMERR_INV_PATTERN_SET_FONT"); - break; - - case PMERR_HUGE_FONTS_NOT_SUPPORTED: - sError = wxT("PMERR_HUGE_FONTS_NOT_SUPPORTED"); - break; - - default: - sError = wxT("Unknown error"); - } - return sError; -} // end of wxPMErrorToStr diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp deleted file mode 100644 index 70e7e5a1ed..0000000000 --- a/src/os2/utilsexc.cpp +++ /dev/null @@ -1,245 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/utilsexec.cpp -// Purpose: Various utilities -// Author: David Webster -// Modified by: -// Created: 10/17/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include "wx/process.h" - -#include "wx/os2/private.h" - -#define PURE_32 -#ifndef __EMX__ - #include - #ifndef __WATCOMC__ - #include - #include - #endif -#endif - -#include -#ifdef __EMX__ -#include -#endif - -#include -#include - -#include -#include -#include -#include -#include - - -// this message is sent when the process we're waiting for terminates -#define wxWM_PROC_TERMINATED (WM_USER + 10000) - -#ifndef NO_ERROR -# define NO_ERROR 0 -#endif - -// structure describing the process we're being waiting for -struct wxExecuteData -{ -public: - ~wxExecuteData() - { -// cout << "Closing thread: " << endl; - DosExit(EXIT_PROCESS, 0); - } - - HWND hWnd; // window to send wxWM_PROC_TERMINATED to [not used] - RESULTCODES vResultCodes; - wxProcess* pHandler; - ULONG ulExitCode; // the exit code of the process - bool bState; // set to false when the process finishes -}; - -static ULONG wxExecuteThread(wxExecuteData* pData) -{ - ULONG ulRc; - PID vPidChild; - -// cout << "Executing thread: " << endl; - - ulRc = ::DosWaitChild( DCWA_PROCESSTREE - ,DCWW_NOWAIT - ,&pData->vResultCodes - ,&vPidChild - ,pData->vResultCodes.codeTerminate // process PID to look at - ); - if (ulRc != NO_ERROR) - { - wxLogLastError(wxT("DosWaitChild")); - } - delete pData; - return 0; -} - -// window procedure of a hidden window which is created just to receive -// the notification message when a process exits -MRESULT APIENTRY wxExecuteWindowCbk( HWND hWnd, - ULONG ulMessage, - MPARAM WXUNUSED(wParam), - MPARAM lParam) -{ - if (ulMessage == wxWM_PROC_TERMINATED) - { - wxExecuteData* pData = (wxExecuteData *)lParam; - - if (pData->pHandler) - { - pData->pHandler->OnTerminate( (int)pData->vResultCodes.codeTerminate - ,(int)pData->vResultCodes.codeResult - ); - } - - if (pData->bState) - { - // we're executing synchronously, tell the waiting thread - // that the process finished - pData->bState = 0; - } - else - { - // asynchronous execution - we should do the clean up - delete pData; - } - ::WinDestroyWindow(hWnd); // we don't need it any more - } - return 0; -} - -long wxExecute( const wxString& rCommand, - int flags, - wxProcess* pHandler, - const wxExecuteEnv *env) -{ - if (rCommand.empty()) - { -// cout << "empty command in wxExecute." << endl; - return 0; - } - - // create the process - UCHAR vLoadError[CCHMAXPATH] = {0}; - RESULTCODES vResultCodes = {0}; - ULONG ulExecFlag; - PSZ zArgs = NULL; - PSZ zEnvs = NULL; - APIRET rc; - TID vTID; - - if (flags & wxEXEC_SYNC) - ulExecFlag = EXEC_SYNC; - else - ulExecFlag = EXEC_ASYNCRESULT; - - rc = ::DosExecPgm( (PCHAR)vLoadError - ,sizeof(vLoadError) - ,ulExecFlag - ,zArgs - ,zEnvs - ,&vResultCodes - ,rCommand.c_str() - ); - if (rc != NO_ERROR) - { - wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc); - return 0; - } -// cout << "Executing: " << rCommand.c_str() << endl; - // Alloc data - wxExecuteData* pData = new wxExecuteData; - - pData->vResultCodes = vResultCodes; - pData->hWnd = NULLHANDLE; - pData->bState = (flags & wxEXEC_SYNC) != 0; - if (flags & wxEXEC_SYNC) - { - wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution")); - pData->pHandler = NULL; - } - else - { - // may be NULL or not - pData->pHandler = pHandler; - } - - rc = ::DosCreateThread( &vTID - ,(PFNTHREAD)&wxExecuteThread - ,(ULONG)pData - ,CREATE_READY|STACK_SPARSE - ,8192 - ); - if (rc != NO_ERROR) - { - wxLogLastError(wxT("CreateThread in wxExecute")); - delete pData; - - // the process still started up successfully... - return vResultCodes.codeTerminate; - } - if (!(flags & wxEXEC_SYNC)) - { - // return the pid - // warning: don't exit your app unless you actively - // kill and cleanup you child processes - // Maybe detach the process here??? - // If cmd.exe need to pass DETACH to detach the process here - return vResultCodes.codeTerminate; - } - - // waiting until command executed - ::DosWaitThread(&vTID, DCWW_WAIT); - - ULONG ulExitCode = pData->vResultCodes.codeResult; - delete pData; - - // return the exit code - return (long)ulExitCode; -} - -long wxExecute( - char** ppArgv -, int flags -, wxProcess* pHandler -, const wxExecuteEnv *env -) -{ - wxString sCommand; - - while (*ppArgv != NULL) - { - wxString sArg((wxChar*)(*ppArgv++)); - - - sCommand << sArg.c_str() << ' '; - } - sCommand.RemoveLast(); - return wxExecute( sCommand - ,flags - ,pHandler - , env - ); -} - -bool wxGetFullHostName( wxChar* zBuf, int nMaxSize) -{ - return wxGetHostName( zBuf, nMaxSize ); -} diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp deleted file mode 100644 index beea68483c..0000000000 --- a/src/os2/utilsgui.cpp +++ /dev/null @@ -1,877 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: src/os2/utilsgui.cpp -// Purpose: Various utility functions only available in GUI -// Author: David Webster -// Modified by: -// Created: 20.08.2003 (extracted from os2/utils.cpp) -// Copyright: (c) David Webster -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -// for compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/cursor.h" - #include "wx/font.h" - #include "wx/timer.h" -#endif //WX_PRECOMP - -#include "wx/apptrait.h" -#include "wx/os2/private/timer.h" -#include "wx/evtloop.h" - -#include "wx/os2/private.h" // includes - -// ============================================================================ -// implementation -// ============================================================================ - -// Emit a beeeeeep -void wxBell() -{ - DosBeep(1000,1000); // 1kHz during 1 sec. -} - -// ---------------------------------------------------------------------------- -// functions to work with .INI files -// ---------------------------------------------------------------------------- - -// Sleep for nSecs seconds. Attempt a Windows implementation using timers. -static bool inTimer = false; - -class wxSleepTimer: public wxTimer -{ -public: - inline void Notify() - { - inTimer = false; - Stop(); - } -}; - -// --------------------------------------------------------------------------- -// helper functions for showing a "busy" cursor -// --------------------------------------------------------------------------- - -HCURSOR gs_wxBusyCursor = 0; // new, busy cursor -HCURSOR gs_wxBusyCursorOld = 0; // old cursor -static int gs_wxBusyCursorCount = 0; - -// Set the cursor to the busy cursor for all windows -void wxBeginBusyCursor(const wxCursor* pCursor) -{ - if ( gs_wxBusyCursorCount++ == 0 ) - { - gs_wxBusyCursor = (HCURSOR)pCursor->GetHCURSOR(); - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursor); - } - //else: nothing to do, already set -} - -// Restore cursor to normal -void wxEndBusyCursor() -{ - wxCHECK_RET( gs_wxBusyCursorCount > 0 - ,wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") - ); - - if (--gs_wxBusyCursorCount == 0) - { - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursorOld); - gs_wxBusyCursorOld = 0; - } -} - -// true if we're between the above two calls -bool wxIsBusy() -{ - return (gs_wxBusyCursorCount > 0); -} - -// Check whether this window wants to process messages, e.g. Stop button -// in long calculations. -bool wxCheckForInterrupt( wxWindow* pWnd ) -{ - if(pWnd) - { - QMSG vMsg; - HAB hab = 0; - HWND hwndFilter = NULLHANDLE; - - while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE)) - { - ::WinDispatchMsg(hab, &vMsg); - } - return true;//*** temporary? - } - else - { - wxFAIL_MSG(wxT("pWnd==NULL !!!")); - return false;//*** temporary? - } -} - -// ---------------------------------------------------------------------------- -// get display info -// ---------------------------------------------------------------------------- - -// See also the wxGetMousePosition in window.cpp -// Deprecated: use wxPoint wxGetMousePosition() instead -void wxGetMousePosition( - int* pX -, int* pY -) -{ - POINTL vPt; - - ::WinQueryPointerPos(HWND_DESKTOP, &vPt); - *pX = vPt.x; - *pY = vPt.y; -}; - -// Return true if we have a colour display -bool wxColourDisplay() -{ -#if 0 - HPS hpsScreen; - HDC hdcScreen; - LONG lColors; - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_COLORS, 1L, &lColors); - return(lColors > 1L); -#else - // I don't see how the PM display could not be color. Besides, this - // was leaking DCs and PSs!!! MN - return true; -#endif -} - -// Returns depth of screen -int wxDisplayDepth() -{ - HPS hpsScreen; - HDC hdcScreen; - LONG lPlanes; - LONG lBitsPerPixel; - static LONG nDepth = 0; - - // The screen colordepth ain't gonna change. No reason to query - // it over and over! - if (!nDepth) { - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, 1L, &lPlanes); - ::DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitsPerPixel); - - nDepth = (int)(lPlanes * lBitsPerPixel); - ::DevCloseDC(hdcScreen); - ::WinReleasePS(hpsScreen); - } - return (nDepth); -} - -// Get size of display -void wxDisplaySize( - int* pWidth -, int* pHeight -) -{ - HPS hpsScreen; - HDC hdcScreen; - static LONG lWidth = 0; - static LONG lHeight = 0; - - // The screen size ain't gonna change either so just cache the values - if (!lWidth) { - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth); - ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight); - ::DevCloseDC(hdcScreen); - ::WinReleasePS(hpsScreen); - } - if (pWidth) - *pWidth = (int)lWidth; - if (pHeight) - *pHeight = (int)lHeight; -} - -void wxDisplaySizeMM( - int* pWidth -, int* pHeight -) -{ - HPS hpsScreen; - HDC hdcScreen; - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - - if (pWidth) - ::DevQueryCaps( hdcScreen - ,CAPS_HORIZONTAL_RESOLUTION - ,1L - ,(PLONG)pWidth - ); - if (pHeight) - ::DevQueryCaps( hdcScreen - ,CAPS_VERTICAL_RESOLUTION - ,1L - ,(PLONG)pHeight - ); - ::DevCloseDC(hdcScreen); - ::WinReleasePS(hpsScreen); -} - -void wxClientDisplayRect(int *x, int *y, int *width, int *height) -{ - // This is supposed to return desktop dimensions minus any window - // manager panels, menus, taskbars, etc. If there is a way to do that - // for this platform please fix this function, otherwise it defaults - // to the entire desktop. - if (x) *x = 0; - if (y) *y = 0; - wxDisplaySize(width, height); -} - -void wxGUIAppTraits::InitializeGui(unsigned long &ulHab) -{ - ulHab = ::WinInitialize(0); -} - -void wxGUIAppTraits::TerminateGui(unsigned long ulHab) -{ - ::WinTerminate(ulHab); -} - -wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const -{ - // How to get version of PM ? I guess, just reusing the OS version is OK. - (void) wxGetOsVersion(verMaj, verMin); - return wxPORT_OS2; -} - -wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) -{ - return new wxOS2TimerImpl(timer); -} - -wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() -{ - return new wxEventLoop; -} - -// --------------------------------------------------------------------------- -// window information functions -// --------------------------------------------------------------------------- - -wxString WXDLLEXPORT wxGetWindowText( WXHWND hWnd ) -{ - wxString vStr; - - if ( hWnd ) - { - long lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1; - ::WinQueryWindowText((HWND)hWnd, lLen, (PSZ)(wxChar*)wxStringBuffer(vStr, lLen)); - } - - return vStr; -} - -wxString WXDLLEXPORT wxGetWindowClass( WXHWND hWnd ) -{ - wxString vStr; - if ( hWnd ) - { - int nLen = 256; // some starting value - - for ( ;; ) - { - int nCount = ::WinQueryClassName((HWND)hWnd, nLen, (PSZ)(wxChar*)wxStringBuffer(vStr, nLen)); - - if (nCount == nLen ) - { - // the class name might have been truncated, retry with larger - // buffer - nLen *= 2; - } - else - { - break; - } - } - } - return vStr; -} - -WXWORD WXDLLEXPORT wxGetWindowId( - WXHWND hWnd -) -{ - return ::WinQueryWindowUShort((HWND)hWnd, QWS_ID); -} - -void wxDrawBorder( - HPS hPS -, RECTL& rRect -, WXDWORD dwStyle -) -{ - POINTL vPoint[2]; - - vPoint[0].x = rRect.xLeft; - vPoint[0].y = rRect.yBottom; - ::GpiMove(hPS, &vPoint[0]); - if (dwStyle & wxSIMPLE_BORDER || - dwStyle & wxSTATIC_BORDER) - { - vPoint[1].x = rRect.xRight - 1; - vPoint[1].y = rRect.yTop - 1; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - } - if (dwStyle & wxSUNKEN_BORDER) - { - LINEBUNDLE vLineBundle; - - vLineBundle.lColor = 0x00FFFFFF; // WHITE - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[1].x = rRect.xRight - 1; - vPoint[1].y = rRect.yTop - 1; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - vPoint[0].x = rRect.xLeft + 1; - vPoint[0].y = rRect.yBottom + 1; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xRight - 2; - vPoint[1].y = rRect.yTop - 2; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - - vLineBundle.lColor = 0x00000000; // BLACK - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[0].x = rRect.xLeft + 2; - vPoint[0].y = rRect.yBottom + 2; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xLeft + 2; - vPoint[1].y = rRect.yTop - 3; - ::GpiLine(hPS, &vPoint[1]); - vPoint[1].x = rRect.xRight - 3; - vPoint[1].y = rRect.yTop - 3; - ::GpiLine(hPS, &vPoint[1]); - - vPoint[0].x = rRect.xLeft + 3; - vPoint[0].y = rRect.yBottom + 3; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xLeft + 3; - vPoint[1].y = rRect.yTop - 4; - ::GpiLine(hPS, &vPoint[1]); - vPoint[1].x = rRect.xRight - 4; - vPoint[1].y = rRect.yTop - 4; - ::GpiLine(hPS, &vPoint[1]); - } - if (dwStyle & wxDOUBLE_BORDER) - { - LINEBUNDLE vLineBundle; - - vLineBundle.lColor = 0x00FFFFFF; // WHITE - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[1].x = rRect.xRight - 1; - vPoint[1].y = rRect.yTop - 1; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - vLineBundle.lColor = 0x00000000; // WHITE - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[0].x = rRect.xLeft + 2; - vPoint[0].y = rRect.yBottom + 2; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xRight - 2; - vPoint[1].y = rRect.yTop - 2; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - vLineBundle.lColor = 0x00FFFFFF; // BLACK - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[0].x = rRect.xLeft + 3; - vPoint[0].y = rRect.yBottom + 3; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xRight - 3; - vPoint[1].y = rRect.yTop - 3; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - } - if (dwStyle & wxRAISED_BORDER) - { - LINEBUNDLE vLineBundle; - - vLineBundle.lColor = 0x00000000; // BLACK - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[1].x = rRect.xRight - 1; - vPoint[1].y = rRect.yTop - 1; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - vPoint[0].x = rRect.xLeft + 1; - vPoint[0].y = rRect.yBottom + 1; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xRight - 2; - vPoint[1].y = rRect.yTop - 2; - ::GpiBox( hPS - ,DRO_OUTLINE - ,&vPoint[1] - ,0L - ,0L - ); - - vLineBundle.lColor = 0x00FFFFFF; // WHITE - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 2; - vLineBundle.lGeomWidth = 2; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - vPoint[0].x = rRect.xLeft + 2; - vPoint[0].y = rRect.yBottom + 2; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xLeft + 2; - vPoint[1].y = rRect.yTop - 3; - ::GpiLine(hPS, &vPoint[1]); - vPoint[1].x = rRect.xRight - 3; - vPoint[1].y = rRect.yTop - 3; - ::GpiLine(hPS, &vPoint[1]); - - vPoint[0].x = rRect.xLeft + 3; - vPoint[0].y = rRect.yBottom + 3; - ::GpiMove(hPS, &vPoint[0]); - vPoint[1].x = rRect.xLeft + 3; - vPoint[1].y = rRect.yTop - 4; - ::GpiLine(hPS, &vPoint[1]); - vPoint[1].x = rRect.xRight - 4; - vPoint[1].y = rRect.yTop - 4; - ::GpiLine(hPS, &vPoint[1]); - } -} // end of wxDrawBorder - -void wxOS2SetFont( - HWND hWnd -, const wxFont& rFont -) -{ - char zFont[128]; - char zFacename[30]; - char zWeight[30]; - char zStyle[30]; - - if (hWnd == NULLHANDLE) - return; - - // - // The fonts available for Presentation Params are just a few - // outline fonts, the rest are available to the GPI, so we must - // map the families to one of these three - // - switch(rFont.GetFamily()) - { - case wxSCRIPT: - strcpy(zFacename, "Script"); - break; - - case wxDECORATIVE: - strcpy(zFacename, "WarpSans"); - break; - - case wxROMAN: - strcpy(zFacename,"Times New Roman"); - break; - - case wxTELETYPE: - strcpy(zFacename, "Courier New"); - break; - - case wxMODERN: - strcpy(zFacename, "Courier New"); - break; - - case wxDEFAULT: - default: - case wxSWISS: - strcpy(zFacename, "Helvetica"); - break; - } - - switch(rFont.GetWeight()) - { - default: - case wxNORMAL: - case wxLIGHT: - zWeight[0] = '\0'; - break; - - case wxBOLD: - case wxFONTWEIGHT_MAX: - strcpy(zWeight, "Bold"); - break; - } - - switch(rFont.GetStyle()) - { - case wxITALIC: - case wxSLANT: - strcpy(zStyle, "Italic"); - break; - - default: - zStyle[0] = '\0'; - break; - } - sprintf(zFont, "%d.%s", rFont.GetPointSize(), zFacename); - if (zWeight[0] != '\0') - { - strcat(zFont, " "); - strcat(zFont, zWeight); - } - if (zStyle[0] != '\0') - { - strcat(zFont, " "); - strcat(zFont, zStyle); - } - ::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont) + 1, (PVOID)zFont); -} // end of wxOS2SetFont - -// --------------------------------------------------------------------------- -// Helper for taking a regular bitmap and giving it a disabled look -// --------------------------------------------------------------------------- -wxBitmap wxDisableBitmap( - const wxBitmap& rBmp -, long lColor -) -{ - wxMask* pMask = rBmp.GetMask(); - - if (!pMask) - return(wxNullBitmap); - - DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - SIZEL vSize = {0, 0}; - HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); - BITMAPINFOHEADER2 vHeader; - BITMAPINFO2 vInfo; - ERRORID vError; - wxString sError; - HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP(); - HBITMAP hOldBitmap = NULLHANDLE; - HBITMAP hOldMask = NULLHANDLE; - HBITMAP hMask = (HBITMAP)rBmp.GetMask()->GetMaskBitmap(); - unsigned char* pucBits; // buffer that will contain the bitmap data - unsigned char* pucData; // pointer to use to traverse bitmap data - unsigned char* pucBitsMask; // buffer that will contain the mask data - unsigned char* pucDataMask; // pointer to use to traverse mask data - LONG lScans = 0L; - LONG lScansSet = 0L; - bool bpp16 = (wxDisplayDepth() == 16); - - memset(&vHeader, '\0', 16); - vHeader.cbFix = 16; - - memset(&vInfo, '\0', 16); - vInfo.cbFix = 16; - vInfo.cx = (ULONG)rBmp.GetWidth(); - vInfo.cy = (ULONG)rBmp.GetHeight(); - vInfo.cPlanes = 1; - vInfo.cBitCount = 24; // Set to desired count going in - - // - // Create the buffers for data....all wxBitmaps are 24 bit internally - // - int nBytesPerLine = rBmp.GetWidth() * 3; - int nSizeDWORD = sizeof(DWORD); - int nLineBoundary = nBytesPerLine % nSizeDWORD; - int nPadding = 0; - int i; - int j; - - // - // Bitmap must be in a double-word aligned address so we may - // have some padding to worry about - // - if (nLineBoundary > 0) - { - nPadding = nSizeDWORD - nLineBoundary; - nBytesPerLine += nPadding; - } - pucBits = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight()); - memset(pucBits, '\0', (nBytesPerLine * rBmp.GetHeight())); - pucBitsMask = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight()); - memset(pucBitsMask, '\0', (nBytesPerLine * rBmp.GetHeight())); - - // - // Extract the bitmap and mask data - // - if ((hOldBitmap = ::GpiSetBitmap(hPS, hBitmap)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - ::GpiQueryBitmapInfoHeader(hBitmap, &vHeader); - vInfo.cBitCount = 24; - if ((lScans = ::GpiQueryBitmapBits( hPS - ,0L - ,(LONG)rBmp.GetHeight() - ,(PBYTE)pucBits - ,&vInfo - )) == GPI_ALTERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((hOldMask = ::GpiSetBitmap(hPS, hMask)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - ::GpiQueryBitmapInfoHeader(hMask, &vHeader); - vInfo.cBitCount = 24; - if ((lScans = ::GpiQueryBitmapBits( hPS - ,0L - ,(LONG)rBmp.GetHeight() - ,(PBYTE)pucBitsMask - ,&vInfo - )) == GPI_ALTERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if (( hMask = ::GpiSetBitmap(hPS, hOldMask)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - pucData = pucBits; - pucDataMask = pucBitsMask; - - // - // Get the mask value - // - for (i = 0; i < rBmp.GetHeight(); i++) - { - for (j = 0; j < rBmp.GetWidth(); j++) - { - // Byte 1 - if (bpp16 && *pucDataMask == 0xF8) // 16 bit display gobblygook - { - *pucData = 0x7F; - pucData++; - } - else if (*pucDataMask == 0xFF) // set to grey - { - *pucData = 0x7F; - pucData++; - } - else - { - *pucData = ((unsigned char)(lColor >> 16)); - pucData++; - } - - // Byte 2 - if (bpp16 && *(pucDataMask + 1) == 0xFC) // 16 bit display gobblygook - { - *pucData = 0x7F; - pucData++; - } - else if (*(pucDataMask + 1) == 0xFF) // set to grey - { - *pucData = 0x7F; - pucData++; - } - else - { - *pucData = ((unsigned char)(lColor >> 8)); - pucData++; - } - - // Byte 3 - if (bpp16 && *(pucDataMask + 2) == 0xF8) // 16 bit display gobblygook - { - *pucData = 0x7F; - pucData++; - } - else if (*(pucDataMask + 2) == 0xFF) // set to grey - { - *pucData = 0x7F; - pucData++; - } - else - { - *pucData = ((unsigned char)lColor); - pucData++; - } - pucDataMask += 3; - } - for (j = 0; j < nPadding; j++) - { - pucData++; - pucDataMask++; - } - } - - // - // Create a new bitmap and set the modified bits - // - wxBitmap vNewBmp( rBmp.GetWidth() - ,rBmp.GetHeight() - ,24 - ); - HBITMAP hNewBmp = (HBITMAP)vNewBmp.GetHBITMAP(); - - if ((hOldBitmap = ::GpiSetBitmap(hPS, hNewBmp)) == HBM_ERROR) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - if ((lScansSet = ::GpiSetBitmapBits( hPS - ,0L - ,(LONG)rBmp.GetHeight() - ,(PBYTE)pucBits - ,&vInfo - )) == GPI_ALTERROR) - - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - } - wxMask* pNewMask; - - pNewMask = new wxMask(pMask->GetMaskBitmap()); - vNewBmp.SetMask(pNewMask); - free(pucBits); - ::GpiSetBitmap(hPS, NULLHANDLE); - ::GpiDestroyPS(hPS); - ::DevCloseDC(hDC); - if (vNewBmp.IsOk()) - return(vNewBmp); - return(wxNullBitmap); -} // end of wxDisableBitmap - -COLORREF wxColourToRGB( - const wxColour& rColor -) -{ - return(OS2RGB(rColor.Red(), rColor.Green(), rColor.Blue())); -} // end of wxColourToRGB diff --git a/src/os2/window.cpp b/src/os2/window.cpp deleted file mode 100644 index 8a7945ab51..0000000000 --- a/src/os2/window.cpp +++ /dev/null @@ -1,5111 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/os2/window.cpp -// Purpose: wxWindow -// Author: David Webster -// Modified by: -// Created: 10/12/99 -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// -// For compilers that support precompilation, includes "wx.h". -// -#include "wx/wxprec.h" - -#include "wx/window.h" - -#ifndef WX_PRECOMP - #define INCL_DOS - #define INCL_PM - #include - #include "wx/accel.h" - #include "wx/menu.h" - #include "wx/dc.h" - #include "wx/dcclient.h" - #include "wx/utils.h" - #include "wx/app.h" - #include "wx/panel.h" - #include "wx/layout.h" - #include "wx/checkbox.h" - #include "wx/combobox.h" - #include "wx/dialog.h" - #include "wx/frame.h" - #include "wx/listbox.h" - #include "wx/button.h" - #include "wx/bmpbuttn.h" - #include "wx/msgdlg.h" - #include "wx/scrolwin.h" - #include "wx/radiobox.h" - #include "wx/radiobut.h" - #include "wx/slider.h" - #include "wx/statbox.h" - #include "wx/statusbr.h" - #include "wx/toolbar.h" - #include "wx/settings.h" - #include "wx/intl.h" - #include "wx/log.h" - #include "wx/textctrl.h" - #include "wx/menuitem.h" - #include -#endif - -#include "wx/os2/dcclient.h" - -#if wxUSE_OWNER_DRAWN - #include "wx/ownerdrw.h" -#endif - -#if wxUSE_DRAG_AND_DROP - #include "wx/dnd.h" -#endif - -#include "wx/os2/private.h" - -#if wxUSE_TOOLTIPS - #include "wx/tooltip.h" -#endif - -#if wxUSE_NOTEBOOK - #include "wx/notebook.h" -#endif - -#if wxUSE_CARET - #include "wx/caret.h" -#endif // wxUSE_CARET - -#include - -// -// Place compiler, OS specific includes here -// - -// -// Standard macros -- these are for OS/2 PM, but most GUI's have something similar -// -#ifndef GET_X_LPARAM -// -// SHORT1FROMMP -- LOWORD -// - #define GET_X_LPARAM(mp) ((unsigned short)(unsigned long)(mp)) -// -// SHORT2FROMMP -- HIWORD -// - #define GET_Y_LPARAM(mp) ((unsigned short)(unsigned long)(mp >> 16)) -#endif // GET_X_LPARAM - -#ifndef CW_USEDEFAULT -# define CW_USEDEFAULT ((int)0x80000000) -#endif - -#ifndef VK_OEM_1 - #define VK_OEM_1 0xBA - #define VK_OEM_PLUS 0xBB - #define VK_OEM_COMMA 0xBC - #define VK_OEM_MINUS 0xBD - #define VK_OEM_PERIOD 0xBE - #define VK_OEM_2 0xBF - #define VK_OEM_3 0xC0 - #define VK_OEM_4 0xDB - #define VK_OEM_5 0xDC - #define VK_OEM_6 0xDD - #define VK_OEM_7 0xDE -#endif - -// --------------------------------------------------------------------------- -// global variables -// --------------------------------------------------------------------------- - -// -// The last PM message we got (MT-UNSAFE) -// -QMSG s_currentMsg; - -#if wxUSE_MENUS_NATIVE -extern wxMenu* wxCurrentPopupMenu; -#endif // wxUSE_MENUS_NATIVE - -// --------------------------------------------------------------------------- -// private functions -// --------------------------------------------------------------------------- - -// -// the window proc for all our windows; most gui's have something similar -// -MRESULT EXPENTRY wxWndProc( HWND hWnd - ,ULONG message - ,MPARAM mp1 - ,MPARAM mp2 - ); - -#ifdef __WXDEBUG__ - const wxChar *wxGetMessageName(int message); -#endif //__WXDEBUG__ - -wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin - ,short* pnX - ,short* pnY - ); -void wxRemoveHandleAssociation(wxWindowOS2* pWin); -void wxAssociateWinWithHandle( HWND hWnd - ,wxWindowOS2* pWin - ); -wxWindow* wxFindWinFromHandle(WXHWND hWnd); - -// -// get the current state of SHIFT/CTRL keys -// -static inline bool IsKeyDown(LONG key) {return (::WinGetKeyState(HWND_DESKTOP, key) & 0x8000) != 0; } -static inline bool IsShiftDown() { return IsKeyDown(VK_SHIFT); } -static inline bool IsCtrlDown() { return IsKeyDown(VK_CTRL); } - -static wxWindow* gpWinBeingCreated = NULL; - -// --------------------------------------------------------------------------- -// event tables -// --------------------------------------------------------------------------- - -// in wxUniv-OS/2 this class is abstract because it doesn't have DoPopupMenu() -// method -#ifdef __WXUNIVERSAL__ - IMPLEMENT_ABSTRACT_CLASS(wxWindowOS2, wxWindowBase) -#endif // __WXUNIVERSAL__ - -BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase) - EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground) - EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged) - EVT_IDLE(wxWindowOS2::OnIdle) - EVT_SET_FOCUS(wxWindowOS2::OnSetFocus) -END_EVENT_TABLE() - -// =========================================================================== -// implementation -// =========================================================================== - -// --------------------------------------------------------------------------- -// wxWindow utility functions -// --------------------------------------------------------------------------- - -// -// Find an item given the PM Window id -// -wxWindow* wxWindowOS2::FindItem( - long lId -) const -{ -#if wxUSE_CONTROLS - wxControl* pItem = wxDynamicCast(this, wxControl); - - if (pItem) - { - // - // I it we or one of our "internal" children? - // - if (pItem->GetId() == lId -#ifndef __WXUNIVERSAL__ - || (pItem->GetSubcontrols().Index(lId) != wxNOT_FOUND) -#endif - ) - { - return pItem; - } - } -#endif // wxUSE_CONTROLS - - wxWindowList::compatibility_iterator current = GetChildren().GetFirst(); - - while (current) - { - wxWindow* pChildWin = current->GetData(); - wxWindow* pWnd = pChildWin->FindItem(lId); - - if (pWnd) - return pWnd; - - current = current->GetNext(); - } - return(NULL); -} // end of wxWindowOS2::FindItem - -// -// Find an item given the PM Window handle -// -wxWindow* wxWindowOS2::FindItemByHWND( - WXHWND hWnd -, bool bControlOnly -) const -{ - wxWindowList::compatibility_iterator current = GetChildren().GetFirst(); - - while (current) - { - wxWindow* pParent = current->GetData(); - - // - // Do a recursive search. - // - wxWindow* pWnd = pParent->FindItemByHWND(hWnd); - - if (pWnd) - return(pWnd); - - if (!bControlOnly -#if wxUSE_CONTROLS - || pParent->IsKindOf(CLASSINFO(wxControl)) -#endif // wxUSE_CONTROLS - ) - { - wxWindow* pItem = current->GetData(); - - if (pItem->GetHWND() == hWnd) - return(pItem); - else - { - if (pItem->ContainsHWND(hWnd)) - return(pItem); - } - } - current = current->GetNext(); - } - return(NULL); -} // end of wxWindowOS2::FindItemByHWND - -// -// Default command handler -// -bool wxWindowOS2::OS2Command( WXUINT WXUNUSED(uParam), - WXWORD WXUNUSED(uId) ) -{ - return false; -} - -// ---------------------------------------------------------------------------- -// constructors and such -// ---------------------------------------------------------------------------- - -void wxWindowOS2::Init() -{ - // - // PM specific - // - m_bWinCaptured = false; - - m_fnOldWndProc = NULL; - m_bUseCtl3D = false; - m_bMouseInWindow = false; - m_bLastKeydownProcessed = false; - - // - // wxWnd - // - m_hMenu = 0L; - m_hWnd = 0L; - m_hWndScrollBarHorz = 0L; - m_hWndScrollBarVert = 0L; - - memset(&m_vWinSwp, '\0', sizeof (SWP)); - - // - // Pass WM_GETDLGCODE to DefWindowProc() - // - m_lDlgCode = 0; - - m_nXThumbSize = 0; - m_nYThumbSize = 0; - m_bBackgroundTransparent = false; - - // - // As all windows are created with WS_VISIBLE style... - // - m_isShown = true; - -#if wxUSE_MOUSEEVENT_HACK - m_lLastMouseX = - m_lLastMouseY = -1; - m_nLastMouseEvent = -1; -#endif // wxUSE_MOUSEEVENT_HACK -} // wxWindowOS2::Init - -// -// Destructor -// -wxWindowOS2::~wxWindowOS2() -{ - SendDestroyEvent(); - - for (wxWindow* pWin = GetParent(); pWin; pWin = pWin->GetParent()) - { - wxTopLevelWindow* pFrame = wxDynamicCast(pWin, wxTopLevelWindow); - - if (pFrame) - { - if (pFrame->GetLastFocus() == this) - pFrame->SetLastFocus(NULL); - } - } - - DestroyChildren(); - - if (m_hWnd) - { - if(!::WinDestroyWindow(GetHWND())) - { - wxLogLastError(wxT("DestroyWindow")); - } - // - // remove hWnd <-> wxWindow association - // - wxRemoveHandleAssociation(this); - } -} // end of wxWindowOS2::~wxWindowOS2 - -// real construction (Init() must have been called before!) -bool wxWindowOS2::Create( wxWindow* pParent, - wxWindowID vId, - const wxPoint& rPos, - const wxSize& rSize, - long lStyle, - const wxString& rName ) -{ - HWND hParent = NULLHANDLE; - ULONG ulCreateFlags = 0; - WXDWORD dwExStyle = 0; - - wxCHECK_MSG(pParent, false, wxT("can't create wxWindow without parent")); - -#if wxUSE_STATBOX - // - // wxGTK doesn't allow to create controls with static box as the parent so - // this will result in a crash when the program is ported to wxGTK - warn - // about it - // - // the correct solution is to create the controls as siblings of the - // static box - // - wxASSERT_MSG( !wxDynamicCast(pParent, wxStaticBox), - wxT("wxStaticBox can't be used as a window parent!") ); -#endif // wxUSE_STATBOX - - // Ensure groupbox backgrounds are painted - if (IsKindOf(CLASSINFO(wxPanel))) - lStyle &= ~wxCLIP_CHILDREN; - - if ( !CreateBase( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,wxDefaultValidator - ,rName - )) - return false; - - if (pParent) - { - pParent->AddChild(this); - hParent = GetWinHwnd(pParent); - - if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow))) - ulCreateFlags |= WS_CLIPSIBLINGS; - } - - // - // Most wxSTYLES are really PM Class specific styles and will be - // set in those class create procs. PM's basic windows styles are - // very limited. - // - ulCreateFlags |= OS2GetCreateWindowFlags(&dwExStyle); - - -#ifdef __WXUNIVERSAL__ - // no 3d effects, we draw them ourselves - WXDWORD exStyle = 0; -#endif // !wxUniversal - if (lStyle & wxPOPUP_WINDOW) - { - ulCreateFlags &= ~WS_VISIBLE; - m_isShown = false; - } - else - { - ulCreateFlags |= WS_VISIBLE; - } - - // - // Generic OS/2 Windows have no Control Data but other classes - // that call OS2Create may have some. - // - return(OS2Create( (PSZ)wxCanvasClassName - ,rName.c_str() - ,ulCreateFlags - ,rPos - ,rSize - ,NULL // Control Data - ,dwExStyle - ,true // Child - )); -} // end of wxWindowOS2::Create - -// --------------------------------------------------------------------------- -// basic operations -// --------------------------------------------------------------------------- - -void wxWindowOS2::SetFocus() -{ - HWND hWnd = GetHwnd(); - wxCHECK_RET( hWnd, wxT("can't set focus to invalid window") ); - - if (hWnd) - ::WinSetFocus(HWND_DESKTOP, hWnd); -} // end of wxWindowOS2::SetFocus - -void wxWindowOS2::SetFocusFromKbd() -{ - // - // Nothing else to do under OS/2 - // - wxWindowBase::SetFocusFromKbd(); -} // end of wxWindowOS2::SetFocus - -wxWindow* wxWindowBase::DoFindFocus() -{ - HWND hWnd = ::WinQueryFocus(HWND_DESKTOP); - - if (hWnd) - { - return wxFindWinFromHandle((WXHWND)hWnd); - } - return NULL; -} // wxWindowBase::DoFindFocus - -void wxWindowOS2::DoEnable( bool bEnable ) -{ - HWND hWnd = GetHwnd(); - if ( hWnd ) - ::WinEnableWindow(hWnd, (BOOL)bEnable); -} - -bool wxWindowOS2::Show( bool bShow ) -{ - if (!wxWindowBase::Show(bShow)) - return false; - - HWND hWnd = GetHwnd(); - - ::WinShowWindow(hWnd, bShow); - - if (bShow) - { - ::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE | SWP_ZORDER); - } - return true; -} // end of wxWindowOS2::Show - -void wxWindowOS2::Raise() -{ - ::WinSetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER | SWP_ACTIVATE); -} // end of wxWindowOS2::Raise - -void wxWindowOS2::Lower() -{ - ::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER | SWP_DEACTIVATE); -} // end of wxWindowOS2::Lower - -void wxWindowOS2::SetLabel( const wxString& label ) -{ - ::WinSetWindowText(GetHwnd(), label.c_str()); -} // end of wxWindowOS2::SetLabel - -wxString wxWindowOS2::GetLabel() const -{ - return wxGetWindowText(GetHWND()); -} // end of wxWindowOS2::GetLabel - -void wxWindowOS2::DoCaptureMouse() -{ - HWND hWnd = GetHwnd(); - - if (hWnd && !m_bWinCaptured) - { - ::WinSetCapture(HWND_DESKTOP, hWnd); - m_bWinCaptured = true; - } -} // end of wxWindowOS2::DoCaptureMouse - -void wxWindowOS2::DoReleaseMouse() -{ - if (m_bWinCaptured) - { - ::WinSetCapture(HWND_DESKTOP, NULLHANDLE); - m_bWinCaptured = false; - } -} // end of wxWindowOS2::ReleaseMouse - -/* static */ wxWindow* wxWindowBase::GetCapture() -{ - HWND hwnd = ::WinQueryCapture(HWND_DESKTOP); - return hwnd ? wxFindWinFromHandle((WXHWND)hwnd) : NULL; -} // end of wxWindowBase::GetCapture - -bool wxWindowOS2::SetFont( const wxFont& rFont ) -{ - if (!wxWindowBase::SetFont(rFont)) - { - // nothing to do - return false; - } - - HWND hWnd = GetHwnd(); - - wxOS2SetFont( hWnd, rFont ); - return true; -} // end of wxWindowOS2::SetFont - -// check if base implementation is OK -bool wxWindowOS2::SetCursor( const wxCursor& rCursor) -{ - if ( !wxWindowBase::SetCursor(rCursor)) - { - // no change - return false; - } - - if ( m_cursor.IsOk() ) { - HWND hWnd = GetHwnd(); - POINTL vPoint; - RECTL vRect; - - ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); - ::WinQueryWindowRect(hWnd, &vRect); - - if (::WinPtInRect(vHabmain, &vRect, &vPoint) && !wxIsBusy()) - { - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR()); - } - } - return true; -} // end of wxWindowOS2::SetCursor - -void wxWindowOS2::WarpPointer( - int nXPos -, int nYPos -) -{ - int nX = nXPos; - int nY = nYPos; - RECTL vRect; - - ::WinQueryWindowRect(GetHwnd(), &vRect); - nX += vRect.xLeft; - nY += vRect.yBottom; - - ::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY)); -} // end of wxWindowOS2::WarpPointer - - -// --------------------------------------------------------------------------- -// scrolling stuff -// --------------------------------------------------------------------------- - -int wxWindowOS2::GetScrollPos( - int nOrient -) const -{ - if (nOrient == wxHORIZONTAL) - return((int)::WinSendMsg(m_hWndScrollBarHorz, SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL)); - else - return((int)::WinSendMsg(m_hWndScrollBarVert, SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL)); -} // end of wxWindowOS2::GetScrollPos - -int wxWindowOS2::GetScrollRange( - int nOrient -) const -{ - MRESULT mr; - - if (nOrient == wxHORIZONTAL) - mr = ::WinSendMsg(m_hWndScrollBarHorz, SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL); - else - mr = ::WinSendMsg(m_hWndScrollBarVert, SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL); - return((int)SHORT2FROMMR(mr)); -} // end of wxWindowOS2::GetScrollRange - -int wxWindowOS2::GetScrollThumb( - int nOrient -) const -{ - if (nOrient == wxHORIZONTAL ) - return m_nXThumbSize; - else - return m_nYThumbSize; -} // end of wxWindowOS2::GetScrollThumb - -void wxWindowOS2::SetScrollPos( - int nOrient -, int nPos -, bool WXUNUSED(bRefresh) -) -{ - if (nOrient == wxHORIZONTAL ) - ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL); - else - ::WinSendMsg(m_hWndScrollBarVert, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL); -} // end of wxWindowOS2::SetScrollPos - -void wxWindowOS2::SetScrollbar( int nOrient, - int nPos, - int nThumbVisible, - int nRange, - bool WXUNUSED(bRefresh) ) -{ - HWND hWnd = GetHwnd(); - int nOldRange = nRange - nThumbVisible; - int nRange1 = nOldRange; - int nPageSize = nThumbVisible; - int nVSBWidth = wxSystemSettingsNative::GetMetric(wxSYS_VSCROLL_X, - this); - int nHSBHeight = wxSystemSettingsNative::GetMetric(wxSYS_HSCROLL_Y, - this); - - SBCDATA vInfo; - ULONG ulStyle = WS_VISIBLE | WS_SYNCPAINT; - SWP vSwp; - SWP vSwpOwner; - HWND hWndParent; - HWND hWndClient; - wxWindow* pParent = GetParent(); - - if (pParent && pParent->IsKindOf(CLASSINFO(wxFrame))) - { - wxFrame* pFrame; - - pFrame = wxDynamicCast(pParent, wxFrame); - hWndParent = pFrame->GetFrame(); - hWndClient = GetHwndOf(pParent); - } - else - { - if (pParent) - hWndParent = GetHwndOf(pParent); - else - hWndParent = GetHwnd(); - hWndClient = hWndParent; - } - ::WinQueryWindowPos(hWndClient, &vSwp); - ::WinQueryWindowPos(hWnd, &vSwpOwner); - - if (nPageSize > 1 && nRange > 0) - { - nRange1 += (nPageSize - 1); - } - - vInfo.cb = sizeof(SBCDATA); - vInfo.posFirst = 0; - vInfo.posLast = (SHORT)nRange1; - vInfo.posThumb = (SHORT)nPos; - - if (nOrient == wxHORIZONTAL ) - { - ulStyle |= SBS_HORZ; - if (m_hWndScrollBarHorz == 0L) - { - // - // Since the scrollbars are usually created before the owner is - // sized either via an OnSize event directly or via sizers or - // layout constraints, we will initially just use the coords of - // the parent window (this is usually a frame client window). But - // the bars themselves, are children of the parent frame (i.e - // siblings of the frame client. The owner, however is the actual - // window being scrolled (or at least the one responsible for - // handling the scroll events). The owner will be resized later, - // as it is usually a child of a top level window, and when that - // is done its scrollbars will be resized and repositioned as well. - // - m_hWndScrollBarHorz = ::WinCreateWindow( hWndParent - ,WC_SCROLLBAR - ,(PSZ)NULL - ,ulStyle - ,vSwp.x - ,vSwp.y - ,vSwp.cx - nVSBWidth - ,nHSBHeight - ,hWnd - ,HWND_TOP - ,60000 - ,&vInfo - ,NULL - ); - } - else - { - // - // The owner (the scrolled window) is a child of the Frame's - // client window, usually. The scrollbars are children of the - // frame, itself, and thus are positioned relative to the frame's - // origin, not the frame's client window origin. - // The starting x position is the same as the starting x position - // of the owner, but in terms of the parent frame. - // The starting y position is wxSYS_HSCROLL_Y pels below the - // origin of the owner in terms of the parent frame. - // The horz bar is the same width as the owner and wxSYS_HSCROLL_Y - // pels high. - // - if (nRange1 >= nThumbVisible) - { - ::WinSetWindowPos( m_hWndScrollBarHorz - ,HWND_TOP - ,vSwp.x + vSwpOwner.x - ,(vSwp.y + vSwpOwner.y) - nHSBHeight - ,vSwpOwner.cx - ,nHSBHeight - ,SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER - ); - ::WinSendMsg( m_hWndScrollBarHorz - ,SBM_SETSCROLLBAR - ,(MPARAM)nPos - ,MPFROM2SHORT(0, (SHORT)nRange1) - ); - ::WinSendMsg( m_hWndScrollBarHorz - ,SBM_SETTHUMBSIZE - ,MPFROM2SHORT( (SHORT)nThumbVisible - ,(SHORT)nRange1 - ) - ,(MPARAM)0 - ); - } - else - ::WinShowWindow(m_hWndScrollBarHorz, FALSE); - } - } - else - { - ulStyle |= SBS_VERT; - if (m_hWndScrollBarVert == 0L) - { - // - // Since the scrollbars are usually created before the owner is - // sized either via an OnSize event directly or via sizers or - // layout constraints, we will initially just use the coords of - // the parent window (this is usually a frame client window). But - // the bars themselves, are children of the parent frame (i.e - // siblings of the frame client. The owner, however is the actual - // window being scrolled (or at least the one responsible for - // handling the scroll events). The owner will be resized later, - // as it is usually a child of a top level window, and when that - // is done its scrollbars will be resized and repositioned as well. - // - m_hWndScrollBarVert = ::WinCreateWindow( hWndParent - ,WC_SCROLLBAR - ,(PSZ)NULL - ,ulStyle - ,vSwp.x + vSwp.cx - nVSBWidth - ,vSwp.y + nHSBHeight - ,nVSBWidth - ,vSwp.cy - nHSBHeight - ,hWnd - ,HWND_TOP - ,60001 - ,&vInfo - ,NULL - ); - } - else - { - // - // The owner (the scrolled window) is a child of the Frame's - // client window, usually. The scrollbars are children of the - // frame, itself and thus are positioned relative to the frame's - // origin, not the frame's client window's origin. - // Thus, the x position will be frame client's x (usually a few - // pels inside the parent frame, plus the width of the owner. - // Since we may be using sizers or layout constraints for multiple - // child scrolled windows, the y position will be the frame client's - // y pos plus the scrolled windows y position, yielding the y - // position of the scrollbar relative to the parent frame (the vert - // scrollbar is on the right and starts at the bottom of the - // owner window). - // It is wxSYS_VSCROLL_X pels wide and the same height as the owner. - // - if (nRange1 >= nThumbVisible) - { - ::WinSetWindowPos( m_hWndScrollBarVert - ,HWND_TOP - ,vSwp.x + vSwpOwner.x + vSwpOwner.cx - ,vSwp.y + vSwpOwner.y - ,nVSBWidth - ,vSwpOwner.cy - ,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW - ); - ::WinSendMsg( m_hWndScrollBarVert - ,SBM_SETSCROLLBAR - ,(MPARAM)nPos - ,MPFROM2SHORT(0, (SHORT)nRange1) - ); - ::WinSendMsg( m_hWndScrollBarVert - ,SBM_SETTHUMBSIZE - ,MPFROM2SHORT( (SHORT)nThumbVisible - ,(SHORT)nRange1 - ) - ,(MPARAM)0 - ); - } - else - ::WinShowWindow(m_hWndScrollBarVert, FALSE); - } - m_nYThumbSize = nThumbVisible; - } -} // end of wxWindowOS2::SetScrollbar - - -void wxWindowOS2::ScrollWindow( int nDx, - int nDy, - const wxRect* pRect ) -{ - RECTL vRect; - - ::WinQueryWindowRect(GetHwnd(), &vRect); - int height = vRect.yTop; - if (pRect) - { - vRect.xLeft = pRect->x; - vRect.yTop = height - pRect->y; - vRect.xRight = pRect->x + pRect->width; - vRect.yBottom = vRect.yTop - pRect->height; - } - nDy *= -1; // flip the sign of Dy as OS/2 is opposite Windows. - ::WinScrollWindow( GetHwnd() - ,(LONG)nDx - ,(LONG)nDy - ,&vRect - ,&vRect - ,NULL - ,NULL - ,SW_SCROLLCHILDREN | SW_INVALIDATERGN - ); -} // end of wxWindowOS2::ScrollWindow - -// --------------------------------------------------------------------------- -// subclassing -// --------------------------------------------------------------------------- - -void wxWindowOS2::SubclassWin( - WXHWND hWnd -) -{ - HWND hwnd = (HWND)hWnd; - - wxCHECK_RET(::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in SubclassWin") ); - wxAssociateWinWithHandle( hWnd - ,(wxWindow*)this - ); - if (!wxCheckWindowWndProc( hWnd - ,(WXFARPROC)wxWndProc - )) - { - m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc); - } - else - { - m_fnOldWndProc = (WXFARPROC)NULL; - } -} // end of wxWindowOS2::SubclassWin - -void wxWindowOS2::UnsubclassWin() -{ - // - // Restore old Window proc - // - HWND hwnd = GetHWND(); - - if (m_hWnd) - { - wxCHECK_RET( ::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in UnsubclassWin") ); - - PFNWP fnProc = (PFNWP)::WinQueryWindowPtr(hwnd, QWP_PFNWP); - - if ( (m_fnOldWndProc != 0) && (fnProc != (PFNWP) m_fnOldWndProc)) - { - WinSubclassWindow(hwnd, (PFNWP)m_fnOldWndProc); - m_fnOldWndProc = 0; - } - } -} // end of wxWindowOS2::UnsubclassWin - -bool wxCheckWindowWndProc( - WXHWND hWnd -, WXFARPROC fnWndProc -) -{ - static char zBuffer[512]; - CLASSINFO vCls; - - ::WinQueryClassName((HWND)hWnd, (LONG)512, (PCH)zBuffer); - ::WinQueryClassInfo(wxGetInstance(), (PSZ)zBuffer, &vCls); - return(fnWndProc == (WXFARPROC)vCls.pfnWindowProc); -} // end of WinGuiBase_CheckWindowWndProc - -void wxWindowOS2::SetWindowStyleFlag( - long lFlags -) -{ - long lFlagsOld = GetWindowStyleFlag(); - - if (lFlags == lFlagsOld) - return; - - // - // Update the internal variable - // - wxWindowBase::SetWindowStyleFlag(lFlags); - - // - // Now update the Windows style as well if needed - and if the window had - // been already created - // - if (!GetHwnd()) - return; - - WXDWORD dwExstyle; - WXDWORD dwExstyleOld; - long lStyle = OS2GetStyle( lFlags - ,&dwExstyle - ); - long lStyleOld = OS2GetStyle( lFlagsOld - ,&dwExstyleOld - ); - - if (lStyle != lStyleOld) - { - // - // Some flags (e.g. WS_VISIBLE or WS_DISABLED) should not be changed by - // this function so instead of simply setting the style to the new - // value we clear the bits which were set in styleOld but are set in - // the new one and set the ones which were not set before - // - long lStyleReal = ::WinQueryWindowULong(GetHwnd(), QWL_STYLE); - - lStyleReal &= ~lStyleOld; - lStyleReal |= lStyle; - - ::WinSetWindowULong(GetHwnd(), QWL_STYLE, lStyleReal); - } -} // end of wxWindowOS2::SetWindowStyleFlag - -WXDWORD wxWindowOS2::OS2GetStyle( long lFlags, - WXDWORD* WXUNUSED(pdwExstyle) ) const -{ - WXDWORD dwStyle = 0L; - - if (lFlags & wxCLIP_CHILDREN ) - dwStyle |= WS_CLIPCHILDREN; - - if (lFlags & wxCLIP_SIBLINGS ) - dwStyle |= WS_CLIPSIBLINGS; - - return dwStyle; -} // end of wxWindowOS2::OS2GetStyle - -// -// Make a Windows extended style from the given wxWidgets window style -// -WXDWORD wxWindowOS2::MakeExtendedStyle( - long lStyle -, bool bEliminateBorders -) -{ - // - // Simply fill out with wxWindow extended styles. We'll conjure - // something up in OS2Create and all window redrawing pieces later - // - WXDWORD dwStyle = 0; - - if (lStyle & wxTRANSPARENT_WINDOW ) - dwStyle |= wxTRANSPARENT_WINDOW; - - if (!bEliminateBorders) - { - if (lStyle & wxSUNKEN_BORDER) - dwStyle |= wxSUNKEN_BORDER; - if (lStyle & wxDOUBLE_BORDER) - dwStyle |= wxDOUBLE_BORDER; - if (lStyle & wxRAISED_BORDER ) - dwStyle |= wxRAISED_BORDER; - if (lStyle & wxSTATIC_BORDER) - dwStyle |= wxSTATIC_BORDER; - } - return dwStyle; -} // end of wxWindowOS2::MakeExtendedStyle - -// -// Setup background and foreground colours correctly -// -void wxWindowOS2::SetupColours() -{ - if ( GetParent() ) - SetBackgroundColour(GetParent()->GetBackgroundColour()); -} // end of wxWindowOS2::SetupColours - -void wxWindowOS2::OnIdle( - wxIdleEvent& WXUNUSED(rEvent) -) -{ - // - // Check if we need to send a LEAVE event - // - if (m_bMouseInWindow) - { - POINTL vPoint; - - ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); - if (::WinWindowFromPoint(HWND_DESKTOP, &vPoint, FALSE) != (HWND)GetHwnd()) - { - // - // Generate a LEAVE event - // - m_bMouseInWindow = false; - - // - // Unfortunately the mouse button and keyboard state may have changed - // by the time the OnIdle function is called, so 'state' may be - // meaningless. - // - int nState = 0; - - if (IsShiftDown()) - nState |= KC_SHIFT; - if (IsCtrlDown()) - nState |= KC_CTRL; - - wxMouseEvent rEvent(wxEVT_LEAVE_WINDOW); - - InitMouseEvent( rEvent - ,vPoint.x - ,vPoint.y - ,nState - ); - (void)HandleWindowEvent(rEvent); - } - } -} // end of wxWindowOS2::OnIdle - -// -// Set this window to be the child of 'parent'. -// -bool wxWindowOS2::Reparent( wxWindowBase* pParent) -{ - if (!wxWindowBase::Reparent(pParent)) - return false; - - HWND hWndChild = GetHwnd(); - HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0; - - ::WinSetParent(hWndChild, hWndParent, TRUE); - return true; -} // end of wxWindowOS2::Reparent - -void wxWindowOS2::Update() -{ - ::WinUpdateWindow(GetHwnd()); -} // end of wxWindowOS2::Update - -void wxWindowOS2::DoFreeze() -{ - ::WinSendMsg(GetHwnd(), WM_VRNDISABLED, (MPARAM)0, (MPARAM)0); -} // end of wxWindowOS2::Freeze - -void wxWindowOS2::DoThaw() -{ - ::WinSendMsg(GetHwnd(), WM_VRNENABLED, (MPARAM)TRUE, (MPARAM)0); - - // - // We need to refresh everything or otherwise he invalidated area is not - // repainted. - // - Refresh(); -} // end of wxWindowOS2::Thaw - -void wxWindowOS2::Refresh( bool bEraseBack, - const wxRect* pRect ) -{ - HWND hWnd = GetHwnd(); - - if (hWnd) - { - if (pRect) - { - RECTL vOs2Rect; - int height; - - ::WinQueryWindowRect(GetHwnd(), &vOs2Rect); - height = vOs2Rect.yTop; - vOs2Rect.xLeft = pRect->x; - vOs2Rect.yTop = height - pRect->y; - vOs2Rect.xRight = pRect->x + pRect->width; - vOs2Rect.yBottom = vOs2Rect.yTop - pRect->height; - - ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack); - } - else - ::WinInvalidateRect(hWnd, NULL, bEraseBack); - if (m_hWndScrollBarHorz != NULLHANDLE) - ::WinInvalidateRect(m_hWndScrollBarHorz, NULL, TRUE); - if (m_hWndScrollBarVert != NULLHANDLE) - ::WinInvalidateRect(m_hWndScrollBarVert, NULL, TRUE); - } -} // end of wxWindowOS2::Refresh - -// --------------------------------------------------------------------------- -// drag and drop -// --------------------------------------------------------------------------- - -#if wxUSE_DRAG_AND_DROP -void wxWindowOS2::SetDropTarget( - wxDropTarget* pDropTarget -) -{ - m_dropTarget = pDropTarget; -} // end of wxWindowOS2::SetDropTarget -#endif - -// -// old style file-manager drag&drop support: we retain the old-style -// DragAcceptFiles in parallel with SetDropTarget. -// -void wxWindowOS2::DragAcceptFiles( - bool bAccept -) -{ - HWND hWnd = GetHwnd(); - - if (hWnd && bAccept) - ::DrgAcceptDroppedFiles(hWnd, NULL, NULL, DO_COPY, 0L); -} // end of wxWindowOS2::DragAcceptFiles - -// ---------------------------------------------------------------------------- -// tooltips -// ---------------------------------------------------------------------------- - -#if wxUSE_TOOLTIPS - -void wxWindowOS2::DoSetToolTip( - wxToolTip* pTooltip -) -{ - wxWindowBase::DoSetToolTip(pTooltip); - - if (m_tooltip) - m_tooltip->SetWindow(this); -} // end of wxWindowOS2::DoSetToolTip - -#endif // wxUSE_TOOLTIPS - -// --------------------------------------------------------------------------- -// moving and resizing -// --------------------------------------------------------------------------- - -// Get total size -void wxWindowOS2::DoGetSize( - int* pWidth -, int* pHeight -) const -{ - HWND hWnd; - RECTL vRect; - - if (IsKindOf(CLASSINFO(wxFrame))) - { - wxFrame* pFrame = wxDynamicCast(this, wxFrame); - hWnd = pFrame->GetFrame(); - } - else - hWnd = GetHwnd(); - - ::WinQueryWindowRect(hWnd, &vRect); - - if (pWidth) - *pWidth = vRect.xRight - vRect.xLeft; - if (pHeight ) - // OS/2 PM is backwards from windows - *pHeight = vRect.yTop - vRect.yBottom; -} // end of wxWindowOS2::DoGetSize - -void wxWindowOS2::DoGetPosition( - int* pX -, int* pY -) const -{ - // - // Return parameters assume wxWidgets coordinate system - // - HWND hWnd; - SWP vSwp; - POINTL vPoint; - wxWindow* pParent = GetParent(); - - // - // It would seem that WinQueryWindowRect would be the correlary to - // the WIN32 WinGetRect, but unlike WinGetRect which returns the window - // origin position in screen coordinates, WinQueryWindowRect returns it - // relative to itself, i.e. (0,0). To get the same under PM we must - // use WinQueryWindowPos. This call, unlike the WIN32 call, however, - // returns a position relative to it's parent, so no parent adujstments - // are needed under OS/2. Also, windows should be created using - // wxWindow coordinates, i.e. 0,0 is the TOP left. - // - if (IsKindOf(CLASSINFO(wxFrame))) - { - wxFrame* pFrame = wxDynamicCast(this, wxFrame); - hWnd = pFrame->GetFrame(); - } - else - hWnd = GetHwnd(); - - ::WinQueryWindowPos(hWnd, &vSwp); - - vPoint.x = vSwp.x; - vPoint.y = vSwp.y; - - // We need to convert to wxWidgets coordinates - int vHeight; - DoGetSize(NULL,&vHeight); - wxWindow* pWindow = wxDynamicCast(this,wxWindow); - vPoint.y = pWindow->GetOS2ParentHeight(pParent) - vPoint.y - vHeight; - - // - // We may be faking the client origin. So a window that's really at (0, - // 30) may appear (to wxWin apps) to be at (0, 0). - // - if (pParent) - { - wxPoint vPt(pParent->GetClientAreaOrigin()); - - vPoint.x -= vPt.x; - vPoint.y -= vPt.y; - } - - if (pX) - *pX = vPoint.x; - if (pY) - *pY = vPoint.y; -} // end of wxWindowOS2::DoGetPosition - -void wxWindowOS2::DoScreenToClient( - int* pX -, int* pY -) const -{ - HWND hWnd = GetHwnd(); - SWP vSwp; - - ::WinQueryWindowPos(hWnd, &vSwp); - - if (pX) - *pX += vSwp.x; - if (pY) - *pY += vSwp.y; -} // end of wxWindowOS2::DoScreenToClient - -void wxWindowOS2::DoClientToScreen( - int* pX -, int* pY -) const -{ - HWND hWnd = GetHwnd(); - SWP vSwp; - - ::WinQueryWindowPos(hWnd, &vSwp); - - if (pX) - *pX += vSwp.x; - if (pY) - *pY += vSwp.y; -} // end of wxWindowOS2::DoClientToScreen - -// -// Get size *available for subwindows* i.e. excluding menu bar etc. -// Must be a frame type window -// -void wxWindowOS2::DoGetClientSize( - int* pWidth -, int* pHeight -) const -{ - HWND hWnd = GetHwnd(); - RECTL vRect; - - ::WinQueryWindowRect(hWnd, &vRect); - if (IsKindOf(CLASSINFO(wxDialog))) - { - RECTL vTitle; - HWND hWndTitle; - // - // For a Dialog we have to explicitly request the client portion. - // For a Frame the hWnd IS the client window - // - hWndTitle = ::WinWindowFromID(hWnd, FID_TITLEBAR); - if (::WinQueryWindowRect(hWndTitle, &vTitle)) - { - if (vTitle.yTop - vTitle.yBottom == 0) - { - // - // Dialog has not been created yet, use a default - // - vTitle.yTop = 20; - } - vRect.yTop -= (vTitle.yTop - vTitle.yBottom); - } - - ULONG uStyle = ::WinQueryWindowULong(hWnd, QWL_STYLE); - - // - // Deal with borders - // - if (uStyle & FCF_DLGBORDER) - { - vRect.xLeft += 4; - vRect.xRight -= 4; - vRect.yTop -= 4; - vRect.yBottom += 4; - } - else if (uStyle & FCF_SIZEBORDER) - { - vRect.xLeft += 4; - vRect.xRight -= 4; - vRect.yTop -= 4; - vRect.yBottom += 4; - } - else if (uStyle & FCF_BORDER) - { - vRect.xLeft += 2; - vRect.xRight -= 2; - vRect.yTop -= 2; - vRect.yBottom += 2; - } - else // make some kind of adjustment or top sizers ram into the titlebar! - { - vRect.xLeft += 3; - vRect.xRight -= 3; - vRect.yTop -= 3; - vRect.yBottom += 3; - } - } - if (pWidth) - *pWidth = vRect.xRight - vRect.xLeft; - if (pHeight) - *pHeight = vRect.yTop - vRect.yBottom; -} // end of wxWindowOS2::DoGetClientSize - -void wxWindowOS2::DoMoveWindow( - int nX -, int nY -, int nWidth -, int nHeight -) -{ - // - // Input parameters assume wxWidgets coordinate system - // - RECTL vRect; - wxWindow* pParent = GetParent(); - HWND hWnd = GetHwnd(); - - if (pParent && !IsKindOf(CLASSINFO(wxDialog))) - { - int nOS2Height = GetOS2ParentHeight(pParent); - - nY = nOS2Height - (nY + nHeight); - } - else - { - RECTL vRect; - - ::WinQueryWindowRect(HWND_DESKTOP, &vRect); - nY = vRect.yTop - (nY + nHeight); - } - - // - // In the case of a frame whose client is sized, the client cannot be - // large than its parent frame minus its borders! This usually happens - // when using an autosizer to size a frame to precisely hold client - // controls as in the notebook sample. - // - // In this case, we may need to resize both a frame and its client so we - // need a quick calc of the frame border size, then if the frame - // (less its borders) is smaller than the client, size the frame to - // encompass the client with the appropriate border size. - // - if (IsKindOf(CLASSINFO(wxFrame))) - { - RECTL vFRect; - int nWidthFrameDelta = 0; - int nHeightFrameDelta = 0; - wxFrame* pFrame; - - pFrame = wxDynamicCast(this, wxFrame); - hWnd = pFrame->GetFrame(); - ::WinQueryWindowRect(hWnd, &vRect); - ::WinMapWindowPoints(hWnd, HWND_DESKTOP, (PPOINTL)&vRect, 2); - vFRect = vRect; - ::WinCalcFrameRect(hWnd, &vRect, TRUE); - nWidthFrameDelta = ((vRect.xLeft - vFRect.xLeft) + (vFRect.xRight - vRect.xRight)); - nHeightFrameDelta = ((vRect.yBottom - vFRect.yBottom) + (vFRect.yTop - vRect.yTop)); - // Input values refer to the window position relative to its parent - // which may be the Desktop so we need to calculate - // the new frame values to keep the wxWidgets frame origin constant - nY -= nHeightFrameDelta; - nWidth += nWidthFrameDelta; - nHeight += nHeightFrameDelta; - } - ::WinSetWindowPos( hWnd - ,HWND_TOP - ,(LONG)nX - ,(LONG)nY - ,(LONG)nWidth - ,(LONG)nHeight - ,SWP_SIZE | SWP_MOVE - ); - if (m_vWinSwp.cx == 0 && m_vWinSwp.cy == 0 && m_vWinSwp.fl == 0) - // - // Uninitialized - // - ::WinQueryWindowPos(hWnd, &m_vWinSwp); - else - { - // - // Handle resizing of scrolled windows. The target or window to - // be scrolled is the owner (gets the scroll notifications). The - // parent is usually the parent frame of the scrolled panel window. - // In order to show the scrollbars the target window will be shrunk - // by the size of the scroll bar widths and moved in the X and Y - // directon. That value will be computed as part of the diff for - // moving the children. Everytime the window is sized the - // toplevel OnSize is going to resize the panel to fit the client - // or the whole sizer and will need to me resized. This will send - // a WM_SIZE out which will be intercepted by the ScrollHelper - // which will cause the scrollbars to be displayed via the SetScrollbar - // call in CWindow. - // - if (IsKindOf(CLASSINFO(wxScrolledWindow))) - { - int nAdjustWidth = 0; - int nAdjustHeight = 0; - int nHSBHeight = wxSystemSettingsNative::GetMetric(wxSYS_HSCROLL_Y, - this); - int nVSBWidth = wxSystemSettingsNative::GetMetric(wxSYS_VSCROLL_X, - this); - SWP vSwpScroll; - - if (GetScrollBarHorz() == NULLHANDLE || - !WinIsWindowShowing(GetScrollBarHorz())) - nAdjustHeight = 0L; - else - nAdjustHeight = nHSBHeight; - if (GetScrollBarVert() == NULLHANDLE || - !WinIsWindowShowing(GetScrollBarVert())) - nAdjustWidth = 0L; - else - nAdjustWidth = nVSBWidth; - ::WinQueryWindowPos(hWnd, &vSwpScroll); - ::WinSetWindowPos( hWnd - ,HWND_TOP - ,vSwpScroll.x - ,vSwpScroll.y + nAdjustHeight - ,vSwpScroll.cx - nAdjustWidth - ,vSwpScroll.cy - nAdjustHeight - ,SWP_MOVE | SWP_SIZE - ); - } - ::WinQueryWindowPos(hWnd, &m_vWinSwp); - } -} // end of wxWindowOS2::DoMoveWindow - -// -// Set the size of the window: if the dimensions are positive, just use them, -// but if any of them is equal to -1, it means that we must find the value for -// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in -// which case -1 is a valid value for x and y) -// -// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate -// the width/height to best suit our contents, otherwise we reuse the current -// width/height -// -void wxWindowOS2::DoSetSize( int nX, - int nY, - int nWidth, - int nHeight, - int nSizeFlags ) -{ - // - // Input & output parameters assume wxWidgets coordinate system - // - - // - // Get the current size and position... - // - int nCurrentX; - int nCurrentY; - int nCurrentWidth; - int nCurrentHeight; - wxSize vSize = wxDefaultSize; - - GetPosition(&nCurrentX, &nCurrentY); - GetSize(&nCurrentWidth, &nCurrentHeight); - - // - // ... and don't do anything (avoiding flicker) if it's already ok - // - if (nX == nCurrentX && nY == nCurrentY && - nWidth == nCurrentWidth && nHeight == nCurrentHeight) - { - return; - } - - if (nX == wxDefaultCoord && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - nX = nCurrentX; - if (nY == wxDefaultCoord && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - nY = nCurrentY; - - AdjustForParentClientOrigin(nX, nY, nSizeFlags); - - if (nWidth == wxDefaultCoord) - { - if (nSizeFlags & wxSIZE_AUTO_WIDTH) - { - vSize = DoGetBestSize(); - nWidth = vSize.x; - } - else - { - // - // Just take the current one - // - nWidth = nCurrentWidth; - } - } - - if (nHeight == wxDefaultCoord) - { - if (nSizeFlags & wxSIZE_AUTO_HEIGHT) - { - if (vSize.x == wxDefaultCoord) - { - vSize = DoGetBestSize(); - } - nHeight = vSize.y; - } - else - { - // just take the current one - nHeight = nCurrentHeight; - } - } - - DoMoveWindow( nX, nY, nWidth, nHeight ); -} // end of wxWindowOS2::DoSetSize - -void wxWindowOS2::DoSetClientSize( int nWidth, - int nHeight ) -{ - // - // nX & nY assume wxWidgets coordinate system - // - int nX; - int nY; - - GetPosition(&nX, &nY); - - DoMoveWindow( nX, nY, nWidth, nHeight ); - - wxSize size( nWidth, nHeight ); - wxSizeEvent vEvent( size, m_windowId ); - vEvent.SetEventObject(this); - HandleWindowEvent(vEvent); -} // end of wxWindowOS2::DoSetClientSize - -// --------------------------------------------------------------------------- -// text metrics -// --------------------------------------------------------------------------- - -int wxWindowOS2::GetCharHeight() const -{ - HPS hPs; - FONTMETRICS vFontMetrics; - - hPs = ::WinGetPS(GetHwnd()); - - if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics)) - { - ::WinReleasePS(hPs); - return (0); - } - ::WinReleasePS(hPs); - return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender); -} // end of wxWindowOS2::GetCharHeight - -int wxWindowOS2::GetCharWidth() const -{ - HPS hPs; - FONTMETRICS vFontMetrics; - - hPs = ::WinGetPS(GetHwnd()); - - if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics)) - { - ::WinReleasePS(hPs); - return (0); - } - ::WinReleasePS(hPs); - return(vFontMetrics.lAveCharWidth); -} // end of wxWindowOS2::GetCharWidth - -void wxWindowOS2::DoGetTextExtent( const wxString& rString, - int* pX, - int* pY, - int* pDescent, - int* pExternalLeading, - const wxFont* WXUNUSED(pTheFont) ) const -{ - POINTL avPoint[TXTBOX_COUNT]; - POINTL vPtMin; - POINTL vPtMax; - int i; - int l; - FONTMETRICS vFM; // metrics structure - BOOL bRc = FALSE; - HPS hPS; - - hPS = ::WinGetPS(GetHwnd()); - - l = rString.length(); - if (l > 0L) - { - // - // In world coordinates. - // - bRc = ::GpiQueryTextBox( hPS, - l, - (char*) rString.wx_str(), - TXTBOX_COUNT,// return maximum information - avPoint // array of coordinates points - ); - if (bRc) - { - vPtMin.x = avPoint[0].x; - vPtMax.x = avPoint[0].x; - vPtMin.y = avPoint[0].y; - vPtMax.y = avPoint[0].y; - for (i = 1; i < 4; i++) - { - if(vPtMin.x > avPoint[i].x) vPtMin.x = avPoint[i].x; - if(vPtMin.y > avPoint[i].y) vPtMin.y = avPoint[i].y; - if(vPtMax.x < avPoint[i].x) vPtMax.x = avPoint[i].x; - if(vPtMax.y < avPoint[i].y) vPtMax.y = avPoint[i].y; - } - bRc = ::GpiQueryFontMetrics( hPS - ,sizeof(FONTMETRICS) - ,&vFM - ); - if (!bRc) - { - vPtMin.x = 0; - vPtMin.y = 0; - vPtMax.x = 0; - vPtMax.y = 0; - } - } - else - { - vPtMin.x = 0; - vPtMin.y = 0; - vPtMax.x = 0; - vPtMax.y = 0; - } - } - else - { - vPtMin.x = 0; - vPtMin.y = 0; - vPtMax.x = 0; - vPtMax.y = 0; - } - if (pX) - *pX = (vPtMax.x - vPtMin.x + 1); - if (pY) - *pY = (vPtMax.y - vPtMin.y + 1); - if (pDescent) - { - if (bRc) - *pDescent = vFM.lMaxDescender; - else - *pDescent = 0; - } - if (pExternalLeading) - { - if (bRc) - *pExternalLeading = vFM.lExternalLeading; - else - *pExternalLeading = 0; - } - ::WinReleasePS(hPS); -} // end of wxWindow::DoGetTextExtent - -bool wxWindowOS2::IsMouseInWindow() const -{ - // - // Get the mouse position - POINTL vPt; - - ::WinQueryPointerPos(HWND_DESKTOP, &vPt); - - // - // Find the window which currently has the cursor and go up the window - // chain until we find this window - or exhaust it - // - HWND hWnd = ::WinWindowFromPoint(HWND_DESKTOP, &vPt, TRUE); - - while (hWnd && (hWnd != GetHwnd())) - hWnd = ::WinQueryWindow(hWnd, QW_PARENT); - - return hWnd != NULL; -} // end of wxWindowOS2::IsMouseInWindow - - -// --------------------------------------------------------------------------- -// popup menu -// --------------------------------------------------------------------------- -// -#if wxUSE_MENUS_NATIVE -bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY ) -{ - HWND hWndOwner = GetHwnd(); - HWND hWndParent = GetHwnd(); - HWND hMenu = GetHmenuOf(pMenu); - bool bIsWaiting = true; - int nHeight; - - pMenu->UpdateUI(); - - if ( nX == -1 && nY == -1 ) - { - wxPoint mouse = wxGetMousePosition(); - nX = mouse.x; nY = mouse.y; - } - else - { - DoClientToScreen( &nX - ,&nY - ); - DoGetSize(0,&nHeight); - nY = nHeight - nY; - } - - ::WinPopupMenu( hWndParent - ,hWndOwner - ,hMenu - ,nX - ,nY - ,0L - ,PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_KEYBOARD - ); - - while(bIsWaiting) - { - QMSG vMsg; - - ::WinGetMsg(vHabmain,&vMsg, (HWND)0, 0, 0); - if (vMsg.msg == WM_COMMAND) - bIsWaiting = false; - ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg); - } - - return true; -} // end of wxWindowOS2::DoPopupMenu -#endif // wxUSE_MENUS_NATIVE - -// =========================================================================== -// pre/post message processing -// =========================================================================== - -MRESULT wxWindowOS2::OS2DefWindowProc( WXUINT uMsg, - WXWPARAM wParam, - WXLPARAM lParam ) -{ - if (m_fnOldWndProc) - return (MRESULT)m_fnOldWndProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam); - else - return ::WinDefWindowProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam); -} // end of wxWindowOS2::OS2DefWindowProc - -bool wxWindowOS2::OS2ProcessMessage( WXMSG* pMsg ) -{ -// wxUniversal implements tab traversal itself -#ifndef __WXUNIVERSAL__ - QMSG* pQMsg = (QMSG*)pMsg; - - if (m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL)) - { - // - // Intercept dialog navigation keys - // - bool bProcess = true; - USHORT uKeyFlags = SHORT1FROMMP(pQMsg->mp1); - - if (uKeyFlags & KC_KEYUP) - bProcess = false; - - if (uKeyFlags & KC_ALT) - bProcess = false; - - if (!(uKeyFlags & KC_VIRTUALKEY)) - bProcess = false; - - if (bProcess) - { - bool bCtrlDown = IsCtrlDown(); - bool bShiftDown = IsShiftDown(); - - // - // WM_QUERYDLGCODE: ask the control if it wants the key for itself, - // don't process it if it's the case (except for Ctrl-Tab/Enter - // combinations which are always processed) - // - ULONG ulDlgCode = 0; - - if (!bCtrlDown) - { - ulDlgCode = (ULONG)::WinSendMsg(pQMsg->hwnd, WM_QUERYDLGCODE, pQMsg, 0); - } - - bool bForward = true; - bool bWindowChange = false; - - switch (SHORT2FROMMP(pQMsg->mp2)) - { - // - // Going to make certain assumptions about specific types of controls - // here, so we may have to alter some things later if they prove invalid - // - case VK_TAB: - // - // Shift tabl will always be a nav-key but tabs may be wanted - // - if (!bShiftDown) - { - bProcess = false; - } - else - { - // - // Entry Fields want tabs for themselve usually - // - switch (ulDlgCode) - { - case DLGC_ENTRYFIELD: - case DLGC_MLE: - bProcess = true; - break; - - default: - bProcess = false; - } - - // - // Ctrl-Tab cycles thru notebook pages - // - bWindowChange = bCtrlDown; - bForward = !bShiftDown; - } - break; - - case VK_UP: - case VK_LEFT: - if (bCtrlDown) - bProcess = false; - else - bForward = false; - break; - - case VK_DOWN: - case VK_RIGHT: - if (bCtrlDown) - bProcess = false; - break; - - case VK_ENTER: - { - if (bCtrlDown) - { - // - // ctrl-enter is not processed - // - return false; - } - else if (ulDlgCode & DLGC_BUTTON) - { - // - // buttons want process Enter themselevs - // - bProcess = false; - } - else - { - wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - wxButton* pBtn = NULL; - - if (tlw) - { - pBtn = wxDynamicCast(tlw->GetDefaultItem(), wxButton); - } - - if (pBtn && pBtn->IsEnabled()) - { - // - // If we do have a default button, do press it - // - pBtn->OS2Command(BN_CLICKED, 0 /* unused */); - return true; - } - else if (!IsTopLevel()) - { - // - // if not a top level window, let parent - // handle it - // - return false; - } - // else: but if it does not it makes sense to make - // it work like a TAB - and that's what we do. - // Note that Ctrl-Enter always works this way. - } - } - break; - - default: - bProcess = false; - } - - if (bProcess) - { - wxNavigationKeyEvent vEvent; - - vEvent.SetDirection(bForward); - vEvent.SetWindowChange(bWindowChange); - vEvent.SetEventObject(this); - - if (HandleWindowEvent(vEvent)) - { - wxButton* pBtn = wxDynamicCast(FindFocus(), wxButton); - - if (pBtn) - { - // - // The button which has focus should be default - // - pBtn->SetDefault(); - } - return true; - } - } - } - // - // Let Dialogs process - // - if (::WinSendMsg(pQMsg->hwnd, WM_QUERYDLGCODE, pQMsg, 0)); - return true; - } -#else - pMsg = pMsg; // just shut up the compiler -#endif // __WXUNIVERSAL__ - - return false; -} // end of wxWindowOS2::OS2ProcessMessage - -bool wxWindowOS2::OS2TranslateMessage( WXMSG* pMsg ) -{ -#if wxUSE_ACCEL && !defined(__WXUNIVERSAL__) - return m_acceleratorTable.Translate(m_hWnd, pMsg); -#else - pMsg = pMsg; - return false; -#endif //wxUSE_ACCEL -} // end of wxWindowOS2::OS2TranslateMessage - -bool wxWindowOS2::OS2ShouldPreProcessMessage( WXMSG* WXUNUSED(pMsg) ) -{ - // preprocess all messages by default - return true; -} // end of wxWindowOS2::OS2ShouldPreProcessMessage - -// --------------------------------------------------------------------------- -// message params unpackers -// --------------------------------------------------------------------------- - -void wxWindowOS2::UnpackCommand( - WXWPARAM wParam -, WXLPARAM lParam -, WORD* pId -, WXHWND* phWnd -, WORD* pCmd -) -{ - *pId = LOWORD(wParam); - *phWnd = NULL; // or may be GetHWND() ? - *pCmd = LOWORD(lParam); -} // end of wxWindowOS2::UnpackCommand - -void wxWindowOS2::UnpackActivate( - WXWPARAM wParam -, WXLPARAM lParam -, WXWORD* pState -, WXHWND* phWnd -) -{ - *pState = LOWORD(wParam); - *phWnd = (WXHWND)lParam; -} // end of wxWindowOS2::UnpackActivate - -void wxWindowOS2::UnpackScroll( - WXWPARAM wParam -, WXLPARAM lParam -, WXWORD* pCode -, WXWORD* pPos -, WXHWND* phWnd -) -{ - ULONG ulId; - HWND hWnd; - - ulId = (ULONG)LONGFROMMP(wParam); - hWnd = ::WinWindowFromID(GetHwnd(), ulId); - if (hWnd == m_hWndScrollBarHorz || hWnd == m_hWndScrollBarVert) - *phWnd = NULLHANDLE; - else - *phWnd = hWnd; - - *pPos = SHORT1FROMMP(lParam); - *pCode = SHORT2FROMMP(lParam); -} // end of wxWindowOS2::UnpackScroll - -void wxWindowOS2::UnpackMenuSelect( - WXWPARAM wParam -, WXLPARAM lParam -, WXWORD* pItem -, WXWORD* pFlags -, WXHMENU* phMenu -) -{ - *pItem = (WXWORD)LOWORD(wParam); - *pFlags = HIWORD(wParam); - *phMenu = (WXHMENU)lParam; -} // end of wxWindowOS2::UnpackMenuSelect - -// --------------------------------------------------------------------------- -// Main wxWidgets window proc and the window proc for wxWindow -// --------------------------------------------------------------------------- - -// -// Hook for new window just as it's being created, when the window isn't yet -// associated with the handle -// -wxWindowOS2* wxWndHook = NULL; - -// -// Main window proc -// -MRESULT EXPENTRY wxWndProc( - HWND hWnd -, ULONG ulMsg -, MPARAM wParam -, MPARAM lParam -) -{ - wxWindowOS2* pWnd = wxFindWinFromHandle((WXHWND)hWnd); - - // - // When we get the first message for the HWND we just created, we associate - // it with wxWindow stored in wxWndHook - // - if (!pWnd && wxWndHook) - { - wxAssociateWinWithHandle(hWnd, wxWndHook); - pWnd = wxWndHook; - wxWndHook = NULL; - pWnd->SetHWND((WXHWND)hWnd); - } - - MRESULT rc = (MRESULT)0; - - - // - // Stop right here if we don't have a valid handle in our wxWindow object. - // - if (pWnd && !pWnd->GetHWND()) - { - pWnd->SetHWND((WXHWND) hWnd); - rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam ); - pWnd->SetHWND(0); - } - else - { - if (pWnd) - { - rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam); - if ( (pWnd->GetScrollBarHorz() != NULLHANDLE || - pWnd->GetScrollBarVert() != NULLHANDLE) && - ulMsg == WM_PAINT) - { - if (pWnd->GetScrollBarHorz() != NULLHANDLE) - ::WinInvalidateRect(pWnd->GetScrollBarHorz(), NULL, TRUE); - if (pWnd->GetScrollBarVert() != NULLHANDLE) - ::WinInvalidateRect(pWnd->GetScrollBarVert(), NULL, TRUE); - } - } - else - rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); - } - - return rc; -} // end of wxWndProc - -// -// We will add (or delete) messages we need to handle at this default -// level as we go -// -MRESULT wxWindowOS2::OS2WindowProc( WXUINT uMsg, - WXWPARAM wParam, - WXLPARAM lParam ) -{ - // - // Did we process the uMsg? - // - bool bProcessed = false; - MRESULT mResult; - - // - // For most messages we should return 0 when we do process the message - // - mResult = (MRESULT)0; - - switch (uMsg) - { - case WM_CREATE: - { - bool bMayCreate; - - bProcessed = HandleCreate( (WXLPCREATESTRUCT)lParam - ,&bMayCreate - ); - if (bProcessed) - { - // - // Return 0 to bAllow window creation - // - mResult = (MRESULT)(bMayCreate ? 0 : -1); - } - } - break; - - case WM_DESTROY: - HandleDestroy(); - bProcessed = true; - break; - - case WM_MOVE: - bProcessed = HandleMove( LOWORD(lParam) - ,HIWORD(lParam) - ); - break; - - case WM_SIZE: - bProcessed = HandleSize( LOWORD(lParam) - ,HIWORD(lParam) - ,(WXUINT)wParam - ); - break; - - case WM_WINDOWPOSCHANGED: - - // - // Dialogs under OS/2 do not get WM_SIZE events at all. - // Instead they get this, which can function much like WM_SIZE - // PSWP contains the new sizes and positioning, PSWP+1 the old - // We use this because ADJUSTWINDOWPOS comes BEFORE the new - // position is added and our auto layout does a WinQueryWindowRect - // to get the CURRENT client size. That is the size used to position - // child controls, so we need to already be sized - // in order to get the child controls positoned properly. - // - if (IsKindOf(CLASSINFO(wxDialog)) || IsKindOf(CLASSINFO(wxFrame))) - { - PSWP pSwp = (PSWP)PVOIDFROMMP(wParam); - PSWP pSwp2 = pSwp++; - - if (!(pSwp->cx == pSwp2->cx && - pSwp->cy == pSwp2->cy)) - bProcessed = HandleSize( pSwp->cx - ,pSwp->cy - ,(WXUINT)lParam - ); - if (IsKindOf(CLASSINFO(wxFrame))) - { - wxFrame* pFrame = wxDynamicCast(this, wxFrame); - - if (pFrame) - { - if (pFrame->GetStatusBar()) - pFrame->PositionStatusBar(); - if (pFrame->GetToolBar()) - pFrame->PositionToolBar(); - } - } - } - break; - - case WM_ACTIVATE: - { - WXWORD wState; - WXHWND hWnd; - - UnpackActivate( wParam - ,lParam - ,&wState - ,&hWnd - ); - - bProcessed = HandleActivate( wState - ,(WXHWND)hWnd - ); - bProcessed = false; - } - break; - - case WM_SETFOCUS: - if (SHORT1FROMMP((MPARAM)lParam) == TRUE) - bProcessed = HandleSetFocus((WXHWND)(HWND)wParam); - else - bProcessed = HandleKillFocus((WXHWND)(HWND)wParam); - break; - - case WM_PAINT: - bProcessed = HandlePaint(); - break; - - case WM_CLOSE: - // - // Don't let the DefWindowProc() destroy our window - we'll do it - // ourselves in ~wxWindow - // - bProcessed = true; - mResult = (MRESULT)TRUE; - break; - - case WM_SHOW: - bProcessed = HandleShow(wParam != 0, (int)lParam); - break; - - // - // Under OS2 PM Joysticks are treated just like mouse events - // The "Motion" events will be prevelent in joysticks - // - case WM_MOUSEMOVE: - case WM_BUTTON1DOWN: - case WM_BUTTON1UP: - case WM_BUTTON1DBLCLK: - case WM_BUTTON1MOTIONEND: - case WM_BUTTON1MOTIONSTART: - case WM_BUTTON2DOWN: - case WM_BUTTON2UP: - case WM_BUTTON2DBLCLK: - case WM_BUTTON2MOTIONEND: - case WM_BUTTON2MOTIONSTART: - case WM_BUTTON3DOWN: - case WM_BUTTON3UP: - case WM_BUTTON3DBLCLK: - case WM_BUTTON3MOTIONEND: - case WM_BUTTON3MOTIONSTART: - { - short nX = LOWORD(wParam); - short nY = HIWORD(wParam); - - // - // Redirect the event to a static control if necessary - // - if (this == GetCapture()) - { - bProcessed = HandleMouseEvent( uMsg - ,nX - ,nY - ,(WXUINT)SHORT2FROMMP(lParam) - ); - } - else - { - wxWindow* pWin = FindWindowForMouseEvent( this - ,&nX - ,&nY - ); - if (!pWin->IsOfStandardClass()) - { - if (uMsg == WM_BUTTON1DOWN && pWin->CanAcceptFocus() ) - pWin->SetFocus(); - } - bProcessed = pWin->HandleMouseEvent( uMsg - ,nX - ,nY - ,(WXUINT)SHORT2FROMMP(lParam) - ); - } - } - break; - - case WM_SYSCOMMAND: - bProcessed = HandleSysCommand(wParam, lParam); - break; - - case WM_COMMAND: - { - WORD id, cmd; - WXHWND hwnd; - UnpackCommand(wParam, lParam, &id, &hwnd, &cmd); - - bProcessed = HandleCommand(id, cmd, hwnd); - } - break; - - // - // For these messages we must return TRUE if process the message - // - case WM_DRAWITEM: - case WM_MEASUREITEM: - { - int nIdCtrl = (UINT)wParam; - - if ( uMsg == WM_DRAWITEM ) - { - bProcessed = OS2OnDrawItem(nIdCtrl, - (WXDRAWITEMSTRUCT *)lParam); - } - else - { - return MRFROMLONG(OS2OnMeasureItem( nIdCtrl - ,(WXMEASUREITEMSTRUCT *)lParam - )); - } - - if ( bProcessed ) - mResult = (MRESULT)TRUE; - } - break; - - case WM_QUERYDLGCODE: - if (!IsOfStandardClass()) - { - if ( m_lDlgCode ) - { - mResult = (MRESULT)m_lDlgCode; - bProcessed = true; - } - } - // - //else: get the dlg code from the DefWindowProc() - // - break; - - // - // In OS/2 PM all keyboard events are of the WM_CHAR type. Virtual key and key-up - // and key-down events are obtained from the WM_CHAR params. - // - case WM_CHAR: - { - USHORT uKeyFlags = SHORT1FROMMP((MPARAM)wParam); - - if (uKeyFlags & KC_KEYUP) - { - //TODO: check if the cast to WXWORD isn't causing trouble - bProcessed = HandleKeyUp(wParam, lParam); - break; - } - else // keydown event - { - m_bLastKeydownProcessed = false; - // - // If this has been processed by an event handler, - // return 0 now (we've handled it). DON't RETURN - // we still need to process further - // - m_bLastKeydownProcessed = HandleKeyDown(wParam, lParam); - if (uKeyFlags & KC_VIRTUALKEY) - { - USHORT uVk = SHORT2FROMMP((MPARAM)lParam); - - // - // We consider these message "not interesting" to OnChar - // - switch(uVk) - { - case VK_SHIFT: - case VK_CTRL: - case VK_MENU: - case VK_CAPSLOCK: - case VK_NUMLOCK: - case VK_SCRLLOCK: - bProcessed = true; - break; - - // Avoid duplicate messages to OnChar for these ASCII keys: they - // will be translated by TranslateMessage() and received in WM_CHAR - case VK_ESC: - case VK_ENTER: - case VK_BACKSPACE: - case VK_TAB: - // But set processed to false, not true to still pass them to - // the control's default window proc - otherwise built-in - // keyboard handling won't work - bProcessed = false; - break; - - default: - bProcessed = HandleChar(wParam, lParam); - } - break; - } - else // WM_CHAR -- Always an ASCII character - { - if (m_bLastKeydownProcessed) - { - // - // The key was handled in the EVT_KEY_DOWN and handling - // a key in an EVT_KEY_DOWN handler is meant, by - // design, to prevent EVT_CHARs from happening - // - m_bLastKeydownProcessed = false; - bProcessed = true; - } - else // do generate a CHAR event - { - bProcessed = HandleChar(wParam, lParam, true); - break; - } - } - } - } - - case WM_HSCROLL: - case WM_VSCROLL: - { - WXWORD wCode; - WXWORD wPos; - WXHWND hWnd; - UnpackScroll( wParam - ,lParam - ,&wCode - ,&wPos - ,&hWnd - ); - - bProcessed = OS2OnScroll( uMsg == WM_HSCROLL ? wxHORIZONTAL - : wxVERTICAL - ,wCode - ,wPos - ,hWnd - ); - } - break; - - case WM_CONTROL: - switch(SHORT2FROMMP(wParam)) - { - case BN_PAINT: - { - HWND hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam)); - wxWindowOS2* pWin = wxFindWinFromHandle(hWnd); - - if (!pWin) - { - bProcessed = false; - break; - } - if (pWin->IsKindOf(CLASSINFO(wxBitmapButton))) - { - wxBitmapButton* pBitmapButton = wxDynamicCast(pWin, wxBitmapButton); - - pBitmapButton->OS2OnDraw((WXDRAWITEMSTRUCT *)lParam); - } - return 0; - } - // break; - - case BKN_PAGESELECTEDPENDING: - { - PPAGESELECTNOTIFY pPage = (PPAGESELECTNOTIFY)lParam; - - if ((pPage->ulPageIdNew != pPage->ulPageIdCur) && - (pPage->ulPageIdNew > 0L && pPage->ulPageIdCur > 0L)) - { - wxWindowOS2* pWin = wxFindWinFromHandle(pPage->hwndBook); - wxBookCtrlEvent vEvent( wxEVT_NOTEBOOK_PAGE_CHANGED - ,(int)SHORT1FROMMP(wParam) - ,(int)pPage->ulPageIdNew - ,(int)pPage->ulPageIdCur - ); - if (!pWin) - { - bProcessed = false; - break; - } - if (pWin->IsKindOf(CLASSINFO(wxNotebook))) - { - wxNotebook* pNotebook = wxDynamicCast(pWin, wxNotebook); - - vEvent.SetEventObject(pWin); - pNotebook->OnSelChange(vEvent); - bProcessed = true; - } - else - bProcessed = false; - } - else - bProcessed = false; - } - break; - - case CBN_LBSELECT: - case BN_CLICKED: // Dups as LN_SELECT and CBN_LBSELECT - { - HWND hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam)); - wxWindowOS2* pWin = wxFindWinFromHandle(hWnd); - - if (!pWin) - { - bProcessed = false; - break; - } - // - // Simulate a WM_COMMAND here, as wxWidgets expects all control - // button clicks to generate WM_COMMAND msgs, not WM_CONTROL - // - if (pWin->IsKindOf(CLASSINFO(wxRadioBox))) - { - wxRadioBox* pRadioBox = wxDynamicCast(pWin, wxRadioBox); - - pRadioBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) - ,(WXWORD)SHORT1FROMMP(wParam) - ); - } - if (pWin->IsKindOf(CLASSINFO(wxRadioButton))) - { - wxRadioButton* pRadioButton = wxDynamicCast(pWin, wxRadioButton); - - pRadioButton->OS2Command( (WXUINT)SHORT2FROMMP(wParam) - ,(WXWORD)SHORT1FROMMP(wParam) - ); - } - if (pWin->IsKindOf(CLASSINFO(wxCheckBox))) - { - wxCheckBox* pCheckBox = wxDynamicCast(pWin, wxCheckBox); - - pCheckBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) - ,(WXWORD)SHORT1FROMMP(wParam) - ); - } - if (pWin->IsKindOf(CLASSINFO(wxListBox))) - { - wxListBox* pListBox = wxDynamicCast(pWin, wxListBox); - - pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) - ,(WXWORD)SHORT1FROMMP(wParam) - ); - if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW) - Refresh(); - } - if (pWin->IsKindOf(CLASSINFO(wxComboBox))) - { - wxComboBox* pComboBox = wxDynamicCast(pWin, wxComboBox); - - pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) - ,(WXWORD)SHORT1FROMMP(wParam) - ); - } - if (pWin->IsKindOf(CLASSINFO(wxChoice))) - { - wxChoice* pChoice = wxDynamicCast(pWin, wxChoice); - - pChoice->OS2Command( (WXUINT)SHORT2FROMMP(wParam) - ,(WXWORD)SHORT1FROMMP(wParam) - ); - } - return 0; - } - // break; - - case LN_ENTER: - { - HWND hWnd = HWNDFROMMP(lParam); - wxWindowOS2* pWin = wxFindWinFromHandle(hWnd); - - if (!pWin) - { - bProcessed = false; - break; - } - // - // Simulate a WM_COMMAND here, as wxWidgets expects all control - // button clicks to generate WM_COMMAND msgs, not WM_CONTROL - // - if (pWin->IsKindOf(CLASSINFO(wxListBox))) - { - wxListBox* pListBox = wxDynamicCast(pWin, wxListBox); - - pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) - ,(WXWORD)SHORT1FROMMP(wParam) - ); - if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW) - Refresh(); - - } - if (pWin->IsKindOf(CLASSINFO(wxComboBox))) - { - wxComboBox* pComboBox = wxDynamicCast(pWin, wxComboBox); - - pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam) - ,(WXWORD)SHORT1FROMMP(wParam) - ); - } - return 0; - } - // break; - - case SPBN_UPARROW: - case SPBN_DOWNARROW: - case SPBN_CHANGE: - { - char zVal[10]; - long lVal; - - ::WinSendMsg( HWNDFROMMP(lParam) - ,SPBM_QUERYVALUE - ,&zVal[0] - ,MPFROM2SHORT( (USHORT)10 - ,(USHORT)SPBQ_UPDATEIFVALID - ) - ); - lVal = atol(zVal); - bProcessed = OS2OnScroll( wxVERTICAL - ,(WXWORD)SHORT2FROMMP(wParam) - ,(WXWORD)lVal - ,HWNDFROMMP(lParam) - ); - } - break; - - case SLN_SLIDERTRACK: - { - HWND hWnd = ::WinWindowFromID(GetHWND(), SHORT1FROMMP(wParam)); - wxWindowOS2* pChild = wxFindWinFromHandle(hWnd); - - if (!pChild) - { - bProcessed = false; - break; - } - if (pChild->IsKindOf(CLASSINFO(wxSlider))) - bProcessed = OS2OnScroll( wxVERTICAL - ,(WXWORD)SHORT2FROMMP(wParam) - ,(WXWORD)LONGFROMMP(lParam) - ,hWnd - ); - } - break; - } - break; - -#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400) - case WM_CTLCOLORCHANGE: - { - bProcessed = HandleCtlColor(&hBrush); - } - break; -#endif - case WM_ERASEBACKGROUND: - // - // Returning TRUE to requestw PM to paint the window background - // in SYSCLR_WINDOW. We don't really want that - // - bProcessed = HandleEraseBkgnd((WXHDC)(HPS)wParam); - mResult = (MRESULT)(FALSE); - break; - - // the return value for this message is ignored - case WM_SYSCOLORCHANGE: - bProcessed = HandleSysColorChange(); - break; - - case WM_REALIZEPALETTE: - bProcessed = HandlePaletteChanged(); - break; - - // move all drag and drops to wxDrg - case WM_ENDDRAG: - bProcessed = HandleEndDrag(wParam); - break; - - case WM_INITDLG: - bProcessed = HandleInitDialog((WXHWND)(HWND)wParam); - - if ( bProcessed ) - { - // we never set focus from here - mResult = (MRESULT)FALSE; - } - break; - - // wxFrame specific message - case WM_MINMAXFRAME: - bProcessed = HandleGetMinMaxInfo((PSWP)wParam); - break; - - case WM_SYSVALUECHANGED: - // TODO: do something - mResult = (MRESULT)TRUE; - break; - - // - // Comparable to WM_SETPOINTER for windows, only for just controls - // - case WM_CONTROLPOINTER: - bProcessed = HandleSetCursor( SHORT1FROMMP(wParam) // Control ID - ,(HWND)lParam // Cursor Handle - ); - if (bProcessed ) - { - // - // Returning TRUE stops the DefWindowProc() from further - // processing this message - exactly what we need because we've - // just set the cursor. - // - mResult = (MRESULT)TRUE; - } - break; - -#if wxUSE_MENUS_NATIVE - case WM_MENUEND: - if (wxCurrentPopupMenu) - { - if (GetHmenuOf(wxCurrentPopupMenu) == (HWND)lParam) - { - // Break out of msg loop in DoPopupMenu - ::WinPostMsg((HWND)lParam,WM_COMMAND,wParam,0); - } - } - break; -#endif // wxUSE_MENUS_NATIVE - - } - if (!bProcessed) - { -#ifdef __WXDEBUG__ - wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."), - wxGetMessageName(uMsg)); -#endif // __WXDEBUG__ - if (IsKindOf(CLASSINFO(wxFrame))) - mResult = ::WinDefWindowProc(m_hWnd, uMsg, wParam, lParam); - else if (IsKindOf(CLASSINFO(wxDialog))) - mResult = ::WinDefDlgProc( m_hWnd, uMsg, wParam, lParam); - else - mResult = OS2DefWindowProc(uMsg, wParam, lParam); - } - return mResult; -} // end of wxWindowOS2::OS2WindowProc - -// ---------------------------------------------------------------------------- -// wxWindow <-> HWND map -// ---------------------------------------------------------------------------- - -wxWinHashTable *wxWinHandleHash = NULL; - -wxWindow* wxFindWinFromHandle( - WXHWND hWnd -) -{ - return (wxWindow *)wxWinHandleHash->Get((long)hWnd); -} // end of wxFindWinFromHandle - -void wxAssociateWinWithHandle( - HWND hWnd -, wxWindowOS2* pWin -) -{ - // - // Adding NULL hWnd is (first) surely a result of an error and - // (secondly) breaks menu command processing - // - wxCHECK_RET( hWnd != (HWND)NULL, - wxT("attempt to add a NULL hWnd to window list ignored") ); - - wxWindow* pOldWin = wxFindWinFromHandle((WXHWND) hWnd); - - if (pOldWin && (pOldWin != pWin)) - { - wxString Newstr(pWin->GetClassInfo()->GetClassName()); - wxString Oldstr(pOldWin->GetClassInfo()->GetClassName()); - wxLogError( wxT("Bug! New window of class %s has same HWND %X as old window of class %s"), - Newstr.c_str(), - (int)hWnd, - Oldstr.c_str() - ); - } - else if (!pOldWin) - { - wxWinHandleHash->Put( (long)hWnd - ,(wxWindow *)pWin - ); - } -} // end of wxAssociateWinWithHandle - -void wxRemoveHandleAssociation( wxWindowOS2* pWin ) -{ - wxWinHandleHash->Delete((long)pWin->GetHWND()); -} // end of wxRemoveHandleAssociation - -// -// Default destroyer - override if you destroy it in some other way -// (e.g. with MDI child windows) -// -void wxWindowOS2::OS2DestroyWindow() -{ -} - -bool wxWindowOS2::OS2GetCreateWindowCoords( const wxPoint& rPos, - const wxSize& rSize, - int& rnX, - int& rnY, - int& rnWidth, - int& rnHeight ) const -{ - bool bNonDefault = false; - static const int DEFAULT_Y = 200; - static const int DEFAULT_H = 250; - - if (rPos.x == wxDefaultCoord) - { - rnX = rnY = CW_USEDEFAULT; - } - else - { - rnX = rPos.x; - rnY = rPos.y == wxDefaultCoord ? DEFAULT_Y : rPos.y; - bNonDefault = true; - } - if (rSize.x == wxDefaultCoord) - { - rnWidth = rnHeight = CW_USEDEFAULT; - } - else - { - rnWidth = rSize.x; - rnHeight = rSize.y == wxDefaultCoord ? DEFAULT_H : rSize.y; - bNonDefault = true; - } - return bNonDefault; -} // end of wxWindowOS2::OS2GetCreateWindowCoords - -WXHWND wxWindowOS2::OS2GetParent() const -{ - return m_parent ? m_parent->GetHWND() : NULL; -} - -bool wxWindowOS2::OS2Create( PSZ zClass, - const wxChar* zTitle, - WXDWORD dwStyle, - const wxPoint& rPos, - const wxSize& rSize, - void* pCtlData, - WXDWORD WXUNUSED(dwExStyle), - bool bIsChild ) -{ - ERRORID vError; - wxString sError; - int nX = 0L; - int nY = 0L; - int nWidth = 0L; - int nHeight = 0L; - long lControlId = 0L; - wxWindowCreationHook vHook(this); - wxString sClassName((wxChar*)zClass); - wxString sTitle(zTitle ? zTitle : wxEmptyString); - - OS2GetCreateWindowCoords( rPos - ,rSize - ,nX - ,nY - ,nWidth - ,nHeight - ); - - if (bIsChild) - { - lControlId = GetId(); - if (GetWindowStyleFlag() & wxCLIP_SIBLINGS) - { - dwStyle |= WS_CLIPSIBLINGS; - } - } - // - // For each class "Foo" we have we also have "FooNR" ("no repaint") class - // which is the same but without CS_[HV]REDRAW class styles so using it - // ensures that the window is not fully repainted on each resize - // - if (!HasFlag(wxFULL_REPAINT_ON_RESIZE)) - { - sClassName += wxT("NR"); - } - m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent() - ,sClassName.c_str() - ,sTitle.c_str() - ,(ULONG)dwStyle - ,(LONG)0L - ,(LONG)0L - ,(LONG)0L - ,(LONG)0L - ,NULLHANDLE - ,HWND_TOP - ,(ULONG)lControlId - ,pCtlData - ,NULL - ); - if (!m_hWnd) - { - vError = ::WinGetLastError(wxGetInstance()); - sError = wxPMErrorToStr(vError); - return false; - } - SubclassWin(m_hWnd); - SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - - LONG lColor = (LONG)m_backgroundColour.GetPixel(); - - if (!::WinSetPresParam( m_hWnd - ,PP_BACKGROUNDCOLOR - ,sizeof(LONG) - ,(PVOID)&lColor - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Error creating frame. Error: %s\n"), sError.c_str()); - return false; - } - SetSize( nX - ,nY - ,nWidth - ,nHeight - ); - return true; -} // end of wxWindowOS2::OS2Create - -// =========================================================================== -// OS2 PM message handlers -// =========================================================================== - -// --------------------------------------------------------------------------- -// window creation/destruction -// --------------------------------------------------------------------------- - -bool wxWindowOS2::HandleCreate( WXLPCREATESTRUCT WXUNUSED(vCs), - bool* pbMayCreate ) -{ - wxWindowCreateEvent vEvent((wxWindow*)this); - - (void)HandleWindowEvent(vEvent); - *pbMayCreate = true; - return true; -} // end of wxWindowOS2::HandleCreate - -bool wxWindowOS2::HandleDestroy() -{ - wxWindowDestroyEvent vEvent((wxWindow*)this); - vEvent.SetId(GetId()); - (void)HandleWindowEvent(vEvent); - - // - // Delete our drop target if we've got one - // -#if wxUSE_DRAG_AND_DROP - wxDELETE(m_dropTarget); -#endif // wxUSE_DRAG_AND_DROP - - // - // WM_DESTROY handled - // - return true; -} // end of wxWindowOS2::HandleDestroy - -// --------------------------------------------------------------------------- -// activation/focus -// --------------------------------------------------------------------------- -void wxWindowOS2::OnSetFocus( - wxFocusEvent& rEvent -) -{ - rEvent.Skip(); -} // end of wxWindowOS2::OnSetFocus - -bool wxWindowOS2::HandleActivate( - int nState -, WXHWND WXUNUSED(hActivate) -) -{ - wxActivateEvent vEvent( wxEVT_ACTIVATE - ,(bool)nState - ,m_windowId - ); - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleActivate - -bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) ) -{ - // - // Notify the parent keeping track of focus for the kbd navigation - // purposes that we got it - // - wxChildFocusEvent vEventFocus((wxWindow *)this); - (void)HandleWindowEvent(vEventFocus); - -#if wxUSE_CARET - // - // Deal with caret - // - if (m_caret) - { - m_caret->OnSetFocus(); - } -#endif // wxUSE_CARET - -#if wxUSE_TEXTCTRL - // If it's a wxTextCtrl don't send the event as it will be done - // after the control gets to process it from EN_FOCUS handler - if ( wxDynamicCastThis(wxTextCtrl) ) - { - return false; - } -#endif // wxUSE_TEXTCTRL - - wxFocusEvent vEvent(wxEVT_SET_FOCUS, m_windowId); - - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleSetFocus - -bool wxWindowOS2::HandleKillFocus( WXHWND hWnd ) -{ -#if wxUSE_CARET - // - // Deal with caret - // - if (m_caret) - { - m_caret->OnKillFocus(); - } -#endif // wxUSE_CARET - -#if wxUSE_TEXTCTRL - // - // If it's a wxTextCtrl don't send the event as it will be done - // after the control gets to process it. - // - wxTextCtrl* pCtrl = wxDynamicCastThis(wxTextCtrl); - - if (pCtrl) - { - return false; - } -#endif - - // - // Don't send the event when in the process of being deleted. This can - // only cause problems if the event handler tries to access the object. - // - if ( m_isBeingDeleted ) - { - return false; - } - - wxFocusEvent vEvent( wxEVT_KILL_FOCUS - ,m_windowId - ); - - vEvent.SetEventObject(this); - - // - // wxFindWinFromHandle() may return NULL, it is ok - // - vEvent.SetWindow(wxFindWinFromHandle(hWnd)); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleKillFocus - -// --------------------------------------------------------------------------- -// miscellaneous -// --------------------------------------------------------------------------- - -bool wxWindowOS2::HandleShow( - bool bShow -, int WXUNUSED(nStatus) -) -{ - wxShowEvent vEvent(GetId(), bShow); - - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleShow - -bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) ) -{ - wxInitDialogEvent vEvent(GetId()); - - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleInitDialog - -bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam)) -{ - // TODO: We'll handle drag and drop later - return false; -} - -bool wxWindowOS2::HandleSetCursor( USHORT WXUNUSED(vId), - WXHWND hPointer ) -{ - // - // Under OS/2 PM this allows the pointer to be changed - // as it passes over a control - // - ::WinSetPointer(HWND_DESKTOP, (HPOINTER)hPointer); - return true; -} // end of wxWindowOS2::HandleSetCursor - -// --------------------------------------------------------------------------- -// owner drawn stuff -// --------------------------------------------------------------------------- -bool wxWindowOS2::OS2OnDrawItem( int vId, - WXDRAWITEMSTRUCT* pItemStruct ) -{ -#if wxUSE_OWNER_DRAWN - wxClientDC vDc(this); - -#if wxUSE_MENUS_NATIVE - // - // Is it a menu item? - // - if (vId == 0) - { - ERRORID vError; - wxString sError; - POWNERITEM pMeasureStruct = (POWNERITEM)pItemStruct; - wxFrame* pFrame = (wxFrame*)this; - wxMenuItem* pMenuItem = pFrame->GetMenuBar()->FindItem(pMeasureStruct->idItem, pMeasureStruct->hItem); - HDC hDC = ::GpiQueryDevice(pMeasureStruct->hps); - wxRect vRect( pMeasureStruct->rclItem.xLeft - ,pMeasureStruct->rclItem.yBottom - ,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft - ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom - ); - - wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl(); - impl->SetHDC( hDC, false ); - impl->SetHPS( pMeasureStruct->hps ); - // - // Load the wxWidgets Pallete and set to RGB mode - // - if (!::GpiCreateLogColorTable( pMeasureStruct->hps - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Unable to set current color table (1). Error: %s\n"), sError.c_str()); - } - // - // Set the color table to RGB mode - // - if (!::GpiCreateLogColorTable( pMeasureStruct->hps - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError(wxT("Unable to set current color table (2). Error: %s\n"), sError.c_str()); - } - - wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE ); - - int eAction = 0; - int eStatus = 0; - - if (pMeasureStruct->fsAttribute == pMeasureStruct->fsAttributeOld) - { - // - // Entire Item needs to be redrawn (either it has reappeared from - // behind another window or is being displayed for the first time - // - eAction = wxOwnerDrawn::wxODDrawAll; - - if (pMeasureStruct->fsAttribute & MIA_HILITED) - { - // - // If it is currently selected we let the system handle it - // - eStatus |= wxOwnerDrawn::wxODSelected; - } - if (pMeasureStruct->fsAttribute & MIA_CHECKED) - { - // - // If it is currently checked we draw our own - // - eStatus |= wxOwnerDrawn::wxODChecked; - pMeasureStruct->fsAttributeOld = pMeasureStruct->fsAttribute &= ~MIA_CHECKED; - } - if (pMeasureStruct->fsAttribute & MIA_DISABLED) - { - // - // If it is currently disabled we let the system handle it - // - eStatus |= wxOwnerDrawn::wxODDisabled; - } - // - // Don't really care about framed (indicationg focus) or NoDismiss - // - } - else - { - if (pMeasureStruct->fsAttribute & MIA_HILITED) - { - eAction = wxOwnerDrawn::wxODDrawAll; - eStatus |= wxOwnerDrawn::wxODSelected; - // - // Keep the system from trying to highlight with its bogus colors - // - pMeasureStruct->fsAttributeOld = pMeasureStruct->fsAttribute &= ~MIA_HILITED; - } - else if (!(pMeasureStruct->fsAttribute & MIA_HILITED)) - { - eAction = wxOwnerDrawn::wxODDrawAll; - eStatus = 0; - // - // Keep the system from trying to highlight with its bogus colors - // - pMeasureStruct->fsAttribute = pMeasureStruct->fsAttributeOld &= ~MIA_HILITED; - } - else - { - // - // For now we don't care about anything else - // just ignore the entire message! - // - return true; - } - } - // - // Now redraw the item - // - return(pMenuItem->OnDrawItem( vDc - ,vRect - ,(wxOwnerDrawn::wxODAction)eAction - ,(wxOwnerDrawn::wxODStatus)eStatus - )); - // - // leave the fsAttribute and fsOldAttribute unchanged. If different, - // the system will do the highlight or fraeming or disabling for us, - // otherwise, we'd have to do it ourselves. - // - } -#endif // wxUSE_MENUS_NATIVE - - wxWindow* pItem = FindItem(vId); - - if (pItem && pItem->IsKindOf(CLASSINFO(wxControl))) - { - return ((wxControl *)pItem)->OS2OnDraw(pItemStruct); - } -#else - vId = vId; - pItemStruct = pItemStruct; -#endif - return false; -} // end of wxWindowOS2::OS2OnDrawItem - -long wxWindowOS2::OS2OnMeasureItem( int lId, - WXMEASUREITEMSTRUCT* pItemStruct ) -{ -#if wxUSE_OWNER_DRAWN - // - // Is it a menu item? - // - if (lId == 65536) // I really don't like this...has to be a better indicator - { - if (IsKindOf(CLASSINFO(wxFrame))) // we'll assume if Frame then a menu - { - size_t nWidth; - size_t nHeight; - POWNERITEM pMeasureStruct = (POWNERITEM)pItemStruct; - wxFrame* pFrame = (wxFrame*)this; - wxMenuItem* pMenuItem = pFrame->GetMenuBar()->FindItem(pMeasureStruct->idItem, pMeasureStruct->hItem); - - wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE ); - nWidth = 0L; - nHeight = 0L; - if (pMenuItem->OnMeasureItem( &nWidth - ,&nHeight - )) - { - MRESULT mRc; - - pMeasureStruct->rclItem.xRight = nWidth; - pMeasureStruct->rclItem.xLeft = 0L; - pMeasureStruct->rclItem.yTop = nHeight; - pMeasureStruct->rclItem.yBottom = 0L; - mRc = MRFROM2SHORT(nHeight, nWidth); - return LONGFROMMR(mRc); - } - return 0L; - } - } - wxWindow* pItem = FindItem(lId); - - if (pItem && pItem->IsKindOf(CLASSINFO(wxControl))) - { - OWNERITEM vItem; - - vItem.idItem = (LONG)pItemStruct; - return ((wxControl *)pItem)->OS2OnMeasure((WXMEASUREITEMSTRUCT*)&vItem); - } -#else - lId = lId; - pItemStruct = pItemStruct; -#endif // wxUSE_OWNER_DRAWN - return FALSE; -} - -// --------------------------------------------------------------------------- -// colours and palettes -// --------------------------------------------------------------------------- - -bool wxWindowOS2::HandleSysColorChange() -{ - wxSysColourChangedEvent vEvent; - - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleSysColorChange - -bool wxWindowOS2::HandleCtlColor( WXHBRUSH* WXUNUSED(phBrush) ) -{ - // - // Not much provided with message. So not sure I can do anything with it - // - return true; -} // end of wxWindowOS2::HandleCtlColor - - -// Define for each class of dialog and control -WXHBRUSH wxWindowOS2::OnCtlColor(WXHDC WXUNUSED(hDC), - WXHWND WXUNUSED(hWnd), - WXUINT WXUNUSED(nCtlColor), - WXUINT WXUNUSED(message), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam)) -{ - return (WXHBRUSH)0; -} - -bool wxWindowOS2::HandlePaletteChanged() -{ - // need to set this to something first - WXHWND hWndPalChange = NULLHANDLE; - - wxPaletteChangedEvent vEvent(GetId()); - - vEvent.SetEventObject(this); - vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange)); - - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandlePaletteChanged - -// -// Responds to colour changes: passes event on to children. -// -void wxWindowOS2::OnSysColourChanged( - wxSysColourChangedEvent& rEvent -) -{ - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - - while (node) - { - // - // Only propagate to non-top-level windows - // - wxWindow* pWin = (wxWindow *)node->GetData(); - - if (pWin->GetParent()) - { - wxSysColourChangedEvent vEvent; - - rEvent.SetEventObject(pWin); - pWin->HandleWindowEvent(vEvent); - } - node = node->GetNext(); - } -} // end of wxWindowOS2::OnSysColourChanged - -// --------------------------------------------------------------------------- -// painting -// --------------------------------------------------------------------------- - -void wxWindow::OnPaint ( - wxPaintEvent& rEvent -) -{ - HDC hDC = (HDC)wxPaintDCImpl::FindDCInCache((wxWindow*) rEvent.GetEventObject()); - - if (hDC != 0) - { - OS2DefWindowProc( (WXUINT)WM_PAINT - ,(WXWPARAM)hDC - ,(WXLPARAM)0 - ); - } -} // end of wxWindow::OnPaint - -bool wxWindowOS2::HandlePaint() -{ - HRGN hRgn; - wxPaintEvent vEvent(m_windowId); - HPS hPS; - bool bProcessed; - - // Create empty region - // TODO: get HPS somewhere else if possible - hPS = ::WinGetPS(GetHwnd()); - hRgn = ::GpiCreateRegion(hPS, 0, NULL); - - if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_ERROR) - { - wxLogLastError(wxT("CreateRectRgn")); - return false; - } - // Get all the rectangles from the region, convert the individual - // rectangles to "the other" coordinate system and reassemble a - // region from the rectangles, to be feed into m_updateRegion. - // - RGNRECT vRgnData; - PRECTL pUpdateRects = NULL; - vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT; - if (::GpiQueryRegionRects( hPS // Pres space - ,hRgn // Handle of region to query - ,NULL // Return all RECTs - ,&vRgnData // Will contain number or RECTs in region - ,NULL // NULL to return number of RECTs - )) - { - pUpdateRects = new RECTL[vRgnData.crcReturned]; - vRgnData.crc = vRgnData.crcReturned; - vRgnData.ircStart = 1; - if (::GpiQueryRegionRects( hPS // Pres space of source - ,hRgn // Handle of source region - ,NULL // Return all RECTs - ,&vRgnData // Operations set to return rects - ,pUpdateRects // Will contain the actual RECTS - )) - { - int height; - RECT vRect; - ::WinQueryWindowRect(GetHwnd(), &vRect); - height = vRect.yTop; - - for(size_t i = 0; i < vRgnData.crc; i++) - { - int rectHeight; - rectHeight = pUpdateRects[i].yTop - pUpdateRects[i].yBottom; - pUpdateRects[i].yBottom = height - pUpdateRects[i].yTop; - pUpdateRects[i].yTop = pUpdateRects[i].yBottom + rectHeight; - } - ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects); - delete [] pUpdateRects; - } - } - m_updateRegion = wxRegion(hRgn, hPS); - - vEvent.SetEventObject(this); - bProcessed = HandleWindowEvent(vEvent); - - if (!bProcessed && - IsKindOf(CLASSINFO(wxPanel)) && - GetChildren().GetCount() == 0 - ) - { - // - // OS/2 needs to process this right here, not by the default proc - // Window's default proc correctly paints everything, OS/2 does not. - // For decorative panels that typically have no children, we draw - // borders. - // - HPS hPS; - RECTL vRect; - - hPS = ::WinBeginPaint( GetHwnd() - ,NULLHANDLE - ,&vRect - ); - if(hPS) - { - ::GpiCreateLogColorTable( hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - ); - ::GpiCreateLogColorTable( hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - ); - if (::WinIsWindowVisible(GetHWND())) - ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); - if (m_dwExStyle) - { - LINEBUNDLE vLineBundle; - - vLineBundle.lColor = 0x00000000; // Black - vLineBundle.usMixMode = FM_OVERPAINT; - vLineBundle.fxWidth = 1; - vLineBundle.lGeomWidth = 1; - vLineBundle.usType = LINETYPE_SOLID; - vLineBundle.usEnd = 0; - vLineBundle.usJoin = 0; - ::GpiSetAttrs( hPS - ,PRIM_LINE - ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE - ,0L - ,&vLineBundle - ); - ::WinQueryWindowRect(GetHwnd(), &vRect); - wxDrawBorder( hPS - ,vRect - ,m_dwExStyle - ); - } - } - ::WinEndPaint(hPS); - bProcessed = true; - } - else if (!bProcessed && - IsKindOf(CLASSINFO(wxPanel)) - ) - { - // - // Panel with children, usually fills a frame client so no borders. - // - HPS hPS; - RECTL vRect; - - hPS = ::WinBeginPaint( GetHwnd() - ,NULLHANDLE - ,&vRect - ); - if(hPS) - { - ::GpiCreateLogColorTable( hPS - ,0L - ,LCOLF_CONSECRGB - ,0L - ,(LONG)wxTheColourDatabase->m_nSize - ,(PLONG)wxTheColourDatabase->m_palTable - ); - ::GpiCreateLogColorTable( hPS - ,0L - ,LCOLF_RGB - ,0L - ,0L - ,NULL - ); - - if (::WinIsWindowVisible(GetHWND())) - ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); - } - ::WinEndPaint(hPS); - bProcessed = true; - } - return bProcessed; -} // end of wxWindowOS2::HandlePaint - -bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC ) -{ - SWP vSwp; - bool rc; - - ::WinQueryWindowPos(GetHwnd(), &vSwp); - if (vSwp.fl & SWP_MINIMIZE) - return true; - - wxClientDC vDC(this); - wxPMDCImpl *impl = (wxPMDCImpl*) vDC.GetImpl(); - impl->SetHDC(hDC); - impl->SetHPS((HPS)hDC); // this is really a PS - - wxEraseEvent vEvent(m_windowId, &vDC); - - vEvent.SetEventObject(this); - - rc = HandleWindowEvent(vEvent); - - impl->SetHPS(NULLHANDLE); - return true; -} // end of wxWindowOS2::HandleEraseBkgnd - -void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent) -{ - RECTL vRect; - wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl(); - HPS hPS = impl->GetHPS(); - APIRET rc; - LONG lColor = m_backgroundColour.GetPixel(); - - rc = ::WinQueryWindowRect(GetHwnd(), &vRect); - rc = ::WinFillRect(hPS, &vRect, lColor); -} // end of wxWindowOS2::OnEraseBackground - -// --------------------------------------------------------------------------- -// moving and resizing -// --------------------------------------------------------------------------- - -bool wxWindowOS2::HandleMinimize() -{ - wxIconizeEvent vEvent(m_windowId); - - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleMinimize - -bool wxWindowOS2::HandleMaximize() -{ - wxMaximizeEvent vEvent(m_windowId); - - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleMaximize - -bool wxWindowOS2::HandleMove( int nX, int nY ) -{ - wxPoint pt(nX, nY); - wxMoveEvent vEvent(pt, m_windowId); - - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleMove - -bool wxWindowOS2::HandleSize( int nWidth, - int nHeight, - WXUINT WXUNUSED(nFlag) ) -{ - wxSize sz(nWidth, nHeight); - wxSizeEvent vEvent(sz, m_windowId); - - vEvent.SetEventObject(this); - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::HandleSize - -bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp ) -{ - POINTL vPoint; - - switch(pSwp->fl) - { - case SWP_MAXIMIZE: - ::WinGetMaxPosition(GetHwnd(), pSwp); - m_maxWidth = pSwp->cx; - m_maxHeight = pSwp->cy; - break; - - case SWP_MINIMIZE: - ::WinGetMinPosition(GetHwnd(), pSwp, &vPoint); - m_minWidth = pSwp->cx; - m_minHeight = pSwp->cy; - break; - - default: - return false; - } - return true; -} // end of wxWindowOS2::HandleGetMinMaxInfo - -// --------------------------------------------------------------------------- -// command messages -// --------------------------------------------------------------------------- -bool wxWindowOS2::HandleCommand( WXWORD wId, - WXWORD wCmd, - WXHWND hControl ) -{ -#if wxUSE_MENUS_NATIVE - if (wxCurrentPopupMenu) - { - wxMenu* pPopupMenu = wxCurrentPopupMenu; - - wxCurrentPopupMenu = NULL; - return pPopupMenu->OS2Command(wCmd, wId); - } -#endif // wxUSE_MENUS_NATIVE - - wxWindow* pWin = FindItem(wId); - - if (!pWin) - { - pWin = wxFindWinFromHandle(hControl); - } - - if (pWin) - return pWin->OS2Command(wCmd, wId); - - return false; -} // end of wxWindowOS2::HandleCommand - -bool wxWindowOS2::HandleSysCommand( WXWPARAM wParam, - WXLPARAM WXUNUSED(lParam) ) -{ - // - // 4 bits are reserved - // - switch (SHORT1FROMMP(wParam)) - { - case SC_MAXIMIZE: - return HandleMaximize(); - - case SC_MINIMIZE: - return HandleMinimize(); - } - return false; -} // end of wxWindowOS2::HandleSysCommand - -// --------------------------------------------------------------------------- -// mouse events -// --------------------------------------------------------------------------- -//TODO: check against MSW -void wxWindowOS2::InitMouseEvent( - wxMouseEvent& rEvent -, int nX -, int nY -, WXUINT uFlags -) -{ - int nHeight; - DoGetSize(0, &nHeight); - rEvent.m_x = nX; - // Convert to wxWidgets standard coordinate system! - rEvent.m_y = nHeight - nY; - rEvent.m_shiftDown = ((uFlags & KC_SHIFT) != 0); - rEvent.m_controlDown = ((uFlags & KC_CTRL) != 0); - rEvent.m_altDown = ((uFlags & KC_ALT) != 0); - rEvent.m_leftDown = IsKeyDown(VK_BUTTON1); - rEvent.m_middleDown = IsKeyDown(VK_BUTTON3); - rEvent.m_rightDown = IsKeyDown(VK_BUTTON2); - rEvent.SetTimestamp(s_currentMsg.time); - rEvent.SetEventObject(this); - rEvent.SetId(GetId()); - -#if wxUSE_MOUSEEVENT_HACK - m_lastMouseX = nX; - m_lastMouseY = nY; - m_lastMouseEvent = rEvent.GetEventType(); -#endif // wxUSE_MOUSEEVENT_HACK -} // end of wxWindowOS2::InitMouseEvent - -bool wxWindowOS2::HandleMouseEvent( WXUINT uMsg, - int nX, - int nY, - WXUINT uFlags ) -{ - bool bProcessed = false; - - // - // The mouse events take consecutive IDs from WM_MOUSEFIRST to - // WM_MOUSELAST, so it's enough to subtract WM_MOUSEMOVE == WM_MOUSEFIRST - // from the message id and take the value in the table to get wxWin event - // id - // - static const wxEventType eventsMouse[] = - { - wxEVT_MOTION, - wxEVT_LEFT_DOWN, - wxEVT_LEFT_UP, - wxEVT_LEFT_DCLICK, - wxEVT_RIGHT_DOWN, - wxEVT_RIGHT_UP, - wxEVT_RIGHT_DCLICK, - wxEVT_MIDDLE_DOWN, - wxEVT_MIDDLE_UP, - wxEVT_MIDDLE_DCLICK - }; - - // Bounds check - if ((uMsg >= WM_MOUSEMOVE) && (uMsg <= WM_BUTTON3DBLCLK)) - { - wxMouseEvent vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]); - - InitMouseEvent( vEvent - ,nX - ,nY - ,uFlags - ); - - bProcessed = HandleWindowEvent(vEvent); - if (!bProcessed) - { - HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR(); - - if (hCursor != NULLHANDLE) - { - ::WinSetPointer(HWND_DESKTOP, hCursor); - bProcessed = true; - } - } - } - return bProcessed; -} // end of wxWindowOS2::HandleMouseEvent - -bool wxWindowOS2::HandleMouseMove( int nX, - int nY, - WXUINT uFlags ) -{ - if (!m_bMouseInWindow) - { - // - // Generate an ENTER event - // - m_bMouseInWindow = true; - - wxMouseEvent vEvent(wxEVT_ENTER_WINDOW); - - InitMouseEvent( vEvent - ,nX - ,nY - ,uFlags - ); - - (void)HandleWindowEvent(vEvent); - } - return HandleMouseEvent( WM_MOUSEMOVE - ,nX - ,nY - ,uFlags - ); -} // end of wxWindowOS2::HandleMouseMove - -// --------------------------------------------------------------------------- -// keyboard handling -// --------------------------------------------------------------------------- - -// -// Create the key event of the given type for the given key - used by -// HandleChar and HandleKeyDown/Up -// -wxKeyEvent wxWindowOS2::CreateKeyEvent( - wxEventType eType -, int nId -, WXLPARAM lParam -, WXWPARAM wParam -) const -{ - wxKeyEvent vEvent(eType); - - vEvent.SetId(GetId()); - vEvent.m_shiftDown = IsShiftDown(); - vEvent.m_controlDown = IsCtrlDown(); - vEvent.m_altDown = (HIWORD(lParam) & KC_ALT) == KC_ALT; - - vEvent.SetEventObject((wxWindow *)this); // const_cast - vEvent.m_keyCode = nId; - vEvent.m_rawCode = (wxUint32)wParam; - vEvent.m_rawFlags = (wxUint32)lParam; - vEvent.SetTimestamp(s_currentMsg.time); - - // - // Translate the position to client coords - // - POINTL vPoint; - RECTL vRect; - - ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); - ::WinQueryWindowRect( GetHwnd() - ,&vRect - ); - - vPoint.x -= vRect.xLeft; - vPoint.y -= vRect.yBottom; - - vEvent.m_x = vPoint.x; - vEvent.m_y = vPoint.y; - - return vEvent; -} // end of wxWindowOS2::CreateKeyEvent - -// -// isASCII is true only when we're called from WM_CHAR handler and not from -// WM_KEYDOWN one -// -bool wxWindowOS2::HandleChar( WXWPARAM WXUNUSED(wParam), - WXLPARAM lParam, - bool isASCII ) -{ - bool bCtrlDown = false; - int vId; - - if (m_bLastKeydownProcessed) - { - // - // The key was handled in the EVT_KEY_DOWN. Handling a key in an - // EVT_KEY_DOWN handler is meant, by design, to prevent EVT_CHARs - // from happening, so just bail out at this point. - // - m_bLastKeydownProcessed = false; - return true; - } - if (isASCII) - { - // - // If 1 -> 26, translate to either special keycode or just set - // ctrlDown. IOW, Ctrl-C should result in keycode == 3 and - // ControlDown() == true. - // - vId = SHORT1FROMMP(lParam); - if ((vId > 0) && (vId < 27)) - { - switch (vId) - { - case 13: - vId = WXK_RETURN; - break; - - case 8: - vId = WXK_BACK; - break; - - case 9: - vId = WXK_TAB; - break; - - default: - bCtrlDown = true; - break; - } - } - } - else // we're called from WM_KEYDOWN - { - vId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); - if (vId == 0) - return false; - } - - wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR, vId, lParam )); - - if (bCtrlDown) - { - vEvent.m_controlDown = true; - } - - return (HandleWindowEvent(vEvent)); -} - -bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam, - WXLPARAM lParam ) -{ - int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); - - if (!nId) - { - // - // Normal ASCII char - // - nId = SHORT1FROMMP(lParam); - } - - if (nId != -1) - { - wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_DOWN - ,nId - ,(MPARAM)lParam - ,(MPARAM)wParam - )); - - if (HandleWindowEvent(vEvent)) - { - return true; - } - } - return false; -} // end of wxWindowOS2::HandleKeyDown - -bool wxWindowOS2::HandleKeyUp( WXWPARAM wParam, - WXLPARAM lParam ) -{ - int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam)); - - if (!nId) - { - // - // Normal ASCII char - // - nId = CHAR1FROMMP(lParam); - } - - if (nId != -1) - { - wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP - ,nId - ,(MPARAM)lParam - ,(MPARAM)wParam - )); - - if (HandleWindowEvent(vEvent)) - return true; - } - return false; -} // end of wxWindowOS2::HandleKeyUp - -// --------------------------------------------------------------------------- -// joystick -// --------------------------------------------------------------------------- - -// --------------------------------------------------------------------------- -// scrolling -// --------------------------------------------------------------------------- - -bool wxWindowOS2::OS2OnScroll( int nOrientation, - WXWORD wParam, - WXWORD wPos, - WXHWND hControl ) -{ - if (hControl) - { - wxWindow* pChild = wxFindWinFromHandle(hControl); - - if (pChild ) - return pChild->OS2OnScroll( nOrientation - ,wParam - ,wPos - ,hControl - ); - } - - wxScrollWinEvent vEvent; - - vEvent.SetPosition(wPos); - vEvent.SetOrientation(nOrientation); - vEvent.SetEventObject(this); - - switch (wParam) - { - case SB_LINEUP: - vEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP); - break; - - case SB_LINEDOWN: - vEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN); - break; - - case SB_PAGEUP: - vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP); - break; - - case SB_PAGEDOWN: - vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN); - break; - - case SB_SLIDERPOSITION: - vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBRELEASE); - break; - - case SB_SLIDERTRACK: - vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBTRACK); - break; - - default: - return false; - } - return HandleWindowEvent(vEvent); -} // end of wxWindowOS2::OS2OnScroll - -// -// Getting the Y position for a window, like a control, is a real -// pain. There are three situations we must deal with in determining -// the OS2 to wxWidgets Y coordinate. -// -// 1) The controls are created in a dialog. -// This is the easiest since a dialog is created with its original -// size so the standard: Y = ParentHeight - (Y + ControlHeight); -// -// 2) The controls are direct children of a frame -// In this instance the controls are actually children of the Frame's -// client. During creation the frame's client resizes several times -// during creation of the status bar and toolbars. The CFrame class -// will take care of this using its AlterChildPos proc. -// -// 3) The controls are children of a panel, which in turn is a child of -// a frame. -// The panel may be one of many, in which case the same treatment -// as 1 applies. It may be the only child, though. -// This is the nastiest case. A panel is created as the only child of -// the frame and as such, when a frame has only one child, the child is -// expanded to fit the entire client area of the frame. Because the -// controls are created BEFORE this occurs their positions are totally -// whacked and any call to WinQueryWindowPos will return invalid -// coordinates. So for this situation we have to compare the size of -// the panel at control creation time with that of the frame client. If -// they are the same we can use the standard Y position equation. If -// not, then we must use the Frame Client's dimensions to position them -// as that will be the eventual size of the panel after the frame resizes -// it! -// -int wxWindowOS2::GetOS2ParentHeight( wxWindowOS2* pParent ) -{ - if (pParent) - { - // - // Case 1 - // - if (pParent->IsKindOf(CLASSINFO(wxDialog))) - return(pParent->GetClientSize().y); - - // - // Case 2 -- if we are one of the separately built standard Frame - // children, like a statusbar, menubar, or toolbar we want to - // use the frame, itself, for positioning. Otherwise we are - // child window and want to use the Frame's client. - // - else if (pParent->IsKindOf(CLASSINFO(wxFrame))) - { - if (IsKindOf(CLASSINFO(wxStatusBar)) || - IsKindOf(CLASSINFO(wxMenuBar)) || - IsKindOf(CLASSINFO(wxToolBar)) - ) - { - if (IsKindOf(CLASSINFO(wxToolBar))) - { - wxFrame* pFrame = wxDynamicCast(GetParent(), wxFrame); - - if (pFrame->GetToolBar() == this) - return(pParent->GetSize().y); - else - return(pParent->GetClientSize().y); - } - else - return(pParent->GetSize().y); - } - else - return(pParent->GetClientSize().y); - } - // - // Case -- this is for any window that is the sole child of a Frame. - // The grandparent must exist and it must be of type CFrame - // and it's height must be different. Otherwise the standard - // applies. - // - else - return(pParent->GetClientSize().y); - } - else // We must be a child of the screen - { - int nHeight; - wxDisplaySize(NULL,&nHeight); - return(nHeight); - } -} // end of wxWindowOS2::GetOS2ParentHeight - -// -// OS/2 needs a lot extra manipulation to deal with layouts -// for canvas windows, particularly scrolled ones. -// -wxWindowCreationHook::wxWindowCreationHook( - wxWindow* pWinBeingCreated -) -{ - gpWinBeingCreated = pWinBeingCreated; -} // end of wxWindowCreationHook::wxWindowCreationHook - -wxWindowCreationHook::~wxWindowCreationHook() -{ - gpWinBeingCreated = NULL; -} // end of wxWindowCreationHook::~wxWindowCreationHook - -// =========================================================================== -// global functions -// =========================================================================== - -void wxGetCharSize( - WXHWND hWnd -, int* pX -, int* pY -,wxFont* WXUNUSED(pTheFont) -) -{ - FONTMETRICS vFM; - HPS hPS; - BOOL rc; - - hPS =::WinGetPS(hWnd); - - rc = ::GpiQueryFontMetrics(hPS, sizeof(FONTMETRICS), &vFM); - if (rc) - { - if (pX) - *pX = vFM.lAveCharWidth; - if (pY) - *pY = vFM.lEmHeight + vFM.lExternalLeading; - } - else - { - if (pX) - *pX = 10; - if (pY) - *pY = 15; - } - ::WinReleasePS(hPS); -} // end of wxGetCharSize - -// -// Returns 0 if was a normal ASCII value, not a special key. This indicates that -// the key should be ignored by WM_KEYDOWN and processed by WM_CHAR instead. -// -int wxCharCodeOS2ToWX( - int nKeySym -) -{ - int nId = 0; - - switch (nKeySym) - { - case VK_BACKTAB: nId = WXK_BACK; break; - case VK_TAB: nId = WXK_TAB; break; - case VK_CLEAR: nId = WXK_CLEAR; break; - case VK_ENTER: nId = WXK_RETURN; break; - case VK_SHIFT: nId = WXK_SHIFT; break; - case VK_CTRL: nId = WXK_CONTROL; break; - case VK_PAUSE: nId = WXK_PAUSE; break; - case VK_SPACE: nId = WXK_SPACE; break; - case VK_PAGEUP: nId = WXK_PAGEUP; break; - case VK_PAGEDOWN: nId = WXK_PAGEDOWN; break; - case VK_ESC: nId = WXK_ESCAPE; break; - case VK_END: nId = WXK_END; break; - case VK_HOME : nId = WXK_HOME; break; - case VK_LEFT : nId = WXK_LEFT; break; - case VK_UP: nId = WXK_UP; break; - case VK_RIGHT: nId = WXK_RIGHT; break; - case VK_DOWN : nId = WXK_DOWN; break; - case VK_PRINTSCRN: nId = WXK_PRINT; break; - case VK_INSERT: nId = WXK_INSERT; break; - case VK_DELETE: nId = WXK_DELETE; break; - case VK_CAPSLOCK: nId = WXK_CAPITAL; break; - case VK_F1: nId = WXK_F1; break; - case VK_F2: nId = WXK_F2; break; - case VK_F3: nId = WXK_F3; break; - case VK_F4: nId = WXK_F4; break; - case VK_F5: nId = WXK_F5; break; - case VK_F6: nId = WXK_F6; break; - case VK_F7: nId = WXK_F7; break; - case VK_F8: nId = WXK_F8; break; - case VK_F9: nId = WXK_F9; break; - case VK_F10: nId = WXK_F10; break; - case VK_F11: nId = WXK_F11; break; - case VK_F12: nId = WXK_F12; break; - case VK_F13: nId = WXK_F13; break; - case VK_F14: nId = WXK_F14; break; - case VK_F15: nId = WXK_F15; break; - case VK_F16: nId = WXK_F16; break; - case VK_F17: nId = WXK_F17; break; - case VK_F18: nId = WXK_F18; break; - case VK_F19: nId = WXK_F19; break; - case VK_F20: nId = WXK_F20; break; - case VK_F21: nId = WXK_F21; break; - case VK_F22: nId = WXK_F22; break; - case VK_F23: nId = WXK_F23; break; - case VK_F24: nId = WXK_F24; break; - case VK_OEM_1: nId = ';'; break; - case VK_OEM_PLUS: nId = '+'; break; - case VK_OEM_COMMA: nId = ','; break; - case VK_OEM_MINUS: nId = '-'; break; - case VK_OEM_PERIOD: nId = '.'; break; - case VK_OEM_2: nId = '/'; break; - case VK_OEM_3: nId = '~'; break; - case VK_OEM_4: nId = '['; break; - case VK_OEM_5: nId = '\\'; break; - case VK_OEM_6: nId = ']'; break; - case VK_OEM_7: nId = '\''; break; - case VK_NUMLOCK: nId = WXK_NUMLOCK; break; - case VK_SCRLLOCK: nId = WXK_SCROLL; break; - default: - { - return 0; - } - } - return nId; -} // end of wxCharCodeOS2ToWX - -int wxCharCodeWXToOS2( int nId, - bool* bIsVirtual) -{ - int nKeySym = 0; - - if ( bIsVirtual ) - *bIsVirtual = true; - switch (nId) - { - case WXK_CLEAR: nKeySym = VK_CLEAR; break; - case WXK_SHIFT: nKeySym = VK_SHIFT; break; - case WXK_CONTROL: nKeySym = VK_CTRL; break; - case WXK_PAUSE: nKeySym = VK_PAUSE; break; - case WXK_PAGEUP: nKeySym = VK_PAGEUP; break; - case WXK_PAGEDOWN: nKeySym = VK_PAGEDOWN; break; - case WXK_END: nKeySym = VK_END; break; - case WXK_HOME : nKeySym = VK_HOME; break; - case WXK_LEFT : nKeySym = VK_LEFT; break; - case WXK_UP: nKeySym = VK_UP; break; - case WXK_RIGHT: nKeySym = VK_RIGHT; break; - case WXK_DOWN : nKeySym = VK_DOWN; break; - case WXK_PRINT: nKeySym = VK_PRINTSCRN; break; - case WXK_INSERT: nKeySym = VK_INSERT; break; - case WXK_DELETE: nKeySym = VK_DELETE; break; - case WXK_F1: nKeySym = VK_F1; break; - case WXK_F2: nKeySym = VK_F2; break; - case WXK_F3: nKeySym = VK_F3; break; - case WXK_F4: nKeySym = VK_F4; break; - case WXK_F5: nKeySym = VK_F5; break; - case WXK_F6: nKeySym = VK_F6; break; - case WXK_F7: nKeySym = VK_F7; break; - case WXK_F8: nKeySym = VK_F8; break; - case WXK_F9: nKeySym = VK_F9; break; - case WXK_F10: nKeySym = VK_F10; break; - case WXK_F11: nKeySym = VK_F11; break; - case WXK_F12: nKeySym = VK_F12; break; - case WXK_F13: nKeySym = VK_F13; break; - case WXK_F14: nKeySym = VK_F14; break; - case WXK_F15: nKeySym = VK_F15; break; - case WXK_F16: nKeySym = VK_F16; break; - case WXK_F17: nKeySym = VK_F17; break; - case WXK_F18: nKeySym = VK_F18; break; - case WXK_F19: nKeySym = VK_F19; break; - case WXK_F20: nKeySym = VK_F20; break; - case WXK_F21: nKeySym = VK_F21; break; - case WXK_F22: nKeySym = VK_F22; break; - case WXK_F23: nKeySym = VK_F23; break; - case WXK_F24: nKeySym = VK_F24; break; - case WXK_NUMLOCK: nKeySym = VK_NUMLOCK; break; - case WXK_SCROLL: nKeySym = VK_SCRLLOCK; break; - default: - { - if ( bIsVirtual ) - *bIsVirtual = false; - nKeySym = nId; - break; - } - } - return nKeySym; -} // end of wxCharCodeWXToOS2 - - -bool wxGetKeyState(wxKeyCode key) -{ - wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != - WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons")); - - const LONG vk = wxCharCodeWXToOS2(key); - // if the requested key is a LED key, return true if the led is pressed - if ( key == WXK_NUMLOCK || key == WXK_CAPITAL || key == WXK_SCROLL ) - { - // low order bit means LED is highlighted and high order one means the - // key is down; for compatibility with the other ports return true if - // either one is set - return ::WinGetKeyState(HWND_DESKTOP, vk) != 0; - - } - else // normal key - { - return IsKeyDown(vk); - } -} - - -wxWindow* wxGetActiveWindow() -{ - HWND hWnd = ::WinQueryActiveWindow(HWND_DESKTOP); - - if (hWnd != 0) - { - return wxFindWinFromHandle((WXHWND)hWnd); - } - return NULL; -} // end of wxGetActiveWindow - -#ifdef __WXDEBUG__ -const wxChar* wxGetMessageName( int nMessage ) -{ - switch (nMessage) - { - case 0x0000: return wxT("WM_NULL"); - case 0x0001: return wxT("WM_CREATE"); - case 0x0002: return wxT("WM_DESTROY"); - case 0x0004: return wxT("WM_ENABLE"); - case 0x0005: return wxT("WM_SHOW"); - case 0x0006: return wxT("WM_MOVE"); - case 0x0007: return wxT("WM_SIZE"); - case 0x0008: return wxT("WM_ADJUSTWINDOWPOS"); - case 0x0009: return wxT("WM_CALCVALIDRECTS"); - case 0x000A: return wxT("WM_SETWINDOWPARAMS"); - case 0x000B: return wxT("WM_QUERYWINDOWPARAMS"); - case 0x000C: return wxT("WM_HITTEST"); - case 0x000D: return wxT("WM_ACTIVATE"); - case 0x000F: return wxT("WM_SETFOCUS"); - case 0x0010: return wxT("WM_SETSELECTION"); - case 0x0011: return wxT("WM_PPAINT"); - case 0x0012: return wxT("WM_PSETFOCUS"); - case 0x0013: return wxT("WM_PSYSCOLORCHANGE"); - case 0x0014: return wxT("WM_PSIZE"); - case 0x0015: return wxT("WM_PACTIVATE"); - case 0x0016: return wxT("WM_PCONTROL"); - case 0x0020: return wxT("WM_COMMAND"); - case 0x0021: return wxT("WM_SYSCOMMAND"); - case 0x0022: return wxT("WM_HELP"); - case 0x0023: return wxT("WM_PAINT"); - case 0x0024: return wxT("WM_TIMER"); - case 0x0025: return wxT("WM_SEM1"); - case 0x0026: return wxT("WM_SEM2"); - case 0x0027: return wxT("WM_SEM3"); - case 0x0028: return wxT("WM_SEM4"); - case 0x0029: return wxT("WM_CLOSE"); - case 0x002A: return wxT("WM_QUIT"); - case 0x002B: return wxT("WM_SYSCOLORCHANGE"); - case 0x002D: return wxT("WM_SYSVALUECHANGE"); - case 0x002E: return wxT("WM_APPTERMINATENOTIFY"); - case 0x002F: return wxT("WM_PRESPARAMCHANGED"); - // Control notification messages - case 0x0030: return wxT("WM_CONTROL"); - case 0x0031: return wxT("WM_VSCROLL"); - case 0x0032: return wxT("WM_HSCROLL"); - case 0x0033: return wxT("WM_INITMENU"); - case 0x0034: return wxT("WM_MENUSELECT"); - case 0x0035: return wxT("WM_MENUSEND"); - case 0x0036: return wxT("WM_DRAWITEM"); - case 0x0037: return wxT("WM_MEASUREITEM"); - case 0x0038: return wxT("WM_CONTROLPOINTER"); - case 0x003A: return wxT("WM_QUERYDLGCODE"); - case 0x003B: return wxT("WM_INITDLG"); - case 0x003C: return wxT("WM_SUBSTITUTESTRING"); - case 0x003D: return wxT("WM_MATCHMNEMONIC"); - case 0x003E: return wxT("WM_SAVEAPPLICATION"); - case 0x0129: return wxT("WM_CTLCOLORCHANGE"); - case 0x0130: return wxT("WM_QUERYCTLTYPE"); - // Frame messages - case 0x0040: return wxT("WM_FLASHWINDOW"); - case 0x0041: return wxT("WM_FORMATFRAME"); - case 0x0042: return wxT("WM_UPDATEFRAME"); - case 0x0043: return wxT("WM_FOCUSCHANGE"); - case 0x0044: return wxT("WM_SETBORDERSIZE"); - case 0x0045: return wxT("WM_TRACKFRAME"); - case 0x0046: return wxT("WM_MINMAXFRAME"); - case 0x0047: return wxT("WM_SETICON"); - case 0x0048: return wxT("WM_QUERYICON"); - case 0x0049: return wxT("WM_SETACCELTABLE"); - case 0x004A: return wxT("WM_QUERYACCELTABLE"); - case 0x004B: return wxT("WM_TRANSLATEACCEL"); - case 0x004C: return wxT("WM_QUERYTRACKINFO"); - case 0x004D: return wxT("WM_QUERYBORDERSIZE"); - case 0x004E: return wxT("WM_NEXTMENU"); - case 0x004F: return wxT("WM_ERASEBACKGROUND"); - case 0x0050: return wxT("WM_QUERYFRAMEINFO"); - case 0x0051: return wxT("WM_QUERYFOCUSCHAIN"); - case 0x0052: return wxT("WM_OWNERPOSCHANGE"); - case 0x0053: return wxT("WM_CACLFRAMERECT"); - case 0x0055: return wxT("WM_WINDOWPOSCHANGED"); - case 0x0056: return wxT("WM_ADJUSTFRAMEPOS"); - case 0x0059: return wxT("WM_QUERYFRAMECTLCOUNT"); - case 0x005B: return wxT("WM_QUERYHELPINFO"); - case 0x005C: return wxT("WM_SETHELPINFO"); - case 0x005D: return wxT("WM_ERROR"); - case 0x005E: return wxT("WM_REALIZEPALETTE"); - // Clipboard messages - case 0x0060: return wxT("WM_RENDERFMT"); - case 0x0061: return wxT("WM_RENDERALLFMTS"); - case 0x0062: return wxT("WM_DESTROYCLIPBOARD"); - case 0x0063: return wxT("WM_PAINTCLIPBOARD"); - case 0x0064: return wxT("WM_SIZECLIPBOARD"); - case 0x0065: return wxT("WM_HSCROLLCLIPBOARD"); - case 0x0066: return wxT("WM_VSCROLLCLIPBOARD"); - case 0x0067: return wxT("WM_DRAWCLIPBOARD"); - // mouse messages - case 0x0070: return wxT("WM_MOUSEMOVE"); - case 0x0071: return wxT("WM_BUTTON1DOWN"); - case 0x0072: return wxT("WM_BUTTON1UP"); - case 0x0073: return wxT("WM_BUTTON1DBLCLK"); - case 0x0074: return wxT("WM_BUTTON2DOWN"); - case 0x0075: return wxT("WM_BUTTON2UP"); - case 0x0076: return wxT("WM_BUTTON2DBLCLK"); - case 0x0077: return wxT("WM_BUTTON3DOWN"); - case 0x0078: return wxT("WM_BUTTON3UP"); - case 0x0079: return wxT("WM_BUTTON3DBLCLK"); - case 0x007D: return wxT("WM_MOUSEMAP"); - case 0x007E: return wxT("WM_VRNDISABLED"); - case 0x007F: return wxT("WM_VRNENABLED"); - case 0x0410: return wxT("WM_CHORD"); - case 0x0411: return wxT("WM_BUTTON1MOTIONSTART"); - case 0x0412: return wxT("WM_BUTTON1MOTIONEND"); - case 0x0413: return wxT("WM_BUTTON1CLICK"); - case 0x0414: return wxT("WM_BUTTON2MOTIONSTART"); - case 0x0415: return wxT("WM_BUTTON2MOTIONEND"); - case 0x0416: return wxT("WM_BUTTON2CLICK"); - case 0x0417: return wxT("WM_BUTTON3MOTIONSTART"); - case 0x0418: return wxT("WM_BUTTON3MOTIONEND"); - case 0x0419: return wxT("WM_BUTTON3CLICK"); - case 0x0420: return wxT("WM_BEGINDRAG"); - case 0x0421: return wxT("WM_ENDDRAG"); - case 0x0422: return wxT("WM_SINGLESELECT"); - case 0x0423: return wxT("WM_OPEN"); - case 0x0424: return wxT("WM_CONTEXTMENU"); - case 0x0425: return wxT("WM_CONTEXTHELP"); - case 0x0426: return wxT("WM_TEXTEDIT"); - case 0x0427: return wxT("WM_BEGINSELECT"); - case 0x0228: return wxT("WM_ENDSELECT"); - case 0x0429: return wxT("WM_PICKUP"); - case 0x04C0: return wxT("WM_PENFIRST"); - case 0x04FF: return wxT("WM_PENLAST"); - case 0x0500: return wxT("WM_MMPMFIRST"); - case 0x05FF: return wxT("WM_MMPMLAST"); - case 0x0600: return wxT("WM_STDDLGFIRST"); - case 0x06FF: return wxT("WM_STDDLGLAST"); - case 0x0BD0: return wxT("WM_BIDI_FIRST"); - case 0x0BFF: return wxT("WM_BIDI_LAST"); - // keyboard input - case 0x007A: return wxT("WM_CHAR"); - case 0x007B: return wxT("WM_VIOCHAR"); - // DDE messages - case 0x00A0: return wxT("WM_DDE_INITIATE"); - case 0x00A1: return wxT("WM_DDE_REQUEST"); - case 0x00A2: return wxT("WM_DDE_ACK"); - case 0x00A3: return wxT("WM_DDE_DATA"); - case 0x00A4: return wxT("WM_DDE_ADVISE"); - case 0x00A5: return wxT("WM_DDE_UNADVISE"); - case 0x00A6: return wxT("WM_DDE_POKE"); - case 0x00A7: return wxT("WM_DDE_EXECUTE"); - case 0x00A8: return wxT("WM_DDE_TERMINATE"); - case 0x00A9: return wxT("WM_DDE_INITIATEACK"); - case 0x00AF: return wxT("WM_DDE_LAST"); - // Buttons - case 0x0120: return wxT("BM_CLICK"); - case 0x0121: return wxT("BM_QUERYCHECKINDEX"); - case 0x0122: return wxT("BM_QUERYHILITE"); - case 0x0123: return wxT("BM_SETHILITE"); - case 0x0124: return wxT("BM_QUERYCHECK"); - case 0x0125: return wxT("BM_SETCHECK"); - case 0x0126: return wxT("BM_SETDEFAULT"); - case 0x0128: return wxT("BM_AUTOSIZE"); - // Combo boxes - case 0x029A: return wxT("CBID_LIST"); - case 0x029B: return wxT("CBID_EDIT"); - case 0x0170: return wxT("CBM_SHOWLIST"); - case 0x0171: return wxT("CBM_HILITE"); - case 0x0172: return wxT("CBM_ISLISTSHOWING"); - // Edit fields - case 0x0140: return wxT("EM_QUERYCHANGED"); - case 0x0141: return wxT("EM_QUERYSEL"); - case 0x0142: return wxT("EM_SETSEL"); - case 0x0143: return wxT("EM_SETTEXTLIMIT"); - case 0x0144: return wxT("EM_CUT"); - case 0x0145: return wxT("EM_COPY"); - case 0x0146: return wxT("EM_CLEAR"); - case 0x0147: return wxT("EM_PASTE"); - case 0x0148: return wxT("EM_QUERYFIRSTCHAR"); - case 0x0149: return wxT("EM_SETFIRSTCHAR"); - case 0x014A: return wxT("EM_QUERYREADONLY"); - case 0x014B: return wxT("EM_SETREADONLY"); - case 0x014C: return wxT("EM_SETINSERTMODE"); - // Listboxes - case 0x0160: return wxT("LM_QUERYITEMCOUNT"); - case 0x0161: return wxT("LM_INSERTITEM"); - case 0x0162: return wxT("LM_SETOPENINDEX"); - case 0x0163: return wxT("LM_DELETEITEM"); - case 0x0164: return wxT("LM_SELECTITEM"); - case 0x0165: return wxT("LM_QUERYSELECTION"); - case 0x0166: return wxT("LM_SETITEMTEXT"); - case 0x0167: return wxT("LM_QUERYITEMTEXTLENGTH"); - case 0x0168: return wxT("LM_QUERYITEMTEXT"); - case 0x0169: return wxT("LM_SETITEMHANDLE"); - case 0x016A: return wxT("LM_QUERYITEMHANDLE"); - case 0x016B: return wxT("LM_SEARCHSTRING"); - case 0x016C: return wxT("LM_SETITEMHEIGHT"); - case 0x016D: return wxT("LM_QUERYTOPINDEX"); - case 0x016E: return wxT("LM_DELETEALL"); - case 0x016F: return wxT("LM_INSERTMULITEMS"); - case 0x0660: return wxT("LM_SETITEMWIDTH"); - // Menus - case 0x0180: return wxT("MM_INSERTITEM"); - case 0x0181: return wxT("MM_DELETEITEM"); - case 0x0182: return wxT("MM_QUERYITEM"); - case 0x0183: return wxT("MM_SETITEM"); - case 0x0184: return wxT("MM_QUERYITEMCOUNT"); - case 0x0185: return wxT("MM_STARTMENUMODE"); - case 0x0186: return wxT("MM_ENDMENUMODE"); - case 0x0188: return wxT("MM_REMOVEITEM"); - case 0x0189: return wxT("MM_SELECTITEM"); - case 0x018A: return wxT("MM_QUERYSELITEMID"); - case 0x018B: return wxT("MM_QUERYITEMTEXT"); - case 0x018C: return wxT("MM_QUERYITEMTEXTLENGTH"); - case 0x018D: return wxT("MM_SETITEMHANDLE"); - case 0x018E: return wxT("MM_SETITEMTEXT"); - case 0x018F: return wxT("MM_ITEMPOSITIONFROMID"); - case 0x0190: return wxT("MM_ITEMIDFROMPOSITION"); - case 0x0191: return wxT("MM_QUERYITEMATTR"); - case 0x0192: return wxT("MM_SETITEMATTR"); - case 0x0193: return wxT("MM_ISITEMVALID"); - case 0x0194: return wxT("MM_QUERYITEMRECT"); - case 0x0431: return wxT("MM_QUERYDEFAULTITEMID"); - case 0x0432: return wxT("MM_SETDEFAULTITEMID"); - // Scrollbars - case 0x01A0: return wxT("SBM_SETSCROLLBAR"); - case 0x01A1: return wxT("SBM_SETPOS"); - case 0x01A2: return wxT("SBM_QUERYPOS"); - case 0x01A3: return wxT("SBM_QUERYRANGE"); - case 0x01A6: return wxT("SBM_SETTHUMBSIZE"); - - // Help messages - case 0x0F00: return wxT("WM_HELPBASE"); - case 0x0FFF: return wxT("WM_HELPTOP"); - // Beginning of user defined messages - case 0x1000: return wxT("WM_USER"); - - // wxWidgets user defined types - - // listview - // case 0x1000 + 0: return wxT("LVM_GETBKCOLOR"); - case 0x1000 + 1: return wxT("LVM_SETBKCOLOR"); - case 0x1000 + 2: return wxT("LVM_GETIMAGELIST"); - case 0x1000 + 3: return wxT("LVM_SETIMAGELIST"); - case 0x1000 + 4: return wxT("LVM_GETITEMCOUNT"); - case 0x1000 + 5: return wxT("LVM_GETITEMA"); - case 0x1000 + 75: return wxT("LVM_GETITEMW"); - case 0x1000 + 6: return wxT("LVM_SETITEMA"); - case 0x1000 + 76: return wxT("LVM_SETITEMW"); - case 0x1000 + 7: return wxT("LVM_INSERTITEMA"); - case 0x1000 + 77: return wxT("LVM_INSERTITEMW"); - case 0x1000 + 8: return wxT("LVM_DELETEITEM"); - case 0x1000 + 9: return wxT("LVM_DELETEALLITEMS"); - case 0x1000 + 10: return wxT("LVM_GETCALLBACKMASK"); - case 0x1000 + 11: return wxT("LVM_SETCALLBACKMASK"); - case 0x1000 + 12: return wxT("LVM_GETNEXTITEM"); - case 0x1000 + 13: return wxT("LVM_FINDITEMA"); - case 0x1000 + 83: return wxT("LVM_FINDITEMW"); - case 0x1000 + 14: return wxT("LVM_GETITEMRECT"); - case 0x1000 + 15: return wxT("LVM_SETITEMPOSITION"); - case 0x1000 + 16: return wxT("LVM_GETITEMPOSITION"); - case 0x1000 + 17: return wxT("LVM_GETSTRINGWIDTHA"); - case 0x1000 + 87: return wxT("LVM_GETSTRINGWIDTHW"); - case 0x1000 + 18: return wxT("LVM_HITTEST"); - case 0x1000 + 19: return wxT("LVM_ENSUREVISIBLE"); - case 0x1000 + 20: return wxT("LVM_SCROLL"); - case 0x1000 + 21: return wxT("LVM_REDRAWITEMS"); - case 0x1000 + 22: return wxT("LVM_ARRANGE"); - case 0x1000 + 23: return wxT("LVM_EDITLABELA"); - case 0x1000 + 118: return wxT("LVM_EDITLABELW"); - case 0x1000 + 24: return wxT("LVM_GETEDITCONTROL"); - case 0x1000 + 25: return wxT("LVM_GETCOLUMNA"); - case 0x1000 + 95: return wxT("LVM_GETCOLUMNW"); - case 0x1000 + 26: return wxT("LVM_SETCOLUMNA"); - case 0x1000 + 96: return wxT("LVM_SETCOLUMNW"); - case 0x1000 + 27: return wxT("LVM_INSERTCOLUMNA"); - case 0x1000 + 97: return wxT("LVM_INSERTCOLUMNW"); - case 0x1000 + 28: return wxT("LVM_DELETECOLUMN"); - case 0x1000 + 29: return wxT("LVM_GETCOLUMNWIDTH"); - case 0x1000 + 30: return wxT("LVM_SETCOLUMNWIDTH"); - case 0x1000 + 31: return wxT("LVM_GETHEADER"); - case 0x1000 + 33: return wxT("LVM_CREATEDRAGIMAGE"); - case 0x1000 + 34: return wxT("LVM_GETVIEWRECT"); - case 0x1000 + 35: return wxT("LVM_GETTEXTCOLOR"); - case 0x1000 + 36: return wxT("LVM_SETTEXTCOLOR"); - case 0x1000 + 37: return wxT("LVM_GETTEXTBKCOLOR"); - case 0x1000 + 38: return wxT("LVM_SETTEXTBKCOLOR"); - case 0x1000 + 39: return wxT("LVM_GETTOPINDEX"); - case 0x1000 + 40: return wxT("LVM_GETCOUNTPERPAGE"); - case 0x1000 + 41: return wxT("LVM_GETORIGIN"); - case 0x1000 + 42: return wxT("LVM_UPDATE"); - case 0x1000 + 43: return wxT("LVM_SETITEMSTATE"); - case 0x1000 + 44: return wxT("LVM_GETITEMSTATE"); - case 0x1000 + 45: return wxT("LVM_GETITEMTEXTA"); - case 0x1000 + 115: return wxT("LVM_GETITEMTEXTW"); - case 0x1000 + 46: return wxT("LVM_SETITEMTEXTA"); - case 0x1000 + 116: return wxT("LVM_SETITEMTEXTW"); - case 0x1000 + 47: return wxT("LVM_SETITEMCOUNT"); - case 0x1000 + 48: return wxT("LVM_SORTITEMS"); - case 0x1000 + 49: return wxT("LVM_SETITEMPOSITION32"); - case 0x1000 + 50: return wxT("LVM_GETSELECTEDCOUNT"); - case 0x1000 + 51: return wxT("LVM_GETITEMSPACING"); - case 0x1000 + 52: return wxT("LVM_GETISEARCHSTRINGA"); - case 0x1000 + 117: return wxT("LVM_GETISEARCHSTRINGW"); - case 0x1000 + 53: return wxT("LVM_SETICONSPACING"); - case 0x1000 + 54: return wxT("LVM_SETEXTENDEDLISTVIEWSTYLE"); - case 0x1000 + 55: return wxT("LVM_GETEXTENDEDLISTVIEWSTYLE"); - case 0x1000 + 56: return wxT("LVM_GETSUBITEMRECT"); - case 0x1000 + 57: return wxT("LVM_SUBITEMHITTEST"); - case 0x1000 + 58: return wxT("LVM_SETCOLUMNORDERARRAY"); - case 0x1000 + 59: return wxT("LVM_GETCOLUMNORDERARRAY"); - case 0x1000 + 60: return wxT("LVM_SETHOTITEM"); - case 0x1000 + 61: return wxT("LVM_GETHOTITEM"); - case 0x1000 + 62: return wxT("LVM_SETHOTCURSOR"); - case 0x1000 + 63: return wxT("LVM_GETHOTCURSOR"); - case 0x1000 + 64: return wxT("LVM_APPROXIMATEVIEWRECT"); - case 0x1000 + 65: return wxT("LVM_SETWORKAREA"); - - // tree view - case 0x1100 + 0: return wxT("TVM_INSERTITEMA"); - case 0x1100 + 50: return wxT("TVM_INSERTITEMW"); - case 0x1100 + 1: return wxT("TVM_DELETEITEM"); - case 0x1100 + 2: return wxT("TVM_EXPAND"); - case 0x1100 + 4: return wxT("TVM_GETITEMRECT"); - case 0x1100 + 5: return wxT("TVM_GETCOUNT"); - case 0x1100 + 6: return wxT("TVM_GETINDENT"); - case 0x1100 + 7: return wxT("TVM_SETINDENT"); - case 0x1100 + 8: return wxT("TVM_GETIMAGELIST"); - case 0x1100 + 9: return wxT("TVM_SETIMAGELIST"); - case 0x1100 + 10: return wxT("TVM_GETNEXTITEM"); - case 0x1100 + 11: return wxT("TVM_SELECTITEM"); - case 0x1100 + 12: return wxT("TVM_GETITEMA"); - case 0x1100 + 62: return wxT("TVM_GETITEMW"); - case 0x1100 + 13: return wxT("TVM_SETITEMA"); - case 0x1100 + 63: return wxT("TVM_SETITEMW"); - case 0x1100 + 14: return wxT("TVM_EDITLABELA"); - case 0x1100 + 65: return wxT("TVM_EDITLABELW"); - case 0x1100 + 15: return wxT("TVM_GETEDITCONTROL"); - case 0x1100 + 16: return wxT("TVM_GETVISIBLECOUNT"); - case 0x1100 + 17: return wxT("TVM_HITTEST"); - case 0x1100 + 18: return wxT("TVM_CREATEDRAGIMAGE"); - case 0x1100 + 19: return wxT("TVM_SORTCHILDREN"); - case 0x1100 + 20: return wxT("TVM_ENSUREVISIBLE"); - case 0x1100 + 21: return wxT("TVM_SORTCHILDRENCB"); - case 0x1100 + 22: return wxT("TVM_ENDEDITLABELNOW"); - case 0x1100 + 23: return wxT("TVM_GETISEARCHSTRINGA"); - case 0x1100 + 64: return wxT("TVM_GETISEARCHSTRINGW"); - case 0x1100 + 24: return wxT("TVM_SETTOOLTIPS"); - case 0x1100 + 25: return wxT("TVM_GETTOOLTIPS"); - - // header - case 0x1200 + 0: return wxT("HDM_GETITEMCOUNT"); - case 0x1200 + 1: return wxT("HDM_INSERTITEMA"); - case 0x1200 + 10: return wxT("HDM_INSERTITEMW"); - case 0x1200 + 2: return wxT("HDM_DELETEITEM"); - case 0x1200 + 3: return wxT("HDM_GETITEMA"); - case 0x1200 + 11: return wxT("HDM_GETITEMW"); - case 0x1200 + 4: return wxT("HDM_SETITEMA"); - case 0x1200 + 12: return wxT("HDM_SETITEMW"); - case 0x1200 + 5: return wxT("HDM_LAYOUT"); - case 0x1200 + 6: return wxT("HDM_HITTEST"); - case 0x1200 + 7: return wxT("HDM_GETITEMRECT"); - case 0x1200 + 8: return wxT("HDM_SETIMAGELIST"); - case 0x1200 + 9: return wxT("HDM_GETIMAGELIST"); - case 0x1200 + 15: return wxT("HDM_ORDERTOINDEX"); - case 0x1200 + 16: return wxT("HDM_CREATEDRAGIMAGE"); - case 0x1200 + 17: return wxT("HDM_GETORDERARRAY"); - case 0x1200 + 18: return wxT("HDM_SETORDERARRAY"); - case 0x1200 + 19: return wxT("HDM_SETHOTDIVIDER"); - - // tab control - case 0x1300 + 2: return wxT("TCM_GETIMAGELIST"); - case 0x1300 + 3: return wxT("TCM_SETIMAGELIST"); - case 0x1300 + 4: return wxT("TCM_GETITEMCOUNT"); - case 0x1300 + 5: return wxT("TCM_GETITEMA"); - case 0x1300 + 60: return wxT("TCM_GETITEMW"); - case 0x1300 + 6: return wxT("TCM_SETITEMA"); - case 0x1300 + 61: return wxT("TCM_SETITEMW"); - case 0x1300 + 7: return wxT("TCM_INSERTITEMA"); - case 0x1300 + 62: return wxT("TCM_INSERTITEMW"); - case 0x1300 + 8: return wxT("TCM_DELETEITEM"); - case 0x1300 + 9: return wxT("TCM_DELETEALLITEMS"); - case 0x1300 + 10: return wxT("TCM_GETITEMRECT"); - case 0x1300 + 11: return wxT("TCM_GETCURSEL"); - case 0x1300 + 12: return wxT("TCM_SETCURSEL"); - case 0x1300 + 13: return wxT("TCM_HITTEST"); - case 0x1300 + 14: return wxT("TCM_SETITEMEXTRA"); - case 0x1300 + 40: return wxT("TCM_ADJUSTRECT"); - case 0x1300 + 41: return wxT("TCM_SETITEMSIZE"); - case 0x1300 + 42: return wxT("TCM_REMOVEIMAGE"); - case 0x1300 + 43: return wxT("TCM_SETPADDING"); - case 0x1300 + 44: return wxT("TCM_GETROWCOUNT"); - case 0x1300 + 45: return wxT("TCM_GETTOOLTIPS"); - case 0x1300 + 46: return wxT("TCM_SETTOOLTIPS"); - case 0x1300 + 47: return wxT("TCM_GETCURFOCUS"); - case 0x1300 + 48: return wxT("TCM_SETCURFOCUS"); - case 0x1300 + 49: return wxT("TCM_SETMINTABWIDTH"); - case 0x1300 + 50: return wxT("TCM_DESELECTALL"); - - // toolbar - case WM_USER+1000+1: return wxT("TB_ENABLEBUTTON"); - case WM_USER+1000+2: return wxT("TB_CHECKBUTTON"); - case WM_USER+1000+3: return wxT("TB_PRESSBUTTON"); - case WM_USER+1000+4: return wxT("TB_HIDEBUTTON"); - case WM_USER+1000+5: return wxT("TB_INDETERMINATE"); - case WM_USER+1000+9: return wxT("TB_ISBUTTONENABLED"); - case WM_USER+1000+10: return wxT("TB_ISBUTTONCHECKED"); - case WM_USER+1000+11: return wxT("TB_ISBUTTONPRESSED"); - case WM_USER+1000+12: return wxT("TB_ISBUTTONHIDDEN"); - case WM_USER+1000+13: return wxT("TB_ISBUTTONINDETERMINATE"); - case WM_USER+1000+17: return wxT("TB_SETSTATE"); - case WM_USER+1000+18: return wxT("TB_GETSTATE"); - case WM_USER+1000+19: return wxT("TB_ADDBITMAP"); - case WM_USER+1000+20: return wxT("TB_ADDBUTTONS"); - case WM_USER+1000+21: return wxT("TB_INSERTBUTTON"); - case WM_USER+1000+22: return wxT("TB_DELETEBUTTON"); - case WM_USER+1000+23: return wxT("TB_GETBUTTON"); - case WM_USER+1000+24: return wxT("TB_BUTTONCOUNT"); - case WM_USER+1000+25: return wxT("TB_COMMANDTOINDEX"); - case WM_USER+1000+26: return wxT("TB_SAVERESTOREA"); - case WM_USER+1000+76: return wxT("TB_SAVERESTOREW"); - case WM_USER+1000+27: return wxT("TB_CUSTOMIZE"); - case WM_USER+1000+28: return wxT("TB_ADDSTRINGA"); - case WM_USER+1000+77: return wxT("TB_ADDSTRINGW"); - case WM_USER+1000+29: return wxT("TB_GETITEMRECT"); - case WM_USER+1000+30: return wxT("TB_BUTTONSTRUCTSIZE"); - case WM_USER+1000+31: return wxT("TB_SETBUTTONSIZE"); - case WM_USER+1000+32: return wxT("TB_SETBITMAPSIZE"); - case WM_USER+1000+33: return wxT("TB_AUTOSIZE"); - case WM_USER+1000+35: return wxT("TB_GETTOOLTIPS"); - case WM_USER+1000+36: return wxT("TB_SETTOOLTIPS"); - case WM_USER+1000+37: return wxT("TB_SETPARENT"); - case WM_USER+1000+39: return wxT("TB_SETROWS"); - case WM_USER+1000+40: return wxT("TB_GETROWS"); - case WM_USER+1000+42: return wxT("TB_SETCMDID"); - case WM_USER+1000+43: return wxT("TB_CHANGEBITMAP"); - case WM_USER+1000+44: return wxT("TB_GETBITMAP"); - case WM_USER+1000+45: return wxT("TB_GETBUTTONTEXTA"); - case WM_USER+1000+75: return wxT("TB_GETBUTTONTEXTW"); - case WM_USER+1000+46: return wxT("TB_REPLACEBITMAP"); - case WM_USER+1000+47: return wxT("TB_SETINDENT"); - case WM_USER+1000+48: return wxT("TB_SETIMAGELIST"); - case WM_USER+1000+49: return wxT("TB_GETIMAGELIST"); - case WM_USER+1000+50: return wxT("TB_LOADIMAGES"); - case WM_USER+1000+51: return wxT("TB_GETRECT"); - case WM_USER+1000+52: return wxT("TB_SETHOTIMAGELIST"); - case WM_USER+1000+53: return wxT("TB_GETHOTIMAGELIST"); - case WM_USER+1000+54: return wxT("TB_SETDISABLEDIMAGELIST"); - case WM_USER+1000+55: return wxT("TB_GETDISABLEDIMAGELIST"); - case WM_USER+1000+56: return wxT("TB_SETSTYLE"); - case WM_USER+1000+57: return wxT("TB_GETSTYLE"); - case WM_USER+1000+58: return wxT("TB_GETBUTTONSIZE"); - case WM_USER+1000+59: return wxT("TB_SETBUTTONWIDTH"); - case WM_USER+1000+60: return wxT("TB_SETMAXTEXTROWS"); - case WM_USER+1000+61: return wxT("TB_GETTEXTROWS"); - case WM_USER+1000+41: return wxT("TB_GETBITMAPFLAGS"); - } - - static wxString s_szBuf; - s_szBuf.Printf(wxT(""), nMessage); - return s_szBuf.c_str(); - -} // end of wxGetMessageName - -#endif // __WXDEBUG__ - -// Unused? -#if 0 -static void TranslateKbdEventToMouse( - wxWindow* pWin -, int* pX -, int* pY -, ULONG* pFlags -) -{ - // - // Construct the key mask - ULONG& fwKeys = *pFlags; - - fwKeys = VK_BUTTON2; - if ((::WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x100) != 0) - fwKeys |= VK_CTRL; - if ((::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x100) != 0) - fwKeys |= VK_SHIFT; - - // - // Simulate right mouse button click - // - POINTL vPoint; - - ::WinQueryMsgPos(vHabmain, &vPoint); - *pX = vPoint.x; - *pY = vPoint.y; - - pWin->ScreenToClient(pX, pY); -} // end of TranslateKbdEventToMouse -#endif - -// Find the wxWindow at the current mouse position, returning the mouse -// position. -wxWindow* wxFindWindowAtPointer(wxPoint& WXUNUSED(rPt)) -{ - return wxFindWindowAtPoint(wxGetMousePosition()); -} - -wxWindow* wxFindWindowAtPoint(const wxPoint& rPt) -{ - POINTL vPt2; - - vPt2.x = rPt.x; - vPt2.y = rPt.y; - - HWND hWndHit = ::WinWindowFromPoint(HWND_DESKTOP, &vPt2, FALSE); - wxWindow* pWin = wxFindWinFromHandle((WXHWND)hWndHit) ; - HWND hWnd = hWndHit; - - // - // Try to find a window with a wxWindow associated with it - // - while (!pWin && (hWnd != 0)) - { - hWnd = ::WinQueryWindow(hWnd, QW_PARENT); - pWin = wxFindWinFromHandle((WXHWND)hWnd) ; - } - return pWin; -} - -// Get the current mouse position. -wxPoint wxGetMousePosition() -{ - POINTL vPt; - - ::WinQueryPointerPos(HWND_DESKTOP, &vPt); - return wxPoint(vPt.x, vPt.y); -} - -wxMouseState wxGetMouseState() -{ - wxMouseState ms; - wxPoint pt = wxGetMousePosition(); - ms.SetX(pt.x); - ms.SetY(pt.y); - ms.SetLeftDown(IsKeyDown(VK_BUTTON1)); - ms.SetMiddleDown(IsKeyDown(VK_BUTTON3)); - ms.SetRightDown(IsKeyDown(VK_BUTTON2)); - ms.SetControlDown(IsCtrlDown()); - ms.SetShiftDown(IsShiftDown()); - ms.SetAltDown(IsKeyDown(VK_ALT)|IsKeyDown(VK_ALTGRAF)); - ms.SetMetaDown(IsKeyDown(VK_ALTGRAF)); - return ms; -} - - -wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin, - short* WXUNUSED(pnX), - short* WXUNUSED(pnY) ) -{ - HWND hWnd = GetHwndOf(pWin); - HWND hWndUnderMouse; - POINTL vPoint; - BOOL rcEnabled = FALSE; - BOOL rcVisible = FALSE; - - ::WinQueryPointerPos(HWND_DESKTOP, &vPoint); - hWndUnderMouse = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE); - if (hWndUnderMouse != HWND_DESKTOP) - { - wxWindow* pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse); - - if (pWinUnderMouse) - { - wxWindowList::compatibility_iterator current = pWinUnderMouse->GetChildren().GetFirst(); - wxWindow* pGrandChild = NULL; - RECTL vRect; - POINTL vPoint2; - - ::WinMapWindowPoints(HWND_DESKTOP, hWndUnderMouse, &vPoint, 1); - // - // Find a child window mouse might be under - // - while (current) - { - wxWindow* pChild = current->GetData(); - - vPoint2.x = vPoint.x; - vPoint2.y = vPoint.y; - ::WinMapWindowPoints(hWndUnderMouse, pChild->GetHWND(), &vPoint2, 1); - ::WinQueryWindowRect(pChild->GetHWND(), &vRect); - if (::WinPtInRect(vHabmain, &vRect, &vPoint2)) - { - if (pChild->IsTopLevel()) - { - POINTL vPoint3; - wxWindowList::compatibility_iterator current2 =pChild->GetChildren().GetFirst(); - - while (current2) - { - wxWindow* pGrandChild = current2->GetData(); - - vPoint3.x = vPoint2.x; - vPoint3.y = vPoint2.y; - ::WinMapWindowPoints( pChild->GetHWND() - ,pGrandChild->GetHWND() - ,&vPoint3 - ,1 - ); - ::WinQueryWindowRect(pGrandChild->GetHWND(), &vRect); - if (::WinPtInRect(vHabmain, &vRect, &vPoint3)) - { - hWndUnderMouse = GetHwndOf(pGrandChild); - pWinUnderMouse = pGrandChild; - break; - } - current2 = current2->GetNext(); - } - if (pGrandChild) - break; - } - hWndUnderMouse = GetHwndOf(pChild); - pWinUnderMouse = pChild; - rcVisible = ::WinIsWindowVisible(hWndUnderMouse); - rcEnabled = ::WinIsWindowEnabled(hWndUnderMouse); - if (rcVisible && rcEnabled) - break; - } - current = current->GetNext(); - } - } - } - rcVisible = ::WinIsWindowVisible(hWndUnderMouse); - rcEnabled = ::WinIsWindowEnabled(hWndUnderMouse); - - - // - // Check that we have a child window which is susceptible to receive mouse - // events: for this it must be shown and enabled - // - if ( hWndUnderMouse && - hWndUnderMouse != hWnd && - rcVisible && rcEnabled) - { - wxWindow* pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse); - - if (pWinUnderMouse) - { - // - // Translate the mouse coords to the other window coords - // - pWin = pWinUnderMouse; - } - } - return pWin; -} // end of FindWindowForMouseEvent diff --git a/src/os2/y_tab.i b/src/os2/y_tab.i deleted file mode 100644 index 8a625d56f3..0000000000 --- a/src/os2/y_tab.i +++ /dev/null @@ -1,1922 +0,0 @@ -static char yysccsid[] = "@(#)yaccpar 1.7 (Berkeley) 09/09/90"; -#line 2 "parser.y" -#pragma info( none ) - #pragma info( none ) -#pragma info( restore ) - - - - - - - - - - - - - - - - typedef unsigned int size_t; - - - char * _Builtin __strcat( char *, const char * ); - char * _Builtin __strchr( const char *, int ); - int _Builtin __strcmp( const char *, const char * ); - char * _Builtin __strcpy( char*, const char * ); - size_t _Builtin __strlen( const char * ); - char * _Builtin __strncat( char *, const char *, size_t ); - int _Builtin __strncmp( const char *, const char *, size_t ); - char * _Builtin __strncpy( char *, const char *, size_t ); - char * _Builtin __strrchr( const char *, int ); - - int _Import _Optlink strcoll( const char *, const char * ); - size_t _Import _Optlink strcspn( const char *, const char * ); - char * _Import _Optlink strerror( int ); - char * _Import _Optlink strpbrk( const char *, const char * ); - size_t _Import _Optlink strspn( const char *, const char * ); - char * _Import _Optlink strstr( const char *, const char * ); - char * _Import _Optlink strtok( char*, const char * ); - size_t _Import _Optlink strxfrm( char *, const char *, size_t ); - - char * _Import _Optlink strcat( char *, const char * ); - char * _Import _Optlink strchr( const char *, int ); - int _Import _Optlink strcmp( const char *, const char * ); - char * _Import _Optlink strcpy( char *, const char * ); - size_t _Import _Optlink strlen( const char * ); - char * _Import _Optlink strncat( char *, const char *, size_t ); - int _Import _Optlink strncmp( const char *, const char *, size_t ); - char * _Import _Optlink strncpy( char *, const char *, size_t ); - char * _Import _Optlink strrchr( const char *, int ); - - #pragma info( none ) - #pragma info( restore ) - - - - void * _Builtin __memcpy( void *, const void *, size_t ); - void * _Builtin __memchr( const void *, int, size_t ); - int _Builtin __memcmp( const void *, const void *, size_t ); - void * _Builtin __memset( void *, int, size_t ); - void * _Builtin __memmove( void *, const void *, size_t ); - - void * _Import _Optlink memcpy( void *, const void *, size_t ); - void * _Import _Optlink memchr( const void *, int, size_t ); - int _Import _Optlink memcmp( const void *, const void *, size_t ); - void * _Import _Optlink memset( void *, int, size_t ); - void * _Import _Optlink memmove( void *, const void *, size_t ); - - #pragma info( none ) - #pragma info( restore ) - - - - void * _Import _Optlink memccpy( void *, void *, int, unsigned int ); - int _Import _Optlink memicmp( void *, void *, unsigned int ); - - - - - - char * _Import _Optlink strdup( const char * ); - int _Import _Optlink stricmp( const char *, const char * ); - char * _Import _Optlink strlwr( char * ); - int _Import _Optlink strnicmp( const char *, const char *, size_t ); - char * _Import _Optlink strupr( char * ); - - int _Import _Optlink strcmpi( const char *, const char * ); - char * _Import _Optlink strrev( char * ); - char * _Import _Optlink strset( char *, int ); - char * _Import _Optlink strnset( char *, int, size_t ); - char * _Import _Optlink _strerror( char * ); - - - size_t _Import _Optlink _fstrcspn( const char *, const char * ); - char * _Import _Optlink _fstrdup( const char * ); - char * _Import _Optlink _nstrdup( const char * ); - int _Import _Optlink _fstricmp( const char *, const char * ); - char * _Import _Optlink _fstrlwr( char * ); - int _Import _Optlink _fstrnicmp( const char *, const char *, size_t ); - char * _Import _Optlink _fstrnset( char *, int, size_t ); - char * _Import _Optlink _fstrpbrk( const char *, const char * ); - char * _Import _Optlink _fstrrev( char * ); - char * _Import _Optlink _fstrset( char *, int ); - size_t _Import _Optlink _fstrspn( const char *, const char * ); - char * _Import _Optlink _fstrstr( const char *, const char * ); - char * _Import _Optlink _fstrtok( char*, const char * ); - char * _Import _Optlink _fstrupr( char * ); - - #pragma map( _fstrcspn , "strcspn" ) - #pragma map( _fstrdup , "strdup" ) - #pragma map( _nstrdup , "strdup" ) - #pragma map( _fstricmp , "stricmp" ) - #pragma map( _fstrlwr , "strlwr" ) - #pragma map( _fstrnicmp, "strnicmp" ) - #pragma map( _fstrnset , "strnset" ) - #pragma map( _fstrpbrk , "strpbrk" ) - #pragma map( _fstrrev , "strrev" ) - #pragma map( _fstrset , "strset" ) - #pragma map( _fstrspn , "strspn" ) - #pragma map( _fstrstr , "strstr" ) - #pragma map( _fstrtok , "strtok" ) - #pragma map( _fstrupr , "strupr" ) - - - - -#pragma info( none ) - #pragma info( restore ) -#pragma info( restore ) -#pragma info( none ) - #pragma info( none ) -#pragma info( restore ) - - - - - - - - - - - - - - - - - int _Import _Optlink _access( const char *, int ); - int _Import _Optlink _chmod( const char *, int ); - int _Import _Optlink _chsize( int, long ); - int _Import _Optlink _close( int ); - int _Import _Optlink _creat( const char *, int ); - int _Import _Optlink _dup( int ); - int _Import _Optlink _dup2( int, int ); - int _Import _Optlink __eof( int ); - long _Import _Optlink _filelength( int ); - int _Import _Optlink _isatty( int ); - long _Import _Optlink _lseek( int, long, int ); - int _Import _Optlink _open( const char *, int, ... ); - int _Import _Optlink _read( int, void *, unsigned int ); - int _Import _Optlink remove( const char * ); - int _Import _Optlink rename( const char *, const char * ); - int _Import _Optlink _sopen( const char *, int, int, ... ); - long _Import _Optlink _tell( int ); - int _Import _Optlink _umask( int ); - int _Import _Optlink _unlink( const char * ); - int _Import _Optlink _write( int, const void *, unsigned int ); - int _Import _Optlink _setmode(int handle, int mode); - - int _Import _Optlink access( const char *, int ); - int _Import _Optlink chmod( const char *, int ); - int _Import _Optlink chsize( int, long ); - int _Import _Optlink close( int ); - int _Import _Optlink creat( const char *, int ); - int _Import _Optlink dup( int ); - int _Import _Optlink dup2( int, int ); - int _Import _Optlink eof( int ); - long _Import _Optlink filelength( int ); - int _Import _Optlink isatty( int ); - long _Import _Optlink lseek( int, long, int ); - int _Import _Optlink open( const char *, int, ... ); - int _Import _Optlink read( int, void *, unsigned int ); - int _Import _Optlink sopen( const char *, int, int, ... ); - long _Import _Optlink tell( int ); - int _Import _Optlink umask( int ); - int _Import _Optlink unlink( const char * ); - int _Import _Optlink write( int, const void *, unsigned int ); - int _Import _Optlink setmode(int handle, int mode); - - #pragma map( access , "_access" ) - #pragma map( chmod , "_chmod" ) - #pragma map( chsize , "_chsize" ) - #pragma map( close , "_close" ) - #pragma map( creat , "_creat" ) - #pragma map( dup , "_dup" ) - #pragma map( dup2 , "_dup2" ) - #pragma map( eof , "__eof" ) - #pragma map( filelength, "_filelength" ) - #pragma map( isatty , "_isatty" ) - #pragma map( lseek , "_lseek" ) - #pragma map( open , "_open" ) - #pragma map( read , "_read" ) - #pragma map( sopen , "_sopen" ) - #pragma map( tell , "_tell" ) - #pragma map( umask , "_umask" ) - #pragma map( unlink , "_unlink" ) - #pragma map( write , "_write" ) - #pragma map( setmode , "_setmode" ) - - - - -#pragma info( none ) - #pragma info( restore ) -#pragma info( restore ) - - - - -#pragma info( none ) - #pragma info( none ) -#pragma info( restore ) - - - - - - - - - - - - - - - - extern const double _infinity; - - - - double _Builtin __fabs( double ); - double _Import _Optlink fabs( double ); - #pragma info( none ) - #pragma info( restore ) - - double _Import _Optlink atan2( double, double ); - double _Import _Optlink ceil( double ); - double _Import _Optlink cosh( double ); - double _Import _Optlink exp( double ); - double _Import _Optlink floor( double ); - double _Import _Optlink fmod( double, double ); - double _Import _Optlink frexp( double, int * ); - double _Import _Optlink ldexp( double, int ); - double _Import _Optlink log( double ); - double _Import _Optlink log10( double ); - double _Import _Optlink modf( double, double * ); - double _Import _Optlink pow( double, double ); - double _Import _Optlink sinh( double ); - double _Import _Optlink tanh( double ); - - double _Import _Optlink asin( double ); - double _Import _Optlink acos( double ); - double _Import _Optlink atan( double ); - double _Import _Optlink sin( double ); - double _Import _Optlink cos( double ); - double _Import _Optlink tan( double ); - double _Import _Optlink sqrt( double ); - - double _Import _Optlink _erf( double ); - double _Import _Optlink _erfc( double ); - double _Import _Optlink _gamma( double ); - double _Import _Optlink _hypot( double, double ); - double _Import _Optlink _j0( double ); - double _Import _Optlink _j1( double ); - double _Import _Optlink _jn( int, double ); - double _Import _Optlink _y0( double ); - double _Import _Optlink _y1( double ); - double _Import _Optlink _yn( int, double ); - double _Import _Optlink erf( double ); - double _Import _Optlink erfc( double ); - double _Import _Optlink gamma( double ); - double _Import _Optlink hypot( double, double ); - double _Import _Optlink j0( double ); - double _Import _Optlink j1( double ); - double _Import _Optlink jn( int, double ); - double _Import _Optlink y0( double ); - double _Import _Optlink y1( double ); - double _Import _Optlink yn( int, double ); - - #pragma map( erf, "_erf" ) - #pragma map( erfc, "_erfc" ) - #pragma map( gamma, "_gamma" ) - #pragma map( hypot, "_hypot" ) - #pragma map( j0, "_j0" ) - #pragma map( j1, "_j1" ) - #pragma map( jn, "_jn" ) - #pragma map( y0, "_y0" ) - #pragma map( y1, "_y1" ) - #pragma map( yn, "_yn" ) - - extern const long double _LHUGE_VAL; - - - - - - struct complex - { - double x,y; - }; - - double _Import _Optlink _cabs( struct complex ); - - #pragma info( none ) - #pragma info( restore ) - - struct exception - { - int type; - char *name; - double arg1; - double arg2; - double retval; - }; - - - - int _matherr( struct exception * ); - int matherr( struct exception * ); - - #pragma map( matherr, "_matherr" ) - - long double _Optlink _atold( const char * ); - - - - - -#pragma info( none ) - #pragma info( restore ) -#pragma info( restore ) - - -#pragma info( none ) - #pragma info( none ) -#pragma info( restore ) - - - - - - - - - - - - - - - - - typedef unsigned short wchar_t; - - typedef struct _div_t - { - int quot; - int rem; - } div_t; - - typedef struct _ldiv_t - { - long int quot; - long int rem; - } ldiv_t; - - - - typedef unsigned long _System _EH_RTN(void *,void *,void *,void *); - - extern int _Import _Optlink _eh_del(_EH_RTN *); - extern int _Import _Optlink _eh_add(_EH_RTN *); - extern int _Import _mb_cur_max; - - - - int _Builtin __abs( int ); - long int _Builtin __labs( long int ); - - double _Import _Optlink atof( const char * ); - int _Import _Optlink atoi( const char * ); - long int _Import _Optlink atol( const char * ); - double _Import _Optlink strtod( const char *, char ** ); - long int _Import _Optlink strtol( const char *, char **, int ); - unsigned long int _Import _Optlink strtoul( const char *, char **, int ); - int _Import _Optlink rand( void ); - void _Import _Optlink srand( unsigned int ); - void * (_Import _Optlink calloc)( size_t, size_t ); - void (_Import _Optlink free)( void * ); - void * (_Import _Optlink malloc)( size_t ); - void * (_Import _Optlink realloc)( void *, size_t ); - void _Import _Optlink abort( void ); - int _Import _Optlink atexit( void ( * )( void ) ); - void _Import _Optlink exit( int ); - char * _Import _Optlink getenv( const char * ); - int _Import _Optlink system( const char * ); - void * _Import _Optlink bsearch( const void *, const void *, size_t, size_t, - int ( * _Optlink __compare )( const void *, const void * ) ); - void _Import _Optlink qsort( void *, size_t, size_t, - int ( * _Optlink __compare )( const void *, const void * ) ); - div_t _Import _Optlink div( int, int ); - ldiv_t _Import _Optlink ldiv( long int, long int ); - int _Import _Optlink mblen( const char *, size_t ); - int _Import _Optlink mbtowc( wchar_t *, const char *, size_t ); - int _Import _Optlink wctomb( char *, wchar_t ); - size_t _Import _Optlink mbstowcs( wchar_t *, const char *, size_t ); - size_t _Import _Optlink wcstombs( char *, const wchar_t *, size_t ); - - int _Import _Optlink abs ( int ); - long int _Import _Optlink labs( long int ); - - #pragma info( none ) - #pragma info( restore ) - - - - - void * _Builtin __alloca( size_t ); - #pragma info( none ) - #pragma info( restore ) - - unsigned char _Builtin __parmdwords( void ); - - long double _Import _Optlink _atold( const char * ); - char * _Import _Optlink ecvt( double, int, int *, int * ); - char * _Import _Optlink _ecvt( double, int, int *, int * ); - char * _Import _Optlink fcvt( double, int, int *, int * ); - char * _Import _Optlink _fcvt( double, int, int *, int * ); - int _Import _Optlink _freemod( unsigned long ); - char * _Import _Optlink _fullpath(char *, char *, size_t); - char * _Import _Optlink gcvt( double, int, char * ); - char * _Import _Optlink _gcvt( double, int, char * ); - int (_Import _Optlink _heapmin)( void ); - char * _Import _Optlink itoa( int, char *, int ); - char * _Import _Optlink _itoa( int, char *, int ); - int _Import _Optlink _loadmod( char *, unsigned long * ); - char * _Import _Optlink ltoa( long, char *, int ); - char * _Import _Optlink _ltoa( long, char *, int ); - size_t _Import _Optlink _msize(void *); - int _Import _Optlink putenv( const char * ); - int _Import _Optlink _putenv( const char * ); - long double _Import _Optlink strtold( const char *, char ** ); - long double _Import _Optlink _strtold( const char *, char ** ); - char * _Import _Optlink ultoa( unsigned long, char *, int ); - char * _Import _Optlink _ultoa( unsigned long, char *, int ); - - #pragma map( ecvt , "_ecvt" ) - #pragma map( fcvt , "_fcvt" ) - #pragma map( gcvt , "_gcvt" ) - #pragma map( itoa , "_itoa" ) - #pragma map( ltoa , "_ltoa" ) - #pragma map( ultoa , "_ultoa" ) - #pragma map( putenv , "_putenv" ) - #pragma map( _strtold, "strtold" ) - - - - - - int _Import _Optlink _beginthread( void ( * _Optlink thread )( void * ), void *, unsigned, void * ); - void _Import _Optlink _endthread( void ); - void ** _Import _Optlink _threadstore( void ); - - #pragma map( atof , "_atofieee" ) - #pragma map( strtod, "_strtodieee" ) - - - void _Builtin __enable( void ); - void _Builtin __disable( void ); - - - int * _Import _Optlink _errno( void ); - #pragma info( none ) - #pragma info( restore ) - - int * _Import _Optlink __doserrno(void); - #pragma info( none ) - #pragma info( restore ) - - extern char ** _Import _environ; - extern unsigned char _Import _osmajor; - extern unsigned char _Import _osminor; - extern unsigned char _Import _osmode; - - - - typedef int ( __onexit_t )( void ); - typedef __onexit_t * onexit_t; - - - - - - void _Import _Optlink _exit( int ); - onexit_t _Import _Optlink onexit( onexit_t ); - onexit_t _Import _Optlink _onexit( onexit_t ); - - unsigned long _Builtin __lrotl(unsigned long, int); - unsigned long _Builtin __lrotr(unsigned long, int); - unsigned short _Builtin __srotl(unsigned short, int); - unsigned short _Builtin __srotr(unsigned short, int); - unsigned char _Builtin __crotl(unsigned char, int); - unsigned char _Builtin __crotr(unsigned char, int); - - void _Import _Optlink _makepath( char *, char *, char *, char *, char * ); - void _Import _Optlink _splitpath( char *, char *, char *, char *, char * ); - void _Import _Optlink _searchenv( char *, char *, char *); - void _Import _Optlink swab( char *, char *, int ); - void _Import _Optlink _swab( char *, char *, int ); - - #pragma map( onexit , "_onexit" ) - #pragma map( swab , "_swab" ) - - int _Import _Optlink rpmatch(const char *); - int _Import _Optlink csid(const char *); - int _Import _Optlink wcsid(const wchar_t); - - #pragma map( rpmatch, "_rpmatch" ) - #pragma map( csid , "_csid" ) - #pragma map( wcsid , "_wcsid" ) - - - - - - - - - -#pragma info( none ) - #pragma info( restore ) -#pragma info( restore ) - - - - - - - - - - - -char *proio_cons(); -char * wxmake_integer(); -char * wxmake_word(); -char * wxmake_string(); -char * wxmake_real(); -char * wxmake_exp(); -char * wxmake_exp2(); - -void add_expr(); -void process_command(); -void syntax_error(); - - - - - -int PROIO_yylex(void); -int PROIO_yylook(void); -int PROIO_yywrap(void); -int PROIO_yyback(int *, int); - - -void PROIO_yyoutput(int); - -#line 36 "parser.y" -typedef union { - char *s; - -} YYSTYPE; -#line 44 "y_tab.c" -short PROIO_yylhs[] = { -1, - 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, - 3, 4, 4, 5, 5, 5, 5, 5, 5, 5, -}; -short PROIO_yylen[] = { 2, - 0, 2, 2, 2, 2, 4, 2, 3, 0, 1, - 3, 3, 1, 1, 1, 1, 3, 3, 5, 1, -}; -short PROIO_yydefred[] = { 1, - 0, 0, 0, 0, 2, 0, 5, 3, 0, 0, - 0, 15, 7, 20, 0, 0, 13, 4, 0, 0, - 0, 0, 8, 0, 6, 0, 18, 0, 12, 11, - 0, 19, -}; -short PROIO_yydgoto[] = { 1, - 5, 14, 15, 16, 17, -}; -short PROIO_yysindex[] = { 0, - -2, 9, 2, 1, 0, 10, 0, 0, 11, -5, - 17, 0, 0, 0, 14, -1, 0, 0, 33, 38, - 41, 16, 0, 11, 0, 29, 0, 40, 0, 0, - 44, 0, -}; -short PROIO_yyrindex[] = { 0, - 0, 0, 0, 0, 0, 0, 0, 0, 42, 21, - 24, 0, 0, 0, 0, 30, 0, 0, 0, 0, - 0, 0, 0, 31, 0, 27, 0, 24, 0, 0, - 0, 0, -}; -short PROIO_yygindex[] = { 0, - 0, 45, -8, 0, 26, -}; -short PROIO_yytable[] = { 3, - 19, 10, 11, 12, 24, 9, 4, 20, 21, 4, - 13, 10, 11, 12, 8, 30, 10, 28, 12, 4, - 9, 7, 18, 23, 4, 16, 16, 22, 14, 14, - 16, 17, 17, 14, 10, 9, 17, 25, 26, 10, - 9, 27, 31, 9, 32, 6, 9, 29, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 2, -}; -short PROIO_yycheck[] = { 2, - 9, 1, 2, 3, 6, 4, 9, 13, 14, 9, - 10, 1, 2, 3, 13, 24, 1, 2, 3, 9, - 4, 13, 13, 10, 9, 5, 6, 11, 5, 6, - 10, 5, 6, 10, 5, 5, 10, 5, 1, 10, - 10, 1, 14, 4, 1, 1, 5, 22, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 256, -}; -int PROIO_yydebug; -int PROIO_yynerrs; -int PROIO_yyerrflag; -int PROIO_yychar; -short *PROIO_yyssp; -YYSTYPE *PROIO_yyvsp; -YYSTYPE PROIO_yyval; -YYSTYPE PROIO_yylval; -short PROIO_yyss[600]; -YYSTYPE PROIO_yyvs[600]; -#line 118 "parser.y" - - - - - - -#pragma info( none ) - #pragma info( none ) -#pragma info( restore ) - - - - - - - - - - - - - - - - - enum _OPERATIONS { _IOINIT, _IOREAD, _IOWRITE, _IOREPOSITION, - _IOFLUSH, _IOUNDEFOP }; - - - #pragma pack( 1 ) - typedef struct __file - { - unsigned char *_bufPtr; - unsigned long int _count; - unsigned long int _userFlags; - unsigned long int _bufLen; - unsigned long int _ungetCount; - int _tempStore; - unsigned char _ungetBuf[2]; - enum _OPERATIONS _lastOp; - char _filler; - } FILE; - #pragma pack( ) - - typedef struct __fpos_t - { - long int __fpos_elem[2]; - } fpos_t; - - - - - typedef char *__va_list; - - - - - extern FILE * const _Import stdin; - extern FILE * const _Import stdout; - extern FILE * const _Import stderr; - - - - - int _Import _Optlink fprintf( FILE *, const char *, ... ); - int _Import _Optlink fscanf( FILE *, const char *, ... ); - int _Import _Optlink printf( const char *, ... ); - int _Import _Optlink scanf( const char *, ... ); - int _Import _Optlink sprintf( char *, const char *, ... ); - int _Import _Optlink sscanf( const char *, const char *, ... ); - void _Import _Optlink clearerr( FILE * ); - int _Import _Optlink fclose( FILE * ); - int _Import _Optlink feof( FILE * ); - int _Import _Optlink ferror( FILE * ); - int _Import _Optlink fflush( FILE * ); - int _Import _Optlink fgetc( FILE * ); - int _Import _Optlink fgetpos( FILE *, fpos_t * ); - char * _Import _Optlink fgets( char *, int, FILE * ); - FILE * _Import _Optlink fopen( const char *, const char * ); - int _Import _Optlink fputc( int, FILE * ); - int _Import _Optlink fputs( const char *, FILE * ); - size_t _Import _Optlink fread( void *, size_t, size_t, FILE * ); - FILE * _Import _Optlink freopen( const char *, const char *, FILE * ); - int _Import _Optlink fseek( FILE *, long int, int ); - int _Import _Optlink fsetpos( FILE *, const fpos_t * ); - long int _Import _Optlink ftell( FILE * ); - size_t _Import _Optlink fwrite( const void *, size_t, size_t, FILE * ); - int _Optlink getc( FILE * ); - int _Optlink getchar( void ); - char * _Import _Optlink gets( char * ); - void _Import _Optlink perror( const char * ); - int _Optlink putc( int, FILE * ); - int _Optlink putchar( int ); - int _Import _Optlink puts( const char * ); - int _Import _Optlink remove( const char * ); - int _Import _Optlink rename( const char *, const char * ); - void _Import _Optlink rewind( FILE * ); - void _Import _Optlink setbuf( FILE *, char * ); - int _Import _Optlink setvbuf( FILE *, char *, int, size_t ); - FILE * _Import _Optlink tmpfile( void ); - char * _Import _Optlink tmpnam( char * ); - int _Import _Optlink ungetc( int, FILE * ); - int _Import _Optlink vfprintf( FILE *, const char *, __va_list ); - int _Import _Optlink vprintf( const char *, __va_list ); - int _Import _Optlink vsprintf( char *, const char *, __va_list ); - - - - - - - - - - - #pragma map( fprintf, "_fprintfieee" ) - #pragma map( printf , "_printfieee" ) - #pragma map( sprintf, "_sprintfieee" ) - #pragma map( fscanf , "_fscanfieee" ) - #pragma map( scanf , "_scanfieee" ) - #pragma map( sscanf , "_sscanfieee" ) - - #pragma map( vfprintf, "_vfprintfieee" ) - #pragma map( vprintf , "_vprintfieee" ) - #pragma map( vsprintf, "_vsprintfieee" ) - - int _Optlink _fcloseall( void ); - int _Optlink _rmtmp( void ); - - FILE * _Optlink fdopen( int, const char *); - int _Optlink fgetchar( void ); - int _Optlink fileno( FILE * ); - int _Optlink flushall( void ); - int _Optlink fputchar( int ); - char * _Optlink tempnam( char *, char * ); - int _Optlink unlink( const char * ); - - FILE * _Optlink _fdopen( int, const char *); - int _Optlink _fgetchar( void ); - int _Optlink _fileno( FILE * ); - int _Optlink _flushall( void ); - int _Optlink _fputchar( int ); - char * _Optlink _tempnam( char *, char * ); - int _Optlink _unlink( const char * ); - - int _Optlink _set_crt_msg_handle( int ); - - #pragma map( fdopen , "_fdopen" ) - #pragma map( fgetchar, "_fgetchar" ) - #pragma map( fileno , "_fileno" ) - #pragma map( flushall, "_flushall" ) - #pragma map( fputchar, "_fputchar" ) - #pragma map( tempnam , "_tempnam" ) - - - - -#pragma info( none ) - #pragma info( restore ) -#pragma info( restore ) - - - - - - - - - - - - - - - -int read(); - - - - - - - - - - - - - - - - - - - - - -int PROIO_yywrap(void) { return 1; } - - - - - - - - - - - - - - -typedef struct yy_buffer_state *YY_BUFFER_STATE; - -# line 1 "lexer.l" -# line 9 "lexer.l" - -#pragma info( none ) - #pragma info( none ) -#pragma info( restore ) - - -#pragma info( none ) - #pragma info( restore ) -#pragma info( restore ) - - - - - - - - - - -static size_t lex_buffer_length = 0; -static char *lex_buffer = 0; -static size_t lex_string_ptr = 0; -static int lex_read_from_string = 0; - -static int my_input(void); -static int my_unput(char); - - -# line 58 "lexer.l" - - - - - - - - -struct yy_buffer_state - { - FILE *yy_input_file; - - unsigned char *yy_ch_buf; - unsigned char *yy_buf_pos; - - - int yy_buf_size; - - - int yy_n_chars; - - int yy_eof_status; - - }; - -static YY_BUFFER_STATE yy_current_buffer; - - - - - -static unsigned char yy_hold_char; - -static int yy_n_chars; - - - - - -extern unsigned char *PROIO_yytext; -extern int PROIO_yyleng; -extern FILE *PROIO_yyin, *PROIO_yyout; - -unsigned char *PROIO_yytext; -int PROIO_yyleng; - -FILE *PROIO_yyin = (FILE *) 0, *PROIO_yyout = (FILE *) 0; - -typedef int yy_state_type; -static short int yy_accept[34] = - { 0, - 0, 0, 18, 16, 13, 14, 16, 16, 6, 7, - 16, 8, 12, 16, 1, 11, 3, 9, 10, 2, - 0, 5, 0, 0, 0, 4, 1, 15, 3, 5, - 0, 0, 0 - } ; - -static unsigned char yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 4, 1, 1, 1, 1, 5, 6, - 7, 8, 9, 10, 9, 11, 12, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 1, 1, 1, - 14, 1, 1, 1, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 16, 17, 18, 1, 15, 1, 15, 15, 15, 15, - - 19, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 1, 20, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static unsigned char yy_meta[21] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 1, 2, 1, 3, 1, 2, 1 - } ; - -static short int yy_base[37] = - { 0, - 0, 0, 48, 55, 55, 55, 17, 42, 55, 55, - 19, 55, 55, 23, 17, 55, 0, 55, 55, 0, - 18, 55, 19, 23, 21, 55, 12, 55, 0, 24, - 25, 29, 55, 49, 52, 22 - } ; - -static short int yy_def[37] = - { 0, - 33, 1, 33, 33, 33, 33, 34, 35, 33, 33, - 33, 33, 33, 33, 33, 33, 36, 33, 33, 36, - 34, 33, 34, 34, 35, 33, 33, 33, 36, 34, - 34, 34, 0, 33, 33, 33 - } ; - -static short int yy_nxt[76] = - { 0, - 4, 5, 6, 7, 8, 9, 10, 4, 11, 12, - 13, 14, 15, 16, 17, 18, 4, 19, 20, 4, - 22, 22, 30, 29, 27, 26, 22, 22, 30, 27, - 28, 27, 30, 23, 23, 23, 24, 24, 24, 31, - 23, 32, 24, 24, 24, 23, 26, 33, 24, 21, - 21, 21, 25, 25, 3, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33 - } ; - -static short int yy_chk[76] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 7, 21, 23, 36, 27, 25, 24, 30, 31, 15, - 14, 11, 32, 7, 21, 23, 7, 21, 23, 24, - 30, 31, 24, 30, 31, 32, 8, 3, 32, 34, - 34, 34, 35, 35, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33 - } ; - -static yy_state_type yy_last_accepting_state; -static unsigned char *yy_last_accepting_cpos; - - - - - -static unsigned char *yy_c_buf_p = (unsigned char *) 0; -static int yy_init = 1; -static int yy_start = 0; - - -static int yy_did_buffer_switch_on_eof; - -static yy_state_type yy_get_previous_state (); -static yy_state_type yy_try_NUL_trans (); -static int yy_get_next_buffer (); -static void yyunput (); -void PROIO_yyrestart (); -void PROIO_yy_switch_to_buffer (); -void PROIO_yy_load_buffer_state (); -YY_BUFFER_STATE PROIO_yy_create_buffer (); -void PROIO_yy_delete_buffer (); -void PROIO_yy_init_buffer (); - - -static int input (); - -int PROIO_yylex () - { - register yy_state_type yy_current_state; - register unsigned char *yy_cp, *yy_bp; - register int yy_act; - - - - - if ( yy_init ) - { - ; - - if ( ! yy_start ) - yy_start = 1; - - if ( ! PROIO_yyin ) - PROIO_yyin = stdin; - - if ( ! PROIO_yyout ) - PROIO_yyout = stdout; - - if ( yy_current_buffer ) - PROIO_yy_init_buffer( yy_current_buffer, PROIO_yyin ); - else - yy_current_buffer = PROIO_yy_create_buffer( PROIO_yyin, (8192 * 2) ); - - PROIO_yy_load_buffer_state(); - - yy_init = 0; - } - - while ( 1 ) - { - yy_cp = yy_c_buf_p; - - - *yy_cp = yy_hold_char; - - - yy_bp = yy_cp; - - yy_current_state = yy_start; -yy_match: - do - { - register unsigned char yy_c = yy_ec[*yy_cp]; - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = yy_def[yy_current_state]; - if ( yy_current_state >= 34 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - ++yy_cp; - } - while ( yy_current_state != 33 ); - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - - PROIO_yytext = yy_bp; PROIO_yyleng = yy_cp - yy_bp; yy_hold_char = *yy_cp; *yy_cp = '\0'; yy_c_buf_p = yy_cp;; - ; - -do_action: - - - switch ( yy_act ) - { - case 0: - - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - goto yy_find_action; - -case 1: -# line 60 "lexer.l" -{PROIO_yylval.s = strdup(( char*) PROIO_yytext); return 1;;} - break; -case 2: -# line 62 "lexer.l" -return 14;; - break; -case 3: -# line 64 "lexer.l" -{PROIO_yylval.s = strdup(( char*) PROIO_yytext); return 2;;} - break; -case 4: -# line 66 "lexer.l" -{int len = __strlen( (( char*) PROIO_yytext) ); - PROIO_yytext[len-1] = 0; - PROIO_yylval.s = strdup(( char*) (PROIO_yytext+1)); - return 2;;} - break; -case 5: -# line 71 "lexer.l" -{PROIO_yylval.s = strdup(( char*) PROIO_yytext); return 3;;} - break; -case 6: -# line 73 "lexer.l" -return 4;; - break; -case 7: -# line 75 "lexer.l" -return 5;; - break; -case 8: -# line 77 "lexer.l" -return 6;; - break; -case 9: -# line 79 "lexer.l" -return 9;; - break; -case 10: -# line 81 "lexer.l" -return 10;; - break; -case 11: -# line 83 "lexer.l" -return 11;; - break; -case 12: -# line 85 "lexer.l" -return 13;; - break; -case 13: -# line 87 "lexer.l" -; - break; -case 14: -# line 89 "lexer.l" -; - break; -case 15: -# line 91 "lexer.l" -{ loop: - while (input() != '*'); - switch (input()) - { - case '/': break; - case '*': yyunput( '*', PROIO_yytext ); - default: goto loop; - } - } - break; -case 16: -# line 106 "lexer.l" -return 8;; - break; -case 17: -# line 108 "lexer.l" -(void) fwrite( (char *) PROIO_yytext, PROIO_yyleng, 1, PROIO_yyout ); - break; -case (18 + 0 + 1): - return ( 0 ); - - case 18: - { - - int yy_amount_of_matched_text = yy_cp - PROIO_yytext - 1; - - - *yy_cp = yy_hold_char; - - - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) - - { - yy_state_type yy_next_state; - - yy_c_buf_p = PROIO_yytext + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state(); - - - - yy_next_state = yy_try_NUL_trans( yy_current_state ); - - yy_bp = PROIO_yytext + 0; - - if ( yy_next_state ) - { - - yy_cp = ++yy_c_buf_p; - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer() ) - { - case 1: - { - yy_did_buffer_switch_on_eof = 0; - - if ( PROIO_yywrap() ) - { - - yy_c_buf_p = PROIO_yytext + 0; - - yy_act = (18 + (yy_start - 1) / 2 + 1); - goto do_action; - } - - else - { - if ( ! yy_did_buffer_switch_on_eof ) - do { PROIO_yy_init_buffer( yy_current_buffer, PROIO_yyin ); PROIO_yy_load_buffer_state(); } while ( 0 ); - } - } - break; - - case 0: - yy_c_buf_p = PROIO_yytext + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state(); - - yy_cp = yy_c_buf_p; - yy_bp = PROIO_yytext + 0; - goto yy_match; - - case 2: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; - - yy_current_state = yy_get_previous_state(); - - yy_cp = yy_c_buf_p; - yy_bp = PROIO_yytext + 0; - goto yy_find_action; - } - break; - } - - default: - do { (void) fputs( "fatal flex scanner internal error--no action found", stderr ); (void) fputc( ('\n'), (stderr) ); exit( 1 ); } while ( 0 ); - } - } - } - - - - -static int yy_get_next_buffer() - - { - register unsigned char *dest = yy_current_buffer->yy_ch_buf; - register unsigned char *source = PROIO_yytext - 1; - register int number_to_move, i; - int ret_val; - - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) - do { (void) fputs( "fatal flex scanner internal error--end of buffer missed", stderr ); (void) fputc( ('\n'), (stderr) ); exit( 1 ); } while ( 0 ); - - - - - number_to_move = yy_c_buf_p - PROIO_yytext; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( yy_current_buffer->yy_eof_status != 0 ) - - yy_n_chars = 0; - - else - { - int num_to_read = yy_current_buffer->yy_buf_size - number_to_move - 1; - - if ( num_to_read > 8192 ) - num_to_read = 8192; - - else if ( num_to_read <= 0 ) - do { (void) fputs( "fatal error - scanner input buffer overflow", stderr ); (void) fputc( ('\n'), (stderr) ); exit( 1 ); } while ( 0 ); - - - if (lex_read_from_string) { int c = my_input(); yy_n_chars = (c == 0) ? 0 : (((&yy_current_buffer->yy_ch_buf[number_to_move]))[0]=(c), 1); } else if ( (yy_n_chars = read( fileno(PROIO_yyin), (char *) (&yy_current_buffer->yy_ch_buf[number_to_move]), num_to_read )) < 0 ) do { (void) fputs( "read() in flex scanner failed", stderr ); (void) fputc( ('\n'), (stderr) ); exit( 1 ); } while ( 0 );; - } - - if ( yy_n_chars == 0 ) - { - if ( number_to_move == 1 ) - { - ret_val = 1; - yy_current_buffer->yy_eof_status = 2; - } - - else - { - ret_val = 2; - yy_current_buffer->yy_eof_status = 1; - } - } - - else - ret_val = 0; - - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = 0; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = 0; - - - - PROIO_yytext = &yy_current_buffer->yy_ch_buf[1]; - - return ( ret_val ); - } - - - - -static yy_state_type yy_get_previous_state() - - { - register yy_state_type yy_current_state; - register unsigned char *yy_cp; - - yy_current_state = yy_start; - - for ( yy_cp = PROIO_yytext + 0; yy_cp < yy_c_buf_p; ++yy_cp ) - { - register unsigned char yy_c = (*yy_cp ? yy_ec[*yy_cp] : 1); - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = yy_def[yy_current_state]; - if ( yy_current_state >= 34 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - } - - return ( yy_current_state ); - } - - - - -static yy_state_type yy_try_NUL_trans( yy_current_state ) -register yy_state_type yy_current_state; - - { - register int yy_is_jam; - register unsigned char *yy_cp = yy_c_buf_p; - - register unsigned char yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = yy_def[yy_current_state]; - if ( yy_current_state >= 34 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 33); - - return ( yy_is_jam ? 0 : yy_current_state ); - } - - -static void yyunput( c, yy_bp ) -unsigned char c; -register unsigned char *yy_bp; - - { - register unsigned char *yy_cp = yy_c_buf_p; - - - *yy_cp = yy_hold_char; - - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) - { - register int number_to_move = yy_n_chars + 2; - register unsigned char *dest = - &yy_current_buffer->yy_ch_buf[yy_current_buffer->yy_buf_size + 2]; - register unsigned char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; - - while ( source > yy_current_buffer->yy_ch_buf ) - *--dest = *--source; - - yy_cp += dest - source; - yy_bp += dest - source; - yy_n_chars = yy_current_buffer->yy_buf_size; - - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) - do { (void) fputs( "flex scanner push-back overflow", stderr ); (void) fputc( ('\n'), (stderr) ); exit( 1 ); } while ( 0 ); - } - - if ( yy_cp > yy_bp && yy_cp[-1] == '\n' ) - yy_cp[-2] = '\n'; - - *--yy_cp = c; - - - PROIO_yytext = yy_bp; PROIO_yyleng = yy_cp - yy_bp; yy_hold_char = *yy_cp; *yy_cp = '\0'; yy_c_buf_p = yy_cp;; - } - - -static int input() - - { - int c; - unsigned char *yy_cp = yy_c_buf_p; - - *yy_cp = yy_hold_char; - - if ( *yy_c_buf_p == 0 ) - { - - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) - - *yy_c_buf_p = '\0'; - - else - { - PROIO_yytext = yy_c_buf_p; - ++yy_c_buf_p; - - switch ( yy_get_next_buffer() ) - { - case 1: - { - if ( PROIO_yywrap() ) - { - yy_c_buf_p = PROIO_yytext + 0; - return ( (-1) ); - } - - do { PROIO_yy_init_buffer( yy_current_buffer, PROIO_yyin ); PROIO_yy_load_buffer_state(); } while ( 0 ); - - return ( input() ); - } - break; - - case 0: - yy_c_buf_p = PROIO_yytext + 0; - break; - - case 2: - do { (void) fputs( "unexpected last match in input()", stderr ); (void) fputc( ('\n'), (stderr) ); exit( 1 ); } while ( 0 ); - } - } - } - - c = *yy_c_buf_p; - yy_hold_char = *++yy_c_buf_p; - - return ( c ); - } - - -void PROIO_yyrestart( input_file ) -FILE *input_file; - - { - PROIO_yy_init_buffer( yy_current_buffer, input_file ); - PROIO_yy_load_buffer_state(); - } - - -void PROIO_yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; - - { - if ( yy_current_buffer == new_buffer ) - return; - - if ( yy_current_buffer ) - { - - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; - } - - yy_current_buffer = new_buffer; - PROIO_yy_load_buffer_state(); - - - yy_did_buffer_switch_on_eof = 1; - } - - -void PROIO_yy_load_buffer_state() - - { - yy_n_chars = yy_current_buffer->yy_n_chars; - PROIO_yytext = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - PROIO_yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } - - -YY_BUFFER_STATE PROIO_yy_create_buffer( file, size ) -FILE *file; -int size; - - { - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) malloc( sizeof( struct yy_buffer_state ) ); - - if ( ! b ) - do { (void) fputs( "out of dynamic memory in yy_create_buffer()", stderr ); (void) fputc( ('\n'), (stderr) ); exit( 1 ); } while ( 0 ); - - b->yy_buf_size = size; - - - b->yy_ch_buf = (unsigned char *) malloc( (unsigned) (b->yy_buf_size + 2) ); - - if ( ! b->yy_ch_buf ) - do { (void) fputs( "out of dynamic memory in yy_create_buffer()", stderr ); (void) fputc( ('\n'), (stderr) ); exit( 1 ); } while ( 0 ); - - PROIO_yy_init_buffer( b, file ); - - return ( b ); - } - - -void PROIO_yy_delete_buffer( b ) -YY_BUFFER_STATE b; - - { - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; - - free( (char *) b->yy_ch_buf ); - free( (char *) b ); - } - - -void PROIO_yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; - - { - b->yy_input_file = file; - - - - b->yy_ch_buf[0] = '\n'; - b->yy_n_chars = 1; - - - b->yy_ch_buf[1] = 0; - b->yy_ch_buf[2] = 0; - - b->yy_buf_pos = &b->yy_ch_buf[1]; - - b->yy_eof_status = 0; - } -# line 108 "lexer.l" - - - -static int lex_input() { - return input(); -} - - -void LexFromFile(FILE *fd) -{ - lex_read_from_string = 0; - PROIO_yyin = fd; - - yy_init = 1; -} - -void LexFromString(char *buffer) -{ - lex_read_from_string = 1; - lex_buffer = buffer; - lex_buffer_length = __strlen( (( char*) buffer) ); - lex_string_ptr = 0; - - yy_init = 1; -} - -static int my_input( void ) -{ - if (lex_read_from_string) { - if (lex_string_ptr == lex_buffer_length) - return 0; - else { - char c = lex_buffer[lex_string_ptr++]; - return c; - } - } else { - return lex_input(); - } -} - -void wxExprCleanUp() -{ - if (yy_current_buffer) - PROIO_yy_delete_buffer(yy_current_buffer); -} - - - - - -void PROIO_yyerror(char *s) -{ - syntax_error(s); -} - - - - - -int PROIO_yywrap() { return 1; } -#line 247 "y_tab.c" -int -PROIO_yyparse() -{ - register int yym, yyn, yystate; - - PROIO_yynerrs = 0; - PROIO_yyerrflag = 0; - PROIO_yychar = (-1); - - PROIO_yyssp = PROIO_yyss; - PROIO_yyvsp = PROIO_yyvs; - *PROIO_yyssp = yystate = 0; - -yyloop: - if (yyn = PROIO_yydefred[yystate]) goto yyreduce; - if (PROIO_yychar < 0) - { - if ((PROIO_yychar = PROIO_yylex()) < 0) PROIO_yychar = 0; - } - if ((yyn = PROIO_yysindex[yystate]) && (yyn += PROIO_yychar) >= 0 && - yyn <= 254 && PROIO_yycheck[yyn] == PROIO_yychar) - { - if (PROIO_yyssp >= PROIO_yyss + 600 - 1) - { - goto yyoverflow; - } - *++PROIO_yyssp = yystate = PROIO_yytable[yyn]; - *++PROIO_yyvsp = PROIO_yylval; - PROIO_yychar = (-1); - if (PROIO_yyerrflag > 0) --PROIO_yyerrflag; - goto yyloop; - } - if ((yyn = PROIO_yyrindex[yystate]) && (yyn += PROIO_yychar) >= 0 && - yyn <= 254 && PROIO_yycheck[yyn] == PROIO_yychar) - { - yyn = PROIO_yytable[yyn]; - goto yyreduce; - } - if (PROIO_yyerrflag) goto yyinrecovery; -yynewerror: - PROIO_yyerror("syntax error"); -yyerrlab: - ++PROIO_yynerrs; -yyinrecovery: - if (PROIO_yyerrflag < 3) - { - PROIO_yyerrflag = 3; - for (;;) - { - if ((yyn = PROIO_yysindex[*PROIO_yyssp]) && (yyn += 256) >= 0 && - yyn <= 254 && PROIO_yycheck[yyn] == 256) - { - if (PROIO_yyssp >= PROIO_yyss + 600 - 1) - { - goto yyoverflow; - } - *++PROIO_yyssp = yystate = PROIO_yytable[yyn]; - *++PROIO_yyvsp = PROIO_yylval; - goto yyloop; - } - else - { - if (PROIO_yyssp <= PROIO_yyss) goto yyabort; - --PROIO_yyssp; - --PROIO_yyvsp; - } - } - } - else - { - if (PROIO_yychar == 0) goto yyabort; - PROIO_yychar = (-1); - goto yyloop; - } -yyreduce: - yym = PROIO_yylen[yyn]; - PROIO_yyval = PROIO_yyvsp[1-yym]; - switch (yyn) - { -case 3: -#line 68 "parser.y" -{process_command(proio_cons(wxmake_word(PROIO_yyvsp[-1].s), 0)); free(PROIO_yyvsp[-1].s);} -break; -case 4: -#line 70 "parser.y" -{process_command(PROIO_yyvsp[-1].s);} -break; -case 5: -#line 72 "parser.y" -{syntax_error("Unrecognized command.");} -break; -case 6: -#line 76 "parser.y" -{PROIO_yyval.s = proio_cons(wxmake_word(PROIO_yyvsp[-3].s), PROIO_yyvsp[-1].s); free(PROIO_yyvsp[-3].s);} -break; -case 7: -#line 78 "parser.y" -{PROIO_yyval.s = proio_cons(0, 0);} -break; -case 8: -#line 80 "parser.y" -{PROIO_yyval.s = PROIO_yyvsp[-1].s; } -break; -case 9: -#line 84 "parser.y" -{PROIO_yyval.s = 0;} -break; -case 10: -#line 86 "parser.y" -{PROIO_yyval.s = proio_cons(PROIO_yyvsp[0].s, 0);} -break; -case 11: -#line 89 "parser.y" -{PROIO_yyval.s = proio_cons(PROIO_yyvsp[-2].s, PROIO_yyvsp[0].s);} -break; -case 12: -#line 93 "parser.y" -{PROIO_yyval.s = proio_cons(wxmake_word("="), proio_cons(wxmake_word(PROIO_yyvsp[-2].s), proio_cons(PROIO_yyvsp[0].s, 0))); - free(PROIO_yyvsp[-2].s); } -break; -case 13: -#line 96 "parser.y" -{PROIO_yyval.s = PROIO_yyvsp[0].s; } -break; -case 14: -#line 99 "parser.y" -{PROIO_yyval.s = wxmake_word(PROIO_yyvsp[0].s); free(PROIO_yyvsp[0].s);} -break; -case 15: -#line 101 "parser.y" -{PROIO_yyval.s = wxmake_string(PROIO_yyvsp[0].s); free(PROIO_yyvsp[0].s);} -break; -case 16: -#line 103 "parser.y" -{PROIO_yyval.s = wxmake_integer(PROIO_yyvsp[0].s); free(PROIO_yyvsp[0].s);} -break; -case 17: -#line 105 "parser.y" -{PROIO_yyval.s = wxmake_real(PROIO_yyvsp[-2].s, PROIO_yyvsp[0].s); free(PROIO_yyvsp[-2].s); free(PROIO_yyvsp[0].s); } -break; -case 18: -#line 107 "parser.y" -{PROIO_yyval.s = wxmake_exp(PROIO_yyvsp[-2].s, PROIO_yyvsp[0].s); free(PROIO_yyvsp[-2].s); free(PROIO_yyvsp[0].s); } -break; -case 19: -#line 110 "parser.y" -{PROIO_yyval.s = wxmake_exp2(PROIO_yyvsp[-4].s, PROIO_yyvsp[-2].s, PROIO_yyvsp[0].s); free(PROIO_yyvsp[-4].s); free(PROIO_yyvsp[-2].s); - free(PROIO_yyvsp[0].s); } -break; -case 20: -#line 114 "parser.y" -{PROIO_yyval.s = PROIO_yyvsp[0].s;} -break; -#line 461 "y_tab.c" - } - PROIO_yyssp -= yym; - yystate = *PROIO_yyssp; - PROIO_yyvsp -= yym; - yym = PROIO_yylhs[yyn]; - if (yystate == 0 && yym == 0) - { - yystate = 1; - *++PROIO_yyssp = 1; - *++PROIO_yyvsp = PROIO_yyval; - if (PROIO_yychar < 0) - { - if ((PROIO_yychar = PROIO_yylex()) < 0) PROIO_yychar = 0; - } - if (PROIO_yychar == 0) goto yyaccept; - goto yyloop; - } - if ((yyn = PROIO_yygindex[yym]) && (yyn += yystate) >= 0 && - yyn <= 254 && PROIO_yycheck[yyn] == yystate) - yystate = PROIO_yytable[yyn]; - else - yystate = PROIO_yydgoto[yym]; - if (PROIO_yyssp >= PROIO_yyss + 600 - 1) - { - goto yyoverflow; - } - *++PROIO_yyssp = yystate; - *++PROIO_yyvsp = PROIO_yyval; - goto yyloop; -yyoverflow: - PROIO_yyerror("yacc stack overflow"); -yyabort: - return (1); -yyaccept: - return (0); -} diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 0c1dce5871..eb333546fd 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -107,12 +107,7 @@ void wxFrame::PositionMenuBar() #endif // wxUSE_TOOLBAR m_frameMenuBar->SetSize(0, -#ifdef __WXPM__ // FIXME -- remove this, make wxOS2/Univ behave as - // the rest of the world!!! - GetClientSize().y - heightMbar - heightTbar, -#else - (heightMbar + heightTbar), -#endif GetClientSize().x, heightMbar); } } @@ -193,7 +188,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const { wxPoint pt = wxFrameBase::GetClientAreaOrigin(); -#if wxUSE_MENUS && !defined(__WXPM__) +#if wxUSE_MENUS if ( m_frameMenuBar ) { pt.y += m_frameMenuBar->GetSize().y; diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 87300a6984..9536f6b729 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -97,8 +97,6 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB) #elif defined(__WXX11__) IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11) -#elif defined(__WXPM__) - IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowOS2) #endif BEGIN_EVENT_TABLE(wxWindow, wxWindowNative) diff --git a/src/unix/sockunix.cpp b/src/unix/sockunix.cpp index af723e0dd9..d69c369439 100644 --- a/src/unix/sockunix.cpp +++ b/src/unix/sockunix.cpp @@ -30,10 +30,6 @@ # include #endif -#ifdef __EMX__ - #include -#endif - #ifndef WX_SOCKLEN_T #ifdef VMS diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index da811420e0..50fe929c31 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -147,20 +147,10 @@ #if !defined(HAVE_USLEEP) && \ ((defined(__SUN__) && !defined(__SunOs_5_6) && \ !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \ - defined(__osf__) || defined(__EMX__)) + defined(__osf__)) extern "C" { - #ifdef __EMX__ - /* I copied this from the XFree86 diffs. AV. */ - #define INCL_DOSPROCESS - #include - inline void usleep(unsigned long delay) - { - DosSleep(delay ? (delay/1000l) : 1l); - } - #else // Unix - int usleep(unsigned int usec); - #endif // __EMX__/Unix + int usleep(unsigned int usec); }; #define HAVE_USLEEP 1 @@ -659,7 +649,7 @@ long wxExecute(char **argv, int flags, wxProcess *process, // always opened so don't do it any more, after all there doesn't // seem to be any real problem with keeping them opened -#if !defined(__VMS) && !defined(__EMX__) +#if !defined(__VMS) if ( flags & wxEXEC_MAKE_GROUP_LEADER ) { // Set process group to child process' pid. Then killing -pid diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp index 0865063dcb..ee926d1e41 100644 --- a/src/xrc/xh_menu.cpp +++ b/src/xrc/xh_menu.cpp @@ -103,7 +103,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource() wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel, GetText(wxT("help")), kind); -#if (!defined(__WXMSW__) && !defined(__WXPM__)) || wxUSE_OWNER_DRAWN +#if !defined(__WXMSW__) || wxUSE_OWNER_DRAWN if (HasParam(wxT("bitmap"))) { // currently only wxMSW has support for using different checked diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp index 8f4a6d0200..0b8e2de1d5 100644 --- a/src/xrc/xh_tglbtn.cpp +++ b/src/xrc/xh_tglbtn.cpp @@ -35,7 +35,7 @@ wxObject *wxToggleButtonXmlHandler::DoCreateResource() wxObject *control = m_instance; -#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__)) +#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__)) if (m_class == wxT("wxBitmapToggleButton")) { @@ -81,7 +81,7 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control) button->SetValue(GetBool( wxT("checked"))); } -#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__)) +#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__)) void wxToggleButtonXmlHandler::DoCreateBitmapToggleButton(wxObject *control) { wxBitmapToggleButton *button = wxDynamicCast(control, wxBitmapToggleButton); diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 06ca0c1c73..44057f1a4f 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -597,9 +597,6 @@ static void ProcessPlatformProperty(wxXmlNode *node) #elif defined(__UNIX__) if (s == wxT("unix")) isok = true; #endif -#ifdef __OS2__ - if (s == wxT("os2")) isok = true; -#endif if (isok) break; diff --git a/tests/Makefile.in b/tests/Makefile.in index bb3b96765f..243cc30539 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -166,7 +166,6 @@ TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \ $(CXXFLAGS) TEST_GUI_OBJECTS = \ $(__test_gui___win32rc) \ - $(__test_gui_os2_lib_res) \ test_gui_asserthelper.o \ test_gui_test.o \ test_gui_testableframe.o \ @@ -308,8 +307,6 @@ TEST_GUI_ODEP = $(_____pch_testprec_test_gui_testprec_h_gch___depname) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__test_gui___win32rc = test_gui_sample_rc.o -@COND_PLATFORM_OS2_1@__test_gui_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ = test_gui.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_bundle___depname \ diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in index 67fc48901f..7e9646282e 100644 --- a/tests/benchmarks/Makefile.in +++ b/tests/benchmarks/Makefile.in @@ -62,7 +62,6 @@ BENCH_GUI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) BENCH_GUI_OBJECTS = \ $(__bench_gui___win32rc) \ - $(__bench_gui_os2_lib_res) \ bench_gui_bench.o \ bench_gui_image.o @@ -101,8 +100,6 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__bench_gui___win32rc = bench_gui_sample_rc.o -@COND_PLATFORM_OS2_1@__bench_gui_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1_USE_GUI_1@__bench_gui_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ = bench_gui.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_USE_GUI_1@__bench_gui_bundle___depname \ diff --git a/tests/controls/windowtest.cpp b/tests/controls/windowtest.cpp index 534f9ed8a5..f5f3e67056 100644 --- a/tests/controls/windowtest.cpp +++ b/tests/controls/windowtest.cpp @@ -95,7 +95,7 @@ void WindowTestCase::tearDown() void WindowTestCase::ShowHideEvent() { -#if defined(__WXMSW__) || defined (__WXPM__) +#if defined(__WXMSW__) EventCounter show(m_window, wxEVT_SHOW); CPPUNIT_ASSERT(m_window->IsShown()); @@ -109,7 +109,7 @@ void WindowTestCase::ShowHideEvent() CPPUNIT_ASSERT(m_window->IsShown()); CPPUNIT_ASSERT_EQUAL(2, show.GetCount()); -#endif +#endif // __WXMSW__ } void WindowTestCase::KeyEvent() diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp index 2f33ae6640..f71f4324af 100644 --- a/tests/streams/textstreamtest.cpp +++ b/tests/streams/textstreamtest.cpp @@ -92,7 +92,7 @@ TextStreamTestCase::TextStreamTestCase() { } -#if defined(__WINDOWS__) || defined(__WXPM__) +#if defined(__WINDOWS__) # define NEWLINE "\r\n" # define NEWLINELEN 2 #elif defined(__WXMAC__) && !defined(__DARWIN__) diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index fa801a0336..77040cbf6f 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -47,7 +47,6 @@ WXEMULATOR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) WXEMULATOR_OBJECTS = \ $(__wxemulator___win32rc) \ - $(__wxemulator_os2_lib_res) \ wxemulator_emulator.o ### Conditionally set variables: ### @@ -86,8 +85,6 @@ COND_PLATFORM_OS2_1___wxemulator___os2_emxbindcmd = $(NM) wxemulator$(EXEEXT) \ @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wxemulator___win32rc = wxemulator_sample_rc.o -@COND_PLATFORM_OS2_1@__wxemulator_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res COND_MONOLITHIC_0___WXLIB_CORE_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index 572a604328..05f8b52aed 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -53,7 +53,6 @@ HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ - $(__helpview_os2_lib_res) \ helpview_helpview.o \ $(__helpview___win32rc) @@ -92,8 +91,6 @@ COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \ @COND_PLATFORM_OS2_1@__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__helpview_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__helpview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = helpview.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__helpview_bundle___depname = helpview_bundle diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index a83bf56a5c..8c6c3c6112 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -51,7 +51,6 @@ HHP2CACHED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = \ - $(__hhp2cached_os2_lib_res) \ hhp2cached_hhp2cached.o \ $(__hhp2cached___win32rc) @@ -90,8 +89,6 @@ COND_PLATFORM_OS2_1___hhp2cached___os2_emxbindcmd = $(NM) hhp2cached$(EXEEXT) \ @COND_PLATFORM_OS2_1@__hhp2cached___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___hhp2cached___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__hhp2cached_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_WIN32_1@__hhp2cached___win32rc = hhp2cached_hhp2cached_rc.o COND_MONOLITHIC_0___WXLIB_HTML_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in index 684d8c20e6..06678af56d 100644 --- a/utils/screenshotgen/src/Makefile.in +++ b/utils/screenshotgen/src/Makefile.in @@ -55,7 +55,6 @@ SCREENSHOTGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) SCREENSHOTGEN_OBJECTS = \ - $(__screenshotgen_os2_lib_res) \ screenshotgen_screenshot_app.o \ screenshotgen_screenshot_main.o \ screenshotgen_guiframe.o \ @@ -100,8 +99,6 @@ COND_PLATFORM_OS2_1___screenshotgen___os2_emxbindcmd = $(NM) \ @COND_PLATFORM_OS2_1@__screenshotgen___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___screenshotgen___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__screenshotgen_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__screenshotgen_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = screenshotgen.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__screenshotgen_bundle___depname \ diff --git a/wx-config.in b/wx-config.in index ede85833a0..0ebad1ebdc 100755 --- a/wx-config.in +++ b/wx-config.in @@ -1374,8 +1374,8 @@ if [ -n "$output_option_rescomp" ]; then fi ;; - # neither rez not emxbind have any specific needs from - # us, so just output what was determined by configure. + # rez doesn't have any specific needs so just output what was + # determined by configure. *) echo @RESCOMP@ @WXCONFIG_RESFLAGS@ ;;