From 3a2490c684620904e063cf0a8ff1867c31818e18 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Tue, 10 Aug 1999 13:12:19 +0000
Subject: [PATCH]   Further makefile and compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/filelist.txt | 1 -
 distrib/msw/tmake/unx.t        | 2 +-
 makefile.unx.in                | 5 ++---
 src/generic/prop.cpp           | 8 ++------
 src/motif/utils.cpp            | 3 +++
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 2ddb1a52d9..d45210b55d 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -358,7 +358,6 @@ region.cpp	X
 scrolbar.cpp	X
 settings.cpp	X
 slider.cpp	X
-spinbutt.cpp	X
 statbmp.cpp	X
 statbox.cpp	X
 stattext.cpp	X
diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 120aede3c2..cf7c28c488 100644
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -155,7 +155,7 @@ target_triplet = @target@
 
 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 #################################
 
diff --git a/makefile.unx.in b/makefile.unx.in
index cd7b83c96d..e2eb64e3d8 100644
--- a/makefile.unx.in
+++ b/makefile.unx.in
@@ -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!
 
 #
@@ -93,7 +93,7 @@ target_triplet = @target@
 
 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 #################################
 
@@ -482,7 +482,6 @@ MOTIF_GUIOBJS     = \
 		scrolbar.o \
 		settings.o \
 		slider.o \
-		spinbutt.o \
 		statbmp.o \
 		statbox.o \
 		stattext.o \
diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index 360c7bd864..178d82bc97 100644
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -328,9 +328,7 @@ wxPropertyValue *wxPropertyValue::NewCopy(void) const
      return new wxPropertyValue(m_value.stringPtr);
 
    case wxPropertyValueNull:
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
+    wxFAIL_MSG( _T("Should never get here!\n" ) );
     break;
   }
   return NULL;
@@ -395,9 +393,7 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
       return;
     }
    case wxPropertyValueNull:
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
+    wxFAIL_MSG( _T("Should never get here!\n" ) );
     break;
   }
 }
diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 279ad20b33..094a3e8699 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -1134,8 +1134,11 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
     xc -> green = color_defs[pixel].green;
     xc -> blue = color_defs[pixel].blue;
     xc -> flags = DoRed | DoGreen | DoBlue;
+    
+/*  FIXME, TODO
     if (!XAllocColor(d,cmp,xc))
         cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";
+*/
 
     delete[] color_defs;
 }
-- 
2.45.2