added option for drawing a textured background to test masks on a

non-solid background.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-02-10 04:56:16 +00:00
parent 2433bb2ed1
commit 1edc9f4576

View File

@@ -113,6 +113,7 @@ public:
void PrepareDC(wxDC& dc); void PrepareDC(wxDC& dc);
int m_backgroundMode; int m_backgroundMode;
int m_textureBackground;
int m_mapMode; int m_mapMode;
double m_xUserScale; double m_xUserScale;
double m_yUserScale; double m_yUserScale;
@@ -203,8 +204,9 @@ enum
Colour_TextBackground, Colour_TextBackground,
Colour_Background, Colour_Background,
Colour_BackgroundMode, Colour_BackgroundMode,
Colour_TextureBackgound,
MenuOption_Last = Colour_BackgroundMode MenuOption_Last = Colour_TextureBackgound
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -816,6 +818,20 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
if ( m_owner->m_colourBackground.Ok() ) if ( m_owner->m_colourBackground.Ok() )
dc.SetTextBackground( m_owner->m_colourBackground ); dc.SetTextBackground( m_owner->m_colourBackground );
if ( m_owner->m_textureBackground) {
if ( m_owner->m_backgroundBrush.Ok() )
dc.SetBackground( m_owner->m_backgroundBrush );
else {
wxBrush b(wxColour(0,128,0), wxSOLID);
dc.SetBackground(b);
}
dc.Clear();
dc.SetPen(*wxMEDIUM_GREY_PEN);
for (int i=0; i<200; i++)
dc.DrawLine(0, i*10, i*10, 0);
}
switch ( m_show ) switch ( m_show )
{ {
case Show_Default: case Show_Default:
@@ -928,6 +944,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
menuColour->Append( Colour_TextBackground, "Text background..." ); menuColour->Append( Colour_TextBackground, "Text background..." );
menuColour->Append( Colour_Background, "Background colour..." ); menuColour->Append( Colour_Background, "Background colour..." );
menuColour->Append( Colour_BackgroundMode, "Opaque/transparent\tCtrl-B", "", TRUE ); menuColour->Append( Colour_BackgroundMode, "Opaque/transparent\tCtrl-B", "", TRUE );
menuColour->Append( Colour_TextureBackgound, "Draw textured background\tCtrl-T", "", TRUE);
// now append the freshly created menu to the menu bar... // now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar; wxMenuBar *menuBar = new wxMenuBar;
@@ -955,6 +972,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
m_backgroundMode = wxSOLID; m_backgroundMode = wxSOLID;
m_colourForeground = *wxRED; m_colourForeground = *wxRED;
m_colourBackground = *wxBLUE; m_colourBackground = *wxBLUE;
m_textureBackground = FALSE;
m_canvas = new MyCanvas( this ); m_canvas = new MyCanvas( this );
m_canvas->SetScrollbars( 10, 10, 100, 240 ); m_canvas->SetScrollbars( 10, 10, 100, 240 );
@@ -1060,6 +1078,10 @@ void MyFrame::OnOption(wxCommandEvent& event)
: wxSOLID; : wxSOLID;
break; break;
case Colour_TextureBackgound:
m_textureBackground = ! m_textureBackground;
break;
default: default:
// skip Refresh() // skip Refresh()
return; return;