Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant forward decls and headers from wx/*/bitmap.h

Browse Source 
No real changes, just don't redeclare the classes already forward
declared in wx/bitmap.h in the files included (only) from it and don't
include redundant headers.

Also forward declare wxCursor and wxPixelDataBase in wx/bitmap.h itself
for consistency, as many (even though not all) headers use them.

Do not forward declare wxControl in wx/{msw,osx}/bitmap.h, however,
there is no reason to do it in this header.
This commit is contained in:
Vadim Zeitlin
2022-04-10 17:09:52 +01:00
parent a6cc2c7238
commit bf75fe9d64
7 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/bitmap.h
View File

@@ -22,10 +22,12 @@
class WXDLLIMPEXP_FWD_CORE wxBitmap; class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
class WXDLLIMPEXP_FWD_CORE wxCursor;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxIcon; class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_CORE wxMask; class WXDLLIMPEXP_FWD_CORE wxMask;
class WXDLLIMPEXP_FWD_CORE wxPalette; class WXDLLIMPEXP_FWD_CORE wxPalette;
class WXDLLIMPEXP_FWD_CORE wxDC; class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxVariant support // wxVariant support

2
include/wx/gtk/bitmap.h
View File

@@ -14,8 +14,6 @@ typedef struct _cairo cairo_t;
typedef struct _cairo_surface cairo_surface_t; typedef struct _cairo_surface cairo_surface_t;
#endif #endif
typedef struct _GdkPixbuf GdkPixbuf; typedef struct _GdkPixbuf GdkPixbuf;
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
class WXDLLIMPEXP_FWD_CORE wxCursor;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMask // wxMask

5
include/wx/gtk1/bitmap.h
View File

@@ -10,14 +10,9 @@
#ifndef __GTKBITMAPH__ #ifndef __GTKBITMAPH__
#define __GTKBITMAPH__ #define __GTKBITMAPH__
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/string.h"
#include "wx/palette.h" #include "wx/palette.h"
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// classes // classes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

9
include/wx/msw/bitmap.h
View File

@@ -15,19 +15,10 @@
#include "wx/math.h" #include "wx/math.h"
#include "wx/palette.h" #include "wx/palette.h"
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
class WXDLLIMPEXP_FWD_CORE wxBitmapRefData; class WXDLLIMPEXP_FWD_CORE wxBitmapRefData;
class WXDLLIMPEXP_FWD_CORE wxControl;
class WXDLLIMPEXP_FWD_CORE wxCursor;
class WXDLLIMPEXP_FWD_CORE wxDC;
#if wxUSE_WXDIB #if wxUSE_WXDIB
class WXDLLIMPEXP_FWD_CORE wxDIB; class WXDLLIMPEXP_FWD_CORE wxDIB;
#endif #endif
class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_CORE wxMask;
class WXDLLIMPEXP_FWD_CORE wxPalette;
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
// What kind of transparency should a bitmap copied from an icon or cursor // What kind of transparency should a bitmap copied from an icon or cursor
// have? // have?

8
include/wx/osx/bitmap.h
View File

@@ -14,15 +14,7 @@
#include "wx/palette.h" #include "wx/palette.h"
// Bitmap // Bitmap
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class wxBitmapRefData ; class wxBitmapRefData ;
class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
class WXDLLIMPEXP_FWD_CORE wxControl;
class WXDLLIMPEXP_FWD_CORE wxCursor;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
// A mask is a bitmap used for drawing bitmaps // A mask is a bitmap used for drawing bitmaps
// Internally it is stored as a 8 bit deep memory chunk, 0 = black means the source will be drawn // Internally it is stored as a 8 bit deep memory chunk, 0 = black means the source will be drawn

5
include/wx/qt/bitmap.h
View File

@@ -8,12 +8,7 @@
#ifndef _WX_QT_BITMAP_H_ #ifndef _WX_QT_BITMAP_H_
#define _WX_QT_BITMAP_H_ #define _WX_QT_BITMAP_H_
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxCursor;
class QImage; class QImage;
class QPixmap; class QPixmap;
class QBitmap; class QBitmap;

11
include/wx/x11/bitmap.h
View File

@@ -11,20 +11,9 @@
#ifndef _WX_BITMAP_H_ #ifndef _WX_BITMAP_H_
#define _WX_BITMAP_H_ #define _WX_BITMAP_H_
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/string.h"
#include "wx/palette.h" #include "wx/palette.h"
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_FWD_CORE wxMask;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxImage;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMask // wxMask
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------