don't use WPARAM in the header (build fix after r59336)

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

diff --git a/samples/xrc/custclas.h b/samples/xrc/custclas.h
index e34efa01b7e9f83edfc00f6a12c8a36b95bdffab..aebc043ee040c1ff188337bc1ab0c500c6902919 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
 //----------------------------------------------------------------------------------------


@@ -35,58 +27,58 @@
 //! A custom listctrl that resizes itself and pops up a context-sensitive menu.
 class MyResizableListCtrl : public wxListCtrl
 {
 //! A custom listctrl that resizes itself and pops up a context-sensitive menu.
 class MyResizableListCtrl : public wxListCtrl
 {

-    // Very helpful wxWindows macro required for wxWindows-RTTI tracing: By using this
-    // you will see "Leaked one object of type myResizeableListCtrl" in the debug log, 
+    // 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,

     // 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 wxWindows constructor.
+        These parameters are the same as a wxWidgets constructor.

         \param parent The parent window.
         \param id The id of the progress_listbox. Will usually be -1 unless multiple
             of them on the same dialog.
         \param pos The pixel position of the listctrl on its parent window
         \param size The pixel size of the listctrl
         \param parent The parent window.
         \param id The id of the progress_listbox. Will usually be -1 unless multiple
             of them on the same dialog.
         \param pos The pixel position of the listctrl on its parent window
         \param size The pixel size of the listctrl

-        \param style Style of the listbox. See wxWindows wxListBox docs for details.
-        \param validator Window validator. See wxWindows docs for details.
+        \param style Style of the listbox. See wxWidgets wxListBox docs for details.
+        \param validator Window validator. See wxWidgets docs for details.

         \param name Windows name (rarely used).
         \param exclusion_column_caption The label of header of listctrl's exclusion
             column.
      */
     MyResizableListCtrl( wxWindow *parent = NULL,
         \param name Windows name (rarely used).
         \param exclusion_column_caption The label of header of listctrl's exclusion
             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.
 
     // Destuctor.

-    ~MyResizableListCtrl();    
+    ~MyResizableListCtrl(){};

 
 

-protected:       
+protected:

 
 

-    // A custom function for a context sensitive menu. 
-    void ContextSensitiveMenu( wxMouseEvent& event );       
-    
-    // This is a wxWindows function that we are going to override with our own behaviour.
+    // 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 );
     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:
 
 private:
 

-    // wxWindows macro, required to be able to use Event tables in the .cpp file.
+    // wxWidgets macro, required to be able to use Event tables in the .cpp file.

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-    
+

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