#include "wx/string.h"
#include "wx/setup.h"
#include "wx/colour.h"
+#include "wx/font.h"
// ---------------------------------------------------------------------------
// forward declarations
// Bitmap flags
enum
{
- wxBITMAP_TYPE_BMP = 1,
+ wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility!
+ wxBITMAP_TYPE_BMP,
wxBITMAP_TYPE_BMP_RESOURCE,
wxBITMAP_TYPE_RESOURCE = wxBITMAP_TYPE_BMP_RESOURCE,
wxBITMAP_TYPE_ICO,
wxBITMAP_TYPE_PNG_RESOURCE,
wxBITMAP_TYPE_JPEG,
wxBITMAP_TYPE_JPEG_RESOURCE,
+ wxBITMAP_TYPE_PNM,
+ wxBITMAP_TYPE_PNM_RESOURCE,
+ wxBITMAP_TYPE_PCX,
+ wxBITMAP_TYPE_PCX_RESOURCE,
+ wxBITMAP_TYPE_PICT,
+ wxBITMAP_TYPE_PICT_RESOURCE,
+ wxBITMAP_TYPE_ICON,
+ wxBITMAP_TYPE_ICON_RESOURCE,
+ wxBITMAP_TYPE_MACCURSOR,
+ wxBITMAP_TYPE_MACCURSOR_RESOURCE,
wxBITMAP_TYPE_ANY = 50
};
wxCURSOR_MAX
};
+#ifndef __WXGTK__
+ #define wxCURSOR_DEFAULT wxCURSOR_ARROW
+#endif
+
// ---------------------------------------------------------------------------
// macros
// ---------------------------------------------------------------------------
#ifdef __WXMSW__
// Load from a resource
#define wxICON(X) wxIcon("" #X "")
+#elif defined(__WXPM__)
+ // Load from a resource
+ #define wxICON(X) wxIcon("" #X "")
#elif defined(__WXGTK__)
// Initialize from an included XPM
#define wxICON(X) wxIcon( (const char**) X##_xpm )
#define wxICON(X) wxIcon("" #X "")
#endif // platform
+/* Another macro: this one is for portable creation of bitmaps. We assume that
+ under Unix bitmaps live in XPMs and under Windows they're in ressources.
+ */
+
+#if defined(__WXMSW__) || defined(__WXPM__)
+ #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+ // Initialize from an included XPM
+ #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
+#else // other platforms
+ #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM)
+#endif // platform
+
// ===========================================================================
// classes
// ===========================================================================
// members are public for compatibility (don't use them directly,
// especially that there names were chosen very unfortunately - they should
// have been called width and height)
- long x;
- long y;
+ int x, y;
// constructors
wxSize() { x = y = 0; }
- wxSize(long xx, long yy) { Set(xx, yy); }
+ wxSize(int xx, int yy) { Set(xx, yy); }
// no copy ctor or assignment operator - the defaults are ok
bool operator==(const wxSize& sz) const { return x == sz.x && y == sz.y; }
wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
// accessors
- void Set(long xx, long yy) { x = xx; y = yy; }
- void SetWidth(long w) { x = w; }
- void SetHeight(long h) { y = h; }
+ void Set(int xx, int yy) { x = xx; y = yy; }
+ void SetWidth(int w) { x = w; }
+ void SetHeight(int h) { y = h; }
- long GetWidth() const { return x; }
- long GetHeight() const { return y; }
+ int GetWidth() const { return x; }
+ int GetHeight() const { return y; }
// compatibility
- long GetX() const { return x; }
- long GetY() const { return y; }
+ int GetX() const { return x; }
+ int GetY() const { return y; }
};
// ---------------------------------------------------------------------------
class WXDLLEXPORT wxPoint
{
public:
-#if defined(__WXMSW__) && !defined(__WIN32__)
- int x;
- int y;
-#else
- long x;
- long y;
-#endif
+ int x, y;
wxPoint() { x = y = 0; };
- wxPoint(long xx, long yy) { x = xx; y = yy; };
+ wxPoint(int xx, int yy) { x = xx; y = yy; };
// no copy ctor or assignment operator - the defaults are ok
{
public:
wxRect() { x = y = width = height = 0; }
- wxRect(long xx, long yy, long ww, long hh)
+ wxRect(int xx, int yy, int ww, int hh)
{ x = xx; y = yy; width = ww; height = hh; }
wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRect(const wxPoint& pos, const wxSize& size);
// default copy ctor and assignment operators ok
- long GetX() const { return x; }
- void SetX(long xx) { x = xx; }
+ int GetX() const { return x; }
+ void SetX(int xx) { x = xx; }
- long GetY() const { return y; }
- void SetY(long yy) { y = yy; }
+ int GetY() const { return y; }
+ void SetY(int yy) { y = yy; }
- long GetWidth() const { return width; }
- void SetWidth(long w) { width = w; }
+ int GetWidth() const { return width; }
+ void SetWidth(int w) { width = w; }
- long GetHeight() const { return height; }
- void SetHeight(long h) { height = h; }
+ int GetHeight() const { return height; }
+ void SetHeight(int h) { height = h; }
wxPoint GetPosition() const { return wxPoint(x, y); }
wxSize GetSize() const { return wxSize(width, height); }
- long GetLeft() const { return x; }
- long GetTop() const { return y; }
- long GetBottom() const { return y + height; }
- long GetRight() const { return x + width; }
+ int GetLeft() const { return x; }
+ int GetTop() const { return y; }
+ int GetBottom() const { return y + height - 1; }
+ int GetRight() const { return x + width - 1; }
+ void SetLeft(int left) { x = left; }
+ void SetRight(int right) { width = right - x + 1; }
+ void SetTop(int top) { y = top; }
+ void SetBottom(int bottom) { height = bottom - y + 1; }
+
+ void Inflate(wxCoord dx, wxCoord dy)
+ {
+ x -= dx;
+ y -= dy;
+ width += 2*dx;
+ height += 2*dy;
+ }
+
+ void Inflate(wxCoord d) { Inflate(d, d); }
bool operator==(const wxRect& rect) const;
bool operator!=(const wxRect& rect) const { return !(*this == rect); }
bool Inside(int cx, int cy) const;
- wxRect operator + (const wxRect& rect) const;
- const wxRect& operator += (const wxRect& rect);
-
+ wxRect operator+(const wxRect& rect) const;
+ wxRect& operator+=(const wxRect& rect);
+
public:
- long x, y, width, height;
+ int x, y, width, height;
};
// ---------------------------------------------------------------------------
void RemoveFont(wxFont *font);
wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
bool underline = FALSE,
- const wxString& face = wxEmptyString);
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
};
class WXDLLEXPORT wxColourDatabase : public wxList
projects / wxWidgets.git / blobdiff