Fix compilation

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

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index af7a940d08e4984d50a69f2178f4ec445f51a973..0e3b113553dd532e003fd0f401bab046a24587a0 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -17,13 +17,20 @@
 %newgroup
 
 
 %newgroup
 
 

+MustHaveApp(wxMenu);
+

 class wxMenu : public wxEvtHandler
 {
 public:
     %pythonAppend wxMenu         "self._setOORInfo(self)"
 class wxMenu : public wxEvtHandler
 {
 public:
     %pythonAppend wxMenu         "self._setOORInfo(self)"

+    %typemap(out) wxMenu*;    // turn off this typemap
+

     wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
 
     wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
 

+    // Turn it back on again
+    %typemap(out) wxMenu* { $result = wxPyMake_wxObject($1, $owner); }

 
 

+    

     // append any kind of item (normal/check/radio/separator)
     wxMenuItem* Append(int id,
                        const wxString& text,
     // append any kind of item (normal/check/radio/separator)
     wxMenuItem* Append(int id,
                        const wxString& text,


@@ -43,21 +50,29 @@ public:
                                 const wxString& text,
                                 const wxString& help = wxPyEmptyString);
     // append a submenu
                                 const wxString& text,
                                 const wxString& help = wxPyEmptyString);
     // append a submenu

-    %name(AppendMenu) wxMenuItem* Append(int id,
-                                         const wxString& text,
-                                         wxMenu *submenu,
-                                         const wxString& help = wxPyEmptyString);
+    %Rename(AppendMenu, wxMenuItem*, Append(int id,
+                                           const wxString& text,
+                                           wxMenu *submenu,
+                                           const wxString& help = wxPyEmptyString));

 
 

+    wxMenuItem* AppendSubMenu(wxMenu *submenu,
+                              const wxString& text,
+                              const wxString& help = wxPyEmptyString);
+
+    %disownarg(wxMenuItem*);

     // the most generic form of Append() - append anything
     // the most generic form of Append() - append anything

-    %name(AppendItem) wxMenuItem* Append(wxMenuItem *item);
+    %Rename(AppendItem, wxMenuItem*, Append(wxMenuItem *item));
+    // insert an item before given position
+    %Rename(InsertItem, wxMenuItem*, Insert(size_t pos, wxMenuItem *item));
+    // prepend an item to the menu
+    %Rename(PrependItem,  wxMenuItem*, Prepend(wxMenuItem *item));
+    %cleardisown(wxMenuItem*);
+

 
     // insert a break in the menu (only works when appending the items, not
     // inserting them)
     virtual void Break();
 
 
     // insert a break in the menu (only works when appending the items, not
     // inserting them)
     virtual void Break();
 

-    // insert an item before given position
-    %name(InsertItem) wxMenuItem* Insert(size_t pos, wxMenuItem *item);
-

     // insert an item before given position
     wxMenuItem* Insert(size_t pos,
                        int id,
     // insert an item before given position
     wxMenuItem* Insert(size_t pos,
                        int id,


@@ -81,14 +96,11 @@ public:
                                 const wxString& help = wxPyEmptyString);
 
     // insert a submenu
                                 const wxString& help = wxPyEmptyString);
 
     // insert a submenu

-    %name(InsertMenu) wxMenuItem* Insert(size_t pos,
+    %Rename(InsertMenu, wxMenuItem*, Insert(size_t pos,

                                          int id,
                                          const wxString& text,
                                          wxMenu *submenu,
                                          int id,
                                          const wxString& text,
                                          wxMenu *submenu,

-                                         const wxString& help = wxPyEmptyString);
-
-    // prepend an item to the menu
-    %name(PrependItem) wxMenuItem* Prepend(wxMenuItem *item);
+                                         const wxString& help = wxPyEmptyString));

 
     // prepend any item to the menu
     wxMenuItem* Prepend(int id,
 
     // prepend any item to the menu
     wxMenuItem* Prepend(int id,


@@ -110,26 +122,30 @@ public:
                                   const wxString& help = wxPyEmptyString);
 
     // prepend a submenu
                                   const wxString& help = wxPyEmptyString);
 
     // prepend a submenu

-    %name(PrependMenu) wxMenuItem* Prepend(int id,
+    %Rename(PrependMenu,  wxMenuItem*, Prepend(int id,

                                            const wxString& text,
                                            wxMenu *submenu,
                                            const wxString& text,
                                            wxMenu *submenu,

-                                           const wxString& help = wxPyEmptyString);
+                                           const wxString& help = wxPyEmptyString));

 
 

+    

     // detach an item from the menu, but don't delete it so that it can be
     // added back later (but if it's not, the caller is responsible for
     // deleting it!)
     // detach an item from the menu, but don't delete it so that it can be
     // added back later (but if it's not, the caller is responsible for
     // deleting it!)

+    %newobject Remove;

     wxMenuItem *Remove(int id);
     wxMenuItem *Remove(int id);

-    %name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
+    %Rename(RemoveItem,  wxMenuItem*, Remove(wxMenuItem *item));

 
     // delete an item from the menu (submenus are not destroyed by this
     // function, see Destroy)
     bool Delete(int id);
 
     // delete an item from the menu (submenus are not destroyed by this
     // function, see Destroy)
     bool Delete(int id);

-    %name(DeleteItem) bool Delete(wxMenuItem *item);
+    %Rename(DeleteItem,  bool, Delete(wxMenuItem *item));

 
 

-    // delete the item from menu and destroy it (if it's a submenu)
+    %pythonAppend Destroy "args[0].thisown = 0"

     %extend { void Destroy() { delete self; } }
     %extend { void Destroy() { delete self; } }

-    %name(DestroyId) bool Destroy(int id);
-    %name(DestroyItem) bool Destroy(wxMenuItem *item);
+    
+    // delete the item from menu and destroy it (if it's a submenu)
+    %Rename(DestroyId,  bool, Destroy(int id));
+    %Rename(DestroyItem,  bool, Destroy(wxMenuItem *item));

 
 
     // get the items
 
 
     // get the items


@@ -143,7 +159,7 @@ public:
 
     // search
     int FindItem(const wxString& item) const;
 
     // search
     int FindItem(const wxString& item) const;

-    %name(FindItemById) wxMenuItem* FindItem(int id /*, wxMenu **menu = NULL*/) const;
+    %Rename(FindItemById, wxMenuItem*, FindItem(int id /*, wxMenu **menu = NULL*/) const);

 
     // find by position
     wxMenuItem* FindItemByPosition(size_t position) const;
 
     // find by position
     wxMenuItem* FindItemByPosition(size_t position) const;


@@ -203,12 +219,18 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxMenuBar);
+

 class wxMenuBar : public wxWindow
 {
 public:
     %pythonAppend wxMenuBar         "self._setOORInfo(self)"
 class wxMenuBar : public wxWindow
 {
 public:
     %pythonAppend wxMenuBar         "self._setOORInfo(self)"

+    %typemap(out) wxMenuBar*;    // turn off this typemap
+

     wxMenuBar(long style = 0);
 
     wxMenuBar(long style = 0);
 

+    // Turn it back on again
+    %typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1, $owner); }

 
     // append a menu to the end of menubar, return True if ok
     virtual bool Append(wxMenu *menu, const wxString& title);
 
     // append a menu to the end of menubar, return True if ok
     virtual bool Append(wxMenu *menu, const wxString& title);


@@ -236,7 +258,7 @@ public:
     virtual void EnableTop(size_t pos, bool enable);
 
     // is the menu enabled?
     virtual void EnableTop(size_t pos, bool enable);
 
     // is the menu enabled?

-    virtual bool IsEnabledTop(size_t WXUNUSED(pos)) const { return True; }
+    virtual bool IsEnabledTop(size_t pos) const;

 
     // get or change the label of the menu at given position
     virtual void SetLabelTop(size_t pos, const wxString& label);
 
     // get or change the label of the menu at given position
     virtual void SetLabelTop(size_t pos, const wxString& label);


@@ -250,10 +272,10 @@ public:
     // find item by id (in any menu), returns NULL if not found
     //
     // if menu is !NULL, it will be filled with wxMenu this item belongs to
     // find item by id (in any menu), returns NULL if not found
     //
     // if menu is !NULL, it will be filled with wxMenu this item belongs to

-    %name(FindItemById) virtual wxMenuItem* FindItem(int id /*, wxMenu **menu = NULL*/) const;
+    %Rename(FindItemById, virtual wxMenuItem*, FindItem(int id /*, wxMenu **menu = NULL*/) const);

 
     // find menu by its caption, return wxNOT_FOUND on failure
 
     // find menu by its caption, return wxNOT_FOUND on failure

-    int FindMenu(const wxString& title) const;
+    int FindMenu(const wxString& title);

 
  
     // all these functions just use FindItem() and then call an appropriate
 
  
     // all these functions just use FindItem() and then call an appropriate


@@ -266,7 +288,8 @@ public:
     void Check(int id, bool check);
     bool IsChecked(int id) const;
     bool IsEnabled(int id) const;
     void Check(int id, bool check);
     bool IsChecked(int id) const;
     bool IsEnabled(int id) const;

-
+    // TODO: bool IsEnabled() const;
+     

     void SetLabel(int id, const wxString &label);
     wxString GetLabel(int id) const;
 
     void SetLabel(int id, const wxString &label);
     wxString GetLabel(int id) const;
 


@@ -285,6 +308,16 @@ public:
 
     // called before deleting the menubar normally
     virtual void Detach();
 
     // called before deleting the menubar normally
     virtual void Detach();

+
+#ifdef __WXMAC__
+    static void SetAutoWindowMenu( bool enable );
+    static bool GetAutoWindowMenu();
+#else
+    %extend {
+        static void SetAutoWindowMenu( bool enable ) {}
+        static bool GetAutoWindowMenu() { return false; }
+    }
+#endif

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -297,6 +330,7 @@ public:
                const wxString& help = wxPyEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);
                const wxString& help = wxPyEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);

+    ~wxMenuItem();

 
     // the menu we're in
     wxMenu *GetMenu() const;
 
     // the menu we're in
     wxMenu *GetMenu() const;


@@ -332,10 +366,10 @@ public:
     wxMenu *GetSubMenu() const;
 
     // state
     wxMenu *GetSubMenu() const;
 
     // state

-    virtual void Enable(bool enable = True);
+    virtual void Enable(bool enable = true);

     virtual bool IsEnabled() const;
 
     virtual bool IsEnabled() const;
 

-    virtual void Check(bool check = True);
+    virtual void Check(bool check = true);

     virtual bool IsChecked() const;
     void Toggle();
 
     virtual bool IsChecked() const;
     void Toggle();
 


@@ -350,7 +384,9 @@ public:
     // SetText()
     virtual void SetAccel(wxAcceleratorEntry *accel);
 
     // SetText()
     virtual void SetAccel(wxAcceleratorEntry *accel);
 

-    
+    void SetBitmap(const wxBitmap& bitmap);
+    const wxBitmap& GetBitmap();
+

     // wxOwnerDrawn methods
 #ifdef __WXMSW__
     void SetFont(const wxFont& font);
     // wxOwnerDrawn methods
 #ifdef __WXMSW__
     void SetFont(const wxFont& font);


@@ -371,17 +407,32 @@ public:
     bool IsOwnerDrawn();
 
     // switch on/off owner-drawing the item
     bool IsOwnerDrawn();
 
     // switch on/off owner-drawing the item

-    void SetOwnerDrawn(bool ownerDrawn = True);
+    void SetOwnerDrawn(bool ownerDrawn = true);

     void ResetOwnerDrawn();
 #else
     void ResetOwnerDrawn();
 #else

-    // just to keep the global  renamers in sync

     %extend {
     %extend {

+        void SetFont(const wxFont& font) {}
+        wxFont GetFont() { return wxNullFont; }
+        void SetTextColour(const wxColour& colText) {}
+        wxColour GetTextColour() { return wxNullColour; }
+        void SetBackgroundColour(const wxColour& colBack) {}
+        wxColour GetBackgroundColour() { return wxNullColour; }
+        
+        void SetBitmaps(const wxBitmap& bmpChecked,
+                        const wxBitmap& bmpUnchecked = wxNullBitmap)
+            { self->SetBitmap( bmpChecked ); }
+    
+        void SetDisabledBitmap( const wxBitmap& bmpDisabled ) {}
+        const wxBitmap& GetDisabledBitmap() const { return wxNullBitmap; }
+   
+        void SetMarginWidth(int nWidth) {}
+        int GetMarginWidth() { return 0; }

         static int GetDefaultMarginWidth() { return 0; }
         static int GetDefaultMarginWidth() { return 0; }

+        bool IsOwnerDrawn() { return false; }
+        void SetOwnerDrawn(bool ownerDrawn = true) {}
+        void ResetOwnerDrawn() {}

     }
 #endif
     }
 #endif

-
-    void SetBitmap(const wxBitmap& bitmap);
-    const wxBitmap& GetBitmap();

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------