Found the RIGHT place to make the __unix__ fix.

[wxWidgets.git] / include / wx / msw / control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 3ab4b848291482dd461148b34201d5390080610c..7516125e92f04c012f95df61c3c349abfdd96e6f 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -5,12 +5,12 @@
 // 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 licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __CONTROLH__
-#define __CONTROLH__
+#ifndef _WX_CONTROL_H_
+#define _WX_CONTROL_H_
 
 #ifdef __GNUG__
 #pragma interface "control.h"
@@ -28,10 +28,10 @@ public:
    wxControl(void);
    ~wxControl(void);
 
-   virtual void Command(wxCommandEvent& WXUNUSED(event)) = 0;        // Simulates an event
+   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};        // Simulates an event
    virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
                                                                  // appropriate event handlers
-   virtual void SetClientSize(const int width, const int height);
+   virtual void SetClientSize(int width, int height);
    virtual void SetLabel(const wxString& label);
    virtual wxString GetLabel(void) const ;
 
@@ -46,15 +46,15 @@ public:
 #endif
 
    // Places item in centre of panel - so can't be used BEFORE panel->Fit()
-   void Centre(const int direction = wxHORIZONTAL);
+   void Centre(int direction = wxHORIZONTAL);
    inline void Callback(const wxFunction function);           // Adds callback
 
    // MSW-specific
    
    // Window procedure
    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-   virtual void MSWOnMouseMove(const int x, const int y, const WXUINT flags);
-   virtual bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+   virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
+   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
 
    void OnEraseBackground(wxEraseEvent& event);
 
@@ -83,4 +83,4 @@ inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif
 
 #endif
-    // __CONTROLH__
+    // _WX_CONTROL_H_