'[1219035] cleanup: miscellaneous' and minor source cleaning.

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

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index e756e6fa9f87ac4780e047f11c050c5b3636b6ad..f547e9f1bf02f15e2f82ab1bcbd0153ea9e9020a 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -249,7 +249,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);


@@ -266,7 +266,7 @@ public:
     %Rename(FindItemById, virtual wxMenuItem*, FindItem(int id /*, wxMenu **menu = NULL*/) const);
 
     // find menu by its caption, return wxNOT_FOUND on failure
     %Rename(FindItemById, virtual wxMenuItem*, FindItem(int id /*, wxMenu **menu = NULL*/) const);
 
     // 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


@@ -299,6 +299,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

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


@@ -388,9 +398,25 @@ public:
     void SetOwnerDrawn(bool ownerDrawn = true);
     void ResetOwnerDrawn();
 #else
     void SetOwnerDrawn(bool ownerDrawn = true);
     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) {}
+    
+        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