Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further makefile and compile fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-08-10 13:12:19 +00:00
parent 0ae2df3052
commit 3a2490c684
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distrib/msw/tmake/filelist.txt
View File

@@ -358,7 +358,6 @@ region.cpp X
scrolbar.cpp X scrolbar.cpp X
settings.cpp X settings.cpp X
slider.cpp X slider.cpp X
spinbutt.cpp X
statbmp.cpp X statbmp.cpp X
statbox.cpp X statbox.cpp X
stattext.cpp X stattext.cpp X

2
distrib/msw/tmake/unx.t
View File

@@ -155,7 +155,7 @@ target_triplet = @target@
EXTRA_VPATH = @EXTRA_VPATH@ EXTRA_VPATH = @EXTRA_VPATH@
VPATH = .:${srcdir}:${srcdir}/src/common:${srcdir}/src/generic:${srcdir}/src/html:${EXTRA_VPATH} VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH}
########################### Programs ################################# ########################### Programs #################################

5
makefile.unx.in
View File

@@ -11,7 +11,7 @@
# #
# #
# #
# This file was automatically generated by tmake at 10:43, 1999/08/10 # This file was automatically generated by tmake at 13:53, 1999/08/10
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
# #
@@ -93,7 +93,7 @@ target_triplet = @target@
EXTRA_VPATH = @EXTRA_VPATH@ EXTRA_VPATH = @EXTRA_VPATH@
VPATH = .:${srcdir}:${srcdir}/src/common:${srcdir}/src/generic:${srcdir}/src/html:${EXTRA_VPATH} VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${srcdir}/../html:${EXTRA_VPATH}
########################### Programs ################################# ########################### Programs #################################
@@ -482,7 +482,6 @@ MOTIF_GUIOBJS = \
scrolbar.o \ scrolbar.o \
settings.o \ settings.o \
slider.o \ slider.o \
spinbutt.o \
statbmp.o \ statbmp.o \
statbox.o \ statbox.o \
stattext.o \ stattext.o \

8
src/generic/prop.cpp
View File

@@ -328,9 +328,7 @@ wxPropertyValue *wxPropertyValue::NewCopy(void) const
return new wxPropertyValue(m_value.stringPtr); return new wxPropertyValue(m_value.stringPtr);
case wxPropertyValueNull: case wxPropertyValueNull:
#ifdef __X__ wxFAIL_MSG( _T("Should never get here!\n" ) );
cerr << "Should never get here!\n";
#endif
break; break;
} }
return NULL; return NULL;
@@ -395,9 +393,7 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
return; return;
} }
case wxPropertyValueNull: case wxPropertyValueNull:
#ifdef __X__ wxFAIL_MSG( _T("Should never get here!\n" ) );
cerr << "Should never get here!\n";
#endif
break; break;
} }
} }

3
src/motif/utils.cpp
View File

@@ -1134,8 +1134,11 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
xc -> green = color_defs[pixel].green; xc -> green = color_defs[pixel].green;
xc -> blue = color_defs[pixel].blue; xc -> blue = color_defs[pixel].blue;
xc -> flags = DoRed | DoGreen | DoBlue; xc -> flags = DoRed | DoGreen | DoBlue;
/* FIXME, TODO
if (!XAllocColor(d,cmp,xc)) if (!XAllocColor(d,cmp,xc))
cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n"; cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";
*/
delete[] color_defs; delete[] color_defs;
} }