--- a/CensusButton.xml	Sun Aug 14 15:16:35 2011 +0000
+++ b/CensusButton.xml	Sun Aug 14 17:21:31 2011 +0200
@@ -44,29 +44,18 @@
     <HighlightTexture alphaMode="ADD" file="Interface\Minimap\UI-Minimap-ZoomButton-Highlight"/>
     <Scripts>
         <OnLoad>
-                  this:RegisterForClicks("LeftButtonUp", "RightButtonUp");
+            self:RegisterForClicks("LeftButtonUp", "RightButtonUp");
         </OnLoad>
-     <OnClick>
-      if( not CensusButtonFrame.isMoving ) then
-       CensusPlusButton_OnClick(arg1, arg2);
-       PlaySound("igMainMenuOptionCheckBoxOn");
-      end
-     </OnClick>
-              <OnMouseUp>
+		<OnClick function="CensusPlus_Button_OnClick" />
+         <OnMouseUp>
                   if ( CensusButtonFrame.isMoving ) then
                       CensusButtonFrame:StopMovingOrSizing();
                       CensusButtonFrame.isMoving = false;
                   end
               </OnMouseUp>
-              <OnMouseDown>
-                  if ( ( ( not CensusButtonFrame.isLocked ) or ( CensusButtonFrame.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
-                      CensusButtonFrame:StartMoving();
-                      CensusButtonFrame.isMoving = true;
-                  end
-              </OnMouseDown>
+            <OnMouseDown function="CensusPlus_Button_OnMouseDown" />
      <OnEnter>
       GameTooltip_SetDefaultAnchor(GameTooltip, UIParent);
-<!--      CENSUS_BUTTON_TOOLTIP="test"; -->
       GameTooltip:SetText(CENSUS_BUTTON_TOOLTIP);
      </OnEnter>
      <OnLeave>
@@ -77,15 +66,15 @@
   </Frames>
   <Scripts>
    <OnLoad>
-    this:RegisterEvent("VARIABLES_LOADED");
+    self:RegisterEvent("VARIABLES_LOADED");
    </OnLoad>
    <OnEvent>
     CensusButton_Init();
    </OnEvent>
             <OnHide>
-                if ( this.isMoving ) then
-                    this:StopMovingOrSizing();
-                    this.isMoving = false;
+                if ( self.isMoving ) then
+                    self:StopMovingOrSizing();
+                    self.isMoving = false;
                 end
             </OnHide>
   </Scripts>