#include "wx/colordlg.h"
#include "wx/image.h"
+#include "wx/artprov.h"
// ----------------------------------------------------------------------------
// ressources
// ----------------------------------------------------------------------------
// 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
Show_Default,
Show_Text,
Show_Lines,
+ Show_Brushes,
Show_Polygons,
Show_Mask,
Show_Ops,
void Show(ScreenToShow show) { m_show = show; Refresh(); }
protected:
- void DrawTestPoly( int x, int y, wxDC &dc ,int transparent );
void DrawTestLines( int x, int y, int width, wxDC &dc );
+ void DrawTestPoly(wxDC& dc);
+ void DrawTestBrushes(wxDC& dc);
void DrawText(wxDC& dc);
void DrawImages(wxDC& dc);
void DrawWithLogicalOps(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;
File_ShowDefault = MenuShow_First,
File_ShowText,
File_ShowLines,
+ File_ShowBrushes,
File_ShowPolygons,
File_ShowMask,
File_ShowOps,
LogicalOrigin_MoveUp,
LogicalOrigin_MoveLeft,
LogicalOrigin_MoveRight,
+ LogicalOrigin_Set,
+ LogicalOrigin_Restore,
Colour_TextForeground,
Colour_TextBackground,
wxMask *mask = new wxMask(*gs_bmpMask, *wxBLACK);
gs_bmpWithMask->SetMask(mask);
- {
- wxStopWatch sw;
- wxMask m;
- for ( int i = 0; i < 1000; i++ )
- {
- m.Create(*gs_bmpWithColMask, *wxWHITE);
- }
- wxLogMessage("Total time: %ldms", sw.Time());
- }
-
mask = new wxMask(*gs_bmpWithColMask, *wxWHITE);
gs_bmpWithColMask->SetMask(mask);
m_owner = parent;
m_show = Show_Default;
m_smile_bmp = wxBitmap(smile_xpm);
- m_std_icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
+ m_std_icon = wxArtProvider::GetIcon(wxART_INFORMATION);
}
-// Draw a polygon and an overlapping rectangle
-// If transparent is 1, the fill pattern is made transparent.
-// If transparent is 2, the fill pattern is made transparent but inversed
-// If is transparent is 0 the text for and background color will be used to represent/map
-// the colors of the monochrome bitmap pixels to the fillpattern
-//
-// I abused the the menu items for setting so called back and fore ground color
-// just to show how the those colors do influence the fillpatterns just play
-// with those, and with the code variations are endless using other logical
-// functions.
-
-void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent )
+void MyCanvas::DrawTestBrushes(wxDC& dc)
{
-// wxBrush* brush4 = new wxBrush(*gs_bmp4);
- wxBrush* brush4 = new wxBrush(*wxBLACK,wxFDIAGONAL_HATCH);
- wxBrush* brush4_mono = new wxBrush(*gs_bmp4_mono);
- wxBrush* brush36 = new wxBrush(*gs_bmp36);
-
- wxPoint todraw[5];
- todraw[0].x=(long)x+100;
- todraw[0].y=(long)y+100;
- todraw[1].x=(long)x+300;
- todraw[1].y=(long)y+100;
- todraw[2].x=(long)x+300;
- todraw[2].y=(long)y+300;
- todraw[3].x=(long)x+150;
- todraw[3].y=(long)y+350;
- todraw[4].x=(long)x+100;
- todraw[4].y=(long)y+300;
-
- wxPoint todraw2[5];
- todraw2[0].x=100;
- todraw2[0].y=100;
- todraw2[1].x=300;
- todraw2[1].y=100;
- todraw2[2].x=300;
- todraw2[2].y=300;
- todraw2[3].x=150;
- todraw2[3].y=350;
- todraw2[4].x=100;
- todraw2[4].y=300;
-
- switch (transparent)
- {
- case 0:
- {
- dc.SetLogicalFunction(wxCOPY);
-
- dc.SetPen( wxPen( wxT("black"), 4, wxSOLID) );
- dc.SetBrush( *brush4 );
- dc.DrawPolygon(5,todraw,0,0,wxWINDING_RULE);
-
- dc.SetPen( wxPen( wxT("red"), 4, wxSOLID) );
- dc.SetBrush( *brush36 );
- dc.SetTextForeground(*wxCYAN);
- dc.SetTextBackground(m_owner->m_colourBackground);
- dc.DrawRectangle( x+10, y+10, 200, 200 );
-
- dc.SetPen( wxPen( wxT("green"), 4, wxSOLID) );
- dc.SetBrush( *brush4_mono );
- dc.SetTextForeground(*wxCYAN);
- dc.SetTextBackground(m_owner->m_colourBackground);
- dc.DrawRectangle( x+50, y+50, 200, 200 );
-
- dc.DrawCircle( x+400, y+50, 130 );
-
- dc.SetBrush(wxNullBrush);
- dc.SetPen(wxNullPen);
- break;
- }
- case 1: //now with transparent fillpatterns
- {
-
- wxBitmap* bmpBlit = new wxBitmap(600,400);
- wxMemoryDC* memDC= new wxMemoryDC();
- // wxBrush _clearbrush(*wxGREEN,wxSOLID);
- wxBrush _clearbrush(*wxBLACK,wxSOLID);
- memDC->SelectObject(*bmpBlit);
- memDC->BeginDrawing();
- memDC->SetBackground(_clearbrush);
- memDC->Clear();
- memDC->SetBackground(wxNullBrush);
-
- memDC->SetPen( wxPen( wxT("black"), 4, wxSOLID) );
- memDC->SetBrush( wxNullBrush);
- memDC->SetBrush( *brush4 );
- memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black)
- memDC->SetTextBackground(*wxWHITE); // 1s --> 0xFFFFFF (white)
- memDC->SetLogicalFunction(wxAND_INVERT);
-
- // BLACK OUT the opaque pixels and leave the rest as is
- memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE);
-
- // Set background and foreground colors for fill pattern
- //the previous blacked out pixels are now merged with the layer color
- //while the non blacked out pixels stay as they are.
- memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black)
-
- //now define what will be the color of the fillpattern parts that are not transparent
- // memDC->SetTextBackground(*wxBLUE);
- memDC->SetTextBackground(m_owner->m_colourForeground);
- memDC->SetLogicalFunction(wxOR);
-
-
- //don't understand how but the outline is also depending on logicalfunction
- memDC->SetPen( wxPen( wxT("red"), 4, wxSOLID) );
- memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE);
-
- memDC->SetLogicalFunction(wxCOPY);
-
- memDC->SetPen( wxPen( wxT("black"), 4, wxSOLID) );
- memDC->SetBrush( wxNullBrush);
- memDC->SetBrush( *brush36 );
- memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black)
- memDC->SetTextBackground(*wxWHITE); // 1s --> 0xFFFFFF (white)
- memDC->SetLogicalFunction(wxAND_INVERT);
-
- memDC->DrawRectangle( 10, 10, 200, 200 );
-
- // Set background and foreground colors for fill pattern
- //the previous blacked out pixels are now merged with the layer color
- //while the non blacked out pixels stay as they are.
- memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black)
- //now define what will be the color of the fillpattern parts that are not transparent
- // memDC->SetTextBackground(*wxRED);
- memDC->SetTextBackground(m_owner->m_colourBackground);
- memDC->SetLogicalFunction(wxOR);
-
- //don't understand how but the outline is also depending on logicalfunction
- memDC->SetPen( wxPen( wxT("yellow"), 4, wxSOLID) );
- memDC->DrawRectangle( 10, 10, 200, 200 );
-
- memDC->SetBrush(wxNullBrush);
- memDC->SetPen(wxNullPen);
-
- memDC->EndDrawing();
- dc.Blit(x,y,600,400,memDC,0,0,wxCOPY);
- delete bmpBlit;
- delete memDC;
- break;
- }
- case 2: //now with transparent inversed fillpatterns
- {
- wxBitmap* bmpBlit = new wxBitmap(600,400);
- wxMemoryDC* memDC= new wxMemoryDC();
- wxBrush _clearbrush(*wxWHITE,wxSOLID);
- memDC->SelectObject(*bmpBlit);
- memDC->BeginDrawing();
- memDC->SetBackground(_clearbrush);
- memDC->Clear();
- memDC->SetBackground(wxNullBrush);
-
- memDC->SetPen( wxPen( wxT("black"), 4, wxSOLID) );
- memDC->SetBrush( *brush4 );
- memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black)
- memDC->SetTextForeground(*wxWHITE); // 1s --> 0xFFFFFF (white)
- memDC->SetLogicalFunction(wxAND_INVERT);
-
- // BLACK OUT the opaque pixels and leave the rest as is
- memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE);
-
- // Set background and foreground colors for fill pattern
- //the previous blacked out pixels are now merged with the layer color
- //while the non blacked out pixels stay as they are.
- memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black)
-
- //now define what will be the color of the fillpattern parts that are not transparent
- memDC->SetTextForeground(m_owner->m_colourForeground);
- memDC->SetLogicalFunction(wxOR);
-
-
- //don't understand how but the outline is also depending on logicalfunction
- memDC->SetPen( wxPen( wxT("red"), 4, wxSOLID) );
- memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE);
-
- memDC->SetLogicalFunction(wxCOPY);
-
- memDC->SetPen( wxPen( wxT("black"), 4, wxSOLID) );
- memDC->SetBrush( *brush36 );
- memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black)
- memDC->SetTextForeground(*wxWHITE); // 1s --> 0xFFFFFF (white)
- memDC->SetLogicalFunction(wxAND_INVERT);
-
- memDC->DrawRectangle( 10,10, 200, 200 );
-
- // Set background and foreground colors for fill pattern
- //the previous blacked out pixels are now merged with the layer color
- //while the non blacked out pixels stay as they are.
- memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black)
- //now define what will be the color of the fillpattern parts that are not transparent
- memDC->SetTextForeground(m_owner->m_colourBackground);
- memDC->SetLogicalFunction(wxOR);
-
- //don't understand how but the outline is also depending on logicalfunction
- memDC->SetPen( wxPen( wxT("yellow"), 4, wxSOLID) );
- memDC->DrawRectangle( 10, 10, 200, 200 );
-
- memDC->SetBrush(wxNullBrush);
- memDC->SetPen(wxNullPen);
- dc.Blit(x,y,600,400,memDC,0,0,wxCOPY);
- delete bmpBlit;
- delete memDC;
- }
- }
+ static const wxCoord WIDTH = 200;
+ static const wxCoord HEIGHT = 80;
+
+ wxCoord x = 10,
+ y = 10;
+
+ dc.SetBrush(wxBrush(*wxGREEN, wxSOLID));
+ dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+ dc.DrawText("Solid green", x + 10, y + 10);
+
+ y += HEIGHT;
+ dc.SetBrush(wxBrush(*wxRED, wxCROSSDIAG_HATCH));
+ dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+ dc.DrawText("Hatched red", x + 10, y + 10);
+
+ y += HEIGHT;
+ dc.SetBrush(wxBrush(*gs_bmpMask));
+ dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+ dc.DrawText("Stipple mono", x + 10, y + 10);
+
+ y += HEIGHT;
+ dc.SetBrush(wxBrush(*gs_bmpNoMask));
+ dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+ dc.DrawText("Stipple colour", x + 10, y + 10);
+}
- delete brush4;
- delete brush4_mono;
- delete brush36;
+void MyCanvas::DrawTestPoly(wxDC& dc)
+{
+ wxBrush brushHatch(*wxRED, wxFDIAGONAL_HATCH);
+ dc.SetBrush(brushHatch);
+
+ wxPoint star[5];
+ star[0] = wxPoint(100, 60);
+ star[1] = wxPoint(60, 150);
+ star[2] = wxPoint(160, 100);
+ star[3] = wxPoint(40, 100);
+ star[4] = wxPoint(140, 150);
+
+ dc.DrawText("You should see two (irregular) stars below, the left one "
+ "hatched", 10, 10);
+ dc.DrawText("except for the central region and the right "
+ "one entirely hatched", 10, 30);
+
+ dc.DrawPolygon(WXSIZEOF(star), star);
+ dc.DrawPolygon(WXSIZEOF(star), star, 160, 0, wxWINDING_RULE);
}
void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
{
// mark the origin
dc.DrawCircle(0, 0, 10);
-#if !(defined __WXGTK__) && !(defined __WXMOTIF__) && !(defined __WXMGL__)
- // not implemented in wxGTK or wxMOTIF :-(
- dc.FloodFill(0, 0, wxColour(255, 0, 0));
-#endif //
+
+ //flood fill using brush, starting at 1,1 and replacing whatever colour we find there
+ dc.SetBrush(wxBrush(wxColour(128,128,0), wxSOLID));
+ wxColour tmpColour ;
+ dc.GetPixel(1,1, &tmpColour);
+ dc.FloodFill(1,1, tmpColour, wxFLOOD_SURFACE);
dc.DrawCheckMark(5, 80, 15, 15);
dc.DrawCheckMark(25, 80, 30, 30);
memdc.SelectObject( wxNullBitmap );
dc.DrawBitmap( bitmap, 10, 170 );
- wxImage image( bitmap );
+ wxImage image = bitmap.ConvertToImage();
image.Rescale( 60,210 );
- bitmap = image.ConvertToBitmap();
+ bitmap = wxBitmap(image);
dc.DrawBitmap( bitmap, 50, 170 );
// test the rectangle outline drawing - there should be one pixel between
{
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());
+ 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.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.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.DrawRectangle( x,50,310,310 );
+ dc.DrawRectangle( x, y, 310, 310 );
+
+ dc.DestroyClippingRegion();
+
+ wxRegion region(x + 110, y + 20, 100, 270);
+ if ( !firstTime )
+ region.Offset(10, 10);
- // 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.SetClippingRegion(region);
dc.SetBrush( *wxGREY_BRUSH );
- dc.DrawRectangle( x,50,310,310 );
+ dc.DrawRectangle( x, y, 310, 310 );
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 );
}
}
DrawTestLines( 0, 760, 6, dc );
break;
+ case Show_Brushes:
+ DrawTestBrushes(dc);
+ break;
+
case Show_Polygons:
- DrawTestPoly( 0, 100, dc, 0 );
-/*
- DrawTestPoly( 33, 500, dc, 1 );
- DrawTestPoly( 43, 1000, dc, 2 );
-*/
+ DrawTestPoly(dc);
break;
case Show_Mask:
case Show_Ops:
DrawWithLogicalOps(dc);
break;
-
- default:
- {
- dc.SetPen( *wxBLACK_PEN );
- dc.DrawLine( 0,0,100,100 );
- }
-
}
}
menuFile->Append(File_ShowDefault, "&Default screen\tF1");
menuFile->Append(File_ShowText, "&Text screen\tF2");
menuFile->Append(File_ShowLines, "&Lines screen\tF3");
- menuFile->Append(File_ShowPolygons, "&Polygons screen\tF4");
- menuFile->Append(File_ShowMask, "wx&Mask screen\tF5");
- menuFile->Append(File_ShowOps, "&ROP screen\tF6");
- menuFile->Append(File_ShowRegions, "Re&gions screen\tF7");
- menuFile->Append(File_ShowCircles, "&Circles screen\tF8");
+ menuFile->Append(File_ShowBrushes, "&Brushes screen\tF4");
+ menuFile->Append(File_ShowPolygons, "&Polygons screen\tF5");
+ menuFile->Append(File_ShowMask, "&Mask screen\tF6");
+ menuFile->Append(File_ShowOps, "&ROP screen\tF7");
+ menuFile->Append(File_ShowRegions, "Re&gions screen\tF8");
+ menuFile->Append(File_ShowCircles, "&Circles screen\tF9");
menuFile->AppendSeparator();
menuFile->Append(File_About, "&About...\tCtrl-A", "Show about dialog");
menuFile->AppendSeparator();
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->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 );
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;
- 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");
- menuBar->Append(menuMapMode, "&MapMode");
- menuBar->Append(menuUserScale, "&UserScale");
+ menuBar->Append(menuMapMode, "&Mode");
+ menuBar->Append(menuUserScale, "&Scale");
menuBar->Append(menuAxis, "&Axis");
- menuBar->Append(menuLogical, "&LogicalOrigin");
+ menuBar->Append(menuLogical, "&Origin");
menuBar->Append(menuColour, "&Colours");
// ... and attach this menu bar to the frame
wxString msg;
msg.Printf( wxT("This is the about dialog of the drawing sample.\n")
wxT("This sample tests various primitive drawing functions\n")
- wxT("without any tests to prevent flicker.\n")
+ wxT("(without any attempts to prevent flicker).\n")
wxT("Copyright (c) Robert Roebling 1999")
);
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;
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.SetUserScale( m_xUserScale, m_yUserScale );
+ dc.SetMapMode( m_mapMode );
}
wxColour MyFrame::SelectColour()
projects / wxWidgets.git / blobdiff