Ensure there is valid context for DrawRectangle

[wxWidgets.git] / src / x11 / pango_x.cpp

diff --git a/src/x11/pango_x.cpp b/src/x11/pango_x.cpp
index 8836e142c175c043ccd5128d64f084346c946338..0e82c04f96f0ca7f78c20895e91a419e7abd95b8 100644 (file)
--- a/src/x11/pango_x.cpp
+++ b/src/x11/pango_x.cpp
@@ -9,11 +9,11 @@
 
 void
 x11_draw_glyphs( Drawable       drawable,
 
 void
 x11_draw_glyphs( Drawable       drawable,

-                        GC             gc,
-                        PangoFont     *font,
-                        int            x,
-                        int            y,
-                        PangoGlyphString *glyphs,
+                 GC             gc,
+                 PangoFont     *font,
+                 int            x,
+                 int            y,
+                 PangoGlyphString *glyphs,

                  wxColour       &colour );
 
 void
                  wxColour       &colour );
 
 void


@@ -57,11 +57,11 @@ x11_pango_get_item_properties( PangoItem      *item,
 
 void
 x11_draw_glyphs( Drawable            drawable,
 
 void
 x11_draw_glyphs( Drawable            drawable,

-                        GC                  gc,
-                        PangoFont          *font,
-                        int                 x,
-                        int                 y,
-                        PangoGlyphString   *glyphs,
+                 GC                  gc,
+                 PangoFont          *font,
+                 int                 x,
+                 int                 y,
+                 PangoGlyphString   *glyphs,

                  wxColour           &colour )
 {
 #ifdef HAVE_PANGO_XFT
                  wxColour           &colour )
 {
 #ifdef HAVE_PANGO_XFT


@@ -87,6 +87,7 @@ x11_draw_glyphs( Drawable            drawable,
     else
 #endif
     {
     else
 #endif
     {

+        wxUnusedVar(colour);

         pango_x_render( wxGlobalDisplay(), drawable, gc, font, glyphs, x, y );
     }
 }
         pango_x_render( wxGlobalDisplay(), drawable, gc, font, glyphs, x, y );
     }
 }


@@ -137,11 +138,11 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
         }
 
 #if 0
         }
 
 #if 0

-           XDrawRectangle( drawable, gc, TRUE,
-                             x + (x_off + logical_rect.x) / PANGO_SCALE,
-                             risen_y + overall_rect.y / PANGO_SCALE,
-                             logical_rect.width / PANGO_SCALE,
-                             overall_rect.height / PANGO_SCALE);
+        XDrawRectangle( drawable, gc, TRUE,
+                  x + (x_off + logical_rect.x) / PANGO_SCALE,
+                  risen_y + overall_rect.y / PANGO_SCALE,
+                  logical_rect.width / PANGO_SCALE,
+                  overall_rect.height / PANGO_SCALE);

 #endif
 
         if (!shape_set)
 #endif
 
         if (!shape_set)


@@ -155,9 +156,9 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
         if (uline ==  PANGO_UNDERLINE_SINGLE)
         {
             XDrawLine( wxGlobalDisplay(), drawable, gc,
         if (uline ==  PANGO_UNDERLINE_SINGLE)
         {
             XDrawLine( wxGlobalDisplay(), drawable, gc,

-                         x + (x_off + ink_rect.x) / PANGO_SCALE - 1,
+              x + (x_off + ink_rect.x) / PANGO_SCALE - 1,

                           risen_y + 1,
                           risen_y + 1,

-                         x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE,
+              x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE,

                          risen_y + 1);
         }
 
                          risen_y + 1);
         }
 


@@ -243,50 +244,50 @@ x11_pango_get_item_properties( PangoItem      *item,
       PangoAttribute *attr = (PangoAttribute *) tmp_list->data;
 
       switch (attr->klass->type)
       PangoAttribute *attr = (PangoAttribute *) tmp_list->data;
 
       switch (attr->klass->type)

-       {
-       case PANGO_ATTR_UNDERLINE:
-         if (uline)
-           *uline = (PangoUnderline) ((PangoAttrInt *)attr)->value;
-         break;
-
-       case PANGO_ATTR_STRIKETHROUGH:
-           if (strikethrough)
-               *strikethrough = ((PangoAttrInt *)attr)->value;
-           break;
-       
-       case PANGO_ATTR_FOREGROUND:
-         if (fg_color)
-           *fg_color = ((PangoAttrColor *)attr)->color;
-         if (fg_set)
-           *fg_set = TRUE;
-       
-         break;
-       
-       case PANGO_ATTR_BACKGROUND:
-         if (bg_color)
-           *bg_color = ((PangoAttrColor *)attr)->color;
-         if (bg_set)
-           *bg_set = TRUE;
-       
-         break;
-
-       case PANGO_ATTR_SHAPE:
-         if (shape_set)
-           *shape_set = TRUE;
-         if (logical_rect)
-           *logical_rect = ((PangoAttrShape *)attr)->logical_rect;
-         if (ink_rect)
-           *ink_rect = ((PangoAttrShape *)attr)->ink_rect;
-         break;
-
-        case PANGO_ATTR_RISE:
-          if (rise)
-            *rise = ((PangoAttrInt *)attr)->value;
-          break;
-
-       default:
-         break;
-       }
+      {
+          case PANGO_ATTR_UNDERLINE:
+              if (uline)
+                  *uline = (PangoUnderline) ((PangoAttrInt *)attr)->value;
+              break;
+
+          case PANGO_ATTR_STRIKETHROUGH:
+              if (strikethrough)
+                  *strikethrough = ((PangoAttrInt *)attr)->value;
+              break;
+
+          case PANGO_ATTR_FOREGROUND:
+              if (fg_color)
+                  *fg_color = ((PangoAttrColor *)attr)->color;
+              if (fg_set)
+                  *fg_set = TRUE;
+
+              break;
+
+          case PANGO_ATTR_BACKGROUND:
+              if (bg_color)
+                  *bg_color = ((PangoAttrColor *)attr)->color;
+              if (bg_set)
+                  *bg_set = TRUE;
+
+              break;
+
+          case PANGO_ATTR_SHAPE:
+              if (shape_set)
+                  *shape_set = TRUE;
+              if (logical_rect)
+                  *logical_rect = ((PangoAttrShape *)attr)->logical_rect;
+              if (ink_rect)
+                  *ink_rect = ((PangoAttrShape *)attr)->ink_rect;
+              break;
+
+          case PANGO_ATTR_RISE:
+              if (rise)
+                  *rise = ((PangoAttrInt *)attr)->value;
+              break;
+
+          default:
+              break;
+      }

       tmp_list = tmp_list->next;
     }
 }
       tmp_list = tmp_list->next;
     }
 }