Fixed Dialog Editor compilation

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

diff --git a/docs/readme.txt b/docs/readme.txt
index 9c8558891a4807606b1599c42ad02d2a778b3daf..2e6d4bad3518160f2fef4dfc01d21d090618c4f8 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,13 +1,58 @@
-wxWindows 2.0 alpha
+wxWindows 2.0
+-------------
+
+Welcome to wxWindows 2.0, a sophisticated cross-platform C++
+framework for writing GUI applications.
+
+Platforms supported

 -------------------
 
 -------------------
 

-This is an alpha distribution of wxWindows 2.0. It may be made up
-of sources for different platforms from different authors.
+wxWindows 2.0 currently supports the following platforms:
+
+- Windows 3.1, Windows 95/98, Windows NT
+- Unix with Motif/Lesstif
+- Unix with GTK+
+
+Files
+-----
+
+Depending on what you downloaded, you may have one or more of
+these ports. You may unarchive any or all of the ports into
+the same directory hierarchy. The zip archive set comprises the
+following:
+
+wx200gen.zip            Generic source code and samples (required)
+wx200msw.zip            Windows-specific source code
+wx200mot.zip            Motif-specific source code
+wx200gtk.zip            GTK-specific source code
+wx200doc.zip            Documentation source code (not required)
+wx200hlp.zip            WinHelp documentation
+wx200pdf.zip            Acrobat PDF documentation
+wx200htm.zip            HTML documentation
+wx200vc.zip             MS VC++ 5.0 project files
+wx200cw.zip             Metrowerks CodeWarrior project files

 
 

-For generic installation information, see the docs directory. For
-platform-specific installation information see:
+Installation
+------------
+
+wxWindows 2.0 needs to be compiled before you can test out
+the samples or write your own applications.
+For installation information, please see the install.txt file
+in the individual directories:

 
   docs/msw
   docs/gtk
   docs/motif
 
 
   docs/msw
   docs/gtk
   docs/motif
 

+License information
+-------------------
+
+For licensing information, please see the files:
+
+  docs/preamble.txt
+  docs/licence.txt
+  docs/licendoc.txt
+  docs/gpl.txt
+  docs/lgpl.txt
+
+

diff --git a/utils/dialoged/src/dialoged.h b/utils/dialoged/src/dialoged.h
index 99442bdc25bd3f060a2be468ab21e2920a6d5dd8..adfcb9ace9672ddecdb1d47597990875f86beb64 100644 (file)
--- a/utils/dialoged/src/dialoged.h
+++ b/utils/dialoged/src/dialoged.h
@@ -16,7 +16,7 @@
 #ifndef dialogedh
 #define dialogedh
 
 #ifndef dialogedh
 #define dialogedh
 

-#include "proplist.h"
+#include "wx/proplist.h"

 #include "reseditr.h"
 
 class MyChild;
 #include "reseditr.h"
 
 class MyChild;

diff --git a/utils/dialoged/src/makefile.b32 b/utils/dialoged/src/makefile.b32
index 80d932b105db3aa87a11058ad371b7f8c8dc71c9..8c1fad2317b0c5170dc614c9db060beff11875e4 100644 (file)
--- a/utils/dialoged/src/makefile.b32
+++ b/utils/dialoged/src/makefile.b32
@@ -16,10 +16,8 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw
 
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw

-WXBASEINC = $(WXDIR)\include\base

 WXLIB = $(WXLIBDIR)\wx32.lib
 LIBS=$(WXLIB) cw32 import32 ole2w32
 WXLIB = $(WXLIBDIR)\wx32.lib
 LIBS=$(WXLIB) cw32 import32 ole2w32

-INCFILE = includes.cfg

 
 TARGET=dialoged
 
 
 TARGET=dialoged
 


@@ -36,7 +34,7 @@ CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
 
 OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
 
 
 OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
 

-$(TARGET).exe: $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
+$(TARGET).exe: $(OBJECTS) $(TARGET).def $(TARGET).res

   tlink32 $(LINKFLAGS) @&&!
 c0w32.obj $(OBJECTS)
 $(TARGET)
   tlink32 $(LINKFLAGS) @&&!
 c0w32.obj $(OBJECTS)
 $(TARGET)


@@ -46,11 +44,6 @@ $(TARGET).def
 $(TARGET).res
 !
 
 $(TARGET).res
 !
 

-$(INCFILE):    $(MAKEFILENAME)
-       copy &&!
--I..\..\wxprop\src
-! $(INCFILE)
-

 $(TARGET).res :      $(TARGET).rc $(WXDIR)\include\msw\wx.rc
     brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(TARGET)
 
 $(TARGET).res :      $(TARGET).rc $(WXDIR)\include\msw\wx.rc
     brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(TARGET)
 

diff --git a/utils/dialoged/src/makefile.g95 b/utils/dialoged/src/makefile.g95
index babc48740023053755aaa2df2810d299968849b0..b886f57febf983424b5ad0f97aeb745d0e152947 100644 (file)
--- a/utils/dialoged/src/makefile.g95
+++ b/utils/dialoged/src/makefile.g95
@@ -19,17 +19,7 @@ OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
  $(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF) $(OBJDIR)/winstyle.$(OBJSUFF) $(OBJDIR)/symbtabl.$(OBJSUFF)\
  $(OBJDIR)/dialoged_resources.$(OBJSUFF)
 
  $(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF) $(OBJDIR)/winstyle.$(OBJSUFF) $(OBJDIR)/symbtabl.$(OBJSUFF)\
  $(OBJDIR)/dialoged_resources.$(OBJSUFF)
 

-EXTRAINC = -I../../wxprop/src
-
-LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib -L../../wxprop/lib
-LDLIBS=-lwxprop $(LIBS)
-
-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) $(EXTRAINC)
-
-all:    $(OBJDIR) wxprop dialoged$(GUISUFFIX)$(EXESUFF)
-
-wxprop:
-       cd ../../wxprop/src; $(MAKE) -f makefile.g95
+all:    $(OBJDIR) dialoged$(GUISUFFIX)$(EXESUFF)

 
 $(OBJDIR):
        mkdir $(OBJDIR)
 
 $(OBJDIR):
        mkdir $(OBJDIR)

diff --git a/utils/dialoged/src/makefile.nt b/utils/dialoged/src/makefile.nt
index 2d9bf8889291c09c63c87135add651107f24a0d2..2b0ea7f5dbf88ec2fdc3ee5e9a4376258ec43445 100644 (file)
--- a/utils/dialoged/src/makefile.nt
+++ b/utils/dialoged/src/makefile.nt
@@ -100,7 +100,7 @@ clean:
         -erase *.map
         -erase *.pdb
 
         -erase *.map
         -erase *.pdb
 

-cleanutils: clean clean_wxprop
+cleanutils: clean

 
 DOCSOURCES=$(LOCALDOCDIR)\dialoged.tex $(LOCALDOCDIR)\body.tex\
  $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\
 
 DOCSOURCES=$(LOCALDOCDIR)\dialoged.tex $(LOCALDOCDIR)\body.tex\
  $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 38634c1bfe2fbb30512ddf3e198fed3f748158e2..8a8c6c2b3e5d2bfc9a7e138e88331e96e16cc8bc 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -25,8 +25,7 @@
 #include "wx/toolbar.h"
 #include "wx/imaglist.h"
 #include "wx/treectrl.h"
 #include "wx/toolbar.h"
 #include "wx/imaglist.h"
 #include "wx/treectrl.h"

-
-#include "proplist.h"
+#include "wx/proplist.h"

 #include "symbtabl.h"
 #include "winstyle.h"
 
 #include "symbtabl.h"
 #include "winstyle.h"