In GetPath(), don't append separator if there's already one at the end

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index c245360dc643c7525199a7b7bbbdf2d43e8ea221..484cfeb360a50cac525713bc059adfe9db2731d2 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -33,6 +33,14 @@
 %pragma(python) code = "import wx"
 
 
+//----------------------------------------------------------------------
+
+%{
+    // Put some wx default wxChar* values into wxStrings.
+    DECLARE_DEF_STRING(PanelNameStr);
+    static const wxString wxPyEmptyString(wxT(""));
+%}
+
 //---------------------------------------------------------------------------
 
 class wxEvtHandler : public wxObject {
@@ -79,7 +87,7 @@ public:
 
     %addmethods {
         void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyClientData(_self));
+            self->SetClientObject(new wxPyOORClientData(_self));
         }
     }
 };
@@ -174,20 +182,19 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             char* name = "panel");
+             const wxString& name = wxPyPanelNameStr);
     %name(wxPreWindow)wxWindow();
 
     bool Create(wxWindow* parent, const wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                char* name = "panel");
+                const wxString& name = wxPyPanelNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(val)"
 
 
-    void CaptureMouse();
     void Center(int direction = wxBOTH);
     void Centre(int direction = wxBOTH);
     void CentreOnParent(int direction = wxBOTH );
@@ -305,7 +312,6 @@ public:
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void RefreshRect(const wxRect& rect);
 
-    void ReleaseMouse();
     void RemoveChild(wxWindow* child);
     bool Reparent( wxWindow* newParent );
 
@@ -320,6 +326,7 @@ public:
     void SetConstraints(wxLayoutConstraints *constraints);
     void UnsetConstraints(wxLayoutConstraints *constraints);
     void SetFocus();
+    void SetFocusFromKbd();
     bool AcceptsFocus();
     void SetFont(const wxFont& font);
     void SetForegroundColour(const wxColour& colour);
@@ -343,7 +350,18 @@ public:
         }
     }
 
-    void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
+    void SetSizeHints(int minW,    int minH,
+                      int maxW=-1, int maxH=-1,
+                      int incW=-1, int incH=-1);
+    void SetVirtualSizeHints( int minW, int minH,
+                              int maxW = -1, int maxH = -1 );
+
+    void SetVirtualSize( const wxSize &size );
+    %name(SetVirtualSizeWH)void SetVirtualSize( int x, int y );
+
+    wxSize GetVirtualSize() const;
+    %name(GetVirtualSizeTuple)void GetVirtualSize( int *OUTPUT, int *OUTPUT ) const;
+
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
     void SetClientSize(const wxSize& size);
     //void SetPalette(wxPalette* palette);
@@ -356,7 +374,6 @@ public:
     bool TransferDataToWindow();
     void UpdateWindowUI();
     bool Validate();
-    void WarpPointer(int x, int y);
 
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);
@@ -372,6 +389,7 @@ public:
     wxToolTip* GetToolTip();
 
     void SetSizer(wxSizer* sizer, bool deleteOld=TRUE);
+    void SetSizerAndFit(wxSizer *sizer, bool deleteOld=TRUE);
     wxSizer* GetSizer();
 
         // Track if this window is a member of a sizer
@@ -430,6 +448,23 @@ public:
 
     wxWindow* GetDefaultItem();
     wxWindow* SetDefaultItem(wxWindow *btn);
+
+
+    // move the mouse to the specified position
+    void WarpPointer(int x, int y);
+
+    // start or end mouse capture, these functions maintain the stack of
+    // windows having captured the mouse and after calling ReleaseMouse()
+    // the mouse is not released but returns to the window which had had
+    // captured it previously (if any)
+    void CaptureMouse();
+    void ReleaseMouse();
+
+    // get the window which currently captures the mouse or NULL
+    static wxWindow *GetCapture();
+
+    // does this window have the capture?
+    bool HasCapture() const;
 };
 
 
@@ -471,7 +506,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL,
-            const char* name = "panel");
+            const wxString& name = wxPyPanelNameStr);
     %name(wxPrePanel)wxPanel();
 
     bool Create(wxWindow* parent,
@@ -479,7 +514,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL,
-                const char* name = "panel");
+                const wxString& name = wxPyPanelNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPrePanel:val._setOORInfo(val)"
@@ -502,7 +537,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxHSCROLL | wxVSCROLL,
-                     char* name = "scrolledWindow");
+                     const wxString& name = wxPyPanelNameStr);
     %name(wxPreScrolledWindow)wxScrolledWindow();
 
     bool Create(wxWindow* parent,
@@ -510,7 +545,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHSCROLL | wxVSCROLL,
-                char* name = "scrolledWindow");
+                const wxString& name = wxPyPanelNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreScrolledWindow:val._setOORInfo(val)"
@@ -519,7 +554,6 @@ public:
     int GetScrollPageSize(int orient);
     void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
     wxWindow* GetTargetWindow();
-    void GetVirtualSize(int* OUTPUT, int* OUTPUT);
     bool IsRetained();
     void PrepareDC(wxDC& dc);
     void Scroll(int x, int y);
@@ -562,6 +596,10 @@ public:
     void AdjustScrollbars();
 
     bool Layout();
+
+    // Set the x, y scrolling increments.
+    void SetScrollRate( int xstep, int ystep );
+
 };
 
 //----------------------------------------------------------------------
@@ -569,62 +607,62 @@ public:
 
 class wxMenu : public wxEvtHandler {
 public:
-    wxMenu(const wxString& title = wxEmptyString, long style = 0);
+    wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
     void Append(int id, const wxString& item,
-                const wxString& helpString = wxEmptyString,
-                wxItemKind kind = wxItem_Normal);
+                const wxString& helpString = wxPyEmptyString,
+                wxItemKind kind = wxITEM_NORMAL);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
-                                 const wxString& helpString = wxEmptyString);
+                                 const wxString& helpString = wxPyEmptyString);
     %name(AppendItem)void Append(const wxMenuItem* item);
     void AppendCheckItem(int id,
                          const wxString& text,
-                         const wxString& help = wxEmptyString);
+                         const wxString& help = wxPyEmptyString);
     void AppendRadioItem(int id,
                          const wxString& text,
-                         const wxString& help = wxEmptyString);
+                         const wxString& help = wxPyEmptyString);
     void AppendSeparator();
 
 
     void Insert(size_t pos,
                 int id,
                 const wxString& text,
-                const wxString& help = wxEmptyString,
-                wxItemKind kind = wxItem_Normal);
+                const wxString& help = wxPyEmptyString,
+                wxItemKind kind = wxITEM_NORMAL);
     void InsertSeparator(size_t pos);
     void InsertCheckItem(size_t pos,
                          int id,
                          const wxString& text,
-                         const wxString& help = wxEmptyString);
+                         const wxString& help = wxPyEmptyString);
     void InsertRadioItem(size_t pos,
                          int id,
                          const wxString& text,
-                         const wxString& help = wxEmptyString);
+                         const wxString& help = wxPyEmptyString);
     %name(InsertMenu)void Insert(size_t pos,
                                  int id,
                                  const wxString& text,
                                  wxMenu *submenu,
-                                 const wxString& help = wxEmptyString);
+                                 const wxString& help = wxPyEmptyString);
     %name(InsertItem)bool Insert(size_t pos, wxMenuItem *item);
 
 
     void Prepend(int id,
                  const wxString& text,
-                 const wxString& help = wxEmptyString,
-                 wxItemKind kind = wxItem_Normal);
+                 const wxString& help = wxPyEmptyString,
+                 wxItemKind kind = wxITEM_NORMAL);
     void PrependSeparator();
     void PrependCheckItem(int id,
                           const wxString& text,
-                          const wxString& help = wxEmptyString);
+                          const wxString& help = wxPyEmptyString);
     void PrependRadioItem(int id,
                           const wxString& text,
-                          const wxString& help = wxEmptyString);
+                          const wxString& help = wxPyEmptyString);
     %name(PrependMenu)void Prepend(int id,
                                    const wxString& text,
                                    wxMenu *submenu,
-                                   const wxString& help = wxEmptyString);
+                                   const wxString& help = wxPyEmptyString);
     %name(PrependItem)void Prepend(wxMenuItem *item);
 
 
@@ -724,9 +762,9 @@ public:
 class wxMenuItem : public wxObject {
 public:
     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
-               const wxString& text = wxEmptyString,
-               const wxString& help = wxEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               const wxString& text = wxPyEmptyString,
+               const wxString& help = wxPyEmptyString,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);