Various updates, changes for wxTopLevelWindow, fixes for

wxPen.SetDashes, etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-09-27 02:11:47 +00:00
parent 34a1d7328f
commit ecc08ead91
23 changed files with 1999 additions and 1584 deletions

View File

@@ -87,8 +87,8 @@ public:
#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);
@@ -598,7 +598,6 @@ public:
//----------------------------------------------------------------------
class wxPen : public wxGDIObject {
public:
wxPen(wxColour& colour, int width=1, int style=wxSOLID);
@@ -618,7 +617,7 @@ public:
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__
@@ -628,6 +627,42 @@ public:
};
%{
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: