More use of TCL_UNUSED() macro

1 files changed, 11 insertions, 17 deletions

diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index d1f429e..8eed4f0 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -76,6 +76,8 @@ static void		DrawMenuButtonImageAndText(TkMenuButton *butPtr);
 Tk_ClassProcs tkpMenubuttonClass = {
     sizeof(Tk_ClassProcs),	/* size */
     TkMenuButtonWorldChanged,	/* worldChangedProc */
+	NULL,
+	NULL
 };
 
 /*
@@ -133,7 +135,7 @@ TkMenuButton *
 TkpCreateMenuButton(
     Tk_Window tkwin)
 {
-    MacMenuButton *mbPtr = (MacMenuButton *) ckalloc(sizeof(MacMenuButton));
+    MacMenuButton *mbPtr = (MacMenuButton *)ckalloc(sizeof(MacMenuButton));
 
     Tk_CreateEventHandler(tkwin, ActivateMask, MenuButtonEventProc, mbPtr);
     mbPtr->flags = FIRST_DRAW;
@@ -179,13 +181,6 @@ TkpDisplayMenuButton(
     TkMacOSXComputeMenuButtonDrawParams(butPtr, dpPtr);
 
     /*
-     * Set up clipping region.  Make sure the we are using the port for this
-     * button, or we will set the wrong window's clip.
-     */
-
-    TkMacOSXSetUpClippingRgn(pixmap);
-
-    /*
      * Draw the native portion of the buttons.
      */
 
@@ -222,7 +217,7 @@ TkpDisplayMenuButton(
 
 void
 TkpDestroyMenuButton(
-    TkMenuButton *mbPtr)
+    TCL_UNUSED(TkMenuButton *))
 {
 }
 
@@ -544,8 +539,7 @@ DrawMenuButtonImageAndText(
 static void
 TkMacOSXDrawMenuButton(
     MacMenuButton *mbPtr, /* Mac menubutton. */
-    GC gc,                /* The GC we are drawing into - needed for the bevel
-                           * button */
+    TCL_UNUSED(GC),       /* The GC we are drawing into - not used */
     Pixmap pixmap)        /* The pixmap we are drawing into - needed for the
                            * bevel button */
 {
@@ -625,8 +619,8 @@ TkMacOSXDrawMenuButton(
 static void
 MenuButtonBackgroundDrawCB (
     MacMenuButton *ptr,
-    SInt16 depth,
-    Boolean isColorDev)
+    TCL_UNUSED(SInt16),
+    TCL_UNUSED(Boolean))
 {
     TkMenuButton* butPtr = (TkMenuButton *) ptr;
     Tk_Window tkwin = butPtr->tkwin;
@@ -658,11 +652,11 @@ MenuButtonBackgroundDrawCB (
 
 static void
 MenuButtonContentDrawCB (
-    ThemeButtonKind kind,
-    const HIThemeButtonDrawInfo *drawinfo,
+    TCL_UNUSED(ThemeButtonKind),
+    TCL_UNUSED(const HIThemeButtonDrawInfo *),
     MacMenuButton *ptr,
-    SInt16 depth,
-    Boolean isColorDev)
+    TCL_UNUSED(SInt16),
+    TCL_UNUSED(Boolean))
 {
     TkMenuButton *butPtr = (TkMenuButton *) ptr;
     Tk_Window tkwin = butPtr->tkwin;