From 4234ea8be031f9249aaeae5015861d6dcd7e2f94 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 4 Jul 2001 18:27:43 +0000 Subject: [PATCH] use fontdlgg.cpp under wxUniv/GTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 5 +++-- include/wx/fontdlg.h | 24 ++++++------------------ src/generic/fontdlgg.cpp | 4 ++-- src/gtk/files.lst | 7 ++++--- src/gtk1/files.lst | 7 ++++--- 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index b27071eac4..88e85ad84c 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -62,7 +62,7 @@ dcpsg.cpp Generic NotMSW dirctrlg.cpp Generic dirdlgg.cpp Generic NotWin32,NotOS2 dragimgg.cpp Generic NotOS2 -fontdlgg.cpp Generic Generic,NotGTK,NotOS2 +fontdlgg.cpp Generic Generic,NotOS2 filedlgg.cpp Generic NotMSW,NotX,NotOS2 grid.cpp Generic gridctrl.cpp Generic @@ -375,7 +375,8 @@ brush.cpp GTK LowLevel button.cpp GTK checkbox.cpp GTK checklst.cpp GTK -choice.cpp GTK +# FIXME: remove LowLevel from choice! +choice.cpp GTK LowLevel clipbrd.cpp GTK LowLevel colour.cpp GTK LowLevel combobox.cpp GTK diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index a7fe76f87d..88205f033f 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -3,28 +3,16 @@ #if wxUSE_FONTDLG -#if defined(__WXMSW__) -#include "wx/msw/fontdlg.h" -#elif defined(__WXMOTIF__) -#include "wx/generic/fontdlgg.h" +#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__) +# include "wx/generic/fontdlgg.h" # define wxFontDialog wxGenericFontDialog # define sm_classwxFontDialog sm_classwxGenericFontDialog +#elif defined(__WXMSW__) +# include "wx/msw/fontdlg.h" #elif defined(__WXGTK__) -#include "wx/gtk/fontdlg.h" -#elif defined(__WXQT__) -#include "wx/generic/fontdlgg.h" -# define wxFontDialog wxGenericFontDialog -# define sm_classwxFontDialog sm_classwxGenericFontDialog -#elif defined(__WXMAC__) -#include "wx/generic/fontdlgg.h" -# define wxFontDialog wxGenericFontDialog -# define sm_classwxFontDialog sm_classwxGenericFontDialog +# include "wx/gtk/fontdlg.h" #elif defined(__WXPM__) -#include "wx/os2/fontdlg.h" -#elif defined(__WXSTUBS__) -#include "wx/generic/fontdlgg.h" -# define wxFontDialog wxGenericFontDialog -# define sm_classwxFontDialog sm_classwxGenericFontDialog +# include "wx/os2/fontdlg.h" #endif #endif // wxUSE_FONTDLG diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp index 90de224fe0..91ad7da07b 100644 --- a/src/generic/fontdlgg.cpp +++ b/src/generic/fontdlgg.cpp @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXUNIVERSAL__)) + #ifndef WX_PRECOMP #include #include "wx/utils.h" @@ -34,8 +36,6 @@ #include "wx/intl.h" #endif -#if wxUSE_FONTDLG - #include #include diff --git a/src/gtk/files.lst b/src/gtk/files.lst index b7dd268280..763d5adfb1 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 21:37, 2001/07/03 +# This file was automatically generated by tmake at 20:23, 2001/07/04 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -12,6 +12,7 @@ ALL_SOURCES = \ generic/dirdlgg.cpp \ generic/dragimgg.cpp \ generic/filedlgg.cpp \ + generic/fontdlgg.cpp \ generic/grid.cpp \ generic/gridctrl.cpp \ generic/gridsel.cpp \ @@ -832,6 +833,7 @@ GENERICOBJS = \ dirdlgg.o \ dragimgg.o \ filedlgg.o \ + fontdlgg.o \ grid.o \ gridctrl.o \ gridsel.o \ @@ -879,6 +881,7 @@ GENERICDEPS = \ dirdlgg.d \ dragimgg.d \ filedlgg.d \ + fontdlgg.d \ grid.d \ gridctrl.d \ gridsel.d \ @@ -1061,7 +1064,6 @@ GUI_LOWLEVEL_OBJS = \ pen.o \ region.o \ settings.o \ - tbargtk.o \ timer.o \ tooltip.o \ utilsgtk.o \ @@ -1093,7 +1095,6 @@ GUI_LOWLEVEL_DEPS = \ pen.d \ region.d \ settings.d \ - tbargtk.d \ timer.d \ tooltip.d \ utilsgtk.d \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index b7dd268280..763d5adfb1 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 21:37, 2001/07/03 +# This file was automatically generated by tmake at 20:23, 2001/07/04 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -12,6 +12,7 @@ ALL_SOURCES = \ generic/dirdlgg.cpp \ generic/dragimgg.cpp \ generic/filedlgg.cpp \ + generic/fontdlgg.cpp \ generic/grid.cpp \ generic/gridctrl.cpp \ generic/gridsel.cpp \ @@ -832,6 +833,7 @@ GENERICOBJS = \ dirdlgg.o \ dragimgg.o \ filedlgg.o \ + fontdlgg.o \ grid.o \ gridctrl.o \ gridsel.o \ @@ -879,6 +881,7 @@ GENERICDEPS = \ dirdlgg.d \ dragimgg.d \ filedlgg.d \ + fontdlgg.d \ grid.d \ gridctrl.d \ gridsel.d \ @@ -1061,7 +1064,6 @@ GUI_LOWLEVEL_OBJS = \ pen.o \ region.o \ settings.o \ - tbargtk.o \ timer.o \ tooltip.o \ utilsgtk.o \ @@ -1093,7 +1095,6 @@ GUI_LOWLEVEL_DEPS = \ pen.d \ region.d \ settings.d \ - tbargtk.d \ timer.d \ tooltip.d \ utilsgtk.d \ -- 2.45.2