changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 7516125e92f04c012f95df61c3c349abfdd96e6f..eb9b852be1246cadc6c8287714bda662801e840d 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -13,48 +13,53 @@
 #define _WX_CONTROL_H_
 
 #ifdef __GNUG__
 #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)
+    DECLARE_ABSTRACT_CLASS(wxControl)
+

 public:
 public:

-   wxControl(void);
-   ~wxControl(void);
+   wxControl();
+   virtual ~wxControl();
+
+   // Simulates an event
+   virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
+   // Calls the callback and appropriate event handlers
+   virtual void ProcessCommand(wxCommandEvent& 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(int width, int height);
    virtual void SetClientSize(int width, int height);

+   virtual void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
+

    virtual void SetLabel(const wxString& label);
    virtual void SetLabel(const wxString& label);

-   virtual wxString GetLabel(void) const ;
+   virtual wxString GetLabel() const;

 
 #if WXWIN_COMPATIBILITY
 
 #if WXWIN_COMPATIBILITY

-   inline virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   inline wxColour*GetButtonColour(void) const { return NULL; }
+   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 virtual void SetLabelFont(const wxFont& font);
    inline virtual void SetButtonFont(const wxFont& font);

-   inline wxFont  *GetLabelFont(void) const ;
-   inline wxFont  *GetButtonFont(void) const ;
+   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);
 #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
+
+   // Adds callback
+   inline void Callback(const wxFunction function);

 
    // MSW-specific
    
    // Window procedure
 
    // MSW-specific
    
    // Window procedure

-   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

    virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
    virtual void MSWOnMouseMove(int x, int y, WXUINT flags);

-   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);

 
    void OnEraseBackground(wxEraseEvent& event);
 
 
    void OnEraseBackground(wxEraseEvent& event);
 


@@ -62,24 +67,30 @@ public:
    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 
    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; }
+   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
 
 protected:
    wxFunction       m_callback;     // Callback associated with the window
  
    // MSW implementation
    wxList           m_subControls; // For controls like radiobuttons which are really composite
 

-DECLARE_EVENT_TABLE()
+private:
+   DECLARE_EVENT_TABLE()

 };
 
 };
 

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

 
 #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); }
+    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
 #endif
 
 #endif