# HG changeset patch
# User Flick
# Date 1305138456 25200
# Node ID 4e325f1ea6e1796ccd9fa74e1798eb9f9d9ad972
# Parent  36a29870bf3453c929393da70e9ef724018d8d5f
Construct the button name in the base class

diff -r 36a29870bf34 -r 4e325f1ea6e1 ActionButton.lua
--- a/ActionButton.lua	Wed May 11 11:11:59 2011 -0700
+++ b/ActionButton.lua	Wed May 11 11:27:36 2011 -0700
@@ -194,9 +194,7 @@
 ReAction:RegisterBarType(Action, true)
 
 function Action:New( config, bar, idx, idHint )
-  local name = format("ReAction_%s_Action_%d",bar:GetName(),idx)
- 
-  self = Super.New(self, name, config, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
+  self = Super.New(self, config, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
   self.barConfig = bar:GetConfig()
 
   local f = self:GetFrame()
diff -r 36a29870bf34 -r 4e325f1ea6e1 BagButton.lua
--- a/BagButton.lua	Wed May 11 11:11:59 2011 -0700
+++ b/BagButton.lua	Wed May 11 11:27:36 2011 -0700
@@ -49,8 +49,6 @@
 --
 
 function BagBase:New( btnCfg, bar, idx, idHint )
-  local name = format("ReAction_%s_Bag_%d",bar:GetName(),idx)
-
   -- use a variable private leaf implementation class
   -- unlike traditional OO programming, we can initialize the leaf
   -- class before initializing its parent
@@ -60,7 +58,7 @@
   elseif idx == 6 then
     class = Keyring
   end
-  self = class:New(name, btnCfg, bar, idx)
+  self = class:New(btnCfg, bar, idx)
 
   local f = self:GetFrame()
   local config = self:GetConfig()
diff -r 36a29870bf34 -r 4e325f1ea6e1 Button.lua
--- a/Button.lua	Wed May 11 11:11:59 2011 -0700
+++ b/Button.lua	Wed May 11 11:27:36 2011 -0700
@@ -27,14 +27,17 @@
     btnColumns = 12,
     spacing = 3
   },
-  barType = L["Button Bar"]
+  -- barType = L["Button Bar"],  -- derived classes must declare
+  -- buttonTypeID = "Button"     -- derived classes must declare
 } 
 
 ReAction.Button = Button -- export to ReAction
 
-function Button:New( name, config, bar, idx, inherits, buttonType )
+function Button:New( config, bar, idx, inherits, buttonType )
   buttonType = buttonType or "CheckButton"
 
+  local name = format("ReAction_%s_%s_%d",bar:GetName(), self.buttonTypeID, idx)
+
   -- create new self
   self = setmetatable( 
     { 
diff -r 36a29870bf34 -r 4e325f1ea6e1 MultiCastButton.lua
--- a/MultiCastButton.lua	Wed May 11 11:11:59 2011 -0700
+++ b/MultiCastButton.lua	Wed May 11 11:27:36 2011 -0700
@@ -341,9 +341,7 @@
     error("invalid index")
   end
 
-  local name = format("ReAction_%s_Totem_%d",bar:GetName(),idx)
- 
-  self = Super.New(self, name, btnConfig, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
+  self = Super.New(self, btnConfig, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
 
   local barFrame = bar:GetFrame()
   local f = self:GetFrame()
diff -r 36a29870bf34 -r 4e325f1ea6e1 PetActionButton.lua
--- a/PetActionButton.lua	Wed May 11 11:11:59 2011 -0700
+++ b/PetActionButton.lua	Wed May 11 11:27:36 2011 -0700
@@ -79,9 +79,7 @@
 ReAction:RegisterBarType(Pet)
 
 function Pet:New( config, bar, idx, idHint )
-  local name = format("ReAction_%s_PetAction_%d",bar:GetName(),idx)
- 
-  self = Super.New(self, name, config, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
+  self = Super.New(self, config, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
 
   local f = self:GetFrame()
   if not f.autoCastTexture then
diff -r 36a29870bf34 -r 4e325f1ea6e1 StanceButton.lua
--- a/StanceButton.lua	Wed May 11 11:11:59 2011 -0700
+++ b/StanceButton.lua	Wed May 11 11:27:36 2011 -0700
@@ -53,9 +53,7 @@
 ReAction:RegisterBarType(Stance)
 
 function Stance:New( config, bar, idx, idHint )
-  local name = format("ReAction_%s_Stance_%d",bar:GetName(),idx)
- 
-  self = Super.New(self, name, config, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
+  self = Super.New(self, config, bar, idx, "SecureActionButtonTemplate, ActionButtonTemplate" )
 
   local f = self:GetFrame()
   local barFrame = bar:GetFrame()
diff -r 36a29870bf34 -r 4e325f1ea6e1 VehicleExitButton.lua
--- a/VehicleExitButton.lua	Wed May 11 11:11:59 2011 -0700
+++ b/VehicleExitButton.lua	Wed May 11 11:27:36 2011 -0700
@@ -29,9 +29,7 @@
 ReAction:RegisterBarType(VExitButton)
 
 function VExitButton:New( config, bar, idx )
-  local name = format("ReAction_%s_VehicleExit_%d",bar:GetName(),idx)
- 
-  self = Super.New(self, name, config, bar, idx, "SecureFrameTemplate, ActionButtonTemplate", "Button")
+  self = Super.New(self, config, bar, idx, "SecureFrameTemplate, ActionButtonTemplate", "Button")
 
   -- frame setup
   local f = self:GetFrame()