Minimal (nearly empty) wxDisplay for wxMGL (to compensate src/common/tplvcmn.cpp...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 79ec37097df273977c230424aa9593a20a780755..c7e1810939f032f487caaccec41f3f558cc0e272 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1645,6 +1645,7 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
        wx/mgl/dcclient.h \
        wx/mgl/dcmemory.h \
        wx/mgl/dcscreen.h \
+       wx/mgl/display.h \
        wx/mgl/font.h \
        wx/mgl/fontutil.h \
        wx/mgl/gdiobj.h \
@@ -3471,6 +3472,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
        monodll_dcmemory.o \
        monodll_dcscreen.o \
        monodll_dirmgl.o \
+       monodll_display.o \
        monodll_evtloop.o \
        monodll_font.o \
        monodll_fontenum.o \
@@ -4265,6 +4267,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
        monodll_dcmemory.o \
        monodll_dcscreen.o \
        monodll_dirmgl.o \
+       monodll_display.o \
        monodll_evtloop.o \
        monodll_font.o \
        monodll_fontenum.o \
@@ -5091,6 +5094,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
        monolib_dcmemory.o \
        monolib_dcscreen.o \
        monolib_dirmgl.o \
+       monolib_display.o \
        monolib_evtloop.o \
        monolib_font.o \
        monolib_fontenum.o \
@@ -5886,6 +5890,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
        monolib_dcmemory.o \
        monolib_dcscreen.o \
        monolib_dirmgl.o \
+       monolib_display.o \
        monolib_evtloop.o \
        monolib_font.o \
        monolib_fontenum.o \
@@ -6944,6 +6949,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
        coredll_dcmemory.o \
        coredll_dcscreen.o \
        coredll_dirmgl.o \
+       coredll_display.o \
        coredll_evtloop.o \
        coredll_font.o \
        coredll_fontenum.o \
@@ -7739,6 +7745,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
        coredll_dcmemory.o \
        coredll_dcscreen.o \
        coredll_dirmgl.o \
+       coredll_display.o \
        coredll_evtloop.o \
        coredll_font.o \
        coredll_fontenum.o \
@@ -8273,6 +8280,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
        corelib_dcmemory.o \
        corelib_dcscreen.o \
        corelib_dirmgl.o \
+       corelib_display.o \
        corelib_evtloop.o \
        corelib_font.o \
        corelib_fontenum.o \
@@ -9068,6 +9076,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
        corelib_dcmemory.o \
        corelib_dcscreen.o \
        corelib_dirmgl.o \
+       corelib_display.o \
        corelib_evtloop.o \
        corelib_font.o \
        corelib_fontenum.o \
@@ -13082,6 +13091,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
 
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_display.o: $(srcdir)/src/mgl/display.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/display.cpp
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/mac/carbon/display.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/display.cpp
 
@@ -16859,6 +16871,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
 
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_display.o: $(srcdir)/src/mgl/display.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/display.cpp
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/mac/carbon/display.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/display.cpp
 
@@ -21053,6 +21068,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
 
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_display.o: $(srcdir)/src/mgl/display.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/display.cpp
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/mac/carbon/display.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/display.cpp
 
@@ -23819,6 +23837,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
 
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_display.o: $(srcdir)/src/mgl/display.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/display.cpp
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/mac/carbon/display.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/display.cpp
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d8202ab2bba3a1772175897ae326318d1fbe2933..5fae0df03694803b80fdca67c26c9a9af8b495f1 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1693,6 +1693,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mgl/dcmemory.cpp
     src/mgl/dcscreen.cpp
     src/mgl/dirmgl.cpp
+    src/mgl/display.cpp
     src/mgl/evtloop.cpp
     src/mgl/font.cpp
     src/mgl/fontenum.cpp
@@ -1721,6 +1722,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mgl/dcclient.h
     wx/mgl/dcmemory.h
     wx/mgl/dcscreen.h
+    wx/mgl/display.h
     wx/mgl/font.h
     wx/mgl/fontutil.h
     wx/mgl/gdiobj.h

diff --git a/build/mgl/config.wat b/build/mgl/config.wat
index 0ddcf1b4bedb2b5d7dedd5768b952b6067086c73..8d4f484c022db27453d8a9237e9641aadd4a6462 100644 (file)
--- a/build/mgl/config.wat
+++ b/build/mgl/config.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This configuration file was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Beware that all changes made to this file will be overwritten next
 #     time you run Bakefile!
 # =========================================================================
@@ -73,6 +73,9 @@ 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
 

diff --git a/build/mgl/makefile.wat b/build/mgl/makefile.wat
index dac2fd7727e630a88e6e902ef8f6f42009b45e26..48bc6fcf5d33eb8ad80505230b480625a0266111 100644 (file)
--- a/build/mgl/makefile.wat
+++ b/build/mgl/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -88,6 +88,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(____CORE_SRC_FILENAMES_OBJECTS) &
+       $(OBJS)\monodll_datavcmn.obj &
        $(OBJS)\monodll_calctrl.obj &
        $(OBJS)\monodll_datectlg.obj &
        $(OBJS)\monodll_grid.obj &
@@ -197,6 +198,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_dcmemory.obj &
        $(OBJS)\monodll_dcscreen.obj &
        $(OBJS)\monodll_dirmgl.obj &
+       $(OBJS)\monodll_display.obj &
        $(OBJS)\monodll_evtloop.obj &
        $(OBJS)\monodll_font.obj &
        $(OBJS)\monodll_fontenum.obj &
@@ -353,6 +355,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_splitter.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 &
@@ -369,6 +372,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(____CORE_SRC_FILENAMES_1_OBJECTS) &
+       $(OBJS)\monolib_datavcmn.obj &
        $(OBJS)\monolib_calctrl.obj &
        $(OBJS)\monolib_datectlg.obj &
        $(OBJS)\monolib_grid.obj &
@@ -478,6 +482,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_dcmemory.obj &
        $(OBJS)\monolib_dcscreen.obj &
        $(OBJS)\monolib_dirmgl.obj &
+       $(OBJS)\monolib_display.obj &
        $(OBJS)\monolib_evtloop.obj &
        $(OBJS)\monolib_font.obj &
        $(OBJS)\monolib_fontenum.obj &
@@ -634,6 +639,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_splitter.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 &
@@ -693,6 +699,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_dcmemory.obj &
        $(OBJS)\coredll_dcscreen.obj &
        $(OBJS)\coredll_dirmgl.obj &
+       $(OBJS)\coredll_display.obj &
        $(OBJS)\coredll_evtloop.obj &
        $(OBJS)\coredll_font.obj &
        $(OBJS)\coredll_fontenum.obj &
@@ -849,6 +856,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_splitter.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 &
@@ -880,6 +888,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_dcmemory.obj &
        $(OBJS)\corelib_dcscreen.obj &
        $(OBJS)\corelib_dirmgl.obj &
+       $(OBJS)\corelib_display.obj &
        $(OBJS)\corelib_evtloop.obj &
        $(OBJS)\corelib_font.obj &
        $(OBJS)\corelib_fontenum.obj &
@@ -1036,6 +1045,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_splitter.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 &
@@ -1063,20 +1073,24 @@ __mediadll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_GUI 1
+!ifeq USE_MEDIA 1
 __mediadll___depname = &
        $(LIBDIRNAME)\wx$(PORTNAME)univ$(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)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 !endif
 !endif
 !endif
+!endif
 __odbcdll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
@@ -1352,11 +1366,11 @@ MAKEARGS = DOS32="$(DOS32)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" &
        CPP="$(CPP)" SHARED="$(SHARED)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
-       USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" &
-       USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" &
-       USE_RTTI="$(USE_RTTI)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" &
+       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
+       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)"
 WX_RELEASE_NODOT = 27
 OBJS = wat_$(PORTNAME)univ$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -1912,6 +1926,7 @@ ADVDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
        -dWXMAKINGDLL_ADV /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) &
        $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  &
+       $(OBJS)\advdll_datavcmn.obj &
        $(OBJS)\advdll_calctrl.obj &
        $(OBJS)\advdll_datectlg.obj &
        $(OBJS)\advdll_grid.obj &
@@ -1938,6 +1953,7 @@ ADVLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
        /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
        $(CXXFLAGS)
 ADVLIB_OBJECTS =  &
+       $(OBJS)\advlib_datavcmn.obj &
        $(OBJS)\advlib_calctrl.obj &
        $(OBJS)\advlib_datectlg.obj &
        $(OBJS)\advlib_grid.obj &
@@ -2478,6 +2494,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_GUI 1
+!ifeq USE_MEDIA 1
 $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll :  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(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
@@ -2493,10 +2510,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 !endif
 !endif
 !endif
+!endif
 
 !ifeq MONOLITHIC 0
 !ifeq SHARED 0
 !ifeq USE_GUI 1
+!ifeq USE_MEDIA 1
 $(LIBDIRNAME)\wx$(PORTNAME)univ$(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
@@ -2504,6 +2523,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 !endif
 !endif
 !endif
+!endif
 
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
@@ -2763,6 +2783,7 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo USE_THREADS=0 >>$(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_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@@ -3383,6 +3404,9 @@ $(OBJS)\monodll_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
 $(OBJS)\monodll_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_display.obj :  .AUTODEPEND ..\..\src\mgl\display.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -3851,6 +3875,9 @@ $(OBJS)\monodll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 $(OBJS)\monodll_tipwin.obj :  .AUTODEPEND ..\..\src\generic\tipwin.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_toolbkg.obj :  .AUTODEPEND ..\..\src\generic\toolbkg.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_treectlg.obj :  .AUTODEPEND ..\..\src\generic\treectlg.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -3863,6 +3890,9 @@ $(OBJS)\monodll_vlbox.obj :  .AUTODEPEND ..\..\src\generic\vlbox.cpp
 $(OBJS)\monodll_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -4400,6 +4430,9 @@ $(OBJS)\monolib_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
 $(OBJS)\monolib_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_display.obj :  .AUTODEPEND ..\..\src\mgl\display.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -4868,6 +4901,9 @@ $(OBJS)\monolib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 $(OBJS)\monolib_tipwin.obj :  .AUTODEPEND ..\..\src\generic\tipwin.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_toolbkg.obj :  .AUTODEPEND ..\..\src\generic\toolbkg.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_treectlg.obj :  .AUTODEPEND ..\..\src\generic\treectlg.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -4880,6 +4916,9 @@ $(OBJS)\monolib_vlbox.obj :  .AUTODEPEND ..\..\src\generic\vlbox.cpp
 $(OBJS)\monolib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -5645,6 +5684,9 @@ $(OBJS)\coredll_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
 $(OBJS)\coredll_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
+$(OBJS)\coredll_display.obj :  .AUTODEPEND ..\..\src\mgl\display.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+
 $(OBJS)\coredll_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -6113,6 +6155,9 @@ $(OBJS)\coredll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 $(OBJS)\coredll_tipwin.obj :  .AUTODEPEND ..\..\src\generic\tipwin.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
+$(OBJS)\coredll_toolbkg.obj :  .AUTODEPEND ..\..\src\generic\toolbkg.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+
 $(OBJS)\coredll_treectlg.obj :  .AUTODEPEND ..\..\src\generic\treectlg.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -6179,6 +6224,9 @@ $(OBJS)\corelib_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
 $(OBJS)\corelib_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
+$(OBJS)\corelib_display.obj :  .AUTODEPEND ..\..\src\mgl\display.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+
 $(OBJS)\corelib_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
@@ -6647,6 +6695,9 @@ $(OBJS)\corelib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
 $(OBJS)\corelib_tipwin.obj :  .AUTODEPEND ..\..\src\generic\tipwin.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
+$(OBJS)\corelib_toolbkg.obj :  .AUTODEPEND ..\..\src\generic\toolbkg.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+
 $(OBJS)\corelib_treectlg.obj :  .AUTODEPEND ..\..\src\generic\treectlg.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
@@ -6659,6 +6710,9 @@ $(OBJS)\corelib_vlbox.obj :  .AUTODEPEND ..\..\src\generic\vlbox.cpp
 $(OBJS)\corelib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
+$(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -6710,6 +6764,9 @@ $(OBJS)\advdll_richtextxml.obj :  .AUTODEPEND ..\..\src\richtext\richtextxml.cpp
 $(OBJS)\advdll_richtexthtml.obj :  .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
+$(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
+       $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 

diff --git a/include/wx/display.h b/include/wx/display.h
index 7c829dc36a2f9e51efb4a5627f5e25f8fac2db32..acf445c8c8cff880ed34cf52a4543a7db4fd9df8 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -113,6 +113,8 @@ protected:
     #include "wx/mac/display.h"
 #elif defined(__WXPM__)
     #include "wx/os2/display.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/display.h"
 #endif
 
 #endif // wxUSE_DISPLAY

diff --git a/include/wx/mgl/display.h b/include/wx/mgl/display.h
new file mode 100644 (file)
index 0000000..9cb2198
--- /dev/null
+++ b/include/wx/mgl/display.h
@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/mgl/display.h
+// Purpose:     wxDisplay class customization for WXMGL
+// Author:      Wlodzimierz ABX Skiba
+// Modified by:
+// Created:     05/03/2006
+// RCS-ID:      $Id$
+// Copyright:   (c) Wlodzimierz Skiba
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MGL_DISPLAY_H_
+#define _WX_MGL_DISPLAY_H_
+
+class WXDLLEXPORT wxDisplay : public wxDisplayBase
+{
+public:
+
+    // create the display object for the given physical display
+    wxDisplay(size_t index = 0);
+
+    virtual ~wxDisplay();
+
+    // implement base class pure virtuals
+    virtual bool IsOk() const;
+    virtual wxRect GetGeometry() const;
+    virtual wxString GetName() const;
+
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const;
+    virtual wxVideoMode GetCurrentMode() const;
+    virtual bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode);
+
+    virtual bool IsPrimary() const;
+
+private:
+
+    DECLARE_NO_COPY_CLASS(wxDisplay)
+};
+
+#endif // _WX_MGL_DISPLAY_H_

diff --git a/src/mgl/display.cpp b/src/mgl/display.cpp
new file mode 100644 (file)
index 0000000..86365ff
--- /dev/null
+++ b/src/mgl/display.cpp
@@ -0,0 +1,99 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/mgl/display.cpp
+// Purpose:     MGL Implementation of wxDisplay class
+// Author:      Wlodzimierz ABX Skiba
+// Modified by:
+// Created:     05/03/2006
+// RCS-ID:      $Id$
+// Copyright:   (c) Wlodzimierz Skiba
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_DISPLAY
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
+#include "wx/display.h"
+
+/* static */
+int wxDisplayBase::GetFromPoint ( const wxPoint& WXUNUSED(pt) )
+{
+    // TODO
+    return wxNOT_FOUND;
+}
+
+/* static */
+size_t wxDisplayBase::GetCount()
+{
+    // TODO
+    return 1;
+}
+
+// ----------------------------------------------------------------------------
+// wxDisplay ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxDisplay::wxDisplay ( size_t n )
+         : wxDisplayBase ( n )
+{
+}
+
+wxDisplay::~wxDisplay()
+{
+}
+
+bool wxDisplay::IsOk() const
+{
+    // TODO
+    return m_index < GetCount();
+}
+
+wxRect wxDisplay::GetGeometry() const
+{
+    wxRect rect;
+    // TODO
+    return rect;
+}
+
+wxString wxDisplay::GetName() const
+{
+    // TODO
+    return wxEmptyString;
+}
+
+wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& WXUNUSED(modeMatch)) const
+{
+    wxArrayVideoModes modes;
+    // TODO
+    return modes;
+}
+
+wxVideoMode wxDisplay::GetCurrentMode() const
+{
+    wxVideoMode mode;
+    // TODO
+    return mode;
+}
+
+bool wxDisplay::ChangeMode(const wxVideoMode& WXUNUSED(mode))
+{
+    // TODO
+    return false;
+}
+
+bool wxDisplay::IsPrimary() const
+{
+    // TODO
+    return false;
+}
+
+#endif // wxUSE_DISPLAY