A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index e63718755f778845223f780be1590c4a64fa8add..1c984d20b0f27df394032af6d4e71b73bbd792ef 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -18,8 +18,6 @@
 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
-

 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {


@@ -30,9 +28,7 @@ public:
    wxControl(wxWindow *parent, wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
    wxControl(wxWindow *parent, wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,

-#if wxUSE_VALIDATORS

              const wxValidator& validator = wxDefaultValidator,
              const wxValidator& validator = wxDefaultValidator,

-#endif

              const wxString& name = wxControlNameStr)
     {
         Create(parent, id, pos, size, style, validator, name);
              const wxString& name = wxControlNameStr)
     {
         Create(parent, id, pos, size, style, validator, name);


@@ -41,91 +37,89 @@ public:
     bool Create(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
     bool Create(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,

-#if wxUSE_VALIDATORS

             const wxValidator& validator = wxDefaultValidator,
             const wxValidator& validator = wxDefaultValidator,

-#endif

             const wxString& name = wxControlNameStr);
 
     virtual ~wxControl();
 
             const wxString& name = wxControlNameStr);
 
     virtual ~wxControl();
 

-   // Simulates an event
-   virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
+    // Simulates an event
+    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }

 
 

-   // implementation from now on
-   // --------------------------
+    // implementation from now on
+    // --------------------------

 
 

-   // Calls the callback and appropriate event handlers
-   bool ProcessCommand(wxCommandEvent& event);
+    // Calls the callback and appropriate event handlers
+    bool ProcessCommand(wxCommandEvent& event);

 
 

-   // MSW-specific
+    // MSW-specific

 #ifdef __WIN95__
 #ifdef __WIN95__

-   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

 #endif // Win95
 
 #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; };

 
 

-   wxArrayLong GetSubcontrols() { return m_subControls; }
+    wxArrayLong GetSubcontrols() { return m_subControls; }

 
 

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

 
 

-   virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                               WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

 
 #if WXWIN_COMPATIBILITY
 
 #if WXWIN_COMPATIBILITY

-   virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   wxColour* GetButtonColour() 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 wxFont& GetLabelFont() const;
-   inline wxFont& GetButtonFont() const;
+    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);
+    // Adds callback
+    inline void Callback(const wxFunction function);

 
 

-   wxFunction GetCallback() { return m_callback; }
+    wxFunction GetCallback() { return m_callback; }

 
 protected:
 
 protected:

-   wxFunction       m_callback;     // Callback associated with the window
+    wxFunction       m_callback;     // Callback associated with the window

 #endif // WXWIN_COMPATIBILITY
 
 protected:
 #endif // WXWIN_COMPATIBILITY
 
 protected:

-   // for controls like radiobuttons which are really composite this array
-   // holds the ids (not HWNDs!) of the sub controls
-   wxArrayLong m_subControls;
-
-   virtual wxSize DoGetBestSize() const;
-
-   // create the control of the given class with the given style, returns FALSE
-   // if creation failed
-   //
-   // All parameters except classname and style are optional, if the
-   // size/position are not given, they should be set later with SetSize() and,
-   // label (the title of the window), of course, is left empty. The extended
-   // style is determined from the style and the app 3D settings automatically
-   // if it's not specified explicitly.
-   bool MSWCreateControl(const wxChar *classname,
-                         WXDWORD style,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize,
-                         const wxString& label = wxEmptyString,
-                         WXDWORD exstyle = (WXDWORD)-1);
-
-   // determine the extended styles combination for this window (may slightly
-   // modify style parameter, this is why it's non const)
-   WXDWORD GetExStyle(WXDWORD& style, bool *want3D) const;
+    // for controls like radiobuttons which are really composite this array
+    // holds the ids (not HWNDs!) of the sub controls
+    wxArrayLong m_subControls;
+
+    virtual wxSize DoGetBestSize() const;
+
+    // create the control of the given class with the given style, returns FALSE
+    // if creation failed
+    //
+    // All parameters except classname and style are optional, if the
+    // size/position are not given, they should be set later with SetSize() and,
+    // label (the title of the window), of course, is left empty. The extended
+    // style is determined from the style and the app 3D settings automatically
+    // if it's not specified explicitly.
+    bool MSWCreateControl(const wxChar *classname,
+            WXDWORD style,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            const wxString& label = wxEmptyString,
+            WXDWORD exstyle = (WXDWORD)-1);
+
+    // determine the extended styles combination for this window (may slightly
+    // modify style parameter, this is why it's non const)
+    WXDWORD GetExStyle(WXDWORD& style, bool *want3D) const;

 
 private:
 
 private:

-   DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 
 #if WXWIN_COMPATIBILITY
     inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
 };
 
 
 #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 wxFont& wxControl::GetLabelFont() const { return (wxFont &)GetFont(); }
+    inline wxFont& wxControl::GetButtonFont() const { return (wxFont &)GetFont(); }

     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif // WXWIN_COMPATIBILITY
     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif // WXWIN_COMPATIBILITY