Further makefile and compile fixes.

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

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 2ddb1a52d95bfc2a93c93c7e0384555f54ddd8bc..d45210b55db23c6ce712808e21d16c927cbcb2ee 100644 (file)
--- 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 120aede3c2f29447ff05fc2f8a0ba0bb95ad5bdc..cf7c28c4885f90ec99876b2f7aa94eb62be3fcdd 100644 (file)
--- 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 cd7b83c96dbe3659c650b4ba2c4e0b2cac22f14c..e2eb64e3d87ef8ead24a93cac875fe259ae620e2 100644 (file)
--- 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 360c7bd864326f8f4c9de0fc94a7d59408fc377f..178d82bc97bde1d55f741e012f78ed70cb22fd1a 100644 (file)
--- 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 279ad20b331253193dcf8099cef6816d2f37fe4f..094a3e869901d2e55565652c89950ef378f57a2d 100644 (file)
--- 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;
 }