rebaked after adding threads/atomic.cpp

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

diff --git a/samples/minifram/minifram.h b/samples/minifram/minifram.h
index ea3c215c516f202e0e6ee837553c2761946b625d..c3c390168ddbbfdaac90ecb1a07cd37bb39c3d84 100644 (file)
--- a/samples/minifram/minifram.h
+++ b/samples/minifram/minifram.h
@@ -23,10 +23,10 @@ class MyApp: public wxApp
 class MyMiniFrame: public wxMiniFrame
 {
 public:
-    MyMiniFrame(wxFrame *parent, wxWindowID id = -1, const wxString& title = "wxToolBar Sample",
+    MyMiniFrame(wxFrame *parent, wxWindowID id = wxID_ANY, const wxString& title = _T("wxToolBar Sample"),
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize );
 
-    void OnCloseWindow(wxCloseEvent& event);
+    virtual bool Destroy();
     void OnReparent(wxCommandEvent& event);
     
 DECLARE_EVENT_TABLE()
@@ -36,11 +36,15 @@ DECLARE_EVENT_TABLE()
 class MyMainFrame: public wxFrame
 {
 public:
-    MyMainFrame(wxFrame *parent, wxWindowID id = -1, const wxString& title = "wxToolBar Sample",
+    MyMainFrame(wxFrame *parent, wxWindowID id = wxID_ANY, const wxString& title = _T("wxToolBar Sample"),
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize );
 
-    void OnCloseWindow(wxCloseEvent& event);
+    void OnExit(wxCommandEvent&);
     void OnReparent(wxCommandEvent& event);
+    void OnSetSize_150_150(wxCommandEvent &event);
+    void OnSetSize_200_200(wxCommandEvent &event);
+    void OnSetMaxSize_150_150(wxCommandEvent &event);
+    void OnSetMaxSize_300_300(wxCommandEvent &event);
     
 DECLARE_EVENT_TABLE()
 };