diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/PlatGTK.cxx | 12 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.h | 6 | ||||
| -rw-r--r-- | gtk/ScintillaGTKAccessible.h | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 9ad49c9b8..8a00fcdad 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1505,13 +1505,13 @@ void ListBoxX::Create(Window &parent, int, Point, int, bool, int) { GTK_WINDOW(top)); } -void ListBoxX::SetFont(Font &scint_font) { +void ListBoxX::SetFont(Font &font) { // Only do for Pango font as there have been crashes for GDK fonts - if (Created() && PFont(scint_font)->pfd) { + if (Created() && PFont(font)->pfd) { // Current font is Pango font #if GTK_CHECK_VERSION(3,0,0) if (cssProvider) { - PangoFontDescription *pfd = PFont(scint_font)->pfd; + PangoFontDescription *pfd = PFont(font)->pfd; std::ostringstream ssFontSetting; ssFontSetting << "GtkTreeView, treeview { "; ssFontSetting << "font-family: " << pango_font_description_get_family(pfd) << "; "; @@ -1532,7 +1532,7 @@ void ListBoxX::SetFont(Font &scint_font) { ssFontSetting.str().c_str(), -1, NULL); } #else - gtk_widget_modify_font(PWidget(list), PFont(scint_font)->pfd); + gtk_widget_modify_font(PWidget(list), PFont(font)->pfd); #endif gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), -1); gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), 1); @@ -1918,14 +1918,14 @@ static void MenuPositionFunc(GtkMenu *, gint *x, gint *y, gboolean *, gpointer u } #endif -void Menu::Show(Point pt, Window &wnd) { +void Menu::Show(Point pt, Window &w) { GtkMenu *widget = static_cast<GtkMenu *>(mid); gtk_widget_show_all(GTK_WIDGET(widget)); #if GTK_CHECK_VERSION(3,22,0) // Rely on GTK+ to do the right thing with positioning gtk_menu_popup_at_pointer(widget, NULL); #else - GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(wnd.GetID())); + GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(w.GetID())); GtkRequisition requisition; #if GTK_CHECK_VERSION(3,0,0) gtk_widget_get_preferred_size(GTK_WIDGET(widget), NULL, &requisition); diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h index 225247c8f..95ad953f0 100644 --- a/gtk/ScintillaGTK.h +++ b/gtk/ScintillaGTK.h @@ -135,7 +135,7 @@ private: void GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText); void ReceivedSelection(GtkSelectionData *selection_data); void ReceivedDrop(GtkSelectionData *selection_data); - static void GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *selected); + static void GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *text); void StoreOnClipboard(SelectionText *clipText); static void ClipboardGetSelection(GtkClipboard* clip, GtkSelectionData *selection_data, guint info, void *data); static void ClipboardClearSelection(GtkClipboard* clip, void *data); @@ -197,7 +197,7 @@ private: static AtkObject* GetAccessible(GtkWidget *widget); bool KoreanIME(); - void CommitThis(char *str); + void CommitThis(char *commitStr); static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis); void PreeditChangedInlineThis(); void PreeditChangedWindowedThis(); @@ -238,7 +238,7 @@ private: #if GTK_CHECK_VERSION(3,0,0) static gboolean DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip); #else - static gboolean ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ct); + static gboolean ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ctip); #endif static gboolean PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis); diff --git a/gtk/ScintillaGTKAccessible.h b/gtk/ScintillaGTKAccessible.h index 947b6198a..bb47ddf3e 100644 --- a/gtk/ScintillaGTKAccessible.h +++ b/gtk/ScintillaGTKAccessible.h @@ -109,7 +109,7 @@ private: gboolean SetCaretOffset(int charOffset); gint GetOffsetAtPoint(gint x, gint y, AtkCoordType coords); void GetCharacterExtents(int charOffset, gint *x, gint *y, gint *width, gint *height, AtkCoordType coords); - AtkAttributeSet *GetAttributesForStyle(unsigned int style); + AtkAttributeSet *GetAttributesForStyle(unsigned int styleNum); AtkAttributeSet *GetRunAttributes(int charOffset, int *startChar, int *endChar); AtkAttributeSet *GetDefaultAttributes(); gint GetNSelections(); @@ -120,14 +120,14 @@ private: // for AtkEditableText bool InsertStringUTF8(Sci::Position bytePos, const gchar *utf8, Sci::Position lengthBytes); void SetTextContents(const gchar *contents); - void InsertText(const gchar *contents, int lengthBytes, int *charPosition); + void InsertText(const gchar *text, int lengthBytes, int *charPosition); void CopyText(int startChar, int endChar); void CutText(int startChar, int endChar); void DeleteText(int startChar, int endChar); void PasteText(int charPosition); public: - ScintillaGTKAccessible(GtkAccessible *accessible, GtkWidget *widget); + ScintillaGTKAccessible(GtkAccessible *accessible_, GtkWidget *widget_); ~ScintillaGTKAccessible(); static ScintillaGTKAccessible *FromAccessible(GtkAccessible *accessible); |