Commits

Caolán McNamara  committed b5b3a16

gtk3: #i111952# fix up post m82 merge

  • Participants
  • Parent commits a397b47

Comments (0)

Files changed (2)

File vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx

     if ( (nType==CTRL_COMBOBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
     {
         rNativeBoundingRegion = NWGetComboBoxEntryButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
-        aValue, rControlHandle, rCaption );
+        aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
         
         returnVal = TRUE;
     NWSetWidgetState( gWidgetData[m_nScreen].gBtnWidget, nState, stateType );
     NWSetWidgetState( gWidgetData[m_nScreen].gComboBoxWidget, nState, stateType );
 
-    buttonRect = NWGetComboBoxButtonRect( m_nScreen, nType, PART_BUTTON_DOWN, pixmapRect, nState, aValue, rControlHandle, rCaption );
+    buttonRect = NWGetComboBoxButtonRect( m_nScreen, nType, PART_BUTTON_DOWN, pixmapRect, nState, aValue, rCaption );
     if( nPart == PART_BUTTON_DOWN )
         buttonRect.Left() += 1;
 

File vcl/unx/inc/plugins/gtk/gtkgdi.hxx

                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
 							const OUString& rCaption );
-    BOOL NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-							const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
-                            ControlState nState, const ImplControlValue& aValue,
-							const OUString& rCaption );
+    BOOL NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
+                             ControlType nType, ControlPart nPart,
+                             const Rectangle& rControlRectangle,
+                             const clipList& rClipList,
+                             ControlState nState,
+                             const ImplControlValue& aValue,
+                             const OUString& rCaption );
     
     BOOL NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
 							const Rectangle& rControlRectangle,