Fix wrong configure test for abi::__forced_unwind in previous commit.

[wxWidgets.git] / samples / xrc / custclas.h

diff --git a/samples/xrc/custclas.h b/samples/xrc/custclas.h
index 69b01d438773e6c56af34825e8b664220a70f16e..1072f6b9febcc793506b2e63a90dca8adccfd680 100644 (file)
--- a/samples/xrc/custclas.h
+++ b/samples/xrc/custclas.h
@@ -14,14 +14,6 @@
 #ifndef _CUSTCLAS_H_
 #define _CUSTCLAS_H_
 
 #ifndef _CUSTCLAS_H_
 #define _CUSTCLAS_H_
 

-//----------------------------------------------------------------------------------------
-// GCC interface
-//----------------------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "custclas.h"
-#endif
-

 //----------------------------------------------------------------------------------------
 // Headers
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
 // Headers
 //----------------------------------------------------------------------------------------


@@ -36,16 +28,16 @@
 class MyResizableListCtrl : public wxListCtrl
 {
     // Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this
 class MyResizableListCtrl : public wxListCtrl
 {
     // Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this

-    // you will see "Leaked one object of type myResizeableListCtrl" in the debug log,
+    // you will see "Leaked one object of type myResizableListCtrl" in the debug log,

     // along with which line you if was created, but you forget to free the memory.
     // along with which line you if was created, but you forget to free the memory.

-    // NOTE: Using this REQUIRES a default constructor: that means either: giving a 
+    // NOTE: Using this REQUIRES a default constructor: that means either: giving a

     // default value for all parameters in your constructor, or else having a dummy
     // MyResizableListCtrl(){} constructor in addition to your regular one.
     DECLARE_DYNAMIC_CLASS( MyResizableListCtrl )
 
 public:
 
     // default value for all parameters in your constructor, or else having a dummy
     // MyResizableListCtrl(){} constructor in addition to your regular one.
     DECLARE_DYNAMIC_CLASS( MyResizableListCtrl )
 
 public:
 

-    // Constructor.        
+    // Constructor.

     /*
         These parameters are the same as a wxWidgets constructor.
         \param parent The parent window.
     /*
         These parameters are the same as a wxWidgets constructor.
         \param parent The parent window.


@@ -60,33 +52,33 @@ public:
             column.
      */
     MyResizableListCtrl( wxWindow *parent = NULL,
             column.
      */
     MyResizableListCtrl( wxWindow *parent = NULL,

-                         wxWindowID id = -1,
+                         wxWindowID id = wxID_ANY,

                          const wxPoint &pos = wxDefaultPosition,
                          const wxSize &size = wxDefaultSize,
                          long style = wxLC_REPORT,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString &name = wxT("myResizableListCtrl")
                          const wxPoint &pos = wxDefaultPosition,
                          const wxSize &size = wxDefaultSize,
                          long style = wxLC_REPORT,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString &name = wxT("myResizableListCtrl")

-                       );                   
+                       );

 
 

-    // Destuctor.
-    ~MyResizableListCtrl();    
+    // Destructor.
+    ~MyResizableListCtrl(){};

 
 

-protected:       
+protected:
+
+    // A custom function for a context sensitive menu.
+    void ContextSensitiveMenu( wxMouseEvent& event );

 
 

-    // A custom function for a context sensitive menu. 
-    void ContextSensitiveMenu( wxMouseEvent& event );       
-    

     // This is a wxWidgets function that we are going to override with our own behaviour.
     void OnSize( wxSizeEvent &event );
     // This is a wxWidgets function that we are going to override with our own behaviour.
     void OnSize( wxSizeEvent &event );

-    
+

     // A custom function. What is called in the constructor, and in an OnSize()
     // A custom function. What is called in the constructor, and in an OnSize()

-    void SetColumnWidths();  
-    
+    void SetColumnWidths();
+

 private:
 
     // wxWidgets macro, required to be able to use Event tables in the .cpp file.
     DECLARE_EVENT_TABLE()
 private:
 
     // wxWidgets macro, required to be able to use Event tables in the .cpp file.
     DECLARE_EVENT_TABLE()

-    
+

 };
 
 //----------------------------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------------------------