mention wx[Flex]GridSizer too

[wxWidgets.git] / samples / drawing / drawing.cpp

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 84d05d34120f4a20d3b352e7f6a11bf77fea114b..4903011b23c9523e00ba64e63deb198897ba216f 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -43,7 +43,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon
 // ----------------------------------------------------------------------------
 
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

     #include "mondrian.xpm"
 #endif
 
     #include "mondrian.xpm"
 #endif
 


@@ -159,6 +159,8 @@ protected:
     void DrawCircles(wxDC& dc);
     void DrawDefault(wxDC& dc);
 
     void DrawCircles(wxDC& dc);
     void DrawDefault(wxDC& dc);
 

+    void DrawRegionsHelper(wxDC& dc, wxCoord x);
+

 private:
     MyFrame *m_owner;
 
 private:
     MyFrame *m_owner;
 


@@ -308,9 +310,9 @@ bool MyApp::OnInit()
 
     if ( !LoadImages() )
     {
 
     if ( !LoadImages() )
     {

-        wxLogError("Can't load one of the bitmap files needed for this sample "
-                   "from the current or parent directory, please copy them "
-                   "there.");
+        wxLogError(wxT("Can't load one of the bitmap files needed ")
+                   wxT("for this sample from the current or parent ")
+                   wxT("directory, please copy them there."));

 
         // stop here
         DeleteBitmaps();
 
         // stop here
         DeleteBitmaps();


@@ -570,7 +572,7 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
 {
     dc.SetPen( wxPen( "black", width, wxSOLID) );
     dc.SetBrush( *wxRED_BRUSH );
 {
     dc.SetPen( wxPen( "black", width, wxSOLID) );
     dc.SetBrush( *wxRED_BRUSH );

-    dc.DrawText(wxString::Format("Testing lines of width %d", width), x + 10, y - 10);
+    dc.DrawText(wxString::Format(wxT("Testing lines of width %d"), width), x + 10, y - 10);

     dc.DrawRectangle( x+10, y+10, 100, 190 );
 
     dc.DrawText("Solid/dot/short dash/long dash/dot dash", x + 150, y + 10);
     dc.DrawRectangle( x+10, y+10, 100, 190 );
 
     dc.DrawText("Solid/dot/short dash/long dash/dot dash", x + 150, y + 10);


@@ -620,7 +622,7 @@ void MyCanvas::DrawDefault(wxDC& dc)
 {
     // mark the origin
     dc.DrawCircle(0, 0, 10);
 {
     // mark the origin
     dc.DrawCircle(0, 0, 10);

-#if !(defined __WXGTK__) && !(defined __WXMOTIF__)
+#if !(defined __WXGTK__) && !(defined __WXMOTIF__) && !(defined __WXMGL__)

     // not implemented in wxGTK or wxMOTIF :-(
     dc.FloodFill(0, 0, wxColour(255, 0, 0));
 #endif //
     // not implemented in wxGTK or wxMOTIF :-(
     dc.FloodFill(0, 0, wxColour(255, 0, 0));
 #endif //


@@ -822,14 +824,16 @@ void MyCanvas::DrawText(wxDC& dc)
     dc.DrawText( "This is text", 110, 10 );
     dc.DrawRotatedText( "That is text", 20, 10, -45 );
 
     dc.DrawText( "This is text", 110, 10 );
     dc.DrawRotatedText( "That is text", 20, 10, -45 );
 

-    dc.SetFont( *wxNORMAL_FONT );
+    // use wxSWISS_FONT and not wxNORMAL_FONT as the latter can't be rotated
+    // under Win9x (it is not TrueType)
+    dc.SetFont( *wxSWISS_FONT );

 
     wxString text;
     dc.SetBackgroundMode(wxTRANSPARENT);
 
     for ( int n = -180; n < 180; n += 30 )
     {
 
     wxString text;
     dc.SetBackgroundMode(wxTRANSPARENT);
 
     for ( int n = -180; n < 180; n += 30 )
     {

-        text.Printf("     %d rotated text", n);
+        text.Printf(wxT("     %d rotated text"), n);

         dc.DrawRotatedText(text , 400, 400, n);
     }
 
         dc.DrawRotatedText(text , 400, 400, n);
     }
 


@@ -841,10 +845,10 @@ void MyCanvas::DrawText(wxDC& dc)
     long height;
     long descent;
     dc.GetTextExtent( "This is Swiss 18pt text.", &length, &height, &descent );
     long height;
     long descent;
     dc.GetTextExtent( "This is Swiss 18pt text.", &length, &height, &descent );

-    text.Printf( "Dimensions are length %ld, height %ld, descent %ld", length, height, descent );
+    text.Printf( wxT("Dimensions are length %ld, height %ld, descent %ld"), length, height, descent );

     dc.DrawText( text, 110, 80 );
 
     dc.DrawText( text, 110, 80 );
 

-    text.Printf( "CharHeight() returns: %d", dc.GetCharHeight() );
+    text.Printf( wxT("CharHeight() returns: %d"), dc.GetCharHeight() );

     dc.DrawText( text, 110, 120 );
 
     dc.DrawRectangle( 100, 40, 4, height );
     dc.DrawText( text, 110, 120 );
 
     dc.DrawRectangle( 100, 40, 4, height );


@@ -874,21 +878,21 @@ static const struct
     int           rop;
 } rasterOperations[] =
 {
     int           rop;
 } rasterOperations[] =
 {

-    { "wxAND",          wxAND           },
-    { "wxAND_INVERT",   wxAND_INVERT    },
-    { "wxAND_REVERSE",  wxAND_REVERSE   },
-    { "wxCLEAR",        wxCLEAR         },
-    { "wxCOPY",         wxCOPY          },
-    { "wxEQUIV",        wxEQUIV         },
-    { "wxINVERT",       wxINVERT        },
-    { "wxNAND",         wxNAND          },
-    { "wxNO_OP",        wxNO_OP         },
-    { "wxOR",           wxOR            },
-    { "wxOR_INVERT",    wxOR_INVERT     },
-    { "wxOR_REVERSE",   wxOR_REVERSE    },
-    { "wxSET",          wxSET           },
-    { "wxSRC_INVERT",   wxSRC_INVERT    },
-    { "wxXOR",          wxXOR           },
+    { wxT("wxAND"),          wxAND           },
+    { wxT("wxAND_INVERT"),   wxAND_INVERT    },
+    { wxT("wxAND_REVERSE"),  wxAND_REVERSE   },
+    { wxT("wxCLEAR"),        wxCLEAR         },
+    { wxT("wxCOPY"),         wxCOPY          },
+    { wxT("wxEQUIV"),        wxEQUIV         },
+    { wxT("wxINVERT"),       wxINVERT        },
+    { wxT("wxNAND"),         wxNAND          },
+    { wxT("wxNO_OP"),        wxNO_OP         },
+    { wxT("wxOR"),           wxOR            },
+    { wxT("wxOR_INVERT"),    wxOR_INVERT     },
+    { wxT("wxOR_REVERSE"),   wxOR_REVERSE    },
+    { wxT("wxSET"),          wxSET           },
+    { wxT("wxSRC_INVERT"),   wxSRC_INVERT    },
+    { wxT("wxXOR"),          wxXOR           },

 };
 
 void MyCanvas::DrawImages(wxDC& dc)
 };
 
 void MyCanvas::DrawImages(wxDC& dc)


@@ -988,35 +992,49 @@ void MyCanvas::DrawRegions(wxDC& dc)
     dc.DrawText("You should see a red rect partly covered by a cyan one "
                 "on the left", 10, 5);
     dc.DrawText("and 5 smileys from which 4 are partially clipped on the "
     dc.DrawText("You should see a red rect partly covered by a cyan one "
                 "on the left", 10, 5);
     dc.DrawText("and 5 smileys from which 4 are partially clipped on the "

-                "right", 10, 5 + dc.GetCharHeight());
+                "right (2 copies should be identical)",
+                10, 5 + dc.GetCharHeight());
+
+    DrawRegionsHelper(dc, 10);
+    DrawRegionsHelper(dc, 350);
+}

 
 

+void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x)
+{
+    dc.DestroyClippingRegion();

     dc.SetBrush( *wxWHITE_BRUSH );
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.SetPen( *wxTRANSPARENT_PEN );

-    dc.DrawRectangle( 10,50,310,310 );
+    dc.DrawRectangle( x,50,310,310 );

 
 

-    dc.SetClippingRegion( 20,60,100,270 );
+    dc.SetClippingRegion( x+10,60,100,270 );

 
     dc.SetBrush( *wxRED_BRUSH );
 
     dc.SetBrush( *wxRED_BRUSH );

-    dc.DrawRectangle( 10,50,310,310 );
+    dc.DrawRectangle( x,50,310,310 );

 
 

-    dc.SetClippingRegion( 20,60,100,100 );
+    dc.SetClippingRegion( x+10,60,100,100 );

 
     dc.SetBrush( *wxCYAN_BRUSH );
 
     dc.SetBrush( *wxCYAN_BRUSH );

-    dc.DrawRectangle( 10,50,310,310 );
+    dc.DrawRectangle( x,50,310,310 );

 
 

-    dc.DestroyClippingRegion();
-    dc.SetClippingRegion( 120,70,100,270 );
+    // when drawing the left half, destroy the clipping region, when drawing
+    // the right one - leave it
+    //
+    // normally it shouldn't make any difference as SetClippingRegion()
+    // replaces the old clipping region
+    if ( x < 300 )
+        dc.DestroyClippingRegion();
+    dc.SetClippingRegion( x+110,70,100,270 );

 
     dc.SetBrush( *wxGREY_BRUSH );
 
     dc.SetBrush( *wxGREY_BRUSH );

-    dc.DrawRectangle( 10,50,310,310 );
+    dc.DrawRectangle( x,50,310,310 );

 
     if (m_smile_bmp.Ok())
     {
 
     if (m_smile_bmp.Ok())
     {

-        dc.DrawBitmap( m_smile_bmp, 160, 200, TRUE );
-        dc.DrawBitmap( m_smile_bmp, 140, 60, TRUE );
-        dc.DrawBitmap( m_smile_bmp, 140, 330, TRUE );
-        dc.DrawBitmap( m_smile_bmp, 110, 120, TRUE );
-        dc.DrawBitmap( m_smile_bmp, 210, 120, TRUE );
+        dc.DrawBitmap( m_smile_bmp, x+150, 200, TRUE );
+        dc.DrawBitmap( m_smile_bmp, x+130, 60, TRUE );
+        dc.DrawBitmap( m_smile_bmp, x+130, 330, TRUE );
+        dc.DrawBitmap( m_smile_bmp, x+100, 120, TRUE );
+        dc.DrawBitmap( m_smile_bmp, x+200, 120, TRUE );

     }
 }
 
     }
 }
 


@@ -1110,7 +1128,7 @@ void MyCanvas::OnMouseMove(wxMouseEvent &event)
     long x = dc.DeviceToLogicalX( pos.x );
     long y = dc.DeviceToLogicalY( pos.y );
     wxString str;
     long x = dc.DeviceToLogicalX( pos.x );
     long y = dc.DeviceToLogicalY( pos.y );
     wxString str;

-    str.Printf( "Current mouse position: %d,%d", (int)x, (int)y );
+    str.Printf( wxT("Current mouse position: %d,%d"), (int)x, (int)y );

     m_owner->SetStatusText( str );
 }
 
     m_owner->SetStatusText( str );
 }