Add demonstration of flags to the render sample.

Allow to select the flags to pass to DrawXXX() functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index 6ebf987ae4a6fdcbe23f873ca898116dca8f3cf6..a68df35e474408187ad81ebf8c883bb783593251 100644 (file)
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -105,7 +105,19 @@ public:
     MyFrame();
     virtual ~MyFrame();
 
     MyFrame();
     virtual ~MyFrame();
 

+private:

     // event handlers (these functions should _not_ be virtual)
     // event handlers (these functions should _not_ be virtual)

+    void OnDrawDisabled(wxCommandEvent& event)
+        { OnToggleDrawFlag(event, wxCONTROL_DISABLED); }
+    void OnDrawFocused(wxCommandEvent& event)
+        { OnToggleDrawFlag(event, wxCONTROL_FOCUSED); }
+    void OnDrawPressed(wxCommandEvent& event)
+        { OnToggleDrawFlag(event, wxCONTROL_PRESSED); }
+    void OnDrawChecked(wxCommandEvent& event)
+        { OnToggleDrawFlag(event, wxCONTROL_CHECKED); }
+    void OnDrawHot(wxCommandEvent& event)
+        { OnToggleDrawFlag(event, wxCONTROL_CURRENT); }
+

 #if wxUSE_DYNLIB_CLASS
     void OnLoad(wxCommandEvent& event);
     void OnUnload(wxCommandEvent& event);
 #if wxUSE_DYNLIB_CLASS
     void OnLoad(wxCommandEvent& event);
     void OnUnload(wxCommandEvent& event);


@@ -113,8 +125,9 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

-private:
-    wxPanel *m_panel;
+    void OnToggleDrawFlag(wxCommandEvent& event, int flag);
+
+    class MyPanel *m_panel;

 
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()


@@ -124,8 +137,12 @@ private:
 class MyPanel : public wxPanel
 {
 public:
 class MyPanel : public wxPanel
 {
 public:

-    MyPanel(wxWindow *parent) : wxPanel(parent) { }
+    MyPanel(wxWindow *parent) : wxPanel(parent) { m_flags = 0; }

 
 

+    int GetFlags() const { return m_flags; }
+    void SetFlags(int flags) { m_flags = flags; }
+
+private:

     void OnPaint(wxPaintEvent&)
     {
         wxPaintDC dc(this);
     void OnPaint(wxPaintEvent&)
     {
         wxPaintDC dc(this);


@@ -138,27 +155,48 @@ public:
 
         const int lineHeight = dc.GetCharHeight();
         dc.DrawText("Demonstration of various wxRenderer functions:", x1, y);
 
         const int lineHeight = dc.GetCharHeight();
         dc.DrawText("Demonstration of various wxRenderer functions:", x1, y);

+        y += lineHeight;
+        wxString flagsString;
+        if ( m_flags & wxCONTROL_DISABLED )
+            flagsString += "wxCONTROL_DISABLED ";
+        if ( m_flags & wxCONTROL_FOCUSED )
+            flagsString += "wxCONTROL_FOCUSED ";
+        if ( m_flags & wxCONTROL_PRESSED )
+            flagsString += "wxCONTROL_PRESSED ";
+        if ( m_flags & wxCONTROL_CURRENT )
+            flagsString += "wxCONTROL_CURRENT ";
+        if ( m_flags & wxCONTROL_CHECKED )
+            flagsString += "wxCONTROL_CHECKED ";
+        if ( flagsString.empty() )
+            flagsString = "(none)";
+        dc.DrawText("Using flags: " + flagsString, x1, y);

         y += lineHeight*3;
 
         dc.DrawText("DrawHeaderButton() (overridden)", x1, y);
         const wxCoord heightHdr = renderer.GetHeaderButtonHeight(this);
         y += lineHeight*3;
 
         dc.DrawText("DrawHeaderButton() (overridden)", x1, y);
         const wxCoord heightHdr = renderer.GetHeaderButtonHeight(this);

-        renderer.DrawHeaderButton(this, dc, wxRect(x2, y, 100, heightHdr));
+        renderer.DrawHeaderButton(this, dc,
+                                  wxRect(x2, y, 100, heightHdr), m_flags);

         y += lineHeight + heightHdr;
 
         dc.DrawText("DrawCheckBox()", x1, y);
         const wxSize sizeCheck = renderer.GetCheckBoxSize(this);
         y += lineHeight + heightHdr;
 
         dc.DrawText("DrawCheckBox()", x1, y);
         const wxSize sizeCheck = renderer.GetCheckBoxSize(this);

-        renderer.DrawCheckBox(this, dc, wxRect(wxPoint(x2, y), sizeCheck));
+        renderer.DrawCheckBox(this, dc,
+                              wxRect(wxPoint(x2, y), sizeCheck), m_flags);

         y += lineHeight + sizeCheck.y;
 
         dc.DrawText("DrawRadioBitmap()", x1, y);
         y += lineHeight + sizeCheck.y;
 
         dc.DrawText("DrawRadioBitmap()", x1, y);

-        renderer.DrawRadioBitmap(this, dc, wxRect(wxPoint(x2, y), sizeCheck));
+        renderer.DrawRadioBitmap(this, dc,
+                                 wxRect(wxPoint(x2, y), sizeCheck), m_flags);

         y += lineHeight + sizeCheck.y;
 
         dc.DrawText("DrawTreeItemButton()", x1, y);
         y += lineHeight + sizeCheck.y;
 
         dc.DrawText("DrawTreeItemButton()", x1, y);

-        renderer.DrawTreeItemButton(this, dc, wxRect(x2, y, 20, 20));
+        renderer.DrawTreeItemButton(this, dc,
+                                    wxRect(x2, y, 20, 20), m_flags);

         y += lineHeight + 20;
     }
 
         y += lineHeight + 20;
     }
 

+    int m_flags;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -174,8 +212,14 @@ END_EVENT_TABLE()
 enum
 {
     // our menu items
 enum
 {
     // our menu items

+    Render_DrawDisabled = 100,
+    Render_DrawFocused,
+    Render_DrawPressed,
+    Render_DrawChecked,
+    Render_DrawHot,
+

 #if wxUSE_DYNLIB_CLASS
 #if wxUSE_DYNLIB_CLASS

-    Render_Load = 100,
+    Render_Load,

     Render_Unload,
 #endif // wxUSE_DYNLIB_CLASS
 
     Render_Unload,
 #endif // wxUSE_DYNLIB_CLASS
 


@@ -196,6 +240,12 @@ enum
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

+    EVT_MENU(Render_DrawDisabled, MyFrame::OnDrawDisabled)
+    EVT_MENU(Render_DrawFocused, MyFrame::OnDrawFocused)
+    EVT_MENU(Render_DrawPressed, MyFrame::OnDrawPressed)
+    EVT_MENU(Render_DrawChecked, MyFrame::OnDrawChecked)
+    EVT_MENU(Render_DrawHot, MyFrame::OnDrawHot)
+

 #if wxUSE_DYNLIB_CLASS
     EVT_MENU(Render_Load,  MyFrame::OnLoad)
     EVT_MENU(Render_Unload,MyFrame::OnUnload)
 #if wxUSE_DYNLIB_CLASS
     EVT_MENU(Render_Load,  MyFrame::OnLoad)
     EVT_MENU(Render_Unload,MyFrame::OnUnload)


@@ -250,15 +300,27 @@ MyFrame::MyFrame()
 #if wxUSE_MENUS
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 #if wxUSE_MENUS
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

+    menuFile->AppendCheckItem(Render_DrawDisabled,
+                              "Draw in &disabled state\tCtrl-D");
+    menuFile->AppendCheckItem(Render_DrawFocused,
+                              "Draw in &focused state\tCtrl-F");
+    menuFile->AppendCheckItem(Render_DrawPressed,
+                              "Draw in &pressed state\tCtrl-P");
+    menuFile->AppendCheckItem(Render_DrawChecked,
+                              "Draw in &checked state\tCtrl-C");
+    menuFile->AppendCheckItem(Render_DrawHot,
+                              "Draw in &hot state\tCtrl-H");
+    menuFile->AppendSeparator();

 #if wxUSE_DYNLIB_CLASS
     menuFile->Append(Render_Load, wxT("&Load renderer...\tCtrl-L"));
     menuFile->Append(Render_Unload, wxT("&Unload renderer\tCtrl-U"));
 #if wxUSE_DYNLIB_CLASS
     menuFile->Append(Render_Load, wxT("&Load renderer...\tCtrl-L"));
     menuFile->Append(Render_Unload, wxT("&Unload renderer\tCtrl-U"));

+    menuFile->AppendSeparator();

 #endif // wxUSE_DYNLIB_CLASS
 #endif // wxUSE_DYNLIB_CLASS

-    menuFile->Append(Render_Quit, wxT("E&xit\tCtrl-Q"), wxT("Quit this program"));
+    menuFile->Append(Render_Quit);

 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(Render_About, wxT("&About...\tF1"), wxT("Show about dialog"));
+    helpMenu->Append(Render_About);

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();


@@ -288,6 +350,18 @@ MyFrame::~MyFrame()
 
 // event handlers
 
 
 // event handlers
 

+void MyFrame::OnToggleDrawFlag(wxCommandEvent& event, int flag)
+{
+    int flags = m_panel->GetFlags();
+    if ( event.IsChecked() )
+        flags |= flag;
+    else
+        flags &= ~flag;
+
+    m_panel->SetFlags(flags);
+    m_panel->Refresh();
+}
+

 #if wxUSE_DYNLIB_CLASS
 
 void MyFrame::OnLoad(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_DYNLIB_CLASS
 
 void MyFrame::OnLoad(wxCommandEvent& WXUNUSED(event))