show the resize cursor when the mouse is above the grip and not only when it's just...

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 93c4b6df2fd39f4b7aa06c6799df229319f162cc..e08e04250d80e83474eb31184860f0767000fcfe 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__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)

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


@@ -161,7 +161,7 @@ protected:
     void DrawCircles(wxDC& dc);
     void DrawDefault(wxDC& dc);
 
     void DrawCircles(wxDC& dc);
     void DrawDefault(wxDC& dc);
 

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

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


@@ -217,6 +217,8 @@ enum
     LogicalOrigin_MoveUp,
     LogicalOrigin_MoveLeft,
     LogicalOrigin_MoveRight,
     LogicalOrigin_MoveUp,
     LogicalOrigin_MoveLeft,
     LogicalOrigin_MoveRight,

+    LogicalOrigin_Set,
+    LogicalOrigin_Restore,

 
     Colour_TextForeground,
     Colour_TextBackground,
 
     Colour_TextForeground,
     Colour_TextBackground,


@@ -841,50 +843,53 @@ 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("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 (2 copies should be identical)",
+    dc.DrawText("and 5 smileys from which 4 are partially clipped on the right",

                 10, 5 + dc.GetCharHeight());
                 10, 5 + dc.GetCharHeight());

+    dc.DrawText("The second copy should be identical but right part of it "
+                "should be offset by 10 pixels.",
+                10, 5 + 2*dc.GetCharHeight());

 
 

-    DrawRegionsHelper(dc, 10);
-    DrawRegionsHelper(dc, 350);
+    DrawRegionsHelper(dc, 10, TRUE);
+    DrawRegionsHelper(dc, 350, FALSE);

 }
 
 }
 

-void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x)
+void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime)

 {
 {

+    wxCoord y = 100;
+

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

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

 
 

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

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

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

 
 

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

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

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

 
 

-    // 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 );
+    wxRegion region(x + 110, y + 20, 100, 270);
+    if ( !firstTime )
+        region.Offset(10, 10);
+
+    dc.SetClippingRegion(region);

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

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

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

-        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 );
+        dc.DrawBitmap( m_smile_bmp, x + 150, y + 150, TRUE );
+        dc.DrawBitmap( m_smile_bmp, x + 130, y + 10,  TRUE );
+        dc.DrawBitmap( m_smile_bmp, x + 130, y + 280, TRUE );
+        dc.DrawBitmap( m_smile_bmp, x + 100, y + 70,  TRUE );
+        dc.DrawBitmap( m_smile_bmp, x + 200, y + 70,  TRUE );

     }
 }
 
     }
 }
 


@@ -1022,12 +1027,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuMapMode->Append( MapMode_Metric, "&METRIC map mode" );
 
     wxMenu *menuUserScale = new wxMenu;
     menuMapMode->Append( MapMode_Metric, "&METRIC map mode" );
 
     wxMenu *menuUserScale = new wxMenu;

-    menuUserScale->Append( UserScale_StretchHoriz, "Stretch horizontally\tCtrl-H" );
-    menuUserScale->Append( UserScale_ShrinkHoriz, "Shrink  horizontally\tCtrl-G" );
-    menuUserScale->Append( UserScale_StretchVertic, "Stretch vertically\tCtrl-V" );
-    menuUserScale->Append( UserScale_ShrinkVertic, "Shrink vertically\tCtrl-W" );
+    menuUserScale->Append( UserScale_StretchHoriz, "Stretch &horizontally\tCtrl-H" );
+    menuUserScale->Append( UserScale_ShrinkHoriz, "Shrin&k horizontally\tCtrl-G" );
+    menuUserScale->Append( UserScale_StretchVertic, "Stretch &vertically\tCtrl-V" );
+    menuUserScale->Append( UserScale_ShrinkVertic, "&Shrink vertically\tCtrl-W" );

     menuUserScale->AppendSeparator();
     menuUserScale->AppendSeparator();

-    menuUserScale->Append( UserScale_Restore, "Restore to normal\tCtrl-0" );
+    menuUserScale->Append( UserScale_Restore, "&Restore to normal\tCtrl-0" );

 
     wxMenu *menuAxis = new wxMenu;
     menuAxis->Append( AxisMirror_Horiz, "Mirror horizontally\tCtrl-M", "", TRUE );
 
     wxMenu *menuAxis = new wxMenu;
     menuAxis->Append( AxisMirror_Horiz, "Mirror horizontally\tCtrl-M", "", TRUE );


@@ -1038,21 +1043,24 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuLogical->Append( LogicalOrigin_MoveUp, "Move &up\tCtrl-U" );
     menuLogical->Append( LogicalOrigin_MoveLeft, "Move &right\tCtrl-L" );
     menuLogical->Append( LogicalOrigin_MoveRight, "Move &left\tCtrl-R" );
     menuLogical->Append( LogicalOrigin_MoveUp, "Move &up\tCtrl-U" );
     menuLogical->Append( LogicalOrigin_MoveLeft, "Move &right\tCtrl-L" );
     menuLogical->Append( LogicalOrigin_MoveRight, "Move &left\tCtrl-R" );

+    menuLogical->AppendSeparator();
+    menuLogical->Append( LogicalOrigin_Set, "Set to (&100, 100)\tShift-Ctrl-1" );
+    menuLogical->Append( LogicalOrigin_Restore, "&Restore to normal\tShift-Ctrl-0" );

 
     wxMenu *menuColour = new wxMenu;
 
     wxMenu *menuColour = new wxMenu;

-    menuColour->Append( Colour_TextForeground, "Text foreground..." );
-    menuColour->Append( Colour_TextBackground, "Text background..." );
-    menuColour->Append( Colour_Background, "Background colour..." );
-    menuColour->Append( Colour_BackgroundMode, "Opaque/transparent\tCtrl-B", "", TRUE );
-    menuColour->Append( Colour_TextureBackgound, "Draw textured background\tCtrl-T", "", TRUE);
+    menuColour->Append( Colour_TextForeground, "Text &foreground..." );
+    menuColour->Append( Colour_TextBackground, "Text &background..." );
+    menuColour->Append( Colour_Background, "Background &colour..." );
+    menuColour->Append( Colour_BackgroundMode, "&Opaque/transparent\tCtrl-B", "", TRUE );
+    menuColour->Append( Colour_TextureBackgound, "Draw textured back&ground\tCtrl-T", "", TRUE);

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, "&File");
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, "&File");

-    menuBar->Append(menuMapMode, "&MapMode");
-    menuBar->Append(menuUserScale, "&UserScale");
+    menuBar->Append(menuMapMode, "&Mode");
+    menuBar->Append(menuUserScale, "&Scale");

     menuBar->Append(menuAxis, "&Axis");
     menuBar->Append(menuAxis, "&Axis");

-    menuBar->Append(menuLogical, "&LogicalOrigin");
+    menuBar->Append(menuLogical, "&Origin");

     menuBar->Append(menuColour, "&Colours");
 
     // ... and attach this menu bar to the frame
     menuBar->Append(menuColour, "&Colours");
 
     // ... and attach this menu bar to the frame


@@ -1135,6 +1143,14 @@ void MyFrame::OnOption(wxCommandEvent& event)
         case LogicalOrigin_MoveRight:
             m_xLogicalOrigin -= 10;
             break;
         case LogicalOrigin_MoveRight:
             m_xLogicalOrigin -= 10;
             break;

+        case LogicalOrigin_Set:
+            m_xLogicalOrigin =
+            m_yLogicalOrigin = -100;
+            break;
+        case LogicalOrigin_Restore:
+            m_xLogicalOrigin =
+            m_yLogicalOrigin = 0;
+            break;

 
         case UserScale_StretchHoriz:
             m_xUserScale *= 1.10;
 
         case UserScale_StretchHoriz:
             m_xUserScale *= 1.10;


@@ -1194,10 +1210,10 @@ void MyFrame::OnOption(wxCommandEvent& event)
 
 void MyFrame::PrepareDC(wxDC& dc)
 {
 
 void MyFrame::PrepareDC(wxDC& dc)
 {

-    dc.SetMapMode( m_mapMode );
-    dc.SetUserScale( m_xUserScale, m_yUserScale );

     dc.SetLogicalOrigin( m_xLogicalOrigin, m_yLogicalOrigin );
     dc.SetAxisOrientation( !m_xAxisReversed, m_yAxisReversed );
     dc.SetLogicalOrigin( m_xLogicalOrigin, m_yLogicalOrigin );
     dc.SetAxisOrientation( !m_xAxisReversed, m_yAxisReversed );

+    dc.SetUserScale( m_xUserScale, m_yUserScale );
+    dc.SetMapMode( m_mapMode );

 }
 
 wxColour MyFrame::SelectColour()
 }
 
 wxColour MyFrame::SelectColour()