1. fixed makefile.vc for OLE files

2. fixed asserts in wxGTK::wxWindow::DoGetClientSize()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-15 14:08:30 +00:00
parent 0efe5ba76e
commit 6a008b33c4
5 changed files with 94 additions and 88 deletions

View File

@@ -225,4 +225,4 @@ wave.cpp M
window.cpp M
xpmhand.cpp M
# vi: set noet ts=16:
# vi: set noet ts=16 nolist:

View File

@@ -6,7 +6,6 @@
#! Created: 14.07.99
#! Version: $Id$
#!#############################################################################
#${
#! include the code which parses filelist.txt file and initializes
#! %wxCommon, %wxGeneric and %wxMSW hashes.
@@ -36,11 +35,13 @@
foreach $file (sort keys %wxMSW) {
next if $wxMSW{$file} =~ /\b16\b/;
#! OLE files live in a subdir
$project{"WXMSWOBJS"} .= '..\msw\\';
$project{"WXMSWOBJS"} .= 'ole\\' if $wxMSW{$file} =~ /\bO\b/;
$file =~ s/cp?p?$/obj/;
$project{"WXMSWOBJS"} .= "..\\msw\\\$D\\" . $file . " "
$project{"WXMSWOBJS"} .= '$D\\' . $file . " ";
}
#$}
# This file was automatically generated by tmake at #$ Now()
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!