%{
#include "helpers.h"
-
#include <wx/metafile.h>
%}
wxBitmap(const wxString& name, long type);
~wxBitmap();
+#ifdef __WXMSW__
void Create(int width, int height, int depth = -1);
+#endif
int GetDepth();
int GetHeight();
wxPalette* GetPalette();
void SetDepth(int depth);
void SetHeight(int height);
void SetMask(wxMask* mask);
- void SetOk(int isOk);
- void SetPalette(wxPalette* palette);
+#ifdef __WXMSW__
+ void SetPalette(wxPalette& palette);
+#endif
void SetWidth(int width);
};
%new wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1);
wxBitmap* wxNoRefBitmap(char* name, long flags);
+
%{ // Alternate 'constructor'
wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1) {
return new wxBitmap(width, height, depth);
class wxIcon : public wxBitmap {
public:
- wxIcon(char *name, long flags);
+#ifdef __WXMSW__
+ wxIcon(const wxString& name, long flags,
+ int desiredWidth = -1, int desiredHeight = -1);
+#endif
~wxIcon();
int GetDepth();
bool Ok();
void SetDepth(int depth);
void SetHeight(int height);
- void SetOk(int isOk);
void SetWidth(int width);
};
class wxCursor : public wxBitmap {
public:
+#ifdef __WXMSW__
wxCursor(const wxString& cursorName, long flags, int hotSpotX=0, int hotSpotY=0);
+#endif
~wxCursor();
bool Ok();
};
-%new wxCursor* wxStockCursor(int id);
+%name(wxStockCursor) %new wxCursor* wxPyStockCursor(int id);
%{ // Alternate 'constructor'
- wxCursor* wxStockCursor(int id) {
+ wxCursor* wxPyStockCursor(int id) {
return new wxCursor(id);
}
%}
int GetStyle();
bool GetUnderlined();
int GetWeight();
+#ifdef __WXMSW__
void SetFaceName(const wxString& faceName);
void SetFamily(int family);
void SetPointSize(int pointSize);
void SetStyle(int style);
void SetUnderlined(bool underlined);
void SetWeight(int weight);
+#endif
};
//----------------------------------------------------------------------
int GetCap();
wxColour& GetColour();
+#ifdef __WXMSW__
// **** This one needs to return a list of ints (wxDash)
int GetDashes(wxDash **dashes);
- int GetJoin();
wxBitmap* GetStipple();
+#endif
+ int GetJoin();
int GetStyle();
int GetWidth();
bool Ok();
void SetCap(int cap_style);
void SetColour(wxColour& colour);
+#ifdef __WXMSW__
void SetDashes(int LCOUNT, wxDash* LIST);
+ void SetStipple(wxBitmap& stipple);
+#endif
void SetJoin(int join_style);
- void SetStipple(wxBitmap * stipple);
void SetStyle(int style);
void SetWidth(int width);
};
wxBitmap * GetStipple();
int GetStyle();
bool Ok();
+#ifdef __WXMSW__
void SetColour(wxColour &colour);
- void SetStipple(wxBitmap *bitmap);
+ void SetStipple(wxBitmap& bitmap);
void SetStyle(int style);
+#endif
};
//----------------------------------------------------------------------
class wxDC {
public:
- wxDC();
+// wxDC(); **** abstract base class, can't instantiate.
~wxDC();
void BeginDrawing();
void EndDoc();
void EndDrawing();
void EndPage();
+#ifdef __WXWIN__
void FloodFill(long x, long y, const wxColour& colour, int style=wxFLOOD_SURFACE);
- wxBrush * GetBackground();
- wxBrush * GetBrush();
+#endif
+#ifdef __WXGTK__
+ void FloodFill(long x, long y, wxColour* colour, int style=wxFLOOD_SURFACE);
+#endif
+ wxBrush& GetBackground();
+ wxBrush& GetBrush();
long GetCharHeight();
long GetCharWidth();
void GetClippingBox(long *OUTPUT, long *OUTPUT,
long *OUTPUT, long *OUTPUT);
- wxFont * GetFont();
+ wxFont& GetFont();
int GetLogicalFunction();
int GetMapMode();
bool GetOptimization();
- wxPen * GetPen();
- //bool GetPixel(int x, int y, wxColour *T_OUTPUT); **** See below.
+ wxPen& GetPen();
+ %addmethods {
+ %new wxColour* GetPixel(long x, long y) {
+ wxColour* wc = new wxColour();
+ self->GetPixel(x, y, wc);
+ return wc;
+ }
+ }
void GetSize(int* OUTPUT, int* OUTPUT); //void GetSize(long* OUTPUT, long* OUTPUT);
wxColour& GetTextBackground();
void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT,
%addmethods {
- %new wxColour* GetPixel(long x, long y) {
- wxColor* wc = new wxColor();
- self->GetPixel(x, y, wc);
- return wc;
- }
-
// This one is my own creation...
- void DrawBitmap(wxBitmap* bitmap, long x, long y, bool swapPalette=TRUE) {
+ void DrawBitmap(wxBitmap& bitmap, long x, long y, bool swapPalette=TRUE) {
wxMemoryDC* memDC = new wxMemoryDC;
memDC->SelectObject(bitmap);
if (swapPalette)
- self->SetPalette(bitmap->GetPalette());
- self->Blit(x, y, bitmap->GetWidth(), bitmap->GetHeight(), memDC,
+ self->SetPalette(*bitmap.GetPalette());
+ self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
0, 0, self->GetLogicalFunction());
memDC->SelectObject(wxNullBitmap);
delete memDC;
//---------------------------------------------------------------------------
+#ifdef __WXMSW__
+class wxWindowDC : public wxDC {
+public:
+ wxWindowDC(wxWindow* win);
+};
+#endif
+
+//---------------------------------------------------------------------------
+
+#ifndef __WXMSW__
class wxPostScriptDC : public wxDC {
public:
wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow* win = NULL);
};
+#endif
//---------------------------------------------------------------------------
+#ifdef __WXMSW__
class wxPrinterDC : public wxDC {
public:
wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output,
bool interactive = TRUE, int orientation = wxPORTRAIT);
};
+#endif
//---------------------------------------------------------------------------
+#ifdef __WXMSW__
class wxMetaFileDC : public wxDC {
public:
wxMetaFileDC(const wxString& filename = wxPyEmptyStr);
wxMetaFile* Close();
};
+#endif
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
extern wxFont wxNullFont;
extern wxColour wxNullColour;
+//---------------------------------------------------------------------------
+
+class wxPalette {
+public:
+ wxPalette(int LCOUNT, byte* LIST, byte* LIST, byte* LIST);
+ ~wxPalette();
+
+ int GetPixel(byte red, byte green, byte blue);
+ bool GetRGB(int pixel, byte* OUTPUT, byte* OUTPUT, byte* OUTPUT);
+ bool Ok();
+};
+
+//---------------------------------------------------------------------------
+
+
//---------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
+// Revision 1.7 1998/12/15 20:41:18 RD
+// Changed the import semantics from "from wxPython import *" to "from
+// wxPython.wx import *" This is for people who are worried about
+// namespace pollution, they can use "from wxPython import wx" and then
+// prefix all the wxPython identifiers with "wx."
+//
+// Added wxTaskbarIcon for wxMSW.
+//
+// Made the events work for wxGrid.
+//
+// Added wxConfig.
+//
+// Added wxMiniFrame for wxGTK, (untested.)
+//
+// Changed many of the args and return values that were pointers to gdi
+// objects to references to reflect changes in the wxWindows API.
+//
+// Other assorted fixes and additions.
+//
+// Revision 1.6 1998/11/25 08:45:24 RD
+//
+// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
+// Added events for wxGrid
+// Other various fixes and additions
+//
+// Revision 1.5 1998/10/20 06:43:57 RD
+// New wxTreeCtrl wrappers (untested)
+// some changes in helpers
+// etc.
+//
+// Revision 1.4 1998/10/02 06:40:38 RD
+//
+// Version 0.4 of wxPython for MSW.
+//
+// Revision 1.3 1998/08/18 19:48:16 RD
+// more wxGTK compatibility things.
+//
+// It builds now but there are serious runtime problems...
+//
// Revision 1.2 1998/08/15 07:36:35 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
projects / wxWidgets.git / blobdiff