allow adjusting the combo button size (patch 1489452)

[wxWidgets.git] / samples / png / pngdemo.h

diff --git a/samples/png/pngdemo.h b/samples/png/pngdemo.h
index e4be03ed4b648e7bc9306eea22e748907aa9c605..4376d0477dc325a81037b7506b4df68d17f69d1b 100644 (file)
--- a/samples/png/pngdemo.h
+++ b/samples/png/pngdemo.h
@@ -5,21 +5,17 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/wx.h"
 
 // Define a new application
 class MyApp: public wxApp
 {
   public:
 #include "wx/wx.h"
 
 // Define a new application
 class MyApp: public wxApp
 {
   public:

-    MyApp(void) ;
+    MyApp(void){};

     bool OnInit(void);
 };
 
     bool OnInit(void);
 };
 


@@ -31,10 +27,11 @@ class MyFrame: public wxFrame
   public:
     MyCanvas *canvas;
     MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size);
   public:
     MyCanvas *canvas;
     MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size);

+    virtual ~MyFrame();

 
 

-    bool OnClose(void);

     void OnActivate(bool) {}
     void OnLoadFile(wxCommandEvent& event);
     void OnActivate(bool) {}
     void OnLoadFile(wxCommandEvent& event);

+    void OnSaveFile(wxCommandEvent& event);

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 DECLARE_EVENT_TABLE()
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 DECLARE_EVENT_TABLE()


@@ -45,7 +42,7 @@ class MyCanvas: public wxScrolledWindow
 {
   public:
     MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
 {
   public:
     MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);

-    ~MyCanvas(void) ;
+    ~MyCanvas(void){};

 
     void OnPaint(wxPaintEvent& event);
 DECLARE_EVENT_TABLE()
 
     void OnPaint(wxPaintEvent& event);
 DECLARE_EVENT_TABLE()


@@ -54,4 +51,5 @@ DECLARE_EVENT_TABLE()
 #define PNGDEMO_QUIT       100
 #define PNGDEMO_ABOUT      101
 #define PNGDEMO_LOAD_FILE  102
 #define PNGDEMO_QUIT       100
 #define PNGDEMO_ABOUT      101
 #define PNGDEMO_LOAD_FILE  102

+#define PNGDEMO_SAVE_FILE  103