1. regenerated makefiles

2. wxNewSizer compiles under MSW

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index ea3019c03760abbf73ddab47d11ba8f0b556dea1..76dca7a5f63eacdf338d098b799f3049a20afd02 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -9,13 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __WXSIZERS_H__
-#define __WXSIZERS_H__
-
 #ifdef __GNUG__
 #pragma implementation "sizer.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/sizer.h"
 #include "wx/utils.h"
 
@@ -143,10 +147,11 @@ void wxNewSizer::SetSizeHints( wxWindow *window )
 
 wxSize wxNewSizer::GetMinWindowSize( wxWindow *window )
 {
-    wxSize min( GetMinSize() );
+    wxSize minSize( GetMinSize() );
     wxSize size( window->GetSize() );
     wxSize client_size( window->GetClientSize() );
-    return wxSize( min.x+size.x-client_size.x, min.y+size.y-client_size.y ); 
+    return wxSize( minSize.x+size.x-client_size.x,
+                   minSize.y+size.y-client_size.y ); 
 }
 
 void wxNewSizer::SetDimension( int x, int y, int width, int height )
@@ -380,6 +385,3 @@ wxSize wxBoxNewSizer::CalcMin()
        
     return wxSize( m_minWidth, m_minHeight );
 }
-
-#endif
-  // __SIZERS_H__

diff --git a/src/gtk/Makefile b/src/gtk/Makefile
index 962c7d908b2018eb083bd1d84e7e435ff6cb15fe..d7db9d0e21c79ce8b8e091214e0bea6f04d728e1 100644 (file)
--- a/src/gtk/Makefile
+++ b/src/gtk/Makefile
@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 21:49, 1999/07/29
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 
 #
@@ -111,6 +111,7 @@ COMMONOBJS  = \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -132,7 +133,7 @@ COMMONOBJS  = \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
-               $(COMMDIR)/zipstream.$(OBJSUFF) \
+               $(COMMDIR)/zipstrm.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
 HTMLOBJS = \

diff --git a/src/gtk1/Makefile b/src/gtk1/Makefile
index 962c7d908b2018eb083bd1d84e7e435ff6cb15fe..d7db9d0e21c79ce8b8e091214e0bea6f04d728e1 100644 (file)
--- a/src/gtk1/Makefile
+++ b/src/gtk1/Makefile
@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 21:49, 1999/07/29
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 
 #
@@ -111,6 +111,7 @@ COMMONOBJS  = \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -132,7 +133,7 @@ COMMONOBJS  = \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
-               $(COMMDIR)/zipstream.$(OBJSUFF) \
+               $(COMMDIR)/zipstrm.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
 HTMLOBJS = \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index fff2c88e3fbbc010ceeb2a5490cee091650ea6cb..df72d456e5253d9d1f052854c3a3e2555cbcbc1e 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:00, 1999/08/06
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -164,6 +164,7 @@ COMMONOBJS = \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \
                $(MSWDIR)\socket.obj \
+               $(MSWDIR)\strconv.obj \
                $(MSWDIR)\stream.obj \
                $(MSWDIR)\string.obj \
                $(MSWDIR)\tbarbase.obj \
@@ -185,7 +186,7 @@ COMMONOBJS = \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
                $(MSWDIR)\wxexpr.obj \
-               $(MSWDIR)\zipstream.obj \
+               $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
@@ -622,6 +623,8 @@ $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
 
+$(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
+
 $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
 
 $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
@@ -664,7 +667,7 @@ $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
 
 $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
 
-$(MSWDIR)\zipstream.obj: $(COMMDIR)\zipstream.$(SRCSUFF)
+$(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
 
 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index ff7e40f21caf993c47ed57867263a76afa41259c..42ff996d99d7e208b897c365e3d792b2b2f28efd 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 00:42, 1999/07/27
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -144,6 +144,7 @@ COMMONOBJS = \
                $(MSWDIR)\paper.obj \
                $(MSWDIR)\prntbase.obj \
                $(MSWDIR)\resource.obj \
+               $(MSWDIR)\strconv.obj \
                $(MSWDIR)\stream.obj \
                $(MSWDIR)\string.obj \
                $(MSWDIR)\tbarbase.obj \
@@ -164,7 +165,7 @@ COMMONOBJS = \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
                $(MSWDIR)\wxexpr.obj \
-               $(MSWDIR)\zipstream.obj \
+               $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj \
                ${MSWDIR}\resourc2.cpp
 
@@ -515,6 +516,8 @@ $(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
+$(MSWDIR)\strconv.obj: $(COMMDIR)\strconv.$(SRCSUFF)
+
 $(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
 
 $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
@@ -555,7 +558,7 @@ $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
 
 $(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
 
-$(MSWDIR)\zipstream.obj: $(COMMDIR)\zipstream.$(SRCSUFF)
+$(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
 
 $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index e29d0f28358353338bfd469ba5cf3a0e2dcd4e02..2a2b41d22c31ac8485900f0c3ead6152e68e0a90 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 00:42, 1999/07/27
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -132,6 +132,7 @@ COMMONOBJS = \
                $(COMMDIR)\paper.obj \
                $(COMMDIR)\prntbase.obj \
                $(COMMDIR)\resource.obj \
+               $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
                $(COMMDIR)\tbarbase.obj \
@@ -152,7 +153,7 @@ COMMONOBJS = \
                $(COMMDIR)\wincmn.obj \
                $(COMMDIR)\wxchar.obj \
                $(COMMDIR)\wxexpr.obj \
-               $(COMMDIR)\zipstream.obj \
+               $(COMMDIR)\zipstrm.obj \
                $(COMMDIR)\zstream.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
@@ -896,6 +897,11 @@ $(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/strconv.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/stream.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -996,7 +1002,7 @@ $(COMMDIR)/wxexpr.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/zipstream.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/zipstrm.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 63fa7dc63fc61d2cff8d526c0b157f98ef3864a5..d111d88a1a492a7ad1d89d055a2f78246634e8e0 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 21:49, 1999/07/29
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -114,6 +114,7 @@ COMMONOBJS  = \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -134,7 +135,7 @@ COMMONOBJS  = \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
                $(COMMDIR)/wxchar.$(OBJSUFF) \
                $(COMMDIR)/wxexpr.$(OBJSUFF) \
-               $(COMMDIR)/zipstream.$(OBJSUFF) \
+               $(COMMDIR)/zipstrm.$(OBJSUFF) \
                $(COMMDIR)/zstream.$(OBJSUFF)
 
 HTMLOBJS = \
@@ -387,14 +388,19 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 
 clean:
        -erase *.o
+       -erase *.bak
        -erase core
        -erase ..\common\y_tab.c
        -erase ..\common\lex_yy.c
        -erase ..\common\*.o
+       -erase ..\common\*.bak
        -erase ..\generic\*.o
+       -erase ..\generic\*.bak
        -erase ..\html\*.o
        -erase ..\png\*.o
+       -erase ..\png\*.bak
        -erase ..\zlib\*.o
+       -erase ..\zlib\*.bak
        -erase ..\jpeg\*.o
        -erase ..\..\lib\libwx.a
 

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index d43c1b23013c83e3b23b250e7d6fc84b6306bbd9..6e01a6dcc1737357aa4e20b97722946fafedeb04 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 00:42, 1999/07/27
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -103,6 +103,7 @@ COMMONOBJS = \
                $(COMMDIR)\sckipc.obj \
                $(COMMDIR)\sckstrm.obj \
                $(COMMDIR)\socket.obj \
+               $(COMMDIR)\strconv.obj \
                $(COMMDIR)\stream.obj \
                $(COMMDIR)\string.obj \
                $(COMMDIR)\tbarbase.obj \
@@ -124,7 +125,7 @@ COMMONOBJS = \
                $(COMMDIR)\wincmn.obj \
                $(COMMDIR)\wxchar.obj \
                $(COMMDIR)\wxexpr.obj \
-               $(COMMDIR)\zipstream.obj \
+               $(COMMDIR)\zipstrm.obj \
                $(COMMDIR)\zstream.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 89f483abc99caf442f546c9fc201d19f0bf972b7..02aa755a1162c2398883c41718f2060f805c6276 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 09:32, 1999/08/04
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -170,6 +170,7 @@ COMMONOBJS = \
                ..\common\$D\sckipc.obj \
                ..\common\$D\sckstrm.obj \
                ..\common\$D\socket.obj \
+               ..\common\$D\strconv.obj \
                ..\common\$D\stream.obj \
                ..\common\$D\string.obj \
                ..\common\$D\tbarbase.obj \
@@ -190,7 +191,7 @@ COMMONOBJS = \
                ..\common\$D\wincmn.obj \
                ..\common\$D\wxchar.obj \
                ..\common\$D\wxexpr.obj \
-               ..\common\$D\zipstream.obj \
+               ..\common\$D\zipstrm.obj \
                ..\common\$D\zstream.obj
 
 MSWOBJS = ..\msw\$D\accel.obj \
@@ -305,7 +306,7 @@ HTMLOBJS = \
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 739d1b6322f71fddd5c9ae95b1c437a542a69aa6..396821eb8ec8618c8f455a7dab45fdce9915d429 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 00:42, 1999/07/27
+# This file was automatically generated by tmake at 23:37, 1999/08/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe
@@ -53,7 +53,8 @@ GENERICOBJS= busyinfo.obj &
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
-NONESSENTIALOBJS= colrdlgg.obj &
+NONESSENTIALOBJS= caret.obj &
+       colrdlgg.obj &
        dirdlgg.obj &
        fontdlgg.obj &
        helpxlp.obj &
@@ -122,6 +123,7 @@ COMMONOBJS = &
        sckipc.obj &
        sckstrm.obj &
        socket.obj &
+       strconv.obj &
        stream.obj &
        string.obj &
        tbarbase.obj &
@@ -143,7 +145,7 @@ COMMONOBJS = &
        wincmn.obj &
        wxchar.obj &
        wxexpr.obj &
-       zipstream.obj &
+       zipstrm.obj &
        zstream.obj
 
 MSWOBJS = accel.obj &
@@ -698,6 +700,9 @@ sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+strconv.obj:     $(COMMDIR)\strconv.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 stream.obj:     $(COMMDIR)\stream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -761,7 +766,7 @@ wxchar.obj:     $(COMMDIR)\wxchar.cpp
 wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-zipstream.obj:     $(COMMDIR)\zipstream.cpp
+zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 zstream.obj:     $(COMMDIR)\zstream.cpp