From 6f33360fac01f5ca0a27405219710521a64fbf71 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Mon, 11 Nov 2013 19:27:45 -0500 Subject: [PATCH] BPopUpMenu style fixes for documentation, no functional change intended --- headers/os/interface/PopUpMenu.h | 6 +++--- src/kits/interface/PopUpMenu.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/headers/os/interface/PopUpMenu.h b/headers/os/interface/PopUpMenu.h index 3c1a792133..2ecf6ddb52 100644 --- a/headers/os/interface/PopUpMenu.h +++ b/headers/os/interface/PopUpMenu.h @@ -11,9 +11,9 @@ class BPopUpMenu : public BMenu { public: - BPopUpMenu(const char* title, + BPopUpMenu(const char* name, bool radioMode = true, - bool autoRename = true, + bool labelFromMarked = true, menu_layout layout = B_ITEMS_IN_COLUMN); BPopUpMenu(BMessage* data); virtual ~BPopUpMenu(); @@ -52,7 +52,7 @@ public: virtual void AllAttached(); virtual void AllDetached(); - void SetAsyncAutoDestruct(bool state); + void SetAsyncAutoDestruct(bool on); bool AsyncAutoDestruct() const; protected: diff --git a/src/kits/interface/PopUpMenu.cpp b/src/kits/interface/PopUpMenu.cpp index aebd37394b..7b94b380ab 100644 --- a/src/kits/interface/PopUpMenu.cpp +++ b/src/kits/interface/PopUpMenu.cpp @@ -36,10 +36,10 @@ struct popup_menu_data { }; -BPopUpMenu::BPopUpMenu(const char* title, bool radioMode, bool autoRename, +BPopUpMenu::BPopUpMenu(const char* name, bool radioMode, bool labelFromMarked, menu_layout layout) : - BMenu(title, layout), + BMenu(name, layout), fUseWhere(false), fAutoDestruct(false), fTrackThread(-1) @@ -47,7 +47,7 @@ BPopUpMenu::BPopUpMenu(const char* title, bool radioMode, bool autoRename, if (radioMode) SetRadioMode(true); - if (autoRename) + if (labelFromMarked) SetLabelFromMarked(true); } @@ -267,9 +267,9 @@ BPopUpMenu::AllDetached() void -BPopUpMenu::SetAsyncAutoDestruct(bool state) +BPopUpMenu::SetAsyncAutoDestruct(bool on) { - fAutoDestruct = state; + fAutoDestruct = on; }