Mmedia, OGL lib directory changes; omitted naughty wxGA_SMOOTH style from wxProgressDialog;

wxMotif toolbar fix; ~wxWindow Motif fix


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

contrib/samples/mmedia/Makefile.in

@@ -17,7 +17,7 @@ PROGRAM=mmboard
 
 OBJECTS=mmboard.o mmbman.o
 
-EXTRA_LIBS= $(top_builddir)/lib/libwxmmedia2.a @ESD_LIBS@
+EXTRA_LIBS= $(top_builddir)/contrib/lib/libmmedia.a @ESD_LIBS@
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
@@ -32,5 +32,8 @@ include ../../../src/make.env
 
 all: $(PROGRAM)
 
+clean:
+	rm -f *.o $(PROGRAM)
+
 mmboard: $(OBJECTS)
 	$(CC) $(LDFLAGS) -o mmboard $(OBJECTS) $(EXTRA_LIBS) $(LDLIBS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@

contrib/samples/ogl/ogledit/Makefile

@@ -12,7 +12,7 @@
 # on your system.
 #
 
-CPP = gcc
+CPP = gcc -g
 CC = gcc
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include

contrib/samples/ogl/studio/Makefile

@@ -12,7 +12,7 @@
 # on your system.
 #
 
-CPP = gcc
+CPP = gcc -g
 CC = gcc
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include

contrib/samples/ogl/studio/studio.cpp

@@ -436,7 +436,7 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
     int zoomW = 60;
     int zoomH = 18;
 #ifdef __WXMOTIF__
-    controlX += 70;
+    controlX += 75;
     pointSizeW = 60;
     pointSizeH = 22;
     zoomW = 60;