X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b666ade78496cd91d648fcfe2fd6b79ce2b15e33..b85b06e13d22e7fc1604ec1a49caa1227a1b3d36:/src/gtk/dcclient.cpp

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 93788ede5b..234a38f278 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -282,7 +282,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
             SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y);
     }
 
-    m_context = window->GtkGetPangoDefaultContext();
+    m_context = window->GTKGetPangoDefaultContext();
     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 
@@ -1781,7 +1781,7 @@ wxCoord wxWindowDCImpl::GetCharHeight() const
     wxCHECK_MSG( metrics, -1, _T("failed to get pango font metrics") );
 
     wxCoord h = PANGO_PIXELS (pango_font_metrics_get_descent (metrics) +
-                pango_font_metrics_get_ascent (metrics));
+                              pango_font_metrics_get_ascent (metrics));
     pango_font_metrics_unref (metrics);
     return h;
 }
@@ -1813,7 +1813,7 @@ void wxWindowDCImpl::SetFont( const wxFont &font )
         {
             PangoContext *oldContext = m_context;
 
-            m_context = m_window->GtkGetPangoDefaultContext();
+            m_context = m_window->GTKGetPangoDefaultContext();
 
             // If we switch back/forth between different contexts
             // we also have to create a new layout. I think so,
@@ -2081,6 +2081,9 @@ void wxWindowDCImpl::SetLogicalFunction( wxRasterOperationMode function )
         case wxNO_OP:        mode = GDK_NOOP;          break;
         case wxSRC_INVERT:   mode = GDK_COPY_INVERT;   break;
         case wxNOR:          mode = GDK_NOR;           break;
+        default:
+            wxFAIL_MSG("unknown mode");
+            return;
     }
 
     m_logicalFunction = function;