configure and #ifdef wxUSE_XXX updates

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

include/wx/gtk/bmpbuttn.h

@@ -19,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
+#include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // classes

include/wx/gtk/clipbrd.h

@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#ifdef wxUSE_CLIPBOARD
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/dataobj.h"
@@ -99,6 +102,9 @@ public:
     void OnExit();
 };
 
+#endif
+
+   // wxUSE_CLIPBOARD
 
 #endif
     // __GTKCLIPBOARDH__

include/wx/gtk/combobox.h

@@ -17,6 +17,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#ifdef wxUSE_COMBOBOX
+
 #include "wx/object.h"
 #include "wx/control.h"
 
@@ -116,4 +119,10 @@ public:
   DECLARE_EVENT_TABLE()
 };
 
-#endif // __GTKCOMBOBOXH__
+#endif
+
+  // wxUSE_COMBOBOX
+
+#endif
+
+  // __GTKCOMBOBOXH__

include/wx/gtk/dnd.h

@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#ifdef wxUSE_DRAG_AND_DROP
+
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/dataobj.h"
@@ -148,6 +151,10 @@ class wxDropSource: public wxObject
     wxCursor      m_goaheadCursor;
 };
 
+#endif
+
+   // wxUSE_DRAG_AND_DROP
+
 #endif  
        //__GTKDNDH__
 

include/wx/gtk/frame.h

@@ -18,6 +18,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes

include/wx/gtk/listbox.h

@@ -91,7 +91,9 @@ public:
   void SetString( int n, const wxString &string );
   void SetStringSelection( const wxString &string, bool select = TRUE );
     
+#ifdef wxUSE_DRAG_AND_DROP
   void SetDropTarget( wxDropTarget *dropTarget );
+#endif
 
 // implementation
     

include/wx/gtk/statbmp.h

@@ -18,6 +18,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/control.h"
+#include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // classes

include/wx/gtk/tbargtk.h

@@ -16,6 +16,7 @@
 
 #include "wx/defs.h"
 #include "wx/control.h"
+#include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // classes

include/wx/gtk/window.h

@@ -22,9 +22,7 @@
 #include "wx/validate.h"
 #include "wx/cursor.h"
 #include "wx/font.h"
-#include "wx/dc.h"
 #include "wx/region.h"
-#include "wx/dnd.h"
 #include "wx/accel.h"
 
 //-----------------------------------------------------------------------------
@@ -40,14 +38,17 @@ extern wxList wxTopLevelWindows;
 
 class wxLayoutConstraints;
 class wxSizer;
-#if wxUSE_WX_RESOURCES
-class wxResourceTable;
-class wxItemResource;
-#endif
-
+class wxDC;
 class wxClientData;
 class wxVoidClientData;
 class wxWindow;
+#ifdef wxUSE_WX_RESOURCES
+class wxResourceTable;
+class wxItemResource;
+#endif
+#ifdef wxUSE_DRAG_AND_DROP
+class wxDropTarget;
+#endif
 
 //-----------------------------------------------------------------------------
 // callback definition for inserting a window (internal)
@@ -289,8 +290,10 @@ public:
 
   virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
+#ifdef wxUSE_DRAG_AND_DROP
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
+#endif
 
   virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE );
@@ -332,7 +335,9 @@ public:
   int                  m_retCode;
   wxEvtHandler        *m_eventHandler;
   wxValidator         *m_windowValidator;
+#ifdef wxUSE_DRAG_AND_DROP
   wxDropTarget        *m_dropTarget;
+#endif
   wxWindowID           m_windowId;
   wxCursor            *m_cursor;
   wxFont               m_font;