Because someone was inconsistent about using LPSTR and char*, I missed

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index f6ab16ee18a5a0b172702c9a70e5984e0f273e6c..446d49f3332e67b73a2a133de7a42bca81bfefc1 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -6,81 +6,81 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifdef __GNUG__

-#pragma interface "control.h"
+    #pragma interface "control.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/list.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/list.h"

-#include "wx/validate.h"

 
 // General item class
 
 // General item class

-class WXDLLEXPORT wxControl: public wxWindow
+class WXDLLEXPORT wxControl : public wxWindow

 {
 {

-  DECLARE_ABSTRACT_CLASS(wxControl)
-public:
-   wxControl(void);
-   ~wxControl(void);
+    DECLARE_ABSTRACT_CLASS(wxControl)

 
 

-   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};        // Simulates an event
-   virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
-                                                                 // appropriate event handlers
-   virtual void SetClientSize(int width, int height);
-   virtual void SetLabel(const wxString& label);
-   virtual wxString GetLabel(void) const ;
+public:
+   wxControl();
+   virtual ~wxControl();

 
 

-#if WXWIN_COMPATIBILITY
-   inline virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   inline wxColour*GetButtonColour(void) const { return NULL; }
+   // Simulates an event
+   bool Command(wxCommandEvent& event) { return ProcessCommand(event); }

 
 

-   inline virtual void SetLabelFont(const wxFont& font);
-   inline virtual void SetButtonFont(const wxFont& font);
-   inline wxFont  *GetLabelFont(void) const ;
-   inline wxFont  *GetButtonFont(void) const ;
-#endif
-
-   // Places item in centre of panel - so can't be used BEFORE panel->Fit()
-   void Centre(int direction = wxHORIZONTAL);
-   inline void Callback(const wxFunction function);           // Adds callback
+   // Calls the callback and appropriate event handlers
+   bool ProcessCommand(wxCommandEvent& event);

 
    // MSW-specific
 
    // MSW-specific

-   
-   // Window procedure
-   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-   virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
-   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
-
-   void OnEraseBackground(wxEraseEvent& event);
+#ifdef __WIN95__
+   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+#endif // Win95

 
    // For ownerdraw items
    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 
 
    // For ownerdraw items
    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 

-   inline wxFunction GetCallback(void) { return m_callback; }
-   inline wxList& GetSubcontrols(void) { return m_subControls; }
+   wxList& GetSubcontrols() { return m_subControls; }
+
+   void OnEraseBackground(wxEraseEvent& event);
+
+#if WXWIN_COMPATIBILITY
+   virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
+   wxColour* GetButtonColour() const { return NULL; }
+
+   inline virtual void SetLabelFont(const wxFont& font);
+   inline virtual void SetButtonFont(const wxFont& font);
+   inline wxFont& GetLabelFont() const;
+   inline wxFont& GetButtonFont() const;
+
+   // Adds callback
+   inline void Callback(const wxFunction function);
+
+   wxFunction GetCallback() { return m_callback; }
+

 protected:
    wxFunction       m_callback;     // Callback associated with the window
 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

 
 

-DECLARE_EVENT_TABLE()
+protected:
+   // For controls like radiobuttons which are really composite
+   wxList           m_subControls;
+
+private:
+   DECLARE_EVENT_TABLE()

 };
 
 };
 

-inline void wxControl::Callback(const wxFunction function) { m_callback = function; };           // Adds callback

 
 #if WXWIN_COMPATIBILITY
 
 #if WXWIN_COMPATIBILITY

-inline wxFont  *wxControl::GetLabelFont(void) const         { return GetFont() ; }
-inline wxFont  *wxControl::GetButtonFont(void) const        { return GetFont() ; }
-inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
-inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
-#endif
+    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 // WXWIN_COMPATIBILITY

 
 #endif
     // _WX_CONTROL_H_
 
 #endif
     // _WX_CONTROL_H_