AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use fontdlgg.cpp under wxUniv/GTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-07-04 18:27:43 +00:00
parent 7aa5864467
commit 4234ea8be0
5 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distrib/msw/tmake/filelist.txt
View File

@ -62,7 +62,7 @@ dcpsg.cpp Generic NotMSW
dirctrlg.cpp Generic dirctrlg.cpp Generic
dirdlgg.cpp Generic NotWin32,NotOS2 dirdlgg.cpp Generic NotWin32,NotOS2
dragimgg.cpp Generic NotOS2 dragimgg.cpp Generic NotOS2
fontdlgg.cpp Generic Generic,NotGTK,NotOS2 fontdlgg.cpp Generic Generic,NotOS2
filedlgg.cpp Generic NotMSW,NotX,NotOS2 filedlgg.cpp Generic NotMSW,NotX,NotOS2
grid.cpp Generic grid.cpp Generic
gridctrl.cpp Generic gridctrl.cpp Generic
@ -375,7 +375,8 @@ brush.cpp GTK LowLevel
button.cpp GTK button.cpp GTK
checkbox.cpp GTK checkbox.cpp GTK
checklst.cpp GTK checklst.cpp GTK
choice.cpp GTK # FIXME: remove LowLevel from choice!
choice.cpp GTK LowLevel
clipbrd.cpp GTK LowLevel clipbrd.cpp GTK LowLevel
colour.cpp GTK LowLevel colour.cpp GTK LowLevel
combobox.cpp GTK combobox.cpp GTK

18
include/wx/fontdlg.h
View File

@ -3,28 +3,16 @@
#if wxUSE_FONTDLG #if wxUSE_FONTDLG
#if defined(__WXMSW__) #if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "wx/msw/fontdlg.h"
#elif defined(__WXMOTIF__)
# include "wx/generic/fontdlgg.h" # include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog # define wxFontDialog wxGenericFontDialog
# define sm_classwxFontDialog sm_classwxGenericFontDialog # define sm_classwxFontDialog sm_classwxGenericFontDialog
#elif defined(__WXMSW__)
# include "wx/msw/fontdlg.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
# include "wx/gtk/fontdlg.h" # 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
#elif defined(__WXPM__) #elif defined(__WXPM__)
# include "wx/os2/fontdlg.h" # include "wx/os2/fontdlg.h"
#elif defined(__WXSTUBS__)
#include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog
# define sm_classwxFontDialog sm_classwxGenericFontDialog
#endif #endif
#endif // wxUSE_FONTDLG #endif // wxUSE_FONTDLG

4
src/generic/fontdlgg.cpp
View File

@ -20,6 +20,8 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXUNIVERSAL__))
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <stdio.h> #include <stdio.h>
#include "wx/utils.h" #include "wx/utils.h"
@ -34,8 +36,6 @@
#include "wx/intl.h" #include "wx/intl.h"
#endif #endif
#if wxUSE_FONTDLG
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

7
src/gtk/files.lst
View File

@ -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! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
ALL_SOURCES = \ ALL_SOURCES = \
generic/accel.cpp \ generic/accel.cpp \
@ -12,6 +12,7 @@ ALL_SOURCES = \
generic/dirdlgg.cpp \ generic/dirdlgg.cpp \
generic/dragimgg.cpp \ generic/dragimgg.cpp \
generic/filedlgg.cpp \ generic/filedlgg.cpp \
generic/fontdlgg.cpp \
generic/grid.cpp \ generic/grid.cpp \
generic/gridctrl.cpp \ generic/gridctrl.cpp \
generic/gridsel.cpp \ generic/gridsel.cpp \
@ -832,6 +833,7 @@ GENERICOBJS = \
dirdlgg.o \ dirdlgg.o \
dragimgg.o \ dragimgg.o \
filedlgg.o \ filedlgg.o \
fontdlgg.o \
grid.o \ grid.o \
gridctrl.o \ gridctrl.o \
gridsel.o \ gridsel.o \
@ -879,6 +881,7 @@ GENERICDEPS = \
dirdlgg.d \ dirdlgg.d \
dragimgg.d \ dragimgg.d \
filedlgg.d \ filedlgg.d \
fontdlgg.d \
grid.d \ grid.d \
gridctrl.d \ gridctrl.d \
gridsel.d \ gridsel.d \
@ -1061,7 +1064,6 @@ GUI_LOWLEVEL_OBJS = \
pen.o \ pen.o \
region.o \ region.o \
settings.o \ settings.o \
tbargtk.o \
timer.o \ timer.o \
tooltip.o \ tooltip.o \
utilsgtk.o \ utilsgtk.o \
@ -1093,7 +1095,6 @@ GUI_LOWLEVEL_DEPS = \
pen.d \ pen.d \
region.d \ region.d \
settings.d \ settings.d \
tbargtk.d \
timer.d \ timer.d \
tooltip.d \ tooltip.d \
utilsgtk.d \ utilsgtk.d \

7
src/gtk1/files.lst
View File

@ -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! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
ALL_SOURCES = \ ALL_SOURCES = \
generic/accel.cpp \ generic/accel.cpp \
@ -12,6 +12,7 @@ ALL_SOURCES = \
generic/dirdlgg.cpp \ generic/dirdlgg.cpp \
generic/dragimgg.cpp \ generic/dragimgg.cpp \
generic/filedlgg.cpp \ generic/filedlgg.cpp \
generic/fontdlgg.cpp \
generic/grid.cpp \ generic/grid.cpp \
generic/gridctrl.cpp \ generic/gridctrl.cpp \
generic/gridsel.cpp \ generic/gridsel.cpp \
@ -832,6 +833,7 @@ GENERICOBJS = \
dirdlgg.o \ dirdlgg.o \
dragimgg.o \ dragimgg.o \
filedlgg.o \ filedlgg.o \
fontdlgg.o \
grid.o \ grid.o \
gridctrl.o \ gridctrl.o \
gridsel.o \ gridsel.o \
@ -879,6 +881,7 @@ GENERICDEPS = \
dirdlgg.d \ dirdlgg.d \
dragimgg.d \ dragimgg.d \
filedlgg.d \ filedlgg.d \
fontdlgg.d \
grid.d \ grid.d \
gridctrl.d \ gridctrl.d \
gridsel.d \ gridsel.d \
@ -1061,7 +1064,6 @@ GUI_LOWLEVEL_OBJS = \
pen.o \ pen.o \
region.o \ region.o \
settings.o \ settings.o \
tbargtk.o \
timer.o \ timer.o \
tooltip.o \ tooltip.o \
utilsgtk.o \ utilsgtk.o \
@ -1093,7 +1095,6 @@ GUI_LOWLEVEL_DEPS = \
pen.d \ pen.d \
region.d \ region.d \
settings.d \ settings.d \
tbargtk.d \
timer.d \ timer.d \
tooltip.d \ tooltip.d \
utilsgtk.d \ utilsgtk.d \