X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/341c92a8b4c813cbfb606687937dcdf5d8c3c2fe..1318fabeb4df18bf0c6f045f5598a4e16ea5fd85:/include/wx/msw/control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index eb9b852be1..446d49f333 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
@@ -29,15 +29,23 @@ public:
    virtual ~wxControl();
 
    // Simulates an event
-   virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
+   bool Command(wxCommandEvent& event) { return ProcessCommand(event); }
+
    // Calls the callback and appropriate event handlers
-   virtual void ProcessCommand(wxCommandEvent& event); 
+   bool ProcessCommand(wxCommandEvent& event);
 
-   virtual void SetClientSize(int width, int height);
-   virtual void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
+   // MSW-specific
+#ifdef __WIN95__
+   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+#endif // Win95
 
-   virtual void SetLabel(const wxString& label);
-   virtual wxString GetLabel() const;
+   // For ownerdraw items
+   virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
+   virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
+
+   wxList& GetSubcontrols() { return m_subControls; }
+
+   void OnEraseBackground(wxEraseEvent& event);
 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
@@ -47,51 +55,32 @@ public:
    inline virtual void SetButtonFont(const wxFont& font);
    inline wxFont& GetLabelFont() const;
    inline wxFont& GetButtonFont() const;
-#endif
-
-   // Places item in centre of panel - so can't be used BEFORE panel->Fit()
-   void Centre(int direction = wxHORIZONTAL);
 
    // Adds callback
    inline void Callback(const wxFunction function);
 
-   // MSW-specific
-   
-   // Window procedure
-   virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
-   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
-
-   void OnEraseBackground(wxEraseEvent& event);
-
-   // For ownerdraw items
-   virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
-   virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
-
    wxFunction GetCallback() { return m_callback; }
-   wxList& GetSubcontrols() { return m_subControls; }
 
 protected:
    wxFunction       m_callback;     // Callback associated with the window
- 
-   // MSW implementation
-   wxList           m_subControls; // For controls like radiobuttons which are really composite
+#endif // WXWIN_COMPATIBILITY
+
+protected:
+   // For controls like radiobuttons which are really composite
+   wxList           m_subControls;
 
 private:
    DECLARE_EVENT_TABLE()
 };
 
-// Adds callback
-inline void wxControl::Callback(const wxFunction function)
-{
-    m_callback = function;
-};
 
 #if WXWIN_COMPATIBILITY
+    inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
     inline wxFont& wxControl::GetLabelFont() const { return GetFont() ; }
     inline wxFont& wxControl::GetButtonFont() const { return GetFont() ; }
     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
-#endif
+#endif // WXWIN_COMPATIBILITY
 
 #endif
     // _WX_CONTROL_H_