Moved line-drawing to splittree implementation.

[wxWidgets.git] / wxPython / src / windows.i

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 53d137d72bc0bdeef3f5178d3848538eaa8674ef..1aab58d1dae6578c9604388a1ffa2883aefa62c6 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -234,7 +234,7 @@ public:
     wxLayoutConstraints * GetConstraints();
     wxEvtHandler* GetEventHandler();
 
     wxLayoutConstraints * GetConstraints();
     wxEvtHandler* GetEventHandler();
 

-    wxFont& GetFont();
+    wxFont GetFont();

     wxColour GetForegroundColour();
     wxWindow * GetGrandParent();
     %addmethods {
     wxColour GetForegroundColour();
     wxWindow * GetGrandParent();
     %addmethods {


@@ -332,11 +332,11 @@ public:
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
     void SetClientSize(const wxSize& size);
     //void SetPalette(wxPalette* palette);
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
     void SetClientSize(const wxSize& size);
     //void SetPalette(wxPalette* palette);

-    void SetCursor(const wxCursor&cursor);
+    void SetCursor(const wxCursor& cursor);

     void SetEventHandler(wxEvtHandler* handler);
     void SetExtraStyle(long exStyle);
     void SetTitle(const wxString& title);
     void SetEventHandler(wxEvtHandler* handler);
     void SetExtraStyle(long exStyle);
     void SetTitle(const wxString& title);

-    bool Show(bool show);
+    bool Show(bool show=TRUE);

     bool TransferDataFromWindow();
     bool TransferDataToWindow();
     bool Validate();
     bool TransferDataFromWindow();
     bool TransferDataToWindow();
     bool Validate();


@@ -400,6 +400,9 @@ public:
 
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
     wxAcceleratorTable *GetAcceleratorTable();
 
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
     wxAcceleratorTable *GetAcceleratorTable();

+
+
+    %name(base_OnPaint)void OnPaint(wxPaintEvent& event);

 };
 
 
 };
 
 


@@ -452,7 +455,7 @@ public:
                 const char* name = "panel");
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
                 const char* name = "panel");
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

-    %pragma(python) addtomethod = "XXX:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPrePanel:val._setOORInfo(val)"

 
     void InitDialog();
     wxButton* GetDefaultItem();
 
     void InitDialog();
     wxButton* GetDefaultItem();


@@ -656,7 +659,7 @@ public:
     // wxOwnerDrawn methods
 #ifdef __WXMSW__
     void SetFont(const wxFont& font);
     // wxOwnerDrawn methods
 #ifdef __WXMSW__
     void SetFont(const wxFont& font);

-    wxFont& GetFont();
+    wxFont GetFont();

     void SetTextColour(const wxColour& colText);
     wxColour GetTextColour();
     void SetBackgroundColour(const wxColour& colBack);
     void SetTextColour(const wxColour& colText);
     wxColour GetTextColour();
     void SetBackgroundColour(const wxColour& colBack);


@@ -664,7 +667,7 @@ public:
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetBitmap(const wxBitmap& bmpChecked);
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetBitmap(const wxBitmap& bmpChecked);

-    const wxBitmap& GetBitmap(bool bChecked = TRUE);
+    wxBitmap GetBitmap(bool bChecked = TRUE);

     void SetMarginWidth(int nWidth);
     int GetMarginWidth();
     static int GetDefaultMarginWidth();
     void SetMarginWidth(int nWidth);
     int GetMarginWidth();
     static int GetDefaultMarginWidth();