wxBITMAP_TYPE_XBM_DATA,
wxBITMAP_TYPE_XPM,
wxBITMAP_TYPE_XPM_DATA,
- wxBITMAP_TYPE_TIF,
- wxBITMAP_TYPE_TIF_RESOURCE,
+ wxBITMAP_TYPE_TIFF,
+ wxBITMAP_TYPE_TIF = wxBITMAP_TYPE_TIFF,
+ wxBITMAP_TYPE_TIFF_RESOURCE,
+ wxBITMAP_TYPE_TIF_RESOURCE = wxBITMAP_TYPE_TIFF_RESOURCE,
wxBITMAP_TYPE_GIF,
wxBITMAP_TYPE_GIF_RESOURCE,
wxBITMAP_TYPE_PNG,
This method is the opposite from Inflate(): Deflate(a, b) is equivalent
to Inflate(-a, -b). Please refer to Inflate() for full description.
*/
- void Deflate(wxCoord dx, wxCoord dy);
- void Deflate(const wxSize& diff);
- void Deflate(wxCoord diff);
- wxRect Deflate(wxCoord dx, wxCoord dy) const;
+ wxRect& Deflate(wxCoord dx, wxCoord dy);
+ wxRect& Deflate(const wxSize& diff);
+ wxRect& Deflate(wxCoord diff);
+ wxRect Deflate(wxCoord dx, wxCoord dy) const;
//@}
/**
The left border is moved farther left and the right border is moved
farther right by @a dx. The upper border is moved farther up and the
- bottom border is moved farther down by @a dy. (Note the the width and
+ bottom border is moved farther down by @a dy. (Note that the width and
height of the rectangle thus change by 2*dx and 2*dy, respectively.) If
one or both of @a dx and @a dy are negative, the opposite happens: the
rectangle size decreases in the respective direction.
@see Deflate()
*/
- void Inflate(wxCoord dx, wxCoord dy);
- void Inflate(const wxSize& diff);
- void Inflate(wxCoord diff);
+ wxRect& Inflate(wxCoord dx, wxCoord dy);
+ wxRect& Inflate(const wxSize& diff);
+ wxRect& Inflate(wxCoord diff);
wxRect Inflate(wxCoord dx, wxCoord dy) const;
//@}
*/
void SetY(int y);
+ /**
+ Set the left side of the rectangle.
+
+ Notice that because the rectangle stores its left side and width,
+ calling SetLeft() changes the right side position too -- but does
+ preserve the width.
+ */
+ void SetLeft(int left);
+
+ /**
+ Set the right side of the rectangle.
+
+ Notice that this doesn't affect GetLeft() return value but changes the
+ rectangle width to set its right side to the given position.
+ */
+ void SetRight(int right);
+
+ /**
+ Set the top edge of the rectangle.
+
+ Notice that because the rectangle stores its top side and height,
+ calling SetTop() changes the bottom side position too -- but does
+ preserve the height.
+ */
+ void SetTop(int top);
+
+ /**
+ Set the bottom edge of the rectangle.
+
+ Notice that this doesn't affect GetTop() return value but changes the
+ rectangle height to set its bottom side to the given position.
+ */
+ void SetBottom(int bottom);
+
+ /**
+ Set the top-left point of the rectangle.
+ */
+ void SetTopLeft(const wxPoint &p);
+
+ /**
+ Set the bottom-right point of the rectangle.
+ */
+ void SetBottomRight(const wxPoint &p);
+
+ /**
+ Set the top-right point of the rectangle.
+ */
+ void SetTopRight(const wxPoint &p);
+
+ /**
+ Set the bottom-left point of the rectangle.
+ */
+ void SetBottomLeft(const wxPoint &p);
+
+
//@{
/**
Modifies the rectangle to contain the bounding box of this rectangle
wxSize& operator *=(int factor);
//@}
+
+ /**
+ @name Defaults handling.
+
+ Test for and set non-specified wxPoint components.
+
+ Although a wxPoint is always initialized to (0, 0), wxWidgets commonly
+ uses wxDefaultCoord (defined as @c -1) to indicate that a point hasn't
+ been initialized or specified. In particular, ::wxDefaultPosition is
+ used in many places with this meaning.
+ */
+ //@{
+
+ /**
+ Returns @true if neither of the point components is equal to
+ wxDefaultCoord.
+
+ This method is typically used before calling SetDefaults().
+
+ @since 2.9.2
+ */
+ bool IsFullySpecified() const;
+
+ /**
+ Combine this object with another one replacing the uninitialized
+ values.
+
+ It is typically used like this:
+
+ @code
+ if ( !pos.IsFullySpecified() )
+ {
+ pos.SetDefaults(GetDefaultPosition());
+ }
+ @endcode
+
+ @see IsFullySpecified()
+
+ @since 2.9.2
+ */
+ void SetDefaults(const wxPoint& pt);
+ //@}
+
/**
x member.
*/
};
/**
- Global istance of a wxPoint initialized with values (-1,-1).
+ Global instance of a wxPoint initialized with values (-1,-1).
*/
-wxPoint wxDefaultPosition;
+const wxPoint wxDefaultPosition;
/**
/**
- Global istance of a wxColourDatabase.
+ Global instance of a wxColourDatabase.
*/
wxColourDatabase* wxTheColourDatabase;
almost equivalent to wxSize, has a different meaning: wxPoint represents a
position while wxSize represents the size.
- @beginWxPythonOnly
- wxPython defines aliases for the @e x and @e y members named @e width and
- @e height since it makes much more sense for sizes.
- @endWxPythonOnly
-
@library{wxcore}
@category{data}
*/
void DecTo(const wxSize& size);
+ /**
+ Decrements this object to be not bigger than the given size ignoring
+ non-specified components.
+
+ This is similar to DecTo() but doesn't do anything for x or y
+ component if the same component of @a size is not specified, i.e. set
+ to ::wxDefaultCoord.
+
+ @since 2.9.5
+ */
+ void DecToIfSpecified(const wxSize& size);
+
/**
Gets the height member.
*/
/**
Global instance of a wxSize object initialized to (-1,-1).
*/
-wxSize wxDefaultSize;
+const wxSize wxDefaultSize;
*/
#define wxBITMAP(bitmapName)
+/**
+ Creates a bitmap from either application resources or embedded image data
+ in PNG format.
+
+ This macro is similar to wxBITMAP() but works with bitmap data in PNG
+ format and not BMP or XPM.
+
+ Under Windows the given @a bitmapName must be present in the application
+ resource file with the type @c RCDATA and refer to a PNG image. I.e. you
+ should have a definition similar to the following in your @c .rc file:
+ @code
+ mybitmap RCDATA "mybitmap.png"
+ @endcode
+ to be able to use @c wxBITMAP_PNG(mybitmap) in the code.
+
+ Under OS X the file with the specified name and "png" extension must be
+ present in the "Resources" subdirectory of the application bundle.
+
+ Under the other platforms, this is equivalent to wxBITMAP_PNG_FROM_DATA()
+ and so loads the image data from the array called @c bitmapName_png that
+ must exist. Notice that it @e must be an array and not a pointer as the
+ macro needs to be able to determine its size. Such an array can be produced
+ by a number of conversion programs. A very simple one is included in
+ wxWidgets distribution as @c misc/scripts/png2c.py.
+
+ Finally notice that you must register PNG image handler to be able to
+ load bitmaps from PNG data. This can be done either by calling
+ wxInitAllImageHandlers() which also registers all the other image formats
+ or including the necessary header:
+ @code
+ #include <wx/imagpng.h>
+ @endcode
+ and calling
+ @code
+ wxImage::AddHandler(new wxPNGHandler);
+ @endcode
+ in your application startup code.
+
+ @see wxBITMAP_PNG_FROM_DATA()
+
+ @header{wx/gdicmn.h}
+
+ @since 2.9.5
+ */
+#define wxBITMAP_PNG(bitmapName)
+
+/**
+ Creates a bitmap from embedded image data in PNG format.
+
+ This macro is a thin wrapper around wxBitmap::NewFromPNGData() and takes
+ just the base name of the array containing the image data and computes its
+ size internally. In other words, the array called @c bitmapName_png must
+ exist. Notice that it @e must be an array and not a pointer as the macro
+ needs to be able to determine its size. Such an array can be produced by a
+ number of conversion programs. A very simple one is included in wxWidgets
+ distribution as @c misc/scripts/png2c.py.
+
+ You can use wxBITMAP_PNG() to load the PNG bitmaps from resources on the
+ platforms that support this and only fall back to loading them from data
+ under the other ones (i.e. not Windows and not OS X).
+
+ @header{wx/gdicmn.h}
+
+ @since 2.9.5
+ */
+#define wxBITMAP_PNG_FROM_DATA(bitmapName)
+
/**
This macro loads an icon from either application resources (on the
platforms for which they exist, i.e. Windows and OS2) or from an XPM file.
projects / wxWidgets.git / blobdiff