Fixes to allow OGL building as a DLL

Also removed the hack I put in last week to allow building without the
deprecated headers and fixed it the right way.


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

contrib/include/wx/ogl/bmpshape.h

@@ -16,9 +16,8 @@
 #pragma interface "bmpshape.h"
 #endif
 
-#include <wx/ogl/basic.h>
 
-class wxBitmapShape: public wxRectangleShape
+class WXDLLIMPEXP_OGL wxBitmapShape: public wxRectangleShape
 {
  DECLARE_DYNAMIC_CLASS(wxBitmapShape)
  public: