#ifndef __WXMSW__
#include <wx/dcps.h>
#endif
+#include <wx/fontmap.h>
+#include <wx/fontenc.h>
+#include <wx/fontmap.h>
+#include <wx/fontutil.h>
%}
//----------------------------------------------------------------------
%import _defs.i
%import misc.i
-
%{
static wxString wxPyEmptyStr("");
%}
//---------------------------------------------------------------------------
-// class wxGDIImage {
-// public:
-// long GetHandle();
-// void SetHandle(long handle);
-// bool Ok();
-// int GetWidth();
-// int GetHeight();
-// int GetDepth();
-// void SetWidth(int w);
-// void SetHeight(int h);
-// void SetDepth(int d);
-// void SetSize(const wxSize& size);
-// };
+class wxGDIObject : public wxObject {
+public:
+ wxGDIObject();
+ ~wxGDIObject();
+
+ bool GetVisible();
+ void SetVisible( bool visible );
+
+ bool IsNull();
+
+};
//---------------------------------------------------------------------------
-class wxBitmap
-//: public wxGDIImage
+class wxBitmap : public wxGDIObject
{
public:
- wxBitmap(const wxString& name, long type);
+ wxBitmap(const wxString& name, wxBitmapType type);
~wxBitmap();
wxPalette* GetPalette();
#endif
wxBitmap GetSubBitmap( const wxRect& rect );
-#ifdef __WXMSW__
bool CopyFromIcon(const wxIcon& icon);
+#ifdef __WXMSW__
bool CopyFromCursor(const wxCursor& cursor);
int GetQuality();
void SetQuality(int q);
};
+// Declarations of some alternate "constructors"
%new wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1);
+%new wxBitmap* wxBitmapFromXPMData(PyObject* listOfStrings);
+%new wxBitmap* wxBitmapFromIcon(const wxIcon& icon);
+%new wxBitmap* wxBitmapFromBits(char* bits, int width, int height, int depth = 1 );
-#ifdef __WXMSW__
-%new wxBitmap* wxBitmapFromData(PyObject* data, long type,
- int width, int height, int depth = 1);
-#endif
+// #ifdef __WXMSW__
+// %new wxBitmap* wxBitmapFromData(PyObject* data, long type,
+// int width, int height, int depth = 1);
+// #endif
+
+
+
+%{ // Implementations of some alternate "constructors"
-%{ // Alternate 'constructor'
wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1) {
return new wxBitmap(width, height, depth);
}
-#ifdef __WXMSW__
- wxBitmap* wxBitmapFromData(PyObject* data, long type,
- int width, int height, int depth = 1) {
- if (! PyString_Check(data)) {
- PyErr_SetString(PyExc_TypeError, "Expected string object");
+ static char** ConvertListOfStrings(PyObject* listOfStrings) {
+ char** cArray = NULL;
+ int count;
+
+ if (!PyList_Check(listOfStrings)) {
+ PyErr_SetString(PyExc_TypeError, "Expected a list of strings.");
return NULL;
}
+ count = PyList_Size(listOfStrings);
+ cArray = new char*[count];
- return new wxBitmap((void*)PyString_AsString(data), type, width, height, depth);
+ for(int x=0; x<count; x++) {
+ // TODO: Need some validation and error checking here
+ cArray[x] = PyString_AsString(PyList_GET_ITEM(listOfStrings, x));
+ }
+ return cArray;
}
-#endif
+
+
+ wxBitmap* wxBitmapFromXPMData(PyObject* listOfStrings) {
+ char** cArray = NULL;
+ wxBitmap* bmp;
+
+ cArray = ConvertListOfStrings(listOfStrings);
+ if (! cArray)
+ return NULL;
+ bmp = new wxBitmap(cArray);
+ delete [] cArray;
+ return bmp;
+ }
+
+
+ wxBitmap* wxBitmapFromIcon(const wxIcon& icon) {
+ return new wxBitmap(icon);
+ }
+
+
+ wxBitmap* wxBitmapFromBits(char* bits, int width, int height, int depth = 1 ) {
+ return new wxBitmap(bits, width, height, depth);
+ }
+
+
+// #ifdef __WXMSW__
+// wxBitmap* wxBitmapFromData(PyObject* data, long type,
+// int width, int height, int depth = 1) {
+// if (! PyString_Check(data)) {
+// PyErr_SetString(PyExc_TypeError, "Expected string object");
+// return NULL;
+// }
+// return new wxBitmap((void*)PyString_AsString(data), type, width, height, depth);
+// }
+// #endif
%}
//---------------------------------------------------------------------------
-class wxMask {
+class wxMask : public wxObject {
public:
wxMask(const wxBitmap& bitmap);
//~wxMask();
+
+ %addmethods { void Destroy() { delete self; } }
};
%new wxMask* wxMaskColour(const wxBitmap& bitmap, const wxColour& colour);
//---------------------------------------------------------------------------
-class wxIcon
-//: public wxGDIImage
+class wxIcon : public wxGDIObject
{
public:
wxIcon(const wxString& name, long flags,
#ifdef __WXMSW__
void SetSize(const wxSize& size);
#endif
+ void CopyFromBitmap(const wxBitmap& bmp);
+
%pragma(python) addtoclass = "
def __del__(self,gdic=gdic):
try:
except:
pass
"
-
};
+// Declarations of some alternate "constructors"
+%new wxIcon* wxEmptyIcon();
+%new wxIcon* wxIconFromXPMData(PyObject* listOfStrings);
+
+%{ // Implementations of some alternate "constructors"
+ wxIcon* wxEmptyIcon() {
+ return new wxIcon();
+ }
+
+ wxIcon* wxIconFromXPMData(PyObject* listOfStrings) {
+ char** cArray = NULL;
+ wxIcon* icon;
+
+ cArray = ConvertListOfStrings(listOfStrings);
+ if (! cArray)
+ return NULL;
+ icon = new wxIcon(cArray);
+ delete [] cArray;
+ return icon;
+ }
+%}
+
//---------------------------------------------------------------------------
-class wxCursor
-//: public wxGDIImage
+class wxCursor : public wxGDIObject
{
public:
#ifdef __WXMSW__
//----------------------------------------------------------------------
+enum wxFontFamily
+{
+ wxFONTFAMILY_DEFAULT = wxDEFAULT,
+ wxFONTFAMILY_DECORATIVE = wxDECORATIVE,
+ wxFONTFAMILY_ROMAN = wxROMAN,
+ wxFONTFAMILY_SCRIPT = wxSCRIPT,
+ wxFONTFAMILY_SWISS = wxSWISS,
+ wxFONTFAMILY_MODERN = wxMODERN,
+ wxFONTFAMILY_TELETYPE = wxTELETYPE,
+ wxFONTFAMILY_MAX
+};
+
+// font styles
+enum wxFontStyle
+{
+ wxFONTSTYLE_NORMAL = wxNORMAL,
+ wxFONTSTYLE_ITALIC = wxITALIC,
+ wxFONTSTYLE_SLANT = wxSLANT,
+ wxFONTSTYLE_MAX
+};
+
+// font weights
+enum wxFontWeight
+{
+ wxFONTWEIGHT_NORMAL = wxNORMAL,
+ wxFONTWEIGHT_LIGHT = wxLIGHT,
+ wxFONTWEIGHT_BOLD = wxBOLD,
+ wxFONTWEIGHT_MAX
+};
+
+
+// font encodings
enum wxFontEncoding
{
wxFONTENCODING_SYSTEM = -1, // system default
wxFONTENCODING_ISO8859_1, // West European (Latin1)
wxFONTENCODING_ISO8859_2, // Central and East European (Latin2)
wxFONTENCODING_ISO8859_3, // Esperanto (Latin3)
- wxFONTENCODING_ISO8859_4, // Baltic languages (Estonian) (Latin4)
+ wxFONTENCODING_ISO8859_4, // Baltic (old) (Latin4)
wxFONTENCODING_ISO8859_5, // Cyrillic
wxFONTENCODING_ISO8859_6, // Arabic
wxFONTENCODING_ISO8859_7, // Greek
wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it
// here anyhow to make all ISO8859
// consecutive numbers
- wxFONTENCODING_ISO8859_13, // Latin7
+ wxFONTENCODING_ISO8859_13, // Baltic (Latin7)
wxFONTENCODING_ISO8859_14, // Latin8
wxFONTENCODING_ISO8859_15, // Latin9 (a.k.a. Latin0, includes euro)
+ wxFONTENCODING_ISO8859_MAX,
// Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)
wxFONTENCODING_KOI8, // we don't support any of KOI8 variants
wxFONTENCODING_CP855, // another cyrillic encoding
wxFONTENCODING_CP866, // and another one
// and for Windows
+ wxFONTENCODING_CP874, // WinThai
wxFONTENCODING_CP1250, // WinLatin2
wxFONTENCODING_CP1251, // WinCyrillic
wxFONTENCODING_CP1252, // WinLatin1
+ wxFONTENCODING_CP1253, // WinGreek (8859-7)
+ wxFONTENCODING_CP1254, // WinTurkish
+ wxFONTENCODING_CP1255, // WinHebrew
+ wxFONTENCODING_CP1256, // WinArabic
+ wxFONTENCODING_CP1257, // WinBaltic (same as Latin 7)
+ wxFONTENCODING_CP12_MAX,
+
+ wxFONTENCODING_UTF7, // UTF-7 Unicode encoding
+ wxFONTENCODING_UTF8, // UTF-8 Unicode encoding
+
+ wxFONTENCODING_UNICODE, // Unicode - currently used only by
+ // wxEncodingConverter class
wxFONTENCODING_MAX
};
-class wxFont {
+
+// wxNativeFontInfo is platform-specific font representation: this struct
+// should be considered as opaque font description only used by the native
+// functions, the user code can only get the objects of this type from
+// somewhere and pass it somewhere else (possibly save them somewhere using
+// ToString() and restore them using FromString())
+struct wxNativeFontInfo
+{
+ // it is important to be able to serialize wxNativeFontInfo objects to be
+ // able to store them (in config file, for example)
+ bool FromString(const wxString& s);
+ wxString ToString() const;
+
+ %addmethods {
+ wxString __str__() {
+ return self->ToString();
+ }
+ }
+};
+
+
+// wxFontMapper manages user-definable correspondence between logical font
+// names and the fonts present on the machine.
+//
+// The default implementations of all functions will ask the user if they are
+// not capable of finding the answer themselves and store the answer in a
+// config file (configurable via SetConfigXXX functions). This behaviour may
+// be disabled by giving the value of FALSE to "interactive" parameter.
+// However, the functions will always consult the config file to allow the
+// user-defined values override the default logic and there is no way to
+// disable this - which shouldn't be ever needed because if "interactive" was
+// never TRUE, the config file is never created anyhow.
+class wxFontMapper
+{
+public:
+ wxFontMapper();
+ ~wxFontMapper();
+
+
+ // find an alternative for the given encoding (which is supposed to not be
+ // available on this system). If successful, return TRUE and rwxFontEcoding
+ // that can be used it wxFont ctor otherwise return FALSE
+ //bool GetAltForEncoding(wxFontEncoding encoding,
+ // wxFontEncoding *alt_encoding,
+ // const wxString& facename = wxEmptyString,
+ // bool interactive = TRUE);
+
+
+ // Find an alternative for the given encoding (which is supposed to not be
+ // available on this system). If successful, returns the encoding otherwise
+ // returns None.
+ %addmethods {
+ PyObject* GetAltForEncoding(wxFontEncoding encoding,
+ const wxString& facename = wxEmptyString,
+ bool interactive = TRUE) {
+ wxFontEncoding alt_enc;
+ if (self->GetAltForEncoding(encoding, &alt_enc, facename, interactive))
+ return PyInt_FromLong(alt_enc);
+ else {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+ }
+ }
+
+
+ // checks whether given encoding is available in given face or not.
+ // If no facename is given,
+ bool IsEncodingAvailable(wxFontEncoding encoding,
+ const wxString& facename = wxEmptyString);
+
+ // returns the encoding for the given charset (in the form of RFC 2046) or
+ // wxFONTENCODING_SYSTEM if couldn't decode it
+ wxFontEncoding CharsetToEncoding(const wxString& charset,
+ bool interactive = TRUE);
+
+ // return internal string identifier for the encoding (see also
+ // GetEncodingDescription())
+ static wxString GetEncodingName(wxFontEncoding encoding);
+
+ // return user-readable string describing the given encoding
+ //
+ // NB: hard-coded now, but might change later (read it from config?)
+ static wxString GetEncodingDescription(wxFontEncoding encoding);
+
+ // the parent window for modal dialogs
+ void SetDialogParent(wxWindow *parent);
+
+ // the title for the dialogs (note that default is quite reasonable)
+ void SetDialogTitle(const wxString& title);
+
+ // functions which allow to configure the config object used: by default,
+ // the global one (from wxConfigBase::Get() will be used) and the default
+ // root path for the config settings is the string returned by
+ // GetDefaultConfigPath()
+
+
+ // set the config object to use (may be NULL to use default)
+ void SetConfig(wxConfigBase *config);
+
+ // set the root config path to use (should be an absolute path)
+ void SetConfigPath(const wxString& prefix);
+
+ // return default config path
+ static const wxChar *GetDefaultConfigPath();
+};
+
+
+
+
+class wxFont : public wxGDIObject {
public:
wxFont( int pointSize, int family, int style, int weight,
int underline=FALSE, char* faceName = "",
wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
+
+ %name(wxFontFromNativeInfo)wxFont(const wxNativeFontInfo& info);
+
~wxFont();
- bool Ok();
- wxString GetFaceName();
- int GetFamily();
-#ifdef __WXMSW__
- int GetFontId();
-#endif
- int GetPointSize();
- int GetStyle();
- bool GetUnderlined();
- int GetWeight();
- wxFontEncoding GetEncoding();
- void SetFaceName(const wxString& faceName);
- void SetFamily(int family);
+ bool Ok() const;
+ int GetPointSize() const;
+ int GetFamily() const;
+ int GetStyle() const;
+ int GetWeight() const;
+ bool GetUnderlined() const;
+ wxString GetFaceName() const;
+ wxFontEncoding GetEncoding() const;
+ wxNativeFontInfo* GetNativeFontInfo() const;
+
void SetPointSize(int pointSize);
+ void SetFamily(int family);
void SetStyle(int style);
- void SetUnderlined(bool underlined);
void SetWeight(int weight);
+ void SetFaceName(const wxString& faceName);
+ void SetUnderlined(bool underlined);
void SetEncoding(wxFontEncoding encoding);
- wxString GetFamilyString();
- wxString GetStyleString();
- wxString GetWeightString();
-};
+ void SetNativeFontInfo(const wxNativeFontInfo& info);
-%inline %{
- wxFontEncoding wxFont_GetDefaultEncoding() {
- return wxFont::GetDefaultEncoding();
- }
+ wxString GetFamilyString() const;
+ wxString GetStyleString() const;
+ wxString GetWeightString() const;
- void wxFont_SetDefaultEncoding(wxFontEncoding encoding) {
- wxFont::SetDefaultEncoding(encoding);
- }
-%}
+ static wxFontEncoding GetDefaultEncoding();
+ static void SetDefaultEncoding(wxFontEncoding encoding);
+
+};
-class wxFontList {
+class wxFontList : public wxObject {
public:
void AddFont(wxFont* font);
//----------------------------------------------------------------------
-class wxColour {
+class wxColour : public wxObject {
public:
wxColour(unsigned char red=0, unsigned char green=0, unsigned char blue=0);
~wxColour();
-class wxColourDatabase {
+class wxColourDatabase : public wxObject {
public:
wxColour *FindColour(const wxString& colour);
//----------------------------------------------------------------------
-
-class wxPen {
+class wxPen : public wxGDIObject {
public:
wxPen(wxColour& colour, int width=1, int style=wxSOLID);
~wxPen();
int GetCap();
- wxColour& GetColour();
+ wxColour GetColour();
int GetJoin();
int GetStyle();
void SetWidth(int width);
// **** This one needs to return a list of ints (wxDash)
- int GetDashes(wxDash **dashes);
+ //int GetDashes(wxDash **dashes);
void SetDashes(int LCOUNT, wxDash* choices);
#ifdef __WXMSW__
};
-class wxPenList {
+
+%{
+class wxPyPen : public wxPen {
+public:
+ wxPyPen(wxColour& colour, int width=1, int style=wxSOLID)
+ : wxPen(colour, width, style)
+ { m_dash = NULL; }
+ ~wxPyPen() {
+ if (m_dash)
+ delete m_dash;
+ }
+
+ void SetDashes(int nb_dashes, const wxDash *dash) {
+ m_dash = new wxDash[nb_dashes];
+ for (int i=0; i<nb_dashes; i++)
+ m_dash[i] = dash[i];
+ wxPen::SetDashes(nb_dashes, m_dash);
+ }
+
+private:
+ wxDash* m_dash;
+};
+%}
+
+
+
+class wxPyPen : public wxPen {
+public:
+ wxPyPen(wxColour& colour, int width=1, int style=wxSOLID);
+ ~wxPyPen();
+
+ void SetDashes(int LCOUNT, wxDash* choices);
+};
+
+
+
+class wxPenList : public wxObject {
public:
void AddPen(wxPen* pen);
//----------------------------------------------------------------------
-class wxBrush {
+class wxBrush : public wxGDIObject {
public:
wxBrush(const wxColour& colour, int style=wxSOLID);
~wxBrush();
- wxColour& GetColour();
+ wxColour GetColour();
wxBitmap * GetStipple();
int GetStyle();
bool Ok();
};
-class wxBrushList {
+class wxBrushList : public wxObject {
public:
void AddBrush(wxBrush *brush);
-class wxDC {
+class wxDC : public wxObject {
public:
// wxDC(); **** abstract base class, can't instantiate.
~wxDC();
%name(GetSizeTuple)void GetSize(int* OUTPUT, int* OUTPUT);
wxSize GetSize();
wxSize GetSizeMM();
- wxColour& GetTextBackground();
+ wxColour GetTextBackground();
void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT);
%name(GetFullTextExtent)void GetTextExtent(const wxString& string,
long *OUTPUT, long *OUTPUT, long *OUTPUT, long* OUTPUT,
const wxFont* font = NULL);
- wxColour& GetTextForeground();
+ wxColour GetTextForeground();
void GetUserScale(double *OUTPUT, double *OUTPUT);
long LogicalToDeviceX(long x);
long LogicalToDeviceXRel(long x);
void SetBackground(const wxBrush& brush);
void SetBackgroundMode(int mode);
void SetClippingRegion(long x, long y, long width, long height);
+ %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);
void SetPalette(const wxPalette& colourMap);
void SetBrush(const wxBrush& brush);
void SetFont(const wxFont& font);
void CalcBoundingBox(int x, int y);
void ResetBoundingBox();
+
+#ifdef __WXMSW__
+ long GetHDC();
+#endif
};
extern wxFontList* wxTheFontList;
extern wxPenList* wxThePenList;
-extern wxBrushlist* wxTheBrushList;
+extern wxBrushList* wxTheBrushList;
extern wxColourDatabase* wxTheColourDatabase;
//---------------------------------------------------------------------------
-class wxPalette {
+class wxPalette : public wxGDIObject {
public:
wxPalette(int LCOUNT, byte* choices, byte* choices, byte* choices);
~wxPalette();
wxIMAGE_LIST_STATE
};
-class wxImageList {
+class wxImageList : public wxObject {
public:
wxImageList(int width, int height, int mask=TRUE, int initialCount=1);
~wxImageList();
};
+//---------------------------------------------------------------------------
+// Regions, etc.
+
+enum wxRegionContain {
+ wxOutRegion, wxPartRegion, wxInRegion
+};
+
+
+class wxRegion : public wxGDIObject {
+public:
+ wxRegion(long x=0, long y=0, long width=0, long height=0);
+ ~wxRegion();
+
+ void Clear();
+ wxRegionContain Contains(long x, long y);
+ %name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
+ %name(ContainsRect)wxRegionContain Contains(const wxRect& rect);
+ %name(ContainsRectDim)wxRegionContain Contains(long x, long y, long w, long h);
+
+ wxRect GetBox();
+
+ bool Intersect(long x, long y, long width, long height);
+ %name(IntersectRect)bool Intersect(const wxRect& rect);
+ %name(IntersectRegion)bool Intersect(const wxRegion& region);
+
+ bool IsEmpty();
+
+ bool Union(long x, long y, long width, long height);
+ %name(UnionRect)bool Union(const wxRect& rect);
+ %name(UnionRegion)bool Union(const wxRegion& region);
+
+ bool Subtract(long x, long y, long width, long height);
+ %name(SubtractRect)bool Subtract(const wxRect& rect);
+ %name(SubtractRegion)bool Subtract(const wxRegion& region);
+
+ bool Xor(long x, long y, long width, long height);
+ %name(XorRect)bool Xor(const wxRect& rect);
+ %name(XorRegion)bool Xor(const wxRegion& region);
+};
+
+
+
+class wxRegionIterator : public wxObject {
+public:
+ wxRegionIterator(const wxRegion& region);
+ ~wxRegionIterator();
+
+ long GetX();
+ long GetY();
+ long GetW();
+ long GetWidth();
+ long GetH();
+ long GetHeight();
+ wxRect GetRect();
+ bool HaveRects();
+ void Reset();
+
+ %addmethods {
+ void Next() {
+ (*self) ++;
+ }
+ };
+};
+
+
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff