Changed code to use the RM environment variable (if one exists) to delete files....

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

diff --git a/wxPython/src/windows2.i b/wxPython/src/windows2.i
index 0a0658dc6b938834c692d6a0908a9cf590cb30b6..b5c4d0ebd944279b39ba60652f5485b15bd281b8 100644 (file)
--- a/wxPython/src/windows2.i
+++ b/wxPython/src/windows2.i
@@ -75,8 +75,8 @@ public:
 class wxGrid : public wxPanel {
 public:
     wxGrid(wxWindow* parent, wxWindowID id,
 class wxGrid : public wxPanel {
 public:
     wxGrid(wxWindow* parent, wxWindowID id,

-           const wxPoint& pos=wxPyDefaultPosition,
-           const wxSize& size=wxPyDefaultSize,
+           const wxPoint& pos=wxDefaultPosition,
+           const wxSize& size=wxDefaultSize,

            long style=0,
            char* name="grid");
 
            long style=0,
            char* name="grid");
 


@@ -256,8 +256,8 @@ class wxNotebook : public wxControl {
 public:
     wxNotebook(wxWindow *parent,
                wxWindowID id,
 public:
     wxNotebook(wxWindow *parent,
                wxWindowID id,

-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,

                long style = 0,
                char* name = "notebook");
 
                long style = 0,
                char* name = "notebook");
 


@@ -275,8 +275,8 @@ public:
     bool SetPageImage(int nPage, int nImage);
     int GetRowCount();
 
     bool SetPageImage(int nPage, int nImage);
     int GetRowCount();
 

-    // LINK ERROR: void SetPageSize(const wxSize& size);
-    // LINK ERROR: void SetPadding(const wxSize& padding);
+    void SetPageSize(const wxSize& size);
+    void SetPadding(const wxSize& padding);

     bool DeletePage(int nPage);
     bool RemovePage(int nPage);
     bool DeleteAllPages();
     bool DeletePage(int nPage);
     bool RemovePage(int nPage);
     bool DeleteAllPages();


@@ -284,13 +284,11 @@ public:
                  const wxString& strText,
                  int bSelect = FALSE,
                  int imageId = -1);
                  const wxString& strText,
                  int bSelect = FALSE,
                  int imageId = -1);

-#ifdef __WXMSW__

     bool InsertPage(int nPage,
                     /*wxNotebookPage*/ wxWindow *pPage,
                     const wxString& strText,
                     bool bSelect = FALSE,
                     int imageId = -1);
     bool InsertPage(int nPage,
                     /*wxNotebookPage*/ wxWindow *pPage,
                     const wxString& strText,
                     bool bSelect = FALSE,
                     int imageId = -1);

-#endif

     /*wxNotebookPage*/ wxWindow *GetPage(int nPage);
 
     %addmethods {
     /*wxNotebookPage*/ wxWindow *GetPage(int nPage);
 
     %addmethods {


@@ -332,8 +330,8 @@ public:
 class wxSplitterWindow : public wxWindow {
 public:
     wxSplitterWindow(wxWindow* parent, wxWindowID id,
 class wxSplitterWindow : public wxWindow {
 public:
     wxSplitterWindow(wxWindow* parent, wxWindowID id,

-                     const wxPoint& point = wxPyDefaultPosition,
-                     const wxSize& size = wxPyDefaultSize,
+                     const wxPoint& point = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,

                      long style=wxSP_3D|wxCLIP_CHILDREN,
                      char* name = "splitterWindow");
 
                      long style=wxSP_3D|wxCLIP_CHILDREN,
                      char* name = "splitterWindow");
 


@@ -380,6 +378,7 @@ public:
     wxTaskBarIcon();
     ~wxTaskBarIcon();
 
     wxTaskBarIcon();
     ~wxTaskBarIcon();
 

+    // We still use the magic methods here since that is the way it is documented...

     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnMouseMove',    wxEVT_TASKBAR_MOVE)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonDown',  wxEVT_TASKBAR_LEFT_DOWN)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonUp',    wxEVT_TASKBAR_LEFT_UP)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnMouseMove',    wxEVT_TASKBAR_MOVE)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonDown',  wxEVT_TASKBAR_LEFT_DOWN)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonUp',    wxEVT_TASKBAR_LEFT_UP)"


@@ -391,7 +390,8 @@ public:
     bool SetIcon(const wxIcon& icon, const char* tooltip = "");
     bool RemoveIcon(void);
     bool PopupMenu(wxMenu *menu);
     bool SetIcon(const wxIcon& icon, const char* tooltip = "");
     bool RemoveIcon(void);
     bool PopupMenu(wxMenu *menu);

-
+    bool IsIconInstalled();
+    bool IsOK();

 };
 #endif
 
 };
 #endif