Remove unused variable. Zero the size of the non-functioning pulldown button on Mac

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7123 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/pgadmin/ctl/ctlMenuToolbar.cpp b/pgadmin/ctl/ctlMenuToolbar.cpp
index 5c7745f28069dc39068e65064ef03d8e80447c1e..6824c528da73ae4832be9f40b0128dc62b6b4772 100644 (file)
--- a/pgadmin/ctl/ctlMenuToolbar.cpp
+++ b/pgadmin/ctl/ctlMenuToolbar.cpp
@@ -64,7 +64,9 @@ void ctlMenuButton::Create(wxWindow *window, wxToolBar *toolBar, int ID, wxMenu
 #ifdef __WXGTK__\r
     pulldownSize.Set(18,15);\r
 #else\r
-    pulldownSize.Set(16,15);\r
+//    pulldownSize.Set(16,15);\r
+// The pulldown doesn't currently work on wxMac.\r
+    pulldownSize.Set(0,0);\r
 #endif\r
 #endif\r
 \r
@@ -73,6 +75,7 @@ void ctlMenuButton::Create(wxWindow *window, wxToolBar *toolBar, int ID, wxMenu
 \r
     ((wxBitmapButton *)this)->Create(window, ID, bmpPulldown, wxDefaultPosition, pulldownSize, wxNO_BORDER);\r
     Connect(ID, wxEVT_LEFT_DOWN, wxMouseEventHandler(ctlMenuButton::DoProcessLeftClick) );\r
+       SetOwnBackgroundColour(*wxBLUE);\r
 }\r
 \r
 \r
@@ -148,6 +151,7 @@ ctlMenuToolbar::~ctlMenuToolbar()
 ctlMenuButton *ctlMenuToolbar::AddMenuPulldownTool(int toolId, const wxString& label, const wxString& shortHelpString, wxMenu *popupmenu)\r
 {\r
     ctlMenuButton *menu_button = new ctlMenuButton(this, toolId, popupmenu);\r
+\r
     AddControl(menu_button);\r
 \r
     return menu_button;\r

diff --git a/pgadmin/frm/frmMain.cpp b/pgadmin/frm/frmMain.cpp
index 0911064cbe49d18747733dcca5ef58fa6af2a819..83b7cc3a785eefdef7826a10533c98c0db1280b5 100644 (file)
--- a/pgadmin/frm/frmMain.cpp
+++ b/pgadmin/frm/frmMain.cpp
@@ -445,7 +445,7 @@ void frmMain::CreateMenus()
     // Disable the plugins menu if there aren't any.
     if (!pluginUtilityCount)
     {
-        wxMenuItem *item = pluginsMenu->Append(0, _("No plugins installed"));
+        pluginsMenu->Append(0, _("No plugins installed"));
         pluginsMenu->Enable(0, false);
     }