Made wxGTK dataobj.cpp compile; removed flashing from wxGLCanvas samples;

some doc bug fixes


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

src/gtk/dataobj.cpp

@@ -241,7 +241,7 @@ void wxDataBroker::WriteData( wxDataFormat& format, void *dest ) const
 	
 	if (dobj->GetFormat().GetAtom() == format.GetAtom())
 	{
-	    return dobj->WriteData( dest );
+	    dobj->WriteData( dest );
 	}
     
         node = node->Next();
@@ -279,7 +279,7 @@ wxString wxDataObject::GetFormatId() const
 
 GdkAtom wxDataObject::GetFormatAtom() const
 {
-    GdkAtom ret = m_format.GetAtom();
+    GdkAtom ret = ((wxDataObject*) this)->m_format.GetAtom();
     return ret;
 }  
 

src/gtk1/dataobj.cpp

@@ -241,7 +241,7 @@ void wxDataBroker::WriteData( wxDataFormat& format, void *dest ) const
 	
 	if (dobj->GetFormat().GetAtom() == format.GetAtom())
 	{
-	    return dobj->WriteData( dest );
+	    dobj->WriteData( dest );
 	}
     
         node = node->Next();
@@ -279,7 +279,7 @@ wxString wxDataObject::GetFormatId() const
 
 GdkAtom wxDataObject::GetFormatAtom() const
 {
-    GdkAtom ret = m_format.GetAtom();
+    GdkAtom ret = ((wxDataObject*) this)->m_format.GetAtom();
     return ret;
 }  
 

src/makelib.env

@@ -0,0 +1,14 @@
+# Makes a library in Unix (Motif)
+
+# Replace this with your own path if necessary
+WXDIR       = $(WXWIN)
+include $(WXDIR)/src/make.env
+
+all:    $(LIBTARGET)$(GUISUFFIX).a
+
+$(LIBTARGET)$(GUISUFFIX).a : $(OBJECTS)
+	ar $(AROPTIONS) $@ $(OBJECTS)
+	$(RANLIB) $@
+
+clean:
+	rm -f $(OBJECTS) $(LIBTARGET)$(GUISUFFIX).a core

src/makeprog.env

@@ -4,7 +4,7 @@ WXDIR       = $(WXWIN)
 #WXDIR       = /home/jacs/wx2
 include $(WXDIR)/src/make.env
 
-all:    $(PROGRAM)$(GUISUFFIX)
+all:    $(PROGRAM)$(GUISUFFIX) $(EXTRATARGETS)
 
 $(PROGRAM)$(GUISUFFIX):	$(OBJECTS) $(WXLIB)
 	$(CC) $(LDFLAGS) -o $(PROGRAM)$(GUISUFFIX) $(OBJECTS) $(LDLIBS)