A few compile fixes,

  Updated filetxt.txt to include sizer.cpp

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

diff --git a/distrib/msw/copy_src.bat b/distrib/msw/copy_src.bat
index a68ce55d7920fc6f3aa9034f25debf8f44c96027..c26ad9e976317d859ff3703d90791a99520da70d 100755 (executable)
--- a/distrib/msw/copy_src.bat
+++ b/distrib/msw/copy_src.bat
@@ -532,6 +532,7 @@ cd minifram
 md \wxmsw_dist\wxMSW\samples\minifram
 copy Makefile.* \wxmsw_dist\wxMSW\samples\minifram
 copy *.cpp \wxmsw_dist\wxMSW\samples\minifram
 md \wxmsw_dist\wxMSW\samples\minifram
 copy Makefile.* \wxmsw_dist\wxMSW\samples\minifram
 copy *.cpp \wxmsw_dist\wxMSW\samples\minifram

+copy *.h \wxmsw_dist\wxMSW\samples\minifram

 copy *.xpm \wxmsw_dist\wxMSW\samples\minifram
 copy *.ico \wxmsw_dist\wxMSW\samples\minifram
 copy *.def \wxmsw_dist\wxMSW\samples\minifram
 copy *.xpm \wxmsw_dist\wxMSW\samples\minifram
 copy *.ico \wxmsw_dist\wxMSW\samples\minifram
 copy *.def \wxmsw_dist\wxMSW\samples\minifram

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index f832755bf1c7a0b5d988ff083f369b29dc951c01..2ddb1a52d95bfc2a93c93c7e0384555f54ddd8bc 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -129,6 +129,7 @@ sckaddr.cpp C       S
 sckfile.cpp    C       S
 sckipc.cpp     C       S
 sckstrm.cpp    C       S
 sckfile.cpp    C       S
 sckipc.cpp     C       S
 sckstrm.cpp    C       S

+sizer.cpp      C

 socket.cpp     C       S
 stream.cpp     C
 strconv.cpp    C
 socket.cpp     C       S
 stream.cpp     C
 strconv.cpp    C

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index bea91d258323216caee63ec01d2b7750b17a0227..6b17ca942a78bd6db59089dfa76df3b31c4fcd89 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -182,11 +182,12 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     
     topsizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 );
 
     
     topsizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 );
 

-    topsizer->SetSizeHints( this );
-    topsizer->Fit( this );

     SetSizer( topsizer );
     SetAutoLayout( TRUE );
 
     SetSizer( topsizer );
     SetAutoLayout( TRUE );
 

+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );
+

     Centre( wxBOTH );
 
     if (ok)
     Centre( wxBOTH );
 
     if (ok)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index d111d88a1a492a7ad1d89d055a2f78246634e8e0..2f1a4fba5650f766fe85efe4c2c0df59918e0c49 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,5 +1,5 @@
 
 

-# This file was automatically generated by tmake at 23:37, 1999/08/08
+# This file was automatically generated by tmake at 14:17, 1999/08/10

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #


@@ -113,6 +113,7 @@ COMMONOBJS  = \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \
                $(COMMDIR)/sckfile.$(OBJSUFF) \
                $(COMMDIR)/sckipc.$(OBJSUFF) \
                $(COMMDIR)/sckstrm.$(OBJSUFF) \

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

                $(COMMDIR)/socket.$(OBJSUFF) \
                $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/socket.$(OBJSUFF) \
                $(COMMDIR)/strconv.$(OBJSUFF) \
                $(COMMDIR)/stream.$(OBJSUFF) \

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index af35406da449033fbdd9b0763936aaf06c5aeade..0fa9ef3a20c99e06dc2b4419fce06a7e3c3775b4 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -26,6 +26,7 @@
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/utils.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/utils.h"

+#include "wx/menu.h"

 #endif
 
 #if defined(__WIN95__) && !defined(__TWIN32__)
 #endif
 
 #if defined(__WIN95__) && !defined(__TWIN32__)