1. wxDialogs are now destroyed when they go out of scope

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

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 7d18bfb64491dceca042d3be547737228501cacd..bb84243c76a5736fea2e5a964aa63680f9b7da3f 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -29,8 +29,6 @@ include $(WXDIR)/src/makeg95.env
 #               USE_GAUGE should be 1
 #   xpm:      XPM pixmap support
 #               USE_XPM_IN_X should be 1
 #               USE_GAUGE should be 1
 #   xpm:      XPM pixmap support
 #               USE_XPM_IN_X should be 1

-#   image:    GIF, BMP image reading
-#               USE_IMAGE_LOADING_IN_X should be 1

 #   wxstring: string class
 #               USE_GNU_WXSTRING should be 1
 #
 #   wxstring: string class
 #               USE_GNU_WXSTRING should be 1
 #


@@ -49,51 +47,63 @@ EXTRAOBJS=
 
 GENDIR=../generic
 COMMDIR=../common
 
 GENDIR=../generic
 COMMDIR=../common

+XPMDIR=../xpm

 OLEDIR=ole
 MSWDIR=.
 
 OLEDIR=ole
 MSWDIR=.
 

-GENERICOBJDIR=../generic/$(OBJDIR)
-COMMOBJDIR=../common/$(OBJDIR)
-OLEOBJDIR=ole/$(OBJDIR)
-MSWDIR=$(OBJDIR)
-

 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \

-  $(GENDIR)/colrdlgg.$(OBJSUFF) \
-  $(GENDIR)/fontdlgg.$(OBJSUFF) \
+  $(GENDIR)/dirdlgg.$(OBJSUFF) \

   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \

-  $(GENDIR)/helpxlp.$(OBJSUFF) \
-  $(GENDIR)/msgdlgg.$(OBJSUFF) \
+  $(GENDIR)/laywin.$(OBJSUFF) \

   $(GENDIR)/panelg.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \

-  $(GENDIR)/printps.$(OBJSUFF) \
-  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+  $(GENDIR)/progdlgg.$(OBJSUFF) \
+  $(GENDIR)/prop.$(OBJSUFF) \
+  $(GENDIR)/propform.$(OBJSUFF) \
+  $(GENDIR)/proplist.$(OBJSUFF) \
+  $(GENDIR)/sashwin.$(OBJSUFF) \

   $(GENDIR)/scrolwin.$(OBJSUFF) \
   $(GENDIR)/splitter.$(OBJSUFF) \
   $(GENDIR)/statusbr.$(OBJSUFF) \
   $(GENDIR)/tabg.$(OBJSUFF) \
   $(GENDIR)/textdlgg.$(OBJSUFF)
 
   $(GENDIR)/scrolwin.$(OBJSUFF) \
   $(GENDIR)/splitter.$(OBJSUFF) \
   $(GENDIR)/statusbr.$(OBJSUFF) \
   $(GENDIR)/tabg.$(OBJSUFF) \
   $(GENDIR)/textdlgg.$(OBJSUFF)
 

+#  $(GENDIR)/colrdlgg.$(OBJSUFF) \
+#  $(GENDIR)/fontdlgg.$(OBJSUFF) \
+#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+#  $(GENDIR)/printps.$(OBJSUFF) \
+#  $(GENDIR)/msgdlgg.$(OBJSUFF) \
+

 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \
 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \

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

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

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

   $(COMMDIR)/dynarray.$(OBJSUFF) \
   $(COMMDIR)/event.$(OBJSUFF) \
   $(COMMDIR)/file.$(OBJSUFF) \
   $(COMMDIR)/fileconf.$(OBJSUFF) \
   $(COMMDIR)/filefn.$(OBJSUFF) \
   $(COMMDIR)/dynarray.$(OBJSUFF) \
   $(COMMDIR)/event.$(OBJSUFF) \
   $(COMMDIR)/file.$(OBJSUFF) \
   $(COMMDIR)/fileconf.$(OBJSUFF) \
   $(COMMDIR)/filefn.$(OBJSUFF) \

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

   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \
   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \

+  $(COMMDIR)/image.$(OBJSUFF) \
+  $(COMMDIR)/imagebmp.$(OBJSUFF) \
+  $(COMMDIR)/imagpng.$(OBJSUFF) \
+  $(COMMDIR)/imagjpeg.$(OBJSUFF) \

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

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

   $(COMMDIR)/layout.$(OBJSUFF) \
   $(COMMDIR)/log.$(OBJSUFF) \
   $(COMMDIR)/memory.$(OBJSUFF) \
   $(COMMDIR)/module.$(OBJSUFF) \
   $(COMMDIR)/layout.$(OBJSUFF) \
   $(COMMDIR)/log.$(OBJSUFF) \
   $(COMMDIR)/memory.$(OBJSUFF) \
   $(COMMDIR)/module.$(OBJSUFF) \

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

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

-  $(COMMDIR)/postscrp.$(OBJSUFF) \
+  $(COMMDIR)/process.$(OBJSUFF) \

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


@@ -102,21 +112,43 @@ COMMONOBJS = \
   $(COMMDIR)/timercmn.$(OBJSUFF) \
   $(COMMDIR)/utilscmn.$(OBJSUFF) \
   $(COMMDIR)/validate.$(OBJSUFF) \
   $(COMMDIR)/timercmn.$(OBJSUFF) \
   $(COMMDIR)/utilscmn.$(OBJSUFF) \
   $(COMMDIR)/validate.$(OBJSUFF) \

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

   $(COMMDIR)/valtext.$(OBJSUFF) \
   $(COMMDIR)/date.$(OBJSUFF) \
   $(COMMDIR)/wxexpr.$(OBJSUFF) \
   $(COMMDIR)/hash.$(OBJSUFF) \
   $(COMMDIR)/list.$(OBJSUFF) \
   $(COMMDIR)/valtext.$(OBJSUFF) \
   $(COMMDIR)/date.$(OBJSUFF) \
   $(COMMDIR)/wxexpr.$(OBJSUFF) \
   $(COMMDIR)/hash.$(OBJSUFF) \
   $(COMMDIR)/list.$(OBJSUFF) \

+  $(COMMDIR)/variant.$(OBJSUFF) \
+  $(COMMDIR)/paper.$(OBJSUFF) \

   $(COMMDIR)/string.$(OBJSUFF) \
   $(COMMDIR)/time.$(OBJSUFF) \
   $(COMMDIR)/string.$(OBJSUFF) \
   $(COMMDIR)/time.$(OBJSUFF) \

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

   $(COMMDIR)/y_tab.$(OBJSUFF) \
   $(COMMDIR)/y_tab.$(OBJSUFF) \

+  $(COMMDIR)/stream.$(OBJSUFF) \
+  $(COMMDIR)/wfstream.$(OBJSUFF) \
+  $(COMMDIR)/mstream.$(OBJSUFF) \
+  $(COMMDIR)/zstream.$(OBJSUFF) \

   $(COMMDIR)/datstrm.$(OBJSUFF) \
   $(COMMDIR)/datstrm.$(OBJSUFF) \

-  $(COMMDIR)/extended.$(OBJSUFF)
-
-#  $(COMMDIR)/wxstrgnu/wxstrgnu.$(OBJSUFF) \
-#  $(COMMDIR)/wxstrgnu/wxregex.$(OBJSUFF)
+  $(COMMDIR)/objstrm.$(OBJSUFF) \
+  $(COMMDIR)/extended.$(OBJSUFF) \
+  $(COMMDIR)/wincmn.$(OBJSUFF) \
+  $(COMMDIR)/wxchar.$(OBJSUFF)
+
+# NOTE: if the socket-related files fail with a syntax error in Sockets.h,
+# remove the files (probably all GnuWin32 releases < b20). Cygwin b20 is OK,
+# Mingw32 may still have problems.
+#  $(COMMDIR)/socket.$(OBJSUFF) \
+#  $(COMMDIR)/sckaddr.$(OBJSUFF) \
+#  $(COMMDIR)/sckfile.$(OBJSUFF) \
+#  $(COMMDIR)/sckipc.$(OBJSUFF) \
+#  $(COMMDIR)/sckstrm.$(OBJSUFF) \
+#  $(COMMDIR)/protocol.$(OBJSUFF) \
+#  $(COMMDIR)/http.$(OBJSUFF) \
+#  $(COMMDIR)/ftp.$(OBJSUFF) \
+#  $(COMMDIR)/url.$(OBJSUFF) \

 
 MSWOBJS = \
 
 MSWOBJS = \

+  accel.$(OBJSUFF) \

   app.$(OBJSUFF) \
   bitmap.$(OBJSUFF) \
   bmpbuttn.$(OBJSUFF) \
   app.$(OBJSUFF) \
   bitmap.$(OBJSUFF) \
   bmpbuttn.$(OBJSUFF) \


@@ -124,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) \


@@ -141,7 +174,6 @@ MSWOBJS = \
   dde.$(OBJSUFF) \
   dialog.$(OBJSUFF) \
   dib.$(OBJSUFF) \
   dde.$(OBJSUFF) \
   dialog.$(OBJSUFF) \
   dib.$(OBJSUFF) \

-  dirdlg.$(OBJSUFF) \

   filedlg.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
   filedlg.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \


@@ -163,6 +195,7 @@ MSWOBJS = \
   minifram.$(OBJSUFF) \
   msgdlg.$(OBJSUFF) \
   nativdlg.$(OBJSUFF) \
   minifram.$(OBJSUFF) \
   msgdlg.$(OBJSUFF) \
   nativdlg.$(OBJSUFF) \

+  notebook.$(OBJSUFF) \

   ownerdrw.$(OBJSUFF) \
   palette.$(OBJSUFF) \
   pen.$(OBJSUFF) \
   ownerdrw.$(OBJSUFF) \
   palette.$(OBJSUFF) \
   pen.$(OBJSUFF) \


@@ -173,6 +206,7 @@ MSWOBJS = \
   radiobut.$(OBJSUFF) \
   region.$(OBJSUFF) \
   registry.$(OBJSUFF) \
   radiobut.$(OBJSUFF) \
   region.$(OBJSUFF) \
   registry.$(OBJSUFF) \

+  regconf.$(OBJSUFF) \

   scrolbar.$(OBJSUFF) \
   settings.$(OBJSUFF) \
   slidrmsw.$(OBJSUFF) \
   scrolbar.$(OBJSUFF) \
   settings.$(OBJSUFF) \
   slidrmsw.$(OBJSUFF) \


@@ -189,18 +223,38 @@ MSWOBJS = \
   textctrl.$(OBJSUFF) \
   thread.$(OBJSUFF) \
   timer.$(OBJSUFF) \
   textctrl.$(OBJSUFF) \
   thread.$(OBJSUFF) \
   timer.$(OBJSUFF) \

+  tooltip.$(OBJSUFF) \

   treectrl.$(OBJSUFF) \
   utils.$(OBJSUFF) \
   utilsexc.$(OBJSUFF) \
   wave.$(OBJSUFF) \
   window.$(OBJSUFF) \
   treectrl.$(OBJSUFF) \
   utils.$(OBJSUFF) \
   utilsexc.$(OBJSUFF) \
   wave.$(OBJSUFF) \
   window.$(OBJSUFF) \

-  $(OLEDIR)/droptgt.$(OBJSUFF) \
-  $(OLEDIR)/dropsrc.$(OBJSUFF) \
-  $(OLEDIR)/dataobj.$(OBJSUFF) \
-  $(OLEDIR)/oleutils.$(OBJSUFF) \
-  $(OLEDIR)/uuid.$(OBJSUFF)
-
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS)
+  xpmhand.$(OBJSUFF)
+
+# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
+#  dirdlg.$(OBJSUFF) \
+
+# OLE not supported yet by GnuWin32
+#  $(OLEDIR)/droptgt.$(OBJSUFF) \
+#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
+#  $(OLEDIR)/dataobj.$(OBJSUFF) \
+#  $(OLEDIR)/oleutils.$(OBJSUFF) \
+#  $(OLEDIR)/uuid.$(OBJSUFF) \
+#  $(OLEDIR)/automtn.$(OBJSUFF)
+
+XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
+               $(XPMDIR)/crdatfri.o\
+               $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+               $(XPMDIR)/crifrdat.o\
+               $(XPMDIR)/data.o\
+               $(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
+               $(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+               $(XPMDIR)/rdftoi.o\
+               $(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
+               $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
+               $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS)

 
 all:    $(OBJECTS) $(WXLIB)
 
 
 all:    $(OBJECTS) $(WXLIB)
 


@@ -213,15 +267,6 @@ $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
 
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
 

-#$(MSWOBJDIR):
-#      mkdir $(OBJDIR)
-
-#$(COMMOBJDIR):
-#      mkdir $(COMMDIR)/$(OBJDIR)
-
-#$(GENERICOBJDIR):
-#      mkdir $(GENDIR)/$(OBJDIR)
-

 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 $(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c


@@ -231,7 +276,13 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
 $(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
 $(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l

-       $(LEX) $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+       $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+
+# Try one of these if the above line doesn't work.
+# Alternative syntax (1)
+#      $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+# Alternative syntax (2)
+#      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l

 
 #      sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
 #      sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
 
 #      sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
 #      sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \


@@ -240,53 +291,18 @@ $(COMMDIR)/lex_yy.c:      $(COMMDIR)/lexer.l
 
 # Replace yacc with bison if you run into compilation
 # problems with y_tab.c.
 
 # Replace yacc with bison if you run into compilation
 # problems with y_tab.c.

+

 $(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
        $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
 
 $(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
        $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
 

-#      mv y.tab.c $(COMMDIR)/y_tab.c
+# If you use e.g. gcc on Unix, uncomment these lines
+# and comment out the above.

 
 

+#$(COMMDIR)/y_tab.c:   $(COMMDIR)/parser.y
+#      $(YACC) $(COMMDIR)/parser.y
+#      mv y.tab.c $(COMMDIR)/y_tab.c

 
 # Extra targets
 
 # Extra targets

-prologio:
-       cd $(WXDIR)/utils/prologio/src ; $(MAKE) -f makefile.g95
-       cd $(WXDIR)/src/msw
-
-clean_proio:
-       cd $(WXDIR)/utils/prologio/src; $(MAKE) -f makefile.g95 clean
-       cd $(WXDIR)/src/msw
-
-makedib:
-       cd $(WXDIR)/src/msw/dib ; $(MAKE) -f makefile.g95
-       cd $(WXDIR)/src/msw
-
-clean_dib:
-       cd $(WXDIR)/src/msw/dib; $(MAKE) -f makefile.g95 clean
-       cd $(WXDIR)/src/msw
-
-gauge:
-       cd $(WXDIR)/src/msw/gauge; $(MAKE) -f makefile.g95
-       cd $(WXDIR)/src/msw
-
-clean_gauge:
-       cd $(WXDIR)/src/msw/gauge; $(MAKE) -f makefile.g95 clean
-       cd $(WXDIR)/src/msw
-
-wxstring:
-       cd $(WXDIR)/contrib/wxstring; $(MAKE) -f makefile.g95 OPTIONS="$(OPTIONS)" DEBUG="$(DEBUG)"
-       cd $(WXDIR)/src/msw
-
-clean_wxstring:
-       cd $(WXDIR)/contrib/wxstring; $(MAKE) -f makefile.g95 clean
-       cd $(WXDIR)/src/msw
-
-itsy:
-       cd $(WXDIR)/src/msw/itsybits; $(MAKE) -f makefile.g95
-       cd $(WXDIR)/src/msw
-
-clean_itsy:
-       cd $(WXDIR)/contrib/itsybits; $(MAKE) -f makefile.g95 clean
-       cd $(WXDIR)/src/msw
-

 rcparser:
        cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
        cd $(WXDIR)/src/msw
 rcparser:
        cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
        cd $(WXDIR)/src/msw


@@ -295,14 +311,6 @@ clean_rcp:
        cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
        cd $(WXDIR)/src/msw
 
        cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
        cd $(WXDIR)/src/msw
 

-# +++start steve161(09.04.1995): added for wxString in \contrib\wxstring
-wxstring_ol:
-       cd ../../contrib/wxstring; $(MAKE) -f makefile.unx xview
-wxstring_motif:
-       cd ../../contrib/wxstring; $(MAKE) -f makefile.unx motif
-wxstring_hp:
-       cd ../../contrib/wxstring; $(MAKE) -f makefile.unx hp
-

 clean:
        rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a core
 
 clean:
        rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a core