header includes cleanup

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

include/wx/gtk/bitmap.h

@@ -7,28 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
+#ifndef _WX_GTK_BITMAP_H_
-#ifndef __GTKBITMAPH__
+#define _WX_GTK_BITMAP_H_
-#define __GTKBITMAPH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/palette.h"
-#include "wx/gdiobj.h"
 
 typedef struct _GdkPixbuf GdkPixbuf;
-
 class WXDLLEXPORT wxPixelDataBase;
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMask;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxImage;
-
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
@@ -174,5 +158,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 };
 
-
+#endif // _WX_GTK_BITMAP_H_
-#endif // __GTKBITMAPH__

include/wx/gtk/brush.h

@@ -7,21 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTK_BRUSH_H_
+#define _WX_GTK_BRUSH_H_
 
-#ifndef __GTKBRUSHH__
+class WXDLLIMPEXP_CORE wxBitmap;
-#define __GTKBRUSHH__
+class WXDLLIMPEXP_CORE wxColour;
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBrush;
 
 //-----------------------------------------------------------------------------
 // wxBrush
@@ -58,4 +48,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
-#endif // __GTKBRUSHH__
+#endif // _WX_GTK_BRUSH_H_

include/wx/gtk/button.h

@@ -7,25 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKBUTTONH__
+#ifndef _WX_GTK_BUTTON_H_
-#define __GTKBUTTONH__
+#define _WX_GTK_BUTTON_H_
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxButton;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxButton
@@ -81,4 +64,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
-#endif // __GTKBUTTONH__
+#endif // _WX_GTK_BUTTON_H_

include/wx/gtk/clipbrd.h

@@ -7,17 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
+#ifndef _WX_GTK_CLIPBOARD_H_
-#ifndef __GTKCLIPBOARDH__
+#define _WX_GTK_CLIPBOARD_H_
-#define __GTKCLIPBOARDH__
-
-#if wxUSE_CLIPBOARD
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/dataobj.h"
-#include "wx/control.h"
-#include "wx/module.h"
 
 // ----------------------------------------------------------------------------
 // wxClipboard
@@ -77,8 +68,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
-#endif
+#endif // _WX_GTK_CLIPBOARD_H_
-   // wxUSE_CLIPBOARD
-
-#endif
-    // __GTKCLIPBOARDH__

include/wx/gtk/colordlg.h

@@ -9,15 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __COLORDLG_H__
+#ifndef _WX_GTK_COLORDLG_H_
-#define __COLORDLG_H__
+#define _WX_GTK_COLORDLG_H_
 
-#include "wx/defs.h"
-#include "wx/gdicmn.h"
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
-
 class WXDLLEXPORT wxColourDialog : public wxDialog
 {
 public:

include/wx/gtk/colour.h

@@ -7,25 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCOLOURH__
+#ifndef _WX_GTK_COLOUR_H_
-#define __GTKCOLOURH__
+#define _WX_GTK_COLOUR_H_
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/palette.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDC;
-class WXDLLIMPEXP_CORE wxPaintDC;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxWindow;
-
-class WXDLLIMPEXP_CORE wxColour;
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -72,4 +55,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
-#endif // __GTKCOLOURH__
+#endif // _WX_GTK_COLOUR_H_

include/wx/gtk/combobox.h

@@ -8,27 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCOMBOBOXH__
+#ifndef _WX_GTK_COMBOBOX_H_
-#define __GTKCOMBOBOXH__
+#define _WX_GTK_COMBOBOX_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_COMBOBOX
-
-#include "wx/object.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxComboBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
-extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxComboBox
@@ -184,8 +165,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif
+#endif // _WX_GTK_COMBOBOX_H_
-
-#endif
-
-  // __GTKCOMBOBOXH__

include/wx/gtk/control.h

@@ -7,19 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCONTROLH__
+#ifndef _WX_GTK_CONTROL_H_
-#define __GTKCONTROLH__
+#define _WX_GTK_CONTROL_H_
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/window.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControl;
 
 typedef struct _GtkLabel GtkLabel;
 typedef struct _GtkFrame GtkFrame;
@@ -113,4 +102,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxControl)
 };
 
-#endif // __GTKCONTROLH__
+#endif // _WX_GTK_CONTROL_H_

include/wx/gtk/cursor.h

@@ -7,16 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCURSORH__
+#ifndef _WX_GTK_CURSOR_H_
-#define __GTKCURSORH__
+#define _WX_GTK_CURSOR_H_
 
-#include "wx/defs.h"
 #include "wx/object.h"
-#include "wx/gdicmn.h"
 
-#if wxUSE_IMAGE
+class WXDLLIMPEXP_CORE wxColour;
-#include "wx/image.h"
+class WXDLLIMPEXP_CORE wxImage;
-#endif
 
 //-----------------------------------------------------------------------------
 // wxCursor
@@ -47,4 +44,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
-#endif // __GTKCURSORH__
+#endif // _WX_GTK_CURSOR_H_

include/wx/gtk/dnd.h

@@ -7,29 +7,10 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKDNDH__
+#ifndef _WX_GTK_DND_H_
-#define __GTKDNDH__
+#define _WX_GTK_DND_H_
 
-#if wxUSE_DRAG_AND_DROP
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/dataobj.h"
-#include "wx/cursor.h"
 #include "wx/icon.h"
-#include "wx/gdicmn.h"
-
-//-------------------------------------------------------------------------
-// classes
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindow;
-
-class WXDLLIMPEXP_CORE wxDropTarget;
-class WXDLLIMPEXP_CORE wxTextDropTarget;
-class WXDLLIMPEXP_CORE wxFileDropTarget;
-
-class WXDLLIMPEXP_CORE wxDropSource;
 
 // ----------------------------------------------------------------------------
 // macros
@@ -124,7 +105,5 @@ private:
                   const wxIcon& none);
 };
 
-#endif // wxUSE_DRAG_AND_DROP
+#endif // _WX_GTK_DND_H_
-
-#endif //__GTKDNDH__
 

include/wx/gtk/font.h

@@ -7,20 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKFONTH__
+#ifndef _WX_GTK_FONT_H_
-#define __GTKFONTH__
+#define _WX_GTK_FONT_H_
-
-#include "wx/hash.h"
-
-// ----------------------------------------------------------------------------
-// classes
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDC;
-class WXDLLIMPEXP_CORE wxPaintDC;
-class WXDLLIMPEXP_CORE wxWindow;
-
-class WXDLLIMPEXP_CORE wxFont;
 
 // ----------------------------------------------------------------------------
 // wxFont
@@ -100,4 +88,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
-#endif // __GTKFONTH__
+#endif // _WX_GTK_FONT_H_

include/wx/gtk/gauge.h

@@ -7,31 +7,11 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKGAUGEH__
+#ifndef _WX_GTK_GAUGE_H_
-#define __GTKGAUGEH__
+#define _WX_GTK_GAUGE_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
 
 //-----------------------------------------------------------------------------
-// classes
+// wxGauge
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGauge;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
-
-//-----------------------------------------------------------------------------
-// wxGaugeBox
 //-----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxGauge: public wxControl
@@ -97,6 +77,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 
-#endif
+#endif // _WX_GTK_GAUGE_H_
-
-#endif // __GTKGAUGEH__

include/wx/gtk/mdi.h

@@ -7,31 +7,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MDIH__
+#ifndef _WX_GTK_MDI_H_
-#define __MDIH__
+#define _WX_GTK_MDI_H_
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/panel.h"
 #include "wx/frame.h"
-#include "wx/toolbar.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMDIParentFrame;
-class WXDLLIMPEXP_CORE wxMDIClientWindow;
-class WXDLLIMPEXP_CORE wxMDIChildFrame;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
@@ -211,4 +190,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 };
 
-#endif // __MDIH__
+#endif // _WX_GTK_MDI_H_

include/wx/gtk/pen.h

@@ -7,21 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKPENH__
+#ifndef _WX_GTK_PEN_H_
-#define __GTKPENH__
+#define _WX_GTK_PEN_H_
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPen;
-
 typedef    gint8 wxGTKDash;
 
 //-----------------------------------------------------------------------------
@@ -66,4 +57,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
-#endif // __GTKPENH__
+#endif // _WX_GTK_PEN_H_

include/wx/gtk/popupwin.h

@@ -8,12 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKPOPUPWINH__
+#ifndef _WX_GTK_POPUPWIN_H_
-#define __GTKPOPUPWINH__
+#define _WX_GTK_POPUPWIN_H_
-
-#include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // wxPopUpWindow
@@ -54,4 +50,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 
-#endif // __GTKPOPUPWINDOWH__
+#endif // _WX_GTK_POPUPWIN_H_

include/wx/gtk/region.h

@@ -10,16 +10,9 @@
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 
-#include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxRegion;
-
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------

include/wx/gtk/spinctrl.h

@@ -8,14 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKSPINCTRLH__
+#ifndef _WX_GTK_SPINCTRL_H_
-#define __GTKSPINCTRLH__
+#define _WX_GTK_SPINCTRL_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_SPINCTRL
-
-#include "wx/control.h"
 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
@@ -79,8 +73,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif
+#endif // _WX_GTK_SPINCTRL_H_
-    // wxUSE_SPINCTRL
-
-#endif
-    // __GTKSPINCTRLH__

include/wx/gtk/stattext.h

@@ -7,23 +7,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKSTATICTEXTH__
+#ifndef _WX_GTK_STATTEXT_H_
-#define __GTKSTATICTEXTH__
+#define _WX_GTK_STATTEXT_H_
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStaticText;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxStaticText
@@ -77,4 +62,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };
 
-#endif // __GTKSTATICTEXTH__
+#endif // _WX_GTK_STATTEXT_H_

include/wx/gtk/taskbarpriv.h

@@ -9,11 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_TASKBARPRIV_H_
+#ifndef _WX_GTK_TASKBARPRIV_H_
-#define _WX_TASKBARPRIV_H_
+#define _WX_GTK_TASKBARPRIV_H_
 
 #include "wx/toplevel.h"
-#include "wx/bitmap.h"
 
 #ifdef __WXGTK20__
 #include <gtk/gtkversion.h>
@@ -37,4 +36,4 @@ protected:
 
 #endif // __WXGTK20__
 #endif // GTK_CHECK_VERSION(2, 1, 0)
-#endif // _WX_TASKBARPRIV_H_
+#endif // _WX_GTK_TASKBARPRIV_H_

src/gtk/brush.cpp

@@ -13,11 +13,10 @@
 #include "wx/brush.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
     #include "wx/colour.h"
 #endif
 
-#include <gdk/gdk.h>
-
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------

src/gtk/cursor.cpp

@@ -15,13 +15,11 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
 #include "wx/gtk/private.h" //for idle stuff
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------

src/gtk/minifram.cpp

@@ -16,17 +16,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
-    #include "wx/dcscreen.h"
+    #include "wx/dcclient.h"
+    #include "wx/image.h"
 #endif
 
-#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
 
-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------