added AccessMode parameter to wxRegKey

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 8c2310844d542356fd7883f2a4fbb9257409277e..2549f9b989a16310535a404f3388cec3b7634c63 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "control.h"
 #endif
 
     #pragma interface "control.h"
 #endif
 


@@ -22,12 +22,12 @@
 class WXDLLEXPORT wxControl : public wxControlBase
 {
 public:
 class WXDLLEXPORT wxControl : public wxControlBase
 {
 public:

-   wxControl();
-   wxControl(wxWindow *parent, wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize, long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxControlNameStr)
+    wxControl();
+    wxControl(wxWindow *parent, wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize, long style = 0,
+              const wxValidator& validator = wxDefaultValidator,
+              const wxString& name = wxControlNameStr)

     {
         Create(parent, id, pos, size, style, validator, name);
     }
     {
         Create(parent, id, pos, size, style, validator, name);
     }


@@ -58,27 +58,18 @@ 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; };
 

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

 
     void OnEraseBackground(wxEraseEvent& event);
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
 
     void OnEraseBackground(wxEraseEvent& event);
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 

-#if WXWIN_COMPATIBILITY
-    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-    wxColour* GetButtonColour() const { return NULL; }
-
-    virtual void SetLabelFont(const wxFont& font);
-    virtual void SetButtonFont(const wxFont& font);
-    wxFont& GetLabelFont() const;
-    wxFont& GetButtonFont() const;
-#endif // WXWIN_COMPATIBILITY
-

 protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 
 protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 

+    // return default best size (doesn't really make any sense, override this)

     virtual wxSize DoGetBestSize() const;
 
     // create the control of the given Windows class: this is typically called
     virtual wxSize DoGetBestSize() const;
 
     // create the control of the given Windows class: this is typically called


@@ -119,17 +110,9 @@ protected:
     wxArrayLong m_subControls;
 
 private:
     wxArrayLong m_subControls;
 
 private:

-    DECLARE_ABSTRACT_CLASS(wxControl)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-
-#if WXWIN_COMPATIBILITY
-    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
-

 #endif
     // _WX_CONTROL_H_
 #endif
     // _WX_CONTROL_H_