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

Changes needed to get upto date with the latest wx CVS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-24 20:09:53 +00:00
parent e04fe03d0f
commit 1a10a058d5
8 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/src/_defs.i
View File

@@ -368,6 +368,7 @@ enum {
wxID_HELP_PROCEDURES, wxID_HELP_PROCEDURES,
wxID_HELP_CONTEXT, wxID_HELP_CONTEXT,
wxID_CLOSE_ALL, wxID_CLOSE_ALL,
wxID_PREFERENCES,
wxID_CUT, wxID_CUT,
wxID_COPY, wxID_COPY,
@@ -446,6 +447,7 @@ enum {
wxMENU_TEAROFF, wxMENU_TEAROFF,
wxMB_DOCKABLE, wxMB_DOCKABLE,
wxNO_FULL_REPAINT_ON_RESIZE, wxNO_FULL_REPAINT_ON_RESIZE,
wxFULL_REPAINT_ON_RESIZE,
wxLEFT, wxLEFT,
wxRIGHT, wxRIGHT,

7
wxPython/src/_extras.py
View File

@@ -954,8 +954,11 @@ of your Mac."""
# KeyboardInterrupt???) but will later segfault on exit. By # KeyboardInterrupt???) but will later segfault on exit. By
# setting the default handler then the app will exit, as # setting the default handler then the app will exit, as
# expected (depending on platform.) # expected (depending on platform.)
import signal try:
signal.signal(signal.SIGINT, signal.SIG_DFL) import signal
signal.signal(signal.SIGINT, signal.SIG_DFL)
except:
pass
# this initializes wxWindows and then calls our OnInit # this initializes wxWindows and then calls our OnInit
_wxStart(self.OnInit) _wxStart(self.OnInit)

4
wxPython/src/controls.i
View File

@@ -557,6 +557,7 @@ public:
int GetRange(); int GetRange();
int GetShadowWidth(); int GetShadowWidth();
int GetValue(); int GetValue();
bool IsVertical() const;
void SetBezelFace(int width); void SetBezelFace(int width);
void SetRange(int range); void SetRange(int range);
void SetShadowWidth(int width); void SetShadowWidth(int width);
@@ -881,6 +882,9 @@ public:
bool LoadFile(const wxString& file); bool LoadFile(const wxString& file);
bool SaveFile(const wxString& file = wxPyEmptyString); bool SaveFile(const wxString& file = wxPyEmptyString);
// sets the dirty flag
virtual void MarkDirty() = 0;
// clears the dirty flag // clears the dirty flag
void DiscardEdits(); void DiscardEdits();

9
wxPython/src/controls2.i
View File

@@ -476,6 +476,9 @@ public:
// or small icon view) // or small icon view)
int GetCountPerPage() const; int GetCountPerPage() const;
// return the total area occupied by all the items (icon/small icon only)
wxRect GetViewRect() const;
#ifdef __WXMSW__ #ifdef __WXMSW__
// Gets the edit control for editing labels. // Gets the edit control for editing labels.
wxTextCtrl* GetEditControl() const; wxTextCtrl* GetEditControl() const;
@@ -556,10 +559,8 @@ public:
// Gets the number of columns in the list control // Gets the number of columns in the list control
int GetColumnCount() const; int GetColumnCount() const;
// Retrieves the spacing between icons in pixels. // get the horizontal and vertical components of the item spacing
// If small is TRUE, gets the spacing for the small icon wxSize GetItemSpacing() const;
// view, otherwise the large icon view.
int GetItemSpacing(bool isSmall) const;
#ifndef __WXMSW__ #ifndef __WXMSW__
void SetItemSpacing( int spacing, bool isSmall = FALSE ); void SetItemSpacing( int spacing, bool isSmall = FALSE );

47
wxPython/src/fonts.i
View File

@@ -131,6 +131,12 @@ enum wxFontEncoding
wxFONTENCODING_UTF7, // UTF-7 Unicode encoding wxFONTENCODING_UTF7, // UTF-7 Unicode encoding
wxFONTENCODING_UTF8, // UTF-8 Unicode encoding wxFONTENCODING_UTF8, // UTF-8 Unicode encoding
wxFONTENCODING_UTF16, // UTF-16 Unicode encoding
wxFONTENCODING_UTF16BE, // UTF-16 Big Endian Unicode encoding
wxFONTENCODING_UTF16LE, // UTF-16 Little Endian Unicode encoding
wxFONTENCODING_UTF32, // UTF-32 Unicode encoding
wxFONTENCODING_UTF32BE, // UTF-32 Big Endian Unicode encoding
wxFONTENCODING_UTF32LE, // UTF-32 Little Endian Unicode encoding
// Far Eastern encodings // Far Eastern encodings
// Chinese // Chinese
@@ -161,6 +167,9 @@ struct wxNativeFontInfo
// reset to the default state // reset to the default state
void Init(); void Init();
// init with the parameters of the given font
void InitFromFont(const wxFont& font);
// accessors and modifiers for the font elements // accessors and modifiers for the font elements
int GetPointSize() const; int GetPointSize() const;
wxFontStyle GetStyle() const; wxFontStyle GetStyle() const;
@@ -199,30 +208,30 @@ struct wxNativeFontInfo
%{ %{
// Fix some link errors... Remove this when these methods get real implementations... // Fix some link errors... Remove this when these methods get real implementations...
#if defined(__WXGTK__) || defined(__WXX11__) // #if defined(__WXGTK__) || defined(__WXX11__)
#if wxUSE_PANGO // #if wxUSE_PANGO
void wxNativeFontInfo::SetPointSize(int pointsize) // void wxNativeFontInfo::SetPointSize(int pointsize)
{ wxFAIL_MSG( _T("not implemented") ); } // { wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetStyle(wxFontStyle style) // void wxNativeFontInfo::SetStyle(wxFontStyle style)
{ wxFAIL_MSG( _T("not implemented") ); } // { wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetWeight(wxFontWeight weight) // void wxNativeFontInfo::SetWeight(wxFontWeight weight)
{ wxFAIL_MSG( _T("not implemented") ); } // { wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) // void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
{ wxFAIL_MSG( _T("not implemented") ); } // { wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetFaceName(wxString facename) // void wxNativeFontInfo::SetFaceName(wxString facename)
{ wxFAIL_MSG( _T("not implemented") ); } // { wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetFamily(wxFontFamily family) // void wxNativeFontInfo::SetFamily(wxFontFamily family)
{ wxFAIL_MSG( _T("not implemented") ); } // { wxFAIL_MSG( _T("not implemented") ); }
void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) // void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
{ wxFAIL_MSG( _T("not implemented") ); } // { wxFAIL_MSG( _T("not implemented") ); }
#endif // #endif
#endif // #endif
%} %}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -348,7 +357,7 @@ public:
bool IsFixedWidth(); bool IsFixedWidth();
wxNativeFontInfo* GetNativeFontInfo() const; const wxNativeFontInfo* GetNativeFontInfo() const;
wxString GetNativeFontInfoDesc() const; wxString GetNativeFontInfoDesc() const;
wxString GetNativeFontInfoUserDesc() const; wxString GetNativeFontInfoUserDesc() const;

6
wxPython/src/gdi.i
View File

@@ -465,7 +465,7 @@ public:
%pragma(python) addtoclass = "asTuple = Get %pragma(python) addtoclass = "asTuple = Get
def __str__(self): return str(self.asTuple()) def __str__(self): return str(self.asTuple())
def __repr__(self): return 'wxColour:' + str(self.asTuple()) def __repr__(self): return 'wxColour' + str(self.asTuple())
def __nonzero__(self): return self.Ok() def __nonzero__(self): return self.Ok()
def __getinitargs__(self): return () def __getinitargs__(self): return ()
def __getstate__(self): return self.asTuple() def __getstate__(self): return self.asTuple()
@@ -1210,6 +1210,10 @@ public:
void Next() { void Next() {
(*self) ++; (*self) ++;
} }
bool __nonzero__() {
return self->operator bool();
}
}; };
}; };

6
wxPython/src/windows.i
View File

@@ -879,10 +879,16 @@ public:
const wxBitmap& bmpUnchecked = wxNullBitmap); const wxBitmap& bmpUnchecked = wxNullBitmap);
//void SetBitmap(const wxBitmap& bmpChecked); //void SetBitmap(const wxBitmap& bmpChecked);
//wxBitmap GetBitmap(bool bChecked = TRUE); //wxBitmap GetBitmap(bool bChecked = TRUE);
void SetDisabledBitmap( const wxBitmap& bmpDisabled );
const wxBitmap& GetDisabledBitmap() const;
void SetMarginWidth(int nWidth); void SetMarginWidth(int nWidth);
int GetMarginWidth(); int GetMarginWidth();
static int GetDefaultMarginWidth(); static int GetDefaultMarginWidth();
bool IsOwnerDrawn(); bool IsOwnerDrawn();
// switch on/off owner-drawing the item
void SetOwnerDrawn(bool ownerDrawn = TRUE);
void ResetOwnerDrawn(); void ResetOwnerDrawn();
#endif #endif

4
wxPython/src/windows2.i
View File

@@ -129,14 +129,14 @@ public:
// adds a new page to the control // adds a new page to the control
virtual bool AddPage(wxWindow *page, virtual bool AddPage(wxWindow *page,
const wxString& text, const wxString& text,
bool bSelect = false, bool select = false,
int imageId = -1); int imageId = -1);
// the same as AddPage(), but adds the page at the specified position // the same as AddPage(), but adds the page at the specified position
virtual bool InsertPage(size_t n, virtual bool InsertPage(size_t n,
wxWindow *page, wxWindow *page,
const wxString& text, const wxString& text,
bool bSelect = false, bool select = false,
int imageId = -1) = 0; int imageId = -1) = 0;
// set the currently selected page, return the index of the previously // set the currently selected page, return the index of the previously