Complete rewrite of DoDrawBitmap() and DoBlit().

[wxWidgets.git] / samples / dialogs / dialogs.h

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 0dd71405a5b2c76375706e3551fda0dc8a7a1a25..19605e1a2c7189b57491c85bea6a28251e4e244e 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -98,15 +98,31 @@ of MSW, MAC and OS2
     #define USE_SETTINGS_DIALOG 0
 #endif
 
     #define USE_SETTINGS_DIALOG 0
 #endif
 

+#if wxUSE_LOG
+
+// Custom application traits class which we use to override the default log
+// target creation
+class MyAppTraits : public wxGUIAppTraits
+{
+public:
+    virtual wxLog *CreateLogTarget();
+};
+
+#endif // wxUSE_LOG

 
 // Define a new application type
 class MyApp: public wxApp
 {
 public:
 
 // Define a new application type
 class MyApp: public wxApp
 {
 public:

-    bool OnInit();
+    virtual bool OnInit();

 
     wxFont       m_canvasFont;
     wxColour     m_canvasTextColour;
 
     wxFont       m_canvasFont;
     wxColour     m_canvasTextColour;

+
+protected:
+#if wxUSE_LOG
+    virtual wxAppTraits *CreateTraits() { return new MyAppTraits; }
+#endif // wxUSE_LOG

 };
 
 #if USE_MODAL_PRESENTATION
 };
 
 #if USE_MODAL_PRESENTATION


@@ -195,10 +211,10 @@ private:
     struct BtnInfo
     {
         int flag;
     struct BtnInfo
     {
         int flag;

-        wxString name;
+        const char *name;

     };
 
     };
 

-    static BtnInfo ms_btnInfo[Btn_Max];
+    static const BtnInfo ms_btnInfo[Btn_Max];

 
     wxTextCtrl *m_textMsg,
                *m_textExtMsg;
 
     wxTextCtrl *m_textMsg,
                *m_textExtMsg;


@@ -294,6 +310,8 @@ public:
     void MultiChoice(wxCommandEvent& event);
 #endif // wxUSE_CHOICEDLG
 
     void MultiChoice(wxCommandEvent& event);
 #endif // wxUSE_CHOICEDLG
 

+    void Rearrange(wxCommandEvent& event);
+

 #if wxUSE_TEXTDLG
     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);
 #if wxUSE_TEXTDLG
     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);


@@ -432,6 +450,7 @@ enum
     DIALOGS_MESSAGE_BOX_WXINFO,
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,
     DIALOGS_MESSAGE_BOX_WXINFO,
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,

+    DIALOGS_REARRANGE,

     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,
     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,