use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

[wxWidgets.git] / samples / caret / makefile.unx

diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx
index 0bb48965a008d7207d77214f93c48f3ba5bbca71..f82a4c5990637eba90ee113de7dd1c98dcde21ff 100644 (file)
--- a/samples/caret/makefile.unx
+++ b/samples/caret/makefile.unx
@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = caret
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:     .o .cpp
 
 .cpp.o :
-       $(CC) -c `wx-config --cxxflags` -o $@ $<
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)
-       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
        rm -f *.o $(PROGRAM)