mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-21 05:15:41 +08:00
Move font and encoding related classes to a new module. Added
wxLocale and wxEncodingConverter. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
File diff suppressed because it is too large
Load Diff
+2
-313
@@ -1,6 +1,6 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: gdi.i
|
||||
// Purpose: SWIG interface file for wxDC, wxBrush, wxPen, wxFont, etc.
|
||||
// Purpose: SWIG interface file for wxDC, wxBrush, wxPen, etc.
|
||||
//
|
||||
// Author: Robin Dunn
|
||||
//
|
||||
@@ -32,6 +32,7 @@
|
||||
// Import some definitions of other classes, etc.
|
||||
%import _defs.i
|
||||
%import misc.i
|
||||
%import fonts.i
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@@ -333,318 +334,6 @@ public:
|
||||
}
|
||||
%}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
|
||||
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,
|
||||
wxFONTFAMILY_UNKNOWN
|
||||
};
|
||||
|
||||
// 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_DEFAULT, // current default encoding
|
||||
|
||||
// ISO8859 standard defines a number of single-byte charsets
|
||||
wxFONTENCODING_ISO8859_1, // West European (Latin1)
|
||||
wxFONTENCODING_ISO8859_2, // Central and East European (Latin2)
|
||||
wxFONTENCODING_ISO8859_3, // Esperanto (Latin3)
|
||||
wxFONTENCODING_ISO8859_4, // Baltic (old) (Latin4)
|
||||
wxFONTENCODING_ISO8859_5, // Cyrillic
|
||||
wxFONTENCODING_ISO8859_6, // Arabic
|
||||
wxFONTENCODING_ISO8859_7, // Greek
|
||||
wxFONTENCODING_ISO8859_8, // Hebrew
|
||||
wxFONTENCODING_ISO8859_9, // Turkish (Latin5)
|
||||
wxFONTENCODING_ISO8859_10, // Variation of Latin4 (Latin6)
|
||||
wxFONTENCODING_ISO8859_11, // Thai
|
||||
wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it
|
||||
// here anyhow to make all ISO8859
|
||||
// consecutive numbers
|
||||
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_ALTERNATIVE, // same as MS-DOS CP866
|
||||
wxFONTENCODING_BULGARIAN, // used under Linux in Bulgaria
|
||||
|
||||
// what would we do without Microsoft? They have their own encodings
|
||||
// for DOS
|
||||
wxFONTENCODING_CP437, // original MS-DOS codepage
|
||||
wxFONTENCODING_CP850, // CP437 merged with Latin1
|
||||
wxFONTENCODING_CP852, // CP437 merged with Latin2
|
||||
wxFONTENCODING_CP855, // another cyrillic encoding
|
||||
wxFONTENCODING_CP866, // and another one
|
||||
// and for Windows
|
||||
wxFONTENCODING_CP874, // WinThai
|
||||
wxFONTENCODING_CP932, // Japanese (shift-JIS)
|
||||
wxFONTENCODING_CP936, // Chiniese simplified (GB)
|
||||
wxFONTENCODING_CP949, // Korean (Hangul charset)
|
||||
wxFONTENCODING_CP950, // Chinese (traditional - Big5)
|
||||
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
|
||||
};
|
||||
|
||||
|
||||
|
||||
// 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
|
||||
{
|
||||
#ifdef __WXGTK__
|
||||
// init the elements from an XLFD, return TRUE if ok
|
||||
bool FromXFontName(const wxString& xFontName);
|
||||
|
||||
// return false if we were never initialized with a valid XLFD
|
||||
bool IsDefault() const;
|
||||
|
||||
// generate an XLFD using the fontElements
|
||||
wxString GetXFontName() const;
|
||||
|
||||
// set the XFLD
|
||||
void SetXFontName(const wxString& xFontName);
|
||||
#endif
|
||||
|
||||
wxNativeFontInfo() { Init(); }
|
||||
|
||||
// reset to the default state
|
||||
void Init();
|
||||
|
||||
#ifndef __WXGTK__
|
||||
// accessors and modifiers for the font elements
|
||||
int GetPointSize() const;
|
||||
wxFontStyle GetStyle() const;
|
||||
wxFontWeight GetWeight() const;
|
||||
bool GetUnderlined() const;
|
||||
wxString GetFaceName() const;
|
||||
wxFontFamily GetFamily() const;
|
||||
wxFontEncoding GetEncoding() const;
|
||||
|
||||
void SetPointSize(int pointsize);
|
||||
void SetStyle(wxFontStyle style);
|
||||
void SetWeight(wxFontWeight weight);
|
||||
void SetUnderlined(bool underlined);
|
||||
void SetFaceName(wxString facename);
|
||||
void SetFamily(wxFontFamily family);
|
||||
void SetEncoding(wxFontEncoding encoding);
|
||||
#endif
|
||||
|
||||
// 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();
|
||||
}
|
||||
}
|
||||
|
||||
// we also want to present the native font descriptions to the user in some
|
||||
// human-readable form (it is not platform independent neither, but can
|
||||
// hopefully be understood by the user)
|
||||
bool FromUserString(const wxString& s);
|
||||
wxString ToUserString() const;
|
||||
};
|
||||
|
||||
|
||||
// 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 = wxPyEmptyString,
|
||||
// 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 = wxPyEmptyString,
|
||||
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 = wxPyEmptyString);
|
||||
|
||||
// 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 wxString GetDefaultConfigPath();
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
class wxFont : public wxGDIObject {
|
||||
public:
|
||||
wxFont( int pointSize, int family, int style, int weight,
|
||||
int underline=FALSE, const wxString& faceName = wxPyEmptyString,
|
||||
wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
|
||||
|
||||
%name(wxFontFromNativeInfo)wxFont(const wxNativeFontInfo& info);
|
||||
|
||||
~wxFont();
|
||||
|
||||
bool Ok() const;
|
||||
int GetPointSize() const;
|
||||
int GetFamily() const;
|
||||
int GetStyle() const;
|
||||
int GetWeight() const;
|
||||
bool GetUnderlined() const;
|
||||
wxString GetFaceName() const;
|
||||
wxFontEncoding GetEncoding() const;
|
||||
|
||||
bool IsFixedWidth();
|
||||
|
||||
wxNativeFontInfo* GetNativeFontInfo() const;
|
||||
wxString GetNativeFontInfoDesc() const;
|
||||
wxString GetNativeFontInfoUserDesc() const;
|
||||
|
||||
void SetPointSize(int pointSize);
|
||||
void SetFamily(int family);
|
||||
void SetStyle(int style);
|
||||
void SetWeight(int weight);
|
||||
void SetFaceName(const wxString& faceName);
|
||||
void SetUnderlined(bool underlined);
|
||||
void SetEncoding(wxFontEncoding encoding);
|
||||
void SetNativeFontInfo(const wxNativeFontInfo& info);
|
||||
// void SetNativeFontInfo(const wxString& info);
|
||||
void SetNativeFontInfoUserDesc(const wxString& info);
|
||||
|
||||
wxString GetFamilyString() const;
|
||||
wxString GetStyleString() const;
|
||||
wxString GetWeightString() const;
|
||||
|
||||
static wxFontEncoding GetDefaultEncoding();
|
||||
static void SetDefaultEncoding(wxFontEncoding encoding);
|
||||
|
||||
};
|
||||
|
||||
|
||||
class wxFontList : public wxObject {
|
||||
public:
|
||||
|
||||
void AddFont(wxFont* font);
|
||||
wxFont * FindOrCreateFont(int point_size, int family, int style, int weight,
|
||||
bool underline = FALSE, const wxString& facename = wxPyEmptyString,
|
||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
|
||||
void RemoveFont(wxFont *font);
|
||||
|
||||
int GetCount();
|
||||
};
|
||||
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
class wxColour : public wxObject {
|
||||
|
||||
@@ -127,6 +127,21 @@ public:
|
||||
unsigned char GetGreen( int x, int y );
|
||||
unsigned char GetBlue( int x, int y );
|
||||
|
||||
// find first colour that is not used in the image and has higher
|
||||
// RGB values than <startR,startG,startB>
|
||||
bool FindFirstUnusedColour( byte *OUTPUT, byte *OUTPUT, byte *OUTPUT,
|
||||
byte startR = 0, byte startG = 0, byte startB = 0 ) const;
|
||||
|
||||
// Set image's mask to the area of 'mask' that has <mr,mg,mb> colour
|
||||
bool SetMaskFromImage(const wxImage & mask,
|
||||
byte mr, byte mg, byte mb);
|
||||
|
||||
void DoFloodFill (wxCoord x, wxCoord y,
|
||||
const wxBrush & fillBrush,
|
||||
const wxColour& testColour,
|
||||
int style = wxFLOOD_SURFACE,
|
||||
int LogicalFunction = wxCOPY /* currently unused */ ) ;
|
||||
|
||||
static bool CanRead( const wxString& name );
|
||||
static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
|
||||
|
||||
|
||||
@@ -480,6 +480,7 @@ public:
|
||||
~wxBusyInfo();
|
||||
};
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
+1
-49
@@ -20,7 +20,6 @@
|
||||
#include <wx/resource.h>
|
||||
#include <wx/tooltip.h>
|
||||
#include <wx/caret.h>
|
||||
#include <wx/fontenum.h>
|
||||
#include <wx/tipdlg.h>
|
||||
#include <wx/process.h>
|
||||
|
||||
@@ -365,52 +364,6 @@ public:
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
%{
|
||||
class wxPyFontEnumerator : public wxFontEnumerator {
|
||||
public:
|
||||
wxPyFontEnumerator() {}
|
||||
~wxPyFontEnumerator() {}
|
||||
|
||||
DEC_PYCALLBACK_BOOL_STRING(OnFacename);
|
||||
DEC_PYCALLBACK_BOOL_STRINGSTRING(OnFontEncoding);
|
||||
|
||||
PYPRIVATE;
|
||||
};
|
||||
|
||||
IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
|
||||
IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
|
||||
|
||||
%}
|
||||
|
||||
%name(wxFontEnumerator) class wxPyFontEnumerator {
|
||||
public:
|
||||
wxPyFontEnumerator();
|
||||
~wxPyFontEnumerator();
|
||||
void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref);
|
||||
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxFontEnumerator, 0)"
|
||||
|
||||
bool EnumerateFacenames(
|
||||
wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
|
||||
bool fixedWidthOnly = FALSE);
|
||||
bool EnumerateEncodings(const wxString& facename = wxPyEmptyString);
|
||||
|
||||
//wxArrayString* GetEncodings();
|
||||
//wxArrayString* GetFacenames();
|
||||
%addmethods {
|
||||
PyObject* GetEncodings() {
|
||||
wxArrayString* arr = self->GetEncodings();
|
||||
return wxArrayString2PyList_helper(*arr);
|
||||
}
|
||||
|
||||
PyObject* GetFacenames() {
|
||||
wxArrayString* arr = self->GetFacenames();
|
||||
return wxArrayString2PyList_helper(*arr);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
class wxBusyCursor {
|
||||
public:
|
||||
wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR);
|
||||
@@ -1388,7 +1341,7 @@ public:
|
||||
void Save(wxConfigBase& config);
|
||||
|
||||
void AddFilesToMenu();
|
||||
%name(AddFilesToSingleMenu)void AddFilesToMenu(wxMenu* menu);
|
||||
%name(AddFilesToThisMenu)void AddFilesToMenu(wxMenu* menu);
|
||||
|
||||
// Accessors
|
||||
wxString GetHistoryFile(int i) const;
|
||||
@@ -1404,7 +1357,6 @@ public:
|
||||
|
||||
|
||||
%init %{
|
||||
wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
|
||||
wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
|
||||
wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
|
||||
%}
|
||||
|
||||
@@ -7,6 +7,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from controls import *
|
||||
|
||||
@@ -4,6 +4,8 @@ import clip_dndc
|
||||
from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
import wx
|
||||
class wxDataFormatPtr :
|
||||
def __init__(self,this):
|
||||
|
||||
@@ -5,6 +5,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from windows import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
@@ -7,6 +7,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from events import *
|
||||
|
||||
@@ -7,6 +7,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from events import *
|
||||
|
||||
@@ -4,6 +4,8 @@ import eventsc
|
||||
from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
class wxEventPtr(wxObjectPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
|
||||
@@ -9,6 +9,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from streams import *
|
||||
import wx
|
||||
import string
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -5,6 +5,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from windows import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+2
-304
@@ -2,6 +2,8 @@
|
||||
import gdic
|
||||
|
||||
from misc import *
|
||||
|
||||
from fonts import *
|
||||
class wxGDIObjectPtr(wxObjectPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
@@ -281,239 +283,6 @@ class wxCursor(wxCursorPtr):
|
||||
|
||||
|
||||
|
||||
class wxNativeFontInfoPtr :
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def Init(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_Init,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetPointSize(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_GetPointSize,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetStyle(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_GetStyle,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetWeight(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_GetWeight,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetUnderlined(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_GetUnderlined,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetFaceName(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_GetFaceName,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetFamily(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_GetFamily,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetEncoding(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_GetEncoding,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetPointSize(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_SetPointSize,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetStyle(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_SetStyle,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetWeight(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_SetWeight,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetUnderlined(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_SetUnderlined,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetFaceName(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_SetFaceName,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetFamily(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_SetFamily,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetEncoding(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_SetEncoding,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def FromString(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_FromString,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def ToString(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_ToString,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __str__(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo___str__,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def FromUserString(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_FromUserString,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def ToUserString(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxNativeFontInfo_ToUserString,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<C wxNativeFontInfo instance at %s>" % (self.this,)
|
||||
class wxNativeFontInfo(wxNativeFontInfoPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(gdic.new_wxNativeFontInfo,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
|
||||
|
||||
|
||||
|
||||
class wxFontMapperPtr :
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def __del__(self,gdic=gdic):
|
||||
if self.thisown == 1 :
|
||||
gdic.delete_wxFontMapper(self)
|
||||
def GetAltForEncoding(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def IsEncodingAvailable(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontMapper_IsEncodingAvailable,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def CharsetToEncoding(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontMapper_CharsetToEncoding,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetDialogParent(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontMapper_SetDialogParent,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetDialogTitle(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontMapper_SetDialogTitle,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetConfig(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontMapper_SetConfig,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetConfigPath(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontMapper_SetConfigPath,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<C wxFontMapper instance at %s>" % (self.this,)
|
||||
class wxFontMapper(wxFontMapperPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(gdic.new_wxFontMapper,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
|
||||
|
||||
|
||||
|
||||
class wxFontPtr(wxGDIObjectPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def __del__(self,gdic=gdic):
|
||||
if self.thisown == 1 :
|
||||
gdic.delete_wxFont(self)
|
||||
def Ok(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_Ok,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetPointSize(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetPointSize,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetFamily(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetFamily,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetStyle(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetStyle,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetWeight(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetWeight,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetUnderlined(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetUnderlined,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetFaceName(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetFaceName,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetEncoding(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def IsFixedWidth(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_IsFixedWidth,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetNativeFontInfo(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetNativeFontInfo,(self,) + _args, _kwargs)
|
||||
if val: val = wxNativeFontInfoPtr(val)
|
||||
return val
|
||||
def GetNativeFontInfoDesc(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetNativeFontInfoDesc,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetNativeFontInfoUserDesc(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetNativeFontInfoUserDesc,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetPointSize(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetPointSize,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetFamily(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetFamily,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetStyle(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetStyle,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetWeight(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetWeight,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetFaceName(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetFaceName,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetUnderlined(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetUnderlined,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetEncoding(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetEncoding,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetNativeFontInfo(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetNativeFontInfo,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetNativeFontInfoUserDesc(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_SetNativeFontInfoUserDesc,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetFamilyString(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetFamilyString,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetStyleString(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetStyleString,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetWeightString(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFont_GetWeightString,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<C wxFont instance at %s>" % (self.this,)
|
||||
class wxFont(wxFontPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(gdic.new_wxFont,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
|
||||
|
||||
|
||||
def wxFontFromNativeInfo(*_args,**_kwargs):
|
||||
val = wxFontPtr(apply(gdic.new_wxFontFromNativeInfo,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
return val
|
||||
|
||||
|
||||
class wxFontListPtr(wxObjectPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def AddFont(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontList_AddFont,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def FindOrCreateFont(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontList_FindOrCreateFont,(self,) + _args, _kwargs)
|
||||
if val: val = wxFontPtr(val)
|
||||
return val
|
||||
def RemoveFont(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontList_RemoveFont,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetCount(self, *_args, **_kwargs):
|
||||
val = apply(gdic.wxFontList_GetCount,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<C wxFontList instance at %s>" % (self.this,)
|
||||
class wxFontList(wxFontListPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
|
||||
|
||||
|
||||
|
||||
class wxColourPtr(wxObjectPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
@@ -1491,81 +1260,10 @@ def wxMemoryDCFromDC(*_args, **_kwargs):
|
||||
if val: val = wxMemoryDCPtr(val); val.thisown = 1
|
||||
return val
|
||||
|
||||
wxFontMapper_GetEncodingName = gdic.wxFontMapper_GetEncodingName
|
||||
|
||||
wxFontMapper_GetEncodingDescription = gdic.wxFontMapper_GetEncodingDescription
|
||||
|
||||
wxFontMapper_GetDefaultConfigPath = gdic.wxFontMapper_GetDefaultConfigPath
|
||||
|
||||
wxFont_GetDefaultEncoding = gdic.wxFont_GetDefaultEncoding
|
||||
|
||||
wxFont_SetDefaultEncoding = gdic.wxFont_SetDefaultEncoding
|
||||
|
||||
|
||||
|
||||
#-------------- VARIABLE WRAPPERS ------------------
|
||||
|
||||
wxFONTFAMILY_DEFAULT = gdic.wxFONTFAMILY_DEFAULT
|
||||
wxFONTFAMILY_DECORATIVE = gdic.wxFONTFAMILY_DECORATIVE
|
||||
wxFONTFAMILY_ROMAN = gdic.wxFONTFAMILY_ROMAN
|
||||
wxFONTFAMILY_SCRIPT = gdic.wxFONTFAMILY_SCRIPT
|
||||
wxFONTFAMILY_SWISS = gdic.wxFONTFAMILY_SWISS
|
||||
wxFONTFAMILY_MODERN = gdic.wxFONTFAMILY_MODERN
|
||||
wxFONTFAMILY_TELETYPE = gdic.wxFONTFAMILY_TELETYPE
|
||||
wxFONTFAMILY_MAX = gdic.wxFONTFAMILY_MAX
|
||||
wxFONTFAMILY_UNKNOWN = gdic.wxFONTFAMILY_UNKNOWN
|
||||
wxFONTSTYLE_NORMAL = gdic.wxFONTSTYLE_NORMAL
|
||||
wxFONTSTYLE_ITALIC = gdic.wxFONTSTYLE_ITALIC
|
||||
wxFONTSTYLE_SLANT = gdic.wxFONTSTYLE_SLANT
|
||||
wxFONTSTYLE_MAX = gdic.wxFONTSTYLE_MAX
|
||||
wxFONTWEIGHT_NORMAL = gdic.wxFONTWEIGHT_NORMAL
|
||||
wxFONTWEIGHT_LIGHT = gdic.wxFONTWEIGHT_LIGHT
|
||||
wxFONTWEIGHT_BOLD = gdic.wxFONTWEIGHT_BOLD
|
||||
wxFONTWEIGHT_MAX = gdic.wxFONTWEIGHT_MAX
|
||||
wxFONTENCODING_SYSTEM = gdic.wxFONTENCODING_SYSTEM
|
||||
wxFONTENCODING_DEFAULT = gdic.wxFONTENCODING_DEFAULT
|
||||
wxFONTENCODING_ISO8859_1 = gdic.wxFONTENCODING_ISO8859_1
|
||||
wxFONTENCODING_ISO8859_2 = gdic.wxFONTENCODING_ISO8859_2
|
||||
wxFONTENCODING_ISO8859_3 = gdic.wxFONTENCODING_ISO8859_3
|
||||
wxFONTENCODING_ISO8859_4 = gdic.wxFONTENCODING_ISO8859_4
|
||||
wxFONTENCODING_ISO8859_5 = gdic.wxFONTENCODING_ISO8859_5
|
||||
wxFONTENCODING_ISO8859_6 = gdic.wxFONTENCODING_ISO8859_6
|
||||
wxFONTENCODING_ISO8859_7 = gdic.wxFONTENCODING_ISO8859_7
|
||||
wxFONTENCODING_ISO8859_8 = gdic.wxFONTENCODING_ISO8859_8
|
||||
wxFONTENCODING_ISO8859_9 = gdic.wxFONTENCODING_ISO8859_9
|
||||
wxFONTENCODING_ISO8859_10 = gdic.wxFONTENCODING_ISO8859_10
|
||||
wxFONTENCODING_ISO8859_11 = gdic.wxFONTENCODING_ISO8859_11
|
||||
wxFONTENCODING_ISO8859_12 = gdic.wxFONTENCODING_ISO8859_12
|
||||
wxFONTENCODING_ISO8859_13 = gdic.wxFONTENCODING_ISO8859_13
|
||||
wxFONTENCODING_ISO8859_14 = gdic.wxFONTENCODING_ISO8859_14
|
||||
wxFONTENCODING_ISO8859_15 = gdic.wxFONTENCODING_ISO8859_15
|
||||
wxFONTENCODING_ISO8859_MAX = gdic.wxFONTENCODING_ISO8859_MAX
|
||||
wxFONTENCODING_KOI8 = gdic.wxFONTENCODING_KOI8
|
||||
wxFONTENCODING_ALTERNATIVE = gdic.wxFONTENCODING_ALTERNATIVE
|
||||
wxFONTENCODING_BULGARIAN = gdic.wxFONTENCODING_BULGARIAN
|
||||
wxFONTENCODING_CP437 = gdic.wxFONTENCODING_CP437
|
||||
wxFONTENCODING_CP850 = gdic.wxFONTENCODING_CP850
|
||||
wxFONTENCODING_CP852 = gdic.wxFONTENCODING_CP852
|
||||
wxFONTENCODING_CP855 = gdic.wxFONTENCODING_CP855
|
||||
wxFONTENCODING_CP866 = gdic.wxFONTENCODING_CP866
|
||||
wxFONTENCODING_CP874 = gdic.wxFONTENCODING_CP874
|
||||
wxFONTENCODING_CP932 = gdic.wxFONTENCODING_CP932
|
||||
wxFONTENCODING_CP936 = gdic.wxFONTENCODING_CP936
|
||||
wxFONTENCODING_CP949 = gdic.wxFONTENCODING_CP949
|
||||
wxFONTENCODING_CP950 = gdic.wxFONTENCODING_CP950
|
||||
wxFONTENCODING_CP1250 = gdic.wxFONTENCODING_CP1250
|
||||
wxFONTENCODING_CP1251 = gdic.wxFONTENCODING_CP1251
|
||||
wxFONTENCODING_CP1252 = gdic.wxFONTENCODING_CP1252
|
||||
wxFONTENCODING_CP1253 = gdic.wxFONTENCODING_CP1253
|
||||
wxFONTENCODING_CP1254 = gdic.wxFONTENCODING_CP1254
|
||||
wxFONTENCODING_CP1255 = gdic.wxFONTENCODING_CP1255
|
||||
wxFONTENCODING_CP1256 = gdic.wxFONTENCODING_CP1256
|
||||
wxFONTENCODING_CP1257 = gdic.wxFONTENCODING_CP1257
|
||||
wxFONTENCODING_CP12_MAX = gdic.wxFONTENCODING_CP12_MAX
|
||||
wxFONTENCODING_UTF7 = gdic.wxFONTENCODING_UTF7
|
||||
wxFONTENCODING_UTF8 = gdic.wxFONTENCODING_UTF8
|
||||
wxFONTENCODING_UNICODE = gdic.wxFONTENCODING_UNICODE
|
||||
wxFONTENCODING_MAX = gdic.wxFONTENCODING_MAX
|
||||
wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
|
||||
wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT
|
||||
wxIMAGELIST_DRAW_SELECTED = gdic.wxIMAGELIST_DRAW_SELECTED
|
||||
|
||||
@@ -5,6 +5,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from windows import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
@@ -7,6 +7,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from controls import *
|
||||
|
||||
@@ -9,6 +9,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from events import *
|
||||
|
||||
@@ -9,6 +9,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from events import *
|
||||
|
||||
@@ -1584,6 +1584,156 @@ static PyObject *_wrap_wxImage_GetBlue(PyObject *self, PyObject *args, PyObject
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxImage_FindFirstUnusedColour(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->FindFirstUnusedColour(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
|
||||
static PyObject *_wrap_wxImage_FindFirstUnusedColour(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
wxImage * _arg0;
|
||||
byte * _arg1;
|
||||
int temp;
|
||||
byte * _arg2;
|
||||
int temp0;
|
||||
byte * _arg3;
|
||||
int temp1;
|
||||
byte _arg4 = (byte ) 0;
|
||||
byte _arg5 = (byte ) 0;
|
||||
byte _arg6 = (byte ) 0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self","startR","startG","startB", NULL };
|
||||
|
||||
self = self;
|
||||
{
|
||||
_arg1 = (byte*)&temp;
|
||||
}
|
||||
{
|
||||
_arg2 = (byte*)&temp0;
|
||||
}
|
||||
{
|
||||
_arg3 = (byte*)&temp1;
|
||||
}
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|bbb:wxImage_FindFirstUnusedColour",_kwnames,&_argo0,&_arg4,&_arg5,&_arg6))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_FindFirstUnusedColour. Expected _wxImage_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (bool )wxImage_FindFirstUnusedColour(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
{
|
||||
PyObject *o;
|
||||
o = PyInt_FromLong((long) (*_arg1));
|
||||
_resultobj = t_output_helper(_resultobj, o);
|
||||
}
|
||||
{
|
||||
PyObject *o;
|
||||
o = PyInt_FromLong((long) (*_arg2));
|
||||
_resultobj = t_output_helper(_resultobj, o);
|
||||
}
|
||||
{
|
||||
PyObject *o;
|
||||
o = PyInt_FromLong((long) (*_arg3));
|
||||
_resultobj = t_output_helper(_resultobj, o);
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxImage_SetMaskFromImage(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->SetMaskFromImage(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
|
||||
static PyObject *_wrap_wxImage_SetMaskFromImage(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
wxImage * _arg0;
|
||||
wxImage * _arg1;
|
||||
byte _arg2;
|
||||
byte _arg3;
|
||||
byte _arg4;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _argo1 = 0;
|
||||
char *_kwnames[] = { "self","mask","mr","mg","mb", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OObbb:wxImage_SetMaskFromImage",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_SetMaskFromImage. Expected _wxImage_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
if (_argo1) {
|
||||
if (_argo1 == Py_None) { _arg1 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImage_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImage_SetMaskFromImage. Expected _wxImage_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (bool )wxImage_SetMaskFromImage(_arg0,*_arg1,_arg2,_arg3,_arg4);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxImage_DoFloodFill(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->DoFloodFill(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
|
||||
static PyObject *_wrap_wxImage_DoFloodFill(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxImage * _arg0;
|
||||
wxCoord _arg1;
|
||||
wxCoord _arg2;
|
||||
wxBrush * _arg3;
|
||||
wxColour * _arg4;
|
||||
int _arg5 = (int ) wxFLOOD_SURFACE;
|
||||
int _arg6 = (int ) wxCOPY;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _argo3 = 0;
|
||||
wxColour temp;
|
||||
PyObject * _obj4 = 0;
|
||||
char *_kwnames[] = { "self","x","y","fillBrush","testColour","style","LogicalFunction", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiOO|ii:wxImage_DoFloodFill",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_obj4,&_arg5,&_arg6))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_DoFloodFill. Expected _wxImage_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
if (_argo3) {
|
||||
if (_argo3 == Py_None) { _arg3 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBrush_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxImage_DoFloodFill. Expected _wxBrush_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
_arg4 = &temp;
|
||||
if (! wxColour_helper(_obj4, &_arg4))
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxImage_DoFloodFill(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject *_wrap_wxImage_CanRead(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
@@ -3042,6 +3192,9 @@ static PyMethodDef imagecMethods[] = {
|
||||
{ "wxImage_LoadFile", (PyCFunction) _wrap_wxImage_LoadFile, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxImage_GetImageCount", (PyCFunction) _wrap_wxImage_GetImageCount, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxImage_CanRead", (PyCFunction) _wrap_wxImage_CanRead, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxImage_DoFloodFill", (PyCFunction) _wrap_wxImage_DoFloodFill, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxImage_SetMaskFromImage", (PyCFunction) _wrap_wxImage_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxImage_FindFirstUnusedColour", (PyCFunction) _wrap_wxImage_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxImage_GetBlue", (PyCFunction) _wrap_wxImage_GetBlue, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxImage_GetGreen", (PyCFunction) _wrap_wxImage_GetGreen, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxImage_GetRed", (PyCFunction) _wrap_wxImage_GetRed, METH_VARARGS | METH_KEYWORDS },
|
||||
|
||||
@@ -5,6 +5,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from streams import *
|
||||
class wxImageHandlerPtr(wxObjectPtr):
|
||||
def __init__(self,this):
|
||||
@@ -219,6 +221,15 @@ class wxImagePtr(wxObjectPtr):
|
||||
def GetBlue(self, *_args, **_kwargs):
|
||||
val = apply(imagec.wxImage_GetBlue,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def FindFirstUnusedColour(self, *_args, **_kwargs):
|
||||
val = apply(imagec.wxImage_FindFirstUnusedColour,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetMaskFromImage(self, *_args, **_kwargs):
|
||||
val = apply(imagec.wxImage_SetMaskFromImage,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def DoFloodFill(self, *_args, **_kwargs):
|
||||
val = apply(imagec.wxImage_DoFloodFill,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def LoadFile(self, *_args, **_kwargs):
|
||||
val = apply(imagec.wxImage_LoadFile,(self,) + _args, _kwargs)
|
||||
return val
|
||||
|
||||
@@ -7,6 +7,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from frames import *
|
||||
|
||||
+7
-264
@@ -60,7 +60,6 @@ extern PyObject *SWIG_newvarlink(void);
|
||||
#include <wx/resource.h>
|
||||
#include <wx/tooltip.h>
|
||||
#include <wx/caret.h>
|
||||
#include <wx/fontenum.h>
|
||||
#include <wx/tipdlg.h>
|
||||
#include <wx/process.h>
|
||||
|
||||
@@ -115,21 +114,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
wxCaret::SetBlinkTime(milliseconds);
|
||||
}
|
||||
|
||||
class wxPyFontEnumerator : public wxFontEnumerator {
|
||||
public:
|
||||
wxPyFontEnumerator() {}
|
||||
~wxPyFontEnumerator() {}
|
||||
|
||||
DEC_PYCALLBACK_BOOL_STRING(OnFacename);
|
||||
DEC_PYCALLBACK_BOOL_STRINGSTRING(OnFontEncoding);
|
||||
|
||||
PYPRIVATE;
|
||||
};
|
||||
|
||||
IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
|
||||
IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
|
||||
|
||||
|
||||
bool wxThread_IsMain() {
|
||||
#ifdef WXP_WITH_THREAD
|
||||
return wxThread::IsMain();
|
||||
@@ -3102,239 +3086,6 @@ static PyObject *_wrap_wxCaret_Hide(PyObject *self, PyObject *args, PyObject *kw
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define new_wxFontEnumerator() (new wxPyFontEnumerator())
|
||||
static PyObject *_wrap_new_wxFontEnumerator(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxPyFontEnumerator * _result;
|
||||
char *_kwnames[] = { NULL };
|
||||
char _ptemp[128];
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxFontEnumerator",_kwnames))
|
||||
return NULL;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (wxPyFontEnumerator *)new_wxFontEnumerator();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} if (_result) {
|
||||
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyFontEnumerator_p");
|
||||
_resultobj = Py_BuildValue("s",_ptemp);
|
||||
} else {
|
||||
Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define delete_wxPyFontEnumerator(_swigobj) (delete _swigobj)
|
||||
static PyObject *_wrap_delete_wxFontEnumerator(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxPyFontEnumerator * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxFontEnumerator",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyFontEnumerator_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxFontEnumerator. Expected _wxPyFontEnumerator_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
delete_wxPyFontEnumerator(_arg0);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxFontEnumerator__setCallbackInfo(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1,_swigarg2))
|
||||
static PyObject *_wrap_wxFontEnumerator__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxPyFontEnumerator * _arg0;
|
||||
PyObject * _arg1;
|
||||
PyObject * _arg2;
|
||||
bool _arg3;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
PyObject * _obj2 = 0;
|
||||
int tempbool3;
|
||||
char *_kwnames[] = { "self","self","_class","incref", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOi:wxFontEnumerator__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2,&tempbool3))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyFontEnumerator_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontEnumerator__setCallbackInfo. Expected _wxPyFontEnumerator_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
_arg1 = _obj1;
|
||||
}
|
||||
{
|
||||
_arg2 = _obj2;
|
||||
}
|
||||
_arg3 = (bool ) tempbool3;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxFontEnumerator__setCallbackInfo(_arg0,_arg1,_arg2,_arg3);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxFontEnumerator_EnumerateFacenames(_swigobj,_swigarg0,_swigarg1) (_swigobj->EnumerateFacenames(_swigarg0,_swigarg1))
|
||||
static PyObject *_wrap_wxFontEnumerator_EnumerateFacenames(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
wxPyFontEnumerator * _arg0;
|
||||
wxFontEncoding _arg1 = (wxFontEncoding ) wxFONTENCODING_SYSTEM;
|
||||
bool _arg2 = (bool ) FALSE;
|
||||
PyObject * _argo0 = 0;
|
||||
int tempbool2 = (int) FALSE;
|
||||
char *_kwnames[] = { "self","encoding","fixedWidthOnly", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:wxFontEnumerator_EnumerateFacenames",_kwnames,&_argo0,&_arg1,&tempbool2))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyFontEnumerator_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontEnumerator_EnumerateFacenames. Expected _wxPyFontEnumerator_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
_arg2 = (bool ) tempbool2;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (bool )wxFontEnumerator_EnumerateFacenames(_arg0,_arg1,_arg2);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxFontEnumerator_EnumerateEncodings(_swigobj,_swigarg0) (_swigobj->EnumerateEncodings(_swigarg0))
|
||||
static PyObject *_wrap_wxFontEnumerator_EnumerateEncodings(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
wxPyFontEnumerator * _arg0;
|
||||
wxString * _arg1 = (wxString *) &wxPyEmptyString;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "self","facename", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxFontEnumerator_EnumerateEncodings",_kwnames,&_argo0,&_obj1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyFontEnumerator_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontEnumerator_EnumerateEncodings. Expected _wxPyFontEnumerator_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
if (_obj1)
|
||||
{
|
||||
_arg1 = wxString_in_helper(_obj1);
|
||||
if (_arg1 == NULL)
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (bool )wxFontEnumerator_EnumerateEncodings(_arg0,*_arg1);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
{
|
||||
if (_obj1)
|
||||
delete _arg1;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject * wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self) {
|
||||
wxArrayString* arr = self->GetEncodings();
|
||||
return wxArrayString2PyList_helper(*arr);
|
||||
}
|
||||
static PyObject *_wrap_wxFontEnumerator_GetEncodings(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
PyObject * _result;
|
||||
wxPyFontEnumerator * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontEnumerator_GetEncodings",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyFontEnumerator_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontEnumerator_GetEncodings. Expected _wxPyFontEnumerator_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (PyObject *)wxPyFontEnumerator_GetEncodings(_arg0);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
}{
|
||||
_resultobj = _result;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static PyObject * wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self) {
|
||||
wxArrayString* arr = self->GetFacenames();
|
||||
return wxArrayString2PyList_helper(*arr);
|
||||
}
|
||||
static PyObject *_wrap_wxFontEnumerator_GetFacenames(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
PyObject * _result;
|
||||
wxPyFontEnumerator * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontEnumerator_GetFacenames",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyFontEnumerator_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFontEnumerator_GetFacenames. Expected _wxPyFontEnumerator_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
_result = (PyObject *)wxPyFontEnumerator_GetFacenames(_arg0);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
}{
|
||||
_resultobj = _result;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define new_wxBusyCursor(_swigarg0) (new wxBusyCursor(_swigarg0))
|
||||
static PyObject *_wrap_new_wxBusyCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -9887,8 +9638,8 @@ static PyObject *_wrap_wxFileHistory_AddFilesToMenu(PyObject *self, PyObject *ar
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxFileHistory_AddFilesToSingleMenu(_swigobj,_swigarg0) (_swigobj->AddFilesToMenu(_swigarg0))
|
||||
static PyObject *_wrap_wxFileHistory_AddFilesToSingleMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
#define wxFileHistory_AddFilesToThisMenu(_swigobj,_swigarg0) (_swigobj->AddFilesToMenu(_swigarg0))
|
||||
static PyObject *_wrap_wxFileHistory_AddFilesToThisMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxFileHistory * _arg0;
|
||||
wxMenu * _arg1;
|
||||
@@ -9897,25 +9648,25 @@ static PyObject *_wrap_wxFileHistory_AddFilesToSingleMenu(PyObject *self, PyObje
|
||||
char *_kwnames[] = { "self","menu", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileHistory_AddFilesToSingleMenu",_kwnames,&_argo0,&_argo1))
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileHistory_AddFilesToThisMenu",_kwnames,&_argo0,&_argo1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileHistory_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileHistory_AddFilesToSingleMenu. Expected _wxFileHistory_p.");
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileHistory_AddFilesToThisMenu. Expected _wxFileHistory_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
if (_argo1) {
|
||||
if (_argo1 == Py_None) { _arg1 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFileHistory_AddFilesToSingleMenu. Expected _wxMenu_p.");
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFileHistory_AddFilesToThisMenu. Expected _wxMenu_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxFileHistory_AddFilesToSingleMenu(_arg0,_arg1);
|
||||
wxFileHistory_AddFilesToThisMenu(_arg0,_arg1);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
@@ -10022,7 +9773,7 @@ static PyMethodDef misc2cMethods[] = {
|
||||
{ "wxFileHistory_GetNoHistoryFiles", (PyCFunction) _wrap_wxFileHistory_GetNoHistoryFiles, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFileHistory_GetCount", (PyCFunction) _wrap_wxFileHistory_GetCount, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFileHistory_GetHistoryFile", (PyCFunction) _wrap_wxFileHistory_GetHistoryFile, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFileHistory_AddFilesToSingleMenu", (PyCFunction) _wrap_wxFileHistory_AddFilesToSingleMenu, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFileHistory_AddFilesToThisMenu", (PyCFunction) _wrap_wxFileHistory_AddFilesToThisMenu, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFileHistory_AddFilesToMenu", (PyCFunction) _wrap_wxFileHistory_AddFilesToMenu, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFileHistory_Save", (PyCFunction) _wrap_wxFileHistory_Save, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFileHistory_Load", (PyCFunction) _wrap_wxFileHistory_Load, METH_VARARGS | METH_KEYWORDS },
|
||||
@@ -10223,13 +9974,6 @@ static PyMethodDef misc2cMethods[] = {
|
||||
{ "new_wxWindowDisabler", (PyCFunction) _wrap_new_wxWindowDisabler, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "delete_wxBusyCursor", (PyCFunction) _wrap_delete_wxBusyCursor, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxBusyCursor", (PyCFunction) _wrap_new_wxBusyCursor, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFontEnumerator_GetFacenames", (PyCFunction) _wrap_wxFontEnumerator_GetFacenames, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFontEnumerator_GetEncodings", (PyCFunction) _wrap_wxFontEnumerator_GetEncodings, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFontEnumerator_EnumerateEncodings", (PyCFunction) _wrap_wxFontEnumerator_EnumerateEncodings, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFontEnumerator_EnumerateFacenames", (PyCFunction) _wrap_wxFontEnumerator_EnumerateFacenames, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxFontEnumerator__setCallbackInfo", (PyCFunction) _wrap_wxFontEnumerator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "delete_wxFontEnumerator", (PyCFunction) _wrap_delete_wxFontEnumerator, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxFontEnumerator", (PyCFunction) _wrap_new_wxFontEnumerator, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxCaret_Hide", (PyCFunction) _wrap_wxCaret_Hide, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxCaret_Show", (PyCFunction) _wrap_wxCaret_Show, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxCaret_SetSize", (PyCFunction) _wrap_wxCaret_SetSize, METH_VARARGS | METH_KEYWORDS },
|
||||
@@ -10560,7 +10304,6 @@ SWIGEXPORT(void) initmisc2c() {
|
||||
PyDict_SetItemString(d,"cvar", SWIG_globals);
|
||||
SWIG_addvarlink(SWIG_globals,"wxTheMimeTypesManager",_wrap_wxTheMimeTypesManager_get, _wrap_wxTheMimeTypesManager_set);
|
||||
|
||||
wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
|
||||
wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
|
||||
wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
|
||||
{
|
||||
|
||||
@@ -7,6 +7,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from events import *
|
||||
@@ -108,39 +110,6 @@ class wxCaret(wxCaretPtr):
|
||||
|
||||
|
||||
|
||||
class wxFontEnumeratorPtr :
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def __del__(self,misc2c=misc2c):
|
||||
if self.thisown == 1 :
|
||||
misc2c.delete_wxFontEnumerator(self)
|
||||
def _setCallbackInfo(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def EnumerateFacenames(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFontEnumerator_EnumerateFacenames,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def EnumerateEncodings(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFontEnumerator_EnumerateEncodings,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetEncodings(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFontEnumerator_GetEncodings,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetFacenames(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFontEnumerator_GetFacenames,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<C wxFontEnumerator instance at %s>" % (self.this,)
|
||||
class wxFontEnumerator(wxFontEnumeratorPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(misc2c.new_wxFontEnumerator,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
self._setCallbackInfo(self, wxFontEnumerator, 0)
|
||||
|
||||
|
||||
|
||||
|
||||
class wxBusyCursorPtr :
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
@@ -962,8 +931,8 @@ class wxFileHistoryPtr(wxObjectPtr):
|
||||
def AddFilesToMenu(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFileHistory_AddFilesToMenu,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def AddFilesToSingleMenu(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFileHistory_AddFilesToSingleMenu,(self,) + _args, _kwargs)
|
||||
def AddFilesToThisMenu(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFileHistory_AddFilesToThisMenu,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetHistoryFile(self, *_args, **_kwargs):
|
||||
val = apply(misc2c.wxFileHistory_GetHistoryFile,(self,) + _args, _kwargs)
|
||||
|
||||
@@ -7,6 +7,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from cmndlgs import *
|
||||
|
||||
@@ -7,6 +7,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from controls import *
|
||||
|
||||
@@ -7,6 +7,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from controls import *
|
||||
|
||||
@@ -5,6 +5,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
import wx
|
||||
|
||||
|
||||
@@ -5,6 +5,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from windows import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
@@ -5,6 +5,8 @@ from misc import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from windows import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
@@ -624,6 +624,7 @@ extern "C" SWIGEXPORT(void) initclip_dndc();
|
||||
extern "C" SWIGEXPORT(void) initstreamsc();
|
||||
extern "C" SWIGEXPORT(void) initfilesysc();
|
||||
extern "C" SWIGEXPORT(void) initutilsc();
|
||||
extern "C" SWIGEXPORT(void) initfontsc();
|
||||
|
||||
|
||||
|
||||
@@ -2642,6 +2643,7 @@ SWIGEXPORT(void) initwxc() {
|
||||
initstreamsc();
|
||||
initfilesysc();
|
||||
initutilsc();
|
||||
initfontsc();
|
||||
|
||||
|
||||
PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));
|
||||
|
||||
@@ -9,6 +9,8 @@ from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from events import *
|
||||
|
||||
@@ -45,6 +45,8 @@
|
||||
%import streams.i
|
||||
%import filesys.i
|
||||
%import utils.i
|
||||
%import fonts.i
|
||||
|
||||
|
||||
%native(_wxStart) __wxStart;
|
||||
%native(_wxSetDictionary) __wxSetDictionary;
|
||||
@@ -147,6 +149,7 @@ extern "C" SWIGEXPORT(void) initclip_dndc();
|
||||
extern "C" SWIGEXPORT(void) initstreamsc();
|
||||
extern "C" SWIGEXPORT(void) initfilesysc();
|
||||
extern "C" SWIGEXPORT(void) initutilsc();
|
||||
extern "C" SWIGEXPORT(void) initfontsc();
|
||||
|
||||
|
||||
|
||||
@@ -241,6 +244,7 @@ static wxPyCoreAPI API = {
|
||||
initstreamsc();
|
||||
initfilesysc();
|
||||
initutilsc();
|
||||
initfontsc();
|
||||
|
||||
|
||||
PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));
|
||||
|
||||
Reference in New Issue
Block a user