Use the current font for the DoGetBestSize calculation

[wxWidgets.git] / src / msw / makefile.twn

diff --git a/src/msw/makefile.twn b/src/msw/makefile.twn
index 069d86af37a75b17f699d414108b114d62e868c6..56c206842e178ee019c7f29dad6ed1bc228a47da 100644 (file)
--- a/src/msw/makefile.twn
+++ b/src/msw/makefile.twn
@@ -61,6 +61,7 @@ GENERICOBJS= \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \

+  $(GENDIR)/progdlgg.$(OBJSUFF) \

   $(GENDIR)/prop.$(OBJSUFF) \
   $(GENDIR)/propform.$(OBJSUFF) \
   $(GENDIR)/proplist.$(OBJSUFF) \
   $(GENDIR)/prop.$(OBJSUFF) \
   $(GENDIR)/propform.$(OBJSUFF) \
   $(GENDIR)/proplist.$(OBJSUFF) \


@@ -80,6 +81,7 @@ GENERICOBJS= \
 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \
 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \

+  $(COMMDIR)/dcbase.$(OBJSUFF) \

   $(COMMDIR)/docview.$(OBJSUFF) \
   $(COMMDIR)/docmdi.$(OBJSUFF) \
   $(COMMDIR)/dynarray.$(OBJSUFF) \
   $(COMMDIR)/docview.$(OBJSUFF) \
   $(COMMDIR)/docmdi.$(OBJSUFF) \
   $(COMMDIR)/dynarray.$(OBJSUFF) \


@@ -91,6 +93,9 @@ COMMONOBJS = \
   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \
   $(COMMDIR)/image.$(OBJSUFF) \
   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \
   $(COMMDIR)/image.$(OBJSUFF) \

+  $(COMMDIR)/imagbmp.$(OBJSUFF) \
+  $(COMMDIR)/imagpng.$(OBJSUFF) \
+  $(COMMDIR)/imagjpeg.$(OBJSUFF) \

   $(COMMDIR)/intl.$(OBJSUFF) \
   $(COMMDIR)/ipcbase.$(OBJSUFF) \
   $(COMMDIR)/layout.$(OBJSUFF) \
   $(COMMDIR)/intl.$(OBJSUFF) \
   $(COMMDIR)/ipcbase.$(OBJSUFF) \
   $(COMMDIR)/layout.$(OBJSUFF) \


@@ -99,7 +104,6 @@ COMMONOBJS = \
   $(COMMDIR)/module.$(OBJSUFF) \
   $(COMMDIR)/mimetype.$(OBJSUFF) \
   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/module.$(OBJSUFF) \
   $(COMMDIR)/mimetype.$(OBJSUFF) \
   $(COMMDIR)/object.$(OBJSUFF) \

-  $(COMMDIR)/odbc.$(OBJSUFF) \

   $(COMMDIR)/process.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \
   $(COMMDIR)/process.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \


@@ -152,6 +156,7 @@ MSWOBJS = \
   button.$(OBJSUFF) \
   checkbox.$(OBJSUFF) \
   checklst.$(OBJSUFF) \
   button.$(OBJSUFF) \
   checkbox.$(OBJSUFF) \
   checklst.$(OBJSUFF) \

+  caret.$(OBJSUFF) \

   choice.$(OBJSUFF) \
   clipbrd.$(OBJSUFF) \
   colordlg.$(OBJSUFF) \
   choice.$(OBJSUFF) \
   clipbrd.$(OBJSUFF) \
   colordlg.$(OBJSUFF) \


@@ -173,7 +178,6 @@ MSWOBJS = \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
   frame.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
   frame.$(OBJSUFF) \

-  gaugemsw.$(OBJSUFF) \

   gauge95.$(OBJSUFF) \
   gdiobj.$(OBJSUFF) \
   helpwin.$(OBJSUFF) \
   gauge95.$(OBJSUFF) \
   gdiobj.$(OBJSUFF) \
   helpwin.$(OBJSUFF) \