From: Robert Roebling <robert@roebling.de>
Date: Tue, 10 Aug 1999 12:27:07 +0000 (+0000)
Subject:   A few compile fixes,
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0ae2df30524bb07bcca824bd0a842bd54a305ff3

  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 a68ce55d79..c26ad9e976 100755
--- 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
+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
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index f832755bf1..2ddb1a52d9 100644
--- 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
+sizer.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 bea91d2583..6b17ca942a 100644
--- 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->SetSizeHints( this );
-    topsizer->Fit( this );
     SetSizer( topsizer );
     SetAutoLayout( TRUE );
 
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );
+
     Centre( wxBOTH );
 
     if (ok)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index d111d88a1a..2f1a4fba56 100644
--- 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!
 
 #
@@ -113,6 +113,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/sckfile.$(OBJSUFF) \
 		$(COMMDIR)/sckipc.$(OBJSUFF) \
 		$(COMMDIR)/sckstrm.$(OBJSUFF) \
+		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/socket.$(OBJSUFF) \
 		$(COMMDIR)/strconv.$(OBJSUFF) \
 		$(COMMDIR)/stream.$(OBJSUFF) \
diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index af35406da4..0fa9ef3a20 100644
--- 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/menu.h"
 #endif
 
 #if defined(__WIN95__) && !defined(__TWIN32__)